...

diff --git a/helm/software/matita/nlibrary/algebra/magmas.ma b/helm/software/matita/nlibrary/algebra/magmas.ma
index f3d3fe3528a3c48bc1797b64913cc855f85a6456..d4a650c5eef3f72309e02219c82afe4fbf606456 100644 (file)
--- a/helm/software/matita/nlibrary/algebra/magmas.ma
+++ b/helm/software/matita/nlibrary/algebra/magmas.ma
@@ -20,7 +20,7 @@ nrecord magma_type : Type[1] ≝
  }.
 
 nrecord magma (A: magma_type) : Type[1] ≝
  }.
 
 nrecord magma (A: magma_type) : Type[1] ≝

- { mcarr:> powerset_setoid1 A;
+ { mcarr:> Ω \sup A;

    op_closed: ∀x,y. x ∈ mcarr → y ∈ mcarr → op A x y ∈ mcarr
  }.
 (* le coercion non vanno; sospetto setoid1_of_setoid *)
    op_closed: ∀x,y. x ∈ mcarr → y ∈ mcarr → op A x y ∈ mcarr
  }.
 (* le coercion non vanno; sospetto setoid1_of_setoid *)


@@ -34,15 +34,6 @@ nrecord magma_morphism (A) (B) (Ma: magma A) (Mb: magma B) : Type[0] ≝
    mmclosed: ∀x:carr A. x ∈ mcarr ? Ma → mmmcarr x ∈ mcarr ? Mb
  }.
 (*
    mmclosed: ∀x:carr A. x ∈ mcarr ? Ma → mmmcarr x ∈ mcarr ? Mb
  }.
 (*

-(* qui non funziona una cippa *)
-ndefinition image: ∀A,B. (carr A → carr B) → Ω \sup A → Ω \sup B ≝
- λA,B:setoid.λf:carr A → carr B.λSa:Ω \sup A.
-  {y | ∃x. x ∈ Sa ∧ eq_rel (carr B) (eq B) ? ?(*(f x) y*)}.
-  ##[##2: napply (f x); ##|##3: napply y]
- #a; #a'; #H; nwhd; nnormalize; (* per togliere setoid1_of_setoid *) napply (mk_iff ????);
- *; #x; #Hx; napply (ex_intro … x)
-  [ napply (. (#‡(#‡#))); 
-

 ndefinition mm_image:
  ∀A,B. ∀Ma: magma A. ∀Mb: magma B. magma_morphism … Ma Mb → magma B.
  #A; #B; #Ma; #Mb; #f;
 ndefinition mm_image:
  ∀A,B. ∀Ma: magma A. ∀Mb: magma B. magma_morphism … Ma Mb → magma B.
  #A; #B; #Ma; #Mb; #f;


@@ -58,9 +49,6 @@ ndefinition mm_image:
           napply (mmprop … f)]##]
 nqed.
 
           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;
 ndefinition mm_counter_image:
  ∀A,B. ∀Ma: magma A. ∀Mb: magma B. magma_morphism … Ma Mb → magma A.
   #A; #B; #Ma; #Mb; #f;

diff --git a/helm/software/matita/nlibrary/depends b/helm/software/matita/nlibrary/depends
index 7b7908e20fb93ed6c4fe41b4c61c9e5f93cb7dda..bd4b2744bbf6c5b285c210da0acbd6d6fbf35f09 100644 (file)
--- a/helm/software/matita/nlibrary/depends
+++ b/helm/software/matita/nlibrary/depends
@@ -1,10 +1,10 @@
-sets/sets.ma sets/setoids.ma sets/setoids1.ma
+sets/sets.ma logic/cprop.ma

 logic/cprop.ma sets/setoids1.ma
 sets/setoids1.ma properties/relations1.ma sets/setoids.ma
 sets/setoids.ma logic/connectives.ma properties/relations.ma
 logic/equality.ma logic/connectives.ma
 logic/connectives.ma logic/pts.ma
 logic/cprop.ma sets/setoids1.ma
 sets/setoids1.ma properties/relations1.ma sets/setoids.ma
 sets/setoids.ma logic/connectives.ma properties/relations.ma
 logic/equality.ma logic/connectives.ma
 logic/connectives.ma logic/pts.ma

-algebra/magmas.ma sets/setoids.ma
+algebra/magmas.ma sets/sets.ma

 properties/relations1.ma logic/pts.ma
 properties/relations.ma logic/pts.ma
 logic/pts.ma 
 properties/relations1.ma logic/pts.ma
 properties/relations.ma logic/pts.ma
 logic/pts.ma 

diff --git a/helm/software/matita/nlibrary/sets/sets.ma b/helm/software/matita/nlibrary/sets/sets.ma
index 81f0f07c7a20c2e306a74e68e9612d3b2bde8973..20065cec4156afcc5f9b974968dd99f1a3bb17ae 100644 (file)
--- a/helm/software/matita/nlibrary/sets/sets.ma
+++ b/helm/software/matita/nlibrary/sets/sets.ma
@@ -82,4 +82,18 @@ interpretation "union" 'union U V = (union ? U V).
 
 ndefinition singleton ≝ λA:setoid.λa:A.{b | a=b}.
 
 
 ndefinition singleton ≝ λA:setoid.λa:A.{b | a=b}.
 

-interpretation "singleton" 'singl a = (singleton ? a).*)
\ No newline at end of file
+interpretation "singleton" 'singl a = (singleton ? a).*)
+
+(*
+(* qui non funziona una cippa *)
+ndefinition image: ∀A,B. (carr A → carr B) → Ω \sup A → Ω \sup B ≝
+ λA,B:setoid.λf:carr A → carr B.λSa:Ω \sup A.
+  {y | ∃x. x ∈ Sa ∧ eq_rel (carr B) (eq B) ? ?(*(f x) y*)}.
+  ##[##2: napply (f x); ##|##3: napply y]
+ #a; #a'; #H; nwhd; nnormalize; (* per togliere setoid1_of_setoid *) napply (mk_iff ????);
+ *; #x; #Hx; napply (ex_intro … x)
+  [ napply (. (#‡(#‡#))); 
+
+ndefinition counter_image: ∀A,B. (A → B) → Ω \sup B → Ω \sup A ≝
+ λA,B,f,Sb. {x | ∃y. y ∈ Sb ∧ f x = y}.
+*)