open Inference;;
open Utils;;
+
(* profiling statistics... *)
let infer_time = ref 0.;;
let forward_simpl_time = ref 0.;;
+let forward_simpl_new_time = ref 0.;;
let backward_simpl_time = ref 0.;;
+let passive_maintainance_time = ref 0.;;
(* limited-resource-strategy related globals *)
let processed_clauses = ref 0;; (* number of equalities selected so far... *)
let time_limit = ref 0.;; (* in seconds, settable by the user... *)
let start_time = ref 0.;; (* time at which the execution started *)
let elapsed_time = ref 0.;;
+(* let maximal_weight = ref None;; *)
let maximal_retained_equality = ref None;;
(* equality-selection related globals *)
-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... *)
+let derived_clauses = ref 0;;
+let kept_clauses = ref 0;;
+
(* index of the greatest Cic.Meta created - TODO: find a better way! *)
let maxmeta = ref 0;;
type result =
| Failure
- | Success of Cic.term option * environment
+ | Success 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
match meta_convertibility_eq eq1 eq2 with
| true -> 0
| false ->
- let _, (ty, left, right, _), _, _ = eq1
- and _, (ty', left', right', _), _, _ = 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
+ | 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 _ -> 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
(Negative, hd),
((tl, EqualitySet.remove hd neg_set), (pos, pos_set), passive_table)
| [], hd::tl ->
- let passive_table = Indexing.remove_index passive_table hd in
+ let passive_table =
+ Indexing.remove_index passive_table hd
+(* if !use_fullred then Indexing.remove_index passive_table hd *)
+(* else passive_table *)
+ in
(Positive, hd),
(([], neg_set), (tl, EqualitySet.remove hd pos_set), passive_table)
| _, _ -> assert false
| (Negative, e)::_ ->
let symbols = symbols_of_equality e in
let card = cardinality symbols in
+ let foldfun k v (r1, r2) =
+ if TermMap.mem k symbols then
+ let c = TermMap.find k symbols in
+ let c1 = abs (c - v) in
+ let c2 = v - c1 in
+ r1 + c2, r2 + c1
+ else
+ r1, r2 + v
+ in
let f equality (i, e) =
let common, others =
- TermMap.fold
- (fun k v (r1, r2) ->
- if TermMap.mem k symbols then
- let c = TermMap.find k symbols in
- let c1 = abs (c - v) in
- let c2 = v - c1 in
- r1 + c2, r2 + c1
- else
- r1, r2 + v)
- (symbols_of_equality equality) (0, 0)
+ TermMap.fold foldfun (symbols_of_equality equality) (0, 0)
in
let c = others + (abs (common - card)) in
if c < i then (c, equality)
+(* else if c = i then *)
+(* match OrderedEquality.compare equality e with *)
+(* | -1 -> (c, equality) *)
+(* | res -> (i, e) *)
else (i, e)
in
let e1 = EqualitySet.min_elt pos_set in
let initial =
let common, others =
- TermMap.fold
- (fun k v (r1, r2) ->
- if TermMap.mem k symbols then
- let c = TermMap.find k symbols in
- let c1 = abs (c - v) in
- let c2 = v - (abs (c - v)) in
- r1 + c1, r2 + c2
- else
- r1, r2 + v)
- (symbols_of_equality e1) (0, 0)
+ TermMap.fold foldfun (symbols_of_equality e1) (0, 0)
in
(others + (abs (common - card))), e1
in
let _, current = EqualitySet.fold f pos_set initial in
(* Printf.printf "\nsymbols-based selection: %s\n\n" *)
(* (string_of_equality ~env current); *)
- let passive_table = Indexing.remove_index passive_table current in
+ let passive_table =
+ Indexing.remove_index passive_table current
+(* if !use_fullred then Indexing.remove_index passive_table current *)
+(* else passive_table *)
+ in
(Positive, current),
(([], neg_set),
(remove current pos_list, EqualitySet.remove current pos_set),
passive_table)
| _ ->
let current = EqualitySet.min_elt pos_set in
+ let passive_table =
+ Indexing.remove_index passive_table current
+(* if !use_fullred then Indexing.remove_index passive_table current *)
+(* else passive_table *)
+ in
let passive =
(neg_list, neg_set),
(remove current pos_list, EqualitySet.remove current pos_set),
- Indexing.remove_index passive_table current
+ passive_table
in
(Positive, current), passive
)
(neg_list, neg_set),
(remove current pos_list, EqualitySet.remove current pos_set),
Indexing.remove_index passive_table current
+(* if !use_fullred then Indexing.remove_index passive_table current *)
+(* else passive_table *)
in
(Positive, current), passive
else
let set_of equalities =
List.fold_left (fun s e -> EqualitySet.add e s) EqualitySet.empty equalities
in
- let table = Indexing.empty_table () in
+ let table =
+ List.fold_left (fun tbl e -> Indexing.index tbl e)
+ (Indexing.empty_table ()) pos
+(* if !use_fullred then *)
+(* List.fold_left (fun tbl e -> Indexing.index tbl e) *)
+(* (Indexing.empty_table ()) pos *)
+(* else *)
+(* Indexing.empty_table () *)
+ in
(neg, set_of neg),
(pos, set_of pos),
- List.fold_left (fun tbl e -> Indexing.index tbl e) table pos
+ table
;;
let ok set equality = not (EqualitySet.mem equality set) in
let neg = List.filter (ok neg_set) new_neg
and pos = List.filter (ok pos_set) new_pos in
+ let table =
+ List.fold_left (fun tbl e -> Indexing.index tbl e) table pos
+(* if !use_fullred then *)
+(* List.fold_left (fun tbl e -> Indexing.index tbl e) table pos *)
+(* else *)
+(* table *)
+ in
let add set equalities =
List.fold_left (fun s e -> EqualitySet.add e s) set equalities
in
(neg @ neg_list, add neg_set neg),
(pos_list @ pos, add pos_set pos),
- List.fold_left (fun tbl e -> Indexing.index tbl e) table pos
+ table
;;
;;
-let prune_passive (((nl, ns), (pl, ps), tbl) as passive) =
- let f =
- int_of_float ((!time_limit -. !elapsed_time) /.
- (!elapsed_time *. (float_of_int !weight_age_ratio)))
+let size_of_active (active_list, _) =
+ List.length active_list
+;;
+
+
+let prune_passive howmany (active, _) passive =
+ let (nl, ns), (pl, ps), tbl = passive in
+ let howmany = float_of_int howmany
+ 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;
+ let symbols, card =
+ match active with
+ | (Negative, e)::_ ->
+ let symbols = symbols_of_equality e in
+ let card = TermMap.fold (fun k v res -> res + v) symbols 0 in
+ Some symbols, card
+ | _ -> None, 0
in
- let in_weight = !processed_clauses * !weight_age_ratio * f
- and in_age = !processed_clauses * f in
- let rec pickw w s =
- if w > 0 then
- try
- let e = EqualitySet.min_elt s in
- let w, s' = pickw (w-1) (EqualitySet.remove e s) in
- w, EqualitySet.add e s'
- with Not_found ->
- w, s
+ let counter = ref !symbols_ratio in
+ let rec pickw w ns ps =
+ if w > 0 then
+ if not (EqualitySet.is_empty ns) then
+ let e = EqualitySet.min_elt ns in
+ let ns', ps = pickw (w-1) (EqualitySet.remove e ns) ps in
+ EqualitySet.add e ns', ps
+ else if !counter > 0 then
+ let _ =
+ counter := !counter - 1;
+ if !counter = 0 then counter := !symbols_ratio
+ in
+ match symbols with
+ | None ->
+ let e = EqualitySet.min_elt ps in
+ let ns, ps' = pickw (w-1) ns (EqualitySet.remove e ps) in
+ ns, EqualitySet.add e ps'
+ | Some symbols ->
+ let foldfun k v (r1, r2) =
+ if TermMap.mem k symbols then
+ let c = TermMap.find k symbols in
+ let c1 = abs (c - v) in
+ let c2 = v - c1 in
+ r1 + c2, r2 + c1
+ else
+ r1, r2 + v
+ in
+ let f equality (i, e) =
+ let common, others =
+ TermMap.fold foldfun (symbols_of_equality equality) (0, 0)
+ in
+ let c = others + (abs (common - card)) in
+ if c < i then (c, equality)
+ else (i, e)
+ in
+ let e1 = EqualitySet.min_elt ps in
+ let initial =
+ let common, others =
+ TermMap.fold foldfun (symbols_of_equality e1) (0, 0)
+ in
+ (others + (abs (common - card))), e1
+ in
+ let _, e = EqualitySet.fold f ps initial in
+ let ns, ps' = pickw (w-1) ns (EqualitySet.remove e ps) in
+ ns, EqualitySet.add e ps'
+ else
+ let e = EqualitySet.min_elt ps in
+ let ns, ps' = pickw (w-1) ns (EqualitySet.remove e ps) in
+ ns, EqualitySet.add e ps'
else
- 0, EqualitySet.empty
+ EqualitySet.empty, EqualitySet.empty
in
- let in_weight, ns = pickw in_weight ns in
- let _, ps = pickw in_weight ps in
+(* let in_weight, ns = pickw in_weight ns in *)
+(* let _, ps = pickw in_weight ps in *)
+ let ns, ps = pickw in_weight ns ps in
let rec picka w s l =
if w > 0 then
match l with
let w, s, l = picka w s tl in
w, s, hd::l
else
- 0, s, []
+ 0, s, l
in
let in_age, ns, nl = picka in_age ns nl in
let _, ps, pl = picka in_age ps pl in
if not (EqualitySet.is_empty ps) then
+(* maximal_weight := Some (weight_of_equality (EqualitySet.max_elt ps)); *)
maximal_retained_equality := Some (EqualitySet.max_elt ps);
let tbl =
EqualitySet.fold
- (fun e tbl -> Indexing.index tbl e) ps (Indexing.empty_table ()) in
+ (fun e tbl -> Indexing.index tbl e) ps (Indexing.empty_table ())
+(* if !use_fullred then *)
+(* EqualitySet.fold *)
+(* (fun e tbl -> Indexing.index tbl e) ps (Indexing.empty_table ()) *)
+(* else *)
+(* tbl *)
+ in
(nl, ns), (pl, ps), tbl
;;
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 ->
let neg, pos = infer_positive curr_table active_list in
neg, res @ pos
in
- match !maximal_retained_equality with
+ derived_clauses := !derived_clauses + (List.length new_neg) +
+ (List.length new_pos);
+ match (* !maximal_weight *)!maximal_retained_equality with
| None -> new_neg, new_pos
- | Some eq ->
+ | Some (* w *) eq ->
let new_pos =
- List.filter (fun e -> OrderedEquality.compare e eq <= 0) new_pos in
+ List.filter (fun e -> (* (weight_of_equality e) <= w *) OrderedEquality.compare e eq <= 0) new_pos in
new_neg, new_pos
;;
let contains_empty env (negative, positive) =
let metasenv, context, ugraph = env in
try
- let (proof, _, _, _) =
+ 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
- true, Some proof
+ true, Some found
with Not_found ->
false, None
;;
and pp = List.map (fun e -> (Positive, e)) pp in
pn @ pp, Some pt
in
- let all = active_list @ pl in
- let rec find_duplicate sign current = function
- | [] -> false
- | (s, eq)::tl when s = sign ->
- if meta_convertibility_eq current eq then true
- else find_duplicate sign current tl
- | _::tl -> find_duplicate sign current tl
- in
+ let all = if pl = [] then active_list else active_list @ pl in
+
+(* let rec find_duplicate sign current = function *)
+(* | [] -> false *)
+(* | (s, eq)::tl when s = sign -> *)
+(* if meta_convertibility_eq current eq then true *)
+(* else find_duplicate sign current tl *)
+(* | _::tl -> find_duplicate sign current tl *)
+(* in *)
+
+(* let res = *)
+(* if sign = Positive then *)
+(* Indexing.subsumption env active_table current *)
+(* else *)
+(* false *)
+(* in *)
+(* if res then *)
+(* None *)
+(* else *)
+
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 None
+ if sign = Negative then Some (sign, newcurrent)
+ else None
else
Some (sign, newcurrent)
in
in
match res with
| None -> None
- | Some (s, c) ->
- if find_duplicate s c all then
+ | Some (Negative, c) ->
+ let ok = not (
+ List.exists
+ (fun (s, eq) -> s = Negative && meta_convertibility_eq eq c)
+ all)
+ in
+ if ok then res else None
+ | Some (Positive, c) ->
+ if Indexing.in_index active_table c then
None
else
- res
+ match passive_table with
+ | None -> res
+ | Some passive_table ->
+ if Indexing.in_index passive_table c then None
+ else res
+
+(* | Some (s, c) -> if find_duplicate s c all then None else res *)
+
(* if s = Utils.Negative then *)
(* res *)
(* else *)
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
let new_pos_set =
List.fold_left
(fun s e ->
- if not (Inference.is_identity env e) then EqualitySet.add e s else s)
+ if not (Inference.is_identity env e) then
+ 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 t2 = Unix.gettimeofday () in
fs_time_info.subsumption <- fs_time_info.subsumption +. (t2 -. t1);
- new_neg, new_pos
+ let is_duplicate =
+ match passive_table with
+ | None ->
+ (fun e -> not (Indexing.in_index active_table e))
+ | Some passive_table ->
+ (fun e ->
+ not ((Indexing.in_index active_table e) ||
+ (Indexing.in_index passive_table e)))
+ in
+ new_neg, List.filter is_duplicate new_pos
+
+(* new_neg, new_pos *)
+
(* let res = *)
(* (List.filter (fun e -> not (List.exists (f Negative e) all)) new_neg, *)
(* List.filter (fun e -> not (List.exists (f Positive e) all)) new_pos) *)
;;
-let backward_simplify_active env (new_neg, new_pos) active =
+let backward_simplify_active env new_pos new_table active =
let active_list, active_table = active in
- let new_pos, new_table =
- List.fold_left
- (fun (l, t) e -> (Positive, e)::l, Indexing.index t e)
- ([], Indexing.empty_table ()) new_pos
- in
let active_list, newa =
List.fold_right
(fun (s, equality) (res, newn) ->
let active, newa =
List.fold_right
(fun (s, eq) (res, tbl) ->
- if (is_identity env eq) || (find eq res) then
+ if List.mem (s, eq) res then
+ res, tbl
+ else if (is_identity env eq) || (find eq res) then (
res, tbl
+ ) (* else if (find eq res) then *)
+(* res, tbl *)
else
(s, eq)::res, if s = Negative then tbl else Indexing.index tbl eq)
active_list ([], Indexing.empty_table ()),
List.fold_right
(fun (s, eq) (n, p) ->
- if (s <> Negative) && (is_identity env eq) then
+ if (s <> Negative) && (is_identity env eq) then (
(n, p)
- else
+ ) else
if s = Negative then eq::n, p
else n, eq::p)
newa ([], [])
;;
-let backward_simplify_passive env (new_neg, new_pos) passive =
- let new_pos, new_table =
- List.fold_left
- (fun (l, t) e -> (Positive, e)::l, Indexing.index t e)
- ([], Indexing.empty_table ()) new_pos
- in
+let backward_simplify_passive env new_pos new_table passive =
let (nl, ns), (pl, ps), passive_table = passive in
let f sign equality (resl, ress, newn) =
match forward_simplify env (sign, equality) (new_pos, new_table) with
let backward_simplify env new' ?passive active =
- let active, newa = backward_simplify_active env new' active in
+ let new_pos, new_table =
+ List.fold_left
+ (fun (l, t) e -> (Positive, e)::l, Indexing.index t e)
+ ([], Indexing.empty_table ()) (snd new')
+ in
+ let active, newa = backward_simplify_active env new_pos new_table active in
match passive with
| None ->
active, (make_passive [] []), newa, None
| Some passive ->
let passive, newp =
- backward_simplify_passive env new' passive in
+ backward_simplify_passive env new_pos new_table passive in
active, passive, newa, newp
;;
let get_selection_estimate () =
elapsed_time := (Unix.gettimeofday ()) -. !start_time;
- !processed_clauses * (int_of_float (!time_limit /. !elapsed_time))
+(* !processed_clauses * (int_of_float (!time_limit /. !elapsed_time)) *)
+ int_of_float (
+ ceil ((float_of_int !processed_clauses) *.
+ ((!time_limit (* *. 2. *)) /. !elapsed_time -. 1.)))
;;
let rec given_clause env passive active =
+ let time1 = Unix.gettimeofday () in
+
let selection_estimate = get_selection_estimate () in
let kept = size_of_passive passive in
let passive =
- if !time_limit = 0. then
+ if !time_limit = 0. || !processed_clauses = 0 then
passive
- else if !elapsed_time > !time_limit then
+ else if !elapsed_time > !time_limit then (
+ Printf.printf "Time limit (%.2f) reached: %.2f\n"
+ !time_limit !elapsed_time;
make_passive [] []
- else if kept > selection_estimate then
- prune_passive passive
- else
+ ) else if kept > selection_estimate then (
+ Printf.printf ("Too many passive equalities: pruning... (kept: %d, " ^^
+ "selection_estimate: %d)\n") kept selection_estimate;
+ prune_passive selection_estimate active passive
+ ) else
passive
in
+
+ let time2 = Unix.gettimeofday () in
+ passive_maintainance_time := !passive_maintainance_time +. (time2 -. time1);
+
+ kept_clauses := (size_of_passive passive) + (size_of_active active);
match passive_is_empty passive with
| true -> Failure
| false ->
let (sign, current), passive = select env passive active in
- match forward_simplify env (sign, current) ~passive active with
+ let time1 = Unix.gettimeofday () in
+ let res = forward_simplify env (sign, current) ~passive active in
+ let time2 = Unix.gettimeofday () in
+ forward_simpl_time := !forward_simpl_time +. (time2 -. time1);
+ match res with
| None ->
given_clause env passive active
| Some (sign, current) ->
Printf.printf "OK!!! %s %s" (string_of_sign sign)
(string_of_equality ~env current);
print_newline ();
- let proof, _, _, _ = current in
- Success (Some proof, env)
+ Success (Some current, env)
) else (
print_endline "\n================================================";
Printf.printf "selected: %s %s"
let t2 = Unix.gettimeofday () in
infer_time := !infer_time +. (t2 -. t1);
- let res, proof = contains_empty env new' in
+ let res, goal = contains_empty env new' in
if res then
- Success (proof, env)
+ Success (goal, env)
else
let t1 = Unix.gettimeofday () in
- let new' = forward_simplify_new env new' active in
+ let new' = forward_simplify_new env new' (* ~passive *) active in
let t2 = Unix.gettimeofday () in
let _ =
- forward_simpl_time := !forward_simpl_time +. (t2 -. t1)
+ forward_simpl_new_time := !forward_simpl_new_time +. (t2 -. t1)
in
let active =
match sign with
in
nn @ al @ pp, tbl
in
- 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 _ = *)
+(* 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 *)
match contains_empty env new' with
| false, _ ->
let active =
in
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 ();
+(* 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 env passive active
- | true, proof ->
- Success (proof, env)
+ | true, goal ->
+ Success (goal, env)
)
;;
let rec given_clause_fullred env passive active =
+ let time1 = Unix.gettimeofday () in
+
+ let selection_estimate = get_selection_estimate () in
+ let kept = size_of_passive passive in
+ let passive =
+ 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;
+ make_passive [] []
+ ) else if kept > selection_estimate then (
+ Printf.printf ("Too many passive equalities: pruning... (kept: %d, " ^^
+ "selection_estimate: %d)\n") kept selection_estimate;
+ prune_passive selection_estimate active passive
+ ) else
+ passive
+ in
+
+ let time2 = Unix.gettimeofday () in
+ passive_maintainance_time := !passive_maintainance_time +. (time2 -. time1);
+
+ kept_clauses := (size_of_passive passive) + (size_of_active active);
+
match passive_is_empty passive with
| true -> Failure
| false ->
let (sign, current), passive = select env passive active in
- match forward_simplify env (sign, current) ~passive active with
+ let time1 = Unix.gettimeofday () in
+ let res = forward_simplify env (sign, current) ~passive active in
+ let time2 = Unix.gettimeofday () in
+ forward_simpl_time := !forward_simpl_time +. (time2 -. time1);
+ match res with
| None ->
given_clause_fullred env passive active
| Some (sign, current) ->
Printf.printf "OK!!! %s %s" (string_of_sign sign)
(string_of_equality ~env current);
print_newline ();
- let proof, _, _, _ = current in
- Success (Some proof, env)
+ Success (Some current, env)
) else (
print_endline "\n================================================";
Printf.printf "selected: %s %s"
let t1 = Unix.gettimeofday () in
let new' = forward_simplify_new env new' ~passive active in
let t2 = Unix.gettimeofday () in
- forward_simpl_time := !forward_simpl_time +. (t2 -. t1);
+ forward_simpl_new_time := !forward_simpl_new_time +. (t2 -. t1);
let t1 = Unix.gettimeofday () in
let active, passive, newa, retained =
backward_simplify env new' ~passive active in
simplify (nn @ n @ rn, np @ p @ rp) active passive
in
let active, passive, new' = simplify new' active passive in
- 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 k = size_of_passive passive 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 *)
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, proof ->
- Success (proof, env)
+ | true, goal ->
+ Success (goal, env)
)
;;
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!! *)
+ 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
Printf.printf "\ncurrent goal: %s\n"
let start = Unix.gettimeofday () in
print_endline "GO!";
start_time := Unix.gettimeofday ();
- let res = !given_clause_ref env passive active in
+ let res =
+ (if !use_fullred then given_clause_fullred else given_clause)
+ env passive active
+ in
let finish = Unix.gettimeofday () in
- match res with
- | Failure ->
- Printf.printf "NO proof found! :-(\n\n"
- | Success (Some proof, env) ->
- Printf.printf "OK, found a proof!:\n%s\n%.9f\n"
- (PP.pp proof (names_of_context context))
- (finish -. start);
- Printf.printf ("infer_time: %.9f\nforward_simpl_time: %.9f\n" ^^
- "backward_simpl_time: %.9f\n")
- !infer_time !forward_simpl_time !backward_simpl_time;
- Printf.printf ("forward_simpl_details:\n build_all: %.9f\n" ^^
- " demodulate: %.9f\n subsumption: %.9f\n")
- fs_time_info.build_all fs_time_info.demodulate
- fs_time_info.subsumption;
- | Success (None, env) ->
- Printf.printf "Success, but no proof?!?\n\n"
+ let _ =
+ match res with
+ | Failure ->
+ Printf.printf "NO proof found! :-(\n\n"
+ | Success (Some goal, env) ->
+ Printf.printf "OK, found a proof!\n";
+ let proof = Inference.build_proof_term goal in
+ (* 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));
+ 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
+ "\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 "MAXMETA USED: %d\n" !maxmeta;
+ in
+ ()
+
+ | Success (None, env) ->
+ Printf.printf "Success, but no proof?!?\n\n"
+ in
+ Printf.printf ("infer_time: %.9f\nforward_simpl_time: %.9f\n" ^^
+ "forward_simpl_new_time: %.9f\n" ^^
+ "backward_simpl_time: %.9f\n")
+ !infer_time !forward_simpl_time !forward_simpl_new_time
+ !backward_simpl_time;
+ Printf.printf "passive_maintainance_time: %.9f\n"
+ !passive_maintainance_time;
+ Printf.printf " successful unification/matching time: %.9f\n"
+ !Indexing.match_unif_time_ok;
+ Printf.printf " failed unification/matching time: %.9f\n"
+ !Indexing.match_unif_time_no;
+ Printf.printf " indexing retrieval time: %.9f\n"
+ !Indexing.indexing_retrieval_time;
+ Printf.printf " demodulate_term.build_newtarget_time: %.9f\n"
+ !Indexing.build_newtarget_time;
+ Printf.printf "derived %d clauses, kept %d clauses.\n"
+ !derived_clauses !kept_clauses;
with exc ->
print_endline ("EXCEPTION: " ^ (Printexc.to_string exc));
raise exc
;;
-let configuration_file = ref "../../gTopLevel/gTopLevel.conf.xml";;
+let configuration_file = ref "../../matita/matita.conf.xml";;
let _ =
let set_ratio v = weight_age_ratio := (v+1); weight_age_counter := (v+1)
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 () = given_clause_ref := given_clause_fullred
+ and set_fullred b = use_fullred := b
and set_time_limit v = time_limit := float_of_int v
in
Arg.parse [
- "-f", Arg.Unit set_fullred, "Use full-reduction strategy";
+ "-f", Arg.Bool set_fullred,
+ "Enable/disable full-reduction strategy (default: enabled)";
- "-r", Arg.Int set_ratio, "Weight-Age equality selection ratio (default: 0)";
+ "-r", Arg.Int set_ratio, "Weight-Age equality selection ratio (default: 3)";
"-s", Arg.Int set_sel,
- "symbols-based selection ratio (relative to the weight ratio)";
+ "symbols-based selection ratio (relative to the weight ratio, default: 2)";
"-c", Arg.String set_conf, "Configuration file (for the db connection)";
projects / helm.git / blobdiff