(* $Id$ *)
+(* <:profiler<"saturation">> *)
+
open Inference;;
open Utils;;
let maxdepth = ref 3;;
let maxwidth = ref 3;;
+type new_proof =
+ Equality.goal_proof * Equality.proof * Subst.substitution * Cic.metasenv
type result =
- | ParamodulationFailure
- | ParamodulationSuccess of (Inference.proof * Cic.metasenv) option
+ | ParamodulationFailure of string
+ | ParamodulationSuccess of new_proof
;;
-type goal = proof * Cic.metasenv * Cic.term;;
+type goal = Equality.goal_proof * Cic.metasenv * Cic.term;;
type theorem = Cic.term * Cic.term * Cic.metasenv;;
-let symbols_of_equality (_, _, (_, left, right, _), _) =
+let symbols_of_equality equality =
+ let (_, _, (_, left, right, _), _,_) = Equality.open_equality equality in
let m1 = symbols_of_term left in
let m =
TermMap.fold
(* griggio *)
module OrderedEquality = struct
- type t = Inference.equality
+ type t = Equality.equality
let compare eq1 eq2 =
- match meta_convertibility_eq eq1 eq2 with
+ match Equality.meta_convertibility_eq eq1 eq2 with
| true -> 0
| false ->
- let w1, _, (ty, left, right, _), m1 = eq1
- and w2, _, (ty', left', right', _), m2 = eq2 in
+ let w1, _, (ty,left, right, _), m1,_ = Equality.open_equality eq1 in
+ let w2, _, (ty',left', right', _), m2,_ = Equality.open_equality eq2 in
match Pervasives.compare w1 w2 with
| 0 ->
let res = (List.length m1) - (List.length m2) in
- if res <> 0 then res else Pervasives.compare eq1 eq2
+ if res <> 0 then res else
+ Equality.compare eq1 eq2
| res -> res
end
match (List.rev goals) with (_, goal::_)::_ -> goal | _ -> assert false
in
let (pos_list, pos_set), passive_table = passive in
- let remove eq l = List.filter (fun e -> e <> eq) l in
+ let remove eq l = List.filter (fun e -> Equality.compare e eq <> 0) l in
if !weight_age_ratio > 0 then
weight_age_counter := !weight_age_counter - 1;
match !weight_age_counter with
| 0 -> (
weight_age_counter := !weight_age_ratio;
- match pos_list with
- | (hd:EqualitySet.elt)::tl ->
- let passive_table =
- Indexing.remove_index passive_table hd
- in hd, ((tl, EqualitySet.remove hd pos_set), passive_table)
- | _ -> assert false)
+ let rec skip_giant pos_list pos_set passive_table =
+ match pos_list with
+ | (hd:EqualitySet.elt)::tl ->
+ let w,_,_,_,_ = Equality.open_equality hd in
+ let passive_table =
+ Indexing.remove_index passive_table hd
+ in
+ let pos_set = EqualitySet.remove hd pos_set in
+ if w < 500 then
+ hd, ((tl, pos_set), passive_table)
+ else
+ (prerr_endline ("\n\n\nGIANT SKIPPED: "^string_of_int w^"\n\n\n");
+ skip_giant tl pos_set passive_table)
+ | _ -> assert false
+ in
+ skip_giant pos_list pos_set passive_table)
| _ when (!symbols_counter > 0) ->
(symbols_counter := !symbols_counter - 1;
let cardinality map =
let passive_table =
Indexing.remove_index passive_table current
in
- current,
+ current,
((remove current pos_list, EqualitySet.remove current pos_set),
passive_table))
| _ ->
passive_table)
;;
+let filter_dependent passive id =
+ prerr_endline ("+++++++++++++++passives "^
+ ( string_of_int (size_of_passive passive)));
+ let (pos_list, pos_set), passive_table = passive in
+ let passive =
+ List.fold_right
+ (fun eq ((list,set),table) ->
+ if Equality.depend eq id then
+ (let _,_,_,_,id_eq = Equality.open_equality eq in
+ if id_eq = 9228 then
+ prerr_endline ("\n\n--------filtering "^(string_of_int id_eq));
+ ((list,
+ EqualitySet.remove eq set),
+ Indexing.remove_index table eq))
+ else
+ ((eq::list, set),table))
+ pos_list (([],pos_set),passive_table) in
+ prerr_endline ("+++++++++++++++passives "^
+ ( string_of_int (size_of_passive passive)));
+ passive
+;;
+
(* initializes the passive set of equalities *)
let make_passive pos =
and in_age = round (howmany /. (ratio +. 1.)) in
debug_print
(lazy (Printf.sprintf "in_weight: %d, in_age: %d\n" in_weight in_age));
- let symbols, card = None, 0
- in
let counter = ref !symbols_ratio in
let rec pickw w ps =
if w > 0 then
let _ =
counter := !counter - 1;
if !counter = 0 then counter := !symbols_ratio in
- let e = EqualitySet.min_elt ps in
+ let e = EqualitySet.min_elt ps in
let ps' = pickw (w-1) (EqualitySet.remove e ps) in
EqualitySet.add e ps'
else
(** inference of new equalities between current and some in active *)
-let infer env current ((active_list:Inference.equality list), active_table) =
+let infer env current (active_list, active_table) =
let (_,c,_) = env in
if Utils.debug_metas then
(ignore(Indexing.check_target c current "infer1");
(function current ->
Indexing.check_target c current "sup2") res);
let pos = infer_positive table tl in
- res @ pos
+ res @ pos
in
- let maxm, copy_of_current = Inference.fix_metas !maxmeta current in
+ let maxm, copy_of_current = Equality.fix_metas !maxmeta current in
maxmeta := maxm;
let curr_table = Indexing.index Indexing.empty current in
let pos = infer_positive curr_table (copy_of_current::active_list)
ignore(List.map
(function current ->
Indexing.check_target c current "sup3") pos);
- res @ pos
+ res @ pos
in
derived_clauses := !derived_clauses + (List.length new_pos);
match !maximal_retained_equality with
List.filter (fun e -> OrderedEquality.compare e eq <= 0) new_pos
;;
+let check_for_deep_subsumption env active_table eq =
+ let _,_,(eq_ty, left, right, order),metas,id = Equality.open_equality eq in
+ if id = 14242 then assert false;
+
+ let check_subsumed deep l r =
+ let eqtmp =
+ Equality.mk_tmp_equality(0,(eq_ty,l,r,Utils.Incomparable),metas)in
+ match Indexing.subsumption env active_table eqtmp with
+ | None -> false
+ | Some (s,eq') ->
+(*
+ prerr_endline
+ ("\n\n " ^ Equality.string_of_equality ~env eq ^
+ "\nis"^(if deep then " CONTEXTUALLY " else " ")^"subsumed by \n " ^
+ Equality.string_of_equality ~env eq' ^ "\n\n");
+*)
+ true
+ in
+ let rec aux b (ok_so_far, subsumption_used) t1 t2 =
+ match t1,t2 with
+ | t1, t2 when not ok_so_far -> ok_so_far, subsumption_used
+ | t1, t2 when subsumption_used -> t1 = t2, subsumption_used
+(* VERSIONE ERRATA
+ | Cic.Appl (h1::l),Cic.Appl (h2::l') when h1 = h2 ->
+ let rc = check_subsumed b t1 t1 in
+ if rc then
+ true, true
+ else if h1 = h2 then
+ (try
+ List.fold_left2
+ (fun (ok_so_far, subsumption_used) t t' ->
+ aux true (ok_so_far, subsumption_used) t t')
+ (ok_so_far, subsumption_used) l l'
+ with Invalid_argument _ -> false,subsumption_used)
+ else
+ false, subsumption_used
+ | _ -> false, subsumption_used *)
+ | Cic.Appl (h1::l),Cic.Appl (h2::l') ->
+ let rc = check_subsumed b t1 t2 in
+ if rc then
+ true, true
+ else if h1 = h2 then
+ (try
+ List.fold_left2
+ (fun (ok_so_far, subsumption_used) t t' ->
+ aux true (ok_so_far, subsumption_used) t t')
+ (ok_so_far, subsumption_used) l l'
+ with Invalid_argument _ -> false,subsumption_used)
+ else
+ false, subsumption_used
+ | _ -> false, subsumption_used
+ in
+ fst (aux false (true,false) left right)
+;;
+
+(*
+let check_for_deep env active_table eq =
+ match Indexing.subsumption env active_table eq with
+ | None -> false
+ | Some _ -> true
+;;
+*)
+
+let profiler = HExtlib.profile "check_for_deep";;
+
+let check_for_deep_subsumption env active_table eq =
+ profiler.HExtlib.profile (check_for_deep_subsumption env active_table) eq
+;;
+
(* buttare via sign *)
(** simplifies current using active and passive *)
let newmeta, newcurrent =
Indexing.demodulation_equality !maxmeta env table sign current in
maxmeta := newmeta;
- if is_identity env newcurrent then
+ if Equality.is_identity env newcurrent then
(* debug_print *)
(* (lazy *)
(* (Printf.sprintf "\ncurrent was: %s\nnewcurrent is: %s\n" *)
match demodulate passive_table newcurrent with
| None -> None
| Some newnewcurrent ->
- if newcurrent <> newnewcurrent then
+ if Equality.compare newcurrent newnewcurrent <> 0 then
demod newnewcurrent
else Some newnewcurrent
in
else
match passive_table with
| None ->
+ if check_for_deep_subsumption env active_table c then
+ None
+ else
+ res
+(*
if Indexing.subsumption env active_table c = None then
res
else
None
+*)
| Some passive_table ->
if Indexing.in_index passive_table c then None
else
- if Indexing.subsumption env active_table c = None then
- if Indexing.subsumption env passive_table c = None then
- res
- else
- None
+ if check_for_deep_subsumption env active_table c then
+ None
+ else
+(* if Indexing.subsumption env active_table c = None then*)
+ (match Indexing.subsumption env passive_table c with
+ | None -> res
+ | Some (_,c') ->
+ None
+ (*prerr_endline "\n\nPESCO DALLE PASSIVE LA PIU' GENERALE\n\n";
+ Some c'*))
+(*
else
None
+*)
;;
type fs_time_info_t = {
let new_pos_set =
List.fold_left
(fun s e ->
- if not (Inference.is_identity env e) then
+ if not (Equality.is_identity env e) then
if EqualitySet.mem e s then s
else EqualitySet.add e s
else s)
| None -> None
| Some ((_, _), pt) -> Some pt
in
-
let demodulate table goal =
- let newmeta, newgoal =
+ let changed, newmeta, newgoal =
Indexing.demodulation_goal !maxmeta env table goal in
maxmeta := newmeta;
- goal <> newgoal, newgoal
+ changed, newgoal
in
let changed, goal =
match passive_table with
| None -> demodulate active_table goal
| Some passive_table ->
let changed, goal = demodulate active_table goal in
- let changed', goal = demodulate passive_table goal in
- (changed || changed'), goal
+(* let changed', goal = demodulate passive_table goal in*)
+ (changed (*|| changed'*)), goal
in
changed,
if not changed then
(** simplifies active usign new *)
let backward_simplify_active env new_pos new_table min_weight active =
let active_list, active_table = active in
- let active_list, newa =
+ let active_list, newa, pruned =
List.fold_right
- (fun equality (res, newn) ->
- let ew, _, _, _ = equality in
+ (fun equality (res, newn,pruned) ->
+ let ew, _, _, _,id = Equality.open_equality equality in
if ew < min_weight then
- equality::res, newn
+ equality::res, newn,pruned
else
match forward_simplify env (Utils.Positive, equality) (new_pos, new_table) with
- | None -> res, newn
+ | None -> res, newn, id::pruned
| Some e ->
- if equality = e then
- e::res, newn
+ if Equality.compare equality e = 0 then
+ e::res, newn, pruned
else
- res, e::newn)
- active_list ([], [])
+ res, e::newn, pruned)
+ active_list ([], [],[])
in
let find eq1 where =
- List.exists (meta_convertibility_eq eq1) where
+ List.exists (Equality.meta_convertibility_eq eq1) where
in
- let active, newa =
+ let id_of_eq eq =
+ let _, _, _, _,id = Equality.open_equality eq in id
+ in
+ let ((active1,pruned),tbl), newa =
List.fold_right
- (fun eq (res, tbl) ->
+ (fun eq ((res,pruned), tbl) ->
if List.mem eq res then
- res, tbl
- else if (is_identity env eq) || (find eq res) then (
- res, tbl
+ (res, (id_of_eq eq)::pruned),tbl
+ else if (Equality.is_identity env eq) || (find eq res) then (
+ (res, (id_of_eq eq)::pruned),tbl
)
else
- eq::res, Indexing.index tbl eq)
- active_list ([], Indexing.empty),
+ (eq::res,pruned), Indexing.index tbl eq)
+ active_list (([],pruned), Indexing.empty),
List.fold_right
(fun eq p ->
- if (is_identity env eq) then p
- else eq::p)
+ if (Equality.is_identity env eq) then p
+ else eq::p)
newa []
in
+ if List.length active1 <> List.length (fst active) then
+ prerr_endline "\n\n\nMANCAVANO DELLE PRUNED!!!!\n\n\n";
match newa with
- | [] -> active, None
- | _ -> active, Some newa
+ | [] -> (active1,tbl), None, pruned
+ | _ -> (active1,tbl), Some newa, pruned
;;
let backward_simplify_passive env new_pos new_table min_weight passive =
let (pl, ps), passive_table = passive in
let f sign equality (resl, ress, newn) =
- let ew, _, _, _ = equality in
+ let ew, _, _, _ , _ = Equality.open_equality equality in
if ew < min_weight then
equality::resl, ress, newn
else
| _ -> ((pl, ps), passive_table), Some (newp)
;;
+let build_table equations =
+ List.fold_left
+ (fun (l, t, w) e ->
+ let ew, _, _, _ , _ = Equality.open_equality e in
+ e::l, Indexing.index t e, min ew w)
+ ([], Indexing.empty, 1000000) equations
+;;
+
let backward_simplify env new' ?passive active =
- let new_pos, new_table, min_weight =
+ let new_pos, new_table, min_weight = build_table new' in
+(*
List.fold_left
(fun (l, t, w) e ->
- let ew, _, _, _ = e in
+ let ew, _, _, _ , _ = Equality.open_equality e in
e::l, Indexing.index t e, min ew w)
([], Indexing.empty, 1000000) new'
in
- let active, newa =
+*)
+ let active, newa, pruned =
backward_simplify_active env new_pos new_table min_weight active in
match passive with
| None ->
- active, (make_passive []), newa, None
+ active, (make_passive []), newa, None, pruned
| Some passive ->
- active, passive, newa, None
+ active, passive, newa, None, pruned
(* prova
let passive, newp =
backward_simplify_passive env new_pos new_table min_weight passive in
let new_pos, new_table, min_weight =
List.fold_left
(fun (l, t, w) e ->
- let ew, _, _, _ = e in
+ let ew, _, _, _ , _ = Equality.open_equality e in
e::l, Indexing.index t e, min ew w)
([], Indexing.empty, 1000000) (snd new')
in
;;
let is_commutative_law eq =
- let w, proof, (eq_ty, left, right, order), metas = eq in
+ let w, proof, (eq_ty, left, right, order), metas , _ =
+ Equality.open_equality eq
+ in
match left,right with
Cic.Appl[f1;Cic.Meta _ as a1;Cic.Meta _ as b1],
Cic.Appl[f2;Cic.Meta _ as a2;Cic.Meta _ as b2] ->
(Printf.sprintf "symmetric:\n%s\n"
(String.concat "\n"
(List.map
- (fun e -> string_of_equality ~env e)
+ (fun e -> Equality.string_of_equality ~env e)
given)))) in
close env new' given
;;
(lazy
(Printf.sprintf "equalities:\n%s\n"
(String.concat "\n"
- (List.map string_of_equality equalities))));
+ (List.map Equality.string_of_equality equalities))));
debug_print (lazy "SIMPLYFYING EQUALITIES...");
match equalities with
| [] -> []
(lazy
(Printf.sprintf "equalities AFTER:\n%s\n"
(String.concat "\n"
- (List.map string_of_equality res))));
+ (List.map Equality.string_of_equality res))));
res
;;
Printf.sprintf "%d: %s" d (String.concat "; " gl')) goals))
;;
-let check_if_goal_is_subsumed env (proof,menv,ty) table =
+let check_if_goal_is_subsumed ((_,ctx,_) as env) table (goalproof,menv,ty) =
+ let names = names_of_context ctx in
+ Printf.eprintf "check_goal_subsumed: %s\n" (CicPp.pp ty names);
match ty with
| Cic.Appl[Cic.MutInd(uri,_,_);eq_ty;left;right]
when UriManager.eq uri (LibraryObjects.eq_URI ()) ->
- (let goal_equation = 0,proof,(eq_ty,left,right,Eq),menv in
+ (let goal_equation =
+ Equality.mk_equality
+ (0,Equality.Exact (Cic.Implicit None),(eq_ty,left,right,Eq),menv)
+ in
match Indexing.subsumption env table goal_equation with
- | Some (subst, (_,p,_,m)) ->
- let p = Inference.apply_subst subst (Inference.build_proof_term p) in
- let newp =
- let rec repl = function
- | Inference.ProofGoalBlock (_, gp) ->
- Inference.ProofGoalBlock (Inference.BasicProof ([],p), gp)
- | Inference.NoProof -> Inference.BasicProof ([],p)
- | Inference.BasicProof _ -> Inference.BasicProof ([],p)
- | Inference.SubProof (t, i, p2) ->
- Inference.SubProof (t, i, repl p2)
- | _ -> assert false
- in
- repl proof
- in
- Some (newp,Inference.apply_subst_metasenv subst m @ menv)
- | None -> None)
+(* match Indexing.unification env table goal_equation with *)
+ | Some (subst, equality ) ->
+ let (_,p,(ty,l,r,_),m,id) = Equality.open_equality equality in
+ let cicmenv = Subst.apply_subst_metasenv subst (m @ menv) in
+ Some (goalproof, p, subst, cicmenv)
+ | None -> None)
| _ -> None
;;
(* apply_goal_to_theorems dbd env theorems ~passive active goals in *)
let iseq uri = UriManager.eq uri (LibraryObjects.eq_URI ()) in
match (fst goals) with
- | (_, [proof, m, Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right]])::_
+ | (_,[goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right]])::_
when left = right && iseq uri ->
- let p =
- Cic.Appl [Cic.MutConstruct (* reflexivity *)
- (LibraryObjects.eq_URI (), 0, 1, []);eq_ty; left]
- in
- let newp =
- let rec repl = function
- | Inference.ProofGoalBlock (_, gp) ->
- Inference.ProofGoalBlock (Inference.BasicProof ([],p), gp)
- | Inference.NoProof -> Inference.BasicProof ([],p)
- | Inference.BasicProof _ -> Inference.BasicProof ([],p)
- | Inference.SubProof (t, i, p2) ->
- Inference.SubProof (t, i, repl p2)
- | _ -> assert false
- in
- repl proof
- in true, Some (newp,m)
- | (_, [proof,m,ty])::_ ->
- (match check_if_goal_is_subsumed env (proof,m,ty) (snd active) with
+ let reflproof = Equality.Exact (Equality.refl_proof eq_ty left) in
+ true, Some (goalproof, reflproof, Subst.empty_subst,m)
+ | (_, [goal])::_ ->
+ (match check_if_goal_is_subsumed env (snd active) goal with
| None -> false,None
- | Some (newproof,m) ->
+ | Some p ->
prerr_endline "Proof found by subsumption!";
- true, Some (newproof,m))
+ true, Some p)
| _ -> false, None
in
if ok then
(let x,y,_ = passive in (fst x)@(fst y)))) in
prerr_endline s;
prerr_endline sp; *)
- ParamodulationSuccess (proof))
+ match proof with
+ | None -> assert false
+ | Some p -> ParamodulationSuccess p)
else
given_clause_fullred_aux dbd env goals theorems passive active
else
(* else *)
(* given_clause_fullred_aux env goals theorems passive active *)
(* else *)
- if (passive_is_empty passive) then ParamodulationFailure
+ if (passive_is_empty passive) then ParamodulationFailure ""
else given_clause_fullred_aux dbd env goals theorems passive active
and given_clause_fullred_aux dbd env goals theorems passive active =
prerr_endline (string_of_int !counter ^
" MAXMETA: " ^ string_of_int !maxmeta ^
- " LOCALMAX: " ^ string_of_int !Indexing.local_max ^
" #ACTIVES: " ^ string_of_int (size_of_active active) ^
" #PASSIVES: " ^ string_of_int (size_of_passive passive));
incr counter;
kept_clauses := (size_of_passive passive) + (size_of_active active);
match passive_is_empty passive with
- | true -> ParamodulationFailure
+ | true -> ParamodulationFailure ""
(* given_clause_fullred dbd env goals theorems passive active *)
| false ->
let current, passive = select env (fst goals) passive in
prerr_endline
- ("Selected = " ^ string_of_equality ~env current);
+ ("Selected = " ^ Equality.string_of_equality ~env current);
(* ^
(let w,p,(t,l,r,o),m = current in
" size w: " ^ string_of_int (HExtlib.estimate_size w)^
(* weight_age_counter := !weight_age_counter + 1; *)
given_clause_fullred dbd env goals theorems passive active
| Some current ->
- debug_print (lazy (Printf.sprintf "selected: %s"
- (string_of_equality ~env current)));
+(* prerr_endline (Printf.sprintf "selected simpl: %s"
+ (Equality.string_of_equality ~env current));*)
let t1 = Unix.gettimeofday () in
let new' = infer env current active in
let _ =
(String.concat "\n"
(List.map
(fun e -> "Positive " ^
- (string_of_equality ~env e)) new'))))
+ (Equality.string_of_equality ~env e)) new'))))
in
let t2 = Unix.gettimeofday () in
infer_time := !infer_time +. (t2 -. t1);
let active =
- if is_identity env current then active
+ if Equality.is_identity env current then active
else
let al, tbl = active in
al @ [current], Indexing.index tbl current
forward_simpl_new_time :=
!forward_simpl_new_time +. (t2 -. t1);
let t1 = Unix.gettimeofday () in
- let active, passive, newa, retained =
+ let active, passive, newa, retained, pruned =
backward_simplify env new' ~passive active in
+ let passive =
+ List.fold_left filter_dependent passive pruned in
let t2 = Unix.gettimeofday () in
backward_simpl_time := !backward_simpl_time +. (t2 -. t1);
match newa, retained with
| None, None -> active, passive, new'
| Some p, None
| None, Some p ->
- let np = new' in
- if Utils.debug_metas then
- begin
- List.iter
- (fun x->Indexing.check_target context x "simplify1")
- p;
- end;
- simplify (new' @ p) active passive
+ if Utils.debug_metas then
+ begin
+ List.iter
+ (fun x->Indexing.check_target context x "simplify1")
+ p;
+ end;
+ simplify (new' @ p) active passive
| Some p, Some rp ->
simplify (new' @ p @ rp) active passive
in
- let active, _, new' = simplify new' active passive in
+ let active, passive, new' = simplify new' active passive in
+ let goals =
+ let a,b,_ = build_table new' in
+ simplify_goals env goals ~passive (a,b)
+ in
+
(* pessima prova
let new1 = prova env new' active in
let new' = (fst new') @ (fst new1), (snd new') @ (snd new1) in
(Printf.sprintf "active:\n%s\n"
(String.concat "\n"
((List.map
- (fun e -> (string_of_equality ~env e))
+ (fun e -> (Equality.string_of_equality ~env e))
(fst active))))))
in
let _ =
(String.concat "\n"
((List.map
(fun e -> "Negative " ^
- (string_of_equality ~env e)) new')))))
+ (Equality.string_of_equality ~env e)) new')))))
in
let passive = add_to_passive passive new' in
given_clause_fullred dbd env goals theorems passive active
(given_clause_fullred dbd env goals theorems passive) active
*)
+let iseq uri = UriManager.eq uri (LibraryObjects.eq_URI ());;
+
+let check_if_goal_is_identity env = function
+ | (goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right])
+ when left = right && iseq uri ->
+ let reflproof = Equality.Exact (Equality.refl_proof eq_ty left) in
+ Some (goalproof, reflproof,Subst.empty_subst,m)
+ | _ -> None
+;;
+
+let rec check goal = function
+ | [] -> None
+ | f::tl ->
+ match f goal with
+ | None -> check goal tl
+ | (Some p) as ok -> ok
+;;
+
+let simplify_goal_set env goals passive active =
+ (*
+ let supl_goals =
+ (List.flatten
+ (List.map (Indexing.superposition_left env (snd active))
+ goals))
+ in
+ *)
+ let simplified =
+ HExtlib.filter_map
+ (fun g ->
+ match simplify_goal env g ~passive active with
+ | true, g -> Some g
+ | false, g -> Some g)
+ goals
+ in
+ HExtlib.list_uniq ~eq:(fun (_,_,t1) (_,_,t2) -> t1 = t2)
+ (List.sort (fun (_,_,t1) (_,_,t2) -> compare t1 t1)
+ ((*goals @*) simplified))
+;;
+
+let check_if_goals_set_is_solved env active goals =
+ List.fold_left
+ (fun proof goal ->
+ match proof with
+ | Some p -> proof
+ | None ->
+ check goal [
+ check_if_goal_is_identity env;
+ check_if_goal_is_subsumed env (snd active)])
+ None goals
+;;
+
+let size_of_goal_set = List.length;;
+
+(** given-clause algorithm with full reduction strategy: NEW implementation *)
+(* here goals is a set of goals in OR *)
+let given_clause
+ ((_,context,_) as env) goals theorems passive active max_iterations max_time
+=
+ let initial_time = Unix.gettimeofday () in
+ let iterations_left iterno =
+ let now = Unix.gettimeofday () in
+ let time_left = max_time -. now in
+ let time_spent_until_now = now -. initial_time in
+ let iteration_medium_cost =
+ time_spent_until_now /. (float_of_int iterno)
+ in
+ let iterations_left = time_left /. iteration_medium_cost in
+ int_of_float iterations_left
+ in
+ let rec step goals theorems passive active iterno =
+ if iterno > max_iterations then
+ (ParamodulationFailure "No more iterations to spend")
+ else if Unix.gettimeofday () > max_time then
+ (ParamodulationFailure "No more time to spend")
+ else
+ let goals = simplify_goal_set env goals passive active in
+ match check_if_goals_set_is_solved env active goals with
+ | Some p ->
+ Printf.eprintf "Found a proof in: %f\n"
+ (Unix.gettimeofday() -. initial_time);
+ ParamodulationSuccess p
+ | None ->
+ prerr_endline
+ (Printf.sprintf "%d #ACTIVES: %d #PASSIVES: %d #GOALSET: %d\n"
+ iterno (size_of_active active) (size_of_passive passive)
+ (size_of_goal_set goals));
+ (* PRUNING OF PASSIVE THAT WILL NEVER BE PROCESSED *)
+ let passive =
+ let selection_estimate = iterations_left iterno in
+ let kept = size_of_passive passive in
+ if kept > selection_estimate then
+ begin
+ (*Printf.eprintf "Too many passive equalities: pruning...";
+ prune_passive selection_estimate active*) passive
+ end
+ else
+ passive
+ in
+ kept_clauses := (size_of_passive passive) + (size_of_active active);
+ (* SELECTION *)
+ if passive_is_empty passive then
+ ParamodulationFailure "No more passive" (* maybe this is a success! *)
+ else
+ begin
+ let current, passive = select env [1,goals] passive in
+ Printf.eprintf "Selected = %s\n"
+ (Equality.string_of_equality ~env current);
+ (* SIMPLIFICATION OF CURRENT *)
+ let res =
+ forward_simplify env (Positive, current) ~passive active
+ in
+ match res with
+ | None -> step goals theorems passive active (iterno+1)
+ | Some current ->
+ (* GENERATION OF NEW EQUATIONS *)
+ let new' = infer env current active in
+ let active =
+ if Equality.is_identity env current then
+ assert false
+ (* nonsense code, check to se if it can be removed *)
+ else
+ let al, tbl = active in
+ al @ [current], Indexing.index tbl current
+ in
+ (* FORWARD AND BACKWARD SIMPLIFICATION *)
+ let rec simplify new' active passive =
+ let new' = forward_simplify_new env new' ~passive active in
+ let active, passive, newa, retained, pruned =
+ backward_simplify env new' ~passive active
+ in
+ let passive = List.fold_left filter_dependent passive pruned in
+ match newa, retained with
+ | None, None -> active, passive, new'
+ | Some p, None
+ | None, Some p -> simplify (new' @ p) active passive
+ | Some p, Some rp -> simplify (new' @ p @ rp) active passive
+ in
+ let active, passive, new' = simplify new' active passive in
+ let goals =
+ let a,b,_ = build_table new' in
+ simplify_goal_set env goals passive (a,b)
+ in
+ let passive = add_to_passive passive new' in
+ step goals theorems passive active (iterno+1)
+ end
+ in
+ step goals theorems passive active 1
+;;
let rec saturate_equations env goal accept_fun passive active =
elapsed_time := Unix.gettimeofday () -. !start_time;
saturate_equations env goal accept_fun passive active
| Some current ->
debug_print (lazy (Printf.sprintf "selected: %s"
- (string_of_equality ~env current)));
+ (Equality.string_of_equality ~env current)));
let new' = infer env current active in
let active =
- if is_identity env current then active
+ if Equality.is_identity env current then active
else
let al, tbl = active in
al @ [current], Indexing.index tbl current
in
let rec simplify new' active passive =
let new' = forward_simplify_new env new' ~passive active in
- let active, passive, newa, retained =
+ let active, passive, newa, retained, pruned =
backward_simplify env new' ~passive active in
+ let passive =
+ List.fold_left filter_dependent passive pruned in
match newa, retained with
| None, None -> active, passive, new'
| Some p, None
(Printf.sprintf "active:\n%s\n"
(String.concat "\n"
(List.map
- (fun e -> string_of_equality ~env e)
+ (fun e -> Equality.string_of_equality ~env e)
(fst active)))))
in
- let _ =
+ let _ =
debug_print
(lazy
(Printf.sprintf "new':\n%s\n"
(String.concat "\n"
(List.map
(fun e -> "Negative " ^
- (string_of_equality ~env e)) new'))))
+ (Equality.string_of_equality ~env e)) new'))))
in
let new' = List.filter accept_fun new' in
let passive = add_to_passive passive new' in
saturate_equations env goal accept_fun passive active
;;
-
+let main dbd full term metasenv ugraph = ()
+(*
let main dbd full term metasenv ugraph =
let module C = Cic in
let module T = CicTypeChecker in
(fst theorems)))))
in
(*try*)
- let goal = Inference.BasicProof ([],new_meta_goal), [], goal in
+ let goal =
+ ([],Equality.BasicProof (Equality.empty_subst ,new_meta_goal)), [], goal
+ in
let equalities = simplify_equalities env
(equalities@library_equalities) in
let active = make_active () in
Printf.printf "\nequalities:\n%s\n"
(String.concat "\n"
(List.map
- (string_of_equality ~env) equalities));
+ (Equality.string_of_equality ~env) equalities));
(* (equalities @ library_equalities))); *)
print_endline "--------------------------------------------------";
let start = Unix.gettimeofday () in
match res with
| ParamodulationFailure ->
Printf.printf "NO proof found! :-(\n\n"
- | ParamodulationSuccess (Some (proof, env)) ->
- let proof = Inference.build_proof_term proof in
+ | ParamodulationSuccess (Some ((cicproof,cicmenv),(proof, env))) ->
Printf.printf "OK, found a proof!\n";
+ let oldproof = Equation.build_proof_term proof in
+ let newproof,_,newenv,_ =
+ CicRefine.type_of_aux'
+ cicmenv context cicproof CicUniv.empty_ugraph
+ 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
+ prerr_endline "OLD PROOF";
print_endline (PP.pp proof names);
+ prerr_endline "NEW PROOF";
+ print_endline (PP.pp newproof names);
let newmetasenv =
List.fold_left
- (fun m (_, _, _, menv) -> m @ menv) metasenv equalities
+ (fun m eq ->
+ let (_, _, _, menv,_) = Equality.open_equality eq in
+ m @ menv)
+ metasenv equalities
in
let _ =
(*try*)
"backward_simpl_time: %.9f\n")
!infer_time !forward_simpl_time !forward_simpl_new_time
!backward_simpl_time) ^
- (Printf.sprintf "beta_expand_time: %.9f\n"
- !Indexing.beta_expand_time) ^
(Printf.sprintf "passive_maintainance_time: %.9f\n"
!passive_maintainance_time) ^
(Printf.sprintf " successful unification/matching time: %.9f\n"
raise exc
*)
;;
-
+*)
let default_depth = !maxdepth
and default_width = !maxwidth;;
let reset_refs () =
maxmeta := 0;
- Indexing.local_max := 100;
symbols_counter := 0;
weight_age_counter := !weight_age_ratio;
processed_clauses := 0;
passive_maintainance_time := 0.;
derived_clauses := 0;
kept_clauses := 0;
- Indexing.beta_expand_time := 0.;
- Inference.metas_of_proof_time := 0.;
+ Equality.reset ();
;;
let saturate
let goal' = goal in
let uri, metasenv, meta_proof, term_to_prove = proof in
let _, context, goal = CicUtil.lookup_meta goal' metasenv in
- prerr_endline ("CTX: " ^ string_of_int (HExtlib.estimate_size context));
+ let names = names_of_context context in
let eq_indexes, equalities, maxm = find_equalities context proof in
let new_meta_goal, metasenv, type_of_goal =
let irl =
in
let ugraph = CicUniv.empty_ugraph in
let env = (metasenv, context, ugraph) in
- let goal = Inference.BasicProof ([],new_meta_goal), [], goal in
+ prerr_endline
+ ("METASENV DEL GOAL: " ^ CicMetaSubst.ppmetasenv [] metasenv );
+ let goal = [], metasenv, goal in
let res, time =
let t1 = Unix.gettimeofday () in
let lib_eq_uris, library_equalities, maxm =
let passive = make_passive equalities in
let start = Unix.gettimeofday () in
let res =
+(*
let goals = make_goals goal in
given_clause_fullred dbd env goals theorems passive active
+*)
+ let goals = [goal] in
+ let max_iterations = 1000 in
+ let max_time =
+ Unix.gettimeofday () +.
+ 600. (* minutes *)
+ in
+ given_clause env goals theorems passive active max_iterations max_time
in
let finish = Unix.gettimeofday () in
(res, finish -. start)
in
match res with
- | ParamodulationSuccess (Some (proof, proof_menv)) ->
+ | ParamodulationFailure s ->
+ raise (ProofEngineTypes.Fail (lazy ("NO proof found: " ^ s)))
+ | ParamodulationSuccess
+ (goalproof,newproof,subsumption_subst, proof_menv) ->
prerr_endline "OK, found a proof!";
- debug_print (lazy "OK, found a proof!");
- let proof = Inference.build_proof_term proof in
+
+ prerr_endline "NEWPROOF";
+ (* prerr_endline (Equality.string_of_proof_new ~names newproof
+ * goalproof);*)
+ prerr_endline (Equality.pp_proof names goalproof newproof);
+
+(* assert false; *)
+
+ (* generation of the proof *)
+ let cic_proof_new =
+ Equality.build_goal_proof
+ goalproof (Equality.build_proof_term newproof) type_of_goal
+ in
+ let cic_proof_new =
+ Subst.apply_subst subsumption_subst cic_proof_new
+ in
+
+ (* replacing fake mets with real ones *)
let equality_for_replace i t1 =
match t1 with
| C.Meta (n, _) -> n = i
| _ -> false
in
- prerr_endline "replacing metas";
- let proof_menv, what, with_what =
- let irl =
- CicMkImplicit.identity_relocation_list_for_metavariable context
- in
+ let mkirl = CicMkImplicit.identity_relocation_list_for_metavariable in
+ prerr_endline "replacing metas (new)";
+ let newproof_menv, what, with_what,_ =
+ let irl = mkirl context in
List.fold_left
- (fun (acc1,acc2,acc3) (i,_,ty) ->
- (i,context,ty)::acc1,
- (Cic.Meta(i,[]))::acc2,
- (Cic.Meta(i,irl)) ::acc3)
- ([],[],[]) proof_menv
+ (fun (acc1,acc2,acc3,uniq) (i,_,ty) ->
+ match uniq with
+ | Some m ->
+ acc1,
+ (Cic.Meta(i,[]))::acc2,
+ m::acc3, uniq
+ | None ->
+ [i,context,ty],
+ (Cic.Meta(i,[]))::acc2,
+ (Cic.Meta(i,irl)) ::acc3,Some (Cic.Meta(i,irl)))
+ ([],[],[],None) proof_menv
in
- let proof = ProofEngineReduction.replace_lifting
+ let cic_proof_new = ProofEngineReduction.replace_lifting
~equality:(=)
~what ~with_what
- ~where:proof
+ ~where:cic_proof_new
in
- (* prerr_endline (CicPp.ppterm proof); *)
- let names = names_of_context context in
- let newmetasenv =
+
+ (* pp new/old proof *)
+(* prerr_endline "NEWPROOFCIC";*)
+(* prerr_endline (CicPp.pp cic_proof_new names); *)
+
+ (* generation of proof metasenv *)
+ let newmetasenv_new = metasenv@newproof_menv in
+ let newmetasenv_new =
let i1 =
match new_meta_goal with
| C.Meta (i, _) -> i | _ -> assert false
in
- List.filter (fun (i, _, _) -> i <> i1 && i <> goal') metasenv
+ List.filter (fun (i, _, _) -> i <> i1 && i <> goal') newmetasenv_new
in
- let newmetasenv = newmetasenv@proof_menv in
+ (* check/refine/... build the new proof *)
let newstatus =
- try
- let ty, ug =
- prerr_endline "type checking ... ";
- CicTypeChecker.type_of_aux' newmetasenv context proof ugraph
- in
- prerr_endline (CicPp.pp proof [](* names *));
- debug_print
- (lazy
- (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 real_proof =
- ProofEngineReduction.replace
- ~equality:equality_for_replace
- ~what:[goal'] ~with_what:[proof]
- ~where:meta_proof
+ let cic_proof,newmetasenv,proof_menv,ty, ug =
+ let cic_proof_new,new_ty,newmetasenv_new,newug =
+ try
+ (*
+ prerr_endline "refining ... (new) ";
+ CicRefine.type_of_aux'
+ newmetasenv_new context cic_proof_new ugraph
+ *)
+ let ty,ug =
+ prerr_endline "typechecking ... (new) ";
+ CicTypeChecker.type_of_aux'
+ newmetasenv_new context cic_proof_new ugraph
+ in
+ cic_proof_new, ty, newmetasenv_new, ug
+ with
+ | CicTypeChecker.TypeCheckerFailure s ->
+ prerr_endline "THE PROOF DOESN'T TYPECHECK!!!";
+ prerr_endline (Lazy.force s);
+ assert false
+ | CicRefine.RefineFailure s
+ | CicRefine.Uncertain s
+ | CicRefine.AssertFailure s ->
+ prerr_endline "FAILURE IN REFINE";
+ prerr_endline (Lazy.force s);
+ assert false
in
- debug_print
- (lazy
- (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),
- List.map (fun (i,_,_) -> i) proof_menv)
- with CicTypeChecker.TypeCheckerFailure _ ->
- debug_print (lazy "THE PROOF DOESN'T TYPECHECK!!!");
- debug_print (lazy (CicPp.pp proof names));
- raise (ProofEngineTypes.Fail
- (lazy "Found a proof, but it doesn't typecheck"))
+ if List.length newmetasenv_new <> 0 then
+ prerr_endline
+ ("Some METAS are still open: "(* ^ CicMetaSubst.ppmetasenv
+ [] newmetasenv_new*));
+ cic_proof_new, newmetasenv_new, newmetasenv_new,new_ty, newug
+ (* THE OLD PROOF: cic_proof,newmetasenv,proof_menv,oldty,oldug *)
+ in
+ prerr_endline "FINAL PROOF";
+ prerr_endline (CicPp.pp cic_proof names);
+ prerr_endline "ENDOFPROOFS";
+ (*
+ debug_print
+ (lazy
+ (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 real_proof =
+ ProofEngineReduction.replace
+ ~equality:equality_for_replace
+ ~what:[goal'] ~with_what:[cic_proof]
+ ~where:meta_proof
+ in
+ (*
+ debug_print
+ (lazy
+ (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)));
+ *)
+ let open_goals = List.map (fun (i,_,_) -> i) proof_menv in
+ (uri, newmetasenv, real_proof, term_to_prove), open_goals
in
- let tall = fs_time_info.build_all in
- let tdemodulate = fs_time_info.demodulate in
- let tsubsumption = fs_time_info.subsumption in
if Utils.time then
begin
+ let tall = fs_time_info.build_all in
+ let tdemodulate = fs_time_info.demodulate in
+ let tsubsumption = fs_time_info.subsumption in
prerr_endline (
(Printf.sprintf "\nTIME NEEDED: %.9f" time) ^
(Printf.sprintf "\ntall: %.9f" tall) ^
(Printf.sprintf "\ntdemod: %.9f" tdemodulate) ^
(Printf.sprintf "\ntsubsumption: %.9f" tsubsumption) ^
(Printf.sprintf "\ninfer_time: %.9f" !infer_time) ^
- (Printf.sprintf "\nbeta_expand_time: %.9f\n"
- !Indexing.beta_expand_time) ^
- (Printf.sprintf "\nmetas_of_proof: %.9f\n"
- !Inference.metas_of_proof_time) ^
- (Printf.sprintf "\nforward_simpl_times: %.9f" !forward_simpl_time) ^
+ (Printf.sprintf "\nforward_simpl_times: %.9f"
+ !forward_simpl_time) ^
(Printf.sprintf "\nforward_simpl_new_times: %.9f"
- !forward_simpl_new_time) ^
- (Printf.sprintf "\nbackward_simpl_times: %.9f" !backward_simpl_time) ^
+ !forward_simpl_new_time) ^
+ (Printf.sprintf "\nbackward_simpl_times: %.9f"
+ !backward_simpl_time) ^
(Printf.sprintf "\npassive_maintainance_time: %.9f"
!passive_maintainance_time))
end;
- newstatus
- | _ ->
- raise (ProofEngineTypes.Fail (lazy "NO proof found"))
+ newstatus
;;
-(* dummy function called within matita to trigger linkage *)
-let init () = ();;
-
-
let retrieve_and_print dbd term metasenv ugraph =
let module C = Cic in
let module T = CicTypeChecker in
(fun (u, e) ->
Printf.sprintf "%s: %s"
(UriManager.string_of_uri u)
- (string_of_equality e)
+ (Equality.string_of_equality e)
)
res))));
res in
in
let env = (metasenv, context, ugraph) in
(*try*)
- let goal = Inference.BasicProof ([],new_meta_goal), [], goal in
+ let goal = [], [], goal
+ in
let equalities = simplify_equalities env (equalities@library_equalities) in
let active = make_active () in
let passive = make_passive equalities in
Printf.printf "\nequalities:\n%s\n"
(String.concat "\n"
(List.map
- (string_of_equality ~env) equalities));
+ (Equality.string_of_equality ~env) equalities));
print_endline "--------------------------------------------------";
print_endline "GO!";
start_time := Unix.gettimeofday ();
EqualitySet.elements (List.fold_left addfun EqualitySet.empty l)
in
Printf.printf "\n\nRESULTS:\nActive:\n%s\n\nPassive:\n%s\n"
- (String.concat "\n" (List.map (string_of_equality ~env) active))
+ (String.concat "\n" (List.map (Equality.string_of_equality ~env) active))
(* (String.concat "\n"
(List.map (fun e -> CicPp.ppterm (term_of_equality e)) active)) *)
(* (String.concat "\n" (List.map (string_of_equality ~env) passive)); *)
(String.concat "\n"
- (List.map (fun e -> CicPp.ppterm (term_of_equality e)) passive));
+ (List.map (fun e -> CicPp.ppterm (Equality.term_of_equality e)) passive));
print_newline ();
(*
with e ->
if library_equalities = [] then prerr_endline "VUOTA!!!";
let irl = CicMkImplicit.identity_relocation_list_for_metavariable context in
let library_equalities = List.map snd library_equalities in
- let goalterm = Cic.Meta (metano,irl) in
- let initgoal = Inference.BasicProof ([],goalterm), [], ty in
+ let initgoal = [], [], ty in
let env = (metasenv, context, CicUniv.empty_ugraph) in
let equalities = simplify_equalities env (equalities@library_equalities) in
let table =
(fun tbl eq -> Indexing.index tbl eq)
Indexing.empty equalities
in
- let newmeta,(newproof,newmetasenv, newty) = Indexing.demodulation_goal
- maxm (metasenv,context,CicUniv.empty_ugraph) table initgoal
+ let _, newmeta,(newproof,newmetasenv, newty) =
+ Indexing.demodulation_goal
+ maxm (metasenv,context,CicUniv.empty_ugraph) table initgoal
in
if newmeta != maxm then
begin
let opengoal = Cic.Meta(maxm,irl) in
let proofterm =
- Inference.build_proof_term ~noproof:opengoal newproof in
+ Equality.build_goal_proof newproof opengoal ty in
let extended_metasenv = (maxm,context,newty)::metasenv in
let extended_status =
(curi,extended_metasenv,pbo,pty),goal in
projects / helm.git / blobdiff