]> matita.cs.unibo.it Git - helm.git/commitdiff
update in delayed_updating
authorFerruccio Guidi <ferruccio.guidi@unibo.it>
Mon, 13 Jun 2022 22:30:57 +0000 (00:30 +0200)
committerFerruccio Guidi <ferruccio.guidi@unibo.it>
Mon, 13 Jun 2022 22:30:57 +0000 (00:30 +0200)
+ final definition of lift
+ WIP on dfr_lift_bi
+ updates and corrections
+ old definition of lift parked

38 files changed:
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_constructors.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_eq.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_after.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_proper.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_uni.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm_eq.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm_proper.etc [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_constructors.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_eq.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_after.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_id.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_proper.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_uni.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_eq.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_id.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_proper.etc [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_f_4.ma [deleted file]
matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_if_4.ma [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_ifr.ma
matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_lift.ma
matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr.ma
matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr_unwind.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_constructors.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_eq.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_after.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_head.ma [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_id.ma [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_length.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_structure.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_uni.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_prototerm_eq.ma
matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_prototerm_id.ma [new file with mode: 0644]
matita/matita/contribs/lambdadelta/delayed_updating/syntax/path_reverse.ma

diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift.etc
new file mode 100644 (file)
index 0000000..6933e9d
--- /dev/null
@@ -0,0 +1,158 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+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_id_pap.ma".
+
+(* LIFT FOR PATH ************************************************************)
+
+definition lift_continuation (A:Type[0]) ≝
+           tr_map → path → A.
+
+rec definition lift_gen (A:Type[0]) (k:lift_continuation A) (f) (p) on p ≝
+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)) (𝐢) 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
+  | label_S   ⇒ lift_gen (A) (λg,p. k g (𝗦◗p)) f q
+  ]
+].
+
+interpretation
+  "lift (gneric)"
+  'UpArrow A k f p = (lift_gen A k f p).
+
+definition proj_path: lift_continuation … ≝
+           λf,p.p.
+
+definition proj_rmap: lift_continuation … ≝
+           λf,p.f.
+
+interpretation
+  "lift (path)"
+  'UpArrow f p = (lift_gen ? proj_path f p).
+
+interpretation
+  "lift (relocation map)"
+  'UpArrow p f = (lift_gen ? proj_rmap f p).
+
+(* Basic constructions ******************************************************)
+
+lemma lift_empty (A) (k) (f):
+      k f (𝐞) = ↑{A}❨k, f, 𝐞❩.
+// qed.
+
+lemma lift_d_sn (A) (k) (p) (n) (f):
+      ↑❨(λg,p. k g (𝗱(f@⧣❨n❩)◗p)), 𝐢, p❩ = ↑{A}❨k, f, 𝗱n◗p❩.
+// qed.
+
+lemma lift_m_sn (A) (k) (p) (f):
+      ↑❨(λg,p. k g (𝗺◗p)), f, p❩ = ↑{A}❨k, f, 𝗺◗p❩.
+// qed.
+
+lemma lift_L_sn (A) (k) (p) (f):
+      ↑❨(λg,p. k g (𝗟◗p)), ⫯f, p❩ = ↑{A}❨k, f, 𝗟◗p❩.
+// qed.
+
+lemma lift_A_sn (A) (k) (p) (f):
+      ↑❨(λg,p. k g (𝗔◗p)), f, p❩ = ↑{A}❨k, f, 𝗔◗p❩.
+// qed.
+
+lemma lift_S_sn (A) (k) (p) (f):
+      ↑❨(λg,p. k g (𝗦◗p)), f, p❩ = ↑{A}❨k, f, 𝗦◗p❩.
+// qed.
+
+(* Basic constructions with proj_path ***************************************)
+
+lemma lift_path_empty (f):
+      (𝐞) = ↑[f]𝐞.
+// qed.
+
+(* Basic constructions with proj_rmap ***************************************)
+
+lemma lift_rmap_empty (f):
+      f = ↑[𝐞]f.
+// qed.
+
+lemma lift_rmap_d_sn (f) (p) (n):
+      ↑[p]𝐢 = ↑[𝗱n◗p]f.
+// qed.
+
+lemma lift_rmap_m_sn (f) (p):
+      ↑[p]f = ↑[𝗺◗p]f.
+// qed.
+
+lemma lift_rmap_L_sn (f) (p):
+      ↑[p](⫯f) = ↑[𝗟◗p]f.
+// qed.
+
+lemma lift_rmap_A_sn (f) (p):
+      ↑[p]f = ↑[𝗔◗p]f.
+// qed.
+
+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 //
+[ <lift_rmap_d_sn <lift_rmap_d_sn //
+| <lift_rmap_m_sn <lift_rmap_m_sn //
+| <lift_rmap_A_sn <lift_rmap_A_sn //
+| <lift_rmap_S_sn <lift_rmap_S_sn //
+]
+qed.
+
+(* Advanced constructions with proj_rmap and path_rcons *********************)
+
+lemma lift_rmap_d_dx (f) (p) (n):
+      (𝐢) = ↑[p◖𝗱n]f.
+// qed.
+
+lemma lift_rmap_m_dx (f) (p):
+      ↑[p]f = ↑[p◖𝗺]f.
+// qed.
+
+lemma lift_rmap_L_dx (f) (p):
+      (⫯↑[p]f) = ↑[p◖𝗟]f.
+// qed.
+
+lemma lift_rmap_A_dx (f) (p):
+      ↑[p]f = ↑[p◖𝗔]f.
+// qed.
+
+lemma lift_rmap_S_dx (f) (p):
+      ↑[p]f = ↑[p◖𝗦]f.
+// qed.
+
+lemma lift_rmap_pap_d_dx (f) (p) (n) (m):
+      m = ↑[p◖𝗱n]f@⧣❨m❩.
+// qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_constructors.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_constructors.etc
new file mode 100644 (file)
index 0000000..4eeb2ab
--- /dev/null
@@ -0,0 +1,47 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift_prototerm_eq.ma".
+include "delayed_updating/substitution/lift_path_uni.ma".
+include "delayed_updating/syntax/prototerm_constructors.ma".
+
+(* LIFT FOR PROTOTERM *******************************************************)
+
+lemma lift_iref_bi (t1) (t2) (n):
+      t1 ⇔ t2 → 𝛗n.t1 ⇔ 𝛗n.t2.
+/2 width=1 by subset_equivalence_ext_f1_bi/
+qed.
+
+lemma lift_iref_sn (f) (t:prototerm) (n:pnat):
+      (𝛗f@⧣❨n❩.t) ⊆ ↑[f](𝛗n.t).
+#f #t #n #p * #q #Hq #H0 destruct
+@(ex2_intro … (𝗱n◗𝗺◗q))
+/2 width=1 by in_comp_iref/
+qed-.
+
+lemma lift_iref_dx (f) (t) (n:pnat):
+      ↑[f](𝛗n.t) ⊆ 𝛗f@⧣❨n❩.t.
+#f #t #n #p * #q #Hq #H0 destruct
+elim (in_comp_inv_iref … Hq) -Hq #p #H0 #Hp destruct
+/2 width=1 by in_comp_iref/
+qed-.
+
+lemma lift_iref (f) (t) (n:pnat):
+      (𝛗f@⧣❨n❩.t) ⇔ ↑[f](𝛗n.t).
+/3 width=1 by conj, lift_iref_sn, lift_iref_dx/
+qed.
+
+lemma lift_iref_uni (t) (m) (n):
+      (𝛗(n+m).t) ⇔ ↑[𝐮❨m❩](𝛗n.t).
+// qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_eq.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_eq.etc
new file mode 100644 (file)
index 0000000..f6759bd
--- /dev/null
@@ -0,0 +1,164 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift.ma".
+include "ground/relocation/tr_pap_eq.ma".
+include "ground/relocation/tr_pn_eq.ma".
+
+(* LIFT FOR PATH ************************************************************)
+
+definition lift_exteq (A): relation2 (lift_continuation A) (lift_continuation A) ≝
+           λk1,k2. ∀f1,f2,p. f1 ≗ f2 → k1 f1 p = k2 f2 p.
+
+interpretation
+  "extensional equivalence (lift continuation)"
+  'RingEq A k1 k2 = (lift_exteq A k1 k2).
+
+(* Constructions with lift_exteq ********************************************)
+
+lemma lift_eq_repl (A) (p) (k1) (k2):
+      k1 ≗{A} k2 → stream_eq_repl … (λf1,f2. ↑❨k1, f1, p❩ = ↑❨k2, f2, p❩).
+#A #p elim p -p [| * [ #n ] #q #IH ]
+#k1 #k2 #Hk #f1 #f2 #Hf
+[ <lift_empty <lift_empty /2 width=1 by/
+| <lift_d_sn <lift_d_sn <(tr_pap_eq_repl … Hf)
+  /3 width=1 by stream_eq_refl/
+| /3 width=1 by/
+| /3 width=1 by tr_push_eq_repl/
+| /3 width=1 by/
+| /3 width=1 by/
+]
+qed-.
+
+(* Advanced constructions ***************************************************)
+
+lemma lift_lcons_alt (A) (k) (f) (p) (l): k ≗ k →
+      ↑❨λg,p2. k g (l◗p2), f, p❩ = ↑{A}❨λg,p2. k g ((l◗𝐞)●p2), f, p❩.
+#A #k #f #p #l #Hk
+@lift_eq_repl // #g1 #g2 #p2 #Hg @Hk -Hk // (**) (* auto fail *)
+qed.
+
+lemma lift_append_rcons_sn (A) (k) (f) (p1) (p) (l): k ≗ k →
+      ↑❨λg,p2. k g (p1●l◗p2), f, p❩ = ↑{A}❨λg,p2. k g (p1◖l●p2), f, p❩.
+#A #k #f #p1 #p #l #Hk
+@lift_eq_repl // #g1 #g2 #p2 #Hg
+<list_append_rcons_sn @Hk -Hk // (**) (* auto fail *)
+qed.
+
+(* Advanced constructions with proj_path ************************************)
+
+lemma proj_path_proper:
+      proj_path ≗ proj_path.
+// qed.
+
+lemma lift_path_eq_repl (p):
+      stream_eq_repl … (λf1,f2. ↑[f1]p = ↑[f2]p).
+/2 width=1 by lift_eq_repl/ qed.
+
+lemma lift_path_append_sn (p) (f) (q):
+      q●↑[f]p = ↑❨(λg,p. proj_path g (q●p)), f, p❩.
+#p elim p -p // * [ #n ] #p #IH #f #q
+[ <lift_d_sn <lift_d_sn
+| <lift_m_sn <lift_m_sn
+| <lift_L_sn <lift_L_sn
+| <lift_A_sn <lift_A_sn
+| <lift_S_sn <lift_S_sn
+] 
+>lift_lcons_alt // >lift_append_rcons_sn //
+<IH <IH -IH <list_append_rcons_sn //
+qed.
+
+lemma lift_path_lcons (f) (p) (l):
+      l◗↑[f]p = ↑❨(λg,p. proj_path g (l◗p)), f, p❩.
+#f #p #l
+>lift_lcons_alt <lift_path_append_sn //
+qed.
+
+lemma lift_path_d_sn (f) (p) (n):
+      (𝗱(f@⧣❨n❩)◗↑[𝐢]p) = ↑[f](𝗱n◗p).
+// qed.
+
+lemma lift_path_m_sn (f) (p):
+      (𝗺◗↑[f]p) = ↑[f](𝗺◗p).
+// qed.
+
+lemma lift_path_L_sn (f) (p):
+      (𝗟◗↑[⫯f]p) = ↑[f](𝗟◗p).
+// qed.
+
+lemma lift_path_A_sn (f) (p):
+      (𝗔◗↑[f]p) = ↑[f](𝗔◗p).
+// qed.
+
+lemma lift_path_S_sn (f) (p):
+      (𝗦◗↑[f]p) = ↑[f](𝗦◗p).
+// qed.
+
+lemma lift_path_id (p):
+      p = ↑[𝐢]p.
+#p elim p -p //
+* [ #n ] #p #IH //
+[ <lift_path_d_sn //
+| <lift_path_L_sn //
+]
+qed.
+
+lemma lift_path_append (p2) (p1) (f):
+      (↑[f]p1)●(↑[↑[p1]f]p2) = ↑[f](p1●p2).
+#p2 #p1 elim p1 -p1 //
+* [ #n1 ] #p1 #IH #f
+[ <lift_path_d_sn <lift_path_d_sn <IH //
+| <lift_path_m_sn <lift_path_m_sn <IH //
+| <lift_path_L_sn <lift_path_L_sn <IH //
+| <lift_path_A_sn <lift_path_A_sn <IH //
+| <lift_path_S_sn <lift_path_S_sn <IH //
+]
+qed.
+
+lemma lift_path_d_dx (n) (p) (f):
+      (↑[f]p)◖𝗱((↑[p]f)@⧣❨n❩) = ↑[f](p◖𝗱n).
+#n #p #f <lift_path_append //
+qed.
+
+lemma lift_path_m_dx (p) (f):
+      (↑[f]p)◖𝗺 = ↑[f](p◖𝗺).
+#p #f <lift_path_append //
+qed.
+
+lemma lift_path_L_dx (p) (f):
+      (↑[f]p)◖𝗟 = ↑[f](p◖𝗟).
+#p #f <lift_path_append //
+qed.
+
+lemma lift_path_A_dx (p) (f):
+      (↑[f]p)◖𝗔 = ↑[f](p◖𝗔).
+#p #f <lift_path_append //
+qed.
+
+lemma lift_path_S_dx (p) (f):
+      (↑[f]p)◖𝗦 = ↑[f](p◖𝗦).
+#p #f <lift_path_append //
+qed.
+
+(* COMMENT 
+
+(* Advanced constructions with proj_rmap and stream_tls *********************)
+
+lemma lift_rmap_tls_d_dx (f) (p) (m) (n):
+      ⇂*[m+n]↑[p]f ≗ ⇂*[m]↑[p◖𝗱n]f.
+#f #p #m #n
+<lift_rmap_d_dx >nrplus_inj_dx
+/2 width=1 by tr_tls_compose_uni_dx/
+qed.
+*)
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_after.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_after.etc
new file mode 100644 (file)
index 0000000..938d215
--- /dev/null
@@ -0,0 +1,28 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift_eq.ma".
+include "ground/relocation/tr_compose_pap.ma".
+include "ground/relocation/tr_compose_pn.ma".
+
+(* LIFT FOR PATH ************************************************************)
+
+(* Constructions with tr_after **********************************************)
+
+lemma lift_path_after (p) (f1) (f2):
+      ↑[f2]↑[f1]p = ↑[f2∘f1]p.
+#p elim p -p [| * ] // #p #IH #f1 #f2
+<lift_path_L_sn <lift_path_L_sn <lift_path_L_sn
+>tr_compose_push_bi //
+qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_proper.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_proper.etc
new file mode 100644 (file)
index 0000000..0eef978
--- /dev/null
@@ -0,0 +1,42 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift_eq.ma".
+include "delayed_updating/syntax/path_proper.ma".
+
+(* LIFT FOR PATH ************************************************************)
+
+(* Constructions with proper condition for path *****************************)
+
+lemma lift_path_proper (f) (p):
+      p ϵ 𝐏 → ↑[f]p ϵ 𝐏.
+#f *
+[ #H0 elim (ppc_inv_empty … H0)
+| * [ #n ] #p #_
+  [ <lift_path_d_sn /2 width=3 by ppc_lcons/
+  | <lift_path_m_sn /2 width=3 by ppc_lcons/
+  | <lift_path_L_sn /2 width=3 by ppc_lcons/
+  | <lift_path_A_sn /2 width=3 by ppc_lcons/
+  | <lift_path_S_sn /2 width=3 by ppc_lcons/
+  ]
+]
+qed.
+
+(* Inversions with proper condition for path ********************************)
+
+lemma lift_path_inv_proper (f) (p):
+      ↑[f]p ϵ 𝐏 → p ϵ 𝐏.
+#f * //
+#H0 elim (ppc_inv_empty … H0)
+qed-.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_uni.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_path_uni.etc
new file mode 100644 (file)
index 0000000..9a62cb2
--- /dev/null
@@ -0,0 +1,24 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift_eq.ma".
+include "ground/relocation/tr_uni_pap.ma".
+
+(* LIFT FOR PATH ************************************************************)
+
+(* Constructions with tr_uni ************************************************)
+
+lemma lift_path_d_sn_uni (p) (m) (n):
+      (𝗱(n+m)◗p) = ↑[𝐮❨m❩](𝗱(n)◗p).
+// qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm.etc
new file mode 100644 (file)
index 0000000..6555b5d
--- /dev/null
@@ -0,0 +1,30 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift.ma".
+include "delayed_updating/syntax/prototerm.ma".
+include "ground/lib/subset_ext.ma".
+
+(* LIFT FOR PROTOTERM *******************************************************)
+
+interpretation
+  "lift (prototerm)"
+  'UpArrow f t = (subset_ext_f1 ? ? (lift_gen ? proj_path f) t).
+
+(* Basic constructions ******************************************************)
+
+lemma in_comp_lift_bi (f) (p) (t):
+      p ϵ t → ↑[f]p ϵ ↑[f]t.
+/2 width=1 by subset_in_ext_f1_dx/
+qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm_eq.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm_eq.etc
new file mode 100644 (file)
index 0000000..0b3ba39
--- /dev/null
@@ -0,0 +1,57 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "ground/lib/subset_ext_equivalence.ma".
+include "delayed_updating/substitution/lift_path_after.ma".
+include "delayed_updating/substitution/lift_prototerm.ma".
+
+(* LIFT FOR PROTOTERM *******************************************************)
+
+(* Constructions with subset_equivalence ************************************)
+
+lemma lift_term_eq_repl_sn (f1) (f2) (t):
+      f1 ≗ f2 → ↑[f1]t ⇔ ↑[f2]t.
+/3 width=1 by subset_equivalence_ext_f1_exteq, lift_path_eq_repl/
+qed.
+
+lemma lift_term_eq_repl_dx (f) (t1) (t2):
+      t1 ⇔ t2 → ↑[f]t1 ⇔ ↑[f]t2.
+/2 width=1 by subset_equivalence_ext_f1_bi/
+qed.
+
+lemma lift_term_after (f1) (f2) (t):
+      ↑[f2]↑[f1]t ⇔ ↑[f2∘f1]t.
+#f1 #f2 #t @subset_eq_trans
+[
+| @subset_inclusion_ext_f1_compose
+| @subset_equivalence_ext_f1_exteq /2 width=5/
+]
+qed.
+
+lemma lift_term_id_sn (t):
+      t ⊆ ↑[𝐢]t.
+#t #p #Hp
+>(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_i/lift_prototerm_proper.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_i/lift_prototerm_proper.etc
new file mode 100644 (file)
index 0000000..a9b1621
--- /dev/null
@@ -0,0 +1,36 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift_prototerm.ma".
+include "delayed_updating/substitution/lift_path_proper.ma".
+include "delayed_updating/syntax/prototerm_proper.ma".
+
+(* LIFT FOR PROTOTERM *******************************************************)
+
+(* Constructions with proper condition for path *****************************)
+
+lemma lift_term_proper (f) (t):
+      t ϵ 𝐏 → ↑[f]t ϵ 𝐏.
+#f #t #Ht #p * #q #Hq #H0 destruct
+@lift_path_proper @Ht -Ht // (**) (* auto fails *)
+qed.
+
+(* Inversions with proper condition for path ********************************)
+
+lemma lift_term_inv_proper (f) (t):
+      ↑[f]t ϵ 𝐏 → t ϵ 𝐏.
+#f #t #Ht #p #Hp
+@(lift_path_inv_proper f)
+@Ht -Ht @in_comp_lift_bi // (**) (* auto fails *)
+qed-.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift.etc
deleted file mode 100644 (file)
index b873ed3..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-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".
-
-(* LIFT FOR PATH ************************************************************)
-
-definition lift_continuation (A:Type[0]) ≝
-           tr_map → path → A.
-
-rec definition lift_gen (A:Type[0]) (k:lift_continuation A) (f) (p) on p ≝
-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_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
-  | label_S   ⇒ lift_gen (A) (λg,p. k g (𝗦◗p)) f q
-  ]
-].
-
-interpretation
-  "lift (gneric)"
-  'UpArrow A k f p = (lift_gen A k f p).
-
-definition proj_path: lift_continuation … ≝
-           λf,p.p.
-
-definition proj_rmap: lift_continuation … ≝
-           λf,p.f.
-
-interpretation
-  "lift (path)"
-  'UpArrow f p = (lift_gen ? proj_path f p).
-
-interpretation
-  "lift (relocation map)"
-  'UpArrow p f = (lift_gen ? proj_rmap f p).
-
-(* Basic constructions ******************************************************)
-
-lemma lift_empty (A) (k) (f):
-      k f (𝐞) = ↑{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❩.
-// qed.
-
-lemma lift_m_sn (A) (k) (p) (f):
-      ↑❨(λg,p. k g (𝗺◗p)), f, p❩ = ↑{A}❨k, f, 𝗺◗p❩.
-// qed.
-
-lemma lift_L_sn (A) (k) (p) (f):
-      ↑❨(λg,p. k g (𝗟◗p)), ⫯f, p❩ = ↑{A}❨k, f, 𝗟◗p❩.
-// qed.
-
-lemma lift_A_sn (A) (k) (p) (f):
-      ↑❨(λg,p. k g (𝗔◗p)), f, p❩ = ↑{A}❨k, f, 𝗔◗p❩.
-// qed.
-
-lemma lift_S_sn (A) (k) (p) (f):
-      ↑❨(λg,p. k g (𝗦◗p)), f, p❩ = ↑{A}❨k, f, 𝗦◗p❩.
-// qed.
-
-(* Basic constructions with proj_path ***************************************)
-
-lemma lift_path_empty (f):
-      (𝐞) = ↑[f]𝐞.
-// qed.
-
-(* Basic constructions with proj_rmap ***************************************)
-
-lemma lift_rmap_empty (f):
-      f = ↑[𝐞]f.
-// qed.
-
-lemma lift_rmap_d_sn (f) (p) (n):
-      ↑[p](⇂*[ninj n]f) = ↑[𝗱n◗p]f.
-// qed.
-
-lemma lift_rmap_m_sn (f) (p):
-      ↑[p]f = ↑[𝗺◗p]f.
-// qed.
-
-lemma lift_rmap_L_sn (f) (p):
-      ↑[p](⫯f) = ↑[𝗟◗p]f.
-// qed.
-
-lemma lift_rmap_A_sn (f) (p):
-      ↑[p]f = ↑[𝗔◗p]f.
-// qed.
-
-lemma lift_rmap_S_sn (f) (p):
-      ↑[p]f = ↑[𝗦◗p]f.
-// 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 //
-[ <lift_rmap_m_sn <lift_rmap_m_sn //
-| <lift_rmap_A_sn <lift_rmap_A_sn //
-| <lift_rmap_S_sn <lift_rmap_S_sn //
-]
-qed.
-
-(* Advanced constructions with proj_rmap and path_rcons *********************)
-
-lemma lift_rmap_d_dx (f) (p) (n):
-      ⇂*[ninj n](↑[p]f) = ↑[p◖𝗱n]f.
-// qed.
-
-lemma lift_rmap_m_dx (f) (p):
-      ↑[p]f = ↑[p◖𝗺]f.
-// qed.
-
-lemma lift_rmap_L_dx (f) (p):
-      (⫯↑[p]f) = ↑[p◖𝗟]f.
-// qed.
-
-lemma lift_rmap_A_dx (f) (p):
-      ↑[p]f = ↑[p◖𝗔]f.
-// qed.
-
-lemma lift_rmap_S_dx (f) (p):
-      ↑[p]f = ↑[p◖𝗦]f.
-// qed.
-
-lemma lift_rmap_pap_d_dx (f) (p) (n) (m):
-      ↑[p]f@⧣❨m+n❩ = ↑[p◖𝗱n]f@⧣❨m❩+↑[p]f@⧣❨n❩.
-// qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_constructors.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_constructors.etc
deleted file mode 100644 (file)
index 1cdcd46..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift_prototerm_id.ma".
-include "delayed_updating/substitution/lift_path_uni.ma".
-include "delayed_updating/syntax/prototerm_constructors.ma".
-
-(* LIFT FOR PROTOTERM *******************************************************)
-
-lemma lift_iref_bi (t1) (t2) (n):
-      t1 ⇔ t2 → 𝛗n.t1 ⇔ 𝛗n.t2.
-/2 width=1 by subset_equivalence_ext_f1_bi/
-qed.
-
-lemma lift_iref_sn (f) (t:prototerm) (n:pnat):
-      (𝛗f@⧣❨n❩.↑[⇂*[n]f]t) ⊆ ↑[f](𝛗n.t).
-#f #t #n #p * #q * #r #Hr #H1 #H2 destruct
-@(ex2_intro … (𝗱n◗𝗺◗r))
-/2 width=1 by in_comp_iref/
-qed-.
-
-lemma lift_iref_dx (f) (t) (n:pnat):
-      ↑[f](𝛗n.t) ⊆ 𝛗f@⧣❨n❩.↑[⇂*[n]f]t.
-#f #t #n #p * #q #Hq #H0 destruct
-elim (in_comp_inv_iref … Hq) -Hq #p #H0 #Hp destruct
-/3 width=1 by in_comp_iref, in_comp_lift_bi/
-qed-.
-
-lemma lift_iref (f) (t) (n:pnat):
-      (𝛗f@⧣❨n❩.↑[⇂*[n]f]t) ⇔ ↑[f](𝛗n.t).
-/3 width=1 by conj, lift_iref_sn, lift_iref_dx/
-qed.
-
-lemma lift_iref_uni (t) (m) (n):
-      (𝛗(n+m).t) ⇔ ↑[𝐮❨m❩](𝛗n.t).
-#t #m #n
-@(subset_eq_trans … (lift_iref …))
-<tr_uni_pap >nsucc_pnpred <tr_tls_succ_uni
-/3 width=1 by lift_iref_bi, lift_term_id/
-qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_eq.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_eq.etc
deleted file mode 100644 (file)
index 9c4b0f3..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift.ma".
-include "ground/relocation/tr_pap_eq.ma".
-include "ground/relocation/tr_pn_eq.ma".
-include "ground/lib/stream_tls_eq.ma".
-
-(* LIFT FOR PATH ************************************************************)
-
-definition lift_exteq (A): relation2 (lift_continuation A) (lift_continuation A) ≝
-           λk1,k2. ∀f1,f2,p. f1 ≗ f2 → k1 f1 p = k2 f2 p.
-
-interpretation
-  "extensional equivalence (lift continuation)"
-  'RingEq A k1 k2 = (lift_exteq A k1 k2).
-
-(* Constructions with lift_exteq ********************************************)
-
-lemma lift_eq_repl (A) (p) (k1) (k2):
-      k1 ≗{A} k2 → stream_eq_repl … (λf1,f2. ↑❨k1, f1, p❩ = ↑❨k2, f2, p❩).
-#A #p elim p -p [| * [ #n ] #q #IH ]
-#k1 #k2 #Hk #f1 #f2 #Hf
-[ <lift_empty <lift_empty /2 width=1 by/
-| <lift_d_sn <lift_d_sn <(tr_pap_eq_repl … Hf)
-  /3 width=3 by stream_tls_eq_repl, compose_repl_fwd_sn/
-| /3 width=1 by/
-| /3 width=1 by tr_push_eq_repl/
-| /3 width=1 by/
-| /3 width=1 by/
-]
-qed-.
-
-(* Advanced constructions ***************************************************)
-
-lemma lift_lcons_alt (A) (k) (f) (p) (l): k ≗ k →
-      ↑❨λg,p2. k g (l◗p2), f, p❩ = ↑{A}❨λg,p2. k g ((l◗𝐞)●p2), f, p❩.
-#A #k #f #p #l #Hk
-@lift_eq_repl // #g1 #g2 #p2 #Hg @Hk -Hk // (**) (* auto fail *)
-qed.
-
-lemma lift_append_rcons_sn (A) (k) (f) (p1) (p) (l): k ≗ k →
-      ↑❨λg,p2. k g (p1●l◗p2), f, p❩ = ↑{A}❨λg,p2. k g (p1◖l●p2), f, p❩.
-#A #k #f #p1 #p #l #Hk
-@lift_eq_repl // #g1 #g2 #p2 #Hg
-<list_append_rcons_sn @Hk -Hk // (**) (* auto fail *)
-qed.
-
-(* Advanced constructions with proj_path ************************************)
-
-lemma proj_path_proper:
-      proj_path ≗ proj_path.
-// qed.
-
-lemma lift_path_eq_repl (p):
-      stream_eq_repl … (λf1,f2. ↑[f1]p = ↑[f2]p).
-/2 width=1 by lift_eq_repl/ qed.
-
-lemma lift_path_append_sn (p) (f) (q):
-      q●↑[f]p = ↑❨(λg,p. proj_path g (q●p)), f, p❩.
-#p elim p -p // * [ #n ] #p #IH #f #q
-[ <lift_d_sn <lift_d_sn
-| <lift_m_sn <lift_m_sn
-| <lift_L_sn <lift_L_sn
-| <lift_A_sn <lift_A_sn
-| <lift_S_sn <lift_S_sn
-] 
->lift_lcons_alt // >lift_append_rcons_sn //
-<IH <IH -IH <list_append_rcons_sn //
-qed.
-
-lemma lift_path_lcons (f) (p) (l):
-      l◗↑[f]p = ↑❨(λg,p. proj_path g (l◗p)), f, p❩.
-#f #p #l
->lift_lcons_alt <lift_path_append_sn //
-qed.
-
-lemma lift_path_d_sn (f) (p) (n):
-      (𝗱(f@⧣❨n❩)◗↑[⇂*[n]f]p) = ↑[f](𝗱n◗p).
-// qed.
-
-lemma lift_path_m_sn (f) (p):
-      (𝗺◗↑[f]p) = ↑[f](𝗺◗p).
-// qed.
-
-lemma lift_path_L_sn (f) (p):
-      (𝗟◗↑[⫯f]p) = ↑[f](𝗟◗p).
-// qed.
-
-lemma lift_path_A_sn (f) (p):
-      (𝗔◗↑[f]p) = ↑[f](𝗔◗p).
-// qed.
-
-lemma lift_path_S_sn (f) (p):
-      (𝗦◗↑[f]p) = ↑[f](𝗦◗p).
-// qed.
-
-lemma lift_path_append (p2) (p1) (f):
-      (↑[f]p1)●(↑[↑[p1]f]p2) = ↑[f](p1●p2).
-#p2 #p1 elim p1 -p1 //
-* [ #n1 ] #p1 #IH #f
-[ <lift_path_d_sn <lift_path_d_sn <IH //
-| <lift_path_m_sn <lift_path_m_sn <IH //
-| <lift_path_L_sn <lift_path_L_sn <IH //
-| <lift_path_A_sn <lift_path_A_sn <IH //
-| <lift_path_S_sn <lift_path_S_sn <IH //
-]
-qed.
-
-lemma lift_path_d_dx (f) (p) (n):
-      (↑[f]p)◖𝗱((↑[p]f)@⧣❨n❩) = ↑[f](p◖𝗱n).
-#f #p #n <lift_path_append //
-qed.
-
-lemma lift_path_m_dx (f) (p):
-      (↑[f]p)◖𝗺 = ↑[f](p◖𝗺).
-#f #p <lift_path_append //
-qed.
-
-lemma lift_path_L_dx (f) (p):
-      (↑[f]p)◖𝗟 = ↑[f](p◖𝗟).
-#f #p <lift_path_append //
-qed.
-
-lemma lift_path_A_dx (f) (p):
-      (↑[f]p)◖𝗔 = ↑[f](p◖𝗔).
-#f #p <lift_path_append //
-qed.
-
-lemma lift_path_S_dx (f) (p):
-      (↑[f]p)◖𝗦 = ↑[f](p◖𝗦).
-#f #p <lift_path_append //
-qed.
-
-(* COMMENT 
-
-(* Advanced constructions with proj_rmap and stream_tls *********************)
-
-lemma lift_rmap_tls_d_dx (f) (p) (m) (n):
-      ⇂*[m+n]↑[p]f ≗ ⇂*[m]↑[p◖𝗱n]f.
-#f #p #m #n
-<lift_rmap_d_dx >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_k/lift_path_after.etc
deleted file mode 100644 (file)
index 869d680..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-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 ************************************************************)
-
-(* Constructions with tr_after **********************************************)
-
-lemma lift_path_after (p) (f1) (f2):
-      ↑[f2]↑[f1]p = ↑[f2∘f1]p.
-#p elim p -p [| * ] // [ #n ] #p #IH #f1 #f2
-[ <lift_path_d_sn <lift_path_d_sn <lift_path_d_sn //
-| <lift_path_L_sn <lift_path_L_sn <lift_path_L_sn
-  >tr_compose_push_bi //
-]
-qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_id.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_path_id.etc
deleted file mode 100644 (file)
index 1966c25..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift_eq.ma".
-include "ground/relocation/tr_id_pap.ma".
-include "ground/relocation/tr_id_tls.ma".
-
-(* LIFT FOR PATH ************************************************************)
-
-(* Constructions with tr_id *************************************************)
-
-lemma lift_path_id (p):
-      p = ↑[𝐢]p.
-#p elim p -p //
-* [ #n ] #p #IH //
-[ <lift_path_d_sn //
-| <lift_path_L_sn //
-]
-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_k/lift_path_proper.etc
deleted file mode 100644 (file)
index 0eef978..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift_eq.ma".
-include "delayed_updating/syntax/path_proper.ma".
-
-(* LIFT FOR PATH ************************************************************)
-
-(* Constructions with proper condition for path *****************************)
-
-lemma lift_path_proper (f) (p):
-      p ϵ 𝐏 → ↑[f]p ϵ 𝐏.
-#f *
-[ #H0 elim (ppc_inv_empty … H0)
-| * [ #n ] #p #_
-  [ <lift_path_d_sn /2 width=3 by ppc_lcons/
-  | <lift_path_m_sn /2 width=3 by ppc_lcons/
-  | <lift_path_L_sn /2 width=3 by ppc_lcons/
-  | <lift_path_A_sn /2 width=3 by ppc_lcons/
-  | <lift_path_S_sn /2 width=3 by ppc_lcons/
-  ]
-]
-qed.
-
-(* Inversions with proper condition for path ********************************)
-
-lemma lift_path_inv_proper (f) (p):
-      ↑[f]p ϵ 𝐏 → p ϵ 𝐏.
-#f * //
-#H0 elim (ppc_inv_empty … H0)
-qed-.
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_k/lift_path_uni.etc
deleted file mode 100644 (file)
index f68010b..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift_path_id.ma".
-include "ground/relocation/tr_uni_pap.ma".
-include "ground/relocation/tr_uni_tls.ma".
-
-(* LIFT FOR PATH ************************************************************)
-
-(* Constructions with tr_uni ************************************************)
-
-lemma lift_path_d_sn_uni (p) (m) (n):
-      (𝗱(n+m)◗p) = ↑[𝐮❨m❩](𝗱(n)◗p).
-#p #m #n
-<lift_path_d_sn <tr_uni_pap >nsucc_pnpred
-<tr_tls_succ_uni //
-qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm.etc
deleted file mode 100644 (file)
index 6555b5d..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift.ma".
-include "delayed_updating/syntax/prototerm.ma".
-include "ground/lib/subset_ext.ma".
-
-(* LIFT FOR PROTOTERM *******************************************************)
-
-interpretation
-  "lift (prototerm)"
-  'UpArrow f t = (subset_ext_f1 ? ? (lift_gen ? proj_path f) t).
-
-(* Basic constructions ******************************************************)
-
-lemma in_comp_lift_bi (f) (p) (t):
-      p ϵ t → ↑[f]p ϵ ↑[f]t.
-/2 width=1 by subset_in_ext_f1_dx/
-qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_eq.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_eq.etc
deleted file mode 100644 (file)
index 920a16c..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "ground/lib/subset_ext_equivalence.ma".
-include "delayed_updating/substitution/lift_path_after.ma".
-include "delayed_updating/substitution/lift_prototerm.ma".
-
-(* LIFT FOR PROTOTERM *******************************************************)
-
-(* Constructions with subset_equivalence ************************************)
-
-lemma lift_term_eq_repl_sn (f1) (f2) (t):
-      f1 ≗ f2 → ↑[f1]t ⇔ ↑[f2]t.
-/3 width=1 by subset_equivalence_ext_f1_exteq, lift_path_eq_repl/
-qed.
-
-lemma lift_term_eq_repl_dx (f) (t1) (t2):
-      t1 ⇔ t2 → ↑[f]t1 ⇔ ↑[f]t2.
-/2 width=1 by subset_equivalence_ext_f1_bi/
-qed.
-
-lemma lift_term_after (f1) (f2) (t):
-      ↑[f2]↑[f1]t ⇔ ↑[f2∘f1]t.
-#f1 #f2 #t @subset_eq_trans
-[
-| @subset_inclusion_ext_f1_compose
-| @subset_equivalence_ext_f1_exteq /2 width=5/
-]
-qed.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_id.etc b/matita/matita/contribs/lambdadelta/delayed_updating/etc/lift_k/lift_prototerm_id.etc
deleted file mode 100644 (file)
index b66b63f..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift_prototerm_eq.ma".
-include "delayed_updating/substitution/lift_path_id.ma".
-
-(* LIFT FOR PROTOTERM *******************************************************)
-
-(* Constructions with tr_id *************************************************)
-
-lemma lift_term_id_sn (t):
-      t ⊆ ↑[𝐢]t.
-#t #p #Hp
->(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_k/lift_prototerm_proper.etc
deleted file mode 100644 (file)
index a9b1621..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-include "delayed_updating/substitution/lift_prototerm.ma".
-include "delayed_updating/substitution/lift_path_proper.ma".
-include "delayed_updating/syntax/prototerm_proper.ma".
-
-(* LIFT FOR PROTOTERM *******************************************************)
-
-(* Constructions with proper condition for path *****************************)
-
-lemma lift_term_proper (f) (t):
-      t ϵ 𝐏 → ↑[f]t ϵ 𝐏.
-#f #t #Ht #p * #q #Hq #H0 destruct
-@lift_path_proper @Ht -Ht // (**) (* auto fails *)
-qed.
-
-(* Inversions with proper condition for path ********************************)
-
-lemma lift_term_inv_proper (f) (t):
-      ↑[f]t ϵ 𝐏 → t ϵ 𝐏.
-#f #t #Ht #p #Hp
-@(lift_path_inv_proper f)
-@Ht -Ht @in_comp_lift_bi // (**) (* auto fails *)
-qed-.
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_f_4.ma
deleted file mode 100644 (file)
index c69d6c7..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-(**************************************************************************)
-(*       ___                                                              *)
-(*      ||M||                                                             *)
-(*      ||A||       A project by Andrea Asperti                           *)
-(*      ||T||                                                             *)
-(*      ||I||       Developers:                                           *)
-(*      ||T||         The HELM team.                                      *)
-(*      ||A||         http://helm.cs.unibo.it                             *)
-(*      \   /                                                             *)
-(*       \ /        This file is distributed under the terms of the       *)
-(*        v         GNU General Public License Version 2                  *)
-(*                                                                        *)
-(**************************************************************************)
-
-(* NOTATION FOR DELAYED UPDATING ********************************************)
-
-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 }.
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_if_4.ma b/matita/matita/contribs/lambdadelta/delayed_updating/notation/relations/black_rightarrow_if_4.ma
new file mode 100644 (file)
index 0000000..2b35b91
--- /dev/null
@@ -0,0 +1,19 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+(* NOTATION FOR DELAYED UPDATING ********************************************)
+
+notation "hvbox( t1 ➡𝐢𝐟[ break term 46 p, break term 46 q ] break term 46 t2 )"
+   non associative with precedence 45
+   for @{ 'BlackRightArrowIF $t1 $p $q $t2 }.
index be7f3b3d3d3825973ccb0af6aa5360a0cbb7b7a2..fd5f76b54ba8ff80a7d68ca8f2f9f186112bdba4 100644 (file)
@@ -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 â\9e¡ð\9d\90\9dð\9d\90\9f[p,q] t2 â\86\92 â\96¼[f]t1 â\9e¡ð\9d\90¢ð\9d\90\9f\8a\97p,â\8a\97q] â\96¼[f]t2.
 #f #p #q #t1 #t2 #H0t1
 * #n * #H1n #Ht1 #Ht2
 @(ex_intro … (↑♭q)) @and3_intro
index d25ddc502452773090319fb5a90b97e0b50d20c4..e33b454bed039864ef99debb5b0fe171d4397ee3 100644 (file)
@@ -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
+[ <reverse_rcons <lift_path_d_sn <lift_rmap_d_dx
+  <lift_path_d_dx <reverse_rcons
+  <IH  
+*)
 
 theorem dfr_lift_bi (f) (p) (q) (t1) (t2): (*t1 ϵ 𝐓 → *)
         t1 ➡𝐝𝐟[p,q] t2 → ↑[f]t1 ➡𝐟[↑[f]p,↑[↑[p◖𝗔◖𝗟]f]q] ↑[f]t2.
@@ -36,7 +47,10 @@ theorem dfr_lift_bi (f) (p) (q) (t1) (t2): (*t1 ϵ 𝐓 → *)
 * #n * #H1n #Ht1 #Ht2
 @(ex_intro … ((↑[p●𝗔◗𝗟◗q]f)@⧣❨n❩)) @and3_intro
 [ -Ht1 -Ht2
-  >H1n >path_head_structure_depth <H1n -H1n //
+  <lift_rmap_L_dx >lift_path_L_sn
+  >list_append_rcons_sn in H1n; <reverse_append #H1n
+  <(lift_path_head … H1n) -H1n //
+(*
 | lapply (in_comp_unwind2_path_term f … Ht1) -Ht2 -Ht1 -H0t1
   <unwind2_path_d_dx <depth_structure
   >list_append_rcons_sn in H1n; <reverse_append #H1n
@@ -68,3 +82,4 @@ theorem dfr_lift_bi (f) (p) (q) (t1) (t2): (*t1 ϵ 𝐓 → *)
   ]
 ]
 qed.
+*)
\ No newline at end of file
index 6469bb2a029e641b25501e325d242bdd3868c829..87d855281d53c7a51c69608eee0700a69100ecff 100644 (file)
@@ -17,7 +17,7 @@ include "delayed_updating/substitution/fsubst.ma".
 include "delayed_updating/syntax/prototerm_equivalence.ma".
 include "delayed_updating/syntax/path_head.ma".
 include "delayed_updating/syntax/path_reverse.ma".
-include "delayed_updating/notation/relations/black_rightarrow_f_4.ma".
+include "delayed_updating/notation/relations/black_rightarrow_if_4.ma".
 
 (* IMMEDIATE FOCUSED REDUCTION ************************************************)
 
@@ -30,4 +30,4 @@ definition ifr (p) (q): relation2 prototerm prototerm ≝
 
 interpretation
   "focused reduction with immediate updating (prototerm)"
-  'BlackRightArrowF t1 p q t2 = (ifr p q t1 t2).
+  'BlackRightArrowIF t1 p q t2 = (ifr p q t1 t2).
index 21e4ac27fac27dea7ae8c91a9ed629b509f3d66a..f05d86db3078678331cd649e9abe405996c383b1 100644 (file)
@@ -34,7 +34,7 @@ include "delayed_updating/syntax/path_depth_reverse.ma".
 
 lemma ifr_unwind_bi (f) (p) (q) (t1) (t2):
       t1 ϵ 𝐓 → t1⋔(p◖𝗦) ⧸≬ 𝐈 →
-      t1 â\9e¡ð\9d\90\9f[p,q] t2 â\86\92 â\96¼[f]t1 â\9e¡𝐟[⊗p,⊗q] ▼[f]t2.
+      t1 â\9e¡ð\9d\90¢ð\9d\90\9f[p,q] t2 â\86\92 â\96¼[f]t1 â\9e¡ð\9d\90¢𝐟[⊗p,⊗q] ▼[f]t2.
 #f #p #q #t1 #t2 #H1t1 #H2t1
 * #n * #H1n #Ht1 #Ht2
 @(ex_intro … (↑♭q)) @and3_intro
index 6933e9dbe704b39331ea6d29d503a0254affd711..b873ed3036aca4daadce71579d2edf86aa8dd5a6 100644 (file)
@@ -15,7 +15,8 @@
 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_id_pap.ma".
+include "ground/relocation/tr_uni.ma".
+include "ground/relocation/tr_pap_tls.ma".
 
 (* LIFT FOR PATH ************************************************************)
 
@@ -27,7 +28,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)) (𝐢) q
+  [ label_d n ⇒ lift_gen (A) (λg,p. k g (𝗱(f@⧣❨n❩)◗p)) (⇂*[n]f) 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
@@ -60,7 +61,7 @@ lemma lift_empty (A) (k) (f):
 // qed.
 
 lemma lift_d_sn (A) (k) (p) (n) (f):
-      ↑❨(λg,p. k g (𝗱(f@⧣❨n❩)◗p)), 𝐢, p❩ = ↑{A}❨k, f, 𝗱n◗p❩.
+      ↑❨(λg,p. k g (𝗱(f@⧣❨n❩)◗p)), ⇂*[n]f, p❩ = ↑{A}❨k, f, 𝗱n◗p❩.
 // qed.
 
 lemma lift_m_sn (A) (k) (p) (f):
@@ -92,7 +93,7 @@ lemma lift_rmap_empty (f):
 // qed.
 
 lemma lift_rmap_d_sn (f) (p) (n):
-      ↑[p]𝐢 = ↑[𝗱n◗p]f.
+      ↑[p](⇂*[ninj n]f) = ↑[𝗱n◗p]f.
 // qed.
 
 lemma lift_rmap_m_sn (f) (p):
@@ -111,21 +112,12 @@ 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 //
-[ <lift_rmap_d_sn <lift_rmap_d_sn //
-| <lift_rmap_m_sn <lift_rmap_m_sn //
+[ <lift_rmap_m_sn <lift_rmap_m_sn //
 | <lift_rmap_A_sn <lift_rmap_A_sn //
 | <lift_rmap_S_sn <lift_rmap_S_sn //
 ]
@@ -134,7 +126,7 @@ qed.
 (* Advanced constructions with proj_rmap and path_rcons *********************)
 
 lemma lift_rmap_d_dx (f) (p) (n):
-      (𝐢) = ↑[p◖𝗱n]f.
+      ⇂*[ninj n](↑[p]f) = ↑[p◖𝗱n]f.
 // qed.
 
 lemma lift_rmap_m_dx (f) (p):
@@ -154,5 +146,5 @@ lemma lift_rmap_S_dx (f) (p):
 // qed.
 
 lemma lift_rmap_pap_d_dx (f) (p) (n) (m):
-      m = ↑[p◖𝗱n]f@⧣❨m❩.
+      ↑[p]f@⧣❨m+n❩ = ↑[p◖𝗱n]f@⧣❨m❩+↑[p]f@⧣❨n❩.
 // qed.
index 4eeb2ab6d9eda5930dc40cf7fba5e7b0318e4b59..1cdcd4650d1b990de616a87dd79a2f8e202b818d 100644 (file)
@@ -12,7 +12,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include "delayed_updating/substitution/lift_prototerm_eq.ma".
+include "delayed_updating/substitution/lift_prototerm_id.ma".
 include "delayed_updating/substitution/lift_path_uni.ma".
 include "delayed_updating/syntax/prototerm_constructors.ma".
 
@@ -24,24 +24,28 @@ lemma lift_iref_bi (t1) (t2) (n):
 qed.
 
 lemma lift_iref_sn (f) (t:prototerm) (n:pnat):
-      (𝛗f@⧣❨n❩.t) ⊆ ↑[f](𝛗n.t).
-#f #t #n #p * #q #Hq #H0 destruct
-@(ex2_intro … (𝗱n◗𝗺◗q))
+      (𝛗f@⧣❨n❩.↑[⇂*[n]f]t) ⊆ ↑[f](𝛗n.t).
+#f #t #n #p * #q * #r #Hr #H1 #H2 destruct
+@(ex2_intro … (𝗱n◗𝗺◗r))
 /2 width=1 by in_comp_iref/
 qed-.
 
 lemma lift_iref_dx (f) (t) (n:pnat):
-      ↑[f](𝛗n.t) ⊆ 𝛗f@⧣❨n❩.t.
+      ↑[f](𝛗n.t) ⊆ 𝛗f@⧣❨n❩.↑[⇂*[n]f]t.
 #f #t #n #p * #q #Hq #H0 destruct
 elim (in_comp_inv_iref … Hq) -Hq #p #H0 #Hp destruct
-/2 width=1 by in_comp_iref/
+/3 width=1 by in_comp_iref, in_comp_lift_bi/
 qed-.
 
 lemma lift_iref (f) (t) (n:pnat):
-      (𝛗f@⧣❨n❩.t) ⇔ ↑[f](𝛗n.t).
+      (𝛗f@⧣❨n❩.↑[⇂*[n]f]t) ⇔ ↑[f](𝛗n.t).
 /3 width=1 by conj, lift_iref_sn, lift_iref_dx/
 qed.
 
 lemma lift_iref_uni (t) (m) (n):
       (𝛗(n+m).t) ⇔ ↑[𝐮❨m❩](𝛗n.t).
-// qed.
+#t #m #n
+@(subset_eq_trans … (lift_iref …))
+<tr_uni_pap >nsucc_pnpred <tr_tls_succ_uni
+/3 width=1 by lift_iref_bi, lift_term_id/
+qed.
index f6759bd1e0fd1f7011adc2bd9116177771628903..9c4b0f3b5ac350eba4175d9fc10d603361a96d4f 100644 (file)
@@ -15,6 +15,7 @@
 include "delayed_updating/substitution/lift.ma".
 include "ground/relocation/tr_pap_eq.ma".
 include "ground/relocation/tr_pn_eq.ma".
+include "ground/lib/stream_tls_eq.ma".
 
 (* LIFT FOR PATH ************************************************************)
 
@@ -33,7 +34,7 @@ lemma lift_eq_repl (A) (p) (k1) (k2):
 #k1 #k2 #Hk #f1 #f2 #Hf
 [ <lift_empty <lift_empty /2 width=1 by/
 | <lift_d_sn <lift_d_sn <(tr_pap_eq_repl … Hf)
-  /3 width=1 by stream_eq_refl/
+  /3 width=3 by stream_tls_eq_repl, compose_repl_fwd_sn/
 | /3 width=1 by/
 | /3 width=1 by tr_push_eq_repl/
 | /3 width=1 by/
@@ -86,7 +87,7 @@ lemma lift_path_lcons (f) (p) (l):
 qed.
 
 lemma lift_path_d_sn (f) (p) (n):
-      (𝗱(f@⧣❨n❩)◗↑[𝐢]p) = ↑[f](𝗱n◗p).
+      (𝗱(f@⧣❨n❩)◗↑[⇂*[n]f]p) = ↑[f](𝗱n◗p).
 // qed.
 
 lemma lift_path_m_sn (f) (p):
@@ -105,15 +106,6 @@ lemma lift_path_S_sn (f) (p):
       (𝗦◗↑[f]p) = ↑[f](𝗦◗p).
 // qed.
 
-lemma lift_path_id (p):
-      p = ↑[𝐢]p.
-#p elim p -p //
-* [ #n ] #p #IH //
-[ <lift_path_d_sn //
-| <lift_path_L_sn //
-]
-qed.
-
 lemma lift_path_append (p2) (p1) (f):
       (↑[f]p1)●(↑[↑[p1]f]p2) = ↑[f](p1●p2).
 #p2 #p1 elim p1 -p1 //
@@ -126,29 +118,29 @@ lemma lift_path_append (p2) (p1) (f):
 ]
 qed.
 
-lemma lift_path_d_dx (n) (p) (f):
+lemma lift_path_d_dx (f) (p) (n):
       (↑[f]p)◖𝗱((↑[p]f)@⧣❨n❩) = ↑[f](p◖𝗱n).
-#n #p #f <lift_path_append //
+#f #p #n <lift_path_append //
 qed.
 
-lemma lift_path_m_dx (p) (f):
+lemma lift_path_m_dx (f) (p):
       (↑[f]p)◖𝗺 = ↑[f](p◖𝗺).
-#p #f <lift_path_append //
+#f #p <lift_path_append //
 qed.
 
-lemma lift_path_L_dx (p) (f):
+lemma lift_path_L_dx (f) (p):
       (↑[f]p)◖𝗟 = ↑[f](p◖𝗟).
-#p #f <lift_path_append //
+#f #p <lift_path_append //
 qed.
 
-lemma lift_path_A_dx (p) (f):
+lemma lift_path_A_dx (f) (p):
       (↑[f]p)◖𝗔 = ↑[f](p◖𝗔).
-#p #f <lift_path_append //
+#f #p <lift_path_append //
 qed.
 
-lemma lift_path_S_dx (p) (f):
+lemma lift_path_S_dx (f) (p):
       (↑[f]p)◖𝗦 = ↑[f](p◖𝗦).
-#p #f <lift_path_append //
+#f #p <lift_path_append //
 qed.
 
 (* COMMENT 
@@ -161,4 +153,5 @@ lemma lift_rmap_tls_d_dx (f) (p) (m) (n):
 <lift_rmap_d_dx >nrplus_inj_dx
 /2 width=1 by tr_tls_compose_uni_dx/
 qed.
+
 *)
index 938d2153443f3e300f6279ceb70673eccee8bfee..869d680fef6a2cec94700f90aef49d9fb4587787 100644 (file)
@@ -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
-<lift_path_L_sn <lift_path_L_sn <lift_path_L_sn
->tr_compose_push_bi //
+#p elim p -p [| * ] // [ #n ] #p #IH #f1 #f2
+[ <lift_path_d_sn <lift_path_d_sn <lift_path_d_sn //
+| <lift_path_L_sn <lift_path_L_sn <lift_path_L_sn
+  >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 (file)
index 0000000..126b691
--- /dev/null
@@ -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
+  <path_head_zero //
+| #p #l #IH #q #n @(nat_ind_succ …n) -n [| #m #_ ]
+  [ <reverse_rcons <path_head_zero #H0 destruct
+  | cases l [ #n ]
+    [ <reverse_rcons <path_head_d_sn #H0
+      elim (eq_inv_list_lcons_bi ????? H0) -H0 #_ #H0
+      <list_append_assoc <lift_rmap_d_dx <lift_path_d_dx <reverse_rcons
+      <tr_xap_succ_pos <path_head_d_sn >tr_xap_succ_pos
+      <lift_path_d_dx >lift_rmap_append <reverse_rcons  
+      @eq_f2 // <(IH … H0) -IH -H0
+      @eq_f2 // <tr_xap_plus //
diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_id.ma b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_path_id.ma
new file mode 100644 (file)
index 0000000..1966c25
--- /dev/null
@@ -0,0 +1,30 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift_eq.ma".
+include "ground/relocation/tr_id_pap.ma".
+include "ground/relocation/tr_id_tls.ma".
+
+(* LIFT FOR PATH ************************************************************)
+
+(* Constructions with tr_id *************************************************)
+
+lemma lift_path_id (p):
+      p = ↑[𝐢]p.
+#p elim p -p //
+* [ #n ] #p #IH //
+[ <lift_path_d_sn //
+| <lift_path_L_sn //
+]
+qed.
index f384cf7467621b88e03dceb0e9acdf6cea1b70d5..a4b81aeebf057c0dc0200eb75b9e461f696befad 100644 (file)
@@ -21,8 +21,9 @@ include "ground/lib/list_length.ma".
 
 lemma lift_path_length (p) (f):
       ❘p❘ = ❘↑[f]p❘.
-#p elim p -p // * [ #n ] #p #IH #f //
-[ <lift_path_m_sn
+#p elim p -p // * [ #n ] #p #IH #f
+[ <lift_path_d_sn
+| <lift_path_m_sn
 | <lift_path_L_sn
 | <lift_path_A_sn
 | <lift_path_S_sn
index 15d6e0933800e9c3a47c7ad18114a52f61b1b4a9..773749b63762721581b377a23b1cc300e6a6dadc 100644 (file)
@@ -23,7 +23,8 @@ lemma structure_lift_path (p) (f):
       ⊗p = ⊗↑[f]p.
 #p elim p -p //
 * [ #n ] #p #IH #f //
-[ <lift_path_m_sn <structure_m_sn <structure_m_sn //
+[ <lift_path_d_sn <structure_d_sn <structure_d_sn //
+| <lift_path_m_sn <structure_m_sn <structure_m_sn //
 | <lift_path_L_sn <structure_L_sn <structure_L_sn //
 ]
 qed.
index 9a62cb28a75cbd28645898154147c03729de886e..f68010b32a4eabfcd6a6d72f99b42988f3ebe574 100644 (file)
@@ -12,8 +12,9 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include "delayed_updating/substitution/lift_eq.ma".
+include "delayed_updating/substitution/lift_path_id.ma".
 include "ground/relocation/tr_uni_pap.ma".
+include "ground/relocation/tr_uni_tls.ma".
 
 (* LIFT FOR PATH ************************************************************)
 
@@ -21,4 +22,7 @@ include "ground/relocation/tr_uni_pap.ma".
 
 lemma lift_path_d_sn_uni (p) (m) (n):
       (𝗱(n+m)◗p) = ↑[𝐮❨m❩](𝗱(n)◗p).
-// qed.
+#p #m #n
+<lift_path_d_sn <tr_uni_pap >nsucc_pnpred
+<tr_tls_succ_uni //
+qed.
index 0b3ba39b001f5f7e1787537fb1cafa0c0ad1c200..920a16cf0d2cc59a0c983c6f98cfbbade6406e6f 100644 (file)
@@ -38,20 +38,3 @@ lemma lift_term_after (f1) (f2) (t):
 | @subset_equivalence_ext_f1_exteq /2 width=5/
 ]
 qed.
-
-lemma lift_term_id_sn (t):
-      t ⊆ ↑[𝐢]t.
-#t #p #Hp
->(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/substitution/lift_prototerm_id.ma b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift_prototerm_id.ma
new file mode 100644 (file)
index 0000000..b66b63f
--- /dev/null
@@ -0,0 +1,37 @@
+(**************************************************************************)
+(*       ___                                                              *)
+(*      ||M||                                                             *)
+(*      ||A||       A project by Andrea Asperti                           *)
+(*      ||T||                                                             *)
+(*      ||I||       Developers:                                           *)
+(*      ||T||         The HELM team.                                      *)
+(*      ||A||         http://helm.cs.unibo.it                             *)
+(*      \   /                                                             *)
+(*       \ /        This file is distributed under the terms of the       *)
+(*        v         GNU General Public License Version 2                  *)
+(*                                                                        *)
+(**************************************************************************)
+
+include "delayed_updating/substitution/lift_prototerm_eq.ma".
+include "delayed_updating/substitution/lift_path_id.ma".
+
+(* LIFT FOR PROTOTERM *******************************************************)
+
+(* Constructions with tr_id *************************************************)
+
+lemma lift_term_id_sn (t):
+      t ⊆ ↑[𝐢]t.
+#t #p #Hp
+>(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.
index 046404f0375e4b32f626794cb2c0e81b243000e4..7fa03a41e2f15abbd568575254b9b400b77a780a 100644 (file)
@@ -54,7 +54,7 @@ qed.
 
 (* Main constructions *******************************************************)
 
-theorem reverse_revrse (p):
+theorem reverse_reverse (p):
         p = pᴿᴿ.
 #p elim p -p //
 #l #p #IH