Changed the ordering of rels, and the introduction of hypothesis to get

a version closer to the standalone prover.

diff --git a/helm/software/components/ng_paramodulation/nCicBlob.ml b/helm/software/components/ng_paramodulation/nCicBlob.ml
index 2ed7eef23b005efff510e2daa6a9619f9ea67d84..91746f210480f9eefae71b9cfde9aea198c238c0 100644 (file)
--- 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 8c740a0e4605c5d282ff89270b6f1134587553f2..a1e2a9ff5ea96b58cee526825ac456af267804f4 100644 (file)
--- 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)