open Printf
-let critical_value = 6
-let just_factor = 3
+let critical_value = 7
+let just_factor = 4
module StringSet = Set.Make (String)
module SetSet = Set.Make (StringSet)
((n+1), from, where)
| `Sort (sort, positions) ->
let tbl = MetadataTypes.sort_tbl in
- let sort_str = MetadataPp.pp_sort sort in
+ let sort_str = CicPp.ppsort sort in
let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
let where =
(sprintf "%s.h_sort = \"%s\"" cur_tbl sort_str) ::
(* Special handling of equality. The problem is filtering out theorems just
* containing variables (e.g. all the theorems in cic:/Coq/Ring/). Really
* ad-hoc, no better solution found at the moment *)
+let myspeciallist_of_facts =
+ [0,"cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)"]
let myspeciallist =
[0,"cic:/Coq/Init/Logic/eq.ind#xpointer(1/1/1)";
- 0,"cic:/Coq/Init/Logic/sym_eq.con";
+(* 0,"cic:/Coq/Init/Logic/sym_eq.con"; *)
0,"cic:/Coq/Init/Logic/trans_eq.con";
0,"cic:/Coq/Init/Logic/f_equal.con";
0,"cic:/Coq/Init/Logic/f_equal2.con";
0,"cic:/Coq/Init/Logic/f_equal3.con"]
-let compute_exactly ~(dbd:Mysql.dbd) where main prefixes =
+
+let compute_exactly ~(dbd:Mysql.dbd) ?(facts=false) ~where main prefixes =
List.concat
(List.map
(fun (m,s) ->
- if (m = 0) then
- myspeciallist
+ if ((m = 0) && (main = HelmLibraryObjects.Logic.eq_XURI)) then
+ (if facts then myspeciallist_of_facts
+ else myspeciallist)
else
let res =
let must = must_of_prefix ~where main s in
prefixes)
(* critical value reached, fallback to "only" constraints *)
-let compute_with_only ~(dbd:Mysql.dbd) ?(where = `Conclusion) main
- prefixes constants
+
+let compute_with_only ~(dbd:Mysql.dbd) ?(facts=false) ?(where = `Conclusion)
+ main prefixes constants
=
let max_prefix_length =
match prefixes with
maximal_prefixes)
in
List.filter (function (_,uri) -> at_most ~dbd ~where constants uri) all in
- let equal_to = compute_exactly ~dbd where main prefixes in
+ let equal_to = compute_exactly ~dbd ~facts ~where main prefixes in
greater_than @ equal_to
(* real match query implementation *)
-let cmatch ~(dbd:Mysql.dbd) t =
+
+let cmatch ~(dbd:Mysql.dbd) ?(facts=false) t =
let (main, constants) = signature_of t in
match main with
| None -> []
| Some (main, types) ->
(* the type of eq is not counted in constants_no *)
let types_no = List.length types in
- let constants_no = StringSet.cardinal constants + types_no in
+ let constants_no = StringSet.cardinal constants in
if (constants_no > critical_value) then
let prefixes = prefixes just_factor t in
(match prefixes with
let all_constants =
List.fold_right StringSet.add types (StringSet.add main constants)
in
- compute_with_only ~dbd main all_concl all_constants
+ compute_with_only ~dbd ~facts main all_concl all_constants
| _, _ -> [])
else
(* in this case we compute all prefixes, and we do not need
to apply the only constraints *)
let prefixes =
- if constants_no = types_no then
- Some main, [0, []; types_no, types]
+ if constants_no = 0 then
+ (if types_no = 0 then
+ Some main, [0, []]
+ else
+ Some main, [0, []; types_no, types])
else
- prefixes constants_no t
+ prefixes (constants_no+types_no+1) t
in
(match prefixes with
Some main, all_concl ->
+ compute_exactly ~dbd ~facts ~where:`Conclusion main all_concl
+(*
List.concat
(List.map
(fun (m,s) ->
let must = must_of_prefix ~where:`Conclusion main s in
let res = at_least ~dbd ~concl_card:(Eq (m+1)) must in
List.map (fun uri -> (m, uri)) res)
- all_concl)
+ all_concl) *)
| _, _ -> [])
let power_upto upto consts =
type where = [ `Conclusion | `Statement ]
-let sigmatch ~(dbd:Mysql.dbd) ?(where = `Conclusion) (main, constants) =
+let sigmatch ~(dbd:Mysql.dbd)
+ ?(facts=false) ?(where = `Conclusion) (main, constants) =
match main with
None -> []
| Some (main, types) ->
let subsets =
let subsets = power constants in
let types_no = List.length types in
+ if types_no > 0 then
(0,[]) :: List.map (function (n,l) -> (n+types_no,types@l)) subsets
+ else subsets
in
- compute_exactly ~dbd where main subsets
+ compute_exactly ~dbd ~facts ~where main subsets
(* match query wrappers *)
-let cmatch' = cmatch
-let cmatch ~dbd term =
+
+let cmatch'= cmatch
+
+let cmatch ~dbd ?(facts=false) term =
List.map snd
(List.sort
(fun x y -> Pervasives.compare (fst y) (fst x))
- (cmatch' ~dbd term))
+ (cmatch' ~dbd ~facts term))
let constants_of = signature_concl