# HG changeset patch # User David Loeffler # Date 1331585393 0 # Node ID 2776e6381d46fd6078372bcb809420a8cd749c88 # Parent de4d759832b671f39a7c1846b2ee0cad06c981bf #12491 reviewer fixes diff --git a/sage/plot/plot3d/list_plot3d.py b/sage/plot/plot3d/list_plot3d.py --- a/sage/plot/plot3d/list_plot3d.py +++ b/sage/plot/plot3d/list_plot3d.py @@ -20,11 +20,10 @@ - a list of 3-tuples - - a list of lists (all of the same length) - - this is treated the same as a matrix. + - a list of lists (all of the same length) - this is treated the same as + a matrix. - - ``texture`` - (default: "automatic"), solid light - blue + - ``texture`` - (default: "automatic", a solid light blue) OPTIONAL KEYWORDS: @@ -54,9 +53,7 @@ function in each direction, when ``interpolation_type`` is not ``default``. By default for an `n\times n` array this is `n`. - - ``**kwds`` - all other arguments are passed to the - surface function - + - ``**kwds`` - all other arguments are passed to the surface function OUTPUT: a 3d plot @@ -220,7 +217,7 @@ We plot a matrix that illustrates summation modulo `n`:: - sage: n = 5; list_plot3d(matrix(RDF,n,[(i+j)%n for i in [1..n] for j in [1..n]])) + sage: n = 5; list_plot3d(matrix(RDF,n,[(i+j)%n for i in [1..n] for j in [1..n]])) # indirect doctest The interpolation type for matrices is 'linear'; for other types use other :func:`list_plot3d` input types. @@ -229,11 +226,8 @@ sage: pi = float(pi) sage: m = matrix(RDF, 6, [sin(i^2 + j^2) for i in [0,pi/5,..,pi] for j in [0,pi/5,..,pi]]) - sage: list_plot3d(m, texture='yellow', frame_aspect_ratio=[1,1,1/3]) - - :: - - sage: list_plot3d(m, texture='yellow', interpolation_type='linear') + sage: list_plot3d(m, texture='yellow', frame_aspect_ratio=[1,1,1/3]) # indirect doctest + sage: list_plot3d(m, texture='yellow', interpolation_type='linear') # indirect doctest """ from parametric_surface import ParametricSurface f = lambda i,j: (i,j,float(m[int(i),int(j)])) @@ -256,8 +250,7 @@ OPTIONAL KEYWORDS: - - ``**kwds`` - all other arguments are passed to the - surface function + - ``**kwds`` - all other arguments are passed to the surface function OUTPUT: a 3d plot @@ -265,7 +258,7 @@ The resulting matrix does not have to be square:: - sage: show(list_plot3d([[1, 1, 1, 1], [1, 2, 1, 2], [1, 1, 3, 1]])) + sage: show(list_plot3d([[1, 1, 1, 1], [1, 2, 1, 2], [1, 1, 3, 1]])) # indirect doctest The normal route is for the list of lists to be turned into a matrix and use :func:`list_plot3d_matrix`:: @@ -301,7 +294,7 @@ - a list of lists (all of the same length, under same conditions as a matrix) - - ``texture`` - (default: "automatic", solid light blue) + - ``texture`` - (default: "automatic", a solid light blue) OPTIONAL KEYWORDS: @@ -342,7 +335,7 @@ sage: pi = float(pi) sage: m = matrix(RDF, 6, [sin(i^2 + j^2) for i in [0,pi/5,..,pi] for j in [0,pi/5,..,pi]]) - sage: list_plot3d(m, texture='yellow', interpolation_type='linear', num_points=5) + sage: list_plot3d(m, texture='yellow', interpolation_type='linear', num_points=5) # indirect doctest :: diff --git a/sage/plot/plot3d/parametric_plot3d.py b/sage/plot/plot3d/parametric_plot3d.py --- a/sage/plot/plot3d/parametric_plot3d.py +++ b/sage/plot/plot3d/parametric_plot3d.py @@ -551,7 +551,7 @@ We do the first one with a lambda function, which creates a callable Python function that sends `u` to `u/10`:: - sage: parametric_plot3d( (sin, cos, lambda u: u/10), (0, 20)) + sage: parametric_plot3d( (sin, cos, lambda u: u/10), (0, 20)) # indirect doctest Now we do the same thing with symbolic expressions:: @@ -608,7 +608,7 @@ We do the first one with lambda functions:: sage: f = (lambda u,v: cos(u), lambda u,v: sin(u)+cos(v), lambda u,v: sin(v)) - sage: parametric_plot3d(f, (0, 2*pi), (-pi, pi)) + sage: parametric_plot3d(f, (0, 2*pi), (-pi, pi)) # indirect doctest Now we do the same thing with symbolic expressions:: @@ -626,4 +626,4 @@ G += line3d([(g[0](u,v), g[1](u,v), g[2](u,v)) for v in vrange], **boundary_style) for v in (vrange[0], vrange[-1]): G += line3d([(g[0](u,v), g[1](u,v), g[2](u,v)) for u in urange], **boundary_style) - return G \ No newline at end of file + return G diff --git a/sage/plot/plot3d/plot3d.py b/sage/plot/plot3d/plot3d.py --- a/sage/plot/plot3d/plot3d.py +++ b/sage/plot/plot3d/plot3d.py @@ -375,11 +375,11 @@ A spherical coordinate system for use with ``plot3d(transformation=...)`` where the position of a point is specified by three numbers: - - the *radial distance* (``radius``) from the origin + - the *radial distance* (``radius``) from the origin - - the *azimuth angle* (``azimuth``) from the positive `x`-axis + - the *azimuth angle* (``azimuth``) from the positive `x`-axis - - the *inclination angle* (``inclination``) from the positive `z`-axis + - the *inclination angle* (``inclination``) from the positive `z`-axis These three variables must be specified in the constructor. @@ -432,12 +432,12 @@ A spherical coordinate system for use with ``plot3d(transformation=...)`` where the position of a point is specified by three numbers: - - the *radial distance* (``radius``) from the origin + - the *radial distance* (``radius``) from the origin - - the *azimuth angle* (``azimuth``) from the positive `x`-axis + - the *azimuth angle* (``azimuth``) from the positive `x`-axis - - the *elevation angle* (``elevation``) from the `xy`-plane toward the - positive `z`-axis + - the *elevation angle* (``elevation``) from the `xy`-plane toward the + positive `z`-axis These three variables must be specified in the constructor. @@ -492,7 +492,7 @@ def transform(self, radius=None, azimuth=None, elevation=None): """ - A spherical coordinates transform. + A spherical elevation coordinates transform. EXAMPLE:: @@ -509,11 +509,11 @@ A cylindrical coordinate system for use with ``plot3d(transformation=...)`` where the position of a point is specified by three numbers: - - the *radial distance* (``radius``) from the `z`-axis + - the *radial distance* (``radius``) from the `z`-axis - - the *azimuth angle* (``azimuth``) from the positive `x`-axis + - the *azimuth angle* (``azimuth``) from the positive `x`-axis - - the *height* or *altitude* (``height``) above the `xy`-plane + - the *height* or *altitude* (``height``) above the `xy`-plane These three variables must be specified in the constructor.