Mercurial > octave-nkf

changeset 10689:6622772a0add

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rotdim.m: Modify function to use same variable names as documentation
author Rik <octave@nomad.inbox5.com>
date Tue, 08 Jun 2010 21:59:16 -0700
parents 7357e37f34fa
children 35adf2a71f3f
files scripts/ChangeLog scripts/general/rotdim.m
diffstat 2 files changed, 17 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/ChangeLog	Tue Jun 08 21:47:05 2010 -0700
+++ b/scripts/ChangeLog	Tue Jun 08 21:59:16 2010 -0700
@@ -1,3 +1,8 @@
+2010-06-03  Rik <octave@nomad.inbox5.com>
+
+        * general/rotdim.m: Modify function to use same variable names
+        as documentation.
+
 2010-06-03  Rik <octave@nomad.inbox5.com>
 
         * general/cart2pol.m, general/cart2sph.m, general/pol2cart.m, 
--- a/scripts/general/rotdim.m	Tue Jun 08 21:47:05 2010 -0700
+++ b/scripts/general/rotdim.m	Tue Jun 08 21:59:16 2010 -0700
@@ -51,18 +51,18 @@
 ## @seealso{rot90, flipud, fliplr, flipdim}
 ## @end deftypefn
 
-function y = rotdim (x, k, plane)
+function y = rotdim (x, n, plane)
   
   if (nargin < 1 || nargin > 3)
     print_usage ();
   endif
 
-  if (nargin > 1 && ! isempty(k))
-    if (!isscalar (k) || imag (k) != 0 || fix (k) != k)
-      error ("rotdim: k must be an scalar integer");
+  if (nargin > 1 && ! isempty(n))
+    if (!isscalar (n) || !isreal(n) || fix (n) != n)
+      error ("rotdim: N must be a scalar integer");
     endif
   else
-    k = 1;
+    n = 1;
   endif
 
   nd = ndims (x);
@@ -93,20 +93,20 @@
     endif
   endif
 
-  k = rem (k, 4);
-  if (k < 0)
-    k = k + 4;
+  n = rem (n, 4);
+  if (n < 0)
+    n = n + 4;
   endif
-  if (k == 0)
+  if (n == 0)
     y = x;
-  elseif (k == 2)
+  elseif (n == 2)
     y = flipdim (flipdim (x, plane(1)), plane(2));
-  elseif (k == 1 || k == 3)
+  elseif (n == 1 || n == 3)
     perm = 1:nd;
     perm(plane(1)) = plane(2);
     perm(plane(2)) = plane(1);
     y = permute (x, perm);
-    if (k == 1)
+    if (n == 1)
       y = flipdim (y, min (plane));
     else
       y = flipdim (y, max (plane));