update un delayed_updating

+ bugs fixed in dfr and ifr

diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr.ma b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr.ma
index 67c22257b0ba0f92ed2c218fbaa2e7573b6dd939..3cdf0d47e9f63a9c1666d6a23b2c036c293dc2ac 100644 (file)
--- a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr.ma
+++ b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr.ma
@@ -28,7 +28,7 @@ include "ground/xoa/and_4.ma".
 definition dfr (p) (q): relation2 prototerm prototerm ≝
            λt1,t2. ∃∃b,n.
            let r ≝ p●𝗔◗b●𝗟◗q in
-           â\88§â\88§ â\8a\97b ϵ ð\9d\90\81 & â\9d\98qâ\9d\98 = (â\86\91[q]ð\9d\90¢)@❨n❩ & r◖𝗱n ϵ t1 &
+           â\88§â\88§ â\8a\97b ϵ ð\9d\90\81 & â\88\80f. â\9d\98qâ\9d\98 = (â\86\91[q]⫯f)@❨n❩ & r◖𝗱n ϵ t1 &
               t1[⋔r←𝛗n.(t1⋔(p◖𝗦))] ⇔ 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 fb39e209a0191ad66309ebb3810b17fc07037cae..a8d9469ddaa6fe171c11ece64ebff473d74a3429 100644 (file)
--- a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_ifr.ma
+++ b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/dfr_ifr.ma
@@ -18,8 +18,7 @@ include "delayed_updating/substitution/fsubst_lift.ma".
 include "delayed_updating/substitution/lift_structure_depth.ma".
 include "delayed_updating/syntax/prototerm_proper_constructors.ma".
 include "delayed_updating/syntax/path_structure_depth.ma".
-include "ground/relocation/tr_id_pap.ma".
-include "ground/relocation/tr_id_pushs.ma".
+include "ground/relocation/tr_pap_pushs.ma".
 
 (* DELAYED FOCUSED REDUCTION ************************************************)
 
@@ -29,9 +28,10 @@ lemma dfr_lift_bi (f) (p) (q) (t1) (t2): t1 ϵ 𝐓 →
 * #b #n * #Hb #Hn  #Ht1 #Ht2
 @(ex1_2_intro … (⊗b) (❘⊗q❘)) @and4_intro
 [ //
-| //
-| lapply (in_comp_lift_bi f … Ht1) -Ht1 -H0t1 -Hb -Ht2 #Ht1
-  <depth_structure
+| #g <lift_rmap_structure <depth_structure
+  >tr_pushs_swap <tr_pap_pushs_le //
+| lapply (in_comp_lift_bi f … Ht1) -Ht1 -H0t1 -Hb -Ht2
+  <lift_d_empty_dx //
 | lapply (eq_lift_bi f … Ht2) -Ht2 #Ht2
   @(subset_eq_trans … Ht2) -t2
   @(subset_eq_trans … (lift_fsubst …))

diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr.ma b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr.ma
index 2394523f5c26de3cd3af0685823e78f059fec30d..ffa4f44bd0ea968f66f6aaf46653295c126ef62c 100644 (file)
--- a/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr.ma
+++ b/matita/matita/contribs/lambdadelta/delayed_updating/reduction/ifr.ma
@@ -26,7 +26,7 @@ include "ground/xoa/and_4.ma".
 definition ifr (p) (q): relation2 prototerm prototerm ≝
            λt1,t2. ∃∃b,n.
            let r ≝ p●𝗔◗b●𝗟◗q in
-           â\88§â\88§ â\8a\97b ϵ ð\9d\90\81 & â\9d\98qâ\9d\98 = (â\86\91[q]ð\9d\90¢)@❨n❩ & r◖𝗱n ϵ t1 &
+           â\88§â\88§ â\8a\97b ϵ ð\9d\90\81 & â\88\80f. â\9d\98qâ\9d\98 = (â\86\91[q]⫯f)@❨n❩ & r◖𝗱n ϵ t1 &
               t1[⋔r←↑[𝐮❨n❩](t1⋔(p◖𝗦))] ⇔ t2
 .
 

diff --git a/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift.ma b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift.ma
index fa63286846e697621e2ac313b739825204abc2a5..3a6991a92d686797e9862700bbaea455e8e5230f 100644 (file)
--- a/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift.ma
+++ b/matita/matita/contribs/lambdadelta/delayed_updating/substitution/lift.ma
@@ -109,6 +109,10 @@ lemma lift_path_m_sn (f) (p):
 
 (* Basic constructions with proj_rmap ***************************************)
 
+lemma lift_rmap_empty (f):
+      f = ↑[𝐞]f.
+// qed.
+
 lemma lift_rmap_d_sn (f) (p) (n):
       ↑[p](f∘𝐮❨ninj n❩) = ↑[𝗱n◗p]f.
 #f * // qed.