X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_disambiguation%2Fdisambiguate.ml;h=9f4c41d2e709e608b5f7497d27692d6737736598;hb=6912a028bef118d8e9d7c2847200510a9b055c6a;hp=139a6417a3c33c6f6f4fb4328794ac4802a5195c;hpb=c5d5bf37b1e4c4b9b499ed2cbfe27cf2ec181944;p=helm.git diff --git a/helm/ocaml/cic_disambiguation/disambiguate.ml b/helm/ocaml/cic_disambiguation/disambiguate.ml index 139a6417a..9f4c41d2e 100644 --- a/helm/ocaml/cic_disambiguation/disambiguate.ml +++ b/helm/ocaml/cic_disambiguation/disambiguate.ml @@ -34,9 +34,18 @@ exception NoWellTypedInterpretation (** raised when an environment is not enough informative to decide *) exception Try_again -let debug = true +let debug = false let debug_print = if debug then prerr_endline else ignore +(* + (** print benchmark information *) +let benchmark = true +let max_refinements = ref 0 (* benchmarking is not thread safe *) +let actual_refinements = ref 0 +let domain_size = ref 0 +let choices_avg = ref 0. +*) + let descr_of_domain_item = function | Id s -> s | Symbol (s, _) -> s @@ -47,24 +56,33 @@ type test_result = | Ko | Uncertain -let refine metasenv context term = - let metasenv, term = CicMkImplicit.expand_implicits metasenv context term in - debug_print (sprintf "TEST_INTERPRETATION: %s" (CicPp.ppterm term)); - try - let term', _, metasenv' = CicRefine.type_of_aux' metasenv context term in - Ok (term', metasenv') - with - | CicRefine.Uncertain _ -> - debug_print ("%%% UNCERTAIN!!! " ^ CicPp.ppterm term) ; - Uncertain - | CicRefine.RefineFailure _ -> - debug_print ("%%% PRUNED!!! " ^ CicPp.ppterm term) ; - Ko +let refine metasenv context term ugraph = +(* if benchmark then incr actual_refinements; *) + let metasenv, term = + CicMkImplicit.expand_implicits metasenv [] context term in + debug_print (sprintf "TEST_INTERPRETATION: %s" (CicPp.ppterm term)); + try + let term', _, metasenv',ugraph1 = + CicRefine.type_of_aux' metasenv context term ugraph in + (Ok (term', metasenv')),ugraph1 + with + | CicRefine.Uncertain _ -> + debug_print ("UNCERTAIN!!! " ^ CicPp.ppterm term) ; + Uncertain,ugraph + | CicRefine.RefineFailure msg -> + debug_print (sprintf "PRUNED!!!\nterm%s\nmessage:%s" + (CicPp.ppterm term) msg); + Ko,ugraph + | CicUnification.UnificationFailure s -> + prerr_endline ("PASSADI QUI: " ^ s); + raise ( CicUnification.UnificationFailure s ) let resolve (env: environment) (item: domain_item) ?(num = "") ?(args = []) () = try snd (Environment.find item env) env num args - with Not_found -> assert false + with Not_found -> + failwith ("Domain item not found: " ^ + (DisambiguateTypes.string_of_domain_item item)) (* TODO move it to Cic *) let find_in_environment name context = @@ -180,15 +198,26 @@ let interpretate ~context ~env ast = Cic.LetIn (Cic.Name var, Cic.CoFix (!counter, funs), cic)) in List.fold_right (build_term inductiveFuns) inductiveFuns cic_body - | CicAst.Ident (name, subst) -> + | CicAst.Ident (name, subst) + | CicAst.Uri (name, subst) as ast -> + let is_uri = function CicAst.Uri _ -> true | _ -> false in (try + if is_uri ast then raise Not_found;(* don't search the env for URIs *) let index = find_in_environment name context in if subst <> None then CicTextualParser2.fail loc "Explicit substitutions not allowed here"; Cic.Rel index with Not_found -> - let cic = resolve env (Id name) () in + let cic = + if is_uri ast then (* we have the URI, build the term out of it *) + try + CicUtil.term_of_uri name + with UriManager.IllFormedUri _ -> + CicTextualParser2.fail loc "Ill formed URI" + else + resolve env (Id name) () + in let mk_subst uris = let ids_to_uris = List.map (fun uri -> UriManager.name_of_uri uri, uri) uris @@ -203,49 +232,41 @@ let interpretate ~context ~env ast = raise DisambiguateChoices.Invalid_choice)) subst | None -> List.map (fun uri -> uri, Cic.Implicit None) uris) - in - (match cic with - | Cic.Const (uri, []) -> - let uris = - match CicEnvironment.get_obj uri with - | Cic.Constant (_, _, _, uris) -> uris - | _ -> assert false - in - Cic.Const (uri, mk_subst uris) - | Cic.Var (uri, []) -> - let uris = - match CicEnvironment.get_obj uri with - | Cic.Variable (_, _, _, uris) -> uris - | _ -> assert false - in - Cic.Var (uri, mk_subst uris) - | Cic.MutInd (uri, i, []) -> - let uris = - match CicEnvironment.get_obj uri with - | Cic.InductiveDefinition (_, uris, _) -> uris - | _ -> assert false - in - Cic.MutInd (uri, i, mk_subst uris) - | Cic.MutConstruct (uri, i, j, []) -> - let uris = - match CicEnvironment.get_obj uri with - | Cic.InductiveDefinition (_, uris, _) -> uris - | _ -> assert false - in - Cic.MutConstruct (uri, i, j, mk_subst uris) - | Cic.Meta _ | Cic.Implicit _ as t -> + in + (try + match cic with + | Cic.Const (uri, []) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let uris = CicUtil.params_of_obj o in + Cic.Const (uri, mk_subst uris) + | Cic.Var (uri, []) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let uris = CicUtil.params_of_obj o in + Cic.Var (uri, mk_subst uris) + | Cic.MutInd (uri, i, []) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let uris = CicUtil.params_of_obj o in + Cic.MutInd (uri, i, mk_subst uris) + | Cic.MutConstruct (uri, i, j, []) -> + let o,_ = CicEnvironment.get_obj CicUniv.empty_ugraph uri in + let uris = CicUtil.params_of_obj o in + Cic.MutConstruct (uri, i, j, mk_subst uris) + | Cic.Meta _ | Cic.Implicit _ as t -> (* - prerr_endline (sprintf - "Warning: %s must be instantiated with _[%s] but we do not enforce it" - (CicPp.ppterm t) - (String.concat "; " - (List.map - (fun (s, term) -> s ^ " := " ^ CicAstPp.pp_term term) - subst))); + prerr_endline (sprintf + "Warning: %s must be instantiated with _[%s] but we do not enforce it" + (CicPp.ppterm t) + (String.concat "; " + (List.map + (fun (s, term) -> s ^ " := " ^ CicAstPp.pp_term term) + subst))); *) - t - | _ -> - raise DisambiguateChoices.Invalid_choice)) + t + | _ -> + raise DisambiguateChoices.Invalid_choice + with + CicEnvironment.CircularDependency _ -> + raise DisambiguateChoices.Invalid_choice)) | CicAst.Implicit -> Cic.Implicit None | CicAst.Num (num, i) -> resolve env (Num i) ~num () | CicAst.Meta (index, subst) -> @@ -261,13 +282,14 @@ let interpretate ~context ~env ast = | CicAst.Sort `CProp -> Cic.Sort Cic.CProp | CicAst.Symbol (symbol, instance) -> resolve env (Symbol (symbol, instance)) () + | CicAst.UserInput -> assert false and aux_option loc context = function | None -> Cic.Implicit (Some `Type) | Some term -> aux loc context term in match ast with | CicAst.AttributedTerm (`Loc loc, term) -> aux loc context term - | term -> aux (-1, -1) context term + | term -> aux CicAst.dummy_floc context term let domain_of_term ~context ast = (* "aux" keeps domain in reverse order and doesn't care about duplicates. @@ -342,6 +364,7 @@ let domain_of_term ~context ast = let dom' = aux loc context term in dom' @ dom) [Id name] subst)) + | CicAst.Uri _ -> [] | CicAst.Implicit -> [] | CicAst.Num (num, i) -> [ Num i ] | CicAst.Meta (index, local_context) -> @@ -349,6 +372,7 @@ let domain_of_term ~context ast = local_context | CicAst.Sort _ -> [] | CicAst.Symbol (symbol, instance) -> [ Symbol (symbol, instance) ] + | CicAst.UserInput -> assert false and aux_option loc context = function | None -> [] @@ -381,7 +405,7 @@ let domain_of_term ~context ast = rev_uniq (match ast with | CicAst.AttributedTerm (`Loc loc, term) -> aux loc context term - | term -> aux (-1, -1) context term) + | term -> aux CicAst.dummy_floc context term) (* dom1 \ dom2 *) @@ -395,19 +419,13 @@ let domain_diff dom1 dom2 = module Make (C: Callbacks) = struct - let choices_of_id mqi_handle id = - let query = MQueryGenerator.locate id in - let result = MQueryInterpreter.execute mqi_handle query in - let uris = - List.map - (function uri,_ -> - MQueryMisc.wrong_xpointer_format_from_wrong_xpointer_format' uri - ) result in - let uris' = + let choices_of_id dbd id = + let uris = MetadataQuery.locate ~dbd id in + let uris = match uris with | [] -> [UriManager.string_of_uri (C.input_or_locate_uri - ~title:("URI matching \"" ^ id ^ "\" unknown."))] + ~title:("URI matching \"" ^ id ^ "\" unknown.") ~id ())] | [uri] -> [uri] | _ -> C.interactive_user_uri_choice ~selection_mode:`MULTIPLE @@ -422,13 +440,17 @@ module Make (C: Callbacks) = (uri, let term = try - HelmLibraryObjects.term_of_uri (UriManager.uri_of_string uri) - with _ -> assert false + CicUtil.term_of_uri uri + with exn -> + prerr_endline uri; + prerr_endline (Printexc.to_string exn); + assert false in fun _ _ _ -> term)) - uris' + uris - let disambiguate_term mqi_handle context metasenv term ~aliases:current_env + let disambiguate_term ~(dbd:Mysql.dbd) context metasenv term + ?(initial_ugraph = CicUniv.empty_ugraph) ~aliases:current_env = debug_print "NEW DISAMBIGUATE INPUT"; let disambiguate_context = (* cic context -> disambiguate context *) @@ -453,7 +475,7 @@ module Make (C: Callbacks) = (try Hashtbl.find id_choices id with Not_found -> - let choices = choices_of_id mqi_handle id in + let choices = choices_of_id dbd id in Hashtbl.add id_choices id choices; choices) | Symbol (symb, _) -> DisambiguateChoices.lookup_symbol_choices symb @@ -462,80 +484,127 @@ module Make (C: Callbacks) = if choices = [] then raise (No_choices item); choices in + +(* + (* *) + let _ = + if benchmark then begin + let per_item_choices = + List.map + (fun dom_item -> + try + let len = List.length (lookup_choices dom_item) in + prerr_endline (sprintf "BENCHMARK %s: %d" + (string_of_domain_item dom_item) len); + len + with No_choices _ -> 0) + term_dom + in + max_refinements := List.fold_left ( * ) 1 per_item_choices; + actual_refinements := 0; + domain_size := List.length term_dom; + choices_avg := + (float_of_int !max_refinements) ** (1. /. float_of_int !domain_size) + end + in + (* *) +*) + (* (3) test an interpretation filling with meta uninterpreted identifiers *) - let test_env current_env todo_dom = + let test_env current_env todo_dom ugraph = let filled_env = List.fold_left (fun env item -> - Environment.add item - ("Implicit", + Environment.add item + ("Implicit", (match item with - | Id _ | Num _ -> (fun _ _ _ -> Cic.Implicit (Some `Closed)) - | Symbol _ -> (fun _ _ _ -> Cic.Implicit None))) env) + | Id _ | Num _ -> (fun _ _ _ -> Cic.Implicit (Some `Closed)) + | Symbol _ -> (fun _ _ _ -> Cic.Implicit None))) env) current_env todo_dom in try let cic_term = interpretate ~context:disambiguate_context ~env:filled_env term in - refine metasenv context cic_term + let k,ugraph1 = refine metasenv context cic_term ugraph in + (k , ugraph1 ) with - | Try_again -> Uncertain - | DisambiguateChoices.Invalid_choice -> Ko + | Try_again -> Uncertain,ugraph + | DisambiguateChoices.Invalid_choice -> Ko,ugraph in (* (4) build all possible interpretations *) - let rec aux current_env todo_dom = + let rec aux current_env todo_dom base_univ = match todo_dom with | [] -> - (match test_env current_env [] with - | Ok (term, metasenv) -> [ current_env, metasenv, term ] - | Ko | Uncertain -> []) + (match test_env current_env [] base_univ with + | Ok (term, metasenv),new_univ -> + [ current_env, metasenv, term, new_univ ] + | Ko,_ | Uncertain,_ -> []) | item :: remaining_dom -> debug_print (sprintf "CHOOSED ITEM: %s" - (string_of_domain_item item)); + (string_of_domain_item item)); let choices = lookup_choices item in - let rec filter = function + let rec filter univ = function | [] -> [] | codomain_item :: tl -> debug_print (sprintf "%s CHOSEN" (fst codomain_item)) ; let new_env = Environment.add item codomain_item current_env in - (match test_env new_env remaining_dom with - | Ok (term, metasenv) -> + (match test_env new_env remaining_dom univ with + | Ok (term, metasenv),new_univ -> (match remaining_dom with - | [] -> [ new_env, metasenv, term ] - | _ -> aux new_env remaining_dom) @ filter tl - | Uncertain -> + | [] -> [ new_env, metasenv, term, new_univ ] + | _ -> aux new_env remaining_dom new_univ )@ + filter univ tl + | Uncertain,new_univ -> (match remaining_dom with | [] -> [] - | _ -> aux new_env remaining_dom) @ filter tl - | Ko -> filter tl) + | _ -> aux new_env remaining_dom new_univ )@ + filter univ tl + | Ko,_ -> filter univ tl) in - filter choices + filter base_univ choices in - match aux current_env todo_dom with - | [] -> raise NoWellTypedInterpretation - | [ _ ] as l -> - debug_print "UNA SOLA SCELTA"; - l - | l -> - debug_print (sprintf "PIU' SCELTE (%d)" (List.length l)); - let choices = - List.map - (fun (env, _, _) -> - List.map - (fun domain_item -> - let description = - fst (Environment.find domain_item env) - in - (descr_of_domain_item domain_item, description)) - term_dom) - l - in - let choosed = C.interactive_interpretation_choice choices in - List.map (List.nth l) choosed - + let base_univ = initial_ugraph in + try + let res = + match aux current_env todo_dom base_univ with + | [] -> raise NoWellTypedInterpretation + | [ e,me,t,u ] as l -> + debug_print "UNA SOLA SCELTA"; + [ e,me,t,u] + | l -> + debug_print (sprintf "PIU' SCELTE (%d)" (List.length l)); + let choices = + List.map + (fun (env, _, _, _) -> + List.map + (fun domain_item -> + let description = + fst (Environment.find domain_item env) + in + (descr_of_domain_item domain_item, description)) + term_dom) + l + in + let choosed = C.interactive_interpretation_choice choices in + List.map (List.nth l) choosed + in +(* + (if benchmark then + let res_size = List.length res in + prerr_endline (sprintf + ("BENCHMARK: %d/%d refinements performed, domain size %d, interps %d, k %.2f\n" ^^ + "BENCHMARK: estimated %.2f") + !actual_refinements !max_refinements !domain_size res_size + !choices_avg + (float_of_int (!domain_size - 1) *. !choices_avg *. (float_of_int res_size) +. !choices_avg))); +*) + res + with + CicEnvironment.CircularDependency s -> + failwith "Disambiguate: circular dependency" end