took out CVC3 again -- there seems to be issues with the server version of CVC3 + minor tweaks
--- a/src/HOL/TPTP/MaSh_Export.thy Mon Jul 23 09:28:03 2012 +0200
+++ b/src/HOL/TPTP/MaSh_Export.thy Mon Jul 23 15:32:30 2012 +0200
@@ -11,7 +11,7 @@
sledgehammer_params
[provers = e, max_relevant = 40, strict, dont_slice, type_enc = poly_guards??,
- lam_trans = combs_and_lifting, timeout = 5, dont_preplay, minimize]
+ lam_trans = combs_and_lifting, timeout = 1, dont_preplay, minimize]
ML {*
open MaSh_Export
@@ -66,5 +66,4 @@
()
*}
-
end
--- a/src/HOL/Tools/Sledgehammer/sledgehammer_isar.ML Mon Jul 23 09:28:03 2012 +0200
+++ b/src/HOL/Tools/Sledgehammer/sledgehammer_isar.ML Mon Jul 23 15:32:30 2012 +0200
@@ -226,7 +226,7 @@
(* The first ATP of the list is used by Auto Sledgehammer. Because of the low
timeout, it makes sense to put E first. *)
fun default_provers_param_value ctxt =
- [eN, spassN, vampireN, z3N, e_sineN, waldmeisterN, yicesN, cvc3N]
+ [eN, spassN, vampireN, z3N, e_sineN, waldmeisterN, yicesN]
|> map_filter (remotify_prover_if_not_installed ctxt)
|> avoid_too_many_threads ctxt (Multithreading.max_threads_value (),
max_default_remote_threads)
@@ -404,11 +404,11 @@
else
();
mash_learn ctxt (get_params Normal ctxt
- (("timeout",
- [string_of_real default_learn_atp_timeout]) ::
+ ([("timeout",
+ [string_of_real default_learn_atp_timeout]),
+ ("slice", ["false"])] @
override_params @
- [("slice", ["false"]),
- ("minimize", ["true"]),
+ [("minimize", ["true"]),
("preplay_timeout", ["0"])]))
fact_override (#facts (Proof.goal state))
(subcommand = learn_atpN orelse subcommand = relearn_atpN))