From: Raymond T. <rt...@us...> - 2003-05-20 02:20:03
|
Update of /cvsroot/maxima/maxima/src In directory sc8-pr-cvs1:/tmp/cvs-serv29544/src Modified Files: plot.lisp Log Message: o Set NTICKS to a smaller, more reasonable value for adaptive plotting. o Add ADAPT_DEPTH plot option to control the depth (number of interval splits) of the adaptive-plotting routine. Index: plot.lisp =================================================================== RCS file: /cvsroot/maxima/maxima/src/plot.lisp,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- plot.lisp 20 May 2003 01:24:10 -0000 1.25 +++ plot.lisp 20 May 2003 02:20:00 -0000 1.26 @@ -33,7 +33,13 @@ ((mlist) $transform_xy nil) ((mlist) $run_viewer t) ((mlist) $plot_format $openmath) - ((mlist) $nticks 100) + ;; With adaptive plotting, 100 is probably too + ;; many ticks. I (rtoy) think 10 is a more + ;; reasonable default. + ((mlist) $nticks 10) + ;; Controls the number of splittings + ;; adaptive-plotting will do. + ((mlist) $adapt_depth 10) )) (defun $get_plot_option (name &optional n) @@ -75,6 +81,7 @@ )) (merror "Only [zic,geomview,ps,openmath,gnuplot] are available")) value) + ($adapt_depth (check-list-items name (cddr value) 'fixnum 1)) (t (merror "Unknown plot option specified: ~M" name)))) (sloop for v on (cdr $plot_options) @@ -769,6 +776,7 @@ (return-from draw2d (draw2d-parametric f range))) (let* ((nticks (nth 2 ($get_plot_option '$nticks))) (yrange ($get_plot_option '|$y|)) + (depth (nth 2 ($get_plot_option '$adapt_depth))) ($numer t)) (setq f (coerce-float-fun f `((mlist), (nth 1 range)))) @@ -814,7 +822,7 @@ (cddr (adaptive-plot f (car x-start) (car x-mid) (car x-end) (car y-start) (car y-mid) (car y-end) - 10 1d-5))))) + depth 1d-5))))) (format t "Points = ~D~%" (length result)) |