diff options
Diffstat (limited to 'src/algebra')
| -rw-r--r-- | src/algebra/draw.spad.pamphlet | 8 | ||||
| -rw-r--r-- | src/algebra/plot.spad.pamphlet | 6 | ||||
| -rw-r--r-- | src/algebra/plot3d.spad.pamphlet | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/algebra/draw.spad.pamphlet b/src/algebra/draw.spad.pamphlet index de5dc3e3..52f12b71 100644 --- a/src/algebra/draw.spad.pamphlet +++ b/src/algebra/draw.spad.pamphlet @@ -318,9 +318,9 @@ TopLevelDrawFunctionsForCompiledFunctions(): myTrap1: (SF-> SF, SF) -> SF myTrap1(ff:SF-> SF, f:SF):SF == s := trapNumericErrors(ff(f))$Lisp :: Union(SF, "failed") - s case "failed" => _$NaNvalue$Lisp + s case "failed" => quietDoubleNaN()$Lisp r:=s::SF - r >max()$SF or r < min()$SF => _$NaNvalue$Lisp + r >max()$SF or r < min()$SF => quietDoubleNaN()$Lisp r makePt2: (SF,SF) -> Point SF @@ -493,9 +493,9 @@ TopLevelDrawFunctionsForCompiledFunctions(): myTrap2: ((SF, SF) -> SF, SF, SF) -> SF myTrap2(ff:(SF, SF) -> SF, u:SF, v:SF):SF == s := trapNumericErrors(ff(u, v))$Lisp :: Union(SF, "failed") - s case "failed" => _$NaNvalue$Lisp + s case "failed" => quietDoubleNaN()$Lisp r:SF := s::SF - r >max()$SF or r < min()$SF => _$NaNvalue$Lisp + r >max()$SF or r < min()$SF => quietDoubleNaN()$Lisp r recolor(ptFunc,colFunc) == diff --git a/src/algebra/plot.spad.pamphlet b/src/algebra/plot.spad.pamphlet index 5b5eefd3..0ab68ee1 100644 --- a/src/algebra/plot.spad.pamphlet +++ b/src/algebra/plot.spad.pamphlet @@ -284,7 +284,7 @@ Plot(): Exports == Implementation where xDiff = 0 or yDiff = 0 => curve l := lo tRange; h := hi tRange (tDiff := h-l) = 0 => curve --- if (EQL(yDiff, _$NaNvalue$Lisp)$Lisp) then yDiff := 1::F +-- if (EQL(yDiff, quietDoubleNaN()$Lisp)$Lisp) then yDiff := 1::F t := curve.knots #t < 3 => curve p := curve.points; f := curve.source @@ -477,9 +477,9 @@ Plot(): Exports == Implementation where myTrap: (F-> F, F) -> F myTrap(ff:F-> F, f:F):F == s := trapNumericErrors(ff(f))$Lisp :: Union(F, "failed") - s case "failed" => _$NaNvalue$Lisp + s case "failed" => quietDoubleNaN()$Lisp r:F:=s::F - r > max()$F or r < min()$F => _$NaNvalue$Lisp + r > max()$F or r < min()$F => quietDoubleNaN()$Lisp r plot(f:F -> F,xRange:R) == diff --git a/src/algebra/plot3d.spad.pamphlet b/src/algebra/plot3d.spad.pamphlet index faf926ad..658b3a32 100644 --- a/src/algebra/plot3d.spad.pamphlet +++ b/src/algebra/plot3d.spad.pamphlet @@ -192,11 +192,11 @@ Plot3D(): Exports == Implementation where select(l,f,g) == m := f first l - if (EQL(m, _$NaNvalue$Lisp)$Lisp) then m := 0 + if (EQL(m, quietDoubleNaN()$Lisp)$Lisp) then m := 0 -- for p in rest l repeat m := g(m,fp) for p in rest l repeat fp : F := f p - if (EQL(fp, _$NaNvalue$Lisp)$Lisp) then fp := 0 + if (EQL(fp, quietDoubleNaN()$Lisp)$Lisp) then fp := 0 m := g(m,fp) m @@ -447,7 +447,7 @@ Plot3D(): Exports == Implementation where myTrap(ff:F-> F, f:F):F == s := trapNumericErrors(ff(f))$Lisp :: Union(F, "failed") if (s) case "failed" then - r:F := _$NaNvalue$Lisp + r:F := quietDoubleNaN()$Lisp else r:F := s r |