From 44b3d34ddcc81a5e008cc8be7db102139af1d907 Mon Sep 17 00:00:00 2001 From: Alberto Griggio Date: Wed, 15 Jun 2005 08:34:46 +0000 Subject: [PATCH] now something works... --- helm/ocaml/paramodulation/indexing.ml | 324 +++++++++++++++--------- helm/ocaml/paramodulation/saturation.ml | 15 +- 2 files changed, 216 insertions(+), 123 deletions(-) diff --git a/helm/ocaml/paramodulation/indexing.ml b/helm/ocaml/paramodulation/indexing.ml index 5c08d906d..c45e19ab0 100644 --- a/helm/ocaml/paramodulation/indexing.ml +++ b/helm/ocaml/paramodulation/indexing.ml @@ -55,21 +55,22 @@ let rec find_matches unif_fun metasenv context ugraph lift_amount term = let module HL = HelmLibraryObjects in let cmp = !Utils.compare_terms in let names = Utils.names_of_context context in - Printf.printf "CHIAMO find_matches (%s) su: %s\n" - (if unif_fun == Inference.matching then "MATCHING" - else if unif_fun == CicUnification.fo_unif then "UNIFICATION" - else "??????????") - (CicPp.pp term names); +(* Printf.printf "CHIAMO find_matches (%s) su: %s\n" *) +(* (if unif_fun == Inference.matching then "MATCHING" *) +(* else if unif_fun == CicUnification.fo_unif then "UNIFICATION" *) +(* else "??????????") *) +(* (CicPp.pp term names); *) function | [] -> None - | (pos, (proof, (ty, left, right, o), metas, args))::tl -> + | candidate::tl -> + let pos, (proof, (ty, left, right, o), metas, args) = candidate in let do_match c other eq_URI = - Printf.printf "provo con %s: %s, %s\n\n" - (if unif_fun == Inference.matching then "MATCHING" - else if unif_fun == CicUnification.fo_unif then "UNIFICATION" - else "??????????") - (CicPp.pp term names) - (CicPp.pp (S.lift lift_amount c) names); +(* Printf.printf "provo con %s: %s, %s\n\n" *) +(* (if unif_fun == Inference.matching then "MATCHING" *) +(* else if unif_fun == CicUnification.fo_unif then "UNIFICATION" *) +(* else "??????????") *) +(* (CicPp.pp term names) *) +(* (CicPp.pp (S.lift lift_amount c) names); *) let subst', metasenv', ugraph' = (* Inference.matching (metasenv @ metas) context term *) (* (S.lift lift_amount c) ugraph *) @@ -77,10 +78,11 @@ let rec find_matches unif_fun metasenv context ugraph lift_amount term = term (S.lift lift_amount c) ugraph in (* let names = U.names_of_context context in *) - Printf.printf "MATCH FOUND: %s, %s\n" - (CicPp.pp term names) (CicPp.pp (S.lift lift_amount c) names); +(* Printf.printf "MATCH FOUND: %s, %s\n" *) +(* (CicPp.pp term names) (CicPp.pp (S.lift lift_amount c) names); *) Some (C.Rel (1 + lift_amount), subst', metasenv', ugraph', - (proof, ty, c, other, eq_URI)) + (candidate, eq_URI)) +(* (proof, ty, c, other, eq_URI)) *) in let c, other, eq_URI = if pos = Left then left, right, HL.Logic.eq_ind_URI @@ -88,29 +90,24 @@ let rec find_matches unif_fun metasenv context ugraph lift_amount term = in if o <> U.Incomparable then try - print_endline "SONO QUI!"; +(* print_endline "SONO QUI!"; *) let res = do_match c other eq_URI in - print_endline "RITORNO RES"; +(* print_endline "RITORNO RES"; *) res with e -> - Printf.printf "ERRORE!: %s\n" (Printexc.to_string e); +(* Printf.printf "ERRORE!: %s\n" (Printexc.to_string e); *) find_matches unif_fun metasenv context ugraph lift_amount term tl else - let res = - try - let res = do_match c other eq_URI in - print_endline "RITORNO RES 2"; - res - with e -> None in + let res = try do_match c other eq_URI with e -> None in match res with | Some (_, s, _, _, _) -> let c' = M.apply_subst s c and other' = M.apply_subst s other in let order = cmp c' other' in let names = U.names_of_context context in - Printf.printf "c': %s\nother': %s\norder: %s\n\n" - (CicPp.pp c' names) (CicPp.pp other' names) - (U.string_of_comparison order); +(* Printf.printf "c': %s\nother': %s\norder: %s\n\n" *) +(* (CicPp.pp c' names) (CicPp.pp other' names) *) +(* (U.string_of_comparison order); *) (* if cmp (M.apply_subst s c) (M.apply_subst s other) = U.Gt then *) if order = U.Gt then res @@ -158,8 +155,8 @@ let rec demodulate_term metasenv context ugraph table lift_amount term = in ( match res with | None -> None - | Some (_, subst, menv, ug, info) -> - Some (C.Appl ll, subst, menv, ug, info) + | Some (_, subst, menv, ug, eq_found) -> + Some (C.Appl ll, subst, menv, ug, eq_found) ) | C.Prod (nn, s, t) -> let r1 = @@ -173,12 +170,13 @@ let rec demodulate_term metasenv context ugraph table lift_amount term = in ( match r2 with | None -> None - | Some (t', subst, menv, ug, info) -> + | Some (t', subst, menv, ug, eq_found) -> Some (C.Prod (nn, (S.lift 1 s), t'), - subst, menv, ug, info) + subst, menv, ug, eq_found) ) - | Some (s', subst, menv, ug, info) -> - Some (C.Prod (nn, s', (S.lift 1 t)), subst, menv, ug, info) + | Some (s', subst, menv, ug, eq_found) -> + Some (C.Prod (nn, s', (S.lift 1 t)), + subst, menv, ug, eq_found) ) | t -> (* Printf.printf "Ne` Appl ne` Prod: %s\n" *) @@ -187,19 +185,24 @@ let rec demodulate_term metasenv context ugraph table lift_amount term = ;; -let rec demodulate newmeta env table target = +let rec demodulation newmeta env table target = let module C = Cic in let module S = CicSubstitution in let module M = CicMetaSubst in let module HL = HelmLibraryObjects in - print_endline "\n\ndemodulate"; let metasenv, context, ugraph = env in let proof, (eq_ty, left, right, order), metas, args = target in +(* let _ = *) +(* let names = Utils.names_of_context context in *) +(* Printf.printf "demodulation %s = %s\n" *) +(* (CicPp.pp left names) (CicPp.pp right names) *) +(* in *) let metasenv' = metasenv @ metas in - let build_newtarget is_left - (t, subst, menv, ug, (proof', ty, what, other, eq_URI)) = + let build_newtarget is_left (t, subst, menv, ug, (eq_found, eq_URI)) = + let pos, (proof', (ty, what, other, _), menv', args') = eq_found in + let what, other = if pos = Left then what, other else other, what in let newterm, newproof = - let bo = S.subst (M.apply_subst subst other) t in + let bo = M.apply_subst subst (S.subst other t) in let bo'' = C.Appl ([C.MutInd (HL.Logic.eq_URI, 0, []); S.lift 1 eq_ty] @ @@ -210,44 +213,101 @@ let rec demodulate newmeta env table target = M.apply_subst subst (C.Appl [C.Const (eq_URI, []); ty; what; t'; proof; other; proof']) in - let newmeta, newtarget = - let left, right = if is_left then newterm, right else left, newterm in - let m = - (Inference.metas_of_term left) @ (Inference.metas_of_term right) - in - let newmetasenv = List.filter (fun (i, _, _) -> List.mem i m) metas - and newargs = - List.filter - (function C.Meta (i, _) -> List.mem i m | _ -> assert false) - args - in - let ordering = !Utils.compare_terms left right in - newmeta, (newproof, (eq_ty, left, right, ordering), newmetasenv, newargs) + let left, right = if is_left then newterm, right else left, newterm in + let m = + (Inference.metas_of_term left) @ (Inference.metas_of_term right) + in + let newmetasenv = List.filter (fun (i, _, _) -> List.mem i m) metas + and newargs = + List.filter + (function C.Meta (i, _) -> List.mem i m | _ -> assert false) + args in - newmeta, newtarget + let ordering = !Utils.compare_terms left right in + newmeta, (newproof, (eq_ty, left, right, ordering), newmetasenv, newargs) in let res = demodulate_term metasenv' context ugraph table 0 left in match res with | Some t -> let newmeta, newtarget = build_newtarget true t in - if Inference.is_identity (metasenv', context, ugraph) newtarget then - newmeta, newtarget - else - demodulate newmeta env table newtarget + if (Inference.is_identity (metasenv', context, ugraph) newtarget) || + (Inference.meta_convertibility_eq target newtarget) then + newmeta, newtarget + else ( +(* Printf.printf "Going on 1:\ntarget: %s\nnewtarget: %s\n%s\n\n" *) +(* (Inference.string_of_equality ~env target) *) +(* (Inference.string_of_equality ~env newtarget) *) +(* (string_of_bool (target = newtarget)); *) + demodulation newmeta env table newtarget + ) | None -> let res = demodulate_term metasenv' context ugraph table 0 right in match res with | Some t -> let newmeta, newtarget = build_newtarget false t in - if Inference.is_identity (metasenv', context, ugraph) newtarget then - newmeta, newtarget - else - demodulate newmeta env table newtarget + if (Inference.is_identity (metasenv', context, ugraph) newtarget) || + (Inference.meta_convertibility_eq target newtarget) then + newmeta, newtarget + else ( +(* Printf.printf "Going on 2:\ntarget: %s\nnewtarget: %s\n\n" *) +(* (Inference.string_of_equality ~env target) *) +(* (Inference.string_of_equality ~env newtarget); *) + demodulation newmeta env table newtarget + ) | None -> newmeta, target ;; +let rec find_all_matches metasenv context ugraph lift_amount term = + let module C = Cic in + let module U = Utils in + let module S = CicSubstitution in + let module M = CicMetaSubst in + let module HL = HelmLibraryObjects in + let cmp = !Utils.compare_terms in + let names = Utils.names_of_context context in + function + | [] -> [] + | candidate::tl -> + let pos, (proof, (ty, left, right, o), metas, args) = candidate in + let do_match c other eq_URI = + let subst', metasenv', ugraph' = + CicUnification.fo_unif (metasenv @ metas) context + term (S.lift lift_amount c) ugraph + in + (C.Rel (1 + lift_amount), subst', metasenv', ugraph', + (candidate, eq_URI)) + in + let c, other, eq_URI = + if pos = Left then left, right, HL.Logic.eq_ind_URI + else right, left, HL.Logic.eq_ind_r_URI + in + if o <> U.Incomparable then + try + let res = do_match c other eq_URI in + res::(find_all_matches metasenv context ugraph lift_amount term tl) + with e -> + find_all_matches metasenv context ugraph lift_amount term tl + else + try + let res = do_match c other eq_URI in + match res with + | _, s, _, _, _ -> + let c' = M.apply_subst s c + and other' = M.apply_subst s other in + let order = cmp c' other' in + let names = U.names_of_context context in + if order <> U.Lt && order <> U.Le then + res::(find_all_matches metasenv context ugraph + lift_amount term tl) + else + find_all_matches metasenv context ugraph lift_amount term tl + with e -> + find_all_matches metasenv context ugraph lift_amount term tl +;; + + let rec betaexpand_term metasenv context ugraph table lift_amount term = let module C = Cic in let module S = CicSubstitution in @@ -258,12 +318,39 @@ let rec betaexpand_term metasenv context ugraph table lift_amount term = let res, lifted_term = match term with | C.Meta (i, l) -> - let l = - List.map (function - | Some t -> Some (S.lift lift_amount t) - | None -> None) l + let l', lifted_l = + List.fold_right + (fun arg (res, lifted_tl) -> + match arg with + | Some arg -> + let arg_res, lifted_arg = + betaexpand_term metasenv context ugraph table + lift_amount arg in + let l1 = + List.map + (fun (t, s, m, ug, eq_found) -> + (Some t)::lifted_tl, s, m, ug, eq_found) + arg_res + in + (l1 @ + (List.map + (fun (l, s, m, ug, eq_found) -> + (Some lifted_arg)::l, s, m, ug, eq_found) + res), + (Some lifted_arg)::lifted_tl) + | None -> + (List.map + (fun (r, s, m, ug, eq_found) -> + None::r, s, m, ug, eq_found) res, + None::lifted_tl) + ) l ([], []) in - [], C.Meta (i, l) + let e = + List.map + (fun (l, s, m, ug, eq_found) -> + (C.Meta (i, l), s, m, ug, eq_found)) l' + in + e, C.Meta (i, lifted_l) | C.Rel m -> [], if m <= lift_amount then C.Rel m else C.Rel (m+1) @@ -276,12 +363,12 @@ let rec betaexpand_term metasenv context ugraph table lift_amount term = table (lift_amount+1) t in let l1' = List.map - (fun (t, s, m, ug, info) -> - C.Prod (nn, t, lifted_t), s, m, ug, info) l1 + (fun (t, s, m, ug, eq_found) -> + C.Prod (nn, t, lifted_t), s, m, ug, eq_found) l1 and l2' = List.map - (fun (t, s, m, ug, info) -> - C.Prod (nn, lifted_s, t), s, m, ug, info) l2 in + (fun (t, s, m, ug, eq_found) -> + C.Prod (nn, lifted_s, t), s, m, ug, eq_found) l2 in l1' @ l2', C.Prod (nn, lifted_s, lifted_t) | C.Appl l -> @@ -293,35 +380,39 @@ let rec betaexpand_term metasenv context ugraph table lift_amount term = in let l1 = List.map - (fun (a, s, m, ug, info) -> a::lifted_tl, s, m, ug, info) + (fun (a, s, m, ug, eq_found) -> + a::lifted_tl, s, m, ug, eq_found) arg_res in (l1 @ (List.map - (fun (r, s, m, ug, info) -> lifted_arg::r, s, m, ug, info) + (fun (r, s, m, ug, eq_found) -> + lifted_arg::r, s, m, ug, eq_found) res), lifted_arg::lifted_tl) ) l ([], []) in - (List.map (fun (l, s, m, ug, info) -> (C.Appl l, s, m, ug, info)) l', + (List.map + (fun (l, s, m, ug, eq_found) -> (C.Appl l, s, m, ug, eq_found)) l', C.Appl lifted_l) | t -> [], (S.lift lift_amount t) in match term with | C.Meta _ -> res, lifted_term - | _ -> + | term -> (* let names = Utils.names_of_context context in *) -(* Printf.printf "CHIAMO find_matches su: %s\n" (CicPp.pp term names); *) - match - find_matches CicUnification.fo_unif metasenv context ugraph - lift_amount term candidates - with - | None -> res, lifted_term - | Some r -> -(* let _, _, _, _, (_, _, what, _, _) = r in *) -(* Printf.printf "OK, aggiungo a res: %s\n" (CicPp.pp what names); *) - r::res, lifted_term +(* Printf.printf "CHIAMO find_all_matches su: %s\n" (CicPp.pp term names); *) + let r = + find_all_matches metasenv context ugraph lift_amount term candidates + in + r @ res, lifted_term +(* match *) +(* find_all_matches metasenv context ugraph lift_amount term candidates *) +(* with *) +(* | None -> res, lifted_term *) +(* | Some r -> *) +(* r::res, lifted_term *) ;; @@ -332,24 +423,17 @@ let superposition_left (metasenv, context, ugraph) table target = let module HL = HelmLibraryObjects in let module CR = CicReduction in let module U = Utils in - print_endline "\n\nsuperposition_left"; +(* print_endline "superposition_left"; *) let proof, (eq_ty, left, right, ordering), _, _ = target in let expansions, _ = let term = if ordering = U.Gt then left else right in - let res = - betaexpand_term metasenv context ugraph table 0 term in -(* let names = U.names_of_context context in *) -(* Printf.printf "\n\nsuperposition_left: %s\n%s\n" *) -(* (CicPp.pp term names) *) -(* (String.concat "\n" *) -(* (List.map *) -(* (fun (_, _, _, _, (_, _, what, _, _)) -> CicPp.pp what names) *) -(* (fst res))); *) - res + betaexpand_term metasenv context ugraph table 0 term in - let build_new (bo, s, m, ug, (proof', ty, what, other, eq_URI)) = + let build_new (bo, s, m, ug, (eq_found, eq_URI)) = + let pos, (proof', (ty, what, other, _), menv', args') = eq_found in + let what, other = if pos = Left then what, other else other, what in let newgoal, newproof = - let bo' = S.subst (M.apply_subst s other) bo in + let bo' = M.apply_subst s (S.subst other bo) in let bo'' = C.Appl ( [C.MutInd (HL.Logic.eq_URI, 0, []); @@ -358,18 +442,15 @@ let superposition_left (metasenv, context, ugraph) table target = else [S.lift 1 left; bo']) in let t' = C.Lambda (C.Anonymous, ty, bo'') in - S.subst (M.apply_subst s other) bo, + bo', M.apply_subst s (C.Appl [C.Const (eq_URI, []); ty; what; t'; proof; other; proof']) in - let left, right, newordering = - if ordering = U.Gt then - newgoal, right, !Utils.compare_terms newgoal right - else - left, newgoal, !Utils.compare_terms left newgoal - in - (newproof, (eq_ty, left, right, ordering), [], []) + let left, right = + if ordering = U.Gt then newgoal, right else left, newgoal in + let neworder = !Utils.compare_terms left right in + (newproof, (eq_ty, left, right, neworder), [], []) in List.map build_new expansions ;; @@ -382,7 +463,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 - print_endline "\n\nsuperposition_right"; +(* print_endline "superposition_right"; *) let eqproof, (eq_ty, left, right, ordering), newmetas, args = target in let metasenv' = metasenv @ newmetas in let maxmeta = ref newmeta in @@ -401,31 +482,38 @@ 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, (proof', ty, what, other, eq_URI)) = + let build_new ordering (bo, s, m, ug, (eq_found, eq_URI)) = + let pos, (proof', (ty, what, other, _), menv', args') = eq_found in + let what, other = if pos = Left then what, other else other, what in let newgoal, newproof = - let bo' = S.subst (M.apply_subst s other) bo in + let bo' = M.apply_subst s (S.subst other bo) in let bo'' = C.Appl ( - [C.MutInd (HL.Logic.eq_URI, 0, []); - S.lift 1 eq_ty] @ + [C.MutInd (HL.Logic.eq_URI, 0, []); S.lift 1 eq_ty] @ if ordering = U.Gt then [bo'; S.lift 1 right] else [S.lift 1 left; bo']) in let t' = C.Lambda (C.Anonymous, ty, bo'') in - S.subst (M.apply_subst s other) bo, + bo', M.apply_subst s (C.Appl [C.Const (eq_URI, []); ty; what; t'; eqproof; other; proof']) in let newmeta, newequality = - let left, right, newordering = - if ordering = U.Gt then - newgoal, right, !Utils.compare_terms newgoal right - else - left, newgoal, !Utils.compare_terms left newgoal - in - Inference.fix_metas !maxmeta - (newproof, (eq_ty, left, right, ordering), [], []) + let left, right = + if ordering = U.Gt then newgoal, M.apply_subst s right + else M.apply_subst s left, newgoal in + let neworder = !Utils.compare_terms left right + and newmenv = newmetas @ menv' + and newargs = args @ args' in + let eq' = (newproof, (eq_ty, left, right, neworder), newmenv, newargs) + and env = (metasenv, context, ugraph) in +(* Printf.printf "eq' prima di fix_metas: %s\n" *) +(* (Inference.string_of_equality eq' ~env); *) + let newm, eq' = Inference.fix_metas !maxmeta eq' in +(* Printf.printf "eq' dopo fix_metas: %s\n" *) +(* (Inference.string_of_equality eq' ~env); *) + newm, eq' in maxmeta := newmeta; newequality diff --git a/helm/ocaml/paramodulation/saturation.ml b/helm/ocaml/paramodulation/saturation.ml index e30b1545f..372127b48 100644 --- a/helm/ocaml/paramodulation/saturation.ml +++ b/helm/ocaml/paramodulation/saturation.ml @@ -264,7 +264,8 @@ let forward_simplify env (sign, current) ?passive (active_list, active_table) = | _::tl -> find_duplicate sign current tl in let demodulate table current = - let newmeta, newcurrent = Indexing.demodulate !maxmeta env table current in + let newmeta, newcurrent = + Indexing.demodulation !maxmeta env table current in maxmeta := newmeta; if is_identity env newcurrent then if sign = Negative then Some (sign, newcurrent) else None @@ -307,7 +308,7 @@ let forward_simplify_new env (new_neg, new_pos) ?passive active = in let all = active_list @ pl in let demodulate table target = - let newmeta, newtarget = Indexing.demodulate !maxmeta env table target in + let newmeta, newtarget = Indexing.demodulation !maxmeta env table target in maxmeta := newmeta; newtarget in @@ -321,12 +322,15 @@ let forward_simplify_new env (new_neg, new_pos) ?passive active = List.map (demodulate passive_table) new_pos in let new_pos_set = - List.fold_left (fun s e -> EqualitySet.add e s) EqualitySet.empty new_pos + List.fold_left + (fun s e -> + if not (Inference.is_identity env e) then EqualitySet.add e s else s) + EqualitySet.empty new_pos in let new_pos = EqualitySet.elements new_pos_set in let f sign' target (sign, eq) = if sign <> sign' then false - else subsumption env target eq + else subsumption env target eq in (List.filter (fun e -> not (List.exists (f Negative e) all)) new_neg, List.filter (fun e -> not (List.exists (f Positive e) all)) new_pos) @@ -650,7 +654,8 @@ let main () = | Failure -> Printf.printf "NO proof found! :-(\n\n" | Success (Some proof, env) -> - Printf.printf "OK, found a proof!:\n%s\n%.9f\n" (PP.ppterm proof) + Printf.printf "OK, found a proof!:\n%s\n%.9f\n" + (PP.pp proof (names_of_context context)) (finish -. start); | Success (None, env) -> Printf.printf "Success, but no proof?!?\n\n" -- 2.39.2