* http://cs.unibo.it/helm/.
*)
-(* Da rimuovere, solo per debug*)
-let print_context ctx =
- let print_name =
- function
- Cic.Name n -> n
- | Cic.Anonymous -> "_"
- in
- List.fold_right
- (fun i (output,context) ->
- let (newoutput,context') =
- match i with
- Some (n,Cic.Decl t) ->
- print_name n ^ ":" ^ CicPp.pp t context ^ "\n", (Some n)::context
- | Some (n,Cic.Def (t,None)) ->
- print_name n ^ ":=" ^ CicPp.pp t context ^ "\n", (Some n)::context
- | None ->
- "_ ?= _\n", None::context
- | Some (_,Cic.Def (_,Some _)) -> assert false
- in
- output^newoutput,context'
- ) ctx ("",[])
- ;;
+ let debug_print = prerr_endline
+(* let debug_print = fun _ -> () *)
let search_theorems_in_context status =
let (proof, goal) = status in
[]
;;
-let depth = 9;;
-let width = 9;;
+let depth = 5;;
+let width = 3;;
let new_search_theorems f proof goal depth gtl sign =
let choices = f (proof,goal)
match meta_inf with
Some (ey, ty) ->
(* the goal is still there *)
- (*
- prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
- prerr_endline ("CURRENT PROOF = " ^ (CicPp.ppterm p));
- prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey)));
+ (*
+ debug_print ("CURRENT GOAL = " ^ CicPp.ppterm ty);
+ debug_print ("CURRENT PROOF = " ^ CicPp.ppterm p);
+ debug_print ("CURRENT HYP = " ^ CicPp.ppcontext ey);
*)
(* if the goal contains metavariables we use the input
signature for at_most constraints *)
;;
-let auto_tac ~(dbd:Mysql.dbd) =
+let auto_tac ?num dbd =
let auto_tac dbh (proof,goal) =
- prerr_endline "Entro in Auto";
+ debug_print "Entro in Auto";
match (auto dbd [(proof, [(goal,depth)],None)]) with
- [] -> prerr_endline("Auto failed");
+ [] -> debug_print("Auto failed");
raise (ProofEngineTypes.Fail "No Applicable theorem")
| (proof,[],_)::_ ->
- prerr_endline "AUTO_TAC HA FINITO";
+ debug_print "AUTO_TAC HA FINITO";
(proof,[])
| _ -> assert false
in
let inspected_goals = Hashtbl.create 503;;
-let compare_goal_list proof goal1 goal2 =
- let _,metasenv,_,_ = proof in
- let (_, ey1, ty1) = CicUtil.lookup_meta goal1 metasenv in
- let (_, ey2, ty2) = CicUtil.lookup_meta goal2 metasenv in
- let ty_sort1,_ = CicTypeChecker.type_of_aux' metasenv ey1 ty1
- CicUniv.empty_ugraph in
- let ty_sort2,_ = CicTypeChecker.type_of_aux' metasenv ey2 ty2
- CicUniv.empty_ugraph in
- let prop1 =
- let b,_ = CicReduction.are_convertible ey1 (Cic.Sort Cic.Prop) ty_sort1
- CicUniv.empty_ugraph in
- if b then 0 else 1
- in
- let prop2 =
- let b,_ = CicReduction.are_convertible ey2 (Cic.Sort Cic.Prop) ty_sort2
- CicUniv.empty_ugraph in
- if b then 0 else 1
- in
- prop1 - prop2
-
let search_theorems_in_context status =
let (proof, goal) = status in
let module C = Cic in
try
let (subst,(proof, goal_list)) =
PT.apply_tac_verbose ~term:(C.Rel n) status in
+ (*
let goal_list =
- List.stable_sort (compare_goal_list proof) goal_list in
+ List.stable_sort (compare_goal_list proof) goal_list in
+ *)
Some (subst,(proof, goal_list))
with
PET.Fail _ -> None in
[]
;;
-let new_search_theorems f proof goal depth sign =
+
+let compare_goals proof goal1 goal2 =
+ let _,metasenv,_,_ = proof in
+ let (_, ey1, ty1) = CicUtil.lookup_meta goal1 metasenv in
+ let (_, ey2, ty2) = CicUtil.lookup_meta goal2 metasenv in
+ let ty_sort1,_ = CicTypeChecker.type_of_aux' metasenv ey1 ty1
+ CicUniv.empty_ugraph in
+ let ty_sort2,_ = CicTypeChecker.type_of_aux' metasenv ey2 ty2
+ CicUniv.empty_ugraph in
+ let prop1 =
+ let b,_ = CicReduction.are_convertible ey1 (Cic.Sort Cic.Prop) ty_sort1
+ CicUniv.empty_ugraph in
+ if b then 0 else 1
+ in
+ let prop2 =
+ let b,_ = CicReduction.are_convertible ey2 (Cic.Sort Cic.Prop) ty_sort2
+ CicUniv.empty_ugraph in
+ if b then 0 else 1
+ in
+ prop1 - prop2
+
+
+let new_search_theorems f dbd proof goal depth sign =
let choices = f (proof,goal)
in
List.map
(function (subst,(proof, goallist)) ->
+ (* let goallist = reorder_goals dbd sign proof goallist in *)
+ let goallist = List.sort (compare_goals proof) goallist in
(subst,(proof,(List.map (function g -> (g,depth)) goallist), sign)))
choices
;;
exception NoOtherChoices;;
-let rec auto_single dbd proof goal ey ty depth width sign
+let is_in_metasenv goal metasenv =
+ try
+ let (_, ey ,ty) =
+ CicUtil.lookup_meta goal metasenv in
+ true
+ with _ -> false
+
+let rec auto_single dbd proof goal ey ty depth width sign already_seen_goals
=
if depth = 0 then [] else
+ if List.mem ty already_seen_goals then [] else
+ let already_seen_goals = ty::already_seen_goals in
let facts = (depth = 1) in
- let _,metasenv,_,_ = proof in
+ let _,metasenv,p,_ = proof in
(* first of all we check if the goal has been already
inspected *)
+ assert (is_in_metasenv goal metasenv);
let exitus =
try Hashtbl.find inspected_goals ty
with Not_found -> NotYetInspected in
match exitus with
Yes (bo,_) ->
(*
- prerr_endline "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
- prerr_endline (CicPp.ppterm ty);
+ debug_print "ALREADY PROVED!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
+ debug_print (CicPp.ppterm ty);
*)
let subst_in =
(* if we just apply the subtitution, the type
proof goal subst_in metasenv in
[(subst_in,(proof,[],sign))]
| No d when (d >= depth) ->
- (*
- prerr_endline "PRUNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!";
- *)
+ (* debug_print "PRUNED!!!!!!!!!!!!!!!!!!!!!!!!!!!!"; *)
[] (* the empty list means no choices, i.e. failure *)
| No _
- | NotYetInspected ->
- (*
- prerr_endline ("CURRENT GOAL = " ^ (CicPp.ppterm ty));
- prerr_endline ("CURRENT PROOF = " ^ (CicPp.ppterm p));
- prerr_endline ("CURRENT HYP = " ^ (fst (print_context ey)));
- *)
+ | NotYetInspected ->
+ debug_print ("CURRENT GOAL = " ^ CicPp.ppterm ty);
+ debug_print ("CURRENT PROOF = " ^ CicPp.ppterm p);
+ debug_print ("CURRENT HYP = " ^ CicPp.ppcontext ey);
let sign, new_sign =
if is_meta_closed then
None, Some (MetadataConstraints.signature_of ty)
else sign,sign in (* maybe the union ? *)
let local_choices =
new_search_theorems
- search_theorems_in_context
+ search_theorems_in_context dbd
proof goal (depth-1) new_sign in
let global_choices =
new_search_theorems
(fun status ->
- List.map snd
+ List.map snd
(MetadataQuery.experimental_hint
~dbd ~facts:facts ?signature:sign status))
- proof goal (depth-1) new_sign in
+ dbd proof goal (depth-1) new_sign in
let all_choices =
local_choices@global_choices in
- let sorted_choices =
+ let sorted_choices =
List.stable_sort
(fun (_, (_, goals1, _)) (_, (_, goals2, _)) ->
Pervasives.compare
(List.length goals1) (List.length goals2))
- all_choices in
- (match (auto_new dbd width sorted_choices)
+ all_choices in
+ (match (auto_new dbd width already_seen_goals sorted_choices)
with
[] ->
(* no proof has been found; we update the
in
if not (cty = ty) then
begin
- prerr_endline ("ty = "^CicPp.ppterm ty);
- prerr_endline ("cty = "^CicPp.ppterm cty);
+ debug_print ("ty = "^CicPp.ppterm ty);
+ debug_print ("cty = "^CicPp.ppterm cty);
assert false
end
Hashtbl.add inspected_goals
| _ -> assert false)
end
-and auto_new dbd width = function
+and auto_new dbd width already_seen_goals = function
[] -> []
- | (subst,(proof, [], sign))::tl -> (subst,(proof, [], sign))::tl
- | (subst,(proof, (goal,0)::_, _))::tl -> auto_new dbd width tl
- | (subst,(proof, (goal,depth)::goals, _))::tl when
- (List.length goals) > width -> auto_new dbd width tl
- | (subst,(proof, (goal,depth)::gtl, sign))::tl ->
- let _,metasenv,p,_ = proof in
- let meta_inf =
+ | (subst,(proof, goals, sign))::tl ->
+ let _,metasenv,_,_ = proof in
+ let is_in_metasenv (goal, _) =
try
let (_, ey ,ty) =
CicUtil.lookup_meta goal metasenv in
- Some (ey,ty)
- with _ -> None in
- match meta_inf with
- Some (ey,ty) ->
- let (_, ey ,ty) = CicUtil.lookup_meta goal metasenv in
- begin
- match (auto_single dbd proof goal ey ty depth
- (width - (List.length gtl)) sign)
- with
- [] -> auto_new dbd width tl
- | (local_subst,(proof,[],sign))::tl1 ->
- let new_subst f t = f (subst t) in
- let is_meta_closed = CicUtil.is_meta_closed ty in
- let all_choices =
- if is_meta_closed then
- (new_subst local_subst,(proof,gtl,sign))::tl
- else
- let tl2 =
- (List.map
- (function (f,(p,l,s)) -> (new_subst f,(p,l@gtl,s))) tl1)
- in
- (new_subst local_subst,(proof,gtl,sign))::tl2@tl in
- let sorted_choices = all_choices in
-(*
- List.stable_sort
- (fun (_, (_, goals1, _)) (_, (_, goals2, _)) ->
- Pervasives.compare
- (List.length goals1) (List.length goals2))
- all_choices in *)
-
- auto_new dbd width sorted_choices
- | _ -> assert false
- end
- | None -> auto_new dbd width ((subst,(proof, gtl, sign))::tl)
-;;
+ true
+ with _ -> false in
+ let goals'= List.filter is_in_metasenv goals in
+ auto_new_aux dbd width already_seen_goals
+ ((subst,(proof, goals', sign))::tl)
+
+and auto_new_aux dbd width already_seen_goals = function
+ [] -> []
+ | (subst,(proof, [], sign))::tl -> (subst,(proof, [], sign))::tl
+ | (subst,(proof, (goal,0)::_, _))::tl ->
+ auto_new dbd width already_seen_goals tl
+ | (subst,(proof, goals, _))::tl when
+ (List.length goals) > width ->
+ auto_new dbd width already_seen_goals tl
+ | (subst,(proof, (goal,depth)::gtl, sign))::tl ->
+ let _,metasenv,p,_ = proof in
+ let (_, ey ,ty) = CicUtil.lookup_meta goal metasenv in
+ match (auto_single dbd proof goal ey ty depth
+ (width - (List.length gtl)) sign already_seen_goals)
+ with
+ [] -> auto_new dbd width already_seen_goals tl
+ | (local_subst,(proof,[],sign))::tl1 ->
+ let new_subst f t = f (subst t) in
+ let is_meta_closed = CicUtil.is_meta_closed ty in
+ let all_choices =
+ if is_meta_closed then
+ (new_subst local_subst,(proof,gtl,sign))::tl
+ else
+ let tl2 =
+ (List.map
+ (function (f,(p,l,s)) -> (new_subst f,(p,l@gtl,s))) tl1)
+ in
+ (new_subst local_subst,(proof,gtl,sign))::tl2@tl in
+ auto_new dbd width already_seen_goals all_choices
+ | _ -> assert false
+ ;;
+let default_depth = 5
+let default_width = 3
-let auto_tac_new ~(dbd:Mysql.dbd) =
+let auto_tac_new ?(depth=default_depth) ?(width=default_width) ~(dbd:Mysql.dbd)
+ ()
+=
let auto_tac dbd (proof,goal) =
Hashtbl.clear inspected_goals;
- prerr_endline "Entro in Auto";
+ debug_print "Entro in Auto";
let id t = t in
- match (auto_new dbd width [id,(proof, [(goal,depth)],None)]) with
- [] -> prerr_endline("Auto failed");
+ match (auto_new dbd width [] [id,(proof, [(goal,depth)],None)]) with
+ [] -> debug_print("Auto failed");
raise (ProofEngineTypes.Fail "No Applicable theorem")
| (_,(proof,[],_))::_ ->
- prerr_endline "AUTO_TAC HA FINITO";
+ debug_print "AUTO_TAC HA FINITO";
let _,_,p,_ = proof in
- prerr_endline (CicPp.ppterm p);
+ debug_print (CicPp.ppterm p);
(proof,[])
| _ -> assert false
in
projects / helm.git / blobdiff