From 4ac2becfaa45abb18acb2bdf3db5d2587cadb6d4 Mon Sep 17 00:00:00 2001 From: Ferruccio Guidi Date: Tue, 14 Jun 2022 00:30:57 +0200 Subject: [PATCH] update in delayed_updating + final definition of lift + WIP on dfr_lift_bi + updates and corrections + old definition of lift parked --- .../etc/{lift_k => lift_i}/lift.etc | 24 ++++++++----- .../{lift_k => lift_i}/lift_constructors.etc | 20 +++++------ .../etc/{lift_k => lift_i}/lift_eq.etc | 35 +++++++++++-------- .../{lift_k => lift_i}/lift_path_after.etc | 9 ++--- .../{lift_k => lift_i}/lift_path_proper.etc | 0 .../etc/{lift_k => lift_i}/lift_path_uni.etc | 8 ++--- .../etc/{lift_k => lift_i}/lift_prototerm.etc | 0 .../{lift_k => lift_i}/lift_prototerm_eq.etc | 17 +++++++++ .../lift_prototerm_proper.etc | 0 ...tarrow_f_4.ma => black_rightarrow_if_4.ma} | 4 +-- .../delayed_updating/reduction/dfr_ifr.ma | 2 +- .../delayed_updating/reduction/dfr_lift.ma | 17 ++++++++- .../delayed_updating/reduction/ifr.ma | 4 +-- .../delayed_updating/reduction/ifr_unwind.ma | 2 +- .../delayed_updating/substitution/lift.ma | 24 +++++-------- .../substitution/lift_constructors.ma | 20 ++++++----- .../delayed_updating/substitution/lift_eq.ma | 35 ++++++++----------- .../substitution/lift_path_after.ma | 9 +++-- .../substitution/lift_path_head.ma | 31 ++++++++++++++++ .../lift_path_id.ma} | 0 .../substitution/lift_path_length.ma | 5 +-- .../substitution/lift_path_structure.ma | 3 +- .../substitution/lift_path_uni.ma | 8 +++-- .../substitution/lift_prototerm_eq.ma | 17 --------- .../lift_prototerm_id.ma} | 0 .../delayed_updating/syntax/path_reverse.ma | 2 +- 26 files changed, 172 insertions(+), 124 deletions(-) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift.etc (89%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_constructors.etc (77%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_eq.etc (89%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_path_after.etc (86%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_path_proper.etc (100%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_path_uni.etc (88%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_prototerm.etc (100%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_prototerm_eq.etc (85%) rename matita/matita/contribs/lambdadelta/delayed_updating/etc/{lift_k => lift_i}/lift_prototerm_proper.etc (100%) rename matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/{black_rightarrow_f_4.ma => black_rightarrow_if_4.ma} (89%) create mode 100644 matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_head.ma rename matita/matita/contribs/lambdadelta/delayed_updating/{etc/lift_k/lift_path_id.etc => substitution/lift_path_id.ma} (100%) rename matita/matita/contribs/lambdadelta/delayed_updating/{etc/lift_k/lift_prototerm_id.etc => substitution/lift_prototerm_id.ma} (100%) diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift.etc similarity index 89% rename from matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift.etc rename to matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift.etc index b873ed303..6933e9dbe 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift.etc +++ b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift.etc @@ -15,8 +15,7 @@ include "delayed_updating/notation/functions/uparrow_4.ma". include "delayed_updating/notation/functions/uparrow_2.ma". include "delayed_updating/syntax/path.ma". -include "ground/relocation/tr_uni.ma". -include "ground/relocation/tr_pap_tls.ma". +include "ground/relocation/tr_id_pap.ma". (* LIFT FOR PATH ************************************************************) @@ -28,7 +27,7 @@ match p with [ list_empty ⇒ k f (𝐞) | list_lcons l q ⇒ match l with - [ label_d n ⇒ lift_gen (A) (λg,p. k g (𝗱(f@⧣❨n❩)◗p)) (⇂*[n]f) q + [ label_d n ⇒ lift_gen (A) (λg,p. k g (𝗱(f@⧣❨n❩)◗p)) (𝐢) q | label_m ⇒ lift_gen (A) (λg,p. k g (𝗺◗p)) f q | label_L ⇒ lift_gen (A) (λg,p. k g (𝗟◗p)) (⫯f) q | label_A ⇒ lift_gen (A) (λg,p. k g (𝗔◗p)) f q @@ -61,7 +60,7 @@ lemma lift_empty (A) (k) (f): // qed. lemma lift_d_sn (A) (k) (p) (n) (f): - ↑❨(λg,p. k g (𝗱(f@⧣❨n❩)◗p)), ⇂*[n]f, p❩ = ↑{A}❨k, f, 𝗱n◗p❩. + ↑❨(λg,p. k g (𝗱(f@⧣❨n❩)◗p)), 𝐢, p❩ = ↑{A}❨k, f, 𝗱n◗p❩. // qed. lemma lift_m_sn (A) (k) (p) (f): @@ -93,7 +92,7 @@ lemma lift_rmap_empty (f): // qed. lemma lift_rmap_d_sn (f) (p) (n): - ↑[p](⇂*[ninj n]f) = ↑[𝗱n◗p]f. + ↑[p]𝐢 = ↑[𝗱n◗p]f. // qed. lemma lift_rmap_m_sn (f) (p): @@ -112,12 +111,21 @@ lemma lift_rmap_S_sn (f) (p): ↑[p]f = ↑[𝗦◗p]f. // qed. +(* Advanced cinstructionswith proj_rmap and tr_id ***************************) + +lemma lift_rmap_id (p): + (𝐢) = ↑[p]𝐢. +#p elim p -p // +* [ #n ] #p #IH // +qed. + (* Advanced constructions with proj_rmap and path_append ********************) lemma lift_rmap_append (p2) (p1) (f): ↑[p2]↑[p1]f = ↑[p1●p2]f. #p2 #p1 elim p1 -p1 // * [ #n ] #p1 #IH #f // -[ nsucc_pnpred nrplus_inj_dx /2 width=1 by tr_tls_compose_uni_dx/ qed. - *) diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_after.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_after.etc similarity index 86% rename from matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_after.etc rename to matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_after.etc index 869d680fe..938d21534 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_after.etc +++ b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_after.etc @@ -15,7 +15,6 @@ include "delayed_updating/substitution/lift_eq.ma". include "ground/relocation/tr_compose_pap.ma". include "ground/relocation/tr_compose_pn.ma". -include "ground/relocation/tr_compose_tls.ma". (* LIFT FOR PATH ************************************************************) @@ -23,9 +22,7 @@ include "ground/relocation/tr_compose_tls.ma". lemma lift_path_after (p) (f1) (f2): ↑[f2]↑[f1]p = ↑[f2∘f1]p. -#p elim p -p [| * ] // [ #n ] #p #IH #f1 #f2 -[ tr_compose_push_bi // -] +#p elim p -p [| * ] // #p #IH #f1 #f2 +tr_compose_push_bi // qed. diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_proper.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_proper.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_proper.etc rename to matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_proper.etc diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_uni.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_uni.etc similarity index 88% rename from matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_uni.etc rename to matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_uni.etc index f68010b32..9a62cb28a 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_uni.etc +++ b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_uni.etc @@ -12,9 +12,8 @@ (* *) (**************************************************************************) -include "delayed_updating/substitution/lift_path_id.ma". +include "delayed_updating/substitution/lift_eq.ma". include "ground/relocation/tr_uni_pap.ma". -include "ground/relocation/tr_uni_tls.ma". (* LIFT FOR PATH ************************************************************) @@ -22,7 +21,4 @@ include "ground/relocation/tr_uni_tls.ma". lemma lift_path_d_sn_uni (p) (m) (n): (𝗱(n+m)◗p) = ↑[𝐮❨m❩](𝗱(n)◗p). -#p #m #n -nsucc_pnpred -(lift_path_id p) +/2 width=1 by in_comp_lift_bi/ +qed-. + +lemma lift_term_id_dx (t): + ↑[𝐢]t ⊆ t. +#t #p * #q #Hq #H destruct // +qed-. + +lemma lift_term_id (t): + t ⇔ ↑[𝐢]t. +/3 width=2 by lift_term_id_dx, lift_term_id_sn, conj/ +qed. diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_proper.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm_proper.etc similarity index 100% rename from matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_proper.etc rename to matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm_proper.etc diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_f_4.ma b/matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_if_4.ma similarity index 89% rename from matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_f_4.ma rename to matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_if_4.ma index c69d6c79b..2b35b91ea 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_f_4.ma +++ b/matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_if_4.ma @@ -14,6 +14,6 @@ (* NOTATION FOR DELAYED UPDATING ********************************************) -notation "hvbox( t1 ➡𝐟[ break term 46 p, break term 46 q ] break term 46 t2 )" +notation "hvbox( t1 ➡𝐢𝐟[ break term 46 p, break term 46 q ] break term 46 t2 )" non associative with precedence 45 - for @{ 'BlackRightArrowF $t1 $p $q $t2 }. + for @{ 'BlackRightArrowIF $t1 $p $q $t2 }. diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_ifr.ma b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_ifr.ma index be7f3b3d3..fd5f76b54 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_ifr.ma +++ b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_ifr.ma @@ -33,7 +33,7 @@ include "delayed_updating/syntax/path_depth_reverse.ma". (* Main destructions with ifr ***********************************************) theorem dfr_des_ifr (f) (p) (q) (t1) (t2): t1 ϵ 𝐓 → - t1 ➡𝐝𝐟[p,q] t2 → ▼[f]t1 ➡𝐟[⊗p,⊗q] ▼[f]t2. + t1 ➡𝐝𝐟[p,q] t2 → ▼[f]t1 ➡𝐢𝐟[⊗p,⊗q] ▼[f]t2. #f #p #q #t1 #t2 #H0t1 * #n * #H1n #Ht1 #Ht2 @(ex_intro … (↑♭q)) @and3_intro diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_lift.ma b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_lift.ma index d25ddc502..e33b454be 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_lift.ma +++ b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_lift.ma @@ -23,12 +23,23 @@ include "delayed_updating/unwind/unwind2_rmap_head.ma". *) include "delayed_updating/substitution/fsubst_eq.ma". include "delayed_updating/substitution/lift_prototerm_eq.ma". +include "delayed_updating/substitution/lift_path_head.ma". include "delayed_updating/syntax/prototerm_proper_constructors.ma". + (* DELAYED FOCUSED REDUCTION ************************************************) (* Constructions with lift **************************************************) +(* +lemma pippo (f) (r): + ↑[↑[r]f](rᴿ) = (↑[f]r)ᴿ. +#f #r @(list_ind_rcons … r) -r // +#p * [ #n ] #IH +[ H1n >path_head_structure_depth lift_path_L_sn + >list_append_rcons_sn in H1n; list_append_rcons_sn in H1n; nsucc_pnpred nrplus_inj_dx /2 width=1 by tr_tls_compose_uni_dx/ qed. + *) diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_after.ma b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_after.ma index 938d21534..869d680fe 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_after.ma +++ b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_after.ma @@ -15,6 +15,7 @@ include "delayed_updating/substitution/lift_eq.ma". include "ground/relocation/tr_compose_pap.ma". include "ground/relocation/tr_compose_pn.ma". +include "ground/relocation/tr_compose_tls.ma". (* LIFT FOR PATH ************************************************************) @@ -22,7 +23,9 @@ include "ground/relocation/tr_compose_pn.ma". lemma lift_path_after (p) (f1) (f2): ↑[f2]↑[f1]p = ↑[f2∘f1]p. -#p elim p -p [| * ] // #p #IH #f1 #f2 -tr_compose_push_bi // +#p elim p -p [| * ] // [ #n ] #p #IH #f1 #f2 +[ tr_compose_push_bi // +] qed. diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_head.ma b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_head.ma new file mode 100644 index 000000000..126b691c6 --- /dev/null +++ b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_head.ma @@ -0,0 +1,31 @@ +include "delayed_updating/substitution/lift_eq.ma". +include "delayed_updating/syntax/path_head.ma". +include "delayed_updating/syntax/path_reverse.ma". +include "ground/relocation/xap.ma". + +axiom tr_xap_succ_pos (f) (n): + ↑↓(f@❨↑n❩) = f@❨↑n❩. + +axiom tr_xap_plus (n1) (n2) (f): + (⇂*[n2]f)@❨n1❩+f@❨n2❩ = f@❨n1+n2❩. + +axiom eq_inv_path_empty_head (p) (n): + (𝐞) = ↳[n]p → 𝟎 = n. + +lemma lift_path_head (f) (p) (q) (n): + pᴿ = ↳[n](pᴿ●qᴿ) → + ↳[↑[q●p]f@❨n❩](↑[f](q●p))ᴿ = (↑[↑[q]f]p)ᴿ. +#f #p @(list_ind_rcons … p) -p +[ #q #n #H0 + <(eq_inv_path_empty_head … H0) -H0 + tr_xap_succ_pos + lift_rmap_append nsucc_pnpred +(lift_path_id p) -/2 width=1 by in_comp_lift_bi/ -qed-. - -lemma lift_term_id_dx (t): - ↑[𝐢]t ⊆ t. -#t #p * #q #Hq #H destruct // -qed-. - -lemma lift_term_id (t): - t ⇔ ↑[𝐢]t. -/3 width=2 by lift_term_id_dx, lift_term_id_sn, conj/ -qed. diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_id.etc b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_prototerm_id.ma similarity index 100% rename from matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_id.etc rename to matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_prototerm_id.ma diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/syntax/path_reverse.ma b/matita/matita/contribs/lambdadelta/delayed_updating/syntax/path_reverse.ma index 046404f03..7fa03a41e 100644 --- a/matita/matita/contribs/lambdadelta/delayed_updating/syntax/path_reverse.ma +++ b/matita/matita/contribs/lambdadelta/delayed_updating/syntax/path_reverse.ma @@ -54,7 +54,7 @@ qed. (* Main constructions *******************************************************) -theorem reverse_revrse (p): +theorem reverse_reverse (p): p = pᴿᴿ. #p elim p -p // #l #p #IH -- 2.39.2