From 6d93161de89559ad66be655a50d3a5001c208c90 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 8 Feb 2009 01:44:04 +0000 Subject: 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. --- src/algebra/galfact.spad.pamphlet | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'src/algebra/galfact.spad.pamphlet') diff --git a/src/algebra/galfact.spad.pamphlet b/src/algebra/galfact.spad.pamphlet index 0e06b615..92ad2d65 100644 --- a/src/algebra/galfact.spad.pamphlet +++ b/src/algebra/galfact.spad.pamphlet @@ -260,8 +260,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where tc := leadingCoefficient rf rf := reductum rf for p in factors(factor c)$Factored(Z) repeat --- if (one? p.exponent) and (not zero? (lc rem p.factor)) and - if (p.exponent = 1) and (not zero? (lc rem p.factor)) and + if (one? p.exponent) and (not zero? (lc rem p.factor)) and (not zero? (tc rem ((p.factor)**2))) then return true false @@ -298,8 +297,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where fullSet(n:N):Set N == set [ i for i in 0..n ] modularFactor(p:UP):MFact == --- not one? abs(content(p)) => - not (abs(content(p)) = 1) => + not one? abs(content(p)) => error "modularFactor: the polynomial is not primitive." zero? (n := degree p) => [0,[p]] @@ -462,8 +460,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where degf := degree f d := select(#1<=degf,d) if degf<=1 then -- lf exhausted --- if one? degf then - if (degf = 1) then + if one? degf then ltrue := cons(f,ltrue) return ltrue -- 1st exit, all factors found else -- can we go on with the same pk? @@ -576,8 +573,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where b := b+(r::Z) a := 2*a d := gcd(a,b) --- if not one? d then - if not (d = 1) then + if not one? d then a := a quo d b := b quo d f: UP := monomial(a,1)+monomial(b,0) @@ -616,8 +612,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where zero? d => [c,factorlist]$FinalFact -- is f linear? --- one? d => [c,cons([f,1]$ParFact,factorlist)]$FinalFact - (d = 1) => [c,cons([f,1]$ParFact,factorlist)]$FinalFact + one? d => [c,cons([f,1]$ParFact,factorlist)]$FinalFact lcPol: UP := leadingCoefficient(f) :: UP @@ -654,8 +649,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where mult := sqfr.exponent sqff := sqfr.factor d := degree sqff --- one? d => factorlist := cons([sqff,mult]$ParFact,factorlist) - (d = 1) => factorlist := cons([sqff,mult]$ParFact,factorlist) + one? d => factorlist := cons([sqff,mult]$ParFact,factorlist) d=2 => factorlist := append([[pf,mult]$ParFact for pf in quadratic(sqff)], factorlist) @@ -689,8 +683,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where zero? d => [c,factorlist]$FinalFact -- is f linear? --- one? d => [c,cons([f,1]$ParFact,factorlist)]$FinalFact - (d = 1) => [c,cons([f,1]$ParFact,factorlist)]$FinalFact + one? d => [c,cons([f,1]$ParFact,factorlist)]$FinalFact lcPol: UP := leadingCoefficient(f) :: UP @@ -723,8 +716,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where -- f is not square-free : sqfflist := factors squareFree(f) --- if one?(#(sqfflist)) then -- indeed f was a power of a square-free - if ((#(sqfflist)) = 1) then -- indeed f was a power of a square-free + if one?(#(sqfflist)) then -- indeed f was a power of a square-free r := max(r quo ((first sqfflist).exponent),2)::N else r := 2 @@ -732,8 +724,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where mult := sqfr.exponent sqff := sqfr.factor d := degree sqff --- one? d => - (d = 1) => + one? d => factorlist := cons([sqff,mult]$ParFact,factorlist) maxd := (max(fd)-mult)::N fd := select(#1<=maxd,fd) @@ -798,8 +789,7 @@ GaloisGroupFactorizer(UP): Exports == Implementation where factorOfDegree(d:P,p:UP,ld:List N,r:N,sqf:Boolean):Union(UP,"failed") == dp := degree p errorsum?(dp,ld) => error "factorOfDegree: Bad arguments" --- (one? (d::N)) and noLinearFactor?(p) => "failed" - ((d::N) = 1) and noLinearFactor?(p) => "failed" + (one? (d::N)) and noLinearFactor?(p) => "failed" lf := btwFact(p,sqf,makeSet(ld),r).factors for f in lf repeat degree(f.irr)=d => return f.irr -- cgit v1.2.3