X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fnlibrary%2Falgebra%2Fmagmas.ma;h=3e4cb942b4c09ba22e4188c3239748a915968fba;hb=32f2a8f8016b2c6c7fb88189fc0ea0c7f9336555;hp=a879679a9feb760a2b7b30a979aeb3a6ed62f237;hpb=6678a28314d8878bb46d5de7b1060628f4930242;p=helm.git

diff --git a/helm/software/matita/nlibrary/algebra/magmas.ma b/helm/software/matita/nlibrary/algebra/magmas.ma
index a879679a9..3e4cb942b 100644
--- a/helm/software/matita/nlibrary/algebra/magmas.ma
+++ b/helm/software/matita/nlibrary/algebra/magmas.ma
@@ -15,28 +15,36 @@
 include "sets/sets.ma".
 
 nrecord magma_type : Type[1] ≝
- { mcarr:> setoid;
-   op: mcarr → mcarr → mcarr
+ { mtcarr:> setoid;
+   op: binary_morphism mtcarr mtcarr mtcarr
  }.
 
 nrecord magma (A: magma_type) : Type[1] ≝
- { mcarr:> powerset_setoid1 A;
+ { mcarr:> qpowerclass A;
    op_closed: ∀x,y. x ∈ mcarr → y ∈ mcarr → op A x y ∈ mcarr
  }.
 
-nrecord magma_morphism_type (A,B: magma_type) : Type ≝
- { mmcarr:1> A → B;
-   mmprop: ∀x,y. mmcarr (op … x y) = op … (mmcarr x) (mmcarr y)
+alias symbol "hint_decl" = "hint_decl_Type2".
+unification hint 0 ≔ 
+  A : ? ⊢ carr1 (qpowerclass_setoid A) ≡ qpowerclass A. 
+
+(*
+ncoercion mcarr' : ∀A. ∀M: magma A. carr1 (qpowerclass_setoid (mtcarr A))
+ ≝ λA.λM: magma A.mcarr ? M
+ on _M: magma ? to carr1 (qpowerclass_setoid (mtcarr ?)).
+*)
+
+nrecord magma_morphism_type (A,B: magma_type) : Type[0] ≝
+ { mmcarr:> unary_morphism A B;
+   mmprop: ∀x,y:A. mmcarr (op ? x y) = op … (mmcarr x) (mmcarr y)
  }.
 
-nrecord magma_morphism (A) (B) (Ma: magma A) (Mb: magma B) : Type ≝
+nrecord magma_morphism (A) (B) (Ma: magma A) (Mb: magma B) : Type[0] ≝
  { mmmcarr:> magma_morphism_type A B;
-   mmclosed: ∀x. x ∈ Ma → mmmcarr x ∈ Mb
+   mmclosed: ∀x:A. x ∈ mcarr ? Ma → mmmcarr x ∈ mcarr ? Mb
  }.
- 
-ndefinition image: ∀A,B. (A → B) → Ω \sup A → Ω \sup B ≝
- λA,B,f,Sa. {y | ∃x. x ∈ Sa ∧ f x = y}.
 
+(*
 ndefinition mm_image:
  ∀A,B. ∀Ma: magma A. ∀Mb: magma B. magma_morphism … Ma Mb → magma B.
  #A; #B; #Ma; #Mb; #f;
@@ -52,9 +60,6 @@ ndefinition mm_image:
           napply (mmprop … f)]##]
 nqed.
 
-ndefinition counter_image: ∀A,B. (A → B) → Ω \sup B → Ω \sup A ≝
- λA,B,f,Sb. {x | ∃y. y ∈ Sb ∧ f x = y}.
- 
 ndefinition mm_counter_image:
  ∀A,B. ∀Ma: magma A. ∀Mb: magma B. magma_morphism … Ma Mb → magma A.
   #A; #B; #Ma; #Mb; #f;
@@ -69,11 +74,12 @@ ndefinition mm_counter_image:
            nrewrite < Hy1;
            napply (mmprop … f)]##]
 nqed.
+*)
 
 ndefinition m_intersect: ∀A. magma A → magma A → magma A.
  #A; #M1; #M2;
  napply (mk_magma …)
-  [ napply (M1 ∩ M2)
+  [ napply (intersect_ok ? M1 M2)
   | #x; #y; nwhd in ⊢ (% → % → %); *; #Hx1; #Hx2; *; #Hy1; #Hy2;
     napply conj; napply op_closed; nassumption ]
 nqed.
\ No newline at end of file