X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_tactics%2FnnAuto.ml;h=e2ddda0336e2a458458643661aa81f17c1d5db34;hb=fa6d1f3df955464343b365114be1071fc0b0cd18;hp=a2a76d4f51075676f331782b79eaae0344b3d642;hpb=f2771b346a41445df23adb6acccd7ee6b1578666;p=helm.git

diff --git a/helm/software/components/ng_tactics/nnAuto.ml b/helm/software/components/ng_tactics/nnAuto.ml
index a2a76d4f5..e2ddda033 100644
--- a/helm/software/components/ng_tactics/nnAuto.ml
+++ b/helm/software/components/ng_tactics/nnAuto.ml
@@ -14,9 +14,9 @@ open Printf
 let debug = ref false
 let debug_print ?(depth=0) s = 
   if !debug then prerr_endline (String.make depth '\t'^Lazy.force s) else ()
-let print= debug_print 
-(* let print ?(depth=0) s = 
-  prerr_endline (String.make depth '\t'^Lazy.force s) *)
+(* let print = debug_print *)
+let print ?(depth=0) s = 
+  prerr_endline (String.make depth '\t'^Lazy.force s) 
 
 let debug_do f = if !debug then f () else ()
 
@@ -53,7 +53,7 @@ let menv_closure status gl =
   in closure IntSet.empty gl
 ;;
 
