X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Fmatitaprover%2Fmatitaprover.ml;h=cfa82da98b6fa826c86113f631e9d6f07ee2bdee;hb=db7f6d6b32515c091e0f338dd4903624f35f27ac;hp=3bec2c9c18c3f5e9a2efe17d5e2ab64d3275f577;hpb=68a557b997805b4a96fb2851cb4d2ab2076bba36;p=helm.git diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml index 3bec2c9c1..cfa82da98 100644 --- a/helm/software/components/binaries/matitaprover/matitaprover.ml +++ b/helm/software/components/binaries/matitaprover/matitaprover.ml @@ -78,48 +78,126 @@ module MakeBlob(C:LeafComparer) : Terms.Blob end ;; -let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) = +let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) ord = + (* TODO: do some sort of poor man lock (open + OEXCL) so that + * just one thread at a time prints the proof *) print_endline ("% SZS status Unsatisfiable for " ^ Filename.basename !problem_file); print_endline ("% SZS output start CNFRefutation for " ^ Filename.basename !problem_file); flush stdout; List.iter (fun x -> + let (cl,_,_) = Terms.get_from_bag x bag in print_endline (pp ~margin:max_int - (fst(Terms.M.find x bag)))) l; + cl)) l; print_endline ("% SZS output end CNFRefutation for " ^ - Filename.basename !problem_file) + Filename.basename !problem_file); + let prefix = string_of_int (Unix.getpid ()) in + 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); ;; -let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) = - prerr_endline (string_of_int (Unix.getpid ())); -(* - prerr_endline "Facts"; +let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) oname = + let prefix = string_of_int (Unix.getpid ()) in + let prerr_endline s = prerr_endline (prefix ^ ": " ^ s) in + prerr_endline "Facts:"; List.iter (fun x -> prerr_endline (" " ^ pp x)) passives; - prerr_endline "Goal"; - prerr_endline (" " ^ pp g_passives) -*) + prerr_endline "Goal:"; + prerr_endline (" " ^ pp g_passives); + prerr_endline "Order:"; + prerr_endline (" " ^ oname); ;; -module Main(C:LeafComparer) = struct - let main goal hypotheses = +let report_error s = prerr_endline (string_of_int (Unix.getpid())^": "^s);; + +module Main(P : Paramod.Paramod with type t = leaf) = struct + + let run bag g_passives passives pp_unit_clause name = + match + P.paramod + ~max_steps:max_int bag ~g_passives:[g_passives] ~passives + with + | P.Error s -> report_error s; 3 + | P.Unsatisfiable ((bag,_,l)::_) -> + success_msg bag l pp_unit_clause name; 0 + | P.Unsatisfiable ([]) -> + report_error "Unsatisfiable but no solution output"; 3 + | P.GaveUp -> 2 + | P.Timeout _ -> 1 + ;; +end + +let worker order goal hypotheses = + let module C = + struct type t = leaf let cmp (a,_) (b,_) = Pervasives.compare a b end + in let module B = MakeBlob(C) in let module Pp = Pp.Pp(B) in - let module P = Paramod.Paramod(B) in - let bag = Terms.M.empty, 0 in + let module O = Orderings.NRKBO(B) in (* just for processing the clauses *) + let module P = Paramod.Paramod(O) in + let module Stats = Stats.Stats(O) in + 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 passives g_passives Pp.pp_unit_clause; - match - P.paramod - ~max_steps:max_int bag ~g_passives:[g_passives] ~passives - with - | [] -> () - | (bag,_,l)::_ -> success_msg bag l Pp.pp_unit_clause + (* TODO: do stats analysys there and generate a new + * C and then B + * TODO: rebuild clauses, since the ordering has to + * change after the stats are computed *) + let symb_list = Stats.parse_symbols passives g_passives in + prerr_endline "Hypotheses statistics :"; + List.iter (fun (t,occ,ar,g_occ) -> prerr_endline + (Printf.sprintf "%s %d %d %d %s" + (B.pp t) ar occ g_occ + (String.concat "," + (List.map B.pp (Stats.dependencies t passives)))); + if List.exists + (fun (u,occ2,ar2,g_occ2) -> not (B.eq t u) && occ = occ2 + && ar = ar2 && g_occ = g_occ2) symb_list + then prerr_endline ((B.pp t) ^ " clashes") + ) symb_list; + let module C = C in + let module B = MakeBlob(C) in + match order with + | `NRKBO -> + let module O = Orderings.NRKBO(B) in + let module Main = Main(Paramod.Paramod(O)) in + start_msg passives g_passives Pp.pp_unit_clause O.name; + Main.run bag g_passives passives Pp.pp_unit_clause O.name + | `KBO -> + let module O = Orderings.KBO(B) in + let module Main = Main(Paramod.Paramod(O)) in + start_msg passives g_passives Pp.pp_unit_clause O.name; + Main.run bag g_passives passives Pp.pp_unit_clause O.name + | `LPO -> + let module O = Orderings.LPO(B) in + let module Main = Main(Paramod.Paramod(O)) in + start_msg passives g_passives Pp.pp_unit_clause O.name; + Main.run bag g_passives passives Pp.pp_unit_clause O.name +;; + +let print_status p = + let print_endline s = prerr_endline (string_of_int p ^ ": " ^ s) in + function + | Unix.WEXITED 0 -> + print_endline ("status Unsatisfiable for " ^ + Filename.basename !problem_file); + | Unix.WEXITED 1 -> + print_endline ("status Timeout for " ^ + Filename.basename !problem_file); + | Unix.WEXITED 2 -> + print_endline ("status GaveUp for " ^ + Filename.basename !problem_file); + | Unix.WEXITED 3 -> + print_endline ("status Error for " ^ + Filename.basename !problem_file); + | Unix.WEXITED _ -> assert false + | Unix.WSIGNALED s -> print_endline ("killed by signal " ^ string_of_int s) + | Unix.WSTOPPED _ -> print_endline "stopped" ;; -end let killall l = List.iter (fun pid -> try Unix.kill pid 9 with _ -> ()) l @@ -144,7 +222,8 @@ let main () = Matitaprover is the first order automatic prover that equips the Matita interactive theorem prover (http://matita.cs.unibo.it). -Developed by A.Asperti, M.Denes and E.Tassi, released under GPL-2.1 +Developed by A.Asperti, M.Denes and E.Tassi, released under GPL version 2 +or at your option any later version. If --tptppath is given, instead of the problem file you can just give the problem name with the .p suffix (e.g. BOO001-1.p) @@ -160,19 +239,27 @@ usage: matitaprover [options] problemfile"; List.map (fun f -> let pid = Unix.fork () in - if pid = 0 then (f ();exit 0) else pid) + if pid = 0 then (exit (f ())) else pid) [ - (fun () -> - let module M = Main(struct let cmp (a,_) (b,_) = compare a b end) in - M.main goal hypotheses) + (fun () -> worker `NRKBO goal hypotheses) ; - (fun () -> - let module M = Main(struct let cmp (a,_) (b,_) = compare b a end) in - M.main goal hypotheses) + (fun () -> worker `KBO goal hypotheses) + ; + (fun () -> worker `LPO goal hypotheses) ]; - let _ = Unix.wait () in - killall !childs; - exit 0; + let rec aux () = + if List.length !childs = 0 then + (fail_msg (); exit 1) + else + match Unix.wait () with + | p, (Unix.WEXITED 0 as s) -> + print_status p s; + killall !childs; exit 0; + | p, s -> + print_status p s; + childs := List.filter ((<>)p) !childs; aux () + in + aux () ;; main ()