Mercurial > octave

changeset 20854:cdf08aacfd86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
magic.m: magic(N) accepting all integers (matlab compatibility)
author Bernardo Sulzbach <mafagafogigante@gmail.com>
date Sat, 12 Dec 2015 13:01:52 -0200
parents 1142cf6abc0d
children 6f9e010760a1 b3a18c764161
files scripts/special-matrix/magic.m
diffstat 1 files changed, 4 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/special-matrix/magic.m	Sat Dec 12 07:40:03 2015 -0800
+++ b/scripts/special-matrix/magic.m	Sat Dec 12 13:01:52 2015 -0200
@@ -24,7 +24,9 @@
 ## A magic square is an arrangement of the integers @code{1:n^2} such that the
 ## row sums, column sums, and diagonal sums are all equal to the same value.
 ##
-## Note: @var{n} must be greater than 2 for the magic square to exist.
+## Note: @var{n} must be a scalar greater than or equal to 3. If you supply
+## @var{n} less than 3, magic returns either a nonmagic square, or else the
+## degenerate magic squares 1 and [].
 ## @end deftypefn
 
 function A = magic (n)
@@ -33,11 +35,7 @@
     print_usage ();
   endif
 
-  if (n != fix (n) || n < 0 || n == 2)
-    error ("magic: N must be a positive integer not equal to 2");
-  endif
-
-  if (n == 0)
+  if (n < 1)
 
     A = [];