X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FmetadataQuery.ml;h=9385f1c99d3ef3cef1845f82a05dac3707c011b9;hb=827e35d6058ebba3a4a4fa6eb3c160f0cd0fd1e8;hp=5afd37a9aafe6cb2620412f8d8f19d597f453acd;hpb=fb1c54e2c68e87998c1c9b09221b64fb63adaa7a;p=helm.git diff --git a/helm/ocaml/tactics/metadataQuery.ml b/helm/ocaml/tactics/metadataQuery.ml index 5afd37a9a..9385f1c99 100644 --- a/helm/ocaml/tactics/metadataQuery.ml +++ b/helm/ocaml/tactics/metadataQuery.ml @@ -25,82 +25,14 @@ open Printf -module Constr = MetadataConstraints -module PET = ProofEngineTypes +let nonvar uri = not (UriManager.uri_is_var uri) - (** maps a shell like pattern (which uses '*' and '?') to a sql pattern for - * the "like" operator (which uses '%' and '_'). Does not support escaping. *) -let sqlpat_of_shellglob = - let star_RE, qmark_RE, percent_RE, uscore_RE = - Pcre.regexp "\\*", Pcre.regexp "\\?", Pcre.regexp "%", Pcre.regexp "_" - in - fun shellglob -> - Pcre.replace ~rex:star_RE ~templ:"%" - (Pcre.replace ~rex:qmark_RE ~templ:"_" - (Pcre.replace ~rex:percent_RE ~templ:"\\%" - (Pcre.replace ~rex:uscore_RE ~templ:"\\_" - shellglob))) +module Constr = MetadataConstraints -let nonvar s = - let len = String.length s in - let suffix = String.sub s (len-4) 4 in - not (suffix = ".var") +exception Goal_is_not_an_equation -let locate ~(dbd:Mysql.dbd) ?(vars = false) pat = - let sql_pat = sqlpat_of_shellglob pat in - let query = - sprintf ("SELECT source FROM %s WHERE value LIKE \"%s\" UNION "^^ - "SELECT source FROM %s WHERE value LIKE \"%s\"") - (MetadataTypes.name_tbl ()) sql_pat - MetadataTypes.library_name_tbl sql_pat - in - let result = Mysql.exec dbd query in - List.filter nonvar - (Mysql.map result - (fun cols -> match cols.(0) with Some s -> s | _ -> assert false)) - -let match_term ~(dbd:Mysql.dbd) ty = -(* prerr_endline (CicPp.ppterm ty); *) - let metadata = MetadataExtractor.compute ~body:None ~ty in - let constants_no = - MetadataConstraints.StringSet.cardinal (MetadataConstraints.constants_of ty) - in - let full_card, diff = - if CicUtil.is_meta_closed ty then - Some (MetadataConstraints.Eq constants_no), None - else - let diff_no = - let (hyp_constants, concl_constants) = - (* collect different constants in hypotheses and conclusions *) - List.fold_left - (fun ((hyp, concl) as acc) metadata -> - match (metadata: MetadataTypes.metadata) with - | `Sort _ | `Rel _ -> acc - | `Obj (uri, `InConclusion) | `Obj (uri, `MainConclusion _) - when not (List.mem uri concl) -> (hyp, uri :: concl) - | `Obj (uri, `InHypothesis) | `Obj (uri, `MainHypothesis _) - when not (List.mem uri hyp) -> (uri :: hyp, concl) - | `Obj _ -> acc) - ([], []) - metadata - in - List.length hyp_constants - List.length concl_constants - in - let (concl_metas, hyp_metas) = MetadataExtractor.compute_metas ty in - let diff = - if MetadataExtractor.IntSet.equal concl_metas hyp_metas then - Some (MetadataConstraints.Eq diff_no) - else if MetadataExtractor.IntSet.subset concl_metas hyp_metas then - Some (MetadataConstraints.Gt (diff_no - 1)) - else if MetadataExtractor.IntSet.subset hyp_metas concl_metas then - Some (MetadataConstraints.Lt (diff_no + 1)) - else - None - in - None, diff - in - let constraints = List.map MetadataTypes.constr_of_metadata metadata in - Constr.at_least ~dbd ?full_card ?diff constraints +let debug = false +let debug_print s = if debug then prerr_endline (Lazy.force s) let ( ** ) x y = int_of_float ((float_of_int x) ** (float_of_int y)) @@ -111,16 +43,29 @@ let signature_of_hypothesis context = | None -> set | Some (_, Cic.Decl t) | Some (_, Cic.Def (t, _)) -> - Constr.StringSet.union set (Constr.constants_of t)) - Constr.StringSet.empty context + Constr.UriManagerSet.union set (Constr.constants_of t)) + Constr.UriManagerSet.empty context let intersect uris siguris = - let set1 = List.fold_right Constr.StringSet.add uris Constr.StringSet.empty in + let set1 = List.fold_right Constr.UriManagerSet.add uris Constr.UriManagerSet.empty in let set2 = - List.fold_right Constr.StringSet.add siguris Constr.StringSet.empty + List.fold_right Constr.UriManagerSet.add siguris Constr.UriManagerSet.empty in - let inter = Constr.StringSet.inter set1 set2 in - List.filter (fun s -> Constr.StringSet.mem s inter) uris + let inter = Constr.UriManagerSet.inter set1 set2 in + List.filter (fun s -> Constr.UriManagerSet.mem s inter) uris + +(* Profiling code +let at_most = + let profiler = CicUtil.profile "at_most" in + fun ~dbd ~where uri -> profiler.profile (Constr.at_most ~dbd ~where) uri + +let sigmatch = + let profiler = CicUtil.profile "sigmatch" in + fun ~dbd ~facts ~where signature -> + profiler.profile (MetadataConstraints.sigmatch ~dbd ~facts ~where) signature +*) +let at_most = Constr.at_most +let sigmatch = MetadataConstraints.sigmatch let filter_uris_forward ~dbd (main, constants) uris = let main_uris = @@ -129,14 +74,14 @@ let filter_uris_forward ~dbd (main, constants) uris = | Some (main, types) -> main :: types in let full_signature = - List.fold_right Constr.StringSet.add main_uris constants + List.fold_right Constr.UriManagerSet.add main_uris constants in - List.filter (Constr.at_most ~dbd ~where:`Statement full_signature) uris + List.filter (at_most ~dbd ~where:`Statement full_signature) uris let filter_uris_backward ~dbd ~facts signature uris = let siguris = List.map snd - (MetadataConstraints.sigmatch ~dbd ~facts ~where:`Statement signature) + (sigmatch ~dbd ~facts ~where:`Statement signature) in intersect uris siguris @@ -168,65 +113,6 @@ let compare_goal_list proof goal1 goal2 = in prop1 - prop2 -let hint ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) = - let (_, metasenv, _, _) = proof in - let (_, context, ty) = CicUtil.lookup_meta goal metasenv in - let (uris, (main, sig_constants)) = - match signature with - | Some signature -> (Constr.sigmatch ~dbd ~facts signature, signature) - | None -> (Constr.cmatch' ~dbd ~facts ty, Constr.signature_of ty) - in - let uris = List.filter nonvar (List.map snd uris) in - let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in - let types_constants = - match main with - | None -> Constr.StringSet.empty - | Some (main, types) -> - List.fold_right Constr.StringSet.add (main :: types) - Constr.StringSet.empty - in - let hyp_constants = - Constr.StringSet.diff (signature_of_hypothesis context) types_constants - in -(* Constr.StringSet.iter prerr_endline hyp_constants; *) - let other_constants = Constr.StringSet.union sig_constants hyp_constants in - let uris = - let pow = 2 ** (Constr.StringSet.cardinal other_constants) in - if ((List.length uris < pow) or (pow <= 0)) - then begin - prerr_endline "MetadataQuery: large sig, falling back to old method"; - filter_uris_forward ~dbd (main, other_constants) uris - end else - filter_uris_backward ~dbd ~facts (main, other_constants) uris - in - let rec aux = function - | [] -> [] - | uri :: tl -> - (let status' = - try - let (proof, goal_list) = -(* prerr_endline ("STO APPLICANDO " ^ uri); *) - PET.apply_tactic - (PrimitiveTactics.apply_tac - ~term:(CicUtil.term_of_uri uri)) - status - in - let goal_list = - List.stable_sort (compare_goal_list proof) goal_list - in - Some (uri, (proof, goal_list)) - with ProofEngineTypes.Fail _ -> None - in - match status' with - | None -> aux tl - | Some status' -> - status' :: aux tl) - in - List.stable_sort - (fun (_, (_, goals1)) (_, (_, goals2)) -> - Pervasives.compare (List.length goals1) (List.length goals2)) - (aux uris) - (* experimental_hint is a version of hint for experimental purposes. It uses auto_tac_verbose instead of auto tac. Auto_tac verbose also returns a substitution - for the moment @@ -237,44 +123,145 @@ let hint ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) = of the experimentation we shall make a choice. *) let close_with_types s metasenv context = - Constr.StringSet.fold + Constr.UriManagerSet.fold (fun e bag -> let t = CicUtil.term_of_uri e in let ty, _ = CicTypeChecker.type_of_aux' metasenv context t CicUniv.empty_ugraph in - Constr.StringSet.union bag (Constr.constants_of ty)) + Constr.UriManagerSet.union bag (Constr.constants_of ty)) s s +let close_with_constructors s metasenv context = + Constr.UriManagerSet.fold + (fun e bag -> + let t = CicUtil.term_of_uri e in + match t with + Cic.MutInd (uri,_,_) + | Cic.MutConstruct (uri,_,_,_) -> + (match fst (CicEnvironment.get_obj CicUniv.empty_ugraph uri) with + Cic.InductiveDefinition(tl,_,_,_) -> + snd + (List.fold_left + (fun (i,s) (_,_,_,cl) -> + let _,s = + List.fold_left + (fun (j,s) _ -> + let curi = UriManager.uri_of_uriref uri i (Some j) in + j+1,Constr.UriManagerSet.add curi s) (1,s) cl in + (i+1,s)) (0,bag) tl) + | _ -> assert false) + | _ -> bag) + s s + +(* Profiling code +let apply_tac_verbose = + let profiler = CicUtil.profile "apply_tac_verbose" in + fun ~term status -> profiler.profile (PrimitiveTactics.apply_tac_verbose ~term) status + +let sigmatch = + let profiler = CicUtil.profile "sigmatch" in + fun ~dbd ~facts ?(where=`Conclusion) signature -> profiler.profile (Constr.sigmatch ~dbd ~facts ~where) signature + +let cmatch' = + let profiler = CicUtil.profile "cmatch'" in + fun ~dbd ~facts signature -> profiler.profile (Constr.cmatch' ~dbd ~facts) signature +*) +let apply_tac_verbose = PrimitiveTactics.apply_tac_verbose +let cmatch' = Constr.cmatch' + +let signature_of_goal ~(dbd:HMysql.dbd) ((proof, goal) as _status) = + let (_, metasenv, _, _) = proof in + let (_, context, ty) = CicUtil.lookup_meta goal metasenv in + let main, sig_constants = Constr.signature_of ty in + let set = signature_of_hypothesis context in + let set = + match main with + None -> set + | Some (main,l) -> + List.fold_right Constr.UriManagerSet.add (main::l) set in + let set = Constr.UriManagerSet.union set sig_constants in + let all_constants_closed = close_with_types set metasenv context in + let uris = + sigmatch ~dbd ~facts:false ~where:`Statement (None,all_constants_closed) in + let uris = List.filter nonvar (List.map snd uris) in + let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in + uris + +let equations_for_goal ~(dbd:HMysql.dbd) ((proof, goal) as _status) = +(* let to_string set = + "{ " ^ + (String.concat ", " + (Constr.UriManagerSet.fold + (fun u l -> (UriManager.string_of_uri u)::l) set [])) + ^ " }" + in *) + let (_, metasenv, _, _) = proof in + let (_, context, ty) = CicUtil.lookup_meta goal metasenv in + let main, sig_constants = Constr.signature_of ty in +(* Printf.printf "\nsig_constants: %s\n\n" (to_string sig_constants); *) +(* match main with *) +(* None -> raise Goal_is_not_an_equation *) +(* | Some (m,l) -> *) + let m, l = + let eq_URI = + let us = UriManager.string_of_uri (LibraryObjects.eq_URI ()) in + UriManager.uri_of_string (us ^ "#xpointer(1/1)") + in + match main with + | None -> eq_URI, [] + | Some (m, l) when UriManager.eq m eq_URI -> m, l + | Some (m, l) -> eq_URI, [] + in + Printf.printf "\nSome (m, l): %s, [%s]\n\n" + (UriManager.string_of_uri m) + (String.concat "; " (List.map UriManager.string_of_uri l)); + (* if m == UriManager.uri_of_string HelmLibraryObjects.Logic.eq_XURI then ( *) + let set = signature_of_hypothesis context in + (* Printf.printf "\nsignature_of_hypothesis: %s\n\n" (to_string set); *) + let set = Constr.UriManagerSet.union set sig_constants in + let set = close_with_types set metasenv context in + (* Printf.printf "\ndopo close_with_types: %s\n\n" (to_string set); *) + let set = close_with_constructors set metasenv context in + (* Printf.printf "\ndopo close_with_constructors: %s\n\n" (to_string set); *) + let set = List.fold_right Constr.UriManagerSet.remove (m::l) set in + let uris = + sigmatch ~dbd ~facts:false ~where:`Statement (main,set) in + let uris = List.filter nonvar (List.map snd uris) in + let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in + uris + (* ) *) + (* else raise Goal_is_not_an_equation *) + let experimental_hint - ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) = + ~(dbd:HMysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) = let (_, metasenv, _, _) = proof in let (_, context, ty) = CicUtil.lookup_meta goal metasenv in let (uris, (main, sig_constants)) = match signature with | Some signature -> - (Constr.sigmatch ~dbd ~facts signature, signature) + (sigmatch ~dbd ~facts signature, signature) | None -> - (Constr.cmatch' ~dbd ~facts ty, Constr.signature_of ty) - in + (cmatch' ~dbd ~facts ty, Constr.signature_of ty) + in let uris = List.filter nonvar (List.map snd uris) in let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in let types_constants = match main with - | None -> Constr.StringSet.empty + | None -> Constr.UriManagerSet.empty | Some (main, types) -> - List.fold_right Constr.StringSet.add (main :: types) - Constr.StringSet.empty + List.fold_right Constr.UriManagerSet.add (main :: types) + Constr.UriManagerSet.empty in let all_constants = let hyp_and_sug = - Constr.StringSet.union + Constr.UriManagerSet.union (signature_of_hypothesis context) sig_constants in let main = match main with - | None -> Constr.StringSet.empty + | None -> Constr.UriManagerSet.empty | Some (main,_) -> let ty, _ = CicTypeChecker.type_of_aux' @@ -282,33 +269,34 @@ let experimental_hint in Constr.constants_of ty in - Constr.StringSet.union main hyp_and_sug + Constr.UriManagerSet.union main hyp_and_sug in +(* Constr.UriManagerSet.iter debug_print hyp_constants; *) let all_constants_closed = close_with_types all_constants metasenv context in let other_constants = - Constr.StringSet.diff all_constants_closed types_constants + Constr.UriManagerSet.diff all_constants_closed types_constants in - prerr_endline "all_constants_closed"; - Constr.StringSet.iter prerr_endline all_constants_closed; - prerr_endline "other_constants"; - Constr.StringSet.iter prerr_endline other_constants; + debug_print (lazy "all_constants_closed"); + if debug then Constr.UriManagerSet.iter (fun s -> debug_print (lazy (UriManager.string_of_uri s))) all_constants_closed; + debug_print (lazy "other_constants"); + if debug then Constr.UriManagerSet.iter (fun s -> debug_print (lazy (UriManager.string_of_uri s))) other_constants; let uris = - let pow = 2 ** (Constr.StringSet.cardinal other_constants) in + let pow = 2 ** (Constr.UriManagerSet.cardinal other_constants) in if ((List.length uris < pow) or (pow <= 0)) then begin - prerr_endline "MetadataQuery: large sig, falling back to old method"; + debug_print (lazy "MetadataQuery: large sig, falling back to old method"); filter_uris_forward ~dbd (main, other_constants) uris end else filter_uris_backward ~dbd ~facts (main, other_constants) uris - in + in let rec aux = function | [] -> [] | uri :: tl -> (let status' = try let (subst,(proof, goal_list)) = - (* prerr_endline ("STO APPLICANDO" ^ uri); *) - PrimitiveTactics.apply_tac_verbose + (* debug_print (lazy ("STO APPLICANDO" ^ uri)); *) + apply_tac_verbose ~term:(CicUtil.term_of_uri uri) status in @@ -327,13 +315,51 @@ let experimental_hint Pervasives.compare (List.length goals1) (List.length goals2)) (aux uris) -let elim ~dbd uri = - let constraints = - [`Rel [`MainConclusion None]; - `Sort (Cic.Prop,[`MainHypothesis (Some 1)]); - `Obj (uri,[`MainHypothesis (Some 0)]); - `Obj (uri,[`InHypothesis]); - ] +let new_experimental_hint + ~(dbd:HMysql.dbd) ?(facts=false) ?signature ~universe + ((proof, goal) as status) += + let (_, metasenv, _, _) = proof in + let (_, context, ty) = CicUtil.lookup_meta goal metasenv in + let (uris, (main, sig_constants)) = + match signature with + | Some signature -> + (sigmatch ~dbd ~facts signature, signature) + | None -> + (cmatch' ~dbd ~facts ty, Constr.signature_of ty) in + let universe = + List.fold_left + (fun res u -> Constr.UriManagerSet.add u res) + Constr.UriManagerSet.empty universe in + let uris = + List.fold_left + (fun res (_,u) -> Constr.UriManagerSet.add u res) + Constr.UriManagerSet.empty uris in + let uris = Constr.UriManagerSet.inter uris universe in + let uris = Constr.UriManagerSet.elements uris in + let rec aux = function + | [] -> [] + | uri :: tl -> + (let status' = + try + let (subst,(proof, goal_list)) = + (* debug_print (lazy ("STO APPLICANDO" ^ uri)); *) + apply_tac_verbose + ~term:(CicUtil.term_of_uri uri) + status + in + let goal_list = + List.stable_sort (compare_goal_list proof) goal_list + in + Some (uri, (subst,(proof, goal_list))) + with ProofEngineTypes.Fail _ -> None + in + match status' with + | None -> aux tl + | Some status' -> status' :: aux tl) in - MetadataConstraints.at_least ~rating:`Hits ~dbd constraints + List.stable_sort + (fun (_,(_, (_, goals1))) (_,(_, (_, goals2))) -> + Pervasives.compare (List.length goals1) (List.length goals2)) + (aux uris)