diff options
| author | dos-reis <gdr@axiomatics.org> | 2011-05-21 02:03:15 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2011-05-21 02:03:15 +0000 |
| commit | 58dc9f8145468998071a2a69d3dbfb6c710eab39 (patch) | |
| tree | 55dc479b3854da39e13abd1281904e148e7f3f7e /src/algebra/draw.spad.pamphlet | |
| parent | 8887fe1d244a40fdc3980d87e30f445249ecdf2e (diff) | |
| download | open-axiom-58dc9f8145468998071a2a69d3dbfb6c710eab39.tar.gz | |
* interp/modemap.boot (augModemapsFromDomain): Don't add modemaps
for element types of Vector or List aggregates.
* algebrar/: Adjust algebras that depended on this behaviour.
Diffstat (limited to 'src/algebra/draw.spad.pamphlet')
| -rw-r--r-- | src/algebra/draw.spad.pamphlet | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/algebra/draw.spad.pamphlet b/src/algebra/draw.spad.pamphlet index fe9ddefe..b5e7bae8 100644 --- a/src/algebra/draw.spad.pamphlet +++ b/src/algebra/draw.spad.pamphlet @@ -232,6 +232,7 @@ TopLevelDrawFunctionsForCompiledFunctions(): import AnyFunctions1((SF,SF,SF) -> SF) import DrawOptionFunctions0 import SPACE3 + import DROP EXTOVARERROR : String := _ "draw: when specifying function, left hand side must be a variable" @@ -778,6 +779,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): --% Two Dimensional Function Plots draw(f:Ex,bind:BIND,l:L DROP) == + import DROP -- create title if necessary if not option?(l,"title" :: Symbol) then s:String := unparse(convert(f)@InputForm) @@ -792,6 +794,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): --% Parametric Plane Curves draw(ppc:PPC,bind:BIND,l:L DROP) == + import DROP f := coordinate(ppc,1); g := coordinate(ppc,2) -- create title if necessary if not option?(l,"title" :: Symbol) then @@ -812,6 +815,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): ------------------------------------------------------------------------ makeObject(psc:PSC,tBind:BIND,l:L DROP) == + import DROP -- obtain dependent variable and coordinate functions t := variable tBind; tSeg := segment tBind f := coordinate(psc,1); g := coordinate(psc,2); h := coordinate(psc,3) @@ -835,6 +839,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): makeObject(psc,tBind,nil()) draw(psc:PSC,tBind:BIND,l:L DROP) == + import DROP -- obtain dependent variable and coordinate functions t := variable tBind; tSeg := segment tBind f := coordinate(psc,1); g := coordinate(psc,2); h := coordinate(psc,3) @@ -864,6 +869,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): --% Three Dimensional Function Plots makeObject(f:Ex,xBind:BIND,yBind:BIND,l:L DROP) == + import DROP -- create title if necessary if not option?(l,"title" :: Symbol) then s:String := unparse(convert(f)@InputForm) @@ -883,6 +889,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): makeObject(f,xBind,yBind,nil()) draw(f:Ex,xBind:BIND,yBind:BIND,l:L DROP) == + import DROP -- create title if necessary if not option?(l,"title" :: Symbol) then s:String := unparse(convert(f)@InputForm) @@ -904,6 +911,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): --% parametric surface makeObject(s:PSF,uBind:BIND,vBind:BIND,l:L DROP) == + import DROP f := coordinate(s,1); g := coordinate(s,2); h := coordinate(s,3) if not option?(l,"title" :: Symbol) then s:String := unparse(convert(f)@InputForm) @@ -923,6 +931,7 @@ TopLevelDrawFunctions(Ex:Join(ConvertibleTo InputForm,SetCategory)): makeObject(s,uBind,vBind,nil()) draw(s:PSF,uBind:BIND,vBind:BIND,l:L DROP) == + import DROP f := coordinate(s,1); g := coordinate(s,2); h := coordinate(s,3) -- create title if necessary if not option?(l,"title" :: Symbol) then @@ -995,6 +1004,7 @@ TopLevelDrawFunctionsForAlgebraicCurves(R,Ex): Exports == Implementation where import SegmentFunctions2(RN,F) import SegmentFunctions2(F,RN) import AnyFunctions1(L SEG RN) + import DROP drawToScaleRanges: (SEG F,SEG F) -> L SEG F drawToScaleRanges(xVals,yVals) == |