* http://cs.unibo.it/helm/.
*)
+let _profiler = <:profiler<_profiler>>;;
+
(* $Id$ *)
open Inference;;
let maxwidth = ref 3;;
type new_proof =
- Equality.goal_proof * Equality.new_proof * Equality.substitution * Cic.metasenv
-type old_proof = Equality.old_proof * Cic.metasenv
+ Equality.goal_proof * Equality.proof * int * Subst.substitution * Cic.metasenv
type result =
- | ParamodulationFailure
- | ParamodulationSuccess of (new_proof * old_proof) option
+ | ParamodulationFailure of string
+ | ParamodulationSuccess of new_proof
;;
-type goal = (Equality.goal_proof * Equality.old_proof) * Cic.metasenv * Cic.term;;
+type goal = Equality.goal_proof * Cic.metasenv * Cic.term;;
type theorem = Cic.term * Cic.term * Cic.metasenv;;
let compare eq1 eq2 =
match Equality.meta_convertibility_eq eq1 eq2 with
| true -> 0
- | false ->
+ | false ->
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
+ Equality.compare eq1 eq2
| res -> res
end
of weight, age and goal-similarity
*)
-let rec select env goals passive =
+let rec select env (goals,_) passive =
processed_clauses := !processed_clauses + 1;
let goal =
- match (List.rev goals) with (_, goal::_)::_ -> goal | _ -> assert false
+ 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 -> Equality.compare e eq <> 0) l in
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 =
passive_table))
| _ ->
symbols_counter := !symbols_ratio;
- let current = EqualitySet.min_elt pos_set in
+ let my_min e1 e2 =
+ let w1,_,_,_,_ = Equality.open_equality e1 in
+ let w2,_,_,_,_ = Equality.open_equality e2 in
+ if w1 < w2 then e1 else e2
+ in
+ let rec my_min_elt min = function
+ | [] -> min
+ | hd::tl -> my_min_elt (my_min hd min) tl
+ in
+ (* let current = EqualitySet.min_elt pos_set in *)
+ let current = my_min_elt (List.hd pos_list) (List.tl pos_list) in
let passive_table =
Indexing.remove_index passive_table current
in
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 =
(** inference of new equalities between current and some in active *)
-let infer env current (active_list, active_table) =
+let infer eq_uri env current (active_list, active_table) =
let (_,c,_) = env in
if Utils.debug_metas then
(ignore(Indexing.check_target c current "infer1");
ignore(List.map (function current -> Indexing.check_target c current "infer2") active_list));
let new_pos =
- let maxm, res =
- Indexing.superposition_right !maxmeta env active_table current in
+ let maxm, copy_of_current = Equality.fix_metas !maxmeta current in
+ maxmeta := maxm;
+ let active_table = Indexing.index active_table copy_of_current in
+ let _ = <:start<current contro active>> in
+ let maxm, res =
+ Indexing.superposition_right eq_uri !maxmeta env active_table current
+ in
+ let _ = <:stop<current contro active>> in
if Utils.debug_metas then
ignore(List.map
(function current ->
| [] -> []
| equality::tl ->
let maxm, res =
- Indexing.superposition_right !maxmeta env table equality in
+ Indexing.superposition_right
+ ~subterms_only:true eq_uri !maxmeta env table equality
+ in
maxmeta := maxm;
if Utils.debug_metas then
ignore
let pos = infer_positive table tl in
res @ pos
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)
- in
+ let _ = <:start<active contro current>> in
+ let pos = infer_positive curr_table ((*copy_of_current::*)active_list) in
+ let _ = <:stop<active contro current>> in
if Utils.debug_metas then
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
+ 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 _ -> 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
+ | 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)
+;;
+
(* buttare via sign *)
(** simplifies current using active and passive *)
-let forward_simplify env (sign,current) ?passive (active_list, active_table) =
+let forward_simplify
+ eq_uri env (sign,current) ?passive (active_list, active_table)
+=
let _, context, _ = env in
let passive_table =
match passive with
in
let demodulate table current =
let newmeta, newcurrent =
- Indexing.demodulation_equality !maxmeta env table sign current in
+ Indexing.demodulation_equality eq_uri !maxmeta env table sign current in
maxmeta := newmeta;
if Equality.is_identity env newcurrent then
-(* debug_print *)
-(* (lazy *)
-(* (Printf.sprintf "\ncurrent was: %s\nnewcurrent is: %s\n" *)
-(* (string_of_equality current) *)
-(* (string_of_equality newcurrent))); *)
-(* debug_print *)
-(* (lazy *)
-(* (Printf.sprintf "active is: %s" *)
-(* (String.concat "\n" *)
-(* (List.map (fun (_, e) -> (string_of_equality e)) active_list)))); *)
- None
+ None
else
Some newcurrent
in
match res with
| None -> None
| Some c ->
- (* immagino non funzioni piu'... *)
if Indexing.in_index active_table c then
None
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 = {
- mutable build_all: float;
- mutable demodulate: float;
- mutable subsumption: float;
-};;
-
-let fs_time_info = { build_all = 0.; demodulate = 0.; subsumption = 0. };;
-
-
(** simplifies new using active and passive *)
-let forward_simplify_new env new_pos ?passive active =
+let forward_simplify_new eq_uri env new_pos ?passive active =
if Utils.debug_metas then
begin
let m,c,u = env in
(fun current -> Indexing.check_target c current "forward new pos")
new_pos;)
end;
- let t1 = Unix.gettimeofday () in
-
let active_list, active_table = active in
let passive_table =
match passive with
| None -> None
| Some ((_, _), pt) -> Some pt
in
- let t2 = Unix.gettimeofday () in
- fs_time_info.build_all <- fs_time_info.build_all +. (t2 -. t1);
-
let demodulate sign table target =
let newmeta, newtarget =
- Indexing.demodulation_equality !maxmeta env table sign target in
+ Indexing.demodulation_equality eq_uri !maxmeta env table sign target
+ in
maxmeta := newmeta;
newtarget
in
- let t1 = Unix.gettimeofday () in
(* we could also demodulate using passive. Currently we don't *)
let new_pos =
List.map (demodulate Positive active_table) new_pos
in
- let t2 = Unix.gettimeofday () in
- fs_time_info.demodulate <- fs_time_info.demodulate +. (t2 -. t1);
-
let new_pos_set =
List.fold_left
(fun s e ->
if not (Equality.is_identity env e) then
- if EqualitySet.mem e s then s
- else EqualitySet.add e s
+ EqualitySet.add e s
else s)
EqualitySet.empty new_pos
in
(fun e -> ((Indexing.subsumption env active_table e = None) &&
(Indexing.subsumption env passive_table e = None)))
in
-(* let t1 = Unix.gettimeofday () in *)
-(* let t2 = Unix.gettimeofday () in *)
-(* fs_time_info.subsumption <- fs_time_info.subsumption +. (t2 -. t1); *)
let is_duplicate =
match passive_table with
| None ->
not ((Indexing.in_index active_table e) ||
(Indexing.in_index passive_table e)))
in
- List.filter subs (List.filter is_duplicate new_pos)
+ List.filter subs (List.filter is_duplicate new_pos)
;;
| None -> None
| Some ((_, _), pt) -> Some pt
in
- let demodulate table goal =
- let changed, newmeta, newgoal =
- Indexing.demodulation_goal !maxmeta env table goal in
- maxmeta := newmeta;
- changed, newgoal
- in
+ let demodulate table goal = Indexing.demodulation_goal env table goal 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
let a_goals, p_goals = goals in
let p_goals =
List.map
- (fun (d, gl) ->
- let gl =
- List.map (fun g -> snd (simplify_goal env g ?passive active)) gl in
- d, gl)
+ (fun g -> snd (simplify_goal env g ?passive active))
p_goals
in
- let goals =
- List.fold_left
- (fun (a, p) (d, gl) ->
- let changed = ref false in
- let gl =
- List.map
- (fun g ->
- let c, g = simplify_goal env g ?passive active in
- changed := !changed || c; g) gl in
- if !changed then (a, (d, gl)::p) else ((d, gl)::a, p))
- ([], p_goals) a_goals
+ let a_goals =
+ List.map
+ (fun g -> snd (simplify_goal env g ?passive active))
+ a_goals
in
- goals
+ a_goals, p_goals
;;
(** simplifies active usign new *)
-let backward_simplify_active env new_pos new_table min_weight active =
+let backward_simplify_active eq_uri 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.open_equality 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
+ match
+ forward_simplify
+ eq_uri env (Utils.Positive, equality) (new_pos, new_table)
+ with
+ | None -> res, newn, id::pruned
| Some e ->
if Equality.compare equality e = 0 then
- e::res, newn
+ e::res, newn, pruned
else
- res, e::newn)
- active_list ([], [])
+ res, e::newn, pruned)
+ active_list ([], [],[])
in
let find 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
+ (res, (id_of_eq eq)::pruned),tbl
else if (Equality.is_identity env eq) || (find eq res) then (
- res, tbl
+ (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 (Equality.is_identity env eq) then p
newa []
in
match newa with
- | [] -> active, None
- | _ -> active, Some newa
+ | [] -> (active1,tbl), None, pruned
+ | _ -> (active1,tbl), Some newa, pruned
;;
(** simplifies passive using new *)
-let backward_simplify_passive env new_pos new_table min_weight passive =
+let backward_simplify_passive eq_uri 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.open_equality equality in
if ew < min_weight then
equality::resl, ress, newn
else
- match forward_simplify env (sign, equality) (new_pos, new_table) with
+ match
+ forward_simplify eq_uri env (sign, equality) (new_pos, new_table)
+ with
| None -> resl, EqualitySet.remove equality ress, newn
| Some e ->
if equality = e then
| _ -> ((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 backward_simplify eq_uri env new' ?passive active =
+ let new_pos, new_table, min_weight = build_table new' in
+(*
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) new'
in
- let active, newa =
- backward_simplify_active env new_pos new_table min_weight active in
+*)
+ let active, newa, pruned =
+ backward_simplify_active eq_uri 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
active, passive, newa, newp *)
;;
-
-let close env new' given =
+let close eq_uri env new' given =
let new_pos, new_table, min_weight =
List.fold_left
(fun (l, t, w) e ->
in
List.fold_left
(fun p c ->
- let pos = infer env c (new_pos,new_table) in
+ let pos = infer eq_uri env c (new_pos,new_table) in
pos@p)
[] given
;;
| _ -> false
;;
-let prova env new' active =
+let prova eq_uri env new' active =
let given = List.filter is_commutative_law (fst active) in
let _ =
debug_print
(List.map
(fun e -> Equality.string_of_equality ~env e)
given)))) in
- close env new' given
+ close eq_uri env new' given
;;
(* returns an estimation of how many equalities in passive can be activated
active, passive
;;
+let make_goal_set goal =
+ ([],[goal])
+;;
(** initializes the set of theorems *)
let make_theorems theorems =
;;
-let rec simpl env e others others_simpl =
+let rec simpl eq_uri env e others others_simpl =
let active = others @ others_simpl in
let tbl =
List.fold_left
(fun t e -> Indexing.index t e)
Indexing.empty active
in
- let res = forward_simplify env (Positive,e) (active, tbl) in
+ let res = forward_simplify eq_uri env (Positive,e) (active, tbl) in
match others with
| hd::tl -> (
match res with
- | None -> simpl env hd tl others_simpl
- | Some e -> simpl env hd tl (e::others_simpl)
+ | None -> simpl eq_uri env hd tl others_simpl
+ | Some e -> simpl eq_uri env hd tl (e::others_simpl)
)
| [] -> (
match res with
)
;;
-let simplify_equalities env equalities =
+let simplify_equalities eq_uri env equalities =
debug_print
(lazy
(Printf.sprintf "equalities:\n%s\n"
| [] -> []
| hd::tl ->
let res =
- List.rev (simpl env hd tl [])
+ List.rev (simpl eq_uri env hd tl [])
in
debug_print
(lazy
in
Printf.sprintf "%d: %s" d (String.concat "; " gl')) goals))
;;
-
-let check_if_goal_is_subsumed env ((cicproof,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 ()) ->
+ when LibraryObjects.is_eq_URI uri ->
(let goal_equation =
Equality.mk_equality
- (0,(Equality.Exact (Cic.Rel (-1)),proof),(eq_ty,left,right,Eq),menv)
- in
- match Indexing.subsumption env table goal_equation with
- | Some (subst, equality ) ->
- let (_,(np,p),(ty,l,r,_),m,id) =
- Equality.open_equality equality in
- let p = Equality.apply_subst subst
- (Equality.build_proof_term_old p) in
- let newp =
- let rec repl = function
- | Equality.ProofGoalBlock (_, gp) ->
- Equality.ProofGoalBlock
- (Equality.BasicProof (Equality.empty_subst,p), gp)
- | Equality.NoProof ->
- Equality.BasicProof (Equality.empty_subst,p)
- | Equality.BasicProof _ ->
- Equality.BasicProof (Equality.empty_subst,p)
- | Equality.SubProof (t, i, p2) ->
- Equality.SubProof (t, i, repl p2)
- | _ -> assert false
- in
- repl proof
- in
- let newcicp,np,subst,cicmenv =
- cicproof,np, subst, (m @ menv)
- in
- Some
- ((newcicp,np,subst,cicmenv),
- (newp, Equality.apply_subst_metasenv subst m @ menv ))
- | None -> None)
+ (0,Equality.Exact (Cic.Implicit None),(eq_ty,left,right,Eq),menv)
+ in
+(* match Indexing.subsumption env table goal_equation with*)
+ match Indexing.unification env table goal_equation with
+ | Some (subst, equality, swapped ) ->
+ prerr_endline
+ ("GOAL SUBSUMED BY: " ^ Equality.string_of_equality equality);
+ prerr_endline ("SUBST:" ^ Subst.ppsubst subst);
+ let (_,p,(ty,l,r,_),m,id) = Equality.open_equality equality in
+ let cicmenv = Subst.apply_subst_metasenv subst (m @ menv) in
+ let p =
+ if swapped then
+ Equality.symmetric eq_ty l id uri m
+ else
+ p
+ in
+ Some (goalproof, p, id, subst, cicmenv)
+ | None -> None)
| _ -> None
;;
-let counter = ref 0
-
-(** given-clause algorithm with full reduction strategy *)
-let rec given_clause_fullred dbd env goals theorems ~passive active =
- let goals = simplify_goals env goals ~passive active in
- let _,context,_ = env in
- let ok, goals = activate_goal goals in
-(* let theorems = simplify_theorems env theorems ~passive active in *)
- if ok then
- let names = List.map (HExtlib.map_option (fun (name,_) -> name)) context in
- let _, _, t = List.hd (snd (List.hd (fst goals))) in
- let _ = prerr_endline ("goal activated = " ^ (CicPp.pp t names)) in
-(* let _ = *)
-(* debug_print *)
-(* (lazy *)
-(* (Printf.sprintf "\ngoals = \nactive\n%s\npassive\n%s\n" *)
-(* (print_goals (fst goals)) (print_goals (snd goals)))); *)
-(* let current = List.hd (fst goals) in *)
-(* let p, _, t = List.hd (snd current) in *)
-(* debug_print *)
-(* (lazy *)
-(* (Printf.sprintf "goal activated:\n%s\n%s\n" *)
-(* (CicPp.ppterm t) (string_of_proof p))); *)
-(* in *)
- let ok, proof =
- (* 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]])::_
- 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
- | Equality.ProofGoalBlock (_, gp) ->
- Equality.ProofGoalBlock
- (Equality.BasicProof (Equality.empty_subst,p), gp)
- | Equality.NoProof ->
-
- Equality.BasicProof (Equality.empty_subst,p)
- | Equality.BasicProof _ ->
- Equality.BasicProof (Equality.empty_subst,p)
- | Equality.SubProof (t, i, p2) ->
- Equality.SubProof (t, i, repl p2)
- | _ -> assert false
- in
- repl (snd proof)
- in
- let reflproof = Equality.refl_proof eq_ty left in
- true,
- Some ((fst proof,Equality.Exact reflproof,
- Equality.empty_subst,m),
- (newp,m))
- | (_, [proof,m,ty])::_ ->
- (match check_if_goal_is_subsumed env (proof,m,ty) (snd active) with
- | None -> false,None
- | Some p ->
- prerr_endline "Proof found by subsumption!";
- true, Some p)
- | _ -> false, None
- in
- if ok then
- ( prerr_endline "esco qui";
- (*
- let s = Printf.sprintf "actives:\n%s\n"
- (String.concat "\n"
- ((List.map
- (fun (s, e) -> (string_of_sign s) ^ " " ^
- (string_of_equality ~env e))
- (fst active)))) in
- let sp = Printf.sprintf "passives:\n%s\n"
- (String.concat "\n"
- (List.map
- (string_of_equality ~env)
- (let x,y,_ = passive in (fst x)@(fst y)))) in
- prerr_endline s;
- prerr_endline sp; *)
- ParamodulationSuccess (proof))
- else
- given_clause_fullred_aux dbd env goals theorems passive active
- else
-(* let ok', theorems = activate_theorem theorems in *)
-(* if ok' then *)
-(* let ok, goals = apply_theorem_to_goals env theorems active goals in *)
-(* if ok then *)
-(* let proof = *)
-(* match (fst goals) with *)
-(* | (_, [proof, _, _])::_ -> Some proof *)
-(* | _ -> assert false *)
-(* in *)
-(* ParamodulationSuccess (proof, env) *)
-(* else *)
-(* given_clause_fullred_aux env goals theorems passive active *)
-(* else *)
- if (passive_is_empty passive) then ParamodulationFailure
- else given_clause_fullred_aux dbd env goals theorems passive active
+let check_if_goal_is_identity env = function
+ | (goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right])
+ when left = right && LibraryObjects.is_eq_URI uri ->
+ let reflproof = Equality.Exact (Equality.refl_proof uri eq_ty left) in
+ Some (goalproof, reflproof, 0, Subst.empty_subst,m)
+ | (goalproof,m,Cic.Appl[Cic.MutInd(uri,_,ens);eq_ty;left;right])
+ when LibraryObjects.is_eq_URI uri ->
+ (let _,context,_ = env in
+ try
+ let s,m,_ =
+ Inference.unification m m context left right CicUniv.empty_ugraph
+ in
+ let reflproof = Equality.Exact (Equality.refl_proof uri eq_ty left) in
+ let m = Subst.apply_subst_metasenv s m in
+ Some (goalproof, reflproof, 0, s,m)
+ with _ -> None)
+ | _ -> None
+;;
-and given_clause_fullred_aux dbd env goals theorems passive active =
- prerr_endline (string_of_int !counter ^
- " MAXMETA: " ^ string_of_int !maxmeta ^
- " #ACTIVES: " ^ string_of_int (size_of_active active) ^
- " #PASSIVES: " ^ string_of_int (size_of_passive passive));
- incr counter;
-(*
- if !counter mod 10 = 0 then
- begin
- let size = HExtlib.estimate_size (passive,active) in
- let sizep = HExtlib.estimate_size (passive) in
- let sizea = HExtlib.estimate_size (active) in
- let (l1,s1),(l2,s2), t = passive in
- let sizetbl = HExtlib.estimate_size t in
- let sizel = HExtlib.estimate_size (l1,l2) in
- let sizes = HExtlib.estimate_size (s1,s2) in
-
- prerr_endline ("SIZE: " ^ string_of_int size);
- prerr_endline ("SIZE P: " ^ string_of_int sizep);
- prerr_endline ("SIZE A: " ^ string_of_int sizea);
- prerr_endline ("SIZE TBL: " ^ string_of_int sizetbl ^
- " SIZE L: " ^ string_of_int sizel ^
- " SIZE S:" ^ string_of_int sizes);
- end;*)
-(*
- if (size_of_active active) mod 50 = 0 then
- (let s = Printf.sprintf "actives:\n%s\n"
- (String.concat "\n"
- ((List.map
- (fun (s, e) -> (string_of_sign s) ^ " " ^
- (string_of_equality ~env e))
- (fst active)))) in
- let sp = Printf.sprintf "passives:\n%s\n"
- (String.concat "\n"
- (List.map
- (string_of_equality ~env)
- (let x,y,_ = passive in (fst x)@(fst y)))) in
- prerr_endline s;
- prerr_endline sp); *)
- let time1 = Unix.gettimeofday () in
- let (_,context,_) = env 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 (
- debug_print (lazy (Printf.sprintf "Time limit (%.2f) reached: %.2f\n"
- !time_limit !elapsed_time));
- make_passive []
- ) else if kept > selection_estimate then (
- debug_print
- (lazy (Printf.sprintf ("Too many passive equalities: pruning..." ^^
- "(kept: %d, selection_estimate: %d)\n")
- kept selection_estimate));
- prune_passive selection_estimate active passive
- ) else
- passive
+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 active_goals, passive_goals = goals in
+ let find (_,_,g) where =
+ List.exists (fun (_,_,g1) -> Equality.meta_convertibility g g1) where
in
+ let simplified =
+ List.fold_left
+ (fun acc goal ->
+ match simplify_goal env goal ~passive active with
+ | changed, g ->
+ if changed then prerr_endline "???????????????cambiato ancora";
+ if find g acc then acc else g::acc)
+ (* active_goals active_goals *)
+ [] active_goals
+ in
+ if List.length active_goals <> List.length simplified then
+ prerr_endline "SEMPLIFICANDO HO SCARTATO...";
+ (simplified,passive_goals)
+ (*
+ HExtlib.list_uniq ~eq:(fun (_,_,t1) (_,_,t2) -> t1 = t2)
+ (List.sort (fun (_,_,t1) (_,_,t2) -> compare t1 t1)
+ ((*goals @*) simplified))
+ *)
+;;
- 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 -> ParamodulationFailure
- (* given_clause_fullred dbd env goals theorems passive active *)
- | false ->
- let current, passive = select env (fst goals) passive in
- prerr_endline
- ("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)^
- " size p: " ^ string_of_int (HExtlib.estimate_size p)^
- " size t: " ^ string_of_int (HExtlib.estimate_size t)^
- " size l: " ^ string_of_int (HExtlib.estimate_size l)^
- " size r: " ^ string_of_int (HExtlib.estimate_size r)^
- " size o: " ^ string_of_int (HExtlib.estimate_size o)^
- " size m: " ^ string_of_int (HExtlib.estimate_size m)^
- " size m-c: " ^ string_of_int
- (HExtlib.estimate_size (List.map (fun (x,_,_) -> x) m)))) *)
- let time1 = Unix.gettimeofday () in
- let res = forward_simplify env (Positive, current) ~passive active in
- let time2 = Unix.gettimeofday () in
- forward_simpl_time := !forward_simpl_time +. (time2 -. time1);
- match res with
- | None ->
- (* weight_age_counter := !weight_age_counter + 1; *)
- given_clause_fullred dbd env goals theorems passive active
- | Some current ->
- prerr_endline (Printf.sprintf "selected sipl: %s"
- (Equality.string_of_equality ~env current));
- let t1 = Unix.gettimeofday () in
- let new' = infer env current active in
- let _ =
- debug_print
- (lazy
- (Printf.sprintf "new' (senza semplificare):\n%s\n"
- (String.concat "\n"
- (List.map
- (fun e -> "Positive " ^
- (Equality.string_of_equality ~env e)) new'))))
- in
- let t2 = Unix.gettimeofday () in
- infer_time := !infer_time +. (t2 -. t1);
- let 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 t1 = Unix.gettimeofday () in
- let new' = forward_simplify_new env new'~passive active in
- let t2 = Unix.gettimeofday () in
- 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
- 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 ->
- 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
-(* pessima prova
- let new1 = prova env new' active in
- let new' = (fst new') @ (fst new1), (snd new') @ (snd new1) in
- let _ =
- match new1 with
- | neg, pos ->
- debug_print
- (lazy
- (Printf.sprintf "new1:\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
-end prova *)
- let k = size_of_passive passive in
- if k < (kept - 1) then
- processed_clauses := !processed_clauses + (kept - 1 - k);
-
- let _ =
- debug_print
- (lazy
- (Printf.sprintf "active:\n%s\n"
- (String.concat "\n"
- ((List.map
- (fun e -> (Equality.string_of_equality ~env e))
- (fst active))))))
- in
- let _ =
- debug_print
- (lazy
- (Printf.sprintf "new':\n%s\n"
- (String.concat "\n"
- ((List.map
- (fun e -> "Negative " ^
- (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
+let check_if_goals_set_is_solved env active goals =
+ let active_goals, passive_goals = goals in
+ 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 active_goals
;;
-(*
-let profiler0 = HExtlib.profile "P/Saturation.given_clause_fullred"
+let infer_goal_set env active goals =
+ let active_goals, passive_goals = goals in
+ let rec aux = function
+ | [] -> goals
+ | hd::tl ->
+ let changed,selected = simplify_goal env hd active in
+ if changed then
+ prerr_endline ("--------------- goal semplificato");
+ let (_,_,t1) = selected in
+ if (List.exists
+ (fun (_,_,t) ->
+ Equality.meta_convertibility t t1)
+ active_goals) then aux tl
+ else
+ let passive_goals = tl in
+ let new_passive_goals =
+ if Utils.metas_of_term t1 = [] then passive_goals
+ else
+ let new' =
+ Indexing.superposition_left env (snd active) selected in
+ passive_goals @ new'
+ in
+ selected::active_goals, new_passive_goals
+ in
+ aux passive_goals
+;;
-let given_clause_fullred dbd env goals theorems passive active =
- profiler0.HExtlib.profile
- (given_clause_fullred dbd env goals theorems passive) active
+(* old
+let infer_goal_set env active goals =
+ let active_goals, passive_goals = goals in
+ let rec aux = function
+ | [] -> goals
+ | ((_,_,t1) as hd)::tl when
+ not (List.exists
+ (fun (_,_,t) ->
+ Equality.meta_convertibility t t1)
+ active_goals)
+ ->
+ let selected = hd in
+ let passive_goals = tl in
+ let new_passive_goals =
+ if CicUtil.is_meta_closed t1 then
+ passive_goals
+ else
+ let new' = Indexing.superposition_left env (snd active) selected in
+ passive_goals @ new'
+ in
+ selected::active_goals, new_passive_goals
+ | _::tl -> aux tl
+ in
+ aux passive_goals
+;;
*)
+let infer_goal_set_with_current env current goals =
+ let active_goals, passive_goals = goals in
+ let _,table,_ = build_table [current] in
+ active_goals,
+ List.fold_left
+ (fun acc g ->
+ let new' = Indexing.superposition_left env table g in
+ acc @ new')
+ passive_goals active_goals
+;;
+
+let ids_of_goal g =
+ let p,_,_ = g in
+ let ids = List.map (fun _,_,i,_,_ -> i) p in
+ ids
+;;
-let rec saturate_equations env goal accept_fun passive active =
+let ids_of_goal_set (ga,gp) =
+ List.flatten (List.map ids_of_goal ga) @
+ List.flatten (List.map ids_of_goal gp)
+;;
+
+let size_of_goal_set_a (l,_) = List.length l;;
+let size_of_goal_set_p (_,l) = List.length l;;
+
+(** given-clause algorithm with full reduction strategy: NEW implementation *)
+(* here goals is a set of goals in OR *)
+let given_clause
+ eq_uri ((_,context,_) as env) goals theorems passive active max_iterations max_time
+=
+ let names = names_of_context context in
+ 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 _ = prerr_endline "simpl goal with active" in
+ let _ = <:start<simplify goal set active>> in
+ let goals = simplify_goal_set env goals passive active in
+ let _ = <:stop<simplify goal set active>> in
+*)
+ let _ =
+ prerr_endline
+ (Printf.sprintf "%d #ACTIVES: %d #PASSIVES: %d #GOALSET: %d(%d)\n"
+ iterno (size_of_active active) (size_of_passive passive)
+ (size_of_goal_set_a goals) (size_of_goal_set_p goals))
+ in
+ (* 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);
+ let goals = infer_goal_set env active goals in
+ match check_if_goals_set_is_solved env active goals with
+ | Some p ->
+ prerr_endline
+ (Printf.sprintf "Found a proof in: %f\n"
+ (Unix.gettimeofday() -. initial_time));
+ ParamodulationSuccess p
+ | None ->
+ (* SELECTION *)
+ if passive_is_empty passive then
+ ParamodulationFailure "No more passive"(*maybe this is a success! *)
+ else
+ begin
+ (* COLLECTION OF GARBAGED EQUALITIES *)
+ if iterno mod 40 = 0 then
+ begin
+ let active = List.map Equality.id_of (fst active) in
+ let passive = List.map Equality.id_of (fst (fst passive)) in
+ let goal = ids_of_goal_set goals in
+ Equality.collect active passive goal
+ end;
+ let current, passive = select env goals passive in
+ let _ =
+ List.iter
+ (fun _,_,g ->
+ prerr_endline (Printf.sprintf "Current goal = %s\n"
+ (CicPp.pp g names)))
+ (fst goals);
+ prerr_endline (Printf.sprintf "Selected = %s\n"
+ (Equality.string_of_equality ~env current))
+ in
+ (* SIMPLIFICATION OF CURRENT *)
+ let res =
+ forward_simplify eq_uri env (Positive, current) active
+ in
+ match res with
+ | None -> step goals theorems passive active (iterno+1)
+ | Some current ->
+ (* GENERATION OF NEW EQUATIONS *)
+ prerr_endline "infer";
+ let new' = infer eq_uri env current active in
+ prerr_endline "infer goal";
+ let goals = infer_goal_set_with_current env current goals in
+ let active =
+ let al, tbl = active in
+ al @ [current], Indexing.index tbl current
+ in
+ (* FORWARD AND BACKWARD SIMPLIFICATION *)
+ prerr_endline "fwd/back simpl";
+ let rec simplify new' active passive =
+ let new' =
+ forward_simplify_new eq_uri env new' ~passive active
+ in
+ let active, passive, newa, retained, pruned =
+ backward_simplify eq_uri 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
+ prerr_endline "simpl goal with new";
+ let goals =
+ let a,b,_ = build_table new' in
+ let _ = <:start<simplify_goal_set new>> in
+ let rc = simplify_goal_set env goals passive (a,b) in
+ let _ = <:stop<simplify_goal_set new>> in
+ rc
+ 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 eq_uri env goal accept_fun passive active =
elapsed_time := Unix.gettimeofday () -. !start_time;
if !elapsed_time > !time_limit then
(active, passive)
else
- let current, passive = select env [1, [goal]] passive in
- let res = forward_simplify env (Positive, current) ~passive active in
+ let current, passive = select env ([goal],[]) passive in
+ let res = forward_simplify eq_uri env (Positive, current) ~passive active in
match res with
| None ->
- saturate_equations env goal accept_fun passive active
+ saturate_equations eq_uri env goal accept_fun passive active
| Some current ->
debug_print (lazy (Printf.sprintf "selected: %s"
(Equality.string_of_equality ~env current)));
- let new' = infer env current active in
+ let new' = infer eq_uri env current active in
let active =
if Equality.is_identity env current then active
else
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 =
- backward_simplify env new' ~passive active in
+ let new' = forward_simplify_new eq_uri env new' ~passive active in
+ let active, passive, newa, retained, pruned =
+ backward_simplify eq_uri 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
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
+ saturate_equations eq_uri env goal accept_fun passive active
;;
let main dbd full term metasenv ugraph = ()
Equality.reset ();
;;
+let eq_of_goal = function
+ | Cic.Appl [Cic.MutInd(uri,0,_);_;_;_] when LibraryObjects.is_eq_URI uri ->
+ uri
+ | _ -> raise (ProofEngineTypes.Fail (lazy ("The goal is not an equality ")))
+;;
+
+let eq_and_ty_of_goal = function
+ | Cic.Appl [Cic.MutInd(uri,0,_);t;_;_] when LibraryObjects.is_eq_URI uri ->
+ uri,t
+ | _ -> raise (ProofEngineTypes.Fail (lazy ("The goal is not an equality ")))
+;;
+
let saturate
dbd ?(full=false) ?(depth=default_depth) ?(width=default_width) status =
let module C = Cic in
reset_refs ();
Indexing.init_index ();
- counter := 0;
maxdepth := depth;
maxwidth := width;
(* CicUnification.unif_ty := false;*)
- let proof, goal = status in
- let goal' = goal in
+ let proof, goalno = status in
let uri, metasenv, meta_proof, term_to_prove = proof in
- let _, context, goal = CicUtil.lookup_meta goal' metasenv in
+ let _, context, type_of_goal = CicUtil.lookup_meta goalno metasenv in
+ let eq_uri = eq_of_goal type_of_goal in
+ 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 =
- CicMkImplicit.identity_relocation_list_for_metavariable context in
- let _, context, ty = CicUtil.lookup_meta goal' metasenv in
- debug_print
- (lazy (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
- let goal =
- ([],Equality.BasicProof (Equality.empty_subst,new_meta_goal)), [], goal
- in
+ let cleaned_goal = Utils.remove_local_context type_of_goal in
+ let goal = [], List.filter (fun (i,_,_)->i<>goalno) metasenv, cleaned_goal in
let res, time =
let t1 = Unix.gettimeofday () in
let lib_eq_uris, library_equalities, maxm =
- find_library_equalities dbd context (proof, goal') (maxm+2)
+ find_library_equalities dbd context (proof, goalno) (maxm+2)
in
let library_equalities = List.map snd library_equalities in
let t2 = Unix.gettimeofday () in
maxmeta := maxm+2;
- let equalities = simplify_equalities env (equalities@library_equalities) in
+ let equalities =
+ simplify_equalities eq_uri env (equalities@library_equalities)
+ in
debug_print
(lazy
(Printf.sprintf "Time to retrieve equalities: %.9f\n" (t2 -. t1)));
let t1 = Unix.gettimeofday () in
let theorems =
if full then
- let thms = find_library_theorems dbd env (proof, goal') lib_eq_uris in
+ let thms = find_library_theorems dbd env (proof, goalno) lib_eq_uris in
let context_hyp = find_context_hypotheses env eq_indexes in
context_hyp @ thms, []
else
- let refl_equal =
- let us = UriManager.string_of_uri (LibraryObjects.eq_URI ()) in
- UriManager.uri_of_string (us ^ "#xpointer(1/1/1)")
- in
+ let refl_equal = LibraryObjects.eq_refl_URI ~eq:eq_uri in
let t = CicUtil.term_of_uri refl_equal in
let ty, _ = CicTypeChecker.type_of_aux' [] [] t CicUniv.empty_ugraph in
[(t, ty, [])], []
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 = make_goal_set goal in
+ let max_iterations = 10000 in
+ let max_time = Unix.gettimeofday () +. 600. (* minutes *) in
+ given_clause
+ eq_uri env goals theorems passive active max_iterations max_time
in
let finish = Unix.gettimeofday () in
(res, finish -. start)
in
match res with
+ | ParamodulationFailure s ->
+ raise (ProofEngineTypes.Fail (lazy ("NO proof found: " ^ s)))
| ParamodulationSuccess
- (Some
- ((goalproof,newproof,subsumption_subst, newproof_menv), (* NEW *)
- (proof, proof_menv))) (* OLD *)
- ->
+ (goalproof,newproof,subsumption_id,subsumption_subst, proof_menv) ->
prerr_endline "OK, found a proof!";
-
- (* generation of the old proof *)
- let cic_proof = Equality.build_proof_term_old proof in
-
- (* generation of the new proof *)
- let cic_proof_new,cic_proof_new_menv =
- Equality.build_goal_proof
- goalproof (Equality.build_proof_term_new newproof)
+ prerr_endline
+ (Equality.pp_proof names goalproof newproof subsumption_subst
+ subsumption_id type_of_goal);
+ prerr_endline (CicMetaSubst.ppmetasenv [] proof_menv);
+ prerr_endline "ENDOFPROOFS";
+ (* generation of the CIC proof *)
+ let side_effects =
+ List.filter (fun i -> i <> goalno)
+ (ProofEngineHelpers.compare_metasenvs
+ ~newmetasenv:metasenv ~oldmetasenv:proof_menv)
in
- let newproof_menv =
- Equality.apply_subst_metasenv subsumption_subst
- (newproof_menv @ cic_proof_new_menv)
+ let goal_proof, side_effects_t =
+ let initial = Equality.add_subst subsumption_subst newproof in
+ Equality.build_goal_proof
+ eq_uri goalproof initial type_of_goal side_effects
in
- let cic_proof_new =
- Equality.apply_subst subsumption_subst cic_proof_new
+ let goal_proof = Subst.apply_subst subsumption_subst goal_proof in
+ let metas_still_open_in_proof = Utils.metas_of_term goal_proof in
+(*prerr_endline (CicPp.pp goal_proof names);*)
+ (* ?? *)
+ let goal_proof = (* Subst.apply_subst subsumption_subst *) goal_proof in
+ let side_effects_t =
+ List.map (Subst.apply_subst subsumption_subst) side_effects_t
in
-
(* replacing fake mets with real ones *)
- let equality_for_replace i t1 =
- match t1 with
- | C.Meta (n, _) -> n = i
- | _ -> false
- in
- let mkirl = CicMkImplicit.identity_relocation_list_for_metavariable in
- prerr_endline "replacing metas (old)";
- let proof_menv, what, with_what =
- let irl = mkirl context in
+ prerr_endline "replacing metas...";
+ let irl=CicMkImplicit.identity_relocation_list_for_metavariable context in
+ let goal_proof_menv, what, with_what,free_meta =
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)
+ (List.filter
+ (fun (i,_,_) -> List.mem i metas_still_open_in_proof)
+ proof_menv)
in
- let cic_proof = ProofEngineReduction.replace_lifting
- ~equality:(=)
- ~what ~with_what
- ~where:cic_proof
+ let replace where =
+ (* we need this fake equality since the metas of the hypothesis may be
+ * with a real local context *)
+ ProofEngineReduction.replace_lifting
+ ~equality:(fun x y ->
+ match x,y with Cic.Meta(i,_),Cic.Meta(j,_) -> i=j | _-> false)
+ ~what ~with_what ~where
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)
- ([],[],[]) newproof_menv
+ let goal_proof = replace goal_proof in
+ (* ok per le meta libere... ma per quelle che c'erano e sono rimaste?
+ * what mi pare buono, sostituisce solo le meta farlocche *)
+ let side_effects_t = List.map replace side_effects_t in
+ let free_metas =
+ List.filter (fun i -> i <> goalno)
+ (ProofEngineHelpers.compare_metasenvs
+ ~oldmetasenv:metasenv ~newmetasenv:goal_proof_menv)
in
- let cic_proof_new = ProofEngineReduction.replace_lifting
- ~equality:(=)
- ~what ~with_what
- ~where:cic_proof_new
+prerr_endline ("freemetas: " ^ String.concat "," (List.map string_of_int free_metas) );
+ (* check/refine/... build the new proof *)
+ let replaced_goal =
+ ProofEngineReduction.replace
+ ~what:side_effects ~with_what:side_effects_t
+ ~equality:(fun i t -> match t with Cic.Meta(j,_)->j=i|_->false)
+ ~where:type_of_goal
in
-
- (* pp new/old proof *)
- let names = names_of_context context in
- prerr_endline "OLDPROOF";
- prerr_endline (Equality.string_of_proof_old proof);
- prerr_endline "OLDPROOFCIC";
- prerr_endline (CicPp.pp cic_proof names);
- prerr_endline "NEWPROOF";
- prerr_endline (Equality.string_of_proof_new ~names newproof goalproof);
- prerr_endline "NEWPROOFCIC";
- prerr_endline (CicPp.pp cic_proof_new names);
-
- (* generation of proof metasenv *)
- let newmetasenv =
- let i1 =
- match new_meta_goal with
- | C.Meta (i, _) -> i | _ -> assert false
+ let subst_side_effects,real_menv,_ =
+ let fail t s = raise (ProofEngineTypes.Fail (lazy (t^Lazy.force s))) in
+ let free_metas_menv =
+ List.map (fun i -> CicUtil.lookup_meta i goal_proof_menv) free_metas
in
- List.filter (fun (i, _, _) -> i <> i1 && i <> goal') metasenv
+ try
+ CicUnification.fo_unif_subst [] context (metasenv @ free_metas_menv)
+ replaced_goal type_of_goal CicUniv.empty_ugraph
+ with
+ | CicUnification.UnificationFailure s
+ | CicUnification.Uncertain s
+ | CicUnification.AssertFailure s ->
+ fail "Maybe the local context of metas in the goal was not an IRL" s
in
- let newmetasenv = newmetasenv@proof_menv in
- let newmetasenv_new = newmetasenv@newproof_menv in
-
- (* check/refine/... build the new proof *)
- let newstatus =
- let cic_proof,newmetasenv,proof_menv,ty, ug =
- prerr_endline "type checking ... (old) ";
- let _old_ty, _oldug =
- try
- CicTypeChecker.type_of_aux' newmetasenv context cic_proof ugraph
- with
- CicTypeChecker.TypeCheckerFailure s ->
- prerr_endline "THE *OLD* PROOF DOESN'T TYPECHECK!!!";
- prerr_endline (Lazy.force s);
- Cic.Implicit None, CicUniv.empty_ugraph
- in
- 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
- 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
+ let final_subst =
+ (goalno,(context,goal_proof,type_of_goal))::subst_side_effects
+ in
+prerr_endline ("MENVreal_menv: " ^ CicMetaSubst.ppmetasenv [] real_menv);
+ let _ =
+ try
+ CicTypeChecker.type_of_aux' real_menv context goal_proof
+ CicUniv.empty_ugraph
+ with
+ | CicUtil.Meta_not_found _
+ | CicTypeChecker.TypeCheckerFailure _
+ | CicTypeChecker.AssertFailure _
+ | Invalid_argument "list_fold_left2" as exn ->
+ prerr_endline "THE PROOF DOES NOT TYPECHECK!";
+ prerr_endline (CicPp.pp goal_proof names);
+ prerr_endline "THE PROOF DOES NOT TYPECHECK!";
+ raise exn
+ in
+ let proof, real_metasenv =
+ ProofEngineHelpers.subst_meta_and_metasenv_in_proof
+ proof goalno (CicMetaSubst.apply_subst final_subst) real_menv
+ in
+ let open_goals =
+ match free_meta with Some(Cic.Meta(m,_)) when m<>goalno ->[m] | _ ->[]
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 "\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) ^
- (Printf.sprintf "\npassive_maintainance_time: %.9f"
- !passive_maintainance_time))
- end;
- newstatus
- | ParamodulationSuccess None -> assert false
- | ParamodulationFailure ->
- raise (ProofEngineTypes.Fail (lazy "NO proof found"))
+ Printf.eprintf
+ "GOALS APERTI: %s\nMETASENV PRIMA:\n%s\nMETASENV DOPO:\n%s\n"
+ (String.concat ", " (List.map string_of_int open_goals))
+ (CicMetaSubst.ppmetasenv [] metasenv)
+ (CicMetaSubst.ppmetasenv [] real_metasenv);
+ prerr_endline (Printf.sprintf "\nTIME NEEDED: %8.2f" time);
+ proof, open_goals
;;
-(* 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
let proof, goals = status in
let goal' = List.nth goals 0 in
let uri, metasenv, meta_proof, term_to_prove = proof in
- let _, context, goal = CicUtil.lookup_meta goal' metasenv in
+ let _, context, type_of_goal = CicUtil.lookup_meta goal' metasenv in
+ let eq_uri = eq_of_goal type_of_goal in
let eq_indexes, equalities, maxm = find_equalities context proof in
- 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
- (lazy (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
let t1 = Unix.gettimeofday () in
(fun t (_, e) -> Indexing.index t e)
Indexing.empty active
in
- let res = forward_simplify env (Positive, e) (active, tbl) in
+ let res = forward_simplify eq_uri env (Positive, e) (active, tbl) in
match others with
| hd::tl -> (
match res with
let goal' = List.nth goals 0 in
let _, metasenv, meta_proof, _ = proof in
let _, context, goal = CicUtil.lookup_meta goal' metasenv in
+ let eq_uri = eq_of_goal goal in
let eq_indexes, equalities, maxm = find_equalities context proof in
let lib_eq_uris, library_equalities, maxm =
find_library_equalities dbd context (proof, goal') (maxm+2)
in
let env = (metasenv, context, ugraph) in
(*try*)
- let goal =
- ([],Equality.BasicProof (Equality.empty_subst,new_meta_goal)), [], goal
+ let goal = [], [], goal
+ in
+ let equalities =
+ simplify_equalities eq_uri env (equalities@library_equalities)
in
- let equalities = simplify_equalities env (equalities@library_equalities) in
let active = make_active () in
let passive = make_passive equalities in
Printf.printf "\ncontext:\n%s\n" (PP.ppcontext context);
start_time := Unix.gettimeofday ();
if !time_limit < 1. then time_limit := 60.;
let ra, rp =
- saturate_equations env goal (fun e -> true) passive active
+ saturate_equations eq_uri env goal (fun e -> true) passive active
in
let initial =
(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 (Equality.term_of_equality e)) passive));
+ (List.map
+ (fun e -> CicPp.ppterm (Equality.term_of_equality eq_uri e))
+ passive));
print_newline ();
(*
with e ->
*)
;;
-let demodulate_tac ~dbd ~pattern ((proof,goal) as initialstatus) =
- let module I = Inference in
+let demodulate_tac ~dbd ~pattern ((proof,goal)(*s initialstatus*)) =
let curi,metasenv,pbo,pty = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
- let eq_indexes, equalities, maxm = I.find_equalities context proof in
+ let eq_uri = eq_of_goal ty in
+ let eq_indexes, equalities, maxm =
+ Inference.find_equalities context proof
+ in
let lib_eq_uris, library_equalities, maxm =
- I.find_library_equalities dbd context (proof, goal) (maxm+2) in
+ Inference.find_library_equalities dbd context (proof, goal) (maxm+2) in
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 =
- ([],Equality.BasicProof (Equality.empty_subst,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 equalities =
+ simplify_equalities eq_uri env (equalities@library_equalities)
+ in
let table =
List.fold_left
(fun tbl eq -> Indexing.index tbl eq)
Indexing.empty equalities
in
- let _, newmeta,(newproof,newmetasenv, newty) =
+ let changed,(newproof,newmetasenv, newty) =
Indexing.demodulation_goal
- maxm (metasenv,context,CicUniv.empty_ugraph) table initgoal
+ (metasenv,context,CicUniv.empty_ugraph) table initgoal
in
- if newmeta != maxm then
+ if changed then
begin
- let opengoal = Cic.Meta(maxm,irl) in
- let proofterm =
- Equality.build_proof_term_old ~noproof:opengoal (snd newproof) in
+ let opengoal = Equality.Exact (Cic.Meta(maxm,irl)) in
+ let proofterm,_ =
+ Equality.build_goal_proof eq_uri newproof opengoal ty []
+ in
let extended_metasenv = (maxm,context,newty)::metasenv in
let extended_status =
(curi,extended_metasenv,pbo,pty),goal in
extended_status in
(status,maxm::newgoals)
end
- else if newty = ty then
+ else (* if newty = ty then *)
raise (ProofEngineTypes.Fail (lazy "no progress"))
- else ProofEngineTypes.apply_tactic
+ (*else ProofEngineTypes.apply_tactic
(ReductionTactics.simpl_tac ~pattern)
- initialstatus
+ initialstatus*)
;;
let demodulate_tac ~dbd ~pattern =
ProofEngineTypes.mk_tactic (demodulate_tac ~dbd ~pattern)
;;
+
+let rec find_in_ctx i name = function
+ | [] -> raise (ProofEngineTypes.Fail (lazy ("Hypothesis not found: " ^ name)))
+ | Some (Cic.Name name', _)::tl when name = name' -> i
+ | _::tl -> find_in_ctx (i+1) name tl
+;;
+
+let rec position_of i x = function
+ | [] -> assert false
+ | j::tl when j <> x -> position_of (i+1) x tl
+ | _ -> i
+;;
+
+let superposition_tac ~what ~other ~subterms_only ~demodulate status =
+ reset_refs();
+ let proof,goalno = status in
+ let curi,metasenv,pbo,pty = proof in
+ let metano,context,ty = CicUtil.lookup_meta goalno metasenv in
+ let eq_uri,tty = eq_and_ty_of_goal ty in
+ let env = (metasenv, context, CicUniv.empty_ugraph) in
+ let names = names_of_context context in
+ let eq_index, equalities, maxm = find_equalities context proof in
+ let what = find_in_ctx 1 what context in
+ let other = find_in_ctx 1 other context in
+ let eq_what = List.nth equalities (position_of 0 what eq_index) in
+ let eq_other = List.nth equalities (position_of 0 other eq_index) in
+ let index = Indexing.index Indexing.empty eq_other in
+ let maxm, eql =
+ Indexing.superposition_right
+ ~subterms_only eq_uri maxm env index eq_what
+ in
+ prerr_endline ("Superposition right:");
+ prerr_endline ("\n eq: " ^ Equality.string_of_equality eq_what ~env);
+ prerr_endline ("\n table: " ^ Equality.string_of_equality eq_other ~env);
+ prerr_endline ("\n result: ");
+ List.iter (fun e -> prerr_endline (Equality.string_of_equality e ~env)) eql;
+ prerr_endline ("\n result (cut&paste): ");
+ List.iter
+ (fun e ->
+ let t = Equality.term_of_equality eq_uri e in
+ prerr_endline (CicPp.pp t names))
+ eql;
+ if demodulate then
+ begin
+ let table = List.fold_left Indexing.index Indexing.empty equalities in
+ let maxm,eql =
+ List.fold_left
+ (fun (maxm,acc) e ->
+ let maxm,eq =
+ Indexing.demodulation_equality
+ eq_uri maxm env table Utils.Positive e
+ in
+ maxm,eq::acc)
+ (maxm,[]) eql
+ in
+ let eql = List.rev eql in
+ prerr_endline ("\n result [demod]: ");
+ List.iter
+ (fun e -> prerr_endline (Equality.string_of_equality e ~env)) eql;
+ prerr_endline ("\n result [demod] (cut&paste): ");
+ List.iter
+ (fun e ->
+ let t = Equality.term_of_equality eq_uri e in
+ prerr_endline (CicPp.pp t names))
+ eql;
+ end;
+ proof,[goalno]
+;;
+
+let get_stats () =
+ <:show<Saturation.>> ^ Indexing.get_stats () ^ Inference.get_stats () ^
+ Equality.get_stats ();;
+
projects / helm.git / blobdiff