open Utils;;
+(* set to false to disable paramodulation inside auto_tac *)
+let connect_to_auto = true;;
+
+
(* profiling statistics... *)
let infer_time = ref 0.;;
let forward_simpl_time = ref 0.;;
let maximal_retained_equality = ref None;;
(* equality-selection related globals *)
-let use_fullred = ref false;;
-let weight_age_ratio = ref 0;; (* settable by the user from the command line *)
+let use_fullred = ref true;;
+let weight_age_ratio = ref 3;; (* settable by the user from the command line *)
let weight_age_counter = ref !weight_age_ratio;;
-let symbols_ratio = ref 0;;
+let symbols_ratio = ref 2;;
let symbols_counter = ref 0;;
(* statistics... *)
type result =
- | Failure
- | Success of Inference.equality option * environment
+ | ParamodulationFailure
+ | ParamodulationSuccess of Inference.equality option * environment
;;
;;
*)
-let symbols_of_equality ((_, (_, left, right, _), _, _) as equality) =
+let symbols_of_equality ((_, _, (_, left, right, _), _, _) as equality) =
let m1 = symbols_of_term left in
let m =
TermMap.fold
;;
-let weight_of_equality (_, (ty, left, right, _), _, _) =
- let meta_number = ref 0 in
- let weight_of t =
- let weight, ml = weight_of_term t in
- meta_number := !meta_number + (List.fold_left (fun r (_, n) -> r+n) 0 ml);
- weight
- in
- (weight_of ty) + (weight_of left) + (weight_of right), meta_number
-;;
-
-
module OrderedEquality = struct
type t = Inference.equality
match meta_convertibility_eq eq1 eq2 with
| true -> 0
| false ->
- let _, (ty, left, right, _), _, _ = eq1
- and _, (ty', left', right', _), _, _ = eq2 in
-(* let w1, m1 = weight_of_equality eq1 *)
-(* and w2, m2 = weight_of_equality eq2 in *)
- let weight_of t = fst (weight_of_term ~consider_metas:false t) in
- let w1 = (weight_of ty) + (weight_of left) + (weight_of right)
- and w2 = (weight_of ty') + (weight_of left') + (weight_of right') in
+ let w1, _, (ty, left, right, _), _, a = eq1
+ and w2, _, (ty', left', right', _), _, a' = eq2 in
+(* let weight_of t = fst (weight_of_term ~consider_metas:false t) in *)
+(* let w1 = (weight_of ty) + (weight_of left) + (weight_of right) *)
+(* and w2 = (weight_of ty') + (weight_of left') + (weight_of right') in *)
match Pervasives.compare w1 w2 with
- | 0 -> Pervasives.compare eq1 eq2
-(* let res = Pervasives.compare m1 m2 in *)
-(* if res = 0 then Pervasives.compare eq1 eq2 else res *)
+ | 0 ->
+ let res = (List.length a) - (List.length a') in
+ if res <> 0 then res else (
+ try
+ let res = Pervasives.compare (List.hd a) (List.hd a') in
+ if res <> 0 then res else Pervasives.compare eq1 eq2
+ with Failure "hd" -> Pervasives.compare eq1 eq2
+(* match a, a' with *)
+(* | (Cic.Meta (i, _)::_), (Cic.Meta (j, _)::_) -> *)
+(* let res = Pervasives.compare i j in *)
+(* if res <> 0 then res else Pervasives.compare eq1 eq2 *)
+(* | _, _ -> Pervasives.compare eq1 eq2 *)
+ )
| res -> res
end
and ratio = float_of_int !weight_age_ratio in
let in_weight = int_of_float (howmany *. ratio /. (ratio +. 1.))
and in_age = int_of_float (howmany /. (ratio +. 1.)) in
- Printf.printf "in_weight: %d, in_age: %d\n" in_weight in_age;
+ debug_print (Printf.sprintf "in_weight: %d, in_age: %d\n" in_weight in_age);
let symbols, card =
match active with
| (Negative, e)::_ ->
let new_neg, new_pos =
match sign with
| Negative ->
- Indexing.superposition_left env active_table current, []
+ let maxm, res =
+ Indexing.superposition_left !maxmeta env active_table current in
+ maxmeta := maxm;
+ res, []
| Positive ->
let maxm, res =
Indexing.superposition_right !maxmeta env active_table current in
let rec infer_positive table = function
| [] -> [], []
| (Negative, equality)::tl ->
- let res = Indexing.superposition_left env table equality in
+ let maxm, res =
+ Indexing.superposition_left !maxmeta env table equality in
+ maxmeta := maxm;
let neg, pos = infer_positive table tl in
res @ neg, pos
| (Positive, equality)::tl ->
try
let found =
List.find
- (fun (proof, (ty, left, right, ordering), m, a) ->
+ (fun (w, proof, (ty, left, right, ordering), m, a) ->
fst (CicReduction.are_convertible context left right ugraph))
negative
in
let demodulate table current =
let newmeta, newcurrent =
- Indexing.demodulation !maxmeta env table current in
+ Indexing.demodulation !maxmeta env table sign current in
maxmeta := newmeta;
if is_identity env newcurrent then
if sign = Negative then Some (sign, newcurrent)
- else (Inference.delete_proof newcurrent; None)
+ else None
else
Some (sign, newcurrent)
in
if ok then res else None
| Some (Positive, c) ->
if Indexing.in_index active_table c then
- (Inference.delete_proof c; None)
+ None
else
match passive_table with
| None -> res
| Some passive_table ->
- if Indexing.in_index passive_table c then
- (Inference.delete_proof c; None)
+ if Indexing.in_index passive_table c then None
else res
(* | Some (s, c) -> if find_duplicate s c all then None else res *)
let t2 = Unix.gettimeofday () in
fs_time_info.build_all <- fs_time_info.build_all +. (t2 -. t1);
- let demodulate table target =
- let newmeta, newtarget = Indexing.demodulation !maxmeta env table target in
+ let demodulate sign table target =
+ let newmeta, newtarget =
+ Indexing.demodulation !maxmeta env table sign target in
maxmeta := newmeta;
newtarget
in
let t1 = Unix.gettimeofday () in
let new_neg, new_pos =
- let new_neg = List.map (demodulate active_table) new_neg
- and new_pos = List.map (demodulate active_table) new_pos in
+ let new_neg = List.map (demodulate Negative active_table) new_neg
+ and new_pos = List.map (demodulate Positive active_table) new_pos in
match passive_table with
| None -> new_neg, new_pos
| Some passive_table ->
- List.map (demodulate passive_table) new_neg,
- List.map (demodulate passive_table) new_pos
+ List.map (demodulate Negative passive_table) new_neg,
+ List.map (demodulate Positive passive_table) new_pos
in
let t2 = Unix.gettimeofday () in
List.fold_left
(fun s e ->
if not (Inference.is_identity env e) then
- if EqualitySet.mem e s then
- (Inference.delete_proof e; s)
- else
- EqualitySet.add e s
- else
- (Inference.delete_proof e; s))
+ if EqualitySet.mem e s then s
+ else EqualitySet.add e s
+ else s)
EqualitySet.empty new_pos
in
let new_pos = EqualitySet.elements new_pos_set in
let is_duplicate =
match passive_table with
| None ->
- (fun e ->
- let ok = not (Indexing.in_index active_table e) in
- if not ok then Inference.delete_proof e;
- ok)
+ (fun e -> not (Indexing.in_index active_table e))
| Some passive_table ->
(fun e ->
- let ok = not ((Indexing.in_index active_table e) ||
- (Indexing.in_index passive_table e)) in
- if not ok then Inference.delete_proof e;
- ok)
+ not ((Indexing.in_index active_table e) ||
+ (Indexing.in_index passive_table e)))
in
new_neg, List.filter is_duplicate new_pos
if List.mem (s, eq) res then
res, tbl
else if (is_identity env eq) || (find eq res) then (
- Inference.delete_proof eq;
res, tbl
) (* else if (find eq res) then *)
(* res, tbl *)
List.fold_right
(fun (s, eq) (n, p) ->
if (s <> Negative) && (is_identity env eq) then (
- Inference.delete_proof eq;
(n, p)
) else
if s = Negative then eq::n, p
if !time_limit = 0. || !processed_clauses = 0 then
passive
else if !elapsed_time > !time_limit then (
- Printf.printf "Time limit (%.2f) reached: %.2f\n"
- !time_limit !elapsed_time;
+ debug_print (Printf.sprintf "Time limit (%.2f) reached: %.2f\n"
+ !time_limit !elapsed_time);
make_passive [] []
) else if kept > selection_estimate then (
- Printf.printf ("Too many passive equalities: pruning... (kept: %d, " ^^
- "selection_estimate: %d)\n") kept selection_estimate;
+ debug_print (Printf.sprintf ("Too many passive equalities: pruning..." ^^
+ "(kept: %d, selection_estimate: %d)\n")
+ kept selection_estimate);
prune_passive selection_estimate active passive
) else
passive
kept_clauses := (size_of_passive passive) + (size_of_active active);
match passive_is_empty passive with
- | true -> Failure
+ | true -> ParamodulationFailure
| false ->
let (sign, current), passive = select env passive active in
let time1 = Unix.gettimeofday () in
given_clause env passive active
| Some (sign, current) ->
if (sign = Negative) && (is_identity env current) then (
- Printf.printf "OK!!! %s %s" (string_of_sign sign)
- (string_of_equality ~env current);
- print_newline ();
- Success (Some current, env)
+ debug_print (Printf.sprintf "OK!!! %s %s" (string_of_sign sign)
+ (string_of_equality ~env current));
+ ParamodulationSuccess (Some current, env)
) else (
- print_endline "\n================================================";
- Printf.printf "selected: %s %s"
- (string_of_sign sign) (string_of_equality ~env current);
- print_newline ();
+ debug_print "\n================================================";
+ debug_print (Printf.sprintf "selected: %s %s"
+ (string_of_sign sign)
+ (string_of_equality ~env current));
let t1 = Unix.gettimeofday () in
let new' = infer env sign current active in
let res, goal = contains_empty env new' in
if res then
- Success (goal, env)
+ ParamodulationSuccess (goal, env)
else
let t1 = Unix.gettimeofday () in
let new' = forward_simplify_new env new' (* ~passive *) active in
al @ [(sign, current)], Indexing.index tbl current
in
let passive = add_to_passive passive new' in
-(* let (_, ns), (_, ps), _ = passive in *)
+ let (_, ns), (_, ps), _ = passive in
(* Printf.printf "passive:\n%s\n" *)
(* (String.concat "\n" *)
(* ((List.map (fun e -> "Negative " ^ *)
(* print_newline (); *)
given_clause env passive active
| true, goal ->
- Success (goal, env)
+ ParamodulationSuccess (goal, env)
)
;;
if !time_limit = 0. || !processed_clauses = 0 then
passive
else if !elapsed_time > !time_limit then (
- Printf.printf "Time limit (%.2f) reached: %.2f\n"
- !time_limit !elapsed_time;
+ debug_print (Printf.sprintf "Time limit (%.2f) reached: %.2f\n"
+ !time_limit !elapsed_time);
make_passive [] []
) else if kept > selection_estimate then (
- Printf.printf ("Too many passive equalities: pruning... (kept: %d, " ^^
- "selection_estimate: %d)\n") kept selection_estimate;
+ debug_print (Printf.sprintf ("Too many passive equalities: pruning..." ^^
+ "(kept: %d, selection_estimate: %d)\n")
+ kept selection_estimate);
prune_passive selection_estimate active passive
) else
passive
kept_clauses := (size_of_passive passive) + (size_of_active active);
match passive_is_empty passive with
- | true -> Failure
+ | true -> ParamodulationFailure
| false ->
let (sign, current), passive = select env passive active in
let time1 = Unix.gettimeofday () in
given_clause_fullred env passive active
| Some (sign, current) ->
if (sign = Negative) && (is_identity env current) then (
- Printf.printf "OK!!! %s %s" (string_of_sign sign)
- (string_of_equality ~env current);
- print_newline ();
- Success (Some current, env)
+ debug_print (Printf.sprintf "OK!!! %s %s" (string_of_sign sign)
+ (string_of_equality ~env current));
+ ParamodulationSuccess (Some current, env)
) else (
- print_endline "\n================================================";
- Printf.printf "selected: %s %s"
- (string_of_sign sign) (string_of_equality ~env current);
- print_newline ();
+ debug_print "\n================================================";
+ debug_print (Printf.sprintf "selected: %s %s"
+ (string_of_sign sign)
+ (string_of_equality ~env current));
let t1 = Unix.gettimeofday () in
let new' = infer env sign current active in
if k < (kept - 1) then
processed_clauses := !processed_clauses + (kept - 1 - k);
-(* let _ = *)
-(* Printf.printf "active:\n%s\n" *)
-(* (String.concat "\n" *)
-(* ((List.map *)
-(* (fun (s, e) -> (string_of_sign s) ^ " " ^ *)
-(* (string_of_equality ~env e)) (fst active)))); *)
-(* print_newline (); *)
-(* in *)
-(* let _ = *)
-(* match new' with *)
-(* | neg, pos -> *)
-(* Printf.printf "new':\n%s\n" *)
-(* (String.concat "\n" *)
-(* ((List.map *)
-(* (fun e -> "Negative " ^ *)
-(* (string_of_equality ~env e)) neg) @ *)
-(* (List.map *)
-(* (fun e -> "Positive " ^ *)
-(* (string_of_equality ~env e)) pos))); *)
-(* print_newline (); *)
-(* in *)
+ let _ =
+ debug_print (
+ Printf.sprintf "active:\n%s\n"
+ (String.concat "\n"
+ ((List.map
+ (fun (s, e) -> (string_of_sign s) ^ " " ^
+ (string_of_equality ~env e)) (fst active)))))
+ in
+ let _ =
+ match new' with
+ | neg, pos ->
+ debug_print (
+ Printf.sprintf "new':\n%s\n"
+ (String.concat "\n"
+ ((List.map
+ (fun e -> "Negative " ^
+ (string_of_equality ~env e)) neg) @
+ (List.map
+ (fun e -> "Positive " ^
+ (string_of_equality ~env e)) pos))))
+ in
match contains_empty env new' with
| false, _ ->
let passive = add_to_passive passive new' in
+(* let (_, ns), (_, ps), _ = passive in *)
+(* Printf.printf "passive:\n%s\n" *)
+(* (String.concat "\n" *)
+(* ((List.map (fun e -> "Negative " ^ *)
+(* (string_of_equality ~env e)) *)
+(* (EqualitySet.elements ns)) @ *)
+(* (List.map (fun e -> "Positive " ^ *)
+(* (string_of_equality ~env e)) *)
+(* (EqualitySet.elements ps)))); *)
+(* print_newline (); *)
given_clause_fullred env passive active
| true, goal ->
- Success (goal, env)
+ ParamodulationSuccess (goal, env)
)
;;
-let get_from_user () =
- let dbd = Mysql.quick_connect
- ~host:"localhost" ~user:"helm" ~database:"mowgli" () in
- let rec get () =
- match read_line () with
- | "" -> []
- | t -> t::(get ())
- in
- let term_string = String.concat "\n" (get ()) in
- let env, metasenv, term, ugraph =
- List.nth (Disambiguate.Trivial.disambiguate_string dbd term_string) 0
- in
- term, metasenv, ugraph
-;;
-
-
let given_clause_ref = ref given_clause;;
-let main () =
+let main dbd term metasenv ugraph =
let module C = Cic in
let module T = CicTypeChecker in
let module PET = ProofEngineTypes in
let module PP = CicPp in
- let term, metasenv, ugraph = get_from_user () in
let proof = None, (1, [], term)::metasenv, C.Meta (1, []), term in
- let proof, goals =
- PET.apply_tactic (PrimitiveTactics.intros_tac ()) (proof, 1) in
- let goal = List.nth goals 0 in
+ let status = PET.apply_tactic (PrimitiveTactics.intros_tac ()) (proof, 1) in
+ let proof, goals = status in
+ let goal' = List.nth goals 0 in
let _, metasenv, meta_proof, _ = proof in
- let _, context, goal = CicUtil.lookup_meta goal metasenv in
+ let _, context, goal = CicUtil.lookup_meta goal' metasenv in
let equalities, maxm = find_equalities context proof in
- maxmeta := maxm; (* TODO ugly!! *)
+(* let library_equalities, maxm = *)
+(* find_library_equalities ~dbd context (proof, goal') (maxm+1) *)
+(* in *)
+ maxmeta := maxm+2; (* TODO ugly!! *)
+ let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
+ let new_meta_goal, metasenv, type_of_goal =
+ let _, context, ty = CicUtil.lookup_meta goal' metasenv in
+ Printf.printf "\n\nTIPO DEL GOAL: %s\n" (CicPp.ppterm ty);
+ print_newline ();
+ Cic.Meta (maxm+1, irl),
+ (maxm+1, context, ty)::metasenv,
+ ty
+ in
+(* let new_meta_goal = Cic.Meta (goal', irl) in *)
let env = (metasenv, context, ugraph) in
try
- let term_equality = equality_of_term meta_proof goal in
- let meta_proof, (eq_ty, left, right, ordering), _, _ = term_equality in
+ let term_equality = equality_of_term new_meta_goal goal in
+ let _, meta_proof, (eq_ty, left, right, ordering), _, _ = term_equality in
let active = make_active () in
- let passive = make_passive [term_equality] equalities in
+ let passive =
+ make_passive [term_equality] (equalities (* @ library_equalities *))
+ in
Printf.printf "\ncurrent goal: %s\n"
(string_of_equality ~env term_equality);
Printf.printf "\ncontext:\n%s\n" (PP.ppcontext context);
let finish = Unix.gettimeofday () in
let _ =
match res with
- | Failure ->
+ | ParamodulationFailure ->
Printf.printf "NO proof found! :-(\n\n"
- | Success (Some goal, env) ->
- Printf.printf "OK, found a proof!\n";
- let proof = Inference.build_term_proof goal in
- print_endline (PP.pp proof (names_of_context context));
- print_endline (string_of_float (finish -. start));
- | Success (None, env) ->
+ | ParamodulationSuccess (Some goal, env) ->
+ let proof = Inference.build_proof_term goal in
+ let newmetasenv =
+ List.fold_left
+ (fun m (_, _, _, menv, _) -> m @ menv) metasenv equalities
+ in
+ let _ =
+ try
+ let ty, ug =
+ CicTypeChecker.type_of_aux' newmetasenv context proof ugraph
+ in
+ Printf.printf "OK, found a proof!\n";
+ (* REMEMBER: we have to instantiate meta_proof, we should use
+ apply the "apply" tactic to proof and status
+ *)
+ let names = names_of_context context in
+ print_endline (PP.pp proof names);
+ (* print_endline (PP.ppterm proof); *)
+
+ print_endline (string_of_float (finish -. start));
+ Printf.printf
+ "\nGOAL was: %s\nPROOF has type: %s\nconvertible?: %s\n\n"
+ (CicPp.pp type_of_goal names) (CicPp.pp ty names)
+ (string_of_bool
+ (fst (CicReduction.are_convertible
+ context type_of_goal ty ug)));
+ with e ->
+ Printf.printf "\nEXCEPTION!!! %s\n" (Printexc.to_string e);
+ Printf.printf "MAXMETA USED: %d\n" !maxmeta;
+ in
+ ()
+
+ | ParamodulationSuccess (None, env) ->
Printf.printf "Success, but no proof?!?\n\n"
in
Printf.printf ("infer_time: %.9f\nforward_simpl_time: %.9f\n" ^^
;;
-let configuration_file = ref "../../gTopLevel/gTopLevel.conf.xml";;
-
-let _ =
- let set_ratio v = weight_age_ratio := (v+1); weight_age_counter := (v+1)
- and set_sel v = symbols_ratio := v; symbols_counter := v;
- and set_conf f = configuration_file := f
- and set_lpo () = Utils.compare_terms := lpo
- and set_kbo () = Utils.compare_terms := nonrec_kbo
- and set_fullred () = use_fullred := true
- and set_time_limit v = time_limit := float_of_int v
+let saturate dbd (proof, goal) =
+ let module C = Cic in
+ maxmeta := 0;
+ let goal' = goal in
+ let uri, metasenv, meta_proof, term_to_prove = proof in
+ let _, context, goal = CicUtil.lookup_meta goal' metasenv in
+ let equalities, maxm = find_equalities context proof in
+ let library_equalities, maxm =
+ find_library_equalities ~dbd context (proof, goal') (maxm+2)
in
- Arg.parse [
- "-f", Arg.Unit set_fullred, "Use full-reduction strategy";
-
- "-r", Arg.Int set_ratio, "Weight-Age equality selection ratio (default: 0)";
-
- "-s", Arg.Int set_sel,
- "symbols-based selection ratio (relative to the weight ratio)";
+ maxmeta := maxm+2;
+ let new_meta_goal, metasenv, type_of_goal =
+ let irl =
+ CicMkImplicit.identity_relocation_list_for_metavariable context in
+ let _, context, ty = CicUtil.lookup_meta goal' metasenv in
+ debug_print (Printf.sprintf "\n\nTIPO DEL GOAL: %s\n" (CicPp.ppterm ty));
+ Cic.Meta (maxm+1, irl),
+ (maxm+1, context, ty)::metasenv,
+ ty
+ in
+ let ugraph = CicUniv.empty_ugraph in
+ let env = (metasenv, context, ugraph) in
+(* try *)
+ let term_equality = equality_of_term new_meta_goal goal in
+ let active = make_active () in
+ let passive =
+ make_passive [term_equality] (equalities @ library_equalities)
+ in
+ let res = given_clause_fullred env passive active in
+ match res with
+ | ParamodulationSuccess (Some goal, env) ->
+ debug_print "OK, found a proof!";
+ let proof = Inference.build_proof_term goal in
+ let names = names_of_context context in
+ let newmetasenv =
+ let i1 =
+ match new_meta_goal with
+ | C.Meta (i, _) -> i | _ -> assert false
+ in
+(* let i2 = *)
+(* match meta_proof with *)
+(* | C.Meta (i, _) -> i *)
+(* | t -> *)
+(* Printf.printf "\nHMMM!!! meta_proof: %s\ngoal': %s" *)
+(* (CicPp.pp meta_proof names) (string_of_int goal'); *)
+(* print_newline (); *)
+(* assert false *)
+(* in *)
+ List.filter (fun (i, _, _) -> i <> i1 && i <> goal') metasenv
+ in
+ let newstatus =
+ try
+ let ty, ug =
+ CicTypeChecker.type_of_aux' newmetasenv context proof ugraph
+ in
+ debug_print (CicPp.pp proof [](* names *));
+ debug_print
+ (Printf.sprintf
+ "\nGOAL was: %s\nPROOF has type: %s\nconvertible?: %s\n"
+ (CicPp.pp type_of_goal names) (CicPp.pp ty names)
+ (string_of_bool
+ (fst (CicReduction.are_convertible
+ context type_of_goal ty ug))));
+ let equality_for_replace i t1 =
+ match t1 with
+ | C.Meta (n, _) -> n = i
+ | _ -> false
+ in
+ let real_proof =
+ ProofEngineReduction.replace
+ ~equality:equality_for_replace
+ ~what:[goal'] ~with_what:[proof]
+ ~where:meta_proof
+ in
+ debug_print (
+ Printf.sprintf "status:\n%s\n%s\n%s\n%s\n"
+ (match uri with Some uri -> UriManager.string_of_uri uri
+ | None -> "")
+ (print_metasenv newmetasenv)
+ (CicPp.pp real_proof [](* names *))
+ (CicPp.pp term_to_prove names));
+ ((uri, newmetasenv, real_proof, term_to_prove), [])
+ with CicTypeChecker.TypeCheckerFailure _ ->
+ debug_print "THE PROOF DOESN'T TYPECHECK!!!";
+ debug_print (CicPp.pp proof names);
+ raise
+ (ProofEngineTypes.Fail "Found a proof, but it doesn't typecheck")
+ in
+ newstatus
+ | _ ->
+ raise (ProofEngineTypes.Fail "NO proof found")
+(* with e -> *)
+(* raise (Failure "saturation failed") *)
+;;
- "-c", Arg.String set_conf, "Configuration file (for the db connection)";
- "-lpo", Arg.Unit set_lpo, "Use lpo term ordering";
+(* dummy function called within matita to trigger linkage *)
+let init () = ();;
- "-kbo", Arg.Unit set_kbo, "Use (non-recursive) kbo term ordering (default)";
- "-l", Arg.Int set_time_limit, "Time limit (in seconds)";
- ] (fun a -> ()) "Usage:"
-in
-Helm_registry.load_from !configuration_file;
-main ()
+(* UGLY SIDE EFFECT... *)
+if connect_to_auto then (
+ AutoTactic.paramodulation_tactic := saturate;
+ AutoTactic.term_is_equality := Inference.term_is_equality;
+);;
projects / helm.git / blobdiff