X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FfoUtils.ml;h=8c75baeea18e058f2999fe77a90949b3d8f72d7f;hb=95a14ced97592a4116485f94c6ffa806feb62dbc;hp=7b57e5bb3d2037b98ff681521c3b55d1ecd6a2cc;hpb=948bb5d710c5d7f3185b6fef76c8e71f247cc664;p=helm.git

diff --git a/helm/software/components/ng_paramodulation/foUtils.ml b/helm/software/components/ng_paramodulation/foUtils.ml
index 7b57e5bb3..8c75baeea 100644
--- a/helm/software/components/ng_paramodulation/foUtils.ml
+++ b/helm/software/components/ng_paramodulation/foUtils.ml
@@ -69,8 +69,8 @@ module Utils (B : Orderings.Blob) = struct
     | Terms.Equation _, Terms.Predicate _ -> 1
   ;;
 
-  let eq_unit_clause (id1,_,_,_) (id2,_,_,_) = id1 = id2
-  let compare_unit_clause (id1,_,_,_) (id2,_,_,_) = Pervasives.compare id1 id2
+  let eq_clause (id1,_,_,_,_) (id2,_,_,_,_) = id1 = id2
+  let compare_clause (id1,_,_,_,_) (id2,_,_,_,_) = Pervasives.compare id1 id2
     
   let relocate maxvar varlist subst =
     List.fold_right
@@ -79,10 +79,9 @@ module Utils (B : Orderings.Blob) = struct
       varlist (maxvar+1, [], subst)
   ;;
 
-  let fresh_unit_clause maxvar (id, lit, varlist, proof) =
+  let fresh_clause maxvar (id, nlit, plit, varlist, proof) =
     let maxvar, varlist, subst = relocate maxvar varlist Subst.id_subst in
-    let lit = 
-      match lit with
+    let apply_subst_on_lit = function
       | Terms.Equation (l,r,ty,o) ->
           let l = Subst.apply_subst subst l in
           let r = Subst.apply_subst subst r in
@@ -92,50 +91,48 @@ module Utils (B : Orderings.Blob) = struct
           let p = Subst.apply_subst subst p in
           Terms.Predicate p
     in
+    let nlit = List.map apply_subst_on_lit nlit in
+    let plit = List.map apply_subst_on_lit plit in
     let proof =
       match proof with
       | Terms.Exact t -> Terms.Exact (Subst.apply_subst subst t)
       | Terms.Step (rule,c1,c2,dir,pos,s) ->
           Terms.Step(rule,c1,c2,dir,pos,Subst.concat subst s)
     in
-     (id, lit, varlist, proof), maxvar
+     (id, nlit, plit, varlist, proof), maxvar
   ;;
 
   (* may be moved inside the bag *)
-  let mk_unit_clause maxvar ty proofterm =
-    let varlist =
-      let rec aux acc = function
-        | Terms.Leaf _ -> acc
-        | Terms.Var i -> if List.mem i acc then acc else i::acc
-        | Terms.Node l -> List.fold_left aux acc l 
-      in
-       aux (aux [] ty) proofterm
-    in
-    let lit = 
+  let mk_clause maxvar nlit plit proofterm =
+    let foterm_to_lit (acc,literals) ty =
+      let vars = Terms.vars_of_term ~start_acc:acc ty in
       match ty with
       | Terms.Node [ Terms.Leaf eq ; ty; l; r ] when B.eq B.eqP eq ->
            let o = Order.compare_terms l r in
-           Terms.Equation (l, r, ty, o)
-      | t -> Terms.Predicate t
+           (vars,Terms.Equation (l, r, ty, o)::literals)
+      | _ -> (vars,Terms.Predicate ty::literals)
     in
+    let varlist = Terms.vars_of_term proofterm in
+    let (varlist,nlit) = List.fold_left foterm_to_lit (varlist,[]) nlit in
+    let (varlist,plit) = List.fold_left foterm_to_lit (varlist,[]) plit in
     let proof = Terms.Exact proofterm in
-    fresh_unit_clause maxvar (0, lit, varlist, proof)
+    fresh_clause maxvar (0, nlit, plit, varlist, proof)
   ;;
 
   let mk_passive_clause cl =
-    (Order.compute_unit_clause_weight cl, cl)
+    (Order.compute_clause_weight cl, cl)
   ;;
 
   let mk_passive_goal g =
-    (Order.compute_unit_clause_weight g, g)
+    (Order.compute_clause_weight g, g)
   ;;
 
-  let compare_passive_clauses_weight (w1,(id1,_,_,_)) (w2,(id2,_,_,_)) =
+  let compare_passive_clauses_weight (w1,(id1,_,_,_,_)) (w2,(id2,_,_,_,_)) =
     if w1 = w2 then id1 - id2
     else w1 - w2
   ;;
 
-  let compare_passive_clauses_age (_,(id1,_,_,_)) (_,(id2,_,_,_)) =
+  let compare_passive_clauses_age (_,(id1,_,_,_,_)) (_,(id2,_,_,_,_)) =
     id1 - id2
   ;;