--- a/src/HOL/Mirabelle/Tools/mirabelle_sledgehammer.ML Thu Oct 01 14:11:28 2009 +0200
+++ b/src/HOL/Mirabelle/Tools/mirabelle_sledgehammer.ML Thu Oct 01 15:19:49 2009 +0200
@@ -24,6 +24,7 @@
calls: int,
success: int,
lemmas: int,
+ max_lems: int,
time_isa: int,
time_atp: int,
time_atp_fail: int}
@@ -35,6 +36,7 @@
time: int,
timeout: int,
lemmas: int,
+ max_lems: int,
posns: Position.T list
}
@@ -49,125 +51,141 @@
*)
datatype data = Data of sh_data * me_data * min_data * me_data
-fun make_sh_data (calls,success,lemmas,time_isa,time_atp,time_atp_fail) =
- ShData{calls=calls, success=success, lemmas=lemmas, time_isa=time_isa,
- time_atp=time_atp, time_atp_fail=time_atp_fail}
+fun make_sh_data
+ (calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail) =
+ ShData{calls=calls, success=success, lemmas=lemmas, max_lems=max_lems,
+ time_isa=time_isa, time_atp=time_atp, time_atp_fail=time_atp_fail}
fun make_min_data (succs, ab_ratios, it_ratios) =
MinData{succs=succs, ab_ratios=ab_ratios, it_ratios=it_ratios}
-fun make_me_data (calls, success, proofs, time, timeout, lemmas, posns) =
- MeData{calls=calls, success=success, proofs=proofs, time=time, timeout=timeout, lemmas=lemmas, posns=posns}
+fun make_me_data (calls,success,proofs,time,timeout,lemmas,max_lems,posns) =
+ MeData{calls=calls, success=success, proofs=proofs, time=time,
+ timeout=timeout, lemmas=lemmas, max_lems=max_lems, posns=posns}
val empty_data =
- Data(make_sh_data (0, 0, 0, 0, 0, 0),
- make_me_data(0, 0, 0, 0, 0, 0, []),
+ Data(make_sh_data (0, 0, 0, 0, 0, 0, 0),
+ make_me_data(0, 0, 0, 0, 0, 0, 0, []),
MinData{succs=0, ab_ratios=0, it_ratios=0},
- make_me_data(0, 0, 0, 0, 0, 0, []))
+ make_me_data(0, 0, 0, 0, 0, 0, 0, []))
fun map_sh_data f
- (Data (ShData{calls, success, lemmas, time_isa, time_atp, time_atp_fail}, meda0, minda, meda)) =
- Data (make_sh_data (f (calls, success, lemmas, time_isa, time_atp, time_atp_fail)),
+ (Data(ShData{calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail},
+ meda0, minda, meda)) =
+ Data (make_sh_data (f (calls,success,lemmas,max_lems,
+ time_isa,time_atp,time_atp_fail)),
meda0, minda, meda)
fun map_min_data f
(Data(shda, meda0, MinData{succs,ab_ratios,it_ratios}, meda)) =
Data(shda, meda0, make_min_data(f(succs,ab_ratios,it_ratios)), meda)
-fun map_me_data0 f (Data (shda, MeData{calls,success,proofs,time,timeout,lemmas,posns}, minda, meda)) =
- Data(shda, make_me_data(f (calls,success,proofs,time,timeout,lemmas,posns)), minda, meda)
+fun map_me_data0 f (Data (shda, MeData{calls,success,proofs,time,timeout,lemmas,max_lems,posns}, minda, meda)) =
+ Data(shda, make_me_data(f (calls,success,proofs,time,timeout,lemmas,max_lems,posns)), minda, meda)
-fun map_me_data f (Data (shda, meda0, minda, MeData{calls,success,proofs,time,timeout,lemmas,posns})) =
- Data(shda, meda0, minda, make_me_data(f (calls,success,proofs,time,timeout,lemmas,posns)))
+fun map_me_data f (Data (shda, meda0, minda, MeData{calls,success,proofs,time,timeout,lemmas,max_lems,posns})) =
+ Data(shda, meda0, minda, make_me_data(f (calls,success,proofs,time,timeout,lemmas,max_lems,posns)))
-val inc_sh_calls =
- map_sh_data (fn (calls, success, lemmas, time_isa, time_atp, time_atp_fail)
- => (calls + 1, success, lemmas, time_isa, time_atp, time_atp_fail))
+val inc_sh_calls = map_sh_data
+ (fn (calls, success, lemmas,max_lems, time_isa, time_atp, time_atp_fail)
+ => (calls + 1, success, lemmas,max_lems, time_isa, time_atp, time_atp_fail))
-val inc_sh_success =
- map_sh_data (fn (calls, success, lemmas, time_isa, time_atp, time_atp_fail)
- => (calls, success + 1, lemmas, time_isa, time_atp, time_atp_fail))
+val inc_sh_success = map_sh_data
+ (fn (calls, success, lemmas,max_lems, time_isa, time_atp, time_atp_fail)
+ => (calls, success + 1, lemmas,max_lems, time_isa, time_atp, time_atp_fail))
-fun inc_sh_lemmas n =
- map_sh_data (fn (calls, success, lemmas, time_isa, time_atp, time_atp_fail)
- => (calls, success, lemmas + n, time_isa, time_atp, time_atp_fail))
+fun inc_sh_lemmas n = map_sh_data
+ (fn (calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail)
+ => (calls,success,lemmas+n,max_lems,time_isa,time_atp,time_atp_fail))
-fun inc_sh_time_isa t =
- map_sh_data (fn (calls, success, lemmas, time_isa, time_atp, time_atp_fail)
- => (calls, success, lemmas, time_isa + t, time_atp, time_atp_fail))
+fun inc_sh_max_lems n = map_sh_data
+ (fn (calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail)
+ => (calls,success,lemmas,Int.max(max_lems,n),time_isa,time_atp,time_atp_fail))
-fun inc_sh_time_atp t =
- map_sh_data (fn (calls, success, lemmas, time_isa, time_atp, time_atp_fail)
- => (calls, success, lemmas, time_isa, time_atp + t, time_atp_fail))
+fun inc_sh_time_isa t = map_sh_data
+ (fn (calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail)
+ => (calls,success,lemmas,max_lems,time_isa + t,time_atp,time_atp_fail))
+
+fun inc_sh_time_atp t = map_sh_data
+ (fn (calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail)
+ => (calls,success,lemmas,max_lems,time_isa,time_atp + t,time_atp_fail))
-fun inc_sh_time_atp_fail t =
- map_sh_data (fn (calls, success, lemmas, time_isa, time_atp, time_atp_fail)
- => (calls, success, lemmas, time_isa, time_atp, time_atp_fail + t))
+fun inc_sh_time_atp_fail t = map_sh_data
+ (fn (calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail)
+ => (calls,success,lemmas,max_lems,time_isa,time_atp,time_atp_fail + t))
-val inc_min_succs =
- map_min_data (fn (succs,ab_ratios,it_ratios) => (succs+1, ab_ratios, it_ratios))
+val inc_min_succs = map_min_data
+ (fn (succs,ab_ratios,it_ratios) => (succs+1, ab_ratios, it_ratios))
-fun inc_min_ab_ratios r =
- map_min_data (fn (succs, ab_ratios, it_ratios) => (succs, ab_ratios+r, it_ratios))
+fun inc_min_ab_ratios r = map_min_data
+ (fn (succs, ab_ratios, it_ratios) => (succs, ab_ratios+r, it_ratios))
-fun inc_min_it_ratios r =
- map_min_data (fn (succs, ab_ratios, it_ratios) => (succs, ab_ratios, it_ratios+r))
+fun inc_min_it_ratios r = map_min_data
+ (fn (succs, ab_ratios, it_ratios) => (succs, ab_ratios, it_ratios+r))
val inc_metis_calls = map_me_data
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls + 1, success, proofs, time, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls + 1, success, proofs, time, timeout, lemmas,max_lems,posns))
val inc_metis_success = map_me_data
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success + 1, proofs, time, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success + 1, proofs, time, timeout, lemmas,max_lems,posns))
val inc_metis_proofs = map_me_data
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs + 1, time, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs + 1, time, timeout, lemmas,max_lems,posns))
fun inc_metis_time t = map_me_data
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time + t, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time + t, timeout, lemmas,max_lems,posns))
val inc_metis_timeout = map_me_data
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time, timeout + 1, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time, timeout + 1, lemmas,max_lems,posns))
fun inc_metis_lemmas n = map_me_data
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time, timeout, lemmas + n, posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time, timeout, lemmas+n, max_lems, posns))
+
+fun inc_metis_max_lems n = map_me_data
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls,success,proofs,time,timeout,lemmas,Int.max(max_lems,n), posns))
fun inc_metis_posns pos = map_me_data
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time, timeout, lemmas, pos::posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time, timeout, lemmas,max_lems, pos::posns))
val inc_metis_calls0 = map_me_data0
-(fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls + 1, success, proofs, time, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls + 1, success, proofs, time, timeout, lemmas,max_lems,posns))
val inc_metis_success0 = map_me_data0
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success + 1, proofs, time, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success + 1, proofs, time, timeout, lemmas,max_lems,posns))
val inc_metis_proofs0 = map_me_data0
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs + 1, time, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs + 1, time, timeout, lemmas,max_lems,posns))
fun inc_metis_time0 t = map_me_data0
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time + t, timeout, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time + t, timeout, lemmas,max_lems,posns))
val inc_metis_timeout0 = map_me_data0
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time, timeout + 1, lemmas,posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time, timeout + 1, lemmas,max_lems,posns))
fun inc_metis_lemmas0 n = map_me_data0
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time, timeout, lemmas + n, posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time, timeout, lemmas+n, max_lems, posns))
+
+fun inc_metis_max_lems0 n = map_me_data0
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls,success,proofs,time,timeout,lemmas,Int.max(max_lems,n), posns))
fun inc_metis_posns0 pos = map_me_data0
- (fn (calls,success,proofs,time,timeout,lemmas,posns)
- => (calls, success, proofs, time, timeout, lemmas, pos::posns))
+ (fn (calls,success,proofs,time,timeout,lemmas,max_lems,posns)
+ => (calls, success, proofs, time, timeout, lemmas,max_lems, pos::posns))
local
@@ -178,20 +196,21 @@
fun avg_time t n =
if n > 0 then (Real.fromInt t / 1000.0) / Real.fromInt n else 0.0
-fun log_sh_data log sh_calls sh_success sh_lemmas sh_time_isa sh_time_atp sh_time_atp_fail =
- (log ("Total number of sledgehammer calls: " ^ str sh_calls);
- log ("Number of successful sledgehammer calls: " ^ str sh_success);
- log ("Number of sledgehammer lemmas: " ^ str sh_lemmas);
- log ("Success rate: " ^ percentage sh_success sh_calls ^ "%");
- log ("Total time for sledgehammer calls (Isabelle): " ^ str3 (time sh_time_isa));
- log ("Total time for successful sledgehammer calls (ATP): " ^ str3 (time sh_time_atp));
- log ("Total time for failed sledgehammer calls (ATP): " ^ str3 (time sh_time_atp_fail));
+fun log_sh_data log calls success lemmas max_lems time_isa time_atp time_atp_fail =
+ (log ("Total number of sledgehammer calls: " ^ str calls);
+ log ("Number of successful sledgehammer calls: " ^ str success);
+ log ("Number of sledgehammer lemmas: " ^ str lemmas);
+ log ("Max number of sledgehammer lemmas: " ^ str max_lems);
+ log ("Success rate: " ^ percentage success calls ^ "%");
+ log ("Total time for sledgehammer calls (Isabelle): " ^ str3 (time time_isa));
+ log ("Total time for successful sledgehammer calls (ATP): " ^ str3 (time time_atp));
+ log ("Total time for failed sledgehammer calls (ATP): " ^ str3 (time time_atp_fail));
log ("Average time for sledgehammer calls (Isabelle): " ^
- str3 (avg_time sh_time_isa sh_calls));
+ str3 (avg_time time_isa calls));
log ("Average time for successful sledgehammer calls (ATP): " ^
- str3 (avg_time sh_time_atp sh_success));
+ str3 (avg_time time_atp success));
log ("Average time for failed sledgehammer calls (ATP): " ^
- str3 (avg_time sh_time_atp_fail (sh_calls - sh_success)))
+ str3 (avg_time time_atp_fail (calls - success)))
)
@@ -200,13 +219,14 @@
in str0 (Position.line_of pos) ^ ":" ^ str0 (Position.column_of pos) end
fun log_metis_data log tag sh_calls sh_success metis_calls metis_success metis_proofs metis_time
- metis_timeout metis_lemmas metis_posns =
+ metis_timeout metis_lemmas metis_max_lems metis_posns =
(log ("Total number of " ^ tag ^ "metis calls: " ^ str metis_calls);
log ("Number of successful " ^ tag ^ "metis calls: " ^ str metis_success ^
" (proof: " ^ str metis_proofs ^ ")");
log ("Number of " ^ tag ^ "metis timeouts: " ^ str metis_timeout);
log ("Success rate: " ^ percentage metis_success sh_calls ^ "%");
log ("Number of successful " ^ tag ^ "metis lemmas: " ^ str metis_lemmas);
+ log ("Max number of successful " ^ tag ^ "metis lemmas: " ^ str metis_max_lems);
log ("Total time for successful metis calls: " ^ str3 (time metis_time));
log ("Average time for successful metis calls: " ^
str3 (avg_time metis_time metis_success));
@@ -224,27 +244,27 @@
in
fun log_data id log (Data
- (ShData{calls=sh_calls, lemmas=sh_lemmas, success=sh_success,
+ (ShData{calls=sh_calls, lemmas=sh_lemmas, max_lems=sh_max_lems, success=sh_success,
time_isa=sh_time_isa,time_atp=sh_time_atp,time_atp_fail=sh_time_atp_fail},
MeData{calls=metis_calls0, proofs=metis_proofs0,
success=metis_success0, time=metis_time0, timeout=metis_timeout0,
- lemmas=metis_lemmas0,posns=metis_posns0},
+ lemmas=metis_lemmas0,max_lems=metis_max_lems0,posns=metis_posns0},
MinData{succs=min_succs, ab_ratios=ab_ratios, it_ratios=it_ratios},
MeData{calls=metis_calls, proofs=metis_proofs,
success=metis_success, time=metis_time, timeout=metis_timeout,
- lemmas=metis_lemmas,posns=metis_posns})) =
+ lemmas=metis_lemmas,max_lems=metis_max_lems,posns=metis_posns})) =
if sh_calls > 0
then
(log ("\n\n\nReport #" ^ string_of_int id ^ ":\n");
- log_sh_data log sh_calls sh_success sh_lemmas sh_time_isa sh_time_atp sh_time_atp_fail;
+ log_sh_data log sh_calls sh_success sh_lemmas sh_max_lems sh_time_isa sh_time_atp sh_time_atp_fail;
log "";
if metis_calls > 0 then log_metis_data log "" sh_calls sh_success metis_calls
- metis_success metis_proofs metis_time metis_timeout metis_lemmas metis_posns else ();
+ metis_success metis_proofs metis_time metis_timeout metis_lemmas metis_max_lems metis_posns else ();
log "";
if metis_calls0 > 0
then (log_min_data log min_succs ab_ratios it_ratios; log "";
log_metis_data log "unminimized " sh_calls sh_success metis_calls0
- metis_success0 metis_proofs0 metis_time0 metis_timeout0 metis_lemmas0 metis_posns0)
+ metis_success0 metis_proofs0 metis_time0 metis_timeout0 metis_lemmas0 metis_max_lems0 metis_posns0)
else ()
)
else ()
@@ -338,15 +358,14 @@
in
case result of
SH_OK (time_isa, time_atp, names) =>
- let
- val _ = change_data id inc_sh_success
- val _ = change_data id (inc_sh_lemmas (length names))
- val _ = change_data id (inc_sh_time_isa time_isa)
- val _ = change_data id (inc_sh_time_atp time_atp)
-
- fun get_thms name = (name, thms_of_name (Proof.context_of st) name)
- val _ = named_thms := SOME (map get_thms names)
+ let fun get_thms name = (name, thms_of_name (Proof.context_of st) name)
in
+ change_data id inc_sh_success;
+ change_data id (inc_sh_lemmas (length names));
+ change_data id (inc_sh_max_lems (length names));
+ change_data id (inc_sh_time_isa time_isa);
+ change_data id (inc_sh_time_atp time_atp);
+ named_thms := SOME (map get_thms names);
log (sh_tag id ^ "succeeded (" ^ string_of_int time_isa ^ "+" ^
string_of_int time_atp ^ ") [" ^ prover_name ^ "]:\n" ^ msg)
end
@@ -387,7 +406,7 @@
fun run_metis (inc_metis_calls, inc_metis_success, inc_metis_proofs, inc_metis_time, inc_metis_timeout,
- inc_metis_lemmas, inc_metis_posns) args name named_thms id
+ inc_metis_lemmas, inc_metis_max_lems, inc_metis_posns) args name named_thms id
({pre=st, timeout, log, pos, ...}: Mirabelle.run_args) =
let
fun metis thms ctxt = MetisTools.metis_tac ctxt thms
@@ -396,6 +415,7 @@
fun with_time (false, t) = "failed (" ^ string_of_int t ^ ")"
| with_time (true, t) = (change_data id inc_metis_success;
change_data id (inc_metis_lemmas (length named_thms));
+ change_data id (inc_metis_max_lems (length named_thms));
change_data id (inc_metis_time t);
change_data id (inc_metis_posns pos);
if name = "proof" then change_data id inc_metis_proofs else ();
@@ -413,13 +433,14 @@
end
fun sledgehammer_action args id (st as {log, pre, name, ...}: Mirabelle.run_args) =
- if can Logic.dest_conjunction (Thm.major_prem_of(snd(snd(Proof.get_goal pre))))
+ let val goal = Thm.major_prem_of(snd(snd(Proof.get_goal pre))) in
+ if can Logic.dest_conjunction goal orelse can Logic.dest_equals goal
then () else
let
val metis_fns = (inc_metis_calls, inc_metis_success, inc_metis_proofs, inc_metis_time,
- inc_metis_timeout, inc_metis_lemmas, inc_metis_posns)
+ inc_metis_timeout, inc_metis_lemmas, inc_metis_max_lems, inc_metis_posns)
val metis0_fns = (inc_metis_calls0, inc_metis_success0, inc_metis_proofs0, inc_metis_time0,
- inc_metis_timeout0, inc_metis_lemmas0, inc_metis_posns0)
+ inc_metis_timeout0, inc_metis_lemmas0, inc_metis_max_lems0, inc_metis_posns0)
val named_thms = Unsynchronized.ref (NONE : (string * thm list) list option)
val minimize = AList.defined (op =) args minimizeK
in
@@ -435,6 +456,7 @@
Mirabelle.catch metis_tag (run_metis metis_fns args name (these (!named_thms))) id st)
else ()
end
+ end
fun invoke args =
let