X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fbinaries%2Fmatitaprover%2Fmatitaprover.ml;h=3736c024dbf02a4b2199f235480bccbae8e4bab4;hb=4693f3b9de6d867921b51f61e9a7dc36c3da1b77;hp=35d6fd79c4ea6468bbc498b8ac175a108992b266;hpb=b69275324ae2d436f2f4dbb70e0ddcbdf3886636;p=helm.git diff --git a/helm/software/components/binaries/matitaprover/matitaprover.ml b/helm/software/components/binaries/matitaprover/matitaprover.ml index 35d6fd79c..3736c024d 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 @@ -78,7 +79,9 @@ 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.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 " ^ @@ -89,10 +92,15 @@ let success_msg bag l (pp : ?margin:int -> leaf Terms.unit_clause -> string) = print_endline (pp ~margin:max_int 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) = +let start_msg stats passives g_passives (pp : ?margin:int -> leaf Terms.clause -> string) oname = let prefix = string_of_int (Unix.getpid ()) in let prerr_endline s = prerr_endline (prefix ^ ": " ^ s) in prerr_endline "Facts:"; @@ -100,31 +108,34 @@ let start_msg passives g_passives (pp : leaf Terms.unit_clause -> string) = prerr_endline "Goal:"; prerr_endline (" " ^ pp g_passives); prerr_endline "Order:"; - prerr_endline " ...fixme..."; - prerr_endline "Strategy:"; - prerr_endline " ...fixme..."; + 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:LeafComparer) = struct - let main goal hypotheses = - let module B = MakeBlob(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 run ~useage ~printmsg stats goal hypotheses pp_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; - match - P.paramod + if printmsg then start_msg stats passives g_passives pp_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; 0 + success_msg bag l pp_clause name; 0 | P.Unsatisfiable ([]) -> report_error "Unsatisfiable but no solution output"; 3 | P.GaveUp -> 2 @@ -132,6 +143,86 @@ module Main(C:LeafComparer) = 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_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_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_clause O.name +;; + let print_status p = let print_endline s = prerr_endline (string_of_int p ^ ": " ^ s) in function @@ -175,7 +266,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) @@ -193,13 +285,13 @@ usage: matitaprover [options] problemfile"; let pid = Unix.fork () in 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 ~useage:true ~printmsg:true goal hypotheses) + ; + (fun () -> worker `KBO ~useage:true ~printmsg:false goal hypotheses) + ; + (fun () -> worker `LPO ~useage:true ~printmsg:false goal hypotheses) ; - (fun () -> - let module M = Main(struct let cmp (a,_) (b,_) = compare b a end) in - M.main goal hypotheses) + (fun () -> worker `NRKBO ~useage:false ~printmsg:false goal hypotheses) ]; let rec aux () = if List.length !childs = 0 then