diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-21 13:11:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-21 13:11:55 +0000 |
| commit | 79cbfd0098caff35ed453782986ddcc8fa9ae142 (patch) | |
| tree | 75603cfdc01c3bb15c33bb27961e36009110fed5 /src/algebra/newpoly.spad.pamphlet | |
| parent | 7e65db21249e99bfcfd0a8ccf5debee565e3acde (diff) | |
| download | open-axiom-79cbfd0098caff35ed453782986ddcc8fa9ae142.tar.gz | |
* interp/nlib.lisp (COMPILE-LIB-FILE): Rework. Halt compilation
if generated is malformed or contains serious warnings.
* algebra/pfo.spad.pamphlet (PointsOfFiniteOrder) [cmult]: Merge
local conditional definitions.
* algebra/permgrps.spad.pamphlet (PermutationGroup) [cosetRep]:
Don't forget to return a value.
* algebra/newpoly.spad.pamphlet (RecursivePolynomialCategory)
[exactQuo]: Merge conditional local definitions.
[ZToR]: Inline at sole use point. Remove conditional definitions.
[QToR]: Likewise.
[PZToPR]: Likewise.
[PQToPR]: Likewise.
* algebra/naalgc.spad.pamphlet (FramedNonAssociativeAlgebra)
[leftRankPolynomial]: Initialize local variable xx.
(rightRankPolynomial): Likewise.
* algebra/multsqfr.spad.pamphlet (MultivariateSquareFree)
[intChoose]: Error if no solution is found in the loop.
* algebra/mts.spad.pamphlet (SparseMultivariateTaylorSeries): Tidy.
[stream] Remove duplicate definition.
* algebra/d01routine.spad.pamphlet (d01anfAnnaType) [measure]: Tidy.
(d01asfAnnaType) [measure]: Likewise.
* algebra/d01transform.spad.pamphlet (d01TransformFunctionType)
[measure]: Likewise.
* algebra/forttyp.spad.pamphlet (FortranScalarType) [coerce]: Likewise.
Diffstat (limited to 'src/algebra/newpoly.spad.pamphlet')
| -rw-r--r-- | src/algebra/newpoly.spad.pamphlet | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/src/algebra/newpoly.spad.pamphlet b/src/algebra/newpoly.spad.pamphlet index 23cd07b7..573a085f 100644 --- a/src/algebra/newpoly.spad.pamphlet +++ b/src/algebra/newpoly.spad.pamphlet @@ -1029,13 +1029,9 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca if R has IntegralDomain then - if R has EuclideanDomain - then - exactQuo(r:R,s:R):R == - r quo$R s - else - exactQuo(r:R,s:R):R == - (r exquo$R s)::R + exactQuo(r:R,s:R):R == + R has EuclideanDomain => r quo$R s + (r exquo$R s)::R exactQuotient (p:$,r:R) == (p exquo$$ r)::$ @@ -1215,10 +1211,6 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca mpc2Z := MPolyCatFunctions2(Symbol,IES,IES,Z,R,PZ,PR) mpc2Q := MPolyCatFunctions2(Symbol,IES,IES,Q,R,PQ,PR) - ZToR (z:Z):R == coerce(z)@R - QToR (q:Q):R == coerce(q)@R - PZToPR (pz:PZ):PR == map(ZToR,pz)$mpc2Z - PQToPR (pq:PQ):PR == map(QToR,pq)$mpc2Q retract(pz:PZ) == rif : Union($,"failed") := retractIfCan(pz)@Union($,"failed") @@ -1250,11 +1242,11 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca localRetractIfCanPQ(pq)@Union($,"failed") else retractIfCan(pq:PQ) == - pr : PR := PQToPR(pq) + pr : PR := map(#1::R,pq)$mpc2Q retractIfCan(pr)@Union($,"failed") retractIfCan(pz:PZ) == - pr : PR := PZToPR(pz) + pr : PR := map(#1::R,pz)$mpc2Z retractIfCan(pr)@Union($,"failed") retract(pr:PR) == @@ -1298,8 +1290,6 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca then mpc2Z := MPolyCatFunctions2(Symbol,IES,IES,Z,R,PZ,PR) - ZToR (z:Z):R == coerce(z)@R - PZToPR (pz:PZ):PR == map(ZToR,pz)$mpc2Z retract(pz:PZ) == rif : Union($,"failed") := retractIfCan(pz)@Union($,"failed") @@ -1323,7 +1313,7 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca localRetractIfCanPZ(pz)@Union($,"failed") else retractIfCan(pz:PZ) == - pr : PR := PZToPR(pz) + pr : PR := map(#1::R,pz)$mpc2Z retractIfCan(pr)@Union($,"failed") retract(pr:PR) == |