X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Ftactics%2FmetadataQuery.ml;h=eaa146ed1d9cd71178fbc29c087a043529e17a9a;hb=4167cea65ca58897d1a3dbb81ff95de5074700cc;hp=9f0cff9ad305696fc1f3ba6d5e33e4d8c009ee3a;hpb=d2d0007efa611a000b37ad6583f1052a023b9e19;p=helm.git diff --git a/helm/ocaml/tactics/metadataQuery.ml b/helm/ocaml/tactics/metadataQuery.ml index 9f0cff9ad..eaa146ed1 100644 --- a/helm/ocaml/tactics/metadataQuery.ml +++ b/helm/ocaml/tactics/metadataQuery.ml @@ -30,7 +30,8 @@ module PET = ProofEngineTypes exception Goal_is_not_an_equation -let debug_print = fun _ -> () +let debug = false +let debug_print s = if debug then prerr_endline (Lazy.force s) (** maps a shell like pattern (which uses '*' and '?') to a sql pattern for * the "like" operator (which uses '%' and '_'). Does not support escaping. *) @@ -47,7 +48,7 @@ let sqlpat_of_shellglob = let nonvar uri = not (UriManager.uri_is_var uri) -let locate ~(dbd:Mysql.dbd) ?(vars = false) pat = +let locate ~(dbd:HMysql.dbd) ?(vars = false) pat = let sql_pat = sqlpat_of_shellglob pat in let query = sprintf ("SELECT source FROM %s WHERE value LIKE \"%s\" UNION "^^ @@ -55,13 +56,13 @@ let locate ~(dbd:Mysql.dbd) ?(vars = false) pat = (MetadataTypes.name_tbl ()) sql_pat MetadataTypes.library_name_tbl sql_pat in - let result = Mysql.exec dbd query in + let result = HMysql.exec dbd query in List.filter nonvar - (Mysql.map result + (HMysql.map result (fun cols -> match cols.(0) with Some s -> UriManager.uri_of_string s | _ -> assert false)) -let match_term ~(dbd:Mysql.dbd) ty = -(* debug_print (CicPp.ppterm ty); *) +let match_term ~(dbd:HMysql.dbd) ty = +(* debug_print (lazy (CicPp.ppterm ty)); *) let metadata = MetadataExtractor.compute ~body:None ~ty in let constants_no = MetadataConstraints.UriManagerSet.cardinal (MetadataConstraints.constants_of ty) @@ -123,14 +124,16 @@ let intersect uris siguris = 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 (Constr.at_most ~dbd ~where) uri + 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 (MetadataConstraints.sigmatch ~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 = @@ -219,19 +222,21 @@ let close_with_constructors s metasenv context = | _ -> bag) s s +(* Profiling code let apply_tac_verbose = let profiler = CicUtil.profile "apply_tac_verbose" in - fun ~term status -> profiler (PrimitiveTactics.apply_tac_verbose ~term) status + 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 (Constr.sigmatch ~dbd ~facts ~where) signature + 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 (Constr.cmatch' ~dbd ~facts) signature + 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:Mysql.dbd) ((proof, goal) as status) = +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 @@ -249,28 +254,53 @@ let signature_of_goal ~(dbd:Mysql.dbd) ((proof, goal) as status) = let uris = List.filter Hashtbl_equiv.not_a_duplicate uris in uris -let equations_for_goal ~(dbd:Mysql.dbd) ((proof, goal) as status) = +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 - match main with - None -> raise Goal_is_not_an_equation - | Some (m,l) -> - if m == UriManager.uri_of_string HelmLibraryObjects.Logic.eq_XURI then - let set = signature_of_hypothesis context in - let set = Constr.UriManagerSet.union set sig_constants in - let set = close_with_types set metasenv context in - let set = close_with_constructors set metasenv context in - 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 +(* 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)) = @@ -312,15 +342,15 @@ let experimental_hint let other_constants = Constr.UriManagerSet.diff all_constants_closed types_constants in - debug_print "all_constants_closed"; - Constr.UriManagerSet.iter debug_print all_constants_closed; - debug_print "other_constants"; - Constr.UriManagerSet.iter debug_print 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.UriManagerSet.cardinal other_constants) in if ((List.length uris < pow) or (pow <= 0)) then begin - debug_print "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 @@ -331,7 +361,7 @@ let experimental_hint (let status' = try let (subst,(proof, goal_list)) = - (* debug_print ("STO APPLICANDO" ^ uri); *) + (* debug_print (lazy ("STO APPLICANDO" ^ uri)); *) apply_tac_verbose ~term:(CicUtil.term_of_uri uri) status @@ -352,7 +382,7 @@ let experimental_hint (aux uris) let new_experimental_hint - ~(dbd:Mysql.dbd) ?(facts=false) ?signature ~universe + ~(dbd:HMysql.dbd) ?(facts=false) ?signature ~universe ((proof, goal) as status) = let (_, metasenv, _, _) = proof in @@ -379,7 +409,7 @@ let new_experimental_hint (let status' = try let (subst,(proof, goal_list)) = - (* debug_print ("STO APPLICANDO" ^ uri); *) + (* debug_print (lazy ("STO APPLICANDO" ^ uri)); *) apply_tac_verbose ~term:(CicUtil.term_of_uri uri) status @@ -429,7 +459,7 @@ let instance ~dbd t = (* List.iter (fun x -> debug_print - (MetadataPp.pp_constr (MetadataTypes.constr_of_metadata x))) + (lazy (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 @@ -451,7 +481,7 @@ let instance ~dbd t = in match (look_for_dummy_main metadata) with | None-> -(* debug_print "Caso None"; *) +(* debug_print (lazy "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 @@ -461,7 +491,7 @@ let instance ~dbd t = Constr.at_least ~dbd ?concl_card ?full_card ?diff constraints | Some (depth, dummy_type) -> (* debug_print - (sprintf "Caso Some %d %s" depth (CicPp.ppterm dummy_type)); *) + (lazy (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 @@ -578,10 +608,10 @@ let fwd_simpl ~dbd t = let from = "genLemma" in let where = Printf.sprintf "h_outer = \"%s\"" - (Mysql.escape (UriManager.string_of_uri outer)) in + (HMysql.escape (UriManager.string_of_uri outer)) in let query = Printf.sprintf "SELECT %s FROM %s WHERE %s" select from where in - let result = Mysql.exec dbd query in - let lemmas = Mysql.map ~f:(map inners) result in + let result = HMysql.exec dbd query in + let lemmas = HMysql.map ~f:(map inners) result in let ranked = List.fold_left rank [] lemmas in let ordered = List.rev (List.fast_sort compare ranked) in map_filter filter 0 ordered @@ -599,5 +629,5 @@ let decomposables ~dbd = in let select, from = "source", "decomposables" in let query = Printf.sprintf "SELECT %s FROM %s" select from in - let decomposables = Mysql.map ~f:map (Mysql.exec dbd query) in + let decomposables = HMysql.map ~f:map (HMysql.exec dbd query) in map_filter (fun _ x -> x) 0 decomposables