diff options
author | dos-reis <gdr@axiomatics.org> | 2010-02-17 00:21:53 +0000 |
---|---|---|
committer | dos-reis <gdr@axiomatics.org> | 2010-02-17 00:21:53 +0000 |
commit | e5fb9d979a16047d62bbe954ee08577088cdb497 (patch) | |
tree | 3b647c8756c21b10e5a00d8bf589b2bc754a8cce /src/algebra/plot.spad.pamphlet | |
parent | 36563244081c887f2f68eea73c5088674f7d8f37 (diff) | |
download | open-axiom-e5fb9d979a16047d62bbe954ee08577088cdb497.tar.gz |
* interp/compiler.boot (compAtomWithModemap): Reject niladic
functions used as constants.
* algebra/aggcat.spad.pamphlet (IndexedAggregate): Add parenthesis
for call to niladic function 'void'.
* algebra/algext.spad.pamphlet (SimpleAlgebraicExtension): Likewise.
* algebra/curve.spad.pamphlet (RadicalFunctionField): Likewise.
(AlgebraicFunctionField): Likewise.
* algebra/permgrps.spad.pamphlet (PermutationGroup): Likewise.
* algebra/pfo.spad.pamphlet (FunctionSpaceReduce): Likewise.
* algebra/setorder.spad.pamphlet: Likewise.
* algebra/ffcat.spad.pamphlet (FiniteFieldCategory): Add
parenthesis for call to niladic function 'representationType'.
* algebra/ffnb.spad.pamphlet
(FiniteFieldNormalBasisExtensionByPolynomial): Likewise for
normalElement.
* algebra/float.spad.pamphlet (Float): Likewise for OMencodingXML,
pi, log2, log10, digits.
* algebra/fnla.spad.pamphlet (FreeNilpotentLie): Likewise for
dimension.
* algebra/fraction.spad.pamphlet (Fraction): Likewise for
OMencodingXML.
* algebra/gaussian.spad.pamphlet (Complex): Likewise.
* algebra/integer.spad.pamphlet (Integer): Likewise.
* algebra/list.spad.pamphlet (List): Likewise.
* algebra/sf.spad.pamphlet (DoubleFloat): Likewise.
* algebra/si.spad.pamphlet (SingleInteger): Likewise.
* algebra/string.spad.pamphlet (String): Likewise.
* algebra/symbol.spad.pamphlet (Symbol): Likewise.
* algebra/intrf.spad.pamphlet (TranscendentalIntegration):
Likewise for empty.
* algebra/kl.spad.pamphlet (SortedCache): Likewise for cache, void.
* algebra/newdata.spad.pamphlet (TabulatedComputationPackage):
Likewise for usingTable?.
* algebra/omserver.spad.pamphlet (OpenMathServerPackage): Likewise
for OMencodingUnknown.
* algebra/plot.spad.pamphlet (Plot): Likewise for adaptive?.
* algebra/plot3d.spad.pamphlet (Plot3D): Likewise for adaptive3D?.
Diffstat (limited to 'src/algebra/plot.spad.pamphlet')
-rw-r--r-- | src/algebra/plot.spad.pamphlet | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/algebra/plot.spad.pamphlet b/src/algebra/plot.spad.pamphlet index 16ff14e9..8f4731b2 100644 --- a/src/algebra/plot.spad.pamphlet +++ b/src/algebra/plot.spad.pamphlet @@ -449,7 +449,7 @@ Plot(): Exports == Implementation where nRange := intersect(tRange,nRange) curves: L C := [basicRefine(c,nRange) for c in p.functions] xRange := join(curves,1); yRange := join(curves,2) - if adaptive? then + if adaptive?() then tlimit := if parametric? p then 8 else 1 curves := [adaptivePlot(c,nRange,xRange,yRange, _ tlimit) for c in curves] @@ -464,7 +464,7 @@ Plot(): Exports == Implementation where NUMFUNEVALS := 0 curves: L C := [rangeRefine(c,tRange) for c in p.functions] xRange := join(curves,1); yRange := join(curves,2) - if adaptive? then + if adaptive?() then tlimit := if parametric? p then 8 else 1 curves := [adaptivePlot(c,tRange,xRange,yRange,tlimit) for c in curves] xRange := join(curves,1); yRange := join(curves,2) @@ -486,7 +486,7 @@ Plot(): Exports == Implementation where p := basicPlot(pt(#1,myTrap(f,#1)),xRange) r := p.ranges NUMFUNEVALS := minPoints() - if adaptive? then + if adaptive?() then p := adaptivePlot(p,first r,second r,third r,1) r := p.ranges [ false, rest r, r, nil(), [ p ] ] @@ -500,7 +500,7 @@ Plot(): Exports == Implementation where p := basicPlot(pt(myTrap(f,#1),myTrap(g,#1)),tRange) r := p.ranges NUMFUNEVALS := minPoints() - if adaptive? then + if adaptive?() then p := adaptivePlot(p,first r,second r,third r,8) r := p.ranges [ true, rest r, r, nil(), [ p ] ] @@ -514,7 +514,7 @@ Plot(): Exports == Implementation where p := basicPlot(f,tRange) r := p.ranges NUMFUNEVALS := minPoints() - if adaptive? then + if adaptive?() then p := adaptivePlot(p,first r,second r,third r,8) r := p.ranges [ true, rest r, r, nil(), [ p ] ] @@ -529,7 +529,7 @@ Plot(): Exports == Implementation where t: L C := [ basicPlot(pt(#1,myTrap(f,#1)),xRange) for f in l ] yRange := join(t,2) NUMFUNEVALS := # l * minPoints() - if adaptive? then + if adaptive?() then t := [adaptivePlot(p,xRange,xRange,yRange,1) _ for f in l for p in t] yRange := join(t,2) @@ -616,6 +616,8 @@ PlotFunctions1(S:ConvertibleTo InputForm): with <<license>>= --Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. --All rights reserved. +-- Copyright (C) 2007-2010, Gabriel Dos Reis. +-- All rights reserved. -- --Redistribution and use in source and binary forms, with or without --modification, are permitted provided that the following conditions are |