X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FfoUtils.ml;h=a970bb6f0c51ee67870e6577b9797daf45b1abca;hb=07fb52e761b192a97c6fe00c657e670b2d1fc2f1;hp=f56cccd89933b5dde4a4da6b434fb5b9c9312a39;hpb=8de1a75899a83dd31e856804bd448c1bd87d9ab3;p=helm.git diff --git a/helm/software/components/ng_paramodulation/foUtils.ml b/helm/software/components/ng_paramodulation/foUtils.ml index f56cccd89..a970bb6f0 100644 --- a/helm/software/components/ng_paramodulation/foUtils.ml +++ b/helm/software/components/ng_paramodulation/foUtils.ml @@ -130,7 +130,7 @@ module Utils (B : Terms.Blob) = struct let add_to_bag bag (_,lit,vl,proof) = let id = mk_id () in let clause = (id, lit, vl, proof) in - let bag = Terms.M.add id clause bag in + let bag = Terms.M.add id (clause,false) bag in bag, clause ;; @@ -140,9 +140,17 @@ module Utils (B : Terms.Blob) = struct (Order.compute_unit_clause_weight cl, cl) ;; - let compare_passive_clauses (w1,(id1,_,_,_)) (w2,(id2,_,_,_)) = + let mk_passive_goal g = + (Order.compute_goal_weight g, g) + ;; + + 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,_,_,_)) = + id1 - id2 + ;; + end