Mercurial > octave-dspies
changeset 18664:900b524d9072
interp2: Verify Z matrix is 2-D (bug #41267).
* interp2.m: Validate that Z matrix is 2-D. Add %!error test to check new
code.
| author | Rik <rik@octave.org> |
|---|---|
| date | Sat, 19 Apr 2014 09:28:20 -0700 |
| parents | 271873b2f44f |
| children | 652d9ed6f88d |
| files | scripts/general/interp2.m |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/general/interp2.m Wed Apr 02 20:46:57 2014 +0200 +++ b/scripts/general/interp2.m Sat Apr 19 09:28:20 2014 -0700 @@ -141,8 +141,8 @@ endswitch ## Type checking - if (! ismatrix (Z)) - error ("interp2: Z must be a matrix"); + if (! (ismatrix (Z) && ndims (Z) == 2)) + error ("interp2: Z must be a 2-D matrix"); endif if (! isempty (n) && ! (isscalar (n) && n >= 0 && n == fix (n))) error ("interp2: N must be an integer >= 0"); @@ -654,7 +654,8 @@ %!assert (interp2 (z, [2 3 1], [2 2 2], "spline"), [5 7 3], tol) %% Test input validation -%!error <Z must be a matrix> interp2 ({1}) +%!error <Z must be a 2-D matrix> interp2 ({1}) +%!error <Z must be a 2-D matrix> interp2 (ones (2,2,2)) %!error <N must be an integer .= 0> interp2 (1, ones (2)) %!error <N must be an integer .= 0> interp2 (1, -1) %!error <N must be an integer .= 0> interp2 (1, 1.5)