diff options
| author | dos-reis <gdr@axiomatics.org> | 2008-08-31 13:56:20 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2008-08-31 13:56:20 +0000 |
| commit | e8df02fd0970cad96e174ffb5b7707081266f371 (patch) | |
| tree | 5e5322ecc176e9e8bb2bc5caad00409a0a687f42 /src/algebra/multfact.spad.pamphlet | |
| parent | 3c58b07e75e2c6cc1cd57d2902aa305335161e5e (diff) | |
| download | open-axiom-e8df02fd0970cad96e174ffb5b7707081266f371.tar.gz | |
* algebra/boolean.spad.pamphlet (Boolean): Remove definition of
operator ^.
* algebra/aggcat.spad.pamphlet (BitAggregate): Likewise.
* algebra/color.spad.pamphlet: Replace use of '^' as logical
negation by 'not'.
* algebra/ddfact.spad.pamphlet: Likewise.
* algebra/fortran.spad.pamphlet: Likewise.
* algebra/gaussfac.spad.pamphlet: Likewise.
* algebra/gbeuclid.spad.pamphlet: Likewise.
* algebra/gbintern.spad.pamphlet: Likewise.
* algebra/ghensel.spad.pamphlet: Likewise.
* algebra/groebsol.spad.pamphlet: Likewise.
* algebra/ideal.spad.pamphlet: Likewise.
* algebra/idecomp.spad.pamphlet: Likewise.
* algebra/indexedp.spad.pamphlet: Likewise.
* algebra/listgcd.spad.pamphlet: Likewise.
* algebra/mfinfact.spad.pamphlet: Likewise.
* algebra/modgcd.spad.pamphlet: Likewise.
* algebra/multfact.spad.pamphlet: Likewise.
* algebra/multsqfr.spad.pamphlet: Likewise.
* algebra/newpoint.spad.pamphlet: Likewise.
* algebra/npcoef.spad.pamphlet: Likewise.
* algebra/permgrps.spad.pamphlet: Likewise.
* algebra/pgcd.spad.pamphlet: Likewise.
* algebra/pleqn.spad.pamphlet: Likewise.
* algebra/qalgset.spad.pamphlet: Likewise.
* algebra/radeigen.spad.pamphlet: Likewise.
* algebra/rep2.spad.pamphlet: Likewise.
* algebra/solverad.spad.pamphlet: Likewise.
* algebra/space.spad.pamphlet: Likewise.
* algebra/view2D.spad.pamphlet: Likewise.
* algebra/strap/: Update cached Lisp translateion
* share/algebra/: Update databases.
Diffstat (limited to 'src/algebra/multfact.spad.pamphlet')
| -rw-r--r-- | src/algebra/multfact.spad.pamphlet | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/algebra/multfact.spad.pamphlet b/src/algebra/multfact.spad.pamphlet index 0aa0bb59..8e5cf942 100644 --- a/src/algebra/multfact.spad.pamphlet +++ b/src/algebra/multfact.spad.pamphlet @@ -223,7 +223,7 @@ InnerMultFact(OV,E,R,P) : C == T degum ~= degree newm or minimumDegree newm ~=0 => range:=2*range lffc1:=content newm newm:=(newm exquo lffc1)::BP - testp and leadtest and ^ polCase(lffc1*clc,#plist,leadcomp1) + testp and leadtest and not polCase(lffc1*clc,#plist,leadcomp1) => range:=2*range degree(gcd [newm,differentiate(newm)])~=0 => range:=2*range luniv:=ufactor(newm) @@ -243,7 +243,7 @@ InnerMultFact(OV,E,R,P) : C == T -- polCase if leadtest or ((localNorm unifact > localNorm [ff.factor for ff in lunivf]) - and (^testp or polCase(lffc1*clc,#plist,leadcomp1))) then + and (not testp or polCase(lffc1*clc,#plist,leadcomp1))) then unifact:=[uf.factor for uf in lunivf] int:=lval lffc:=lffc1 @@ -260,10 +260,10 @@ InnerMultFact(OV,E,R,P) : C == T nfatt := nf nfatt>nf => -- for the previous values there were more factors - if testp then leadtest:=^polCase(lffc*clc,#plist,leadcomp) + if testp then leadtest:= not polCase(lffc*clc,#plist,leadcomp) else leadtest:= false -- if polCase=true we can consider the univariate decomposition - if ^leadtest then + if not leadtest then unifact:=[uf.factor for uf in lunivf] lffc:=lffc1 if testp then leadcomp:=leadcomp1 |