type cardinality_condition =
| Eq of int
| Gt of int
+ | Lt of int
let tbln n = "table" ^ string_of_int n
(positions :> MetadataTypes.position list)) ^
")"
+let explode_card_constr = function
+ | Eq card -> "=", card
+ | Gt card -> ">", card
+ | Lt card -> "<", card
+
let add_card_constr tbl (n,from,where) = function
| None -> (n,from,where)
- | Some (Eq card) ->
+ | Some constr ->
let cur_tbl = tbln n in
+ let op, card = explode_card_constr constr in
(n+1,
(sprintf "%s as %s" tbl cur_tbl :: from),
- (sprintf "%s.no=%d" cur_tbl card ::
+ (sprintf "%s.no %s %d" cur_tbl op card ::
(if n=0 then []
else [sprintf "table0.source = %s.source" cur_tbl]) @
where))
- | Some (Gt card) ->
- let cur_tbl = tbln n in
- (n+1,
- (sprintf "%s as %s" tbl cur_tbl :: from),
- (sprintf "%s.no>%d" cur_tbl card ::
- (if n=0 then []
- else [sprintf "table0.source = %s.source" cur_tbl]) @
+
+let add_diff_constr conclno_tbl hypno_tbl (n,from,where) = function
+ | None -> (n,from,where)
+ | Some constr ->
+ let cur_tbl1, cur_tbl2 = tbln n, tbln (n+1) in
+ let op, card = explode_card_constr constr in
+ (n+2,
+ (sprintf "%s as %s" conclno_tbl cur_tbl1 ::
+ sprintf "%s as %s" hypno_tbl cur_tbl2 :: from),
+ (sprintf "%s.no - %s.no %s %d" cur_tbl2 cur_tbl1 op card ::
+ (if n=0 then assert false
+ else [sprintf "table0.source = %s.source" cur_tbl1;
+ sprintf "table0.source = %s.source" cur_tbl2]) @
where))
-let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card
+let add_constraint tables (n,from,where) metadata =
+ let obj_tbl,rel_tbl,sort_tbl,conclno_tbl,fullno_tbl,hypno_tbl = tables in
+ let cur_tbl = tbln n in
+ match metadata with
+ | `Obj (uri, positions) ->
+ 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]) @
+ where
+ in
+ ((n+2), from, where)
+ | `Rel positions ->
+ 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]) @
+ where
+ in
+ ((n+2), from, where)
+ | `Sort (sort, positions) ->
+ 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
+ in
+ ((n+2), from, where)
+
+let at_least ~(dbd:Mysql.dbd) ?concl_card ?full_card ?diff tables
(metadata: MetadataTypes.constr list)
=
+ let obj_tbl,rel_tbl,sort_tbl,conclno_tbl,fullno_tbl,hypno_tbl = tables in
if (metadata = []) && concl_card = None && full_card = None then
failwith "MetadataQuery.at_least: no constraints given";
- 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) ::
- mk_positions positions cur_tbl ::
- (if n=0 then []
- else [sprintf "table0.source = %s.source" cur_tbl]) @
- where
- in
- ((n+1), from, where)
- | `Rel positions ->
- let tbl = MetadataTypes.rel_tbl in
- let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
- let where =
- mk_positions positions cur_tbl ::
- (if n=0 then []
- else [sprintf "table0.source = %s.source" cur_tbl]) @
- where
- in
- ((n+1), 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 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)
+ let (n,from,where) =
+ List.fold_left (add_constraint tables) (0,[],[]) metadata
+ in
+ let (n,from,where) =
+ add_card_constr conclno_tbl (n,from,where) concl_card
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 fullno_tbl (n,from,where) full_card
in
let (n,from,where) =
- add_card_constr MetadataTypes.conclno_hyp_tbl (n,from,where) full_card
+ add_diff_constr conclno_tbl hypno_tbl (n,from,where) diff
in
let from = String.concat ", " from in
let where = String.concat " and " where in
- let query = sprintf "select table0.source from %s where %s" from where in
+ let query =
+(*
+ sprintf
+ ("select table0.source from %s, %s where %s and %s.source = table0.source"
+ ^^ " order by %s.no")
+ from fullno_tbl where fullno_tbl fullno_tbl
+ *)
+ sprintf "select table0.source from %s where %s" from where
+ in
+(* prerr_endline query; *)
let result = Mysql.exec dbd query 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 ?diff
+ (metadata: MetadataTypes.constr list)
+=
+ let module MT = MetadataTypes in
+ if MT.are_tables_ownerized () then
+ (at_least ~dbd ?concl_card ?full_card ?diff
+ (MT.obj_tbl (),MT.rel_tbl (),MT.sort_tbl (),
+ MT.conclno_tbl (),MT.fullno_tbl (),MT.hypno_tbl ())
+ metadata)
+ @
+ (at_least ~dbd ?concl_card ?full_card ?diff
+ (MT.library_obj_tbl,MT.library_rel_tbl,MT.library_sort_tbl,
+ MT.library_conclno_tbl,MT.library_fullno_tbl,MT.library_hypno_tbl)
+ metadata)
+ else
+ at_least ~dbd ?concl_card ?full_card ?diff
+ (MT.library_obj_tbl,MT.library_rel_tbl,MT.library_sort_tbl,
+ MT.library_conclno_tbl,MT.library_fullno_tbl,MT.library_hypno_tbl)
+ metadata
+
+
(** Prefix handling *)
let filter_by_card n =
let uri = escape uri in
let positions =
match where with
- | `Conclusion -> ["\"MainConclusion\""; "\"InConclusion\""]
+ | `Conclusion -> [ MetadataTypes.mainconcl_pos; MetadataTypes.inconcl_pos ]
| `Statement ->
- ["\"MainConclusion\""; "\"InConclusion\""; "\"InHypothesis\"";
- "\"MainHypothesis\""]
+ [ MetadataTypes.mainconcl_pos; MetadataTypes.inconcl_pos;
+ MetadataTypes.inhyp_pos; MetadataTypes.mainhyp_pos ]
in
let query =
- sprintf "select h_occurrence from refObj where source=\"%s\" and (%s)"
- uri (String.concat " or " positions)
+ let pos_predicate =
+ String.concat " OR "
+ (List.map (fun pos -> sprintf "(h_position = \"%s\")" pos) positions)
+ in
+ 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 pos_predicate
+ MetadataTypes.library_obj_tbl uri pos_predicate
+
in
let result = Mysql.exec dbd query in
let set = ref StringSet.empty in
[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";
else
Some main, [0, []; types_no, types])
else
- prefixes (constants_no+types_no) t
+ prefixes (constants_no+types_no+1) t
in
(match prefixes with
Some main, all_concl ->
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 ~facts ~where main subsets