X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Ftactics%2Fparamodulation%2Findexing.ml;h=873cc5698cadab2be35ce92860a7cab7ad7c14ec;hb=2cb08b0959a375f2d542948cc0da3a4bbc551a5c;hp=83dc1b180126d71f4ffce95640ee6dc92adf540f;hpb=14621bf944fd8cae2d0f0bc8bc0e0f8123cbffa7;p=helm.git diff --git a/helm/software/components/tactics/paramodulation/indexing.ml b/helm/software/components/tactics/paramodulation/indexing.ml index 83dc1b180..873cc5698 100644 --- a/helm/software/components/tactics/paramodulation/indexing.ml +++ b/helm/software/components/tactics/paramodulation/indexing.ml @@ -45,13 +45,13 @@ let check_equation env equation msg = CicTypeChecker.type_of_aux' metasenv' context right ugraph; () with - CicUtil.Meta_not_found _ as exn -> - begin - prerr_endline msg; - prerr_endline (CicPp.ppterm left); - prerr_endline (CicPp.ppterm right); - raise exn - end + CicUtil.Meta_not_found _ as exn -> + begin + prerr_endline msg; + prerr_endline (CicPp.ppterm left); + prerr_endline (CicPp.ppterm right); + raise exn + end *) type retrieval_mode = Matching | Unification;; @@ -60,10 +60,10 @@ let string_of_res ?env = function None -> "None" | Some (t, s, m, u, ((p,e), eq_URI)) -> - Printf.sprintf "Some: (%s, %s, %s)" - (Utils.string_of_pos p) - (Inference.string_of_equality ?env e) - (CicPp.ppterm t) + Printf.sprintf "Some: (%s, %s, %s)" + (Utils.string_of_pos p) + (Inference.string_of_equality ?env e) + (CicPp.ppterm t) ;; let print_res ?env res = @@ -83,17 +83,17 @@ let print_candidates ?env mode term res = prerr_endline (String.concat "\n" (List.map - (fun (p, e) -> - Printf.sprintf "| (%s, %s)" (Utils.string_of_pos p) - (Inference.string_of_equality ?env e)) - res)); + (fun (p, e) -> + Printf.sprintf "| (%s, %s)" (Utils.string_of_pos p) + (Inference.string_of_equality ?env e)) + res)); ;; let indexing_retrieval_time = ref 0.;; -let apply_subst = CicMetaSubst.apply_subst +let apply_subst = Inference.apply_subst let index = Index.index let remove_index = Index.remove_index @@ -103,7 +103,7 @@ let init_index = Index.init_index let check_disjoint_invariant subst metasenv msg = if (List.exists - (fun (i,_,_) -> (List.exists (fun (j,_) -> i=j) subst)) metasenv) + (fun (i,_,_) -> (List.exists (fun (j,_) -> i=j) subst)) metasenv) then begin prerr_endline ("not disjoint: " ^ msg); @@ -112,13 +112,7 @@ let check_disjoint_invariant subst metasenv msg = ;; let check_for_duplicates metas msg = -let _ = - try - ignore(CicUtil.lookup_meta 190 metas); - prerr_endline ("eccoci in " ^ msg); - with - CicUtil.Meta_not_found _ -> () in -if List.length metas <> + if List.length metas <> List.length (HExtlib.list_uniq (List.sort Pervasives.compare metas)) then begin prerr_endline ("DUPLICATI " ^ msg); @@ -130,19 +124,19 @@ if List.length metas <> let check_res res msg = match res with Some (t, subst, menv, ug, (eq_found, eq_URI)) -> - let eqs = Inference.string_of_equality (snd eq_found) in - check_disjoint_invariant subst menv msg; - check_for_duplicates menv (msg ^ "\nchecking " ^ eqs); + let eqs = Inference.string_of_equality (snd eq_found) in + check_disjoint_invariant subst menv msg; + check_for_duplicates menv (msg ^ "\nchecking " ^ eqs); | None -> () ;; let check_target context target msg = - let w, proof, (eq_ty, left, right, order), metas, args = target in + let w, proof, (eq_ty, left, right, order), metas = target in (* check that metas does not contains duplicates *) let eqs = Inference.string_of_equality target in let _ = check_for_duplicates metas (msg ^ "\nchecking " ^ eqs) in let actual = (Inference.metas_of_term left)@(Inference.metas_of_term right) - @(Inference.metas_of_term eq_ty)@(Inference.metas_of_proof proof) in + @(Inference.metas_of_term eq_ty)@(Inference.metas_of_proof proof) in let menv = List.filter (fun (i, _, _) -> List.mem i actual) metas in let _ = if menv <> metas then begin @@ -154,19 +148,20 @@ let check_target context target msg = prerr_endline ("right: " ^ (CicPp.ppterm right)); prerr_endline ("ty: " ^ (CicPp.ppterm eq_ty)); assert false - end - else () in + end + else () in () +(* try - CicTypeChecker.type_of_aux' - metas context (Inference.build_proof_term proof) CicUniv.empty_ugraph + ignore(CicTypeChecker.type_of_aux' + metas context (Inference.build_proof_term proof) CicUniv.empty_ugraph) with e -> prerr_endline msg; prerr_endline (Inference.string_of_proof proof); prerr_endline (CicPp.ppterm (Inference.build_proof_term proof)); prerr_endline ("+++++++++++++left: " ^ (CicPp.ppterm left)); prerr_endline ("+++++++++++++right: " ^ (CicPp.ppterm right)); - raise e -;; + raise e +*) (* returns a list of all the equalities in the tree that are in relation @@ -208,6 +203,10 @@ let get_candidates ?env mode tree term = res ;; +let profiler = HExtlib.profile "P/Indexing.get_candidates" + +let get_candidates ?env mode tree term = + profiler.HExtlib.profile (get_candidates ?env mode tree) term let match_unif_time_ok = ref 0.;; let match_unif_time_no = ref 0.;; @@ -246,18 +245,18 @@ let rec find_matches metasenv context ugraph lift_amount term termty = function | [] -> None | candidate::tl -> - let pos, (_, proof, (ty, left, right, o), metas, args) = candidate in + let pos, (_, proof, (ty, left, right, o), metas) = candidate in if Utils.debug_metas then - ignore(check_target context (snd candidate) "find_matches"); + ignore(check_target context (snd candidate) "find_matches"); if Utils.debug_res then - begin - let c = "eq = " ^ (Inference.string_of_equality (snd candidate)) ^ "\n"in - let t = "t = " ^ (CicPp.ppterm term) ^ "\n" in + begin + let c = "eq = " ^ (Inference.string_of_equality (snd candidate)) ^ "\n"in + let t = "t = " ^ (CicPp.ppterm term) ^ "\n" in let m = "metas = " ^ (CicMetaSubst.ppmetasenv [] metas) ^ "\n" in let p = "proof = " ^ (CicPp.ppterm (Inference.build_proof_term proof)) ^ "\n" in - check_for_duplicates metas "gia nella metas"; - check_for_duplicates (metasenv @ metas) ("not disjoint" ^ c ^ t ^ m ^ p) - end; + check_for_duplicates metas "gia nella metas"; + check_for_duplicates (metasenv @ metas) ("not disjoint" ^ c ^ t ^ m ^ p) + end; if check && not (fst (CicReduction.are_convertible ~metasenv context termty ty ugraph)) then ( find_matches metasenv context ugraph lift_amount term termty tl @@ -274,11 +273,11 @@ let rec find_matches metasenv context ugraph lift_amount term termty = match_unif_time_ok := !match_unif_time_ok +. (t2 -. t1); r with - | Inference.MatchingFailure as e -> + | Inference.MatchingFailure as e -> let t2 = Unix.gettimeofday () in match_unif_time_no := !match_unif_time_no +. (t2 -. t1); raise e - | CicUtil.Meta_not_found _ as exn -> raise exn + | CicUtil.Meta_not_found _ as exn -> raise exn in Some (C.Rel (1 + lift_amount), subst', metasenv', ugraph', (candidate, eq_URI)) @@ -289,13 +288,13 @@ let rec find_matches metasenv context ugraph lift_amount term termty = in if o <> U.Incomparable then let res = - try - do_match c eq_URI + try + do_match c eq_URI with Inference.MatchingFailure -> - find_matches metasenv context ugraph lift_amount term termty tl - in - if Utils.debug_res then ignore (check_res res "find1"); - res + find_matches metasenv context ugraph lift_amount term termty tl + in + if Utils.debug_res then ignore (check_res res "find1"); + res else let res = try do_match c eq_URI @@ -318,7 +317,6 @@ let rec find_matches metasenv context ugraph lift_amount term termty = find_matches metasenv context ugraph lift_amount term termty tl ;; - (* as above, but finds all the matching equalities, and the matching condition can be either Inference.matching or Inference.unification @@ -334,7 +332,7 @@ let rec find_all_matches ?(unif_fun=Inference.unification) function | [] -> [] | candidate::tl -> - let pos, (_, _, (ty, left, right, o), metas, args) = candidate in + let pos, (_, _, (ty, left, right, o), metas) = candidate in let do_match c eq_URI = let subst', metasenv', ugraph' = let t1 = Unix.gettimeofday () in @@ -393,46 +391,68 @@ let rec find_all_matches ?(unif_fun=Inference.unification) lift_amount term termty tl ;; +let find_all_matches + ?unif_fun metasenv context ugraph lift_amount term termty l += + let rc = + find_all_matches + ?unif_fun metasenv context ugraph lift_amount term termty l + in + (*prerr_endline "CANDIDATES:"; + List.iter (fun (_,x)->prerr_endline (Inference.string_of_equality x)) l; + prerr_endline ("MATCHING:" ^ CicPp.ppterm term ^ " are " ^ string_of_int + (List.length rc));*) + rc (* returns true if target is subsumed by some equality in table *) -let subsumption env table target = - let _, _, (ty, left, right, _), tmetas, _ = target in +let subsumption env table target = + (* + let print_res l = + prerr_endline (String.concat "\n" (List.map (fun (_, subst, menv, ug, + ((pos,equation),_)) -> Inference.string_of_equality equation)l)) + in + *) + let _, _, (ty, left, right, _), tmetas = target in let metasenv, context, ugraph = env in - let metasenv = metasenv @ tmetas in - let samesubst subst subst' = - let tbl = Hashtbl.create (List.length subst) in - List.iter (fun (m, (c, t1, t2)) -> Hashtbl.add tbl m (c, t1, t2)) subst; - List.for_all - (fun (m, (c, t1, t2)) -> - try - let c', t1', t2' = Hashtbl.find tbl m in - if (c = c') && (t1 = t1') && (t2 = t2') then true - else false - with Not_found -> - true) - subst' + let metasenv = tmetas in + let merge_if_possible s1 s2 = + let already_in = Hashtbl.create 13 in + let rec aux acc = function + | ((i,x) as s)::tl -> + (try + let x' = Hashtbl.find already_in i in + if x = x' then aux acc tl else None + with + | Not_found -> + Hashtbl.add already_in i x; + aux (s::acc) tl) + | [] -> Some acc + in + aux [] (s1@s2) in let leftr = match left with - | Cic.Meta _ -> [] + | Cic.Meta _ -> [] | _ -> let leftc = get_candidates Matching table left in find_all_matches ~unif_fun:Inference.matching metasenv context ugraph 0 left ty leftc in +(* print_res leftr;*) let rec ok what = function - | [] -> false, [] - | (_, subst, menv, ug, ((pos, (_, _, (_, l, r, o), m, _)), _))::tl -> + | [] -> None + | (_, subst, menv, ug, ((pos,equation),_))::tl -> + let _, _, (_, l, r, o), m = equation in try let other = if pos = Utils.Left then r else l in let subst', menv', ug' = let t1 = Unix.gettimeofday () in try let r = - Inference.matching menv m context what other ugraph - in + Inference.matching metasenv m context what other ugraph + in let t2 = Unix.gettimeofday () in match_unif_time_ok := !match_unif_time_ok +. (t2 -. t1); r @@ -441,34 +461,30 @@ let subsumption env table target = match_unif_time_no := !match_unif_time_no +. (t2 -. t1); raise e in - if samesubst subst subst' then - true, subst - else - ok what tl + (match merge_if_possible subst subst' with + | None -> ok what tl + | Some s -> Some (s, equation)) with Inference.MatchingFailure -> ok what tl in - let r, subst = ok right leftr in - let r, s = - if r then - true, subst - else + match ok right leftr with + | Some _ as res -> res + | None -> let rightr = - match right with - | Cic.Meta _ -> [] - | _ -> + match right with + | Cic.Meta _ -> [] + | _ -> let rightc = get_candidates Matching table right in - find_all_matches ~unif_fun:Inference.matching - metasenv context ugraph 0 right ty rightc + find_all_matches ~unif_fun:Inference.matching + metasenv context ugraph 0 right ty rightc in - ok left rightr - in +(* print_res rightr;*) + ok left rightr (* (if r then *) (* debug_print *) -(* (lazy *) -(* (Printf.sprintf "SUBSUMPTION! %s\n%s\n" *) -(* (Inference.string_of_equality target) (Utils.print_subst s)))); *) - r, s +(* (lazy *) +(* (Printf.sprintf "SUBSUMPTION! %s\n%s\n" *) +(* (Inference.string_of_equality target) (Utils.print_subst s)))); *) ;; let rec demodulation_aux ?from ?(typecheck=false) @@ -479,91 +495,98 @@ let rec demodulation_aux ?from ?(typecheck=false) let module M = CicMetaSubst in let module HL = HelmLibraryObjects in let candidates = - get_candidates ~env:(metasenv,context,ugraph) Matching table term in + get_candidates ~env:(metasenv,context,ugraph) (* Unification *) Matching table term in + if List.exists (fun (i,_,_) -> i = 2840) metasenv + then + (prerr_endline ("term: " ^(CicPp.ppterm term)); + List.iter (fun (_,x) -> prerr_endline (Inference.string_of_equality x)) + candidates; + prerr_endline ("-------"); + prerr_endline ("+++++++")); (* let candidates = List.map make_variant candidates in *) let res = match term with | C.Meta _ -> None | term -> - let termty, ugraph = + let termty, ugraph = if typecheck then CicTypeChecker.type_of_aux' metasenv context term ugraph else C.Implicit None, ugraph - in - let res = + in + let res = find_matches metasenv context ugraph lift_amount term termty candidates - in + in if Utils.debug_res then ignore(check_res res "demod1"); - if res <> None then + if res <> None then res - else + else match term with - | C.Appl l -> - let res, ll = - List.fold_left - (fun (res, tl) t -> - if res <> None then - (res, tl @ [S.lift 1 t]) - else - let r = - demodulation_aux ~from:"1" metasenv context ugraph table - lift_amount t - in - match r with - | None -> (None, tl @ [S.lift 1 t]) - | Some (rel, _, _, _, _) -> (r, tl @ [rel])) - (None, []) l - in ( - match res with - | None -> None - | Some (_, subst, menv, ug, eq_found) -> - Some (C.Appl ll, subst, menv, ug, eq_found) - ) - | C.Prod (nn, s, t) -> - let r1 = - demodulation_aux ~from:"2" - metasenv context ugraph table lift_amount s in ( - match r1 with - | None -> - let r2 = - demodulation_aux metasenv - ((Some (nn, C.Decl s))::context) ugraph - table (lift_amount+1) t - in ( - match r2 with - | None -> None - | Some (t', subst, menv, ug, eq_found) -> - Some (C.Prod (nn, (S.lift 1 s), t'), - subst, menv, ug, eq_found) - ) - | Some (s', subst, menv, ug, eq_found) -> - Some (C.Prod (nn, s', (S.lift 1 t)), - subst, menv, ug, eq_found) - ) - | C.Lambda (nn, s, t) -> - let r1 = - demodulation_aux - metasenv context ugraph table lift_amount s in ( - match r1 with - | None -> - let r2 = - demodulation_aux metasenv - ((Some (nn, C.Decl s))::context) ugraph - table (lift_amount+1) t - in ( - match r2 with - | None -> None - | Some (t', subst, menv, ug, eq_found) -> - Some (C.Lambda (nn, (S.lift 1 s), t'), - subst, menv, ug, eq_found) - ) - | Some (s', subst, menv, ug, eq_found) -> - Some (C.Lambda (nn, s', (S.lift 1 t)), - subst, menv, ug, eq_found) - ) - | t -> - None + | C.Appl l -> + let res, ll = + List.fold_left + (fun (res, tl) t -> + if res <> None then + (res, tl @ [S.lift 1 t]) + else + let r = + demodulation_aux ~from:"1" metasenv context ugraph table + lift_amount t + in + match r with + | None -> (None, tl @ [S.lift 1 t]) + | Some (rel, _, _, _, _) -> (r, tl @ [rel])) + (None, []) l + in ( + match res with + | None -> None + | Some (_, subst, menv, ug, eq_found) -> + Some (C.Appl ll, subst, menv, ug, eq_found) + ) + | C.Prod (nn, s, t) -> + let r1 = + demodulation_aux ~from:"2" + metasenv context ugraph table lift_amount s in ( + match r1 with + | None -> + let r2 = + demodulation_aux metasenv + ((Some (nn, C.Decl s))::context) ugraph + table (lift_amount+1) t + in ( + match r2 with + | None -> None + | Some (t', subst, menv, ug, eq_found) -> + Some (C.Prod (nn, (S.lift 1 s), t'), + subst, menv, ug, eq_found) + ) + | Some (s', subst, menv, ug, eq_found) -> + Some (C.Prod (nn, s', (S.lift 1 t)), + subst, menv, ug, eq_found) + ) + | C.Lambda (nn, s, t) -> + let r1 = + demodulation_aux + metasenv context ugraph table lift_amount s in ( + match r1 with + | None -> + let r2 = + demodulation_aux metasenv + ((Some (nn, C.Decl s))::context) ugraph + table (lift_amount+1) t + in ( + match r2 with + | None -> None + | Some (t', subst, menv, ug, eq_found) -> + Some (C.Lambda (nn, (S.lift 1 s), t'), + subst, menv, ug, eq_found) + ) + | Some (s', subst, menv, ug, eq_found) -> + Some (C.Lambda (nn, s', (S.lift 1 t)), + subst, menv, ug, eq_found) + ) + | t -> + None in if Utils.debug_res then ignore(check_res res "demod_aux output"); res @@ -577,6 +600,8 @@ let demod_counter = ref 1;; exception Foo +let profiler = HExtlib.profile "P/Indexing.demod_eq[build_new_target]" + (** demodulation, when target is an equality *) let rec demodulation_equality ?from newmeta env table sign target = let module C = Cic in @@ -585,13 +610,14 @@ let rec demodulation_equality ?from newmeta env table sign target = let module HL = HelmLibraryObjects in let module U = Utils in let metasenv, context, ugraph = env in - let w, proof, (eq_ty, left, right, order), metas, args = target in + let w, proof, (eq_ty, left, right, order), metas = target in (* first, we simplify *) let right = U.guarded_simpl context right in let left = U.guarded_simpl context left in - let w = Utils.compute_equality_weight eq_ty left right in let order = !Utils.compare_terms left right in - let target = w, proof, (eq_ty, left, right, order), metas, args in + let stat = (eq_ty, left, right, order) in + let w = Utils.compute_equality_weight stat in + let target = w, proof, stat, metas in if Utils.debug_metas then ignore(check_target context target "demod equalities input"); let metasenv' = (* metasenv @ *) metas in @@ -603,11 +629,11 @@ let rec demodulation_equality ?from newmeta env table sign target = if Utils.debug_metas then begin ignore(check_for_duplicates menv "input1"); - ignore(check_disjoint_invariant subst menv "input2"); - let substs = CicMetaSubst.ppsubst subst in - ignore(check_target context (snd eq_found) ("input3" ^ substs)) + ignore(check_disjoint_invariant subst menv "input2"); + let substs = Inference.ppsubst subst in + ignore(check_target context (snd eq_found) ("input3" ^ substs)) end; - let pos, (_, proof', (ty, what, other, _), menv', args') = eq_found in + let pos, (_, proof', (ty, what, other, _), menv') = eq_found in let ty = try fst (CicTypeChecker.type_of_aux' metasenv context what ugraph) with CicUtil.Meta_not_found _ -> ty @@ -627,6 +653,8 @@ let rec demodulation_equality ?from newmeta env table sign target = Inference.ProofBlock ( subst, eq_URI, (name, ty), bo'(* t' *), eq_found, proof)) else + begin + prerr_endline "***************************************negative"; let metaproof = incr maxmeta; let irl = @@ -646,20 +674,19 @@ let rec demodulation_equality ?from newmeta env table sign target = let what, other = if pos = Utils.Left then what, other else other, what in - pos, (0, proof', (ty, other, what, Utils.Incomparable), - menv', args') + pos, (0, proof', (ty, other, what, Utils.Incomparable),menv') in let target_proof = let pb = - Inference.ProofBlock (subst, eq_URI, (name, ty), bo', - eq_found, Inference.BasicProof metaproof) + Inference.ProofBlock + (subst, eq_URI, (name, ty), bo', + eq_found, Inference.BasicProof ([],metaproof)) in match proof with | Inference.BasicProof _ -> (* print_endline "replacing a BasicProof"; *) pb | Inference.ProofGoalBlock (_, parent_proof) -> - (* print_endline "replacing another ProofGoalBlock"; *) Inference.ProofGoalBlock (pb, parent_proof) | _ -> assert false @@ -670,67 +697,73 @@ let rec demodulation_equality ?from newmeta env table sign target = eq_ty; if is_left then right else left] in (bo, - Inference.ProofGoalBlock (Inference.BasicProof refl, target_proof)) + Inference.ProofGoalBlock (Inference.BasicProof ([],refl), target_proof)) + end in let newmenv = (* Inference.filter subst *) menv in let _ = if Utils.debug_metas then - try ignore(CicTypeChecker.type_of_aux' + try ignore(CicTypeChecker.type_of_aux' newmenv context (Inference.build_proof_term newproof) ugraph); - () - with exc -> + () + with exc -> prerr_endline "sempre lui"; - prerr_endline (CicMetaSubst.ppsubst subst); - prerr_endline (CicPp.ppterm (Inference.build_proof_term newproof)); + prerr_endline (Inference.ppsubst subst); + prerr_endline (CicPp.ppterm (Inference.build_proof_term newproof)); prerr_endline ("+++++++++++++termine: " ^ (CicPp.ppterm t)); prerr_endline ("+++++++++++++what: " ^ (CicPp.ppterm what)); prerr_endline ("+++++++++++++other: " ^ (CicPp.ppterm other)); - prerr_endline ("+++++++++++++subst: " ^ (CicMetaSubst.ppsubst subst)); - raise exc; + prerr_endline ("+++++++++++++subst: " ^ (Inference.ppsubst subst)); + prerr_endline ("+++++++++++++newmenv: " ^ (CicMetaSubst.ppmetasenv [] + newmenv)); + raise exc; else () in let left, right = if is_left then newterm, right else left, newterm in let ordering = !Utils.compare_terms left right in + let stat = (eq_ty, left, right, ordering) in let time2 = Unix.gettimeofday () in build_newtarget_time := !build_newtarget_time +. (time2 -. time1); let res = - let w = Utils.compute_equality_weight eq_ty left right in - (w, newproof, (eq_ty, left, right, ordering),newmenv,args) in + let w = Utils.compute_equality_weight stat in + (w, newproof, stat,newmenv) in if Utils.debug_metas then ignore(check_target context res "buildnew_target output"); !maxmeta, res in + let build_newtarget is_left x = + profiler.HExtlib.profile (build_newtarget is_left) x + in let res = demodulation_aux ~from:"3" metasenv' context ugraph table 0 left in if Utils.debug_res then check_res res "demod result"; let newmeta, newtarget = match res with | Some t -> - let newmeta, newtarget = build_newtarget true t in - if (Inference.is_weak_identity (metasenv', context, ugraph) newtarget) || + let newmeta, newtarget = build_newtarget true t in + if (Inference.is_weak_identity (metasenv', context, ugraph) newtarget) || (Inference.meta_convertibility_eq target newtarget) then - newmeta, newtarget - else + newmeta, newtarget + else demodulation_equality newmeta env table sign newtarget | None -> - let res = demodulation_aux metasenv' context ugraph table 0 right in - if Utils.debug_res then check_res res "demod result 1"; - match res with - | Some t -> - let newmeta, newtarget = build_newtarget false t in - if (Inference.is_weak_identity (metasenv', context, ugraph) newtarget) || - (Inference.meta_convertibility_eq target newtarget) then - newmeta, newtarget - else - demodulation_equality newmeta env table sign newtarget - | None -> - newmeta, target + let res = demodulation_aux metasenv' context ugraph table 0 right in + if Utils.debug_res then check_res res "demod result 1"; + match res with + | Some t -> + let newmeta, newtarget = build_newtarget false t in + if (Inference.is_weak_identity (metasenv', context, ugraph) newtarget) || + (Inference.meta_convertibility_eq target newtarget) then + newmeta, newtarget + else + demodulation_equality newmeta env table sign newtarget + | None -> + newmeta, target in (* newmeta, newtarget *) newmeta,newtarget ;; - (** Performs the beta expansion of the term "term" w.r.t. "table", i.e. returns the list of all the terms t s.t. "(t term) = t2", for some t2 @@ -856,6 +889,12 @@ let rec betaexpand_term metasenv context ugraph table lift_amount term = r @ res, lifted_term ;; +let profiler = HExtlib.profile "P/Indexing.betaexpand_term" + +let betaexpand_term metasenv context ugraph table lift_amount term = + profiler.HExtlib.profile + (betaexpand_term metasenv context ugraph table lift_amount) term + let sup_l_counter = ref 1;; @@ -871,17 +910,17 @@ let superposition_left newmeta (metasenv, context, ugraph) table target = let module HL = HelmLibraryObjects in let module CR = CicReduction in let module U = Utils in - let weight, proof, (eq_ty, left, right, ordering), menv, _ = target in + let weight, proof, (eq_ty, left, right, ordering), menv = target in if Utils.debug_metas then ignore(check_target context target "superpositionleft"); let expansions, _ = let term = if ordering = U.Gt then left else right in begin - let t1 = Unix.gettimeofday () in - let res = betaexpand_term metasenv context ugraph table 0 term in - let t2 = Unix.gettimeofday () in - beta_expand_time := !beta_expand_time +. (t2 -. t1); - res + let t1 = Unix.gettimeofday () in + let res = betaexpand_term metasenv context ugraph table 0 term in + let t2 = Unix.gettimeofday () in + beta_expand_time := !beta_expand_time +. (t2 -. t1); + res end in let maxmeta = ref newmeta in @@ -889,7 +928,7 @@ let superposition_left newmeta (metasenv, context, ugraph) table target = (* debug_print (lazy "\nSUPERPOSITION LEFT\n"); *) let time1 = Unix.gettimeofday () in - let pos, (_, proof', (ty, what, other, _), menv', args') = eq_found in + let pos, (_, proof', (ty, what, other, _), menv') = eq_found in let what, other = if pos = Utils.Left then what, other else other, what in let newgoal, newproof = let bo' = U.guarded_simpl context (apply_subst s (S.subst other bo)) in @@ -918,12 +957,12 @@ let superposition_left newmeta (metasenv, context, ugraph) table target = let what, other = if pos = Utils.Left then what, other else other, what in - pos, (0, proof', (ty, other, what, Utils.Incomparable), menv', args') + pos, (0, proof', (ty, other, what, Utils.Incomparable), menv') in let target_proof = let pb = Inference.ProofBlock (s, eq_URI, (name, ty), bo'', eq_found, - Inference.BasicProof metaproof) + Inference.BasicProof ([],metaproof)) in match proof with | Inference.BasicProof _ -> @@ -940,17 +979,18 @@ let superposition_left newmeta (metasenv, context, ugraph) table target = eq_ty; if ordering = U.Gt then right else left] in (bo', - Inference.ProofGoalBlock (Inference.BasicProof refl, target_proof)) + Inference.ProofGoalBlock (Inference.BasicProof ([],refl), target_proof)) in let left, right = if ordering = U.Gt then newgoal, right else left, newgoal in let neworder = !Utils.compare_terms left right in + let stat = (eq_ty, left, right, neworder) in let newmenv = (* Inference.filter s *) menv in let time2 = Unix.gettimeofday () in build_newtarget_time := !build_newtarget_time +. (time2 -. time1); - let w = Utils.compute_equality_weight eq_ty left right in - (w, newproof, (eq_ty, left, right, neworder), newmenv, []) + let w = Utils.compute_equality_weight stat in + (w, newproof, stat, newmenv) in !maxmeta, List.map build_new expansions @@ -973,7 +1013,7 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = let module HL = HelmLibraryObjects in let module CR = CicReduction in let module U = Utils in - let w, eqproof, (eq_ty, left, right, ordering), newmetas, args = target in + let w, eqproof, (eq_ty, left, right, ordering), newmetas = target in if Utils.debug_metas then ignore (check_target context target "superpositionright"); let metasenv' = newmetas in @@ -1000,12 +1040,12 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = in (res left right), (res right left) in - let build_new ordering ((bo, s, m, ug, (eq_found, eq_URI)) as input) = + let build_new ordering (bo, s, m, ug, (eq_found, eq_URI)) = if Utils.debug_metas then ignore (check_target context (snd eq_found) "buildnew1" ); let time1 = Unix.gettimeofday () in - let pos, (_, proof', (ty, what, other, _), menv', args') = eq_found in + let pos, (_, proof', (ty, what, other, _), menv') = eq_found in let what, other = if pos = Utils.Left then what, other else other, what in let newgoal, newproof = (* qua *) @@ -1027,15 +1067,15 @@ let superposition_right newmeta (metasenv, context, ugraph) table target = else apply_subst s left, newgoal in let neworder = !Utils.compare_terms left right in let newmenv = (* Inference.filter s *) m in - let newargs = args @ args' in + let stat = (eq_ty, left, right, neworder) in let eq' = - let w = Utils.compute_equality_weight eq_ty left right in - (w, newproof, (eq_ty, left, right, neworder), newmenv, newargs) in + let w = Utils.compute_equality_weight stat in + (w, newproof, stat, newmenv) in if Utils.debug_metas then - ignore (check_target context eq' "buildnew3"); + ignore (check_target context eq' "buildnew3"); let newm, eq' = Inference.fix_metas !maxmeta eq' in if Utils.debug_metas then - ignore (check_target context eq' "buildnew4"); + ignore (check_target context eq' "buildnew4"); newm, eq' in maxmeta := newmeta; @@ -1065,9 +1105,9 @@ let rec demodulation_goal newmeta env table goal = let term = Utils.guarded_simpl (~debug:true) context term in let goal = proof, metas, term in let metasenv' = metas in - + let build_newgoal (t, subst, menv, ug, (eq_found, eq_URI)) = - let pos, (_, proof', (ty, what, other, _), menv', args') = eq_found in + let pos, (_, proof', (ty, what, other, _), menv') = eq_found in let what, other = if pos = Utils.Left then what, other else other, what in let ty = try fst (CicTypeChecker.type_of_aux' metasenv context what ugraph) @@ -1096,12 +1136,12 @@ let rec demodulation_goal newmeta env table goal = let what, other = if pos = Utils.Left then what, other else other, what in - pos, (0, proof', (ty, other, what, Utils.Incomparable), menv', args') + pos, (0, proof', (ty, other, what, Utils.Incomparable), menv') in let goal_proof = let pb = Inference.ProofBlock (subst, eq_URI, (name, ty), bo', - eq_found, Inference.BasicProof metaproof) + eq_found, Inference.BasicProof ([],metaproof)) in let rec repl = function | Inference.NoProof -> @@ -1114,6 +1154,7 @@ let rec demodulation_goal newmeta env table goal = (* debug_print (lazy "replacing another ProofGoalBlock"); *) Inference.ProofGoalBlock (pb, parent_proof) | Inference.SubProof (term, meta_index, p) -> + prerr_endline "subproof!"; Inference.SubProof (term, meta_index, repl p) | _ -> assert false in repl proof @@ -1138,7 +1179,6 @@ let rec demodulation_goal newmeta env table goal = newmeta, goal ;; - (** demodulation, when the target is a theorem *) let rec demodulation_theorem newmeta env table theorem = let module C = Cic in @@ -1151,7 +1191,7 @@ let rec demodulation_theorem newmeta env table theorem = let metasenv' = metas in let build_newtheorem (t, subst, menv, ug, (eq_found, eq_URI)) = - let pos, (_, proof', (ty, what, other, _), menv', args') = eq_found in + let pos, (_, proof', (ty, what, other, _), menv') = eq_found in let what, other = if pos = Utils.Left then what, other else other, what in let newterm, newty = let bo = Utils.guarded_simpl context (apply_subst subst (S.subst other t)) in @@ -1160,12 +1200,10 @@ let rec demodulation_theorem newmeta env table theorem = incr demod_counter; let newproof = Inference.ProofBlock (subst, eq_URI, (name, ty), bo', eq_found, - Inference.BasicProof term) + Inference.BasicProof ([],term)) in (Inference.build_proof_term newproof, bo) in - - let m = Inference.metas_of_term newterm in !maxmeta, (newterm, newty, menv) in let res =