*)
open Printf
+open MetadataTypes
let critical_value = 7
let just_factor = 4
[ `Hits (** order by number of hits, most used objects first *)
]
+let default_tables =
+ (library_obj_tbl,library_rel_tbl,library_sort_tbl,library_count_tbl)
+
+let current_tables () =
+ (obj_tbl (),rel_tbl (),sort_tbl (), count_tbl ())
+
let tbln n = "table" ^ string_of_int n
(*
let op, card = explode_card_constr constr in
(sprintf "%s.hypothesis - %s.conclusion %s %d" tbl tbl op card :: where)
-let add_all_constr tbl (n,from,where) concl full diff =
+let add_all_constr ?(tbl=library_count_tbl) (n,from,where) concl full diff =
match (concl, full, diff) with
| None, None, None -> (n,from,where)
| _ ->
- let where = add_card_constr tbl "conclusion" where concl in
- let where = add_card_constr tbl "statement" where full in
- let where = add_diff_constr tbl where diff in
- (n,tbl :: from,
+ let cur_tbl = tbln n in
+ let from = (sprintf "%s as %s" tbl cur_tbl) :: from in
+ let where = add_card_constr cur_tbl "conclusion" where concl in
+ let where = add_card_constr cur_tbl "statement" where full in
+ let where = add_diff_constr cur_tbl where diff in
+ (n+2,from,
(if n > 0 then
- sprintf "table0.source = %s.source" tbl :: where
+ sprintf "table0.source = %s.source" cur_tbl :: where
else
where))
-let add_constraint tables (n,from,where) metadata =
+let add_constraint ?(start=0) ?(tables=default_tables) (n,from,where) metadata =
let obj_tbl,rel_tbl,sort_tbl,count_tbl = tables
in
let cur_tbl = tbln n in
+ let start_table = tbln start 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]) @
+ (if n=start then []
+ else [sprintf "%s.source = %s.source" start_table cur_tbl]) @
where
in
((n+2), from, where)
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]) @
+ (if n=start then []
+ else [sprintf "%s.source = %s.source" start_table cur_tbl]) @
where
in
((n+2), from, where)
let where =
(sprintf "%s.h_sort = \"%s\"" cur_tbl sort_str ) ::
mk_positions positions cur_tbl ::
- (if n=0 then
+ (if n=start then
[]
else
- [sprintf "table0.source = %s.source" cur_tbl ]) @ where
+ [sprintf "%s.source = %s.source" start_table cur_tbl ]) @ where
in
((n+2), from, where)
+let exec ~(dbd:Mysql.dbd) ?rating (n,from,where) =
+let from = String.concat ", " from in
+ let where = String.concat " and " where in
+ let query =
+ match rating with
+ | None -> sprintf "select table0.source from %s where %s" from where
+ | Some `Hits ->
+ sprintf
+ ("select table0.source from %s, hits where %s
+ and table0.source = hits.source order by hits.no desc")
+ 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 ?rating tables
(metadata: MetadataTypes.constr list)
if (metadata = []) && concl_card = None && full_card = None then
failwith "MetadataQuery.at_least: no constraints given";
let (n,from,where) =
- List.fold_left (add_constraint tables) (0,[],[]) metadata
+ List.fold_left (add_constraint ~tables) (0,[],[]) metadata
in
- let selected = if metadata = [] then count_tbl else "table0" in
let (n,from,where) =
- add_all_constr count_tbl (n,from,where) concl_card full_card diff
- in
- let from = String.concat ", " from in
- let where = String.concat " and " where in
- let query =
- match rating with
- | None -> sprintf "select %s.source from %s where %s" selected from where
- | Some `Hits ->
- sprintf
- ("select %s.source from %s, hits where %s"
- ^^ " and hits.source = %s.source order by hits.no desc")
- selected from where selected
+ add_all_constr ~tbl:count_tbl (n,from,where) concl_card full_card diff
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)
-
+ exec ~dbd ?rating (n,from,where)
let at_least
~(dbd:Mysql.dbd) ?concl_card ?full_card ?diff ?rating
(metadata: MetadataTypes.constr list)
=
- let module MT = MetadataTypes in
- if MT.are_tables_ownerized () then
- (at_least ~dbd ?concl_card ?full_card ?diff ?rating
- (MT.obj_tbl (),MT.rel_tbl (),MT.sort_tbl (), MT.count_tbl ())
- metadata)
- @
- (at_least ~dbd ?concl_card ?full_card ?diff ?rating
- (MT.library_obj_tbl,MT.library_rel_tbl,MT.library_sort_tbl,
- MT.library_count_tbl)
- metadata)
+ if are_tables_ownerized () then
+ (at_least
+ ~dbd ?concl_card ?full_card ?diff ?rating default_tables metadata) @
+ (at_least
+ ~dbd ?concl_card ?full_card ?diff ?rating (current_tables ()) metadata)
else
- at_least ~dbd ?concl_card ?full_card ?diff ?rating
- (MT.library_obj_tbl,MT.library_rel_tbl,MT.library_sort_tbl,
- MT.library_count_tbl)
- metadata
+ at_least
+ ~dbd ?concl_card ?full_card ?diff ?rating default_tables metadata
(** Prefix handling *)
[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";
let fill_with_dummy_constants t =
- let rec aux i =
+ let rec aux i types =
function
Cic.Lambda (n,s,t) ->
let dummy_uri =
UriManager.uri_of_string ("cic:/dummy_"^(string_of_int i)) in
- (aux (i+1) (CicSubstitution.subst (Cic.Const(dummy_uri,[])) t))
- | t -> t
- in aux 0 t
+ (aux (i+1) (s::types)
+ (CicSubstitution.subst (Cic.Const(dummy_uri,[])) t))
+ | t -> t,types
+ in
+ let t,types = aux 0 [] t in
+ t, List.rev types
let instance ~dbd t =
- let t' = fill_with_dummy_constants t in
+ let t',types = fill_with_dummy_constants t in
let metadata = MetadataExtractor.compute ~body:None ~ty:t' in
+ List.iter
+ (fun x ->
+ prerr_endline
+ (MetadataPp.pp_constr (MetadataTypes.constr_of_metadata x)))
+ metadata;
let no_concl = MetadataDb.count_distinct `Conclusion metadata in
let no_hyp = MetadataDb.count_distinct `Hypothesis metadata in
- let no_full = MetadataDb.count_distinct `Statement metadata in
+ let no_full = MetadataDb.count_distinct `Statement metadata in
let is_dummy =
function
`Obj(s, _) -> (String.sub s 0 10) <> "cic:/dummy"
- | _ -> false in
- let metadata = List.filter is_dummy metadata in
- let constraints = List.map MetadataTypes.constr_of_metadata metadata in
- let concl_card = Some (MetadataConstraints.Eq no_concl) in
- let full_card = Some (MetadataConstraints.Eq no_full) in
- let diff = Some (MetadataConstraints.Eq (no_hyp - no_concl)) in
- Constr.at_least ~dbd ?concl_card ?full_card ?diff constraints
+ | _ -> true in
+ let rec look_for_dummy_main =
+ function
+ [] -> None
+ | `Obj(s,`MainConclusion (Some d))::_
+ when ((String.sub s 0 10) = "cic:/dummy") ->
+ let len = String.length s in
+ let dummy_index = int_of_string (String.sub s 11 (len-11)) in
+ let dummy_type = List.nth types dummy_index in
+ Some (d,dummy_type)
+ | _::l -> look_for_dummy_main l in
+ match (look_for_dummy_main metadata) with
+ None->
+ prerr_endline "Caso None";
+ (* no dummy in main position *)
+ let metadata = List.filter is_dummy metadata in
+ let constraints = List.map MetadataTypes.constr_of_metadata metadata in
+ let concl_card = Some (MetadataConstraints.Eq no_concl) in
+ let full_card = Some (MetadataConstraints.Eq no_full) in
+ let diff = Some (MetadataConstraints.Eq (no_hyp - no_concl)) in
+ Constr.at_least ~dbd ?concl_card ?full_card ?diff constraints
+ | Some (depth, dummy_type) ->
+ prerr_endline
+ (sprintf "Caso Some %d %s" depth (CicPp.ppterm dummy_type));
+ (* a dummy in main position *)
+ let metadata_for_dummy_type =
+ MetadataExtractor.compute ~body:None ~ty:dummy_type in
+ (* Let us skip this for the moment
+ let main_of_dummy_type =
+ look_for_dummy_main metadata_for_dummy_type in *)
+ let metadata = List.filter is_dummy metadata in
+ let constraints = List.map MetadataTypes.constr_of_metadata metadata in
+ let metadata_for_dummy_type =
+ List.filter is_dummy metadata_for_dummy_type in
+ let constraints_for_dummy_type =
+ List.map MetadataTypes.constr_of_metadata metadata_for_dummy_type in
+ (* start with the dummy constant in main conlusion *)
+ let from = ["refObj as table0"] in
+ let where =
+ [sprintf "table0.h_position = \"%s\"" MetadataTypes.mainconcl_pos;
+ sprintf "table0.h_depth = %d" depth] in
+ let (n,from,where) =
+ List.fold_left
+ (MetadataConstraints.add_constraint ~start:2)
+ (2,from,where) constraints in
+ let concl_card = Some (MetadataConstraints.Eq no_concl) in
+ let full_card = Some (MetadataConstraints.Eq no_full) in
+ let diff = Some (MetadataConstraints.Eq (no_hyp - no_concl)) in
+ let (n,from,where) =
+ MetadataConstraints.add_all_constr
+ (n,from,where) concl_card full_card diff in
+ (* join with the constraints over the type of the constant *)
+ let where =
+ (sprintf "table0.h_occurrence = table%d.source" n)::where in
+ let (m,from,where) =
+ List.fold_left
+ (MetadataConstraints.add_constraint ~start:n)
+ (n,from,where) constraints_for_dummy_type in
+ Constr.exec ~dbd (m,from,where)
projects / helm.git / commitdiff