diff options
| author | dos-reis <gdr@axiomatics.org> | 2009-05-25 05:29:46 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2009-05-25 05:29:46 +0000 |
| commit | 785f36fcc98e8cbbd206342a73b274bc361508d6 (patch) | |
| tree | 2cb0c951f79e8fd7a3c77832b9c9098c608d8eb5 /src/algebra/fr.spad.pamphlet | |
| parent | 67eb28e8fcfd246d7f149c00bdd3089e2f606676 (diff) | |
| download | open-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/fr.spad.pamphlet')
| -rw-r--r-- | src/algebra/fr.spad.pamphlet | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/algebra/fr.spad.pamphlet b/src/algebra/fr.spad.pamphlet index fc7ccdc9..082ff876 100644 --- a/src/algebra/fr.spad.pamphlet +++ b/src/algebra/fr.spad.pamphlet @@ -191,8 +191,6 @@ Factored(R: IntegralDomain): Exports == Implementation where empty? rest l => first l binary(convert(_*::Symbol)@InputForm, l)@InputForm - orderedR? := R has OrderedSet - -- Private function signatures: reciprocal : % -> % qexpand : % -> R @@ -288,7 +286,7 @@ Factored(R: IntegralDomain): Exports == Implementation where empty? x => empty() x := sort_!(LispLessP, x) x := SimplifyFactorization1(first x, rest x) - if orderedR? then x := sort_!(LispLessP, x) + x := sort!(LispLessP, x) x SimplifyFactorization1(f, x) == @@ -332,9 +330,7 @@ Factored(R: IntegralDomain): Exports == Implementation where qexpand u LispLessP(y, y1) == - orderedR? => y.fctr < y1.fctr - GGREATERP(y.fctr, y1.fctr)$Lisp => false - true + before?(y.fctr, y1.fctr) stricterFlag(fl1, fl2) == fl1 case "prime" => fl1 @@ -513,7 +509,7 @@ which causes wrong results as soon as units are involved, for example in f1 := rest f1 x1 := concat(y, x1) f3 := rest f3 - if orderedR? then x1 := sort_!(LispLessP, x1) + x1 := sort!(LispLessP, x1) mkFF(1, x1) else -- R not a GCD domain |