refactoring: helena sources are now in a dedicated directory

[helm.git] / helm / software / matita / nlibrary / sets / setoids1.ma

diff --git a/helm/software/matita/nlibrary/sets/setoids1.ma b/helm/software/matita/nlibrary/sets/setoids1.ma
index fa615c8e4d74600903d6e1cdd845eb3524ad6f3f..4aac43e448e107e9559a528938d113a2a8c96443 100644 (file)
--- a/helm/software/matita/nlibrary/sets/setoids1.ma
+++ b/helm/software/matita/nlibrary/sets/setoids1.ma
@@ -25,7 +25,7 @@ ndefinition setoid1_of_setoid: setoid → setoid1.
  #s; napply mk_setoid1
   [ napply (carr s)
   | napply (mk_equivalence_relation1 s)
-    [ napply eq
+    [ napply eq0
     | napply refl
     | napply sym
     | napply trans]##]
@@ -36,12 +36,12 @@ nqed.
 (*prefer coercion Type_OF_setoid.*)
 
 interpretation "setoid1 eq" 'eq t x y = (eq_rel1 ? (eq1 t) x y).
-interpretation "setoid eq" 'eq t x y = (eq_rel ? (eq t) x y).
+interpretation "setoid eq" 'eq t x y = (eq_rel ? (eq0 t) x y).
 
 notation > "hvbox(a break =_12 b)" non associative with precedence 45
 for @{ eq_rel2 (carr2 (setoid2_of_setoid1 ?)) (eq2 (setoid2_of_setoid1 ?)) $a $b }.
 notation > "hvbox(a break =_0 b)" non associative with precedence 45
-for @{ eq_rel ? (eq ?) $a $b }.
+for @{ eq_rel ? (eq0 ?) $a $b }.
 notation > "hvbox(a break =_1 b)" non associative with precedence 45
 for @{ eq_rel1 ? (eq1 ?) $a $b }.
 
@@ -104,14 +104,11 @@ unification hint 0 ≔ o1,o2,o3:setoid1,f:unary_morphism1 o2 o3,g:unary_morphism
  (* -------------------------------------------------------------------- *) ⊢
                               fun11 ?? R ≡ (composition1 … f g).
                               
-(*
-ndefinition comp_binary_morphisms:
+ndefinition comp1_binary_morphisms:
  ∀o1,o2,o3.
-  binary_morphism1 (unary_morphism1_setoid1 o2 o3) (unary_morphism1_setoid1 o1 o2)
-   (unary_morphism1_setoid1 o1 o3).
-#o1; #o2; #o3; @
+  unary_morphism1 (unary_morphism1_setoid1 o2 o3)
+   (unary_morphism1_setoid1 (unary_morphism1_setoid1 o1 o2) (unary_morphism1_setoid1 o1 o3)).
+#o1; #o2; #o3; napply mk_binary_morphism1
  [ #f; #g; napply (comp1_unary_morphisms … f g) (*CSC: why not ∘?*)
- | #a; #a'; #b; #b'; #ea; #eb; #x; nnormalize;
-   napply (.= †(eb x)); napply ea.
+ | #a; #a'; #b; #b'; #ea; #eb; #x; #x'; #Hx; nnormalize; /3/ ]
 nqed.
-*)