diff options
Diffstat (limited to 'src/algebra')
-rw-r--r-- | src/algebra/clip.spad.pamphlet | 2 | ||||
-rw-r--r-- | src/algebra/draw.spad.pamphlet | 10 | ||||
-rw-r--r-- | src/algebra/drawopt.spad.pamphlet | 1 | ||||
-rw-r--r-- | src/algebra/drawpak.spad.pamphlet | 2 | ||||
-rw-r--r-- | src/algebra/manip.spad.pamphlet | 3 | ||||
-rw-r--r-- | src/algebra/oderf.spad.pamphlet | 1 | ||||
-rw-r--r-- | src/algebra/patmatch1.spad.pamphlet | 1 |
7 files changed, 20 insertions, 0 deletions
diff --git a/src/algebra/clip.spad.pamphlet b/src/algebra/clip.spad.pamphlet index 30ee0ff3..d4eaf937 100644 --- a/src/algebra/clip.spad.pamphlet +++ b/src/algebra/clip.spad.pamphlet @@ -96,6 +96,8 @@ TwoDimensionalPlotClipping(): Exports == Implementation where Pnan? p == any?(Fnan?,p) iClipParametric(pointLists,fraction,scale) == + import Point SF + import List Point SF -- error checks and special cases negative? fraction or (fraction > 1) => error "clipDraw: fraction should be between 0 and 1" 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) == diff --git a/src/algebra/drawopt.spad.pamphlet b/src/algebra/drawopt.spad.pamphlet index c24e8fae..2b5b0dce 100644 --- a/src/algebra/drawopt.spad.pamphlet +++ b/src/algebra/drawopt.spad.pamphlet @@ -244,6 +244,7 @@ DrawOptionFunctions1(S:Type): Exports == Implementation where ++ is contained in the list of drawing options, l, which is defined ++ by the draw command. Implementation ==> add + import DrawOption option(l, s) == (u := option(l, s)@Union(Any, "failed")) case "failed" => "failed" retract(u::Any)$AnyFunctions1(S) diff --git a/src/algebra/drawpak.spad.pamphlet b/src/algebra/drawpak.spad.pamphlet index 1b71cd40..b9d3a0b6 100644 --- a/src/algebra/drawpak.spad.pamphlet +++ b/src/algebra/drawpak.spad.pamphlet @@ -96,6 +96,7 @@ DrawComplex(): Exports == Implementation where min(max(x, -clipValue), clipValue) drawComplex(f, realRange, imagRange, arrows?) == + import Point SF delReal := (hi(realRange) - lo(realRange))/realSteps::SF delImag := (hi(imagRange) - lo(imagRange))/imagSteps::SF funTable: ARRAY2(PC) := @@ -137,6 +138,7 @@ DrawComplex(): Exports == Implementation where makeViewport3D(space, "Complex Function")$VIEW3D drawComplexVectorField(f, realRange, imagRange): VIEW3D == + import Point SF -- compute the steps size of the grid delReal := (hi(realRange) - lo(realRange))/realSteps::SF delImag := (hi(imagRange) - lo(imagRange))/imagSteps::SF diff --git a/src/algebra/manip.spad.pamphlet b/src/algebra/manip.spad.pamphlet index 4735b5e7..04fdbce5 100644 --- a/src/algebra/manip.spad.pamphlet +++ b/src/algebra/manip.spad.pamphlet @@ -330,6 +330,9 @@ AlgebraicManipulations(R, F): Exports == Implementation where concat([concat(k, same), concat(n, expo)], ll) rootProduct x == + import P,F,Z + import List K + import List Z for rec in breakup rootkernels tower x repeat k0 := first(l := rec.ker) nx := numer x; dx := denom x diff --git a/src/algebra/oderf.spad.pamphlet b/src/algebra/oderf.spad.pamphlet index 2fb8bf0a..45decdf3 100644 --- a/src/algebra/oderf.spad.pamphlet +++ b/src/algebra/oderf.spad.pamphlet @@ -220,6 +220,7 @@ PrimitiveRatDE(F, UP, L, LQ): Exports == Implementation where indicialEquation(op:L, a:F) == indeq(monomial(1, 1) - a::UP, op) splitDenominator(op, lg) == + import RF cd := splitDenominator coefficients op f := cd.den / gcd(cd.num) l:L := 0 diff --git a/src/algebra/patmatch1.spad.pamphlet b/src/algebra/patmatch1.spad.pamphlet index 2189e13e..2b7da476 100644 --- a/src/algebra/patmatch1.spad.pamphlet +++ b/src/algebra/patmatch1.spad.pamphlet @@ -309,6 +309,7 @@ PatternMatchKernel(S, E): Exports == Implementation where patternMatchOpt : (E, List PAT, PRS, E) -> PRS patternMatchOpt(x, lp, l, id) == + import PAT (u := optpair lp) case List(PAT) => failed?(l := addMatch(first(u::List(PAT)), id, l)) => failed() patternMatch(x, second(u::List(PAT)), l) |