Mercurial > octave-nkf

changeset 17584:6278085742b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pol2cart.m: Fix bug with z-input and only 1 output (bug #40184) * scripts/general/pol2cart.m: Correct docstring which had copy/paste error from cart2pol. Initialize z matrix to []. Return 3-column matrix (x,y,z) when only one outptu argument is requested. Change %!test to catch this behavior.
author Rik <rik@octave.org>
date Sun, 06 Oct 2013 20:35:08 -0700
parents 4cb05034f1c6
children 36b9fa789d8e
files scripts/general/pol2cart.m
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/general/pol2cart.m	Sun Oct 06 19:48:25 2013 -0700
+++ b/scripts/general/pol2cart.m	Sun Oct 06 20:35:08 2013 -0700
@@ -28,7 +28,8 @@
 ## @var{theta} describes the angle relative to the positive x-axis.
 ## @var{r} is the distance to the z-axis (0, 0, z).
 ## If called with a single matrix argument then each row of @var{p}
-## represents the polar/(cylindrical) coordinate (@var{x}, @var{y} (, @var{z})).
+## represents the polar/(cylindrical) coordinate (@var{theta}, @var{r} (,
+## @var{z})).
 ##
 ## If only a single return argument is requested then return a matrix
 ## @var{C} where each row represents one Cartesian coordinate
@@ -39,7 +40,7 @@
 ## Author: Kai Habel <kai.habel@gmx.de>
 ## Adapted-by: jwe
 
-function [x, y, z] = pol2cart (theta, r, z)
+function [x, y, z] = pol2cart (theta, r, z = [])
 
   if (nargin < 1 || nargin > 3)
     print_usage ();
@@ -49,8 +50,6 @@
     if (ismatrix (theta) && (columns (theta) == 2 || columns (theta) == 3))
       if (columns (theta) == 3)
         z = theta(:,3);
-      else
-        z = [];
       endif
       r = theta(:,2);
       theta = theta(:,1);
@@ -75,7 +74,7 @@
   y = r .* sin (theta);
 
   if (nargout <= 1)
-    x  = [x, y, z];
+    x = [x(:), y(:), z(:)];
   endif
 
 endfunction
@@ -91,9 +90,9 @@
 %!test
 %! t = [0, 1, 1] * pi/4;
 %! r = sqrt (2) * [0, 1, 2];
-%! [x, y] = pol2cart (t, r);
-%! assert (x, [0, 1, 2], sqrt (eps));
-%! assert (y, [0, 1, 2], sqrt (eps));
+%! cart = pol2cart (t, r);
+%! assert (cart(:,1), [0; 1; 2], sqrt (eps));
+%! assert (cart(:,2), [0; 1; 2], sqrt (eps));
 
 %!test
 %! t = [0, 1, 1] * pi/4;