fixed makefile

[helm.git] / helm / software / components / binaries / matitaprover / matitaprover.ml

diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml
index df6abfa92292bfdc0da05e041c9c264f990be5dc..f72a7ebc5c2520b6217d61f851fba79e96c1e89f 100644 (file)
--- a/helm/software/components/binaries/matitaprover/matitaprover.ml
+++ b/helm/software/components/binaries/matitaprover/matitaprover.ml
@@ -33,7 +33,7 @@ hash "_";;
 
 let problem_file = ref "no-file-given";;
 let tptppath = ref "/";;
-let seconds = ref 300;;
+let seconds = ref 0;;
 
 let fail_msg () =
       print_endline ("% SZS status Timeout for " ^ 
@@ -67,7 +67,10 @@ module MakeBlob(C:LeafComparer) : Terms.Blob
                     (fun x _ m -> embed m x) m args
                 in
                 m, Terms.Node (Terms.Leaf (hash name):: args) 
-        ;;
+        let is_eq = function
+         | Terms.Node [ Terms.Leaf eqt ; ty; l; r ] when eq eqP eqt ->
+              Some (ty,l,r) 
+         | _ -> None
         let saturate bo ty = 
           let vars, ty = embed [] ty in
           let _, bo = embed vars bo in
@@ -97,7 +100,7 @@ let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) ord
   let prerr_endline s = prerr_endline (prefix ^ ": " ^ s) in
   let times = Unix.times () in
   prerr_endline ("solved " ^ !problem_file ^ " in " ^ string_of_float
-    (times.Unix.tms_utime +. times.Unix.tms_stime) ^ " using " ^ ord);
+    (times.Unix.tms_utime +. times.Unix.tms_stime) ^ "(Process Time) using " ^ ord);
 ;;
 
 let start_msg stats passives g_passives (pp : ?margin:int -> leaf Terms.unit_clause -> string) oname =
@@ -120,8 +123,19 @@ let start_msg stats passives g_passives (pp : ?margin:int -> leaf Terms.unit_cla
 
 let report_error s =  prerr_endline (string_of_int (Unix.getpid())^": "^s);;
 
+
 module Main(P : Paramod.Paramod with type t = leaf) = 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 = Terms.add_to_bag c bag in
+      (bag, maxvar), c
+  ;;
+  
+  let mk_passive (bag,maxvar) = mk_clause bag maxvar;;
+  let mk_goal (bag,maxvar) = mk_clause bag maxvar;;*)
+
  let run ~useage ~printmsg stats goal hypotheses pp_unit_clause name = 
    let bag = Terms.empty_bag, 0 in
    let bag, g_passives = P.mk_goal bag goal in
@@ -134,7 +148,7 @@ module Main(P : Paramod.Paramod with type t = leaf) = struct
       ~max_steps:max_int bag ~g_passives:[g_passives] ~passives 
    with
    | P.Error s -> report_error s; 3
-   | P.Unsatisfiable ((bag,_,l)::_) -> 
+   | P.Unsatisfiable ((bag,_,_,l)::_) -> 
          success_msg bag l pp_unit_clause name; 0
    | P.Unsatisfiable ([]) -> 
          report_error "Unsatisfiable but no solution output"; 3
@@ -224,7 +238,7 @@ let worker order ~useage ~printmsg goal hypotheses =
 ;;
 
 let print_status p = 
-  let print_endline s = prerr_endline (string_of_int p ^ ": " ^ s) in
+  let print_endline s = () in (* prerr_endline (string_of_int p ^ ": " ^ s) in*)
     function
     | Unix.WEXITED 0 -> 
         print_endline ("status Unsatisfiable for " ^ 
@@ -255,13 +269,13 @@ let main () =
   in
   let _ =
     Sys.signal Sys.sigalrm 
-      (Sys.Signal_handle (fun _ -> fail_msg (); killall !childs; exit 1)) 
+      (Sys.Signal_handle (fun _ -> prerr_endline "Alarm!"; fail_msg (); killall !childs; exit 1)) 
   in
   Arg.parse [
    "--tptppath", Arg.String (fun p -> tptppath := p), 
      ("[path]  TPTP lib root, default " ^ !tptppath);
    "--timeout", Arg.Int (fun p -> seconds := p), 
-     ("[seconds]  timeout, default " ^ string_of_int !seconds);
+     ("[seconds]  timeout, default none");
    ] (fun x -> problem_file := x) "
 Matitaprover is the first order automatic prover that equips the 
 Matita interactive theorem prover (http://matita.cs.unibo.it).
@@ -278,7 +292,7 @@ in the current directory only.
 usage: matitaprover [options] problemfile";
   let hypotheses, goals = Tptp_cnf.parse ~tptppath:!tptppath !problem_file in
   let goal = match goals with [x] -> x | _ -> assert false in
-  let _ = Unix.alarm !seconds in
+  let _ = if !seconds > 0 then Unix.alarm !seconds else 0 in
   childs := 
     List.map 
       (fun f ->