X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Fmatitaprover%2Fmatitaprover.ml;h=f72a7ebc5c2520b6217d61f851fba79e96c1e89f;hb=a14adba81c00c9dcb9996d7af39e4803214606f1;hp=1c837f18dc464830f06ad65caee4a0568d1c2118;hpb=2bcf927f58bac034b8758173cdbd16cb7475de36;p=helm.git diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml index 1c837f18d..f72a7ebc5 100644 --- a/helm/software/components/binaries/matitaprover/matitaprover.ml +++ b/helm/software/components/binaries/matitaprover/matitaprover.ml @@ -13,6 +13,7 @@ module OT = struct type t = string let compare = Pervasives.compare end module HC = Map.Make(OT) +module TS = HTopoSort.Make(OT) type leaf = int * string @@ -32,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 " ^ @@ -66,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 @@ -79,6 +83,8 @@ module MakeBlob(C:LeafComparer) : Terms.Blob ;; 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 " ^ @@ -94,40 +100,56 @@ 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 passives g_passives (pp : leaf Terms.unit_clause -> string) oname = +let start_msg stats passives g_passives (pp : ?margin:int -> 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 "Order:"; +(* prerr_endline "Order:"; prerr_endline (" " ^ oname); + prerr_endline "Leaf order:"; + List.iter (fun ((_,name), (a,b,c,gp,l)) -> + prerr_endline (" " ^name ^ " " ^ string_of_int a ^ " " ^ + string_of_int b ^ " " ^ + string_of_int c ^ " " ^ + String.concat "," (List.map string_of_int gp) ^ + String.concat "," (List.map snd l))) stats;*) ;; let report_error s = prerr_endline (string_of_int (Unix.getpid())^": "^s);; -module Main(C:Orderings.Blob with type t = leaf) = struct - let main goal hypotheses = - let module B = C in - let module Pp = Pp.Pp(B) in - let module P = Paramod.Paramod(B) in + +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 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 C.name; - match - P.paramod + 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)::_) -> - success_msg bag l Pp.pp_unit_clause C.name; 0 + | 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 @@ -135,8 +157,88 @@ module Main(C:Orderings.Blob with type t = leaf) = struct ;; end + let compute_stats 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 O = Orderings.NRKBO(B) in + 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 + let data = Stats.parse_symbols passives g_passives in + let data = + List.map + (fun (name, n_occ, arity, n_gocc, g_pos) -> + name, (n_occ, arity, n_gocc, g_pos, Stats.dependencies name passives)) + data + in + let oplist = List.map (fun ((_,x),_) -> x) data in + let deps op = + (let _,(_,_,_,_,d) = List.find (fun ((_,op'),_) -> op = op') data + in List.map snd d) + in + let oplist = TS.topological_sort oplist deps in + List.sort + (fun ((_,n1),(o1,a1,go1,p1,_)) ((_,n2),(o2,a2,go2,p2,_)) -> + if a1 = 0 && a2 = 0 then 0 + else if a1 = 0 then -1 + else if a2 = 0 then 1 + else let res = Pervasives.compare (a1,o1,-go1,p1) (a2,o2,-go2,p2) + in if res = 0 then Pervasives.compare (HExtlib.list_index ((=) n1) oplist) (HExtlib.list_index ((=) n2) oplist) + else res) + data + ;; + +let worker order ~useage ~printmsg goal hypotheses = + let stats = compute_stats goal hypotheses in + let module C = + struct + let cmp = + let raw = List.map snd stats in + let rec pos x = function + | ((y,_)::tl) when y = x -> 0 + | _::tl -> 1 + pos x tl + | [] -> assert false + in + if List.length raw = + List.length (HExtlib.list_uniq raw) + then + ((*prerr_endline "NO CLASH, using fixed ground order";*) + fun a b -> + Pervasives.compare + (pos a stats) + (pos b stats)) + else + ((*prerr_endline "CLASH, statistics insufficient";*) + fun (a,_) (b,_) -> Pervasives.compare a b) + ;; + end + in + let module B = MakeBlob(C) in + let module Pp = Pp.Pp(B) in + match order with + | `NRKBO -> + let module O = Orderings.NRKBO(B) in + let module Main = Main(Paramod.Paramod(O)) in + 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 ~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 ~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 " ^ @@ -167,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). @@ -190,24 +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 () -> - let module M = Main(Orderings.NRKBO(MakeBlob(struct let cmp (a,_) (b,_) = compare a b end))) in - M.main goal hypotheses) + (fun () -> worker `NRKBO ~useage:true ~printmsg:true goal hypotheses) + ; + (fun () -> worker `KBO ~useage:true ~printmsg:false goal hypotheses) ; - (fun () -> - let module M = Main(Orderings.KBO(MakeBlob(struct let cmp (a,_) (b,_) = compare a b end))) in - M.main goal hypotheses) + (fun () -> worker `LPO ~useage:true ~printmsg:false goal hypotheses) ; - (fun () -> - let module M = Main(Orderings.LPO(MakeBlob(struct let cmp (a,_) (b,_) = compare a b end))) in - M.main goal hypotheses) + (fun () -> worker `NRKBO ~useage:false ~printmsg:false goal hypotheses) ]; let rec aux () = if List.length !childs = 0 then