better output handling

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

diff --git a/helm/software/components/ng_paramodulation/paramod.ml b/helm/software/components/ng_paramodulation/paramod.ml
index 435c95024416b3f232ce280855605de6e0cc1fb1..0dafc864e215df8985e938b8edf4958de74e29b3 100644 (file)
--- a/helm/software/components/ng_paramodulation/paramod.ml
+++ b/helm/software/components/ng_paramodulation/paramod.ml
@@ -14,10 +14,15 @@
 let debug s = prerr_endline s ;;
 let debug _ = ();;
 
-let monster = 500;;
+let monster = 100;;
     
 module Paramod (B : Terms.Blob) = struct
-  exception Failure of string * B.t Terms.bag * int * int
+  type szsontology = 
+    | Unsatisfiable of (B.t Terms.bag * int * int list) list
+    | GaveUp 
+    | Error of string 
+    | Timeout of int * B.t Terms.bag
+  exception Stop of szsontology
   type bag = B.t Terms.bag * int
   module Pp = Pp.Pp (B) 
   module FU = FoUnif.Founif(B) 
@@ -99,7 +104,7 @@ module Paramod (B : Terms.Blob) = struct
   let mk_clause bag maxvar (t,ty) =
     let (proof,ty) = B.saturate t ty in
     let c, maxvar = Utils.mk_unit_clause maxvar ty proof in
-    let bag, c = Utils.add_to_bag bag c in
+    let bag, c = Terms.add_to_bag c bag in
     (bag, maxvar), c
   ;;
   
@@ -109,8 +114,10 @@ module Paramod (B : Terms.Blob) = struct
   (* TODO : global age over facts and goals (without comparing weights) *)
   let select ~use_age passives g_passives =
     if is_passive_set_empty passives then begin
-      assert (not (is_passive_set_empty g_passives));
-      let g_cl = pick_min_passive ~use_age:use_age g_passives in
+      if (is_passive_set_empty g_passives) then
+        raise (Stop GaveUp) (* we say we are incomplete *)
+      else
+       let g_cl = pick_min_passive ~use_age:use_age g_passives in
         (true,g_cl,passives,remove_passive_clause g_passives g_cl)
     end
     else let cl = pick_min_passive ~use_age:use_age passives in
@@ -118,7 +125,11 @@ module Paramod (B : Terms.Blob) = struct
         (false,cl,remove_passive_clause passives cl,g_passives)
       else
         let g_cl = pick_min_passive ~use_age:use_age g_passives in
-          if (fst cl <= fst g_cl) then
+       let (id1,_,_,_),(id2,_,_,_) = snd cl, snd g_cl in
+       let cmp = if use_age then id1 <= id2
+       else fst cl <= fst g_cl
+       in
+          if cmp then
             (false,cl,remove_passive_clause passives cl,g_passives)
           else
             (true,g_cl,passives,remove_passive_clause g_passives g_cl)
@@ -168,8 +179,7 @@ module Paramod (B : Terms.Blob) = struct
       let bag, maxvar, new_goals = 
         List.fold_left 
           (fun (bag,m,acc) g -> 
-             let bag, m, ng = Sup.infer_left bag m g
-               ([current],ctable) in
+             let bag, m, ng = Sup.infer_left bag m g ([current],ctable) in
                bag,m,ng@acc) 
           (bag,maxvar,[]) g_actives 
       in
@@ -183,8 +193,7 @@ module Paramod (B : Terms.Blob) = struct
     actives passives g_actives g_passives 
   =
     let iterno = iterno + 1 in
-    if iterno = max_steps then       
-      raise (Failure ("No iterations left !",bag,maxvar,iterno));
+    if iterno = max_steps then raise (Stop (Timeout (maxvar,bag)));
     (* timeout check: gettimeofday called only if timeout set *)
     if timeout <> None &&
       (match timeout with
@@ -205,9 +214,7 @@ module Paramod (B : Terms.Blob) = struct
                    ();
                  x::acc,i+1)
               ([],0) g_actives);
-            raise (Failure (("Last chance: failed over " ^ 
-              string_of_int maxgoals^ " goal " ^ 
-              string_of_float (Unix.gettimeofday())),bag,maxvar,0));
+            raise (Stop (Timeout (maxvar,bag)))
           end
         else if false then (* activates last chance strategy *)
           begin
@@ -215,17 +222,25 @@ module Paramod (B : Terms.Blob) = struct
            given_clause ~noinfer:true bag maxvar iterno max_steps 
              (Some (Unix.gettimeofday () +. 20.))
              actives passives g_actives g_passives;
-           raise (Failure ("Timeout !",bag,maxvar,iterno))
+           raise (Stop (Timeout (maxvar,bag)));
           end
-        else raise (Failure ("Timeout !",bag,maxvar,iterno));
+        else raise (Stop (Timeout (maxvar,bag)));
 
-    (* let use_age = iterno mod 10 = 0 in *)
+    let use_age = iterno mod 5 = 0 in
 
     let rec aux_select bag passives g_passives =
       let backward,(weight,current),passives,g_passives =
         select ~use_age:false passives g_passives
       in
+       if use_age && weight > monster then
+         let bag,cl = Terms.add_to_bag current bag in
+           if backward then
+             aux_select bag passives (add_passive_clause g_passives cl)
+           else
+             aux_select bag (add_passive_clause passives cl) g_passives
+       else
         if backward then
+          let _ = debug ("Selected goal : " ^ Pp.pp_unit_clause current) in
          match 
            if noinfer then 
              if weight > monster then None else Some (bag,current)
@@ -249,8 +264,8 @@ module Paramod (B : Terms.Blob) = struct
               if weight > monster then bag,None 
               else  bag, Some (current,actives)
             else if Sup.orphan_murder bag (fst actives) current then
-              let (id,_,_,_) = current in
-              let bag = Terms.M.add id (current,true) bag in
+             let _ = debug "Orphan murdered" in
+              let bag = Terms.replace_in_bag (current,true) bag in
                 bag, None
             else Sup.keep_simplified current actives bag maxvar
           with
@@ -320,7 +335,7 @@ module Paramod (B : Terms.Blob) = struct
     | Sup.Success (bag, _, (i,_,_,_)) ->
         let l =
           let rec traverse ongoal (accg,acce) i =
-            match Terms.M.find i bag with
+            match Terms.get_from_bag i bag with
               | (id,_,_,Terms.Exact _),_ ->
                   if ongoal then [i],acce else
                     if (List.mem i acce) then accg,acce else accg,acce@[i]
@@ -346,11 +361,9 @@ module Paramod (B : Terms.Blob) = struct
         List.iter (fun x ->
           prerr_endline (Pp.pp_unit_clause (fst(Terms.M.find x bag)))) l;
         *)
-        [ bag, i, l ]
-    | Failure (msg,_bag,_maxvar,iterno) -> 
-        prerr_endline msg;
-        prerr_endline (Printf.sprintf "FAILURE in %d iterations" iterno); 
-        []
+        Unsatisfiable [ bag, i, l ]
+    | Stop (Unsatisfiable _) -> Error "stop bug solution found!"
+    | Stop o -> o
   ;;
 
 end