X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FfoUtils.ml;h=454432ec48925a4e53dc734aa6680faff7e14d7f;hb=c22f39a5d5afc0ef55beb221e00e2e6703b13d90;hp=26b7f6fa4b2e1abec80070352d5dbb502d1f99b8;hpb=6f35dd77922431b667f7eb4669ab3fbb6092c343;p=helm.git diff --git a/helm/software/components/ng_paramodulation/foUtils.ml b/helm/software/components/ng_paramodulation/foUtils.ml index 26b7f6fa4..454432ec4 100644 --- a/helm/software/components/ng_paramodulation/foUtils.ml +++ b/helm/software/components/ng_paramodulation/foUtils.ml @@ -21,11 +21,6 @@ let rec lexicograph f l1 l2 = | _,[] -> 1 ;; -let mk_id = - let id = ref 0 in - fun () -> incr id; !id -;; - module Utils (B : Terms.Blob) = struct module Subst = FoSubst;; (*.Subst(B) ;;*) module Order = Orderings.Orderings(B) ;; @@ -124,22 +119,17 @@ module Utils (B : Terms.Blob) = struct | t -> Terms.Predicate t in let proof = Terms.Exact proofterm in - fresh_unit_clause maxvar (mk_id (), lit, varlist, proof) + fresh_unit_clause maxvar (0, lit, varlist, proof) ;; - 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 - bag, clause - ;; - - let empty_bag = Terms.M.empty ;; - let mk_passive_clause cl = (Order.compute_unit_clause_weight cl, cl) ;; + let mk_passive_goal g = + (Order.compute_unit_clause_weight g, g) + ;; + let compare_passive_clauses_weight (w1,(id1,_,_,_)) (w2,(id2,_,_,_)) = if w1 = w2 then id1 - id2 else w1 - w2