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/color.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/color.spad.pamphlet')
| -rw-r--r-- | src/algebra/color.spad.pamphlet | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/algebra/color.spad.pamphlet b/src/algebra/color.spad.pamphlet index 56801bff..4a6b7387 100644 --- a/src/algebra/color.spad.pamphlet +++ b/src/algebra/color.spad.pamphlet @@ -74,7 +74,9 @@ Color(): Exports == Implementation where if (xHueSmaller:= (diff < 0)) then diff := -diff if (moreThanHalf:=(diff > totalHues quo 2)) then diff := totalHues-diff offset : I := wholePart(round (diff::SF/(2::SF)**(x.weight/y.weight)) ) - if (xHueSmaller and ^moreThanHalf) or (^xHueSmaller and moreThanHalf) then + if (xHueSmaller and not moreThanHalf) + or (not xHueSmaller and moreThanHalf) + then ans := x.hue + offset else ans := x.hue - offset |