diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-06-21 03:16:39 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-06-21 03:16:39 +0000 |
| commit | afaaaac2b55741bfe43099f819fd4a9592b1c022 (patch) | |
| tree | 7a5bbd28009759b1c787d3df4c4ba5960cd11280 /src/algebra/newpoly.spad.pamphlet | |
| parent | 640d839b4de4d0daf0dde00ba08eab6d264160ad (diff) | |
| download | open-axiom-afaaaac2b55741bfe43099f819fd4a9592b1c022.tar.gz | |
Revert previous erroneous commit
Diffstat (limited to 'src/algebra/newpoly.spad.pamphlet')
| -rw-r--r-- | src/algebra/newpoly.spad.pamphlet | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/algebra/newpoly.spad.pamphlet b/src/algebra/newpoly.spad.pamphlet index 88fb5070..23cd07b7 100644 --- a/src/algebra/newpoly.spad.pamphlet +++ b/src/algebra/newpoly.spad.pamphlet @@ -1029,9 +1029,13 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca if R has IntegralDomain then - exactQuo(r:R,s:R):R == - R has EuclideanDomain => r quo$R s - (r exquo$R s)::R + 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 exactQuotient (p:$,r:R) == (p exquo$$ r)::$ @@ -1211,7 +1215,9 @@ 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) == @@ -1248,7 +1254,7 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca retractIfCan(pr)@Union($,"failed") retractIfCan(pz:PZ) == - pr : PR := map(#1::R,pz)$mpc2Z + pr : PR := PZToPR(pz) retractIfCan(pr)@Union($,"failed") retract(pr:PR) == @@ -1292,6 +1298,8 @@ 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") @@ -1315,7 +1323,7 @@ RecursivePolynomialCategory(R:Ring, E:OrderedAbelianMonoidSup, V:OrderedSet): Ca localRetractIfCanPZ(pz)@Union($,"failed") else retractIfCan(pz:PZ) == - pr : PR := map(#1::R,pz)$mpc2Z + pr : PR := PZToPR(pz) retractIfCan(pr)@Union($,"failed") retract(pr:PR) == |