X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Futils.ml;h=00d745fd906fb1ec2ac0aa6fa88a11faa17b7515;hb=f809c7537eda20a275b17bc1407f0ee446f70356;hp=8fb1d42bcf60bf6adae07c5ae7826995632f245e;hpb=8b4a227cafd6707cf466c02606b2f1f3f6b60219;p=helm.git

diff --git a/helm/software/components/tactics/paramodulation/utils.ml b/helm/software/components/tactics/paramodulation/utils.ml
index 8fb1d42bc..00d745fd9 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
@@ -98,11 +98,24 @@ 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
 ;;
 
+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,8 +305,31 @@ 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 = 1 in
+  let factor = 2 in
   match o with
     | Lt -> 
 	let w, m = (weight_of_term 
@@ -314,6 +350,21 @@ let compute_equality_weight (ty,left,right,o) =
       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
 let compute_equality_weight (ty,left,right,o) =
   let metasw = ref 0 in
@@ -429,7 +480,6 @@ let compare_weights ?(normalize=false)
   | (m, _, n) when m > 0 && n > 0 ->
       Incomparable
   | _ -> assert false 
-
 ;;
 
 
@@ -710,14 +760,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
@@ -725,11 +767,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 ())