X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2FnCicUnifHint.ml;h=9f349ba6bbbfce24ede8364ea1ab1045f313eb2d;hb=aff007d80f87128884c96a664bc88aec69107d85;hp=ccccfca88742dfd48b1ef1a892229f70cd502e12;hpb=8bc5bc0e8375a85736f6a5df317d129d5efa8de4;p=helm.git diff --git a/helm/software/components/ng_refiner/nCicUnifHint.ml b/helm/software/components/ng_refiner/nCicUnifHint.ml index ccccfca88..9f349ba6b 100644 --- a/helm/software/components/ng_refiner/nCicUnifHint.ml +++ b/helm/software/components/ng_refiner/nCicUnifHint.ml @@ -11,6 +11,9 @@ (* $Id: nCicRefiner.mli 9227 2008-11-21 16:00:06Z tassi $ *) +let debug s = prerr_endline (Lazy.force s);; +let debug _ = ();; + module COT : Set.OrderedType with type t = int * NCic.term = struct type t = int * NCic.term @@ -19,16 +22,28 @@ module COT : Set.OrderedType with type t = int * NCic.term = module HintSet = Set.Make(COT) -module DB = +module HDB = + Discrimination_tree.Make(NDiscriminationTree.NCicIndexable)(HintSet) + +module EQDB = Discrimination_tree.Make(NDiscriminationTree.NCicIndexable)(HintSet) -type db = DB.t +type db = + HDB.t * (* hint database: (dummy A B)[?] |-> \forall X.(summy a b)[X] *) + EQDB.t (* eqclass DB: A[?] |-> \forall X.B[X] and viceversa *) + +exception HintNotValid + +let skel_dummy = NCic.Implicit `Type;; class status = object - val db = DB.empty + val db = HDB.empty, EQDB.empty method uhint_db = db method set_uhint_db v = {< db = v >} + method set_unifhint_status + : 'status. < uhint_db : db; .. > as 'status -> 'self + = fun o -> {< db = o#uhint_db >} end let dummy = NCic.Const (NReference.reference_of_string "cic:/dummy_conv.dec");; @@ -42,29 +57,43 @@ let index_hint hdb context t1 t2 precedence = (match t2 with | NCic.Meta _ | NCic.Appl (NCic.Meta _ :: _) -> false | _ -> true) ); - let pair' = pair t1 t2 in - let data = + (* here we do not use skel_dummy since it could cause an assert false in + * the subst function that lives in the kernel *) + let hole = NCic.Meta (-1,(0,NCic.Irl 0)) in + let t1_skeleton = + List.fold_left (fun t _ -> NCicSubstitution.subst hole t) t1 context + in + let t2_skeleton = + List.fold_left (fun t _ -> NCicSubstitution.subst hole t) t2 context + in + let rec cleanup_skeleton () = function + | NCic.Meta _ -> skel_dummy + | t -> NCicUtils.map (fun _ () -> ()) () cleanup_skeleton t + in + let t1_skeleton = cleanup_skeleton () t1_skeleton in + let t2_skeleton = cleanup_skeleton () t2_skeleton in + let src = pair t1_skeleton t2_skeleton in + let ctx2abstractions context t = List.fold_left (fun t (n,e) -> match e with | NCic.Decl ty -> NCic.Prod (n,ty,t) | NCic.Def (b,ty) -> NCic.LetIn (n,ty,b,t)) - pair' context in - let src = - List.fold_left - (fun t (_,e) -> - match e with - | NCic.Decl _ -> - NCicSubstitution.subst (NCic.Meta (-1,(0,NCic.Irl 0))) t - | NCic.Def _ -> - NCicSubstitution.subst (NCic.Meta (-1,(0,NCic.Irl 0))) t) - pair' context in -(* - prerr_endline ("INDEXING: " ^ + t context + in + let data_hint = ctx2abstractions context (pair t1 t2) in + let data_t1 = t2_skeleton in + let data_t2 = t1_skeleton in + + debug(lazy ("INDEXING: " ^ NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] src ^ " |==> " ^ - NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] data); -*) - hdb#set_uhint_db (DB.index hdb#uhint_db src (precedence, data)) + NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[] data_hint)); + + hdb#set_uhint_db ( + HDB.index (fst (hdb#uhint_db)) src (precedence, data_hint), + EQDB.index + (EQDB.index (snd (hdb#uhint_db)) t2_skeleton (precedence, data_t2)) + t1_skeleton (precedence, data_t1)) ;; let add_user_provided_hint db t precedence = @@ -72,7 +101,21 @@ let add_user_provided_hint db t precedence = let rec aux ctx = function | NCic.Appl l -> (match List.rev l with - | b::a::_ -> ctx, a, b + | b::a::_ -> + if + let ty_a = + NCicTypeChecker.typeof ~metasenv:[] ~subst:[] ctx a + in + let ty_b = + NCicTypeChecker.typeof ~metasenv:[] ~subst:[] ctx b + in + NCicReduction.are_convertible + ~metasenv:[] ~subst:[] ctx ty_a ty_b + && + NCicReduction.are_convertible + ~metasenv:[] ~subst:[] ctx a b + then ctx, a, b + else raise HintNotValid | _ -> assert false) | NCic.Prod (n,s,t) -> aux ((n, NCic.Decl s) :: ctx) t | NCic.LetIn (n,ty,t,b) -> aux ((n, NCic.Def (t,ty)) :: ctx) b @@ -108,11 +151,6 @@ let db () = | b1,b2 -> if NCicReduction.are_convertible ~subst:[] ~metasenv:[] ctx b1 b2 then begin -(* - prerr_endline ("hint: " ^ NCicPp.ppterm ~metasenv:[] ~subst:[] - ~context:ctx b1 ^ " === " ^ NCicPp.ppterm ~metasenv:[] - ~subst:[] ~context:ctx b2); -*) let rec mk_rels = function 0 -> [] | n -> NCic.Rel n :: mk_rels (n-1) in @@ -130,7 +168,7 @@ let db () = aux [] l r | _ -> [] in - let hints = + let _hints = List.fold_left (fun acc (_,_,l) -> acc @ @@ -170,19 +208,38 @@ let saturate ?(delta=0) metasenv subst context ty goal_arity = res, newmetasenv, arguments ;; +let eq_class_of hdb t1 = + let eq_class = + if NDiscriminationTree.NCicIndexable.path_string_of t1 = + [Discrimination_tree.Variable] + then + [] (* if the trie is unable to handle the key, we skip the query since + it sould retulr the whole content of the trie *) + else + let candidates = EQDB.retrieve_unifiables (snd hdb#uhint_db) t1 in + let candidates = HintSet.elements candidates in + let candidates = List.sort (fun (x,_) (y,_) -> compare x y) candidates in + List.map snd candidates + in + debug(lazy("eq_class of: " ^ NCicPp.ppterm ~metasenv:[] ~context:[] ~subst:[] + t1 ^ " is\n" ^ String.concat "\n" + (List.map (NCicPp.ppterm ~subst:[] ~metasenv:[] ~context:[]) eq_class))); + eq_class +;; + let look_for_hint hdb metasenv subst context t1 t2 = + debug(lazy ("KEY1: "^NCicPp.ppterm ~metasenv ~subst ~context t1)); + debug(lazy ("KEY2: "^NCicPp.ppterm ~metasenv ~subst ~context t2)); (* - prerr_endline ("KEY1: "^NCicPp.ppterm ~metasenv ~subst ~context (pair t1 t2)); - prerr_endline ("KEY2: "^NCicPp.ppterm ~metasenv ~subst ~context (pair t2 t1)); - DB.iter hdb + HDB.iter hdb (fun p ds -> prerr_endline ("ENTRY: " ^ NDiscriminationTree.NCicIndexable.string_of_path p ^ " |--> " ^ String.concat "|" (List.map (NCicPp.ppterm ~metasenv:[] ~subst:[] ~context:[]) (HintSet.elements ds)))); *) - let candidates1 = DB.retrieve_unifiables hdb#uhint_db (pair t1 t2) in - let candidates2 = DB.retrieve_unifiables hdb#uhint_db (pair t2 t1) in + let candidates1 = HDB.retrieve_unifiables (fst hdb#uhint_db) (pair t1 t2) in + let candidates2 = HDB.retrieve_unifiables (fst hdb#uhint_db) (pair t2 t1) in let candidates1 = List.map (fun (prec,ty) -> prec,true,saturate ~delta:max_int metasenv subst context ty 0) @@ -221,21 +278,20 @@ let look_for_hint hdb metasenv subst context t1 t2 = List.sort (fun (x,_,_,_) (y,_,_,_) -> Pervasives.compare x y) rc in let rc = List.map (fun (_,x,y,z) -> x,y,z) rc in -(* - prerr_endline "Hints:"; - List.iter - (fun (metasenv, (t1, t2), premises) -> - prerr_endline - ("\t" ^ String.concat "; " - (List.map (fun (a,b) -> - NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context a ^ - " =?= "^ - NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context b) - premises) ^ - " ==> "^ - NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context t1 ^ - " = "^NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context t2)) - rc; -*) + + debug(lazy ("Hints:"^ + String.concat "\n" (List.map + (fun (metasenv, (t1, t2), premises) -> + ("\t" ^ String.concat "; " + (List.map (fun (a,b) -> + NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context a ^ + " =?= "^ + NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context b) + premises) ^ + " ==> "^ + NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context t1 ^ + " = "^NCicPp.ppterm ~margin:max_int ~metasenv ~subst ~context t2)) + rc))); + rc ;;