X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fmatita%2Fcontribs%2FCoRN-Decl%2Falgebra%2FCSetoidFun.ma;h=f025d8a94bc0d6eee8ef0a6f3985557231f3b624;hb=076f639446efce8d8cf83dcf7ca40b4376fc8c36;hp=d183c70e8b8288e12e228fc1759aa74a636f2e3b;hpb=3199f2a8428b5d19a3a803c1b03d9f90e4120f74;p=helm.git

diff --git a/helm/software/matita/contribs/CoRN-Decl/algebra/CSetoidFun.ma b/helm/software/matita/contribs/CoRN-Decl/algebra/CSetoidFun.ma
index d183c70e8..f025d8a94 100644
--- a/helm/software/matita/contribs/CoRN-Decl/algebra/CSetoidFun.ma
+++ b/helm/software/matita/contribs/CoRN-Decl/algebra/CSetoidFun.ma
@@ -16,14 +16,14 @@
 
 set "baseuri" "cic:/matita/CoRN-Decl/algebra/CSetoidFun".
 
+include "CoRN.ma".
+
 (* $Id: CSetoidFun.v,v 1.10 2004/04/23 10:00:53 lcf Exp $ *)
 
-(* INCLUDE
-CSetoids
-*)
+include "algebra/CSetoids.ma".
 
 (* UNEXPORTED
-Section unary_function_composition.
+Section unary_function_composition
 *)
 
 (*#* ** Composition of Setoid functions
@@ -32,65 +32,65 @@ Let [S1],  [S2] and [S3] be setoids, [f] a
 setoid function from [S1] to [S2], and [g] from [S2]
 to [S3] in the following definition of composition.  *)
 
