X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Fgrammar%2Fcl_weight.ma;h=bd837d4df9146f3d9b801426e0d0d00705f5d8b2;hb=88dd0e28758c693660a93ee0a9a5202c61ca09a0;hp=1f79433bd98a2c9608cd6c8c6580f68cd6b24c58;hpb=e2fd96302d52266bec42a19f100dadc6111fc07b;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_weight.ma b/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_weight.ma
index 1f79433bd..bd837d4df 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_weight.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/grammar/cl_weight.ma
@@ -12,32 +12,34 @@
 (*                                                                        *)
 (**************************************************************************)
 
+include "basic_2/notation/functions/weight_3.ma".
 include "basic_2/grammar/lenv_weight.ma".
-include "basic_2/grammar/cl_shift.ma".
+include "basic_2/grammar/genv.ma".
 
 (* WEIGHT OF A CLOSURE ******************************************************)
 
-definition fw: lenv → term → ? ≝ λL,T. ♯{L} + ♯{T}.
+(* activate genv *)
+definition fw: genv → lenv → term → ? ≝ λG,L,T. ♯{L} + ♯{T}.
 
-interpretation "weight (closure)" 'Weight L T = (fw L T).
+interpretation "weight (closure)" 'Weight G L T = (fw G L T).
 
 (* Basic properties *********************************************************)
 
 (* Basic_1: was: flt_shift *)
-lemma fw_shift: ∀a,K,I,V,T. ♯{K. ⓑ{I} V, T} < ♯{K, ⓑ{a,I} V. T}.
-normalize //
+lemma fw_shift: ∀p,I,G,K,V,T. ♯{G, K.ⓑ{I}V, T} < ♯{G, K, ⓑ{p,I}V.T}.
+normalize /2 width=1 by monotonic_le_plus_r/
 qed.
 
-lemma fw_tpair_sn: ∀I,L,V,T. ♯{L, V} < ♯{L, ②{I}V.T}.
-normalize in ⊢ (?→?→?→?→?%%); //
+lemma fw_tpair_sn: ∀I,G,L,V,T. ♯{G, L, V} < ♯{G, L, ②{I}V.T}.
+normalize in ⊢ (?→?→?→?→?→?%%); //
 qed.
 
-lemma fw_tpair_dx: ∀I,L,V,T. ♯{L, T} < ♯{L, ②{I}V.T}.
-normalize in ⊢ (?→?→?→?→?%%); //
+lemma fw_tpair_dx: ∀I,G,L,V,T. ♯{G, L, T} < ♯{G, L, ②{I}V.T}.
+normalize in ⊢ (?→?→?→?→?→?%%); //
 qed.
 
-lemma fw_lpair_sn: ∀I,L,V,T. ♯{L, V} < ♯{L.ⓑ{I}V, T}.
-normalize /3 width=1 by monotonic_lt_plus_l, monotonic_le_plus_r/ (**) (* auto too slow without trace *)
+lemma fw_lpair_sn: ∀I,G,L,V,T. ♯{G, L, V} < ♯{G, L.ⓑ{I}V, T}.
+normalize /3 width=1 by monotonic_lt_plus_l, monotonic_le_plus_r/
 qed.
 
 (* Basic_1: removed theorems 7: