X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fnlibrary%2Falgebra%2Fmagmas.ma;h=685d6248059afb3e162ae4ec00ea1304f05318af;hb=14aa468ded0030440dbc9cc8fb5b936d927bb6fd;hp=d749139882fb6da3209713a25af9ea9a2a850340;hpb=72b4799ea220bc54dc27b34fdb863f1ee6fc9e08;p=helm.git

diff --git a/helm/software/matita/nlibrary/algebra/magmas.ma b/helm/software/matita/nlibrary/algebra/magmas.ma
index d74913988..685d62480 100644
--- a/helm/software/matita/nlibrary/algebra/magmas.ma
+++ b/helm/software/matita/nlibrary/algebra/magmas.ma
@@ -14,61 +14,72 @@
 
 include "sets/sets.ma".
 
-nrecord pre_magma : Type[1] ≝
- { carr: Type;
-   op: carr → carr → carr
+nrecord magma_type : Type[1] ≝
+ { mtcarr:> setoid;
+   op: unary_morphism mtcarr (unary_morph_setoid mtcarr mtcarr)
  }.
-ncoercion carr: ∀M:pre_magma. Type ≝ carr on _M: pre_magma to Type.
 
-nrecord magma (A: pre_magma) : Type[1] ≝
- { mcarr: Ω \sup A;
+nrecord magma (A: magma_type) : Type[1] ≝
+ { mcarr:> ext_powerclass A;
    op_closed: ∀x,y. x ∈ mcarr → y ∈ mcarr → op A x y ∈ mcarr
  }.
-ncoercion mcarr: ∀A.∀M: magma A. Ω \sup A ≝ mcarr
- on _M: magma ? to Ω \sup ?.
 
-nrecord pre_magma_morphism (A,B: pre_magma) : Type ≝
- { mmcarr: 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 (ext_powerclass_setoid A) ≡ ext_powerclass 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)
  }.
-ncoercion mmcarr: ∀A,B.∀M: pre_magma_morphism A B. A → B ≝ mmcarr
- on _M: pre_magma_morphism ? ? to ∀_.?.
 
-nrecord magma_morphism (A) (B) (Ma: magma A) (Mb: magma B) : Type ≝
- { mmmcarr: pre_magma_morphism A B;
-   mmclosed: ∀x. x ∈ Ma → mmmcarr x ∈ Mb
+nrecord magma_morphism (A) (B) (Ma: magma A) (Mb: magma B) : Type[0] ≝
+ { mmmcarr:> magma_morphism_type A B;
+   mmclosed: ∀x:A. x ∈ mcarr ? Ma → mmmcarr x ∈ mcarr ? Mb
  }.
-ncoercion mmmcarr : ∀A,B,Ma,Mb.∀f: magma_morphism A B Ma Mb. pre_magma_morphism A B
- ≝ mmmcarr
- on _f: magma_morphism ???? to pre_magma_morphism ??.
- 
-ndefinition sub_magma ≝
- λA.λM1,M2: magma A. M1 ⊆ M2.
- 
-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: magma A. ∀Mb: magma B. magma_morphism … Ma Mb → magma B.
  #A; #B; #Ma; #Mb; #f;
- napply (mk_magma ???)
-  [ napply (image ?? f Ma)
+ napply mk_magma
+  [ napply (image … f Ma)
   | #x; #y; nwhd in ⊢ (% → % → ?); *; #x0; *; #Hx0; #Hx1; *; #y0; *; #Hy0; #Hy1; nwhd;
-    napply (ex_intro ????)
-     [ napply (op ? x0 y0) 
-     | napply (conj ????)
-        [ napply (op_closed ??????); nassumption
+    napply ex_intro
+     [ napply (op … x0 y0) 
+     | napply conj
+        [ napply op_closed; nassumption
         | nrewrite < Hx1;
           nrewrite < Hy1;
-          napply (mmprop ?? f ??)]##]
+          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: magma A. ∀Mb: magma B. magma_morphism … Ma Mb → magma A.
   #A; #B; #Ma; #Mb; #f;
-  napply (mk_magma ???)
-   [ napply (counter_image ?? f Mb)
-   | #x; #y; nwhd in ⊢ (% → % → ?); *; #y0; *; #Hy0; #H 
+  napply mk_magma
+   [ napply (counter_image … f Mb)
+   | #x; #y; nwhd in ⊢ (% → % → ?); *; #x0; *; #Hx0; #Hx1; *; #y0; *; #Hy0; #Hy1; nwhd;
+     napply ex_intro
+      [ napply (op … x0 y0)
+      | napply conj
+         [ napply op_closed; nassumption
+         | nrewrite < Hx1;
+           nrewrite < Hy1;
+           napply (mmprop … f)]##]
+nqed.
+*)
+
+ndefinition m_intersect: ∀A. magma A → magma A → magma A.
+ #A; #M1; #M2;
+ napply (mk_magma …)
+  [ napply (intersect_is_ext_morph ? M1 M2)
+  | #x; #y; nwhd in ⊢ (% → % → %); *; #Hx1; #Hx2; *; #Hy1; #Hy2;
+    napply conj; napply op_closed; nassumption ]
+nqed.
\ No newline at end of file