X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Futils.ml;h=072d64f66cd76b785c2585d7469b014739d1fd40;hb=0e6ba9d1134a3bfe9fd4d5b4495faf0811a216df;hp=babf684bf97ea27a42c4623603960565fee5d4be;hpb=ba450938c248342c5a716365d57bb133f2fa98ce;p=helm.git

diff --git a/helm/software/components/tactics/paramodulation/utils.ml b/helm/software/components/tactics/paramodulation/utils.ml
index babf684bf..072d64f66 100644
--- a/helm/software/components/tactics/paramodulation/utils.ml
+++ b/helm/software/components/tactics/paramodulation/utils.ml
@@ -41,8 +41,6 @@ let print_metasenv metasenv =
 ;;
 
 
-
-
 let print_subst ?(prefix="\n") subst =
     String.concat prefix
      (List.map
@@ -62,6 +60,8 @@ let string_of_comparison = function
   | Eq -> "="
   | Incomparable -> "I"
 
+type environment = Cic.metasenv * Cic.context * CicUniv.universe_graph
+
 module OrderedTerm =
 struct
   type t = Cic.term
@@ -292,6 +292,29 @@ end
 
 module IntSet = Set.Make(OrderedInt)
 
+let compute_equality_weight (ty,left,right,o) =
+  let factor = 2 in
+  match o with
+    | Lt -> 
+	let w, m = (weight_of_term 
+	       ~consider_metas:true ~count_metas_occurrences:false right) in
+	  w + (factor * (List.length m)) ;
+    | Le -> assert false
+    | Gt -> 
+	let w, m = (weight_of_term 
+	       ~consider_metas:true ~count_metas_occurrences:false left) in
+	  w + (factor * (List.length m)) ;
+  | Ge -> assert false
+  | Eq 
+  | Incomparable -> 
+      let w1, m1 = (weight_of_term 
+	       ~consider_metas:true ~count_metas_occurrences:false right) in
+      let w2, m2 = (weight_of_term 
+	       ~consider_metas:true ~count_metas_occurrences:false left) in
+      w1 + w2 + (factor * (List.length m1)) + (factor * (List.length m2))
+;;
+
+(* old
 let compute_equality_weight (ty,left,right,o) =
   let metasw = ref 0 in
   let weight_of t =
@@ -306,7 +329,7 @@ let compute_equality_weight (ty,left,right,o) =
   (* let w = weight_of (Cic.Appl [ty;left;right]) in *)
   w + !metasw
 ;;
-
+*)
 
 (* returns a "normalized" version of the polynomial weight wl (with type
  * weight list), i.e. a list sorted ascending by meta number,
@@ -406,7 +429,6 @@ let compare_weights ?(normalize=false)
   | (m, _, n) when m > 0 && n > 0 ->
       Incomparable
   | _ -> assert false 
-
 ;;
 
 
@@ -710,3 +732,8 @@ let eq_XURI () =
   let s = UriManager.string_of_uri (LibraryObjects.eq_URI ()) in
   UriManager.uri_of_string (s ^ "#xpointer(1/1/1)")
 let trans_eq_URI () = LibraryObjects.trans_eq_URI ~eq:(LibraryObjects.eq_URI ())
+
+let metas_of_term t = 
+  List.map fst (CicUtil.metas_of_term t)
+;;
+