diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-12-05 07:38:09 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-12-05 07:38:09 +0000 |
| commit | dd55b5ac1701d057ec49a45bfbc790f628757b52 (patch) | |
| tree | 3315c4e42e463924750f565f2e4e5da1a7b1683c /src/algebra | |
| parent | b18855381e61c452349e46e79e9b83ebd1a94dee (diff) | |
| download | open-axiom-dd55b5ac1701d057ec49a45bfbc790f628757b52.tar.gz | |
r12404@gauss: gdr | 2008-12-04 21:21:54 -0600
Branch for fixing CoercibleFrom changes.
r12405@gauss: gdr | 2008-12-05 01:34:50 -0600
* algebra/fs2ups.spad.pamphlet
(FunctionSpaceToUnivariatePowerSeries): Revert previous
requirement change on parameter.
* algebra/manip.spad.pamphlet (PolynomialRoots): Likewise.
* algebra/rf.spad.pamphlet (PolynomialCategoryQuotientFunctions):
Likewise.
* algebra/sum.spad.pamphlet (GosperSummationMethod): Likewise.
* share/algebra: Update databases.
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/fs2ups.spad.pamphlet | 2 | ||||
| -rw-r--r-- | src/algebra/manip.spad.pamphlet | 3 | ||||
| -rw-r--r-- | src/algebra/rf.spad.pamphlet | 3 | ||||
| -rw-r--r-- | src/algebra/sum.spad.pamphlet | 4 |
4 files changed, 7 insertions, 5 deletions
diff --git a/src/algebra/fs2ups.spad.pamphlet b/src/algebra/fs2ups.spad.pamphlet index a27834ae..b43416e3 100644 --- a/src/algebra/fs2ups.spad.pamphlet +++ b/src/algebra/fs2ups.spad.pamphlet @@ -34,7 +34,7 @@ FunctionSpaceToUnivariatePowerSeries(R,FE,Expon,UPS,TRAN,x):_ R : Join(GcdDomain,OrderedSet,RetractableTo Integer,_ LinearlyExplicitRingOver Integer) FE : Join(AlgebraicallyClosedField,TranscendentalFunctionCategory,_ - FunctionSpace R, CoercibleFrom Expon) + FunctionSpace R) with coerce: Expon -> % Expon : OrderedRing UPS : Join(UnivariatePowerSeriesCategory(FE,Expon),Field,_ TranscendentalFunctionCategory) diff --git a/src/algebra/manip.spad.pamphlet b/src/algebra/manip.spad.pamphlet index cfe3fcc6..afdb165c 100644 --- a/src/algebra/manip.spad.pamphlet +++ b/src/algebra/manip.spad.pamphlet @@ -67,7 +67,8 @@ PolynomialRoots(E, V, R, P, F):Exports == Implementation where V: OrderedSet R: IntegralDomain P: PolynomialCategory(R, E, V) - F: Join(Field,CoercibleFrom P) with + F: Field with + coerce: P -> % numer : $ -> P ++ numer(x) \undocumented denom : $ -> P diff --git a/src/algebra/rf.spad.pamphlet b/src/algebra/rf.spad.pamphlet index 764a50a7..c8e40f71 100644 --- a/src/algebra/rf.spad.pamphlet +++ b/src/algebra/rf.spad.pamphlet @@ -26,7 +26,8 @@ PolynomialCategoryQuotientFunctions(E, V, R, P, F): V: OrderedSet R: Ring P: PolynomialCategory(R, E, V) - F: Join(Field,CoercibleFrom P) with + F: Field with + coerce: P -> % numer : % -> P denom : % -> P diff --git a/src/algebra/sum.spad.pamphlet b/src/algebra/sum.spad.pamphlet index a4eef16f..e866dc11 100644 --- a/src/algebra/sum.spad.pamphlet +++ b/src/algebra/sum.spad.pamphlet @@ -79,8 +79,8 @@ GosperSummationMethod(E, V, R, P, Q): Exports == Impl where V: OrderedSet R: IntegralDomain P: PolynomialCategory(R, E, V) - Q: Join(RetractableTo Fraction Integer, CoercibleFrom P, Field with - (numer : % -> P; denom : % -> P)) + Q: Join(RetractableTo Fraction Integer, Field with + (coerce: P -> %; numer : % -> P; denom : % -> P)) I ==> Integer RN ==> Fraction I |