diff options
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/Makefile.am | 2 | ||||
| -rw-r--r-- | src/algebra/Makefile.in | 2 | ||||
| -rw-r--r-- | src/algebra/aggcat.spad.pamphlet | 8 | ||||
| -rw-r--r-- | src/algebra/exposed.lsp.pamphlet | 1 |
4 files changed, 8 insertions, 5 deletions
diff --git a/src/algebra/Makefile.am b/src/algebra/Makefile.am index 9a44eddb..0b2a6854 100644 --- a/src/algebra/Makefile.am +++ b/src/algebra/Makefile.am @@ -1485,7 +1485,7 @@ oa_algebra_layer_0 = \ FSAGG FSAGG- STAGG STAGG- CLAGG CLAGG- \ RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ - DIOPS DIOPS- STRING FINAGG \ + DIOPS DIOPS- STRING FINAGG FINAGG- \ LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ RTVALUE SYSPTR PDDOM PDDOM- PDSPC PDSPC- \ diff --git a/src/algebra/Makefile.in b/src/algebra/Makefile.in index 388c2ef9..94f58422 100644 --- a/src/algebra/Makefile.in +++ b/src/algebra/Makefile.in @@ -740,7 +740,7 @@ oa_algebra_layer_0 = \ FSAGG FSAGG- STAGG STAGG- CLAGG CLAGG- \ RCAGG RCAGG- SETAGG SETAGG- HOAGG HOAGG- \ TBAGG TBAGG- KDAGG KDAGG- DIAGG DIAGG- \ - DIOPS DIOPS- STRING FINAGG \ + DIOPS DIOPS- STRING FINAGG FINAGG- \ LIST DIFFDOM DIFFDOM- DIFFSPC DIFFSPC- DIFFMOD \ LINEXP PATMAB REAL CHARZ LOGIC LOGIC- \ RTVALUE SYSPTR PDDOM PDDOM- PDSPC PDSPC- \ diff --git a/src/algebra/aggcat.spad.pamphlet b/src/algebra/aggcat.spad.pamphlet index f95287ad..ebbf2f97 100644 --- a/src/algebra/aggcat.spad.pamphlet +++ b/src/algebra/aggcat.spad.pamphlet @@ -122,7 +122,7 @@ HomogeneousAggregate(S:Type): Category == Aggregate with members: % -> List S ++ members(u) returns a list of the consecutive elements of u. ++ For collections, \axiom{parts([x,y,...,z]) = (x,y,...,z)}. - if S has SetCategory then + if S has BasicType then count: (S,%) -> NonNegativeInteger ++ count(x,u) returns the number of occurrences of x in u. ++ For collections, \axiom{count(x,u) = reduce(+,[x=y for y in u],0)}. @@ -145,7 +145,7 @@ HomogeneousAggregate(S:Type): Category == Aggregate with x = y == #x = #y and (and/[a = b for a in parts x for b in parts y]) - if S has SetCategory then + if S has BasicType then count(s:S, x:%) == count(s = #1, x) member?(e, c) == any?(e = #1,c) @@ -188,7 +188,7 @@ FiniteAggregate(S: Type): Category == Exports where members: % -> List S ++ \spad{members(u)} returns a list of the consecutive elements of u. ++ For collections, \axiom{parts([x,y,...,z]) = (x,y,...,z)}. - if S has SetCategory then + if S has BasicType then count: (S,%) -> NonNegativeInteger ++ \spad{count(x,u)} returns the number of occurrences ++ of \spad{x} in \spad{u}. @@ -197,6 +197,8 @@ FiniteAggregate(S: Type): Category == Exports where ++ \spad{member?(x,u)} tests if \spad{x} is a member of \spad{u}. ++ For collections, ++ \axiom{member?(x,u) = reduce(or,[x=y for y in u],false)}. + add + empty? x == #x = 0 @ diff --git a/src/algebra/exposed.lsp.pamphlet b/src/algebra/exposed.lsp.pamphlet index 33084c13..221e7b9f 100644 --- a/src/algebra/exposed.lsp.pamphlet +++ b/src/algebra/exposed.lsp.pamphlet @@ -1120,6 +1120,7 @@ (|Field&| . FIELD-) (|FieldOfPrimeCharacteristic&| . FPC-) (|FiniteAbelianMonoidRing&| . FAMR-) + (|FiniteAggregate&| . FINAGG-) (|FiniteAlgebraicExtensionField&| . FAXF-) (|FiniteDivisorCategory&| . FDIVCAT-) (|FiniteFieldCategory&| . FFIELDC-) |