diff options
author | dos-reis <gdr@axiomatics.org> | 2009-02-08 01:44:04 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2009-02-08 01:44:04 +0000 |
commit | 6d93161de89559ad66be655a50d3a5001c208c90 (patch) | |
tree | 30e165f0c3cf7d8eb28fae9fa9fc9dcf0acd3ab8 /src/algebra/crfp.spad.pamphlet | |
parent | 2fbcd8bc4f97cc3e534e11414f5a12dbc08edf2d (diff) | |
download | open-axiom-6d93161de89559ad66be655a50d3a5001c208c90.tar.gz |
Fix AW/66
* algebra/zerodim.spad.pamphlet: Restore use of one?
* algebra/updivp.spad.pamphlet: Likewise.
* algebra/unifact.spad.pamphlet: Likewise.
* algebra/triset.spad.pamphlet: Likewise.
* algebra/tools.spad.pamphlet: Likewise.
* algebra/suts.spad.pamphlet: Likewise.
* algebra/sttaylor.spad.pamphlet: Likewise.
* algebra/string.spad.pamphlet: Likewise.
* algebra/sregset.spad.pamphlet: Likewise.
* algebra/si.spad.pamphlet: Likewise.
* algebra/sf.spad.pamphlet: Likewise.
* algebra/riccati.spad.pamphlet: Likewise.
* algebra/rf.spad.pamphlet: Likewise.
* algebra/regset.spad.pamphlet: Likewise.
* algebra/rderf.spad.pamphlet: Likewise.
* algebra/rdeef.spad.pamphlet: Likewise.
* algebra/quat.spad.pamphlet: Likewise.
* algebra/puiseux.spad.pamphlet: Likewise.
* algebra/pscat.spad.pamphlet: Likewise.
* algebra/prtition.spad.pamphlet: Likewise.
* algebra/prs.spad.pamphlet: Likewise.
* algebra/primelt.spad.pamphlet: Likewise.
* algebra/polycat.spad.pamphlet: Likewise.
* algebra/poly.spad.pamphlet: Likewise.
* algebra/polset.spad.pamphlet: Likewise.
* algebra/pfo.spad.pamphlet: Likewise.
* algebra/perm.spad.pamphlet: Likewise.
* algebra/pattern.spad.pamphlet: Likewise.
* algebra/padiclib.spad.pamphlet:Likewise.
* algebra/openmath.spad.pamphlet: Likewise.
* algebra/opalg.spad.pamphlet: Likewise.
* algebra/op.spad.pamphlet: Likewise.
* algebra/omerror.spad.pamphlet: Likewise.
* algebra/oderf.spad.pamphlet: Likewise.
* algebra/odeef.spad.pamphlet: Likewise.
* algebra/oct.spad.pamphlet: Likewise.
* algebra/nlinsol.spad.pamphlet: Likewise.
* algebra/newpoly.spad.pamphlet: Likewise.
* algebra/naalgc.spad.pamphlet: Likewise.
* algebra/naalg.spad.pamphlet: Likewise.
* algebra/multpoly.spad.pamphlet: Likewise.
* algebra/mring.spad.pamphlet: Likewise.
* algebra/modring.spad.pamphlet: Likewise.
* algebra/moddfact.spad.pamphlet: Likewise.
* algebra/mkfunc.spad.pamphlet: Likewise.
* algebra/matstor.spad.pamphlet: Likewise.
* algebra/matrix.spad.pamphlet: Likewise.
* algebra/matcat.spad.pamphlet: Likewise.
* algebra/manip.spad.pamphlet: Likewise.
* algebra/lodof.spad.pamphlet: Likewise.
* algebra/liouv.spad.pamphlet: Likewise.
* algebra/laplace.spad.pamphlet: Likewise.
* algebra/irexpand.spad.pamphlet: Likewise.
* algebra/intrf.spad.pamphlet: Likewise.
* algebra/intpm.spad.pamphlet: Likewise.
* algebra/intfact.spad.pamphlet: Likewise.
* algebra/integer.spad.pamphlet: Likewise.
* algebra/intclos.spad.pamphlet: Likewise.
* algebra/intaux.spad.pamphlet: Likewise.
* algebra/intalg.spad.pamphlet: Likewise.
* algebra/intaf.spad.pamphlet: Likewise.
* algebra/gpol.spad.pamphlet: Likewise.
* algebra/gpgcd.spad.pamphlet: Likewise.
* algebra/gb.spad.pamphlet: Likewise.
* algebra/gaussian.spad.pamphlet: Likewise.
* algebra/galutil.spad.pamphlet: Likewise.
* algebra/galpolyu.spad.pamphlet: Likewise.
* algebra/galfact.spad.pamphlet: Likewise.
* algebra/fspace.spad.pamphlet: Likewise.
* algebra/fs2ups.spad.pamphlet: Likewise.
* algebra/fs2expxp.spad.pamphlet: Likewise.
* algebra/free.spad.pamphlet: Likewise.
* algebra/fraction.spad.pamphlet: Likewise.
* algebra/fr.spad.pamphlet: Likewise.
* algebra/fparfrac.spad.pamphlet: Likewise.
* algebra/fortran.spad.pamphlet: Likewise.
* algebra/fmod.spad.pamphlet: Likewise.
* algebra/float.spad.pamphlet: Likewise.
* algebra/ffx.spad.pamphlet: Likewise.
* algebra/ffnb.spad.pamphlet: Likewise.
* algebra/ffcg.spad.pamphlet: Likewise.
* algebra/ffcat.spad.pamphlet: Likewise.
* algebra/exprode.spad.pamphlet: Likewise.
* algebra/expr.spad.pamphlet: Likewise.
* algebra/expexpan.spad.pamphlet: Likewise.
* algebra/elemntry.spad.pamphlet: Likewise.
* algebra/efupxs.spad.pamphlet: Likewise.
* algebra/efuls.spad.pamphlet: Likewise.
* algebra/e04routine.spad.pamphlet: Likewise.
* algebra/e04agents.spad.pamphlet: Likewise.
* algebra/divisor.spad.pamphlet: Likewise.
* algebra/derham.spad.pamphlet: Likewise.
* algebra/defintrf.spad.pamphlet: Likewise.
* algebra/defintef.spad.pamphlet: Likewise.
* algebra/defaults.spad.pamphlet: Likewise.
* algebra/d03agents.spad.pamphlet: Likewise.
* algebra/d01weights.spad.pamphlet: Likewise.
* algebra/d01routine.spad.pamphlet: Likewise.
* algebra/d01agents.spad.pamphlet: Likewise.
* algebra/curve.spad.pamphlet: Likewise.
* algebra/crfp.spad.pamphlet: Likewise.
* algebra/cont.spad.pamphlet: Likewise.
* algebra/constant.spad.pamphlet: Likewise.
* algebra/complet.spad.pamphlet: Likewise.
* algebra/combfunc.spad.pamphlet: Likewise.
* algebra/catdef.spad.pamphlet: Likewise.
* algebra/brill.spad.pamphlet: Likewise.
* algebra/array1.spad.pamphlet: Likewise.
* algebra/algfunc.spad.pamphlet: Likewise.
* algebra/algfact.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/crfp.spad.pamphlet')
-rw-r--r-- | src/algebra/crfp.spad.pamphlet | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/algebra/crfp.spad.pamphlet b/src/algebra/crfp.spad.pamphlet index b2291289..3d26fbbd 100644 --- a/src/algebra/crfp.spad.pamphlet +++ b/src/algebra/crfp.spad.pamphlet @@ -240,8 +240,7 @@ ComplexRootFindingPackage(R, UP): public == private where p := p quo monomial(1,md)$UP sP : Record(start: UP, factors: FR UP) := startPolynomial p fp : FR UP := sP.factors --- if not one? fp then - if not (fp = 1) then + if not one? fp then qr: Record(quotient: UP, remainder: UP):= divide(p,makeMonic expand fp) p := qr.quotient st := sP.start @@ -275,16 +274,14 @@ ComplexRootFindingPackage(R, UP): public == private where for fac in split.factors repeat fp := --- one? degree fac => fp * nilFactor(fac,1)$(FR UP) - (degree fac = 1) => fp * nilFactor(fac,1)$(FR UP) + one? degree fac => fp * nilFactor(fac,1)$(FR UP) fp * irreducibleFactor(fac,1)$(FR UP) fp startPolynomial p == -- assume minimumDegree is 0 --print (p :: OF) fp : FR UP := 1 --- one? degree p => - (degree p = 1) => + one? degree p => p := makeMonic p [p,irreducibleFactor(p,1)] startPoly : UP := monomial(1,1)$UP @@ -458,8 +455,7 @@ ComplexRootFindingPackage(R, UP): public == private where --eps0 : R := eps / den -- for now only eps0 : R := eps / (ten*ten) --- one? d => irreducibleFactor(poly,1)$(FR UP) - (d = 1) => irreducibleFactor(poly,1)$(FR UP) + one? d => irreducibleFactor(poly,1)$(FR UP) listOfFactors : L Record(factor: UP,exponent: I) :=_ list [makeMonic poly,1] if info then @@ -475,8 +471,7 @@ ComplexRootFindingPackage(R, UP): public == private where lof : L OF := ["just now we try to split the polynomial:",p::OF] print vconcat lof split : FR UP := pleskenSplit(p, eps0, info) --- one? numberOfFactors split => - (numberOfFactors split = 1) => + one? numberOfFactors split => -- in a later version we will change error bound and -- accuracy here to deal this case as well lof : L OF := ["factor: couldn't split factor",_ @@ -489,8 +484,7 @@ ComplexRootFindingPackage(R, UP): public == private where for rec in factors(split)$(FR UP) repeat newFactor : UP := rec.factor expOfFactor := exponentOfp * rec.exponent --- one? degree newFactor => - (degree newFactor = 1) => + one? degree newFactor => result := result * nilFactor(newFactor,expOfFactor) listOfFactors:=cons([newFactor,expOfFactor],_ listOfFactors) |