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
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 " ^
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 =
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 ^ " " ^
+ 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;
+ String.concat "," (List.map snd l))) stats;*)
;;
let report_error s = prerr_endline (string_of_int (Unix.getpid())^": "^s);;
+
module Main(P : Paramod.Paramod with type t = leaf) = struct
- let run 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
+ P.paramod ~useage
~max_steps:max_int bag ~g_passives:[g_passives] ~passives
with
| P.Error s -> report_error s; 3
name, (n_occ, arity, n_gocc, g_pos, Stats.dependencies name passives))
data
in
- List.sort Pervasives.compare data
+ 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 goal hypotheses =
+let worker order ~useage ~printmsg goal hypotheses =
let stats = compute_stats goal hypotheses in
let module C =
struct
if List.length raw =
List.length (HExtlib.list_uniq raw)
then
- (prerr_endline "NO CLASH, using fixed ground order";
+ ((*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";
+ ((*prerr_endline "CLASH, statistics insufficient";*)
fun (a,_) (b,_) -> Pervasives.compare a b)
;;
end
| `NRKBO ->
let module O = Orderings.NRKBO(B) in
let module Main = Main(Paramod.Paramod(O)) in
- Main.run 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 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 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 " ^
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).
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 goal hypotheses)
+ (fun () -> worker `NRKBO ~useage:true ~printmsg:true goal hypotheses)
;
-(*
- (fun () -> worker `KBO goal hypotheses)
+ (fun () -> worker `KBO ~useage:true ~printmsg:false goal hypotheses)
+ ;
+ (fun () -> worker `LPO ~useage:true ~printmsg:false goal hypotheses)
;
- (fun () -> worker `LPO goal hypotheses)
-*)
+ (fun () -> worker `NRKBO ~useage:false ~printmsg:false goal hypotheses)
];
let rec aux () =
if List.length !childs = 0 then
projects / helm.git / blobdiff