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/triset.spad.pamphlet | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'src/algebra/triset.spad.pamphlet') diff --git a/src/algebra/triset.spad.pamphlet b/src/algebra/triset.spad.pamphlet index 71281026..cdc53b28 100644 --- a/src/algebra/triset.spad.pamphlet +++ b/src/algebra/triset.spad.pamphlet @@ -893,8 +893,7 @@ PolynomialSetUtilitiesPackage (R,E,V,P) : Exports == Implementation where linear? p == ground? p => false --- one?(mdeg(p)) - (mdeg(p) = 1) + one?(mdeg(p)) linearPolynomials ps == selectPolynomials(linear?,ps) @@ -1032,8 +1031,7 @@ PolynomialSetUtilitiesPackage (R,E,V,P) : Exports == Implementation where bs := (rec::RBT).bas rs := (rec::RBT).top rs := rewriteIdealWithRemainder(rs,bs)$T --- contradiction := ((not empty? rs) and (one? first(rs))) - contradiction := ((not empty? rs) and (first(rs) = 1)) + contradiction := ((not empty? rs) and (one? first(rs))) if not contradiction then rs := concat(rs,autoRemainder(bs)) @@ -1531,19 +1529,16 @@ WuWenTsunTriangularSet(R,E,V,P) : Exports == Implementation where bs := (rec::RBT).bas rs := (rec::RBT).top rs := rewriteIdealWithRemainder(rs,bs) --- contradiction := ((not empty? rs) and (one? first(rs))) - contradiction := ((not empty? rs) and (first(rs) = 1)) + contradiction := ((not empty? rs) and (one? first(rs))) if (not empty? rs) and (not contradiction) then rs := rewriteSetWithReduction(rs,bs,redOp,redOp?) --- contradiction := ((not empty? rs) and (one? first(rs))) - contradiction := ((not empty? rs) and (first(rs) = 1)) + contradiction := ((not empty? rs) and (one? first(rs))) if (not empty? rs) and (not contradiction) then rs := removeDuplicates concat(rs,members(bs)) rs := rewriteIdealWithQuasiMonicGenerators(rs,redOp?,redOp)$pa --- contradiction := ((not empty? rs) and (one? first(rs))) - contradiction := ((not empty? rs) and (first(rs) = 1)) + contradiction := ((not empty? rs) and (one? first(rs))) contradiction => "failed"::Union(RBT,"failed") ([bs,qs]$RBT)::Union(RBT,"failed") @@ -1570,13 +1565,11 @@ WuWenTsunTriangularSet(R,E,V,P) : Exports == Implementation where ms := (rec::RBT).bas qs := (rec::RBT).top qs := rewriteIdealWithRemainder(qs,ms) --- contradiction := ((not empty? qs) and (one? first(qs))) - contradiction := ((not empty? qs) and (first(qs) = 1)) + contradiction := ((not empty? qs) and (one? first(qs))) if not contradiction then rs := rewriteSetWithReduction(qs,ms,lazyPrem,reduced?) --- contradiction := ((not empty? rs) and (one? first(rs))) - contradiction := ((not empty? rs) and (first(rs) = 1)) + contradiction := ((not empty? rs) and (one? first(rs))) if (not contradiction) and (not empty? rs) then qs := removeDuplicates(concat(rs,concat(members(ms),qs))) -- cgit v1.2.3