more notation moved to core notation, unification of duplicated CProp connectives

[helm.git] / helm / software / matita / contribs / dama / dama / bishop_set.ma

diff --git a/helm/software/matita/contribs/dama/dama/bishop_set.ma b/helm/software/matita/contribs/dama/dama/bishop_set.ma
index 1e7436af9a3e97d347a47dc259c726537e2a06be..64ae4495d14c11fb1d215ea8d709f8b19c2db2d2 100644 (file)
--- a/helm/software/matita/contribs/dama/dama/bishop_set.ma
+++ b/helm/software/matita/contribs/dama/dama/bishop_set.ma
@@ -23,11 +23,7 @@ record bishop_set: Type ≝ {
   bs_cotransitive: cotransitive ? bs_apart
 }.
 
-notation "hvbox(a break # b)" non associative with precedence 50 
-  for @{ 'apart $a $b}.
-  
-interpretation "bishop_setapartness" 'apart x y = 
-  (cic:/matita/dama/bishop_set/bs_apart.con _ x y).
+interpretation "bishop set apartness" 'apart x y = (bs_apart _ x y).
 
 definition bishop_set_of_ordered_set: ordered_set → bishop_set.
 intros (E); apply (mk_bishop_set E (λa,b:E. a ≰ b ∨ b ≰ a));  
@@ -42,11 +38,7 @@ qed.
 (* Definition 2.2 (2) *)
 definition eq ≝ λA:bishop_set.λa,b:A. ¬ (a # b).
 
-notation "hvbox(a break ≈ b)" non associative with precedence 50 
-  for @{ 'napart $a $b}.
-      
-interpretation "Bishop set alikeness" 'napart a b = 
-  (cic:/matita/dama/bishop_set/eq.con _ a b). 
+interpretation "Bishop set alikeness" 'napart a b = (eq _ a b). 
 
 lemma eq_reflexive:∀E:bishop_set. reflexive ? (eq E).
 intros (E); unfold; intros (x); apply bs_coreflexive; 
@@ -59,7 +51,6 @@ qed.
 lemma eq_sym:∀E:bishop_set.∀x,y:E.x ≈ y → y ≈ x ≝ eq_sym_.
 
 lemma eq_trans_: ∀E:bishop_set.transitive ? (eq E).
-(* bug. intros k deve fare whd quanto basta *)
 intros 6 (E x y z Exy Eyz); intro Axy; cases (bs_cotransitive ???y Axy); 
 [apply Exy|apply Eyz] assumption.
 qed.
@@ -78,8 +69,7 @@ qed.
 
 definition lt ≝ λE:ordered_set.λa,b:E. a ≤ b ∧ a # b.
 
-interpretation "ordered sets less than" 'lt a b = 
-  (cic:/matita/dama/bishop_set/lt.con _ a b).
+interpretation "ordered sets less than" 'lt a b = (lt _ a b).
 
 lemma lt_coreflexive: ∀E.coreflexive ? (lt E).
 intros 2 (E x); intro H; cases H (_ ABS);
@@ -98,3 +88,22 @@ theorem lt_to_excess: ∀E:ordered_set.∀a,b:E. (a < b) → (b ≰ a).
 intros (E a b Lab); cases Lab (LEab Aab); cases Aab (H H);[cases (LEab H)]
 assumption;
 qed.
+
+definition bs_subset ≝ λO:bishop_set.λP,Q:O→Prop.∀x:O.P x → Q x.
+
+interpretation "bishop set subset" 'subseteq a b = (bs_subset _ a b). 
+
+definition square_bishop_set : bishop_set → bishop_set.
+intro S; apply (mk_bishop_set (S × S));
+[1: intros (x y); apply ((\fst x # \fst y) ∨ (\snd x # \snd y));
+|2: intro x; simplify; intro; cases H (X X); clear H; apply (bs_coreflexive ?? X);   
+|3: intros 2 (x y); simplify; intro H; cases H (X X); clear H; [left|right] apply (bs_symmetric ??? X); 
+|4: intros 3 (x y z); simplify; intro H; cases H (X X); clear H;
+    [1: cases (bs_cotransitive ??? (\fst z) X); [left;left|right;left]assumption;
+    |2: cases (bs_cotransitive ??? (\snd z) X); [left;right|right;right]assumption;]]
+qed.
+
+notation "s 2 \atop \neq" non associative with precedence 90
+  for @{ 'square_bs $s }.
+interpretation "bishop set square" 'square x = (square_bishop_set x).
+interpretation "bishop set square" 'square_bs x = (square_bishop_set x).
\ No newline at end of file