X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2Fcontribs%2Flambdadelta%2Fground%2Flib%2Frelations.ma;h=56f6e21f79cf0d3bbad1159d5a257bdb33d98386;hb=6604a232815858a6c75dd25ac45abd68438077ff;hp=98e14be386c44279c3472fac7114cb8460c2aa52;hpb=68b4f2490c12139c03760b39895619e63b0f38c9;p=helm.git

diff --git a/matita/matita/contribs/lambdadelta/ground/lib/relations.ma b/matita/matita/contribs/lambdadelta/ground/lib/relations.ma
index 98e14be38..56f6e21f7 100644
--- a/matita/matita/contribs/lambdadelta/ground/lib/relations.ma
+++ b/matita/matita/contribs/lambdadelta/ground/lib/relations.ma
@@ -27,14 +27,16 @@ definition replace_2 (A) (B): relation3 (relation2 A B) (relation A) (relation B
 definition subR2 (S1) (S2): relation (relation2 S1 S2) ≝
            λR1,R2. (∀a1,a2. R1 a1 a2 → R2 a1 a2).
 
-interpretation "2-relation inclusion"
-   'subseteq R1 R2 = (subR2 ?? R1 R2).
+interpretation
+  "2-relation inclusion"
+  'subseteq R1 R2 = (subR2 ?? R1 R2).
 
 definition subR3 (S1) (S2) (S3): relation (relation3 S1 S2 S3) ≝
            λR1,R2. (∀a1,a2,a3. R1 a1 a2 a3 → R2 a1 a2 a3).
 
-interpretation "3-relation inclusion"
-   'subseteq R1 R2 = (subR3 ??? R1 R2).
+interpretation
+  "3-relation inclusion"
+  'subseteq R1 R2 = (subR3 ??? R1 R2).
 
 (* Properties of relations **************************************************)
 
@@ -72,6 +74,9 @@ definition transitive2 (A) (R1,R2:relation A): Prop ≝
            ∀a1,a0. R1 a1 a0 → ∀a2. R2 a0 a2 →
            ∃∃a. R2 a1 a & R1 a a2.
 
+definition confluent1 (A) (B): relation2 (relation2 A B) (relation A) ≝
+           λR1,R2. ∀a1,b. R1 a1 b → ∀a2. R2 a1 a2 → R1 a2 b.
+
 definition bi_confluent (A) (B) (R: bi_relation A B): Prop ≝
            ∀a0,a1,b0,b1. R a0 b0 a1 b1 → ∀a2,b2. R a0 b0 a2 b2 →
            ∃∃a,b. R a1 b1 a b & R a2 b2 a b.
@@ -104,11 +109,11 @@ definition NF (A): relation A → relation A → predicate A ≝
            λR,S,a1. ∀a2. R a1 a2 → S a1 a2.
 
 definition NF_dec (A): relation A → relation A → Prop ≝
-           λR,S. ∀a1. NF A R S a1 ∨
+           λR,S. ∀a1. NF … R S a1 ∨
            ∃∃a2. R … a1 a2 & (S a1 a2 → ⊥).
 
 inductive SN (A) (R,S:relation A): predicate A ≝
-| SN_intro: ∀a1. (∀a2. R a1 a2 → (S a1 a2 → ⊥) → SN A R S a2) → SN A R S a1
+| SN_intro: ∀a1. (∀a2. R a1 a2 → (S a1 a2 → ⊥) → SN … R S a2) → SN … R S a1
 .
 
 lemma NF_to_SN (A) (R) (S): ∀a. NF A R S a → SN A R S a.
@@ -118,10 +123,10 @@ elim HSa12 -HSa12 /2 width=1 by/
 qed.
 
 definition NF_sn (A): relation A → relation A → predicate A ≝
-   λR,S,a2. ∀a1. R a1 a2 → S a1 a2.
+           λR,S,a2. ∀a1. R a1 a2 → S a1 a2.
 
 inductive SN_sn (A) (R,S:relation A): predicate A ≝
-| SN_sn_intro: ∀a2. (∀a1. R a1 a2 → (S a1 a2 → ⊥) → SN_sn A R S a1) → SN_sn A R S a2
+| SN_sn_intro: ∀a2. (∀a1. R a1 a2 → (S a1 a2 → ⊥) → SN_sn … R S a1) → SN_sn … R S a2
 .
 
 lemma NF_to_SN_sn (A) (R) (S): ∀a. NF_sn A R S a → SN_sn A R S a.
@@ -130,7 +135,13 @@ lemma NF_to_SN_sn (A) (R) (S): ∀a. NF_sn A R S a → SN_sn A R S a.
 elim HSa12 -HSa12 /2 width=1 by/
 qed.
 
-(* Relations on unboxed triples *********************************************)
+(* Normal form and strong normalization with unboxed triples ****************)
+
+inductive SN3 (A) (B) (C) (R,S:relation6 A B C A B C): relation3 A B C ≝
+| SN3_intro: ∀a1,b1,c1. (∀a2,b2,c2. R a1 b1 c1 a2 b2 c2 → (S a1 b1 c1 a2 b2 c2 → ⊥) → SN3 … R S a2 b2 c2) → SN3 … R S a1 b1 c1
+.
+
+(* Relations with unboxed triples *******************************************)
 
 definition tri_RC (A,B,C): tri_relation A B C → tri_relation A B C ≝
            λR,a1,b1,c1,a2,b2,c2.