X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fbasic_2%2Fcomputation%2Facp.ma;h=136ebacea2366e24bf229d4b7859c915955decb2;hb=f95f6cb21b86f3dad114b21f687aa5df36088064;hp=b7b967e1a2df51b34b165645011db12829f52202;hpb=08cb57944c0df08611d4f35d286e46c0d13e4813;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma b/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma
index b7b967e1a..136ebacea 100644
--- a/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma
+++ b/matita/matita/contribs/lambdadelta/basic_2/computation/acp.ma
@@ -12,40 +12,40 @@
 (*                                                                        *)
 (**************************************************************************)
 
-include "basic_2/unfold/ldrops.ma".
+include "basic_2/substitution/ldrops.ma".
 
 (* ABSTRACT COMPUTATION PROPERTIES ******************************************)
 
 definition CP1 ≝ λRR:lenv→relation term. λRS:relation term.
-                 ∀L,k. NF … (RR L) RS (⋆k).
+                 ∀L. ∃k. NF … (RR L) RS (⋆k).
 
 definition CP2 ≝ λRR:lenv→relation term. λRS:relation term.
-                 ∀L,K,W,i. ⇩[0,i] L ≡ K. ⓛW → NF … (RR L) RS (#i).
-
-definition CP3 ≝ λRR:lenv→relation term. λRP:lenv→predicate term.
-                 ∀L,V,k. RP L (ⓐ⋆k.V) → RP L V.
-
-definition CP4 ≝ λRR:lenv→relation term. λRS:relation term.
                  ∀L0,L,T,T0,d,e. NF … (RR L) RS T →
                  ⇩[d, e] L0 ≡ L → ⇧[d, e] T ≡ T0 → NF … (RR L0) RS T0.
 
-definition CP4s ≝ λRR:lenv→relation term. λRS:relation term.
+definition CP2s ≝ λRR:lenv→relation term. λRS:relation term.
                   ∀L0,L,des. ⇩*[des] L0 ≡ L →
                   ∀T,T0. ⇧*[des] T ≡ T0 →
                   NF … (RR L) RS T → NF … (RR L0) RS T0.
 
+definition CP3 ≝ λRP:lenv→predicate term.
+                 ∀L,T,k. RP L (ⓐ⋆k.T) → RP L T.
+
+definition CP4 ≝ λRP:lenv→predicate term.
+                 ∀L,W,T. RP L W → RP L T → RP L (ⓝW.T).
+
 (* requirements for abstract computation properties *)
 record acp (RR:lenv->relation term) (RS:relation term) (RP:lenv→predicate term) : Prop ≝
 { cp1: CP1 RR RS;
   cp2: CP2 RR RS;
-  cp3: CP3 RR RP;
-  cp4: CP4 RR RS
+  cp3: CP3 RP;
+  cp4: CP4 RP
 }.
 
 (* Basic properties *********************************************************)
 
 (* Basic_1: was: nf2_lift1 *)
-lemma acp_lifts: ∀RR,RS. CP4 RR RS → CP4s RR RS.
+lemma acp_lifts: ∀RR,RS. CP2 RR RS → CP2s RR RS.
 #RR #RS #HRR #L1 #L2 #des #H elim H -L1 -L2 -des
 [ #L #T1 #T2 #H #HT1
   <(lifts_inv_nil … H) -H //