aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/gaussian.spad.pamphlet
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2009-05-25 05:29:46 +0000
committerdos-reis <gdr@axiomatics.org>2009-05-25 05:29:46 +0000
commit785f36fcc98e8cbbd206342a73b274bc361508d6 (patch)
tree2cb0c951f79e8fd7a3c77832b9c9098c608d8eb5 /src/algebra/gaussian.spad.pamphlet
parent67eb28e8fcfd246d7f149c00bdd3089e2f606676 (diff)
downloadopen-axiom-785f36fcc98e8cbbd206342a73b274bc361508d6.tar.gz
Partial fix for AW/193 and AW/334.
* algebra/algfunc.spad.pamphlet: Remove OrderedSet requirements. * algebra/combfunc.spad.pamphlet: Likewise. * algebra/defintef.spad.pamphlet: Likewise. * algebra/defintrf.spad.pamphlet: Likewise. * algebra/degred.spad.pamphlet: Likewise. * algebra/efstruc.spad.pamphlet: Likewise. * algebra/elemntry.spad.pamphlet: Likewise. * algebra/expexpan.spad.pamphlet: Likewise. * algebra/expr.spad.pamphlet: Likewise. * algebra/expr2ups.spad.pamphlet: Likewise. * algebra/exprode.spad.pamphlet: Likewise. * algebra/fortran.spad.pamphlet: Likewise. * algebra/fr.spad.pamphlet: Likewise. * algebra/fraction.spad.pamphlet: Likewise. * algebra/fs2expxp.spad.pamphlet: Likewise. * algebra/fspace.spad.pamphlet: Likewise. * algebra/funcpkgs.spad.pamphlet: Likewise. * algebra/gaussian.spad.pamphlet: Likewise. * algebra/genups.spad.pamphlet: Likewise. * algebra/intalg.spad.pamphlet: Likewise. * algebra/intef.spad.pamphlet: Likewise. * algebra/integrat.spad.pamphlet: Likewise. * algebra/intpm.spad.pamphlet: Likewise. * algebra/irexpand.spad.pamphlet: Likewise. * algebra/kl.spad.pamphlet: Likewise. * algebra/laplace.spad.pamphlet: Likewise. * algebra/limitps.spad.pamphlet: Likewise. * algebra/liouv.spad.pamphlet: Likewise. * algebra/manip.spad.pamphlet: Likewise. * algebra/nlode.spad.pamphlet: Likewise. * algebra/odeef.spad.pamphlet: Likewise. * algebra/oderf.spad.pamphlet: Likewise. * algebra/openmath.spad.pamphlet: Likewise. * algebra/patmatch1.spad.pamphlet: Likewise. * algebra/patmatch2.spad.pamphlet: Likewise. * algebra/pfo.spad.pamphlet: Likewise. * algebra/polycat.spad.pamphlet: Likewise. * algebra/primelt.spad.pamphlet: Likewise. * algebra/rdeef.spad.pamphlet: Likewise. * algebra/rdesys.spad.pamphlet: Likewise. * algebra/rule.spad.pamphlet: Likewise. * algebra/solverad.spad.pamphlet: Likewise. * algebra/sum.spad.pamphlet: Likewise. * algebra/transsolve.spad.pamphlet: Likewise. * testsuite/interpreter/aw-193.input: New. * testsuite/interpreter/aw-334.input: Likewise.
Diffstat (limited to 'src/algebra/gaussian.spad.pamphlet')
-rw-r--r--src/algebra/gaussian.spad.pamphlet10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/algebra/gaussian.spad.pamphlet b/src/algebra/gaussian.spad.pamphlet
index abbe8cee..25836835 100644
--- a/src/algebra/gaussian.spad.pamphlet
+++ b/src/algebra/gaussian.spad.pamphlet
@@ -35,7 +35,6 @@ ComplexCategory(R:CommutativeRing): Category ==
imag : % -> R ++ imag(x) returns imaginary part of x.
real : % -> R ++ real(x) returns real part of x.
norm : % -> R ++ norm(x) returns x * conjugate(x)
- if R has OrderedSet then OrderedSet
if R has IntegralDomain then
IntegralDomain
_exquo : (%,R) -> Union(%,"failed")
@@ -77,6 +76,10 @@ ComplexCategory(R:CommutativeRing): Category ==
import MatrixCategoryFunctions2(%, Vector %, Vector %, Matrix %,
R, Vector R, Vector R, Matrix R)
SUP ==> SparseUnivariatePolynomial
+ before?(x,y) ==
+ real x = real y => before?(imag x,imag y)
+ before?(real x,real y)
+
characteristicPolynomial x ==
v := monomial(1,1)$SUP(R)
v**2 - trace(x)*v**1 + norm(x)*v**0
@@ -230,11 +233,6 @@ ComplexCategory(R:CommutativeRing): Category ==
patternMatch(x, p, l)$ComplexPatternMatch(Float, R, %)
- if R has OrderedSet then
- x < y ==
- real x = real y => imag x < imag y
- real x < real y
-
if R has IntegerNumberSystem then
rational? x == zero? imag x