X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Fmatitaprover%2Fmatitaprover.ml;h=f72a7ebc5c2520b6217d61f851fba79e96c1e89f;hb=7b8200f8aaf14195c0817e13234c712e7ab18eb6;hp=7f9046eb3519f168abe6a58cf999493f7b169aa7;hpb=643b05ff81a8bfab0924c23bf3299c1fd47183f5;p=helm.git diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml index 7f9046eb3..f72a7ebc5 100644 --- 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,21 +123,32 @@ 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 run ~useage stats goal hypotheses pp_unit_clause name = + (*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 let bag, passives = HExtlib.list_mapi_acc (fun x _ b -> P.mk_passive b x) bag hypotheses in - start_msg stats passives g_passives pp_unit_clause name; + if printmsg then start_msg stats passives g_passives pp_unit_clause name; match P.paramod ~useage ~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 @@ -181,7 +195,7 @@ end data ;; -let worker order ~useage goal hypotheses = +let worker order ~useage ~printmsg goal hypotheses = let stats = compute_stats goal hypotheses in let module C = struct @@ -212,19 +226,19 @@ let worker order ~useage goal hypotheses = | `NRKBO -> let module O = Orderings.NRKBO(B) in let module Main = Main(Paramod.Paramod(O)) in - Main.run ~useage stats goal hypotheses Pp.pp_unit_clause O.name + Main.run ~useage ~printmsg stats goal hypotheses Pp.pp_unit_clause O.name | `KBO -> let module O = Orderings.KBO(B) in let module Main = Main(Paramod.Paramod(O)) in - Main.run ~useage stats goal hypotheses Pp.pp_unit_clause O.name + Main.run ~useage ~printmsg stats goal hypotheses Pp.pp_unit_clause O.name | `LPO -> let module O = Orderings.LPO(B) in let module Main = Main(Paramod.Paramod(O)) in - Main.run ~useage stats goal hypotheses Pp.pp_unit_clause O.name + Main.run ~useage ~printmsg stats goal hypotheses Pp.pp_unit_clause O.name ;; 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,20 +292,20 @@ 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 -> let pid = Unix.fork () in if pid = 0 then (exit (f ())) else pid) [ - (fun () -> worker `NRKBO ~useage:true goal hypotheses) + (fun () -> worker `NRKBO ~useage:true ~printmsg:true goal hypotheses) ; - (fun () -> worker `KBO ~useage:true goal hypotheses) + (fun () -> worker `KBO ~useage:true ~printmsg:false goal hypotheses) ; - (fun () -> worker `LPO ~useage:true goal hypotheses) + (fun () -> worker `LPO ~useage:true ~printmsg:false goal hypotheses) ; - (fun () -> worker `NRKBO ~useage:false goal hypotheses) + (fun () -> worker `NRKBO ~useage:false ~printmsg:false goal hypotheses) ]; let rec aux () = if List.length !childs = 0 then