Fixed conflicts due to problem when merging with UEQ implementation

[helm.git] / helm / software / components / ng_paramodulation / paramod.mli

diff --git a/helm/software/components/ng_paramodulation/paramod.mli b/helm/software/components/ng_paramodulation/paramod.mli
index 9a2d397ca471bd0bc418f441638c2f4da9ef467b..9cffd9d2889af4958d8dc8254ce1af33e31dc18d 100644 (file)
--- a/helm/software/components/ng_paramodulation/paramod.mli
+++ b/helm/software/components/ng_paramodulation/paramod.mli
@@ -11,13 +11,26 @@
 
 (* $Id: orderings.ml 9869 2009-06-11 22:52:38Z denes $ *)
 
-module Paramod ( B : Terms.Blob ) : 
+module type Paramod =
   sig
-    type bag = B.t Terms.bag * int
-    val mk_passive : bag -> B.input * B.input -> bag * B.t Terms.unit_clause
-    val mk_goal : bag -> B.input * B.input -> bag * B.t Terms.unit_clause
+    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 : 
-      bag -> g_passives:B.t Terms.unit_clause list -> 
-      passives:B.t Terms.unit_clause list ->
-       (B.t Terms.bag * int * int list) list
+      useage:bool ->
+      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 ) : Paramod
+with type t = B.t and type input = B.input