Mercurial > octave-nkf

changeset 19075:0976f9fccbbd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
isprime.m: Verify that input is a real number (bug #43041) * isprime.m: Use isreal() to validate input. Put input checking first in function. Add input validation tests.
author Rik <rik@octave.org>
date Thu, 21 Aug 2014 16:05:09 -0700
parents 0850b5212619
children 4c59f69fa52c
files scripts/specfun/isprime.m
diffstat 1 files changed, 41 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/specfun/isprime.m	Thu Aug 21 15:57:18 2014 -0700
+++ b/scripts/specfun/isprime.m	Thu Aug 21 16:05:09 2014 -0700
@@ -22,8 +22,9 @@
 ## Return a logical array which is true where the elements of @var{x} are
 ## prime numbers and false where they are not.
 ##
-## If the maximum value in @var{x} is very large, then you should be using
-## special purpose factorization code.
+## @code{isprime} is appropriate if the maximum value in @var{x} is not too
+## large (< 1e15).  For larger values special purpose factorization code
+## should be used.
 ##
 ## @example
 ## @group
@@ -36,45 +37,43 @@
 
 function t = isprime (x)
 
-  if (nargin == 1)
-    if (any ((x != floor (x) | x < 0)(:)))
-      error ("isprime: needs positive integers");
+  if (nargin != 1)
+    print_usage ();
+  elseif (! isreal (x) || any ((x < 0 | x != fix (x))(:)))
+    error ("isprime: X must be a non-negative integer");
+  endif
+
+  maxn = max (x(:));
+  ## generate prime table of suitable length.
+  maxp = min (maxn, max (sqrt (maxn), 1e7)); # FIXME: threshold not optimized.
+  pr = primes (maxp);
+  ## quick search for table matches.
+  t = lookup (pr, x, "b");
+  ## take the rest.
+  m = x(x > maxp);
+  if (! isempty (m))
+    ## there are still possible primes. filter them out by division.
+    if (maxn <= intmax ("uint32"))
+      m = uint32 (m);
+    elseif (maxn <= intmax ("uint64"))
+      m = uint64 (m);
+    else
+      warning ("isprime: X contains integers too large to be tested");
     endif
-    maxn = max (x(:));
-    ## generate prime table of suitable length.
-    maxp = min (maxn, max (sqrt (maxn), 1e7)); # FIXME: threshold not optimized.
-    pr = primes (maxp);
-    ## quick search for table matches.
-    t = lookup (pr, x, "b");
-    ## take the rest.
-    m = x(x > maxp);
+    pr = cast (pr(pr <= sqrt (maxn)), class (m));
+    for p = pr
+      m = m(rem (m, p) != 0);
+      if (length (m) < length (pr) / 10)
+        break;
+      endif
+    endfor
+    pr = pr(pr > p);
+    mm = arrayfun (@(x) all (rem (x, pr)), m);
+    m = m(mm);
     if (! isempty (m))
-      ## there are still possible primes. filter them out by division.
-      if (maxn <= intmax ("uint32"))
-        m = uint32 (m);
-      elseif (maxn <= intmax ("uint64"))
-        m = uint64 (m);
-      else
-        warning ("isprime: too large integers being tested");
-      endif
-      pr = cast (pr(pr <= sqrt (maxn)), class (m));
-      for p = pr
-        m = m(rem (m, p) != 0);
-        if (length (m) < length (pr) / 10)
-          break;
-        endif
-      endfor
-      pr = pr(pr > p);
-      mm = arrayfun (@(x) all (rem (x, pr)), m);
-      m = m(mm);
-      if (! isempty (m))
-        m = cast (sort (m), class (x));
-        t |= lookup (m, x, "b");
-      endif
+      m = cast (sort (m), class (x));
+      t |= lookup (m, x, "b");
     endif
-
-  else
-    print_usage ();
   endif
 
 endfunction
@@ -84,6 +83,10 @@
 %!assert (isprime (4), false)
 %!assert (isprime (magic (3)), logical ([0, 0, 0; 1, 1, 1; 0, 0, 1]))
 
+%% Test input validation
 %!error isprime ()
 %!error isprime (1, 2)
+%!error <X must be a non-negative integer> isprime (i)
+%!error <X must be a non-negative integer> isprime ([1 2; -3 4])
+%!error <X must be a non-negative integer> isprime ([1 2; 3.1 4])