X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_omdoc%2Fcic2acic.ml;h=aa0183dad1514c05367818598267012215dcf16b;hb=e7e2a523299d807370b292b44e77f46fad1638c9;hp=a3cdfbb78603d3237e3006fc5ecfb41543a279e5;hpb=4bcd14a9ed245ccae631697a05ff5a377c02b179;p=helm.git diff --git a/helm/ocaml/cic_omdoc/cic2acic.ml b/helm/ocaml/cic_omdoc/cic2acic.ml index a3cdfbb78..aa0183dad 100644 --- a/helm/ocaml/cic_omdoc/cic2acic.ml +++ b/helm/ocaml/cic_omdoc/cic2acic.ml @@ -23,6 +23,26 @@ * http://cs.unibo.it/helm/. *) +let hashtbl_add_time = ref 0.0;; + +let xxx_add h k v = + let t1 = Sys.time () in + Hashtbl.add h k v ; + let t2 = Sys.time () in + hashtbl_add_time := !hashtbl_add_time +. t2 -. t1 +;; + +let number_new_type_of_aux' = ref 0;; +let type_of_aux'_add_time = ref 0.0;; + +let xxx_type_of_aux' m c t = + let t1 = Sys.time () in + let res = CicTypeChecker.type_of_aux' m c t in + let t2 = Sys.time () in + type_of_aux'_add_time := !type_of_aux'_add_time +. t2 -. t1 ; + res +;; + type anntypes = {annsynthesized : Cic.annterm ; annexpected : Cic.annterm option} ;; @@ -36,8 +56,8 @@ let gen_id seed = let fresh_id seed ids_to_terms ids_to_father_ids = fun father t -> let res = gen_id seed in - Hashtbl.add ids_to_father_ids res father ; - Hashtbl.add ids_to_terms res t ; + xxx_add ids_to_father_ids res father ; + xxx_add ids_to_terms res t ; res ;; @@ -60,12 +80,15 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts ids_to_inner_types metasenv context idrefs t expectedty = let module D = DoubleTypeInference in - let module T = CicTypeChecker in let module C = Cic in let fresh_id' = fresh_id seed ids_to_terms ids_to_father_ids in + let time1 = Sys.time () in let terms_to_types = D.double_type_of metasenv context t expectedty in + let time2 = Sys.time () in + prerr_endline + ("++++++++++++ Tempi della double_type_of: "^ string_of_float (time2 -. time1)) ; let rec aux computeinnertypes father context idrefs tt = let fresh_id'' = fresh_id' father tt in (*CSC: computeinnertypes era true, il che e' proprio sbagliato, no? *) @@ -77,10 +100,11 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts (*CSC: computed again and again. *) let string_of_sort t = match CicReduction.whd context t with - C.Sort C.Prop -> "Prop" - | C.Sort C.Set -> "Set" - | C.Sort C.Type -> "Type" - | _ -> assert false + C.Sort C.Prop -> "Prop" + | C.Sort C.Set -> "Set" + | C.Sort C.Type -> "Type" + | C.Sort C.CProp -> "CProp" + | _ -> assert false in let ainnertypes,innertype,innersort,expected_available = (*CSC: Here we need the algorithm for Coscoy's double type-inference *) @@ -88,6 +112,10 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts (*CSC: type-inference, but the result is very poor. As a very weak *) (*CSC: patch, I apply whd to the computed type. Full beta *) (*CSC: reduction would be a much better option. *) +(*CSC: solo per testare i tempi *) +(*XXXXXXX *) + try +(* *) let {D.synthesized = synthesized; D.expected = expected} = if computeinnertypes then D.CicHash.find terms_to_types tt @@ -95,10 +123,13 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts (* We are already in an inner-type and Coscoy's double *) (* type inference algorithm has not been applied. *) {D.synthesized = - CicReduction.whd context (T.type_of_aux' metasenv context tt) ; +(***CSC: patch per provare i tempi + CicReduction.whd context (xxx_type_of_aux' metasenv context tt) ; *) +Cic.Sort Cic.Type ; D.expected = None} in - let innersort = T.type_of_aux' metasenv context synthesized in + incr number_new_type_of_aux' ; + let innersort = (*XXXXX *) xxx_type_of_aux' metasenv context synthesized (* Cic.Sort Cic.Prop *) in let ainnertypes,expected_available = if computeinnertypes then let annexpected,expected_available = @@ -118,11 +149,17 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts None,false in ainnertypes,synthesized, string_of_sort innersort, expected_available +(*XXXXXXXX *) + with + Not_found -> (* l'inner-type non e' nella tabella ==> sort <> Prop *) + (* CSC: Type or Set? I can not tell *) + None,Cic.Sort Cic.Type,"Type",false +(* *) in let add_inner_type id = match ainnertypes with None -> () - | Some ainnertypes -> Hashtbl.add ids_to_inner_types id ainnertypes + | Some ainnertypes -> xxx_add ids_to_inner_types id ainnertypes in match tt with C.Rel n -> @@ -131,12 +168,12 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts (Some (C.Name s,_)) -> s | _ -> raise NameExpected in - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" && expected_available then add_inner_type fresh_id'' ; C.ARel (fresh_id'', List.nth idrefs (n-1), n, id) | C.Var (uri,exp_named_subst) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" && expected_available then add_inner_type fresh_id'' ; let exp_named_subst' = @@ -148,7 +185,7 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts let (_,canonical_context,_) = List.find (function (m,_,_) -> n = m) metasenv in - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" && expected_available then add_inner_type fresh_id'' ; C.AMeta (fresh_id'', n, @@ -162,21 +199,21 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts | C.Sort s -> C.ASort (fresh_id'', s) | C.Implicit -> C.AImplicit (fresh_id'') | C.Cast (v,t) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; C.ACast (fresh_id'', aux' context idrefs v, aux' context idrefs t) | C.Prod (n,s,t) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' + xxx_add ids_to_inner_sorts fresh_id'' (string_of_sort innertype) ; - let sourcetype = T.type_of_aux' metasenv context s in - Hashtbl.add ids_to_inner_sorts (source_id_of_id fresh_id'') + let sourcetype = xxx_type_of_aux' metasenv context s in + xxx_add ids_to_inner_sorts (source_id_of_id fresh_id'') (string_of_sort sourcetype) ; let n' = match n with C.Anonymous -> n | C.Name n' -> - if D.does_not_occur 1 t then + if DoubleTypeInference.does_not_occur 1 t then C.Anonymous else C.Name n' @@ -185,9 +222,9 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts (fresh_id'', n', aux' context idrefs s, aux' ((Some (n, C.Decl s))::context) (fresh_id''::idrefs) t) | C.Lambda (n,s,t) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; - let sourcetype = T.type_of_aux' metasenv context s in - Hashtbl.add ids_to_inner_sorts (source_id_of_id fresh_id'') + xxx_add ids_to_inner_sorts fresh_id'' innersort ; + let sourcetype = xxx_type_of_aux' metasenv context s in + xxx_add ids_to_inner_sorts (source_id_of_id fresh_id'') (string_of_sort sourcetype) ; if innersort = "Prop" then begin @@ -206,19 +243,19 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts (fresh_id'',n, aux' context idrefs s, aux' ((Some (n, C.Decl s)::context)) (fresh_id''::idrefs) t) | C.LetIn (n,s,t) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; C.ALetIn (fresh_id'', n, aux' context idrefs s, - aux' ((Some (n, C.Def s))::context) (fresh_id''::idrefs) t) + aux' ((Some (n, C.Def(s,None)))::context) (fresh_id''::idrefs) t) | C.Appl l -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; C.AAppl (fresh_id'', List.map (aux' context idrefs) l) | C.Const (uri,exp_named_subst) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" && expected_available then add_inner_type fresh_id'' ; let exp_named_subst' = @@ -233,7 +270,7 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts in C.AMutInd (fresh_id'', uri, tyno, exp_named_subst') | C.MutConstruct (uri,tyno,consno,exp_named_subst) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" && expected_available then add_inner_type fresh_id'' ; let exp_named_subst' = @@ -242,7 +279,7 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts in C.AMutConstruct (fresh_id'', uri, tyno, consno, exp_named_subst') | C.MutCase (uri, tyno, outty, term, patterns) -> - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; C.AMutCase (fresh_id'', uri, tyno, aux' context idrefs outty, @@ -254,7 +291,7 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts let tys = List.map (fun (name,_,ty,_) -> Some (C.Name name, C.Decl ty)) funs in - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; C.AFix (fresh_id'', funno, @@ -271,7 +308,7 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts let tys = List.map (fun (name,ty,_) -> Some (C.Name name, C.Decl ty)) funs in - Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ; + xxx_add ids_to_inner_sorts fresh_id'' innersort ; if innersort = "Prop" then add_inner_type fresh_id'' ; C.ACoFix (fresh_id'', funno, @@ -282,7 +319,12 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts ) fresh_idrefs funs ) in - aux true None context idrefs t + let timea = Sys.time () in + let res = aux true None context idrefs t in + let timeb = Sys.time () in + prerr_endline + ("+++++++++++++ Tempi della aux dentro alla acic_of_cic: "^ string_of_float (timeb -. timea)) ; + res ;; let acic_of_cic_context metasenv context idrefs t = @@ -298,6 +340,7 @@ let acic_of_cic_context metasenv context idrefs t = let acic_object_of_cic_object obj = let module C = Cic in + let module E = Eta_fixing in let ids_to_terms = Hashtbl.create 503 in let ids_to_father_ids = Hashtbl.create 503 in let ids_to_inner_sorts = Hashtbl.create 503 in @@ -314,29 +357,52 @@ let acic_object_of_cic_object obj = let aobj = match obj with C.Constant (id,Some bo,ty,params) -> - let abo = acic_term_of_cic_term' bo (Some ty) in - let aty = acic_term_of_cic_term' ty None in + let bo' = E.eta_fix [] bo in + let ty' = E.eta_fix [] ty in + let abo = acic_term_of_cic_term' bo' (Some ty') in + let aty = acic_term_of_cic_term' ty' None in C.AConstant - ("mettereaposto",Some "mettereaposto2",id,Some abo,aty, params) + ("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params) | C.Constant (id,None,ty,params) -> - let aty = acic_term_of_cic_term' ty None in + let ty' = E.eta_fix [] ty in + let aty = acic_term_of_cic_term' ty' None in C.AConstant - ("mettereaposto",None,id,None,aty, params) + ("mettereaposto",None,id,None,aty,params) | C.Variable (id,bo,ty,params) -> + let ty' = E.eta_fix [] ty in let abo = match bo with None -> None - | Some bo -> Some (acic_term_of_cic_term' bo (Some ty)) + | Some bo -> + let bo' = E.eta_fix [] bo in + Some (acic_term_of_cic_term' bo' (Some ty')) in - let aty = acic_term_of_cic_term' ty None in + let aty = acic_term_of_cic_term' ty' None in C.AVariable ("mettereaposto",id,abo,aty, params) | C.CurrentProof (id,conjectures,bo,ty,params) -> + let conjectures' = + List.map + (function (i,canonical_context,term) -> + let canonical_context' = + List.map + (function + None -> None + | Some (n, C.Decl t)-> Some (n, C.Decl (E.eta_fix conjectures t)) + | Some (n, C.Def (t,None)) -> + Some (n, C.Def ((E.eta_fix conjectures t),None)) + | Some (_,C.Def (_,Some _)) -> assert false + ) canonical_context + in + let term' = E.eta_fix conjectures term in + (i,canonical_context',term') + ) conjectures + in let aconjectures = List.map (function (i,canonical_context,term) as conjecture -> let cid = "c" ^ string_of_int !conjectures_seed in - Hashtbl.add ids_to_conjectures cid conjecture ; + xxx_add ids_to_conjectures cid conjecture ; incr conjectures_seed ; let idrefs',revacanonical_context = let rec aux context idrefs = @@ -345,7 +411,7 @@ let acic_object_of_cic_object obj = | hyp::tl -> let hid = "h" ^ string_of_int !hypotheses_seed in let new_idrefs = hid::idrefs in - Hashtbl.add ids_to_hypotheses hid hyp ; + xxx_add ids_to_hypotheses hid hyp ; incr hypotheses_seed ; match hyp with (Some (n,C.Decl t)) -> @@ -356,7 +422,7 @@ let acic_object_of_cic_object obj = conjectures context idrefs t None in final_idrefs,(hid,Some (n,C.ADecl at))::atl - | (Some (n,C.Def t)) -> + | (Some (n,C.Def (t,_))) -> let final_idrefs,atl = aux (hyp::context) new_idrefs tl in let at = @@ -377,10 +443,29 @@ let acic_object_of_cic_object obj = canonical_context idrefs' term None in (cid,i,(List.rev revacanonical_context),aterm) - ) conjectures in + ) conjectures' in + let time1 = Sys.time () in + let bo' = E.eta_fix conjectures' bo in + let ty' = E.eta_fix conjectures' ty in + let time2 = Sys.time () in + prerr_endline + ("++++++++++ Tempi della eta_fix: "^ string_of_float (time2 -. time1)) ; + hashtbl_add_time := 0.0 ; + type_of_aux'_add_time := 0.0 ; let abo = - acic_term_of_cic_term_context' conjectures [] [] bo (Some ty) in - let aty = acic_term_of_cic_term_context' conjectures [] [] ty None in + acic_term_of_cic_term_context' conjectures' [] [] bo' (Some ty') in + let aty = acic_term_of_cic_term_context' conjectures' [] [] ty' None in + let time3 = Sys.time () in + prerr_endline + ("++++++++++++ Tempi della hashtbl_add_time: " ^ string_of_float !hashtbl_add_time) ; + prerr_endline + ("++++++++++++ Tempi della type_of_aux'_add_time(" ^ string_of_int !number_new_type_of_aux' ^ "): " ^ string_of_float !type_of_aux'_add_time) ; + prerr_endline + ("++++++++++++ Tempi della type_of_aux'_add_time nella double_type_inference(" ^ string_of_int !DoubleTypeInference.number_new_type_of_aux'_double_work ^ ";" ^ string_of_int !DoubleTypeInference.number_new_type_of_aux'_prop ^ "/" ^ string_of_int !DoubleTypeInference.number_new_type_of_aux' ^ "): " ^ string_of_float !DoubleTypeInference.type_of_aux'_add_time) ; + prerr_endline + ("++++++++++ Tempi della acic_of_cic: " ^ string_of_float (time3 -. time2)) ; + prerr_endline + ("++++++++++ Numero di iterazioni della acic_of_cic: " ^ string_of_int !seed) ; C.ACurrentProof ("mettereaposto","mettereaposto2",id,aconjectures,abo,aty,params) | C.InductiveDefinition (tys,params,paramsno) ->