-inline cic:/CoRN/algebra/CSetoidFun/S1.var.
+alias id "S1" = "cic:/CoRN/algebra/CSetoidFun/unary_function_composition/S1.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/S2.var.
+alias id "S2" = "cic:/CoRN/algebra/CSetoidFun/unary_function_composition/S2.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/S3.var.
+alias id "S3" = "cic:/CoRN/algebra/CSetoidFun/unary_function_composition/S3.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/f.var.
+alias id "f" = "cic:/CoRN/algebra/CSetoidFun/unary_function_composition/f.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/g.var.
+alias id "g" = "cic:/CoRN/algebra/CSetoidFun/unary_function_composition/g.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_fun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_fun.con".
 
 (* UNEXPORTED
-End unary_function_composition.
+End unary_function_composition
 *)
 
 (* UNEXPORTED
-Section unary_and_binary_function_composition.
+Section unary_and_binary_function_composition
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_bin_un_fun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_bin_un_fun.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_bin_fun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_bin_fun.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_un_bin_fun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/compose_CSetoid_un_bin_fun.con".
 
 (* UNEXPORTED
-End unary_and_binary_function_composition.
+End unary_and_binary_function_composition
 *)
 
 (*#* ***Projections
 *)
 
 (* UNEXPORTED
-Section function_projection.
+Section function_projection
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/proj_bin_fun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/proj_bin_fun.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/projected_bin_fun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/projected_bin_fun.con".
 
 (* UNEXPORTED
-End function_projection.
+End function_projection
 *)
 
 (* UNEXPORTED
-Section BinProj.
+Section BinProj
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/S.var.
+alias id "S" = "cic:/CoRN/algebra/CSetoidFun/BinProj/S.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/binproj1.con.
+inline "cic:/CoRN/algebra/CSetoidFun/binproj1.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/binproj1_strext.con.
+inline "cic:/CoRN/algebra/CSetoidFun/binproj1_strext.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/cs_binproj1.con.
+inline "cic:/CoRN/algebra/CSetoidFun/cs_binproj1.con".
 
 (* UNEXPORTED
-End BinProj.
+End BinProj
 *)
 
 (*#* **Combining operations
@@ -99,14 +99,14 @@ End BinProj.
 *)
 
 (* UNEXPORTED
-Section CombiningOperations.
+Section CombiningOperations
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/S1.var.
+alias id "S1" = "cic:/CoRN/algebra/CSetoidFun/CombiningOperations/S1.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/S2.var.
+alias id "S2" = "cic:/CoRN/algebra/CSetoidFun/CombiningOperations/S2.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/S3.var.
+alias id "S3" = "cic:/CoRN/algebra/CSetoidFun/CombiningOperations/S3.var".
 
 (*#*
 In the following definition, we assume [f] is a setoid function from
@@ -115,21 +115,21 @@ Then [opOnFun] is the composition [op] after [f].
 *)
 
 (* UNEXPORTED
-Section CombiningUnaryOperations.
+Section CombiningUnaryOperations
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/f.var.
+alias id "f" = "cic:/CoRN/algebra/CSetoidFun/CombiningOperations/CombiningUnaryOperations/f.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/op.var.
+alias id "op" = "cic:/CoRN/algebra/CSetoidFun/CombiningOperations/CombiningUnaryOperations/op.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/opOnFun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/opOnFun.con".
 
 (* UNEXPORTED
-End CombiningUnaryOperations.
+End CombiningUnaryOperations
 *)
 
 (* UNEXPORTED
-End CombiningOperations.
+End CombiningOperations
 *)
 
 (*#* **Partial Functions
@@ -155,7 +155,7 @@ Before we state our definitions we need to do some work on domains.
 *)
 
 (* UNEXPORTED
-Section SubSets_of_G.
+Section SubSets_of_G
 *)
 
 (*#* ***Subsets of Setoids
@@ -173,80 +173,84 @@ welldefinedness.
 %\end{convention}%
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/S.var.
+alias id "S" = "cic:/CoRN/algebra/CSetoidFun/SubSets_of_G/S.var".
 
 (* UNEXPORTED
-Section Conjunction.
+Section Conjunction
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/P.var.
+alias id "P" = "cic:/CoRN/algebra/CSetoidFun/SubSets_of_G/Conjunction/P.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/Q.var.
+alias id "Q" = "cic:/CoRN/algebra/CSetoidFun/SubSets_of_G/Conjunction/Q.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/conjP.con.
+inline "cic:/CoRN/algebra/CSetoidFun/conjP.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/prj1.con.
+inline "cic:/CoRN/algebra/CSetoidFun/prj1.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/prj2.con.
+inline "cic:/CoRN/algebra/CSetoidFun/prj2.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/conj_wd.con.
+inline "cic:/CoRN/algebra/CSetoidFun/conj_wd.con".
 
 (* UNEXPORTED
-End Conjunction.
+End Conjunction
 *)
 
 (* UNEXPORTED
-Section Disjunction.
+Section Disjunction
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/P.var.
+alias id "P" = "cic:/CoRN/algebra/CSetoidFun/SubSets_of_G/Disjunction/P.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/Q.var.
+alias id "Q" = "cic:/CoRN/algebra/CSetoidFun/SubSets_of_G/Disjunction/Q.var".
 
 (*#*
 Although at this stage we never use it, for completeness's sake we also treat disjunction (corresponding to union of subsets).
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/disj.con.
+inline "cic:/CoRN/algebra/CSetoidFun/disj.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/inj1.con.
+inline "cic:/CoRN/algebra/CSetoidFun/inj1.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/inj2.con.
+inline "cic:/CoRN/algebra/CSetoidFun/inj2.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/disj_wd.con.
+inline "cic:/CoRN/algebra/CSetoidFun/disj_wd.con".
 
 (* UNEXPORTED
-End Disjunction.
+End Disjunction
 *)
 
 (* UNEXPORTED
-Section Extension.
+Section Extension
 *)
 
 (*#*
 The next definition is a bit tricky, and is useful for choosing among the elements that satisfy a predicate [P] those that also satisfy [R] in the case where [R] is only defined for elements satisfying [P]---consider [R] to be a condition on the image of an object via a function with domain [P].  We chose to call this operation [extension].
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/P.var.
+alias id "P" = "cic:/CoRN/algebra/CSetoidFun/SubSets_of_G/Extension/P.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/R.var.
+alias id "R" = "cic:/CoRN/algebra/CSetoidFun/SubSets_of_G/Extension/R.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/extend.con.
+inline "cic:/CoRN/algebra/CSetoidFun/extend.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/ext1.con.
+inline "cic:/CoRN/algebra/CSetoidFun/ext1.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/ext2_a.con.
+inline "cic:/CoRN/algebra/CSetoidFun/ext2_a.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/ext2.con.
+inline "cic:/CoRN/algebra/CSetoidFun/ext2.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/extension_wd.con.
+inline "cic:/CoRN/algebra/CSetoidFun/extension_wd.con".
 
 (* UNEXPORTED
-End Extension.
+End Extension
 *)
 
 (* UNEXPORTED
-End SubSets_of_G.
+End SubSets_of_G
+*)
+
+(* NOTATION
+Notation Conj := (conjP _).
 *)
 
 (* UNEXPORTED
@@ -270,7 +274,13 @@ Implicit Arguments ext2 [S P R x].
 We are now ready to define the concept of partial function between arbitrary setoids.
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/BinPartFunct.ind.
+inline "cic:/CoRN/algebra/CSetoidFun/BinPartFunct.ind".
+
+coercion cic:/matita/CoRN-Decl/algebra/CSetoidFun/bpfpfun.con 0 (* compounds *).
+
+(* NOTATION
+Notation BDom := (bpfdom _ _).
+*)
 
 (* UNEXPORTED
 Implicit Arguments bpfpfun [S1 S2].
@@ -280,11 +290,21 @@ Implicit Arguments bpfpfun [S1 S2].
 The next lemma states that every partial function is well defined.
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/bpfwdef.con.
+inline "cic:/CoRN/algebra/CSetoidFun/bpfwdef.con".
 
 (*#* Similar for automorphisms. *)
 
-inline cic:/CoRN/algebra/CSetoidFun/PartFunct.ind.
+inline "cic:/CoRN/algebra/CSetoidFun/PartFunct.ind".
+
+coercion cic:/matita/CoRN-Decl/algebra/CSetoidFun/pfpfun.con 0 (* compounds *).
+
+(* NOTATION
+Notation Dom := (pfdom _).
+*)
+
+(* NOTATION
+Notation Part := (pfpfun _).
+*)
 
 (* UNEXPORTED
 Implicit Arguments pfpfun [S].
@@ -294,7 +314,7 @@ Implicit Arguments pfpfun [S].
 The next lemma states that every partial function is well defined.
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/pfwdef.con.
+inline "cic:/CoRN/algebra/CSetoidFun/pfwdef.con".
 
 (*#*
 A few characteristics of this definition should be explained:
@@ -345,19 +365,19 @@ Hint Resolve CI: core.
 *)
 
 (* UNEXPORTED
-Section CSetoid_Ops.
+Section CSetoid_Ops
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/S.var.
+alias id "S" = "cic:/CoRN/algebra/CSetoidFun/CSetoid_Ops/S.var".
 
 (*#*
 To begin with, we want to be able to ``see'' each total function as a partial function.
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/total_eq_part.con.
+inline "cic:/CoRN/algebra/CSetoidFun/total_eq_part.con".
 
 (* UNEXPORTED
-Section Part_Function_Const.
+Section Part_Function_Const
 *)
 
 (*#*
@@ -367,22 +387,22 @@ In any setoid we can also define constant functions (one for each element of the
 %\end{convention}%
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/c.var.
+alias id "c" = "cic:/CoRN/algebra/CSetoidFun/CSetoid_Ops/Part_Function_Const/c.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/Fconst.con.
+inline "cic:/CoRN/algebra/CSetoidFun/Fconst.con".
 
 (* UNEXPORTED
-End Part_Function_Const.
+End Part_Function_Const
 *)
 
 (* UNEXPORTED
-Section Part_Function_Id.
+Section Part_Function_Id
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/Fid.con.
+inline "cic:/CoRN/algebra/CSetoidFun/Fid.con".
 
 (* UNEXPORTED
-End Part_Function_Id.
+End Part_Function_Id
 *)
 
 (*#*
@@ -395,35 +415,35 @@ If we have two setoid functions [F] and [G] we can always compose them.  The dom
 *)
 
 (* UNEXPORTED
-Section Part_Function_Composition.
+Section Part_Function_Composition
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/G.var.
+alias id "G" = "cic:/CoRN/algebra/CSetoidFun/CSetoid_Ops/Part_Function_Composition/G.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/F.var.
+alias id "F" = "cic:/CoRN/algebra/CSetoidFun/CSetoid_Ops/Part_Function_Composition/F.var".
 
 (* begin hide *)
 
-inline cic:/CoRN/algebra/CSetoidFun/P.con.
+inline "cic:/CoRN/algebra/CSetoidFun/CSetoid_Ops/Part_Function_Composition/P.con" "CSetoid_Ops__Part_Function_Composition__".
 
-inline cic:/CoRN/algebra/CSetoidFun/Q.con.
+inline "cic:/CoRN/algebra/CSetoidFun/CSetoid_Ops/Part_Function_Composition/Q.con" "CSetoid_Ops__Part_Function_Composition__".
 
 (* end hide *)
 
-inline cic:/CoRN/algebra/CSetoidFun/R.con.
+inline "cic:/CoRN/algebra/CSetoidFun/CSetoid_Ops/Part_Function_Composition/R.con" "CSetoid_Ops__Part_Function_Composition__".
 
-inline cic:/CoRN/algebra/CSetoidFun/part_function_comp_strext.con.
+inline "cic:/CoRN/algebra/CSetoidFun/part_function_comp_strext.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/part_function_comp_dom_wd.con.
+inline "cic:/CoRN/algebra/CSetoidFun/part_function_comp_dom_wd.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/Fcomp.con.
+inline "cic:/CoRN/algebra/CSetoidFun/Fcomp.con".
 
 (* UNEXPORTED
-End Part_Function_Composition.
+End Part_Function_Composition
 *)
 
 (* UNEXPORTED
-End CSetoid_Ops.
+End CSetoid_Ops
 *)
 
 (*#*
@@ -432,37 +452,37 @@ End CSetoid_Ops.
 *)
 
 (* UNEXPORTED
-Section BinPart_Function_Composition.
+Section BinPart_Function_Composition
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/S1.var.
+alias id "S1" = "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/S1.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/S2.var.
+alias id "S2" = "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/S2.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/S3.var.
+alias id "S3" = "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/S3.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/G.var.
+alias id "G" = "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/G.var".
 
-inline cic:/CoRN/algebra/CSetoidFun/F.var.
+alias id "F" = "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/F.var".
 
 (* begin hide *)
 
-inline cic:/CoRN/algebra/CSetoidFun/P.con.
+inline "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/P.con" "BinPart_Function_Composition__".
 
-inline cic:/CoRN/algebra/CSetoidFun/Q.con.
+inline "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/Q.con" "BinPart_Function_Composition__".
 
 (* end hide *)
 
-inline cic:/CoRN/algebra/CSetoidFun/R.con.
+inline "cic:/CoRN/algebra/CSetoidFun/BinPart_Function_Composition/R.con" "BinPart_Function_Composition__".
 
-inline cic:/CoRN/algebra/CSetoidFun/bin_part_function_comp_strext.con.
+inline "cic:/CoRN/algebra/CSetoidFun/bin_part_function_comp_strext.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/bin_part_function_comp_dom_wd.con.
+inline "cic:/CoRN/algebra/CSetoidFun/bin_part_function_comp_dom_wd.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/BinFcomp.con.
+inline "cic:/CoRN/algebra/CSetoidFun/BinFcomp.con".
 
 (* UNEXPORTED
-End BinPart_Function_Composition.
+End BinPart_Function_Composition
 *)
 
 (* Different tokens for compatibility with coqdoc *)
@@ -471,25 +491,37 @@ End BinPart_Function_Composition.
 Implicit Arguments Fconst [S].
 *)
 
+(* NOTATION
+Notation "[-C-] x" := (Fconst x) (at level 2, right associativity).
+*)
+
+(* NOTATION
+Notation FId := (Fid _).
+*)
+
 (* UNEXPORTED
 Implicit Arguments Fcomp [S].
 *)
 
+(* NOTATION
+Infix "[o]" := Fcomp (at level 65, no associativity).
+*)
+
 (* UNEXPORTED
 Hint Resolve pfwdef bpfwdef: algebra.
 *)
 
 (* UNEXPORTED
-Section bijections.
+Section bijections
 *)
 
 (*#* **Bijections *)
 
-inline cic:/CoRN/algebra/CSetoidFun/injective.con.
+inline "cic:/CoRN/algebra/CSetoidFun/injective.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/injective_weak.con.
+inline "cic:/CoRN/algebra/CSetoidFun/injective_weak.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/surjective.con.
+inline "cic:/CoRN/algebra/CSetoidFun/surjective.con".
 
 (* UNEXPORTED
 Implicit Arguments injective [A B].
@@ -503,46 +535,46 @@ Implicit Arguments injective_weak [A B].
 Implicit Arguments surjective [A B].
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/injective_imp_injective_weak.con.
+inline "cic:/CoRN/algebra/CSetoidFun/injective_imp_injective_weak.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/bijective.con.
+inline "cic:/CoRN/algebra/CSetoidFun/bijective.con".
 
 (* UNEXPORTED
 Implicit Arguments bijective [A B].
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/id_is_bij.con.
+inline "cic:/CoRN/algebra/CSetoidFun/id_is_bij.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/comp_resp_bij.con.
+inline "cic:/CoRN/algebra/CSetoidFun/comp_resp_bij.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/inv.con.
+inline "cic:/CoRN/algebra/CSetoidFun/inv.con".
 
 (* UNEXPORTED
 Implicit Arguments inv [A B].
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/invfun.con.
+inline "cic:/CoRN/algebra/CSetoidFun/invfun.con".
 
 (* UNEXPORTED
 Implicit Arguments invfun [A B].
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/inv1.con.
+inline "cic:/CoRN/algebra/CSetoidFun/inv1.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/inv2.con.
+inline "cic:/CoRN/algebra/CSetoidFun/inv2.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/inv_strext.con.
+inline "cic:/CoRN/algebra/CSetoidFun/inv_strext.con".
 
-inline cic:/CoRN/algebra/CSetoidFun/Inv.con.
+inline "cic:/CoRN/algebra/CSetoidFun/Inv.con".
 
 (* UNEXPORTED
 Implicit Arguments Inv [A B].
 *)
 
-inline cic:/CoRN/algebra/CSetoidFun/Inv_bij.con.
+inline "cic:/CoRN/algebra/CSetoidFun/Inv_bij.con".
 
 (* UNEXPORTED
-End bijections.
+End bijections
 *)
 
 (* UNEXPORTED
@@ -577,3 +609,11 @@ Implicit Arguments Inv [A B].
 Implicit Arguments conj_wd [S P Q].
 *)
 
+(* NOTATION
+Notation Prj1 := (prj1 _ _ _ _).
+*)
+
+(* NOTATION
+Notation Prj2 := (prj2 _ _ _ _).
+*)
+