* http://cs.unibo.it/helm/.
*)
-(* $Id$ *)
+let _profiler = <:profiler<_profiler>>;;
-(* <:profiler<"saturation">> *)
+(* $Id$ *)
open Inference;;
open Utils;;
let maxwidth = ref 3;;
type new_proof =
- Equality.goal_proof * Equality.proof * Subst.substitution * Cic.metasenv
+ Equality.goal_proof * Equality.proof * int * Subst.substitution * Cic.metasenv
type result =
| ParamodulationFailure of string
| ParamodulationSuccess of new_proof
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
(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 !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 !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
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
(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
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
+(* if EqualitySet.mem e s then s *)
+ (*else*) EqualitySet.add e s
else s)
EqualitySet.empty new_pos
in
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
;;
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);*)
+ 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 ()) ->
(* match Indexing.subsumption env table goal_equation with*)
match Indexing.unification env table goal_equation with
| Some (subst, equality ) ->
+ 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
- Some (goalproof, p, subst, cicmenv)
+ Some (goalproof, p, id, subst, cicmenv)
| None -> None)
| _ -> None
;;
| (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
- true, Some (goalproof, reflproof, Subst.empty_subst,m)
+ true, Some (goalproof, reflproof, 0, Subst.empty_subst,m)
| goal::_ ->
(match check_if_goal_is_subsumed env (snd active) goal with
| None -> false,None
| (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)
+ Some (goalproof, reflproof, 0, Subst.empty_subst,m)
| _ -> None
;;
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 =
- HExtlib.filter_map
- (fun g ->
- match simplify_goal env g ~passive active with
- | true, g -> Some g
- | false, g -> Some g)
- active_goals
+ List.fold_left
+ (fun acc goal ->
+ match simplify_goal env goal ~passive active with
+ | _, g -> if find g acc then acc else g::acc)
+ [] 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)
let infer_goal_set env active goals =
let active_goals, passive_goals = goals in
- match passive_goals with
- | [] -> goals
- | hd::tl ->
- let selected = hd in
- let passive_goals = tl in
- let new' = Indexing.superposition_left env (snd active) selected in
- selected::active_goals, passive_goals @ new'
+ 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' = Indexing.superposition_left env (snd active) selected in
+ selected::active_goals, passive_goals @ new'
+ | _::tl -> aux tl
+ in
+ aux passive_goals
;;
let infer_goal_set_with_current env current goals =
else if Unix.gettimeofday () > max_time then
(ParamodulationFailure "No more time to spend")
else
+ let _ = prerr_endline "simpl goal with active" in
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);
+ prerr_endline
+ (Printf.sprintf "Found a proof in: %f\n"
+ (Unix.gettimeofday() -. initial_time));
+(* assert false;*)
ParamodulationSuccess p
| None ->
prerr_endline
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! *)
+ ParamodulationFailure "No more passive"(*maybe this is a success! *)
else
begin
let goals = infer_goal_set env active goals in
let current, passive = select env goals passive in
- Printf.eprintf "Selected = %s\n"
- (Equality.string_of_equality ~env current);
+ prerr_endline (Printf.sprintf "Selected = %s\n"
+ (Equality.string_of_equality ~env current));
(* SIMPLIFICATION OF CURRENT *)
let res =
forward_simplify env (Positive, current) ~passive active
| None -> step goals theorems passive active (iterno+1)
| Some current ->
(* GENERATION OF NEW EQUATIONS *)
+ prerr_endline "infer";
let new' = infer env current active in
+ prerr_endline "infer goal";
let goals = infer_goal_set_with_current env current goals 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 *)
+ prerr_endline "fwd/back simpl";
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
+ let passive =
+ List.fold_left filter_dependent passive pruned
+ in
match newa, retained with
| None, None -> active, passive, new'
| Some p, None
| 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
simplify_goal_set env goals passive (a,b)
let eq_indexes, equalities, maxm = find_equalities context proof in
let ugraph = CicUniv.empty_ugraph in
let env = (metasenv, context, ugraph) in
- let goal = [], metasenv, type_of_goal in
+ let goal = [], List.filter (fun (i,_,_)->i<>goalno) metasenv, type_of_goal in
let res, time =
let t1 = Unix.gettimeofday () in
let lib_eq_uris, library_equalities, maxm =
*)
let goals = make_goal_set goal in
let max_iterations = 1000 in
- let max_time = Unix.gettimeofday () +. 600. (* minutes *) in
+ let max_time = Unix.gettimeofday () +. 300. (* minutes *) in
given_clause env goals theorems passive active max_iterations max_time
in
let finish = Unix.gettimeofday () in
| ParamodulationFailure s ->
raise (ProofEngineTypes.Fail (lazy ("NO proof found: " ^ s)))
| ParamodulationSuccess
- (goalproof,newproof,subsumption_subst, proof_menv) ->
+ (goalproof,newproof,subsumption_id,subsumption_subst, proof_menv) ->
prerr_endline "OK, found a proof!";
- prerr_endline (Equality.pp_proof names goalproof 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 =
(ProofEngineHelpers.compare_metasenvs
~newmetasenv:metasenv ~oldmetasenv:proof_menv)
in
- let free_metas =
- List.filter (fun i -> i <> goalno)
- (ProofEngineHelpers.compare_metasenvs
- ~oldmetasenv:metasenv ~newmetasenv:proof_menv)
- in
let goal_proof, side_effects_t =
- let initial = Equality.build_proof_term newproof in
+ let initial = newproof in
Equality.build_goal_proof goalproof initial type_of_goal side_effects
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
([],[],[],None) proof_menv
in
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:(=) ~what ~with_what ~where
+ ~equality:(fun x y ->
+ match x,y with Cic.Meta(i,_),Cic.Meta(j,_) -> i=j | _-> false)
+ ~what ~with_what ~where
in
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
+prerr_endline ("freemetas: " ^ String.concat "," (List.map string_of_int free_metas) );
(* check/refine/... build the new proof *)
let replaced_goal =
ProofEngineReduction.replace
| CicUnification.AssertFailure s ->
fail "Maybe the local context of metas in the goal was not an IRL" s
in
-
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,_)) -> [m] | _ -> []
+ match free_meta with Some(Cic.Meta(m,_)) when m<>goalno ->[m] | _ ->[]
in
Printf.eprintf
"GOALS APERTI: %s\nMETASENV PRIMA:\n%s\nMETASENV DOPO:\n%s\n"
*)
;;
-let demodulate_tac ~dbd ~pattern ((proof,goal) as initialstatus) =
+let demodulate_tac ~dbd ~pattern ((proof,goal)(*s initialstatus*)) =
let module I = Inference in
let curi,metasenv,pbo,pty = proof in
let metano,context,ty = CicUtil.lookup_meta goal metasenv in
(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 opengoal = Equality.Exact (Cic.Meta(maxm,irl)) in
let proofterm,_ =
Equality.build_goal_proof newproof opengoal ty [] in
let extended_metasenv = (maxm,context,newty)::metasenv 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 get_stats () =
+ <:show<Saturation.>> ^ Indexing.get_stats () ^ Inference.get_stats ();;
+
projects / helm.git / blobdiff