X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Futils.ml;h=a85ccc674220482c782598f26d1d1d1e8e4b9394;hb=403e3c6f8e9288926e1bca283ff0bf54233354a2;hp=a25ba8e2d7cda49cb9ac8cfede5cb14ea2aef99d;hpb=bc8187a8276f45fdf0882acbb832089a10e0d8ed;p=helm.git

diff --git a/helm/software/components/tactics/paramodulation/utils.ml b/helm/software/components/tactics/paramodulation/utils.ml
index a25ba8e2d..a85ccc674 100644
--- a/helm/software/components/tactics/paramodulation/utils.ml
+++ b/helm/software/components/tactics/paramodulation/utils.ml
@@ -25,7 +25,7 @@
 
 (* $Id$ *)
 
-let time = true;;
+let time = false;;
 let debug = false;;
 let debug_metas = false;; 
 let debug_res = false;;
@@ -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,ty,t) ->
+	TermSet.union (aux s) (TermSet.union (aux ty) (aux t))
     | t -> TermSet.empty (* TODO: maybe add other cases? *)
   in
   aux term
@@ -259,7 +265,7 @@ let weight_of_term ?(consider_metas=true) ?(count_metas_occurrences=false) term
     | C.Cast (t1, t2)
     | C.Lambda (_, t1, t2)
     | C.Prod (_, t1, t2)
-    | C.LetIn (_, t1, t2) ->
+    | C.LetIn (_, t1, _, t2) ->
         let w1 = aux t1 in
         let w2 = aux t2 in
         w1 + w2 + 1
@@ -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
@@ -462,12 +506,21 @@ let rec aux_ordering ?(recursion=true) t1 t2 =
   | C.Const _, _ -> Lt
   | _, C.Const _ -> Gt
 
-  | C.MutInd (u1, _, _), C.MutInd (u2, _, _) -> compare_uris u1 u2
+  | C.MutInd (u1, tno1, _), C.MutInd (u2, tno2, _) -> 
+       let res =  compare_uris u1 u2 in
+       if res <> Eq then res 
+       else 
+          let res = compare tno1 tno2 in
+          if res = 0 then Eq else if res < 0 then Lt else Gt
   | C.MutInd _, _ -> Lt
   | _, C.MutInd _ -> Gt
 
-  | C.MutConstruct (u1, _, _, _), C.MutConstruct (u2, _, _, _) ->
-      compare_uris u1 u2
+  | C.MutConstruct (u1, tno1, cno1, _), C.MutConstruct (u2, tno2, cno2, _) ->
+       let res =  compare_uris u1 u2 in
+       if res <> Eq then res 
+       else 
+          let res = compare (tno1,cno1) (tno2,cno2) in
+          if res = 0 then Eq else if res < 0 then Lt else Gt
   | C.MutConstruct _, _ -> Lt
   | _, C.MutConstruct _ -> Gt
 
@@ -508,7 +561,7 @@ let nonrec_kbo_w (t1, w1) (t2, w2) =
 let nonrec_kbo t1 t2 =
   let w1 = weight_of_term t1 in
   let w2 = weight_of_term t2 in
-  (* 
+  (*
   prerr_endline ("weight1 :"^(string_of_weight w1));
   prerr_endline ("weight2 :"^(string_of_weight w2)); 
   *)
@@ -709,21 +762,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