diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-11-21 04:54:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-11-21 04:54:55 +0000 |
| commit | 49727ef97a25730307fdb9622be726e92a41a875 (patch) | |
| tree | 5c6fbb86ff4e49c7ed0d510e76f42d7352005c88 /src/algebra/catdef.spad.pamphlet | |
| parent | 0b97ae7365e5ba3d3e078147124e096f7cccde4b (diff) | |
| download | open-axiom-49727ef97a25730307fdb9622be726e92a41a875.tar.gz | |
* algebra/alql.spad.pamphlet (Database): Now CoercibleFrom List S.
* algebra/asp.spad.pamphlet (Asp20): Now CoercibleFrom MAT FEXPR.
(Asp6): Now CoercibleFrom Vector FEXPR.
* algebra/catdef.spad.pamphlet (Algebra): Extend CoercibleFrom R.
(Ring): Extend CoercibleFrom Integer.
* algebra/formula.spad.pamphlet (ScriptFormulaFormat): Now
CoercibleFrom E.
* algebra/fortran.spad.pamphlet (FortranCode): Remove redundant
signature.
* algebra/fs2ups.spad.pamphlet
(FunctionSpaceToUnivariatePowerSeries): Tidy parameter.
* algebra/laurent.spad.pamphlet
(UnivariateLaurentSeriesConstructorCategory): Extend CoercibleFrom
UTS.
* algebra/manip.spad.pamphlet (PolynomialRoots): Tidy parameter.
* algebra/modmon.spad.pamphlet (ModMonic): Now CoercibleFrom Rep.
* algebra/ore.spad.pamphlet (UnivariateSkewPolynomial): Now
CoercibleFrom Variable x.
Diffstat (limited to 'src/algebra/catdef.spad.pamphlet')
| -rw-r--r-- | src/algebra/catdef.spad.pamphlet | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/algebra/catdef.spad.pamphlet b/src/algebra/catdef.spad.pamphlet index 56860d9f..45d087d0 100644 --- a/src/algebra/catdef.spad.pamphlet +++ b/src/algebra/catdef.spad.pamphlet @@ -149,10 +149,7 @@ AbelianSemiGroup(): Category == SetCategory with ++ \spad{b*x = (b::%)*x} ++ \spad{r*(a*b) = (r*a)*b = a*(r*b)} Algebra(R:CommutativeRing): Category == - Join(Ring, Module R) with - --operations - coerce: R -> % - ++ coerce(r) maps the ring element r to a member of the algebra. + Join(Ring, Module R, CoercibleFrom R) add coerce(x:R):% == x * 1$% @@ -1529,7 +1526,7 @@ RightModule(R:Rng):Category == AbelianGroup with ++ not necessarily commutative. --Ring(): Category == Join(Rng,Monoid,LeftModule(%:Rng)) with -Ring(): Category == Join(Rng,Monoid,LeftModule(%)) with +Ring(): Category == Join(Rng,Monoid,LeftModule(%),CoercibleFrom Integer) with --operations characteristic: () -> NonNegativeInteger ++ characteristic() returns the characteristic of the ring @@ -1537,9 +1534,6 @@ Ring(): Category == Join(Rng,Monoid,LeftModule(%)) with ++ \spad{n*x=0} for all x in the ring, or zero if no such n ++ exists. --We can not make this a constant, since some domains are mutable - coerce: Integer -> % - ++ coerce(i) converts the integer i to a member of the given domain. --- recip: % -> Union(%,"failed") -- inherited from Monoid unitsKnown ++ recip truly yields ++ reciprocal or "failed" if not a unit. |