X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_paramodulation%2Fparamod.ml;h=f3afc16f46e1047615f089808d648d485623bf34;hb=4244a4d70b9ab2fece0ff5b63506f6d323cbfbe2;hp=983dd53e84bd28e567904e2c51c74fe8209db52a;hpb=772def9075b7b62870ebf4cecec6bcd37a549b1d;p=helm.git

diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml
index 983dd53e8..f3afc16f4 100644
--- a/helm/software/components/ng_paramodulation/paramod.ml
+++ b/helm/software/components/ng_paramodulation/paramod.ml
@@ -16,7 +16,29 @@ let debug _ = ();;
 
 let monster = 100;;
     
-module Paramod (B : Terms.Blob) = struct
+module type Paramod =
+  sig
+    type t
+    type input
+    type szsontology = 
+      | Unsatisfiable of (t Terms.bag * int * int list) list
+      | GaveUp 
+      | Error of string 
+      | Timeout of int * t Terms.bag
+    type bag = t Terms.bag * int
+    val mk_passive : bag -> input * input -> bag * t Terms.unit_clause
+    val mk_goal : bag -> input * input -> bag * t Terms.unit_clause
+    val paramod : 
+      max_steps:int ->
+      ?timeout:float ->
+      bag -> 
+      g_passives:t Terms.unit_clause list -> 
+      passives:t Terms.unit_clause list -> szsontology
+  end
+
+module Paramod (B : Orderings.Blob) = struct
+  type t = B.t
+  type input = B.input
   type szsontology = 
     | Unsatisfiable of (B.t Terms.bag * int * int list) list
     | GaveUp 
@@ -29,7 +51,7 @@ module Paramod (B : Terms.Blob) = struct
   module IDX = Index.Index(B) 
   module Sup = Superposition.Superposition(B) 
   module Utils = FoUtils.Utils(B) 
-  module Order = Orderings.Orderings(B)
+  module Order = B
   module WeightOrderedPassives =
       struct
         type t = B.t Terms.passive_clause
@@ -229,7 +251,7 @@ module Paramod (B : Terms.Blob) = struct
           end
         else raise (Stop (Timeout (maxvar,bag)));
 
-    let use_age = weight_picks = (iterno / 10 + 1) in
+    let use_age = weight_picks = (iterno / 6 + 1) in
     let weight_picks = if use_age then 0 else weight_picks+1
     in