-(* we call a "fact" an object whose hypothesis occurs in the goal 
+(* we call a "fact" an object whose hypothesis occur in the goal 
    or in types of goal-variables *)
 let is_a_fact status ty =   
   let status, ty, _ = saturate ~delta:max_int status ty in
@@ -83,7 +83,6 @@ let current_goal status =
     open_goal, ctx, gty
 
 
-
 (* =============================== paramod =========================== *)
 let auto_paramod ~params:(l,_) status goal =
   let gty = get_goalty status goal in
@@ -103,7 +102,7 @@ let auto_paramod ~params:(l,_) status goal =
     NCicParamod.nparamod status metasenv subst (ctx_of gty) (NCic.Rel ~-1,t) l 
   with
   | [] -> raise (Error (lazy "no proof found",None))
-  | (pt, metasenv, subst)::_ -> 
+  | (pt, _, metasenv, subst)::_ -> 
       let status = status#set_obj (n,h,metasenv,subst,o) in
       instantiate status goal (mk_cic_term (ctx_of gty) pt)
 ;;
@@ -113,18 +112,39 @@ let auto_paramod_tac ~params status =
 ;;
 
 let fast_eq_check_all status eq_cache goal =
-  let gty = get_goalty status goal in
-  let ctx = ctx_of gty in 
   let n,h,metasenv,subst,o = status#obj in
-  let status,t = term_of_cic_term status gty ctx in 
-  let build_status (pt, metasenv, subst) =
-    let status = status#set_obj (n,h,metasenv,subst,o) in
-    let gty = get_goalty status goal in
-    instantiate status goal (mk_cic_term ctx pt)
-  in
-    List.map build_status
+  let gname, ctx, gty = List.assoc goal metasenv in
+  let gty = NCicUntrusted.apply_subst subst ctx gty in
+  let build_status (pt, _, metasenv, subst) =
+    try
+      print (lazy ("refining: "^(NCicPp.ppterm ctx subst metasenv pt)));
+      let stamp = Unix.gettimeofday () in 
+      let metasenv, subst, pt, pty =
+	NCicRefiner.typeof 
+       	  (status#set_coerc_db NCicCoercion.empty_db) 
+	  metasenv subst ctx pt None in
+	print (lazy ("synt: "^(NCicPp.ppterm ctx subst metasenv pty)));
+	let metasenv, subst =
+	  NCicUnification.unify status metasenv subst ctx gty pty 
+	(* the previous code is much less expensive than directly refining
+	   pt with expected type pty 
+	   in 
+	   prerr_endline ("exp: "^(NCicPp.ppterm ctx subst metasenv gty));
+	   NCicRefiner.typeof 
+       	     (status#set_coerc_db NCicCoercion.empty_db) 
+	     metasenv subst ctx pt (Some gty) *)
+	in 
+	  print (lazy (Printf.sprintf "Refined in %fs"
+		     (Unix.gettimeofday() -. stamp))); 
+	  let status = status#set_obj (n,h,metasenv,subst,o) in
+	  let metasenv = List.filter (fun j,_ -> j <> goal) metasenv in
+	  let subst = (goal,(gname,ctx,pt,pty)) :: subst in
+	    Some (status#set_obj (n,h,metasenv,subst,o))
+    with _ -> prerr_endline "WARNING: refining in fast_eq_check failed"; None 
+    in
+    HExtlib.filter_map build_status
       (NCicParamod.fast_eq_check status metasenv subst ctx 
-	 eq_cache (NCic.Rel ~-1,t))
+	 eq_cache (NCic.Rel ~-1,gty))
 ;;
 
 let fast_eq_check eq_cache status goal =
@@ -133,19 +153,44 @@ let fast_eq_check eq_cache status goal =
   | s::_ -> s
 ;;
 
-let fast_eq_check_tac ~params s = 
-  NTactics.distribute_tac (fast_eq_check s#eq_cache) s
+let dist_fast_eq_check eq_cache s = 
+  NTactics.distribute_tac (fast_eq_check eq_cache) s
 ;;
 
 let auto_eq_check eq_cache status =
   try 
-    let s = 
-      NTactics.distribute_tac (fast_eq_check eq_cache) status in
+    let s = dist_fast_eq_check eq_cache status in
       [s]
   with
     | Error _ -> []
 ;;
 
+(* warning: ctx is supposed to be already instantiated w.r.t subst *)
+let index_local_equations eq_cache status =
+  let open_goals = head_goals status#stack in
+  let open_goal = List.hd open_goals in
+  let ngty = get_goalty status open_goal in
+  let ctx = ctx_of ngty in
+  let c = ref 0 in
+  List.fold_left 
+    (fun eq_cache _ ->
+       c:= !c+1;
+       let t = NCic.Rel !c in
+	 try
+	   let ty = NCicTypeChecker.typeof [] [] ctx t in
+             debug_print(lazy("eq indexing " ^ (NCicPp.ppterm ctx [] [] ty)));
+	     NCicParamod.forward_infer_step eq_cache t ty
+	 with 
+	   | NCicTypeChecker.TypeCheckerFailure _
+	   | NCicTypeChecker.AssertFailure _ -> eq_cache) 
+    eq_cache ctx
+;;
+
+let fast_eq_check_tac ~params s = 
+  let unit_eq = index_local_equations s#eq_cache s in   
+  dist_fast_eq_check unit_eq s
+;;
+
 (*
 let fast_eq_check_tac_all  ~params eq_cache status = 
   let g,_,_ = current_goal status in
@@ -1179,6 +1224,47 @@ let auto_tac ~(dbd:HSql.dbd) ~params:(univ,params) ~automation_cache (proof, goa
 ;;
 *)
 
+(****************** smart application ********************)
+
+
+let smart_apply t unit_eq status g = 
+  let n,h,metasenv,subst,o = status#obj in
+  let gname, ctx, gty = List.assoc g metasenv in
+  (* let ggty = mk_cic_term context gty in *)
+  let status, t = disambiguate status ctx t None in
+  let status,t = term_of_cic_term status t ctx in
+  let ty = NCicTypeChecker.typeof subst metasenv ctx t in
+  let ty,metasenv,args = NCicMetaSubst.saturate metasenv subst ctx ty 0 in
+  let metasenv,j,inst,_ = NCicMetaSubst.mk_meta metasenv ctx `IsTerm in
+  let status = status#set_obj (n,h,metasenv,subst,o) in
+  let pterm = if args=[] then t else NCic.Appl(t::args) in
+  let eq_coerc =       
+    let uri = 
+      NUri.uri_of_string "cic:/matita/ng/Plogic/equality/eq_coerc.con" in
+    let ref = NReference.reference_of_spec uri (NReference.Def(2)) in
+      NCic.Const ref
+  in
+  let smart = 
+    NCic.Appl[eq_coerc;ty;NCic.Implicit `Type;pterm;inst] in
+  let smart = mk_cic_term ctx smart in 
+    try
+      let status = instantiate status g smart in
+      let _,_,metasenv,subst,_ = status#obj in
+      let _,ctx,jty = List.assoc j metasenv in
+      let jty = NCicUntrusted.apply_subst subst ctx jty in
+        debug_print(lazy("goal " ^ (NCicPp.ppterm ctx [] [] jty)));
+	fast_eq_check unit_eq status j
+    with
+      | Error _ as e -> debug_print (lazy "error"); raise e
+
+let smart_apply_tac t s =
+  let unit_eq = index_local_equations s#eq_cache s in   
+  NTactics.distribute_tac (smart_apply t unit_eq) s
+
+let smart_apply_auto t eq_cache =
+  NTactics.distribute_tac (smart_apply t eq_cache)
+
+
 (****************** types **************)
 
 
@@ -1263,7 +1349,7 @@ let pp_th status =
 let search_in_th gty th = 
   let c = ctx_of gty in
   let rec aux acc = function
-   | [] -> Ncic_termSet.elements acc
+   | [] -> (* Ncic_termSet.elements *) acc
    | (_::tl) as k ->
        try 
          let idx = List.assq k th in
@@ -1322,53 +1408,96 @@ let openg_no status = List.length (head_goals status#stack)
 let sort_new_elems l =
   List.sort (fun (_,s1) (_,s2) -> openg_no s1 - openg_no s2) l
 
-let try_candidate flags depth status t =
+let try_candidate ?(smart=0) flags depth status eq_cache t =
  try
-   debug_print ~depth (lazy ("try " ^ CicNotationPp.pp_term t));
-   let status = NTactics.apply_tac ("",0,t) status in
-   let og_no = openg_no status in 
-   if og_no > flags.maxwidth || 
+   print ~depth (lazy ("------------ try " ^ CicNotationPp.pp_term t));
+  let status = 
+    if smart= 0 then NTactics.apply_tac ("",0,t) status 
+    else if smart = 1 then smart_apply_auto ("",0,t) eq_cache status 
+    else (* smart = 2: both *)
+      try NTactics.apply_tac ("",0,t) status 
+      with Error _ -> 
+	smart_apply_auto ("",0,t) eq_cache status in 
+  let og_no = openg_no status in 
+    if og_no > flags.maxwidth || 
       (depth = flags.maxdepth && og_no <> 0) then
-      (debug_print ~depth (lazy "pruned immediately"); None)
+	(debug_print ~depth (lazy "pruned immediately"); None)
    else
      (incr candidate_no;
       Some ((!candidate_no,t),status))
  with Error (msg,exn) -> debug_print ~depth (lazy "failed"); None
 ;;
 
-let get_candidates status cache signature gty =
+let get_candidates ?(smart=true) status cache signature gty =
   let universe = status#auto_cache in
   let context = ctx_of gty in
+  let t_ast t = 
+     let _status, t = term_of_cic_term status t context 
+     in Ast.NCic t in
+  let c_ast = function 
+    | NCic.Const r -> Ast.NRef r | _ -> assert false in
   let _, raw_gty = term_of_cic_term status gty context in
   let cands = NDiscriminationTree.DiscriminationTree.retrieve_unifiables 
-	universe raw_gty
-  in
-  let cands = 
-    List.filter (only signature context) 
-      (NDiscriminationTree.TermSet.elements cands)
+	universe raw_gty in
+  let local_cands = search_in_th gty cache in
+  let together global local =
+    List.map c_ast 
+      (List.filter (only signature context) 
+	(NDiscriminationTree.TermSet.elements global)) @
+      List.map t_ast (Ncic_termSet.elements local) in
+  let candidates = together cands local_cands in
+  let smart_candidates = 
+    if smart then
+      match raw_gty with
+	| NCic.Appl (hd::tl) -> 
+            let weak_gty = 
+	      NCic.Appl (hd:: HExtlib.mk_list(NCic.Meta (0,(0,NCic.Irl 0))) 
+			   (List.length tl)) in
+	    let more_cands = 
+	      NDiscriminationTree.DiscriminationTree.retrieve_unifiables 
+		universe weak_gty in
+	    let smart_cands = 
+	      NDiscriminationTree.TermSet.diff more_cands cands in
+ 	    let cic_weak_gty = mk_cic_term context weak_gty in
+	    let more_local_cands = search_in_th cic_weak_gty cache in
+	    let smart_local_cands = 
+	      Ncic_termSet.diff more_local_cands local_cands in
+	      together smart_cands smart_local_cands  
+	| _ -> []
+    else [] 
   in
-  List.map (fun t -> 
-     let _status, t = term_of_cic_term status t context in Ast.NCic t) 
-     (search_in_th gty cache)
-  @ 
-  List.map (function NCic.Const r -> Ast.NRef r | _ -> assert false) cands
+    candidates, smart_candidates
 ;;
 
 let applicative_case depth signature status flags gty (cache:cache) =
+  app_counter:= !app_counter+1;
   let tcache = cache.facts in
-  app_counter:= !app_counter+1; 
-  let candidates = get_candidates status tcache signature gty in
-  debug_print ~depth
+  let candidates, smart_candidates = 
+    get_candidates status tcache signature gty in
+  print ~depth
     (lazy ("candidates: " ^ string_of_int (List.length candidates)));
+  print ~depth
+    (lazy ("smart candidates: " ^ 
+	     string_of_int (List.length smart_candidates)));
   let elems = 
     List.fold_left 
       (fun elems cand ->
-        match try_candidate flags depth status cand with
+        match try_candidate (~smart:2) 
+	  flags depth status cache.unit_eq cand with
         | None -> elems
         | Some x -> x::elems)
       [] candidates
   in
-  elems
+  let more_elems = 
+    List.fold_left 
+      (fun elems cand ->
+        match try_candidate (~smart:1) 
+	  flags depth status cache.unit_eq cand with
+        | None -> elems
+        | Some x -> x::elems)
+      [] smart_candidates
+  in
+  elems@more_elems
 ;;
 
 exception Found
@@ -1416,28 +1545,6 @@ let is_subsumed depth status gty cache =
     with Found -> debug_print ~depth (lazy "success");true)
 ;;
 
-(* warning: ctx is supposed to be already instantiated w.r.t subst *)
-let index_local_equations eq_cache status =
-  let open_goals = head_goals status#stack in
-(*  assert (List.length open_goals  = 1); *)
-  let open_goal = List.hd open_goals in
-  let ngty = get_goalty status open_goal in
-  let ctx = ctx_of ngty in
-  let c = ref 0 in
-  List.fold_left 
-    (fun eq_cache _ ->
-       c:= !c+1;
-       let t = NCic.Rel !c in
-	 try
-	   let ty = NCicTypeChecker.typeof [] [] ctx t in
-             debug_print(lazy("eq indexing " ^ (NCicPp.ppterm ctx [] [] ty)));
-	     NCicParamod.forward_infer_step eq_cache t ty
-	 with 
-	   | NCicTypeChecker.TypeCheckerFailure _
-	   | NCicTypeChecker.AssertFailure _ -> eq_cache) 
-    eq_cache ctx
-;;
-
 let rec guess_name name ctx = 
   if name = "_" then guess_name "auto" ctx else
   if not (List.mem_assoc name ctx) then name else
@@ -1599,7 +1706,7 @@ let focus_tac focus status =
    status#set_stack gstatus
 ;;
 
-let rec auto_clusters 
+let rec auto_clusters ?(top=false)  
     flags signature cache depth status : unit =
   debug_print ~depth (lazy "entering auto clusters");
   (* ignore(Unix.select [] [] [] 0.01); *)
@@ -1613,6 +1720,7 @@ let rec auto_clusters
     debug_print ~depth (lazy ("goals = " ^ 
       String.concat "," (List.map string_of_int goals)));
     let classes = HExtlib.clusters (deps status) goals in
+    let classes = if top then List.rev classes else classes in
       debug_print ~depth
 	(lazy 
 	   (String.concat "\n" 
@@ -1620,17 +1728,20 @@ let rec auto_clusters
 	      (fun l -> 
 		 ("cluster:" ^ String.concat "," (List.map string_of_int l)))
 	   classes)));
-      let status = 
+      let status,b = 
 	List.fold_left
-	  (fun status gl -> 
+	  (fun (status,b) gl -> 
 	     let status = focus_tac gl status in
 	     try 
                debug_print ~depth (lazy ("focusing on" ^ 
 			      String.concat "," (List.map string_of_int gl)));
-               auto_main flags signature cache depth status; status
-	     with Proved(status) -> NTactics.merge_tac status)
-	  status classes
-      in raise (Proved status)
+               auto_main flags signature cache depth status; assert false
+	     with 
+	       | Proved(status) -> (NTactics.merge_tac status,true)
+	       | Gaveup _ when top -> (NTactics.merge_tac status,b)
+	  )
+	  (status,false) classes
+      in if b then raise (Proved status) else raise (Gaveup IntSet.empty)
 
 and
 
@@ -1756,7 +1867,7 @@ let auto_tac ~params:(_univ,flags) status =
       let _ = debug_print (lazy("\n\nRound "^string_of_int x^"\n")) in
       let flags = { flags with maxdepth = x } 
       in 
-	try auto_clusters flags signature cache 0 status;assert false
+	try auto_clusters (~top:true) flags signature cache 0 status;assert false
 	with
 	  | Gaveup _ -> up_to (x+1) y
 	  | Proved s ->