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)
else [sprintf "table0.source = %s.source" cur_tbl]) @
where))
-let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
+let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card tables
(metadata: MetadataTypes.constr list)
=
if (metadata = []) && concl_card = None && full_card = None then
failwith "MetadataQuery.at_least: no constraints given";
+ let obj_tbl,rel_tbl,sort_tbl,conclno_tbl,conclno_hyp_tbl = tables in
let add_constraint (n,from,where) metadata =
let cur_tbl = tbln n in
match metadata with
| `Obj (uri, positions) ->
- let tbl = MetadataTypes.obj_tbl in
- let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
- let where =
- (sprintf "%s.h_occurrence = \"%s\"" cur_tbl uri) ::
+ let from = (sprintf "%s as %s" obj_tbl cur_tbl) :: from in
+ let where =
+ (sprintf "(%s.h_occurrence = \"%s\")" cur_tbl uri) ::
mk_positions positions cur_tbl ::
(if n=0 then []
- else [sprintf "table0.source = %s.source" cur_tbl]) @
+ else [sprintf "table0.source = %s.source" cur_tbl]) @
where
in
- ((n+1), from, where)
+ ((n+2), from, where)
| `Rel positions ->
- let tbl = MetadataTypes.rel_tbl in
- let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
+ let from = (sprintf "%s as %s" rel_tbl cur_tbl) :: from in
let where =
mk_positions positions cur_tbl ::
(if n=0 then []
- else [sprintf "table0.source = %s.source" cur_tbl]) @
+ else [sprintf "table0.source = %s.source" cur_tbl]) @
where
in
- ((n+1), from, where)
+ ((n+2), from, where)
| `Sort (sort, positions) ->
- let tbl = MetadataTypes.sort_tbl in
- let sort_str = MetadataPp.pp_sort sort in
- let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
+ let sort_str = CicPp.ppsort sort in
+ let from = (sprintf "%s as %s" sort_tbl cur_tbl) :: from in
let where =
- (sprintf "%s.h_sort = \"%s\"" cur_tbl sort_str) ::
- mk_positions positions cur_tbl ::
- (if n=0 then []
- else [sprintf "table0.source = %s.source" cur_tbl]) @
- where
+ (sprintf "%s.h_sort = \"%s\"" cur_tbl sort_str ) ::
+ mk_positions positions cur_tbl ::
+ (if n=0 then
+ []
+ else
+ [sprintf "table0.source = %s.source" cur_tbl ]) @ where
in
- ((n+1), from, where)
+ ((n+2), from, where)
in
let (n,from,where) = List.fold_left add_constraint (0,[],[]) metadata in
let (n,from,where) =
- add_card_constr MetadataTypes.conclno_tbl (n,from,where) concl_card
+ add_card_constr conclno_tbl (n,from,where) concl_card
in
let (n,from,where) =
- add_card_constr MetadataTypes.conclno_hyp_tbl (n,from,where) full_card
+ add_card_constr conclno_hyp_tbl (n,from,where) full_card
in
let from = String.concat ", " from in
let where = String.concat " and " where in
Mysql.map result
(fun row -> match row.(0) with Some s -> s | _ -> assert false)
+let at_least
+ ~(dbd:Mysql.dbd) ?concl_card ?full_card (metadata: MetadataTypes.constr list)
+=
+ let module MT = MetadataTypes in
+ if MT.are_tables_ownerized () then
+ (at_least ~dbd ?concl_card ?full_card
+ (MT.obj_tbl (),MT.rel_tbl (),MT.sort_tbl (),
+ MT.conclno_tbl (),MT.conclno_hyp_tbl ())
+ metadata)
+ @
+ (at_least ~dbd ?concl_card ?full_card
+ (MT.library_obj_tbl,MT.library_rel_tbl,MT.library_sort_tbl,
+ MT.library_conclno_tbl,MT.library_conclno_hyp_tbl)
+ metadata)
+ else
+ at_least ~dbd ?concl_card ?full_card
+ (MT.library_obj_tbl,MT.library_rel_tbl,MT.library_sort_tbl,
+ MT.library_conclno_tbl,MT.library_conclno_hyp_tbl)
+ metadata
+
+
(** Prefix handling *)
let filter_by_card n =
"\"MainHypothesis\""]
in
let query =
- sprintf "select h_occurrence from refObj where source=\"%s\" and (%s)"
- uri (String.concat " or " positions)
+ sprintf ("SELECT h_occurrence FROM %s WHERE source=\"%s\" AND (%s) UNION "^^
+ "SELECT h_occurrence FROM %s WHERE source=\"%s\" AND (%s)")
+ (MetadataTypes.obj_tbl ()) uri (String.concat " OR " positions)
+ MetadataTypes.library_obj_tbl uri (String.concat " OR " positions)
+
in
let result = Mysql.exec dbd query in
let set = ref StringSet.empty in
(* 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
projects / helm.git / blobdiff