prerr_endine ==> debug_print everywhere

[helm.git] / helm / software / components / tactics / paramodulation / utils.ml

diff --git a/helm/software/components/tactics/paramodulation/utils.ml b/helm/software/components/tactics/paramodulation/utils.ml
index a25ba8e2d7cda49cb9ac8cfede5cb14ea2aef99d..c6e64b898753f435e54a959a4d5c09dfc216e1c6 100644 (file)
--- a/helm/software/components/tactics/paramodulation/utils.ml
+++ b/helm/software/components/tactics/paramodulation/utils.ml
@@ -98,6 +98,12 @@ let metas_of_term term =
     | C.Meta _ as t -> TermSet.singleton t
     | C.Appl l ->
         List.fold_left (fun res t -> TermSet.union res (aux t)) TermSet.empty l
+    | C.Lambda(n,s,t) ->
+       TermSet.union (aux s) (aux t)
+    | C.Prod(n,s,t) ->
+       TermSet.union (aux s) (aux t)
+    | C.LetIn(n,s,t) ->
+       TermSet.union (aux s) (aux t)
     | t -> TermSet.empty (* TODO: maybe add other cases? *)
   in
   aux term
@@ -299,6 +305,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 +347,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 = 0 in (* 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
@@ -709,21 +753,12 @@ let guarded_simpl ?(debug=false) context t =
     if t = t' then t else
       begin
        let simpl_order = !compare_terms t t' in
-       if debug then
-         prerr_endline ("comparing "^(CicPp.ppterm t)^(CicPp.ppterm t'));
+        debug_print (lazy ("comparing "^(CicPp.ppterm t)^(CicPp.ppterm t')));
        if simpl_order = Gt then (if debug then prerr_endline "GT";t')
        else (if debug then prerr_endline "NO_GT";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