X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fapps_2%2Fmodels%2Ftm.ma;h=a0f7b84d117d85e32b1f8ea946599450c1820d9d;hp=2a630c59292c776308056e3ef58cb6679ef79165;hb=cc600ed1e115d5566947288d532a1e89d989227f;hpb=ea918ec7701db4458c5ca25885e80abc6fed1be7

diff --git a/matita/matita/contribs/lambdadelta/apps_2/models/tm.ma b/matita/matita/contribs/lambdadelta/apps_2/models/tm.ma
index 2a630c592..a0f7b84d1 100644
--- a/matita/matita/contribs/lambdadelta/apps_2/models/tm.ma
+++ b/matita/matita/contribs/lambdadelta/apps_2/models/tm.ma
@@ -13,54 +13,28 @@
 (**************************************************************************)
 
 include "basic_2/rt_equivalence/cpcs.ma".
-include "apps_2/functional/flifts_basic.ma".
+include "apps_2/functional/mf.ma".
 include "apps_2/models/model.ma".
-include "apps_2/notation/models/dotteduparrow_2.ma".
-include "apps_2/notation/models/dotteduparrow_3.ma".
 
 (* TERM MODEL ***************************************************************)
 
 definition tm_dd ≝ term.
 
-definition tm_evaluation ≝ nat → tm_dd.
-
 definition tm_sq (h) (T1) (T2) ≝  ⦃⋆, ⋆⦄ ⊢ T1 ⬌*[h] T2.
 
 definition tm_sv (s) ≝ ⋆s.
 
-definition tm_ap (V) (T) ≝ ⓐV.T.
-
-definition tm_vlift (j) (gv): tm_evaluation ≝ λi. ↑[j,1](gv i).
-
-interpretation "lift (term model evaluation)"
-  'DottedUpArrow i gv = (tm_vlift i gv).
-
-definition tm_vpush (j) (T) (lv): tm_evaluation ≝
-                    λi. tri … i j (lv i) T (↑[j,1](lv (↓i))).
-
-interpretation "push (term model evaluation)"
-  'DottedUpArrow i d lv = (tm_vpush i d lv).
+definition tm_co (p) (V) (T) ≝ ⓓ{p}V.(↑[1]T).
 
-rec definition tm_ti gv lv T on T ≝ match T with
-[ TAtom I     ⇒ match I with
-  [ Sort _ ⇒ T
-  | LRef i ⇒ lv i
-  | GRef l ⇒ gv l
-  ]
-| TPair I V T ⇒ match I with
-  [ Bind2 _ _ ⇒ TPair I (tm_ti gv lv V) (tm_ti (⇡[0]gv) (⇡[0←#0]lv) T)
-  | Flat2 _   ⇒ TPair I (tm_ti gv lv V) (tm_ti gv lv T)
-  ]
-].
-
-definition tm_lc: tm_evaluation ≝ λi.#i.
+definition tm_ap (V) (T) ≝ ⓐV.T.
 
-definition tm_gc: tm_evaluation ≝ λl.§l.
+definition tm_ti (gv) (lv) (T) ≝ ●[gv,lv]T.
 
 definition TM (h): model ≝ mk_model … .
 [ @tm_dd
-| @(tm_sq h) |6,7: skip
+| @(tm_sq h) |7,8: skip
 | @tm_sv
+| @tm_co
 | @tm_ap
 | @tm_ti
 ].
@@ -68,17 +42,11 @@ defined-.
 
 (* Basic properties *********************************************************)
 
-lemma tm_vlift_rw (j) (gv): ∀i. (⇡[j]gv) i = ↑[j,1](gv i).
+lemma tm_co_rw (h) (p) (V) (T): V⊕{TM h}[p]T = ⓓ{p}V.(↑[1]T).
 // qed.
 
-lemma tm_vpush_lt (lv) (j) (T): ∀i. i < j → (⇡[j←T]lv) i = lv i.
-/2 width=1 by tri_lt/ qed-.
-
-lemma tm_vpush_eq: ∀lv,T,i. (⇡[i←T]lv) i = T.
-/2 width=1 by tri_eq/ qed.
-
-lemma tm_vpush_gt: ∀lv,T,j,i. j < i → (⇡[j←T]lv) i = ↑[j,1](lv (↓i)).
-/2 width=1 by tri_gt/ qed-.
+lemma tm_ti_sort (h) (gv) (lv): ∀s. ⟦⋆s⟧{TM h}[gv,lv] = sv … s.
+// qed.
 
 lemma tm_ti_lref (h): ∀gv,lv,i. ⟦#i⟧{TM h}[gv,lv] = lv i.
 // qed.