Cache requests while resolving ranking constraints

Cloogle/Search/Rank.icl

@@ -13,6 +13,8 @@ import Data.Error
 from Data.Foldable import class Foldable(foldr1)
 from Data.Func import $
 import Data.Functor
+from Data.GenLexOrd import :: LexOrd, generic gLexOrd
+import qualified Data.GenLexOrd
 from Data.List import instance Foldable []
 import qualified Data.Map as M
 import Data.Maybe
@@ -160,7 +162,7 @@ where
 
 rankConstraints :: ![(Request, RankConstraint)] !*CloogleDB -> *([String], *CloogleDB)
 rankConstraints constraints cdb
-# (constraints,cdb) = findConstraints constraints cdb
+# (constraints,cdb) = findConstraints constraints 'M'.newMap cdb
 = (default ++ constraints,cdb)
 where
 	default =
@@ -178,16 +180,25 @@ where
 		, "(declare-const rs_lib_stdenv         Real)"
 		]
 
-findConstraints :: ![(Request, RankConstraint)] !*CloogleDB -> *([String], *CloogleDB)
-findConstraints [(req,LT urid1 urid2):rest] cdb
-# (orgsearchtype,allsyns,usedsyns,entries,cdb) = search` req cdb
+derive gLexOrd Request, Maybe
+instance < Request where < a b = (gLexOrd{|*|} a b)=:'Data.GenLexOrd'.LT
+
+findConstraints ::
+	![(Request, RankConstraint)]
+	!(Map Request (!Maybe Type,!Map String [TypeDef],![TypeDef],![(!CloogleEntry,![Annotation])]))
+	!*CloogleDB -> *([String], *CloogleDB)
+findConstraints [(req,LT urid1 urid2):rest] results cdb
+# (orgsearchtype,allsyns,usedsyns,entries,cdb) = case 'M'.get req results of
+	Just (t,as,us,es) -> (t,as,us,es,cdb)
+	_                 -> search` req cdb
+# results = 'M'.put req (orgsearchtype,allsyns,usedsyns,entries) results
 # (e1,annots1,cdb) = findEntry orgsearchtype allsyns usedsyns urid1 entries cdb
 # (e2,annots2,cdb) = findEntry orgsearchtype allsyns usedsyns urid2 entries cdb
 # ri1 = symbolicDistance e1 annots1
 # ri2 = symbolicDistance e2 annots2
 # this = "(assert (< (" +++ formula ri1 +++ ") (" +++ formula ri2 +++ ")))"
 # cdb = resetDB cdb
-# (rest,cdb) = findConstraints rest cdb
+# (rest,cdb) = findConstraints rest results cdb
 = ([this:rest],cdb)
 where
 	findEntry orgsearchtype allsyns usedsyns urid=:(_,mod,name) entries cdb
@@ -225,4 +236,4 @@ where
 		sum [t:ts]
 		# s = sum ts
 		= "+ (" +++ t +++ ") (" +++ s +++ ")"
-findConstraints [] cdb = ([],cdb)
+findConstraints [] _ cdb = ([],cdb)