From: Jaime E. V. <vi...@us...> - 2010-04-06 09:20:03
|
Update of /cvsroot/maxima/maxima/doc/info In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv14127 Modified Files: Tag: RELEASE-5_21-BRANCH Plotting.texi Log Message: Small changes to prevent line overflows in the manual (hope this does not disturb the release process). Index: Plotting.texi =================================================================== RCS file: /cvsroot/maxima/maxima/doc/info/Plotting.texi,v retrieving revision 1.52 retrieving revision 1.52.2.1 diff -u -d -r1.52 -r1.52.2.1 --- Plotting.texi 4 Apr 2010 06:05:45 -0000 1.52 +++ Plotting.texi 6 Apr 2010 09:19:54 -0000 1.52.2.1 @@ -305,10 +305,12 @@ program used. For instance, when the plot box is disable, Xmaxima will plot the axes using arrows: @c ===beg=== -@c plot2d ( x^2-1, [x, -3, 3], [y, -2, 10], [box, false], [plot_format, xmaxima])$ +@c plot2d ( x^2-1, [x, -3, 3], [y, -2, 10], [box, false], +@c [plot_format, xmaxima])$ @c ===end=== @example -(%i1) plot2d ( x^2-1, [x, -3, 3], [y, -2, 10], [box, false], [plot_format, xmaxima])$ +(%i1) plot2d ( x^2-1, [x, -3, 3], [y, -2, 10], [box, false], + [plot_format, xmaxima])$ @end example @ifnotinfo @@ -352,11 +354,13 @@ A plot of the butterfly curve, defined parametrically: @c ===beg=== @c r: (exp(cos(t))-2*cos(4*t)-sin(t/12)^5)$ -@c plot2d([parametric, r*sin(t), r*cos(t), [t, -8*%pi, 8*%pi], [nticks, 2000]])$ +@c plot2d([parametric, r*sin(t), r*cos(t), [t, -8*%pi, 8*%pi], + [nticks, 2000]])$ @c ===end=== @example (%i1) r: (exp(cos(t))-2*cos(4*t)-sin(t/12)^5)$ -(%i2) plot2d([parametric, r*sin(t), r*cos(t), [t, -8*%pi, 8*%pi], [nticks, 2000]])$ +(%i2) plot2d([parametric, r*sin(t), r*cos(t), [t, -8*%pi, 8*%pi], + [nticks, 2000]])$ @end example @ifnotinfo @@ -366,10 +370,12 @@ A ``circle'' with two turns, when plotted with only 7 points: @c ===beg=== -@c plot2d ([parametric, cos(t), sin(t), [t, -2*%pi, 2*%pi], [nticks, 8]])$ +@c plot2d ([parametric, cos(t), sin(t), [t, -2*%pi, 2*%pi], + [nticks, 8]])$ @c ===end=== @example -(%i1) plot2d ([parametric, cos(t), sin(t), [t, -2*%pi, 2*%pi], [nticks, 8]])$ +(%i1) plot2d ([parametric, cos(t), sin(t), [t, -2*%pi, 2*%pi], + [nticks, 8]])$ @end example @ifnotinfo @@ -400,10 +406,10 @@ A plot of a discrete set of points, defining x and y coordinates separately: @c ===beg=== -@c plot2d ([discrete, [10, 20, 30, 40, 50], [.6, .9, 1.1, 1.3, 1.4]])$ +@c plot2d ([discrete,[10, 20, 30, 40, 50],[.6, .9, 1.1, 1.3, 1.4]])$ @c ===end=== @example -(%i1) plot2d ([discrete, [10, 20, 30, 40, 50], [.6, .9, 1.1, 1.3, 1.4]])$ +(%i1) plot2d ([discrete,[10, 20, 30, 40, 50],[.6, .9, 1.1, 1.3, 1.4]])$ @end example @ifnotinfo @@ -413,13 +419,13 @@ The same points shown in the previous example, defining each point separately and without any lines joining the points: @c ===beg=== -@c plot2d([discrete, [[10, .6], [20, .9], [30, 1.1], [40, 1.3], [50, 1.4]]], -@c [style, points])$ +@c plot2d([discrete, [[10, .6], [20, .9], [30, 1.1], [40, 1.3], +@c [50, 1.4]]], [style, points])$ @c ===end=== @example @group -(%i1) plot2d([discrete, [[10, .6], [20, .9], [30, 1.1], [40, 1.3], [50, 1.4]]], - [style, points])$ +(%i1) plot2d([discrete, [[10, .6], [20, .9], [30, 1.1], [40, 1.3], + [50, 1.4]]], [style, points])$ @end group @end example @@ -432,16 +438,16 @@ plotted on the two axes: @c ===beg=== @c with_stdout ("data.txt", for x:0 thru 10 do print (x, x^2, x^3))$ -@c data: read_matrix ("data.txt")$ -@c plot2d ([discrete, transpose(data)[2], transpose(data)[3]], -@c [style,points], [point_type,diamond], [color,red])$ +@c data: transpose ( read_matrix ("data.txt"))$ +@c plot2d ([discrete, data[2], data[3]], +@c [style,points], [point_type,diamond], [color,red])$ @c ===end=== @example (%i1) with_stdout ("data.txt", for x:0 thru 10 do print (x, x^2, x^3))$ -(%i2) data: read_matrix ("data.txt")$ +(%i2) data: transpose( read_matrix ("data.txt"))$ @group -(%i3) plot2d ([discrete, transpose(data)[2], transpose(data)[3]], - [style,points], [point_type,diamond], [color,red])$ +(%i3) plot2d ([discrete, data[2], data[3]], + [style,points], [point_type,diamond], [color,red])$ @end group @end example @@ -454,16 +460,16 @@ @c ===beg=== @c xy: [[10, .6], [20, .9], [30, 1.1], [40, 1.3], [50, 1.4]]$ @c plot2d([[discrete, xy], 2*%pi*sqrt(l/980)], [l,0,50], -@c [style, points, lines], [color, red, blue], [point_type, asterisk], -@c [legend, "experiment", "theory"], +@c [style, points, lines], [color, red, blue], +@c [point_type, asterisk], [legend, "experiment", "theory"], @c [xlabel, "pendulum's length (cm)"], [ylabel, "period (s)"])$ @c ===end=== @example (%i1) xy: [[10, .6], [20, .9], [30, 1.1], [40, 1.3], [50, 1.4]]$ @group (%i2) plot2d([[discrete, xy], 2*%pi*sqrt(l/980)], [l,0,50], - [style, points, lines], [color, red, blue], [point_type, asterisk], - [legend, "experiment", "theory"], + [style, points, lines], [color, red, blue], + [point_type, asterisk], [legend, "experiment", "theory"], [xlabel, "pendulum's length (cm)"], [ylabel, "period (s)"])$ @end group @end example @@ -542,10 +548,12 @@ Two surfaces in the same plot, sharing the same domain; in gnuplot the two surfaces will use the same palette: @c ===beg=== -@c plot3d ([2^(-x^2 + y^2), 4*sin(3*(x^2+y^2))/(x^2+y^2), [x, -3, 3], [y, -2, 2]])$ +@c plot3d ( [2^(-x^2 + y^2), 4*sin(3*(x^2+y^2))/(x^2+y^2), +@c [x, -3, 3], [y, -2, 2]])$ @c ===end=== @example -(%i1) plot3d ([2^(-x^2 + y^2), 4*sin(3*(x^2+y^2))/(x^2+y^2), [x, -3, 3], [y, -2, 2]])$ +(%i1) plot3d ( [2^(-x^2 + y^2), 4*sin(3*(x^2+y^2))/(x^2+y^2), + [x, -3, 3], [y, -2, 2]])$ @end example @ifnotinfo @@ -556,12 +564,14 @@ surface will use a different palette, chosen from the list defined by the option palette: @c ===beg=== -@c plot3d ([[2^(-x^2 + y^2),[x,-2,2],[y,-2,2]], 4*sin(3*(x^2+y^2))/(x^2+y^2), -@c [x, -3, 3], [y, -2, 2]], [plot_format,xmaxima])$ +@c plot3d ( [[2^(-x^2 + y^2),[x,-2,2],[y,-2,2]], +@c 4*sin(3*(x^2+y^2))/(x^2+y^2), [x, -3, 3], [y, -2, 2]], +@c [plot_format,xmaxima])$ @c ===end=== @example -(%i1) plot3d ([[2^(-x^2 + y^2),[x,-2,2],[y,-2,2]], 4*sin(3*(x^2+y^2))/(x^2+y^2), - [x, -3, 3], [y, -2, 2]], [plot_format,xmaxima])$ +(%i1) plot3d ( [[2^(-x^2 + y^2),[x,-2,2],[y,-2,2]], + 4*sin(3*(x^2+y^2))/(x^2+y^2), [x, -3, 3], [y, -2, 2]], + [plot_format,xmaxima])$ @end example @ifnotinfo @@ -570,14 +580,14 @@ Plot of a Klein bottle, defined parametrically: @c ===beg=== -@c expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y) + 3.0) - 10.0$ +@c expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y) + 3.0)-10.0$ @c expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y) + 3.0)$ @c expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))$ @c plot3d ([expr_1, expr_2, expr_3], [x, -%pi, %pi], @c [y, -%pi, %pi], [grid, 40, 40])$ @c ===end=== @example -(%i1) expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y) + 3.0) - 10.0$ +(%i1) expr_1: 5*cos(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y) + 3.0)-10.0$ (%i2) expr_2: -5*sin(x)*(cos(x/2)*cos(y) + sin(x/2)*sin(2*y) + 3.0)$ (%i3) expr_3: 5*(-sin(x/2)*cos(y) + cos(x/2)*sin(2*y))$ @group @@ -613,13 +623,13 @@ @code{polar_to_xy}. This example also shows how to eliminate the bounding box and the legend. @c ===beg=== -@c plot3d (r^.33*cos(th/3), [r, 0, 1], [th, 0, 6*%pi], [grid, 12, 80], -@c [transform_xy, polar_to_xy], [box, false], [legend,false])$ +@c plot3d(r^.33*cos(th/3), [r, 0, 1], [th, 0, 6*%pi], [grid, 12, 80], +@c [transform_xy, polar_to_xy], [box, false], [legend,false])$ @c ===end=== @example @group -(%i1) plot3d (r^.33*cos(th/3), [r, 0, 1], [th, 0, 6*%pi], [grid, 12, 80], - [transform_xy, polar_to_xy], [box, false], [legend,false])$ +(%i1) plot3d(r^.33*cos(th/3), [r, 0, 1], [th, 0, 6*%pi], [grid, 12, 80], + [transform_xy, polar_to_xy], [box, false], [legend,false])$ @end group @end example @@ -632,12 +642,12 @@ proportion, maintaining the symmetric shape of the sphere. A palette with different shades of a single color is used: @c ===beg=== -@c plot3d ( 5, [theta, 0, %pi], [phi, 0, 2*%pi], [plot_format,xmaxima], -@c [transform_xy, spherical_to_xyz], [palette,[value,0.65,0.7,0.1,0.9]])$ +@c plot3d (5, [theta, 0, %pi], [phi, 0, 2*%pi], [plot_format,xmaxima], +@c [transform_xy, spherical_to_xyz], [palette,[value,0.65,0.7,0.1,0.9]])$ @c ===end=== @example @group -(%i1) plot3d ( 5, [theta, 0, %pi], [phi, 0, 2*%pi], [plot_format,xmaxima], +(%i1) plot3d (5, [theta, 0, %pi], [phi, 0, 2*%pi], [plot_format,xmaxima], [transform_xy, spherical_to_xyz], [palette,[value,0.65,0.7,0.1,0.9]])$ @end group @end example |