open MetadataTypes
let critical_value = 7
-let just_factor = 3
+let just_factor = 1
module UriManagerSet = UriManager.UriSet
module SetSet = Set.Make (UriManagerSet)
let at_least ~(dbd:HMysql.dbd) ?concl_card ?full_card ?diff ?rating tables
(metadata: MetadataTypes.constr list)
=
- let obj_tbl,rel_tbl,sort_tbl, count_tbl = tables
- in
+ let obj_tbl,rel_tbl,sort_tbl, count_tbl = tables in
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
- in
- let (n,from,where) =
- add_all_constr ~tbl:count_tbl (n,from,where) concl_card full_card diff
- in
- exec ~dbd ?rating (n,from,where)
+ begin
+ HLog.warn "MetadataConstraints.at_least: no constraints given";
+ []
+ end
+ else
+ let (n,from,where) =
+ List.fold_left (add_constraint ~tables) (0,[],[]) metadata
+ in
+ let (n,from,where) =
+ add_all_constr ~tbl:count_tbl (n,from,where) concl_card full_card diff
+ in
+ exec ~dbd ?rating (n,from,where)
+;;
let at_least
~(dbd:HMysql.dbd) ?concl_card ?full_card ?diff ?rating
Some (u, []), add l
| Cic.Appl ((Cic.MutInd (u, t, exp_named_subst))::l) ->
let suri = UriManager.uri_of_uriref u t None in
- if u = HelmLibraryObjects.Logic.eq_URI then
+ if LibraryObjects.is_eq_URI u then
(* equality is handled in a special way: in particular,
the type, if defined, is always added to the prefix,
and n is not decremented - it should have been n-2 *)
let suri1 = UriManager.uri_of_uriref u1 t1 (Some c1) in
let inconcl = UriManagerSet.remove suri1 (add l1) in
Some (suri, [suri1]), inconcl
- | _ :: _ -> Some (suri, []), UriManagerSet.empty
+ | _ :: tl -> Some (suri, []), add tl
| _ -> assert false (* args number must be > 0 *)
else
Some (suri, []), add l
List.map (fun uri -> (card, uri)) res))
maximal_prefixes)
in
- Printf.fprintf stderr "all: %d\n" (List.length all);flush_all ();
- List.filter (function (_,uri) -> at_most ~dbd ~where constants uri) all in
+(* Printf.fprintf stderr "all: %d\n" (List.length all);flush_all (); *)
+(*
+ List.filter (function (_,uri) ->
+ at_most ~dbd ~where constants uri)
+*)
+ all
+ in
let equal_to = compute_exactly ~dbd ~facts ~where main prefixes in
greater_than @ equal_to
let subsets = power_upto just_factor constants in
(* let _ = prerr_endline (("subsets: ")^
(string_of_int (List.length subsets))) in *)
- let types_no = List.length types in
- List.map (function (n,l) -> (n+types_no,types@l)) subsets
+ let types_no = List.length types in
+ if types_no > 0 then
+ List.map (function (n,l) -> (n+types_no,types@l)) subsets
+ else subsets
in
+ prerr_endline ("critical_value exceded..." ^ string_of_int constants_no);
let all_constants =
let all = match main with None -> types | Some m -> m::types in
List.fold_right UriManagerSet.add all constants
in
compute_with_only ~dbd ~where main subsets all_constants
else
+ (prerr_endline ("all subsets..." ^ string_of_int constants_no);
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
+ in
+ prerr_endline "fine1";
+ compute_exactly ~dbd ~facts ~where main subsets)
(* match query wrappers *)