From 1341f9c234571b4172cd76cd84e7230039cb4642 Mon Sep 17 00:00:00 2001 From: Andrea Asperti Date: Wed, 29 Jul 2009 15:53:44 +0000 Subject: [PATCH] Changed the ordering of rels, and the introduction of hypothesis to get a version closer to the standalone prover. --- helm/software/components/ng_paramodulation/nCicBlob.ml | 2 +- helm/software/components/ng_paramodulation/nCicParamod.ml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/helm/software/components/ng_paramodulation/nCicBlob.ml b/helm/software/components/ng_paramodulation/nCicBlob.ml index 2ed7eef23..91746f210 100644 --- a/helm/software/components/ng_paramodulation/nCicBlob.ml +++ b/helm/software/components/ng_paramodulation/nCicBlob.ml @@ -27,7 +27,7 @@ with type t = NCic.term and type input = NCic.term = struct let rec compare x y = match x,y with - | NCic.Rel i, NCic.Rel j -> i-j + | NCic.Rel i, NCic.Rel j -> j-i | NCic.Meta (i,_), NCic.Meta (j,_) -> i-j | NCic.Const r1, NCic.Const r2 -> NReference.compare r1 r2 | NCic.Appl l1, NCic.Appl l2 -> FoUtils.lexicograph compare l1 l2 diff --git a/helm/software/components/ng_paramodulation/nCicParamod.ml b/helm/software/components/ng_paramodulation/nCicParamod.ml index 8c740a0e4..a1e2a9ff5 100644 --- a/helm/software/components/ng_paramodulation/nCicParamod.ml +++ b/helm/software/components/ng_paramodulation/nCicParamod.ml @@ -21,17 +21,17 @@ let nparamod rdb metasenv subst context t table = in let module B : Orderings.Blob with type t = NCic.term and type input = NCic.term - = Orderings.NRKBO(NCicBlob.NCicBlob(C)) + = Orderings.LPO(NCicBlob.NCicBlob(C)) in let module P = Paramod.Paramod(B) in let module Pp = Pp.Pp(B) in let bag, maxvar = Terms.empty_bag, 0 in - let (bag,maxvar), passives = - HExtlib.list_mapi_acc (fun x _ a -> P.mk_passive a x) (bag,maxvar) table - in let (bag,maxvar), goals = HExtlib.list_mapi_acc (fun x _ a -> P.mk_goal a x) (bag,maxvar) [t] in + let (bag,maxvar), passives = + HExtlib.list_mapi_acc (fun x _ a -> P.mk_passive a x) (bag,maxvar) table + in match P.paramod ~useage:true ~max_steps:max_int ~timeout:(Unix.gettimeofday () +. 300.0) ~g_passives:goals ~passives (bag,maxvar) -- 2.39.2