X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=components%2Ftactics%2Fparamodulation%2Futils.ml;h=6ac2132aaa8f203a945982c3f4ecb913868199f9;hb=de74308340f4f94763b34e2f0b8d404886d109c2;hp=a25ba8e2d7cda49cb9ac8cfede5cb14ea2aef99d;hpb=dd5b7e474d70a87846f977f887d045f77342ae62;p=helm.git

diff --git a/components/tactics/paramodulation/utils.ml b/components/tactics/paramodulation/utils.ml
index a25ba8e2d..6ac2132aa 100644
--- a/components/tactics/paramodulation/utils.ml
+++ b/components/tactics/paramodulation/utils.ml
@@ -299,6 +299,29 @@ end
 
 module IntSet = Set.Make(OrderedInt)
 
+let goal_symbols = ref TermSet.empty
+
+let set_of_map m = 
+  TermMap.fold (fun k _ s -> TermSet.add k s) m TermSet.empty
+;;
+
+let set_goal_symbols term = 
+  let m = symbols_of_term term in
+  goal_symbols := (set_of_map m)
+;;
+
+let symbols_of_eq (ty,left,right,_) = 
+  let sty = set_of_map (symbols_of_term ty) in
+  let sl = set_of_map (symbols_of_term left) in
+  let sr = set_of_map (symbols_of_term right) in
+  TermSet.union sty (TermSet.union sl sr)
+;;
+
+let distance sgoal seq =
+  let s = TermSet.diff seq sgoal in
+  TermSet.cardinal s
+;;
+
 let compute_equality_weight (ty,left,right,o) =
   let factor = 2 in
   match o with
@@ -318,7 +341,22 @@ let compute_equality_weight (ty,left,right,o) =
 	       ~consider_metas:true ~count_metas_occurrences:false right) in
       let w2, m2 = (weight_of_term 
 	       ~consider_metas:true ~count_metas_occurrences:false left) in
-      (max w1 w2)+(max (factor * (List.length m1)) (factor * (List.length m2)))
+      w1 + w2 + (factor * (List.length m1)) + (factor * (List.length m2))
+;;
+
+let compute_equality_weight e =
+  let w = compute_equality_weight e in
+  let d = distance !goal_symbols (symbols_of_eq e) in
+(*
+  prerr_endline (Printf.sprintf "dist %s --- %s === %d" 
+   (String.concat ", " (List.map (CicPp.ppterm) (TermSet.elements
+     !goal_symbols)))
+   (String.concat ", " (List.map (CicPp.ppterm) (TermSet.elements
+     (symbols_of_eq e))))
+   d
+  );
+*)
+  w + d 
 ;;
 
 (* old
@@ -716,14 +754,6 @@ let guarded_simpl ?(debug=false) context t =
       end
 ;;
 
-type equality_sign = Negative | Positive;;
-
-let string_of_sign = function
-  | Negative -> "Negative"
-  | Positive -> "Positive"
-;;
-
-
 type pos = Left | Right 
 
 let string_of_pos = function