(* 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 symbols_ratio = ref 0;;
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;;
;;
+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
| 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
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 *)
| res -> res
end
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 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
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
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
;;
(* 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
in
let new_pos = EqualitySet.elements new_pos_set in
-(* let subs = *)
-(* match passive_table with *)
-(* | None -> *)
-(* (fun e -> not (Indexing.subsumption env active_table e)) *)
-(* | Some passive_table -> *)
-(* (fun e -> not ((Indexing.subsumption env active_table e) || *)
-(* (Indexing.subsumption env passive_table e))) *)
-(* in *)
+ let subs =
+ match passive_table with
+ | None ->
+ (fun e -> not (Indexing.subsumption env active_table e))
+ | Some passive_table ->
+ (fun e -> not ((Indexing.subsumption env active_table e) ||
+ (Indexing.subsumption env passive_table e)))
+ in
let t1 = Unix.gettimeofday () in
;;
-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 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)) *)
int_of_float (
ceil ((float_of_int !processed_clauses) *.
- (!time_limit /. !elapsed_time -. 1.)))
+ ((!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 =
) 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) ->
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 =
al @ [(sign, current)], Indexing.index tbl current
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 ();
+(* 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 env passive active
| true, proof ->
Success (proof, 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 =
) 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) ->
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
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 _ = *)
+(* 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
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;
+ let _ =
+ 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 ("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"
+ | 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
projects / helm.git / blobdiff