X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic%2FcicUniv.ml;h=8ae118c9b1bb5ecf1d4c656ffcfb2bfb4ba15c86;hb=2b2b90087f836c2f32291935216549e9370e68c3;hp=cfcbaf74178d2a2839d64b4bfede2e52abee19e3;hpb=ab3b24a72b2da55047bed40d6de48578cb87cd8a;p=helm.git

diff --git a/helm/ocaml/cic/cicUniv.ml b/helm/ocaml/cic/cicUniv.ml
index cfcbaf741..8ae118c9b 100644
--- a/helm/ocaml/cic/cicUniv.ml
+++ b/helm/ocaml/cic/cicUniv.ml
@@ -135,21 +135,6 @@ let string_of_mal m =
 let string_of_bag b = 
   string_of_mal b
 
-(*****************************************************************************)
-(** Helpers                                                                 **)
-(*****************************************************************************)
-
-(* find the repr *)
-let repr u m =
-  try 
-    MAL.find u m
-  with
-    Not_found -> empty_entry
-    
-(* FIXME: May be faster if we make it by hand *)
-let merge_closures f nodes m =  
-  SOF.fold (fun x i -> SOF.union (f (repr x m)) i ) nodes SOF.empty
-
 (*****************************************************************************)
 (** Benchmarking                                                            **)
 (*****************************************************************************)
@@ -169,7 +154,23 @@ let end_spending () =
     partial := 0.0;
     time_spent := !time_spent +. interval
 ;;
-  
+
+
+(*****************************************************************************)
+(** Helpers                                                                 **)
+(*****************************************************************************)
+
+(* find the repr *)
+let repr u m =
+  try 
+    MAL.find u m
+  with
+    Not_found -> empty_entry
+    
+(* FIXME: May be faster if we make it by hand *)
+let merge_closures f nodes m =  
+  SOF.fold (fun x i -> SOF.union (f (repr x m)) i ) nodes SOF.empty
+
 
 (*****************************************************************************)
 (** _fats implementation                                                    **)
@@ -413,7 +414,7 @@ let error arc node1 closure_type node2 closure =
   raise (UniverseInconsistency s)
 
 
-let fill_empty_nodes_with_uri g l uri =
+let fill_empty_nodes_with_uri (g, already_contained) l uri =
   let fill_empty_universe u =
     match u with
         (i,None) -> (i,Some uri)
@@ -437,16 +438,17 @@ let fill_empty_nodes_with_uri g l uri =
       MAL.add (fill_empty_universe k) (fill_empty_entry v) m) m MAL.empty
   in
   let l' = List.map fill_empty_universe l in
-    m',l'
+    (m', already_contained),l'
 
 
 (*****************************************************************************)
 (** World interface                                                         **)
 (*****************************************************************************)
 
-type universe_graph = bag
+type universe_graph = bag * UriManager.UriSet.t 
+(* the graph , the cache of already merged ugraphs *)
 
-let empty_ugraph = empty_bag
+let empty_ugraph = empty_bag, UriManager.UriSet.empty
 
 let current_index_anon = ref (-1)
 let current_index_named = ref (-1)
@@ -472,7 +474,7 @@ let name_universe u uri =
   | (i, None) -> (i, Some uri)
   | _ -> u
   
-let print_ugraph g = 
+let print_ugraph (g, _) = 
   prerr_endline (string_of_bag g)
 
 let add_eq ?(fast=(!fast_implementation)) u v b =
@@ -531,54 +533,77 @@ let add_gt ?(fast=(!fast_implementation)) u v b =
 (** START: Decomment this for performance comparisons                       **)
 (*****************************************************************************)
 
-let add_eq ?(fast=(!fast_implementation))  u v b =
+let add_eq ?(fast=(!fast_implementation))  u v (b,already_contained) =
+  (*prerr_endline "add_eq";*)
   begin_spending ();
   let rc = add_eq ~fast u v b in
-    end_spending();
-    rc
+  end_spending ();
+    rc,already_contained
 
-let add_ge ?(fast=(!fast_implementation)) u v b =
+let add_ge ?(fast=(!fast_implementation)) u v (b,already_contained) =
+(*   prerr_endline "add_ge"; *)
   begin_spending ();
   let rc = add_ge ~fast u v b in
- end_spending();
-    rc
+  end_spending ();
+    rc,already_contained
     
-let add_gt ?(fast=(!fast_implementation)) u v b =
+let add_gt ?(fast=(!fast_implementation)) u v (b,already_contained) =
+(*   prerr_endline "add_gt"; *)
   begin_spending ();
   let rc = add_gt ~fast u v b in
-    end_spending();
-    rc
+  end_spending ();
+    rc,already_contained
+    
+let profiler_eq = HExtlib.profile "CicUniv.add_eq"
+let profiler_ge = HExtlib.profile "CicUniv.add_ge"
+let profiler_gt = HExtlib.profile "CicUniv.add_gt"
+let add_gt ?fast u v b = 
+  profiler_gt.HExtlib.profile (fun _ -> add_gt ?fast u v b) ()
+let add_ge ?fast u v b = 
+  profiler_ge.HExtlib.profile (fun _ -> add_ge ?fast u v b) ()
+let add_eq ?fast u v b = 
+  profiler_eq.HExtlib.profile (fun _ -> add_eq ?fast u v b) ()
 
 (*****************************************************************************)
 (** END: Decomment this for performance comparisons                         **)
 (*****************************************************************************)
 
-let merge_ugraphs u v =
-  (* this sucks *)
-  let merge_brutal u v =
-    if u = empty_bag then v 
-    else if v = empty_bag then u 
-    else
-      let m1 = u in 
-      let m2 = v in 
-        MAL.fold (
-          fun k v x -> 
-            (SOF.fold (
-               fun u x -> 
-                 let m = add_gt k u x in m) 
-                  (SOF.union v.one_s_gt v.gt_closure)
-               (SOF.fold (
-                  fun u x -> 
-                    let m = add_ge k u x in m) 
-                      (SOF.union v.one_s_ge v.ge_closure)
-                  (SOF.fold (
-                     fun u x ->
-                       let m = add_eq k u x in m) 
-                        (SOF.union v.one_s_eq v.eq_closure) x)))
-        ) m1 m2
+let merge_ugraphs ~base_ugraph ~increment:(increment, uri_of_increment) =
+  let merge_brutal (u,_) v =
+    let m1 = u in 
+    let m2 = v in 
+      MAL.fold (
+        fun k v x -> 
+          (SOF.fold (
+             fun u x -> 
+               let m = add_gt k u x in m) 
+                (SOF.union v.one_s_gt v.gt_closure)
+             (SOF.fold (
+                fun u x -> 
+                  let m = add_ge k u x in m) 
+                    (SOF.union v.one_s_ge v.ge_closure)
+                (SOF.fold (
+                   fun u x ->
+                     let m = add_eq k u x in m) 
+                      (SOF.union v.one_s_eq v.eq_closure) x)))
+          ) m1 m2
   in
-  merge_brutal v u
+  let base, already_contained = base_ugraph in
+  if MAL.is_empty base then
+    increment
+  else if 
+    MAL.is_empty (fst increment) || 
+    UriManager.UriSet.mem uri_of_increment already_contained 
+  then
+    base_ugraph
+  else
+    fst (merge_brutal increment base_ugraph), 
+    UriManager.UriSet.add uri_of_increment already_contained
 
+let profiler_merge = HExtlib.profile "CicUniv.merge_graphs"
+let merge_ugraphs ~base_ugraph ~increment =
+  profiler_merge.HExtlib.profile 
+  (fun _ -> merge_ugraphs ~base_ugraph ~increment) ()
 
 (*****************************************************************************)
 (** Xml sesialization and parsing                                           **)
@@ -631,7 +656,7 @@ let xml_of_entry u e =
   let content = xml_of_entry_content e in
   ent content
 
-let write_xml_of_ugraph filename m l =
+let write_xml_of_ugraph filename (m,_) l =
     let tokens = 
       [< 
         Xml.xml_cdata "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\n";
@@ -645,7 +670,7 @@ let write_xml_of_ugraph filename m l =
 let univno = fst
 
  
-let rec clean_ugraph m f =
+let rec clean_ugraph (m,already_contained) f =
   let m' = 
     MAL.fold (fun k v x -> if (f k) then MAL.add k v x else x ) m MAL.empty in
   let m'' =  MAL.fold (fun k v x -> 
@@ -665,11 +690,13 @@ let rec clean_ugraph m f =
       k::l end else l) m'' []
   in
     if e_l != [] then
-      clean_ugraph m'' (fun u -> (f u) && not (List.mem u e_l))
+      clean_ugraph 
+        (m'', already_contained) (fun u -> (f u) && not (List.mem u e_l))
     else
       MAL.fold 
         (fun k v x -> if v <> empty_entry then MAL.add k v x else x) 
-      m'' MAL.empty
+        m'' MAL.empty,
+      already_contained
 
 let clean_ugraph g l =
   clean_ugraph g (fun u -> List.mem u l)
@@ -729,7 +756,7 @@ let ugraph_and_univlist_of_xml filename =
   let xml_source = `Gzip_file filename in
   (try XPP.parse xml_parser xml_source
    with (XPP.Parse_error err) as exn -> raise exn);
-  !result_map, !result_list
+  (!result_map,UriManager.UriSet.empty), !result_list
 
 
 (*****************************************************************************)
@@ -901,18 +928,24 @@ let recons_entry entry =
     one_s_gt = recons_set entry.one_s_gt;
   }
 
-let recons_graph graph =
+let recons_graph (graph,uriset) =
   MAL.fold
     (fun universe entry map ->
       MAL.add (recons_univ universe) (recons_entry entry) map)
-    graph MAL.empty
+    graph 
+    MAL.empty,
+  UriManager.UriSet.fold 
+    (fun u acc -> 
+      UriManager.UriSet.add 
+        (UriManager.uri_of_string (UriManager.string_of_uri u)) acc) 
+    uriset UriManager.UriSet.empty 
 
 let assert_univ u =
     match u with 
     | (_,None) -> raise (UniverseInconsistency "This universe graph has a hole")
     | _ -> ()
     
-let assert_univs_have_uri graph univlist =
+let assert_univs_have_uri (graph,_) univlist =
   let assert_set s =
     SOF.iter (fun u -> assert_univ u) s
   in