X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Focaml%2Ftactics%2FmetadataQuery.ml;h=c1dd20ecc83badb808fb8e303b7feec3d701bbbf;hb=c0f06261e5626228e4681de9973b6412524f09a2;hp=fc5328e9ffa3c252267d44b77e2d1b21614a02ac;hpb=72232ba3f75b569d20c8c1af9907740a47c860da;p=helm.git

diff --git a/helm/ocaml/tactics/metadataQuery.ml b/helm/ocaml/tactics/metadataQuery.ml
index fc5328e9f..c1dd20ecc 100644
--- a/helm/ocaml/tactics/metadataQuery.ml
+++ b/helm/ocaml/tactics/metadataQuery.ml
@@ -28,6 +28,8 @@ open Printf
 module Constr = MetadataConstraints
 module PET = ProofEngineTypes 
 
+let debug_print = fun _ -> ()
+
   (** 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 =
@@ -42,6 +44,7 @@ let sqlpat_of_shellglob =
             shellglob)))
 
 let nonvar s =
+  let s = UriManager.string_of_uri s in
   let len = String.length s in
   let suffix = String.sub s (len-4) 4 in
   not (suffix  = ".var")
@@ -57,13 +60,13 @@ let locate ~(dbd:Mysql.dbd) ?(vars = false) pat =
   let result = Mysql.exec dbd query in
   List.filter nonvar
     (Mysql.map result
-      (fun cols -> match cols.(0) with Some s -> s | _ -> assert false))
+      (fun cols -> match cols.(0) with Some s -> UriManager.uri_of_string s | _ -> assert false))
 
 let match_term ~(dbd:Mysql.dbd) ty =
-(*   prerr_endline (CicPp.ppterm ty); *)
+(*   debug_print (CicPp.ppterm ty); *)
   let metadata = MetadataExtractor.compute ~body:None ~ty in
   let constants_no =
-    MetadataConstraints.StringSet.cardinal (MetadataConstraints.constants_of ty)
+    MetadataConstraints.UriManagerSet.cardinal (MetadataConstraints.constants_of ty)
   in
   let full_card, diff =
     if CicUtil.is_meta_closed ty then
@@ -111,16 +114,16 @@ 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
 
 let filter_uris_forward ~dbd (main, constants) uris =
   let main_uris =
@@ -129,7 +132,7 @@ 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
 
@@ -180,21 +183,21 @@ let hint ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) =
   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 hyp_constants =
-    Constr.StringSet.diff (signature_of_hypothesis context) types_constants
+    Constr.UriManagerSet.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
+(* Constr.UriManagerSet.iter debug_print hyp_constants; *)
+  let other_constants = Constr.UriManagerSet.union sig_constants hyp_constants in
   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 "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
@@ -205,7 +208,7 @@ let hint ~(dbd:Mysql.dbd) ?(facts=false) ?signature ((proof, goal) as status) =
         (let status' =
             try
               let (proof, goal_list) =
-(*                prerr_endline ("STO APPLICANDO " ^ uri); *)
+(*                debug_print ("STO APPLICANDO " ^ uri); *)
 		PET.apply_tactic
                   (PrimitiveTactics.apply_tac
 		    ~term:(CicUtil.term_of_uri uri))
@@ -237,13 +240,13 @@ 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 experimental_hint 
@@ -261,20 +264,20 @@ let experimental_hint
   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,22 +285,22 @@ 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.StringSet.iter prerr_endline hyp_constants; *)
+(* 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 "all_constants_closed";
+  Constr.UriManagerSet.iter debug_print all_constants_closed;
+  debug_print "other_constants";
+  Constr.UriManagerSet.iter debug_print 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 "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
@@ -308,7 +311,7 @@ let experimental_hint
         (let status' =
             try
               let (subst,(proof, goal_list)) =
-                  (* prerr_endline ("STO APPLICANDO" ^ uri); *)
+                  (* debug_print ("STO APPLICANDO" ^ uri); *)
                   PrimitiveTactics.apply_tac_verbose 
 		    ~term:(CicUtil.term_of_uri uri)
                   status
@@ -357,20 +360,21 @@ let instance ~dbd t =
   let metadata = MetadataExtractor.compute ~body:None ~ty:t' in
 (*   List.iter 
     (fun x -> 
-       prerr_endline 
+       debug_print 
          (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 is_dummy = function
-    | `Obj(s, _) -> (String.sub s 0 10) <> "cic:/dummy" 
+    | `Obj(s, _) -> (String.sub (UriManager.string_of_uri s) 0 10) <> "cic:/dummy" 
 	  | _ -> true 
   in
   let rec look_for_dummy_main = function
 	  | [] -> None
     | `Obj(s,`MainConclusion (Some (MetadataTypes.Eq d)))::_ 
-      when ((String.sub s 0 10) = "cic:/dummy") -> 
+      when (String.sub (UriManager.string_of_uri s) 0 10 = "cic:/dummy") -> 
+      let s = UriManager.string_of_uri s in
       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
@@ -379,7 +383,7 @@ let instance ~dbd t =
   in
   match (look_for_dummy_main metadata) with
     | None->
-(*         prerr_endline "Caso None"; *)
+(*         debug_print "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
@@ -388,7 +392,7 @@ let instance ~dbd t =
         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 
+(*         debug_print 
           (sprintf "Caso Some %d %s" depth (CicPp.ppterm dummy_type)); *)
         (* a dummy in main position *)
         let metadata_for_dummy_type = 
@@ -442,4 +446,73 @@ let instance ~dbd t =
             (n,from,where) constraints_for_dummy_type in
         Constr.exec ~dbd (m,from,where)
 
+(* fwd_simpl ****************************************************************)
+
+let rec map_filter f n = function
+   | []       -> []
+   | hd :: tl -> 
+      match f n hd with
+         | None    -> map_filter f (succ n) tl
+	 | Some hd -> hd :: map_filter f (succ n) tl
+
+let get_uri t =
+   let aux = function
+      | Cic.Appl (hd :: tl) -> Some (CicUtil.uri_of_term hd, tl)
+      | hd                  -> Some (CicUtil.uri_of_term hd, []) 
+   in
+   try aux t with
+      | Invalid_argument "uri_of_term" -> None
+
+let get_metadata t =
+   let f n t =
+      match get_uri t with
+         | None          -> None 
+	 | Some (uri, _) -> Some (n, uri)
+   in
+   match get_uri t with
+      | None             -> None
+      | Some (uri, args) -> Some (uri, map_filter f 1 args) 
+
+let debug_metadata = function
+   | None                 -> ()
+   | Some (outer, inners) -> 
+      let f (n, uri) = Printf.eprintf "%s: %i %s\n" "fwd" n uri in
+      Printf.eprintf "\n%s: %s\n" "fwd" outer;
+      List.iter f inners; prerr_newline ()
 
+let fwd_simpl ~dbd t =
+   let map inners row = 
+      match row.(0), row.(1), row.(2) with  
+         | Some source, Some inner, Some index -> 
+	    source,
+             List.mem
+              (int_of_string index, (UriManager.uri_of_string inner)) inners
+	 | _                                   -> "", false
+   in
+   let rec rank ranks (source, ok) = 
+      match ranks, ok with
+         | [], false                               -> [source, 0]
+	 | [], true                                -> [source, 1]
+	 | (uri, i) :: tl, false when uri = source -> (uri, 0) :: tl
+	 | (uri, 0) :: tl, true when uri = source  -> (uri, 0) :: tl
+	 | (uri, i) :: tl, true when uri = source  -> (uri, succ i) :: tl
+	 | hd :: tl, _ -> hd :: rank tl (source, ok)
+   in
+   let compare (_, x) (_, y) = compare x y in
+   let filter n (uri, rank) =
+      if rank > 0 then Some (UriManager.uri_of_string uri) else None
+   in   
+   match get_metadata t with
+      | None                 -> []
+      | Some (outer, inners) ->
+         let select = "source, h_inner, h_index" in
+	 let from = "genLemma" in
+	 let where =
+          Printf.sprintf "h_outer = \"%s\""
+           (Mysql.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 result ~f:(map inners) in
+	 let ranked = List.fold_left rank [] lemmas in
+	 let ordered = List.rev (List.fast_sort compare ranked) in
+	 map_filter filter 0 ordered