X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=inline;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2FfoUtils.ml;h=454432ec48925a4e53dc734aa6680faff7e14d7f;hb=5d0d8107649b9264ebe7d8ff2c69bf777179b0d2;hp=4c99f5b9cbe3b546c4896dd54beb71880c9b13d3;hpb=2c2b31c242aa81dc6f3c73e7e2a3ec0789a21edd;p=helm.git diff --git a/helm/software/components/ng_paramodulation/foUtils.ml b/helm/software/components/ng_paramodulation/foUtils.ml index 4c99f5b9c..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,false) 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