aboutsummaryrefslogtreecommitdiff
path: root/src/algebra/plot.spad.pamphlet
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2011-06-20 10:42:25 +0000
committerdos-reis <gdr@axiomatics.org>2011-06-20 10:42:25 +0000
commite4656a0388e8fa12594788b216b42bb04680d9d5 (patch)
tree3eb1e106e8344ca276b44fae4a489c0813efa92a /src/algebra/plot.spad.pamphlet
parente1925b37c7601d37bfa5d624d428ea40f3708c8f (diff)
downloadopen-axiom-e4656a0388e8fa12594788b216b42bb04680d9d5.tar.gz
* interp/spaderror.lisp ($numericFailure): Remove.
(trapNumericErrors): Define for non-GCL RTS. Tidy GCL-based definition. * algebra/draw.spad.pamphlet: trapNumericErrors now returns a value of type Maybe T. * algebra/plot.spad.pamphlet: Likewise. * algebra/plot3d.spad.pamphlet: Likewise.
Diffstat (limited to 'src/algebra/plot.spad.pamphlet')
-rw-r--r--src/algebra/plot.spad.pamphlet6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/algebra/plot.spad.pamphlet b/src/algebra/plot.spad.pamphlet
index d03da277..664e3036 100644
--- a/src/algebra/plot.spad.pamphlet
+++ b/src/algebra/plot.spad.pamphlet
@@ -476,9 +476,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" => quietDoubleNaN()$Lisp
- r:F:=s::F
+ s: Maybe F := trapNumericErrors(ff(f))$Lisp
+ s case nothing => quietDoubleNaN()$Lisp
+ r:F := s@F
r > max()$F or r < min()$F => quietDoubleNaN()$Lisp
r