# HG changeset patch # User blanchet # Date 1359651245 -3600 # Node ID 7aa40b388e92544ab6e1529d2269426ffbd5db6e # Parent 62b992e53eb81ae6d47b5840527b5be9f99fd8f3 tuned slices diff -r 62b992e53eb8 -r 7aa40b388e92 src/HOL/Tools/ATP/atp_systems.ML --- a/src/HOL/Tools/ATP/atp_systems.ML Thu Jan 31 17:54:05 2013 +0100 +++ b/src/HOL/Tools/ATP/atp_systems.ML Thu Jan 31 17:54:05 2013 +0100 @@ -336,12 +336,12 @@ let val heuristic = effective_e_selection_heuristic ctxt in (* FUDGE *) if heuristic = e_smartN then - [(0.1667, (((128, meshN), FOF, "mono_tags??", combsN, false), e_fun_weightN)), - (0.1667, (((128, mashN), FOF, "mono_guards??", combsN, false), e_sym_offset_weightN)), - (0.1666, (((91, mepoN), FOF, "mono_tags??", combsN, false), e_autoN)), - (0.1667, (((64, mashN), FOF, "mono_guards??", combsN, false), e_fun_weightN)), - (0.1667, (((1000, meshN), FOF, "poly_guards??", combsN, false), e_sym_offset_weightN)), - (0.1666, (((256, mepoN), FOF, "mono_tags??", liftingN, false), e_fun_weightN))] + [(0.15, (((128, meshN), FOF, "mono_tags??", combsN, false), e_fun_weightN)), + (0.15, (((128, mashN), FOF, "mono_guards??", combsN, false), e_sym_offset_weightN)), + (0.15, (((91, mepoN), FOF, "mono_tags??", combsN, false), e_autoN)), + (0.15, (((64, mashN), FOF, "mono_guards??", combsN, false), e_fun_weightN)), + (0.15, (((1000, meshN), FOF, "poly_guards??", combsN, false), e_sym_offset_weightN)), + (0.25, (((256, mepoN), FOF, "mono_tags??", liftingN, false), e_fun_weightN))] else [(1.0, (((500, ""), FOF, "mono_tags??", combsN, false), heuristic))] end, @@ -507,14 +507,14 @@ prem_role = Conjecture, best_slices = fn ctxt => (* FUDGE *) - [(0.1667, (((150, meshN), DFG Monomorphic, "mono_native", combsN, true), "")), - (0.1667, (((500, mepoN), DFG Monomorphic, "mono_native", liftingN, true), spass_H2SOS)), - (0.1666, (((50, mashN), DFG Monomorphic, "mono_native", liftingN, true), spass_H2LR0LT0)), - (0.1000, (((250, mepoN), DFG Monomorphic, "mono_native", combsN, true), spass_H2NuVS0)), - (0.1000, (((1000, meshN), DFG Monomorphic, "mono_native", liftingN, true), spass_H1SOS)), - (0.1000, (((150, mashN), DFG Monomorphic, "poly_guards??", liftingN, false), spass_H2NuVS0Red2)), - (0.1000, (((300, mepoN), DFG Monomorphic, "mono_native", combsN, true), spass_H2SOS)), - (0.1000, (((100, meshN), DFG Monomorphic, "mono_native", combs_and_liftingN, true), spass_H2))] + [(0.15, (((150, meshN), DFG Monomorphic, "mono_native", combsN, true), "")), + (0.15, (((500, mepoN), DFG Monomorphic, "mono_native", liftingN, true), spass_H2SOS)), + (0.15, (((50, mashN), DFG Monomorphic, "mono_native", liftingN, true), spass_H2LR0LT0)), + (0.10, (((250, mepoN), DFG Monomorphic, "mono_native", combsN, true), spass_H2NuVS0)), + (0.10, (((1000, meshN), DFG Monomorphic, "mono_native", liftingN, true), spass_H1SOS)), + (0.10, (((150, mashN), DFG Monomorphic, "poly_guards??", liftingN, false), spass_H2NuVS0Red2)), + (0.10, (((300, mepoN), DFG Monomorphic, "mono_native", combsN, true), spass_H2SOS)), + (0.15, (((100, meshN), DFG Monomorphic, "mono_native", combs_and_liftingN, true), spass_H2))] |> (case Config.get ctxt spass_extra_options of "" => I | opts => map (apsnd (apsnd (K opts)))), @@ -561,12 +561,12 @@ best_slices = fn ctxt => (* FUDGE *) (if is_vampire_beyond_1_8 () then - [(0.1667, (((128, meshN), vampire_tff0, "mono_guards??", combs_or_liftingN, false), e_fun_weightN)), - (0.1667, (((128, mashN), vampire_tff0, "poly_tags??", combs_or_liftingN, false), e_sym_offset_weightN)), - (0.1666, (((91, mepoN), vampire_tff0, "mono_native", combsN, false), e_autoN)), - (0.1667, (((64, mashN), vampire_tff0, "mono_tags??", liftingN, false), e_fun_weightN)), - (0.1667, (((1000, meshN), vampire_tff0, "poly_guards??", combs_or_liftingN, false), e_sym_offset_weightN)), - (0.1666, (((256, mepoN), vampire_tff0, "mono_native", combs_or_liftingN, false), e_fun_weightN))] + [(0.20, (((128, meshN), vampire_tff0, "mono_guards??", combs_or_liftingN, false), e_fun_weightN)), + (0.15, (((128, mashN), vampire_tff0, "poly_tags??", combs_or_liftingN, false), e_sym_offset_weightN)), + (0.15, (((91, mepoN), vampire_tff0, "mono_native", combsN, false), e_autoN)), + (0.15, (((64, mashN), vampire_tff0, "mono_tags??", liftingN, false), e_fun_weightN)), + (0.15, (((1000, meshN), vampire_tff0, "poly_guards??", combs_or_liftingN, false), e_sym_offset_weightN)), + (0.20, (((256, mepoN), vampire_tff0, "mono_native", combs_or_liftingN, false), e_fun_weightN))] else [(0.333, (((150, mepoN), FOF, "poly_guards??", combs_or_liftingN, false), sosN)), (0.333, (((500, meshN), FOF, "mono_tags??", combs_or_liftingN, false), sosN)),