Mercurial > octave-nkf

changeset 13890:3a2f28c08fbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wilkinson.m: Use Octave spacing conventions in code. Add more input validation tests. * wilkinson.m: Use Octave spacing conventions in code. Add more input validation tests.
author Rik <octave@nomad.inbox5.com>
date Sat, 19 Nov 2011 06:56:03 -0800
parents aaefd6b28188
children 5180791b8d9e
files scripts/special-matrix/wilkinson.m
diffstat 1 files changed, 15 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/special-matrix/wilkinson.m	Fri Nov 18 14:26:20 2011 -0800
+++ b/scripts/special-matrix/wilkinson.m	Sat Nov 19 06:56:03 2011 -0800
@@ -35,7 +35,7 @@
     print_usage ();
   endif
 
-  if (! (isscalar (n) && (n == fix (n)) && n >= 0))
+  if (! (isscalar (n) && n >= 0 && (n == fix (n))))
     error ("wilkinson: N must be a non-negative integer");
   endif
 
@@ -45,10 +45,17 @@
 
 endfunction
 
-%!assert (wilkinson(0), [])
-%!assert (wilkinson(1), 0)
-%!assert (wilkinson(2), [0.5,1;1,0.5])
-%!assert (wilkinson(3), [1,1,0;1,0,1;0,1,1])
-%!assert (wilkinson(4), [1.5,1,0,0;1,0.5,1,0;0,1,0.5,1;0,0,1,1.5])
-%!error (wilkinson())
-%!error (wilkinson(1,2))
+
+%!assert (wilkinson (0), [])
+%!assert (wilkinson (1), 0)
+%!assert (wilkinson (2), [0.5,1;1,0.5])
+%!assert (wilkinson (3), [1,1,0;1,0,1;0,1,1])
+%!assert (wilkinson (4), [1.5,1,0,0;1,0.5,1,0;0,1,0.5,1;0,0,1,1.5])
+
+%% Test input validation
+%!error wilkinson ()
+%!error wilkinson (1,2)
+%!error <N must be a non-negative integer> wilkinson (ones (2))
+%!error <N must be a non-negative integer> wilkinson (-1)
+%!error <N must be a non-negative integer> wilkinson (1.5)
+