X-Git-Url: http://matita.cs.unibo.it/gitweb/?p=helm.git;a=blobdiff_plain;f=matita%2Fmatita%2Flib%2Fbasics%2Frelations.ma;h=9da779ee45db629c6994b682d7852c011e553701;hp=3133682dbc372fc1e2bdb4b9fe1c76393f070b89;hb=3a4509b8e569181979f5b15808361c83eb1ae49a;hpb=84b38ac86f1f92b91ae8913cd0dbcb5c3485dc3a diff --git a/matita/matita/lib/basics/relations.ma b/matita/matita/lib/basics/relations.ma index 3133682db..9da779ee4 100644 --- a/matita/matita/lib/basics/relations.ma +++ b/matita/matita/lib/basics/relations.ma @@ -56,12 +56,12 @@ definition antisymmetric: ∀A.∀R:relation A.Prop definition singlevalued: ∀A,B. predicate (relation2 A B) ≝ λA,B,R. ∀a,b1. R a b1 → ∀b2. R a b2 → b1 = b2. -definition confluent1: ∀A. relation A → predicate A ≝ λA,R,a0. - ∀a1. R a0 a1 → ∀a2. R a0 a2 → - ∃∃a. R a1 a & R a2 a. +definition pw_confluent: ∀A. relation A → predicate A ≝ λA,R,a0. + ∀a1. R a0 a1 → ∀a2. R a0 a2 → + ∃∃a. R a1 a & R a2 a. definition confluent: ∀A. predicate (relation A) ≝ λA,R. - ∀a0. confluent1 … R a0. + ∀a0. pw_confluent … R a0. (* triangular confluence of two relations *) definition Conf3: ∀A,B. relation2 A B → relation A → Prop ≝ λA,B,S,R.