X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Futils.ml;h=542c2dd77d26e6c6bae42937abd63d9fc2257a72;hb=e31bb143e3a303321e509f415764338849b7e516;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..542c2dd77 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
@@ -103,6 +103,13 @@ let metas_of_term term =
   aux term
 ;;
 
+let rec remove_local_context =
+  function
+    | Cic.Meta (i,_) -> Cic.Meta (i,[])
+    | Cic.Appl l ->
+       Cic.Appl(List.map remove_local_context l)
+    | t -> t 
+
 
 (************************* rpo ********************************)
 let number = [
@@ -292,6 +299,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 +336,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 +436,6 @@ let compare_weights ?(normalize=false)
   | (m, _, n) when m > 0 && n > 0 ->
       Incomparable
   | _ -> assert false 
-
 ;;
 
 
@@ -702,11 +731,7 @@ let string_of_pos = function
   | Right -> "Right"
 ;;
 
+let metas_of_term t = 
+  List.map fst (CicUtil.metas_of_term t)
+;;
 
-let eq_ind_URI () = LibraryObjects.eq_ind_URI ~eq:(LibraryObjects.eq_URI ())
-let eq_ind_r_URI () = LibraryObjects.eq_ind_r_URI ~eq:(LibraryObjects.eq_URI ())
-let sym_eq_URI () = LibraryObjects.sym_eq_URI ~eq:(LibraryObjects.eq_URI ())
-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 ())