Mercurial > octave-nkf
changeset 11692:0cabd873264d release-3-0-x
Fix griddata3 and add test code
| author | David Bateman <dbateman@free.fr> |
|---|---|
| date | Wed, 12 Mar 2008 15:05:00 +0100 |
| parents | c6ce7274fb14 |
| children | 550113e01d87 |
| files | scripts/ChangeLog scripts/geometry/griddata3.m |
| diffstat | 2 files changed, 31 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/scripts/ChangeLog Wed Mar 12 01:05:55 2008 -0400 +++ b/scripts/ChangeLog Wed Mar 12 15:05:00 2008 +0100 @@ -1,3 +1,8 @@ +2008-03-12 David Bateman <dbateman@free.fr> + + * geometry/griddata3.m: Use griddatan and not griddata + internally. Return vi and not yi. Add test code. + 2008-03-11 John W. Eaton <jwe@octave.org> * plot/__go_draw_axes__.m: Use get to access hidden properties.
--- a/scripts/geometry/griddata3.m Wed Mar 12 01:05:55 2008 -0400 +++ b/scripts/geometry/griddata3.m Wed Mar 12 15:05:00 2008 +0100 @@ -30,7 +30,7 @@ ## Author: David Bateman <dbateman@free.fr> -function [yi] = griddata3 (x, y, z,v, xi, yi, zi, method, varargin) +function vi = griddata3 (x, y, z, v, xi, yi, zi, method, varargin) if (nargin < 7) print_usage (); @@ -48,10 +48,33 @@ endif if (any (size(xi) != size(yi)) || any (size(xi) != size(zi))) - error ("griddata: xi, yi and zi must be vectors or matrices of same size"); + error ("griddata3: xi, yi and zi must be vectors or matrices of same size"); endif - vi = griddata ([x(:), y(:), z(:)], v(:), [xi(:), yi(:), zi(:)], varargin{:}); + vi = griddatan ([x(:), y(:), z(:)], v(:), [xi(:), yi(:), zi(:)], varargin{:}); vi = reshape (vi, size (xi)); endfunction +%!test +%! rand('state', 0); +%! x = 2 * rand(1000, 1) - 1; +%! y = 2 * rand(1000, 1) - 1; +%! z = 2 * rand(1000, 1) - 1; +%! v = x.^2 + y.^2 + z.^2; +%! [xi, yi, zi] = meshgrid (-0.8:0.2:0.8); +%! ##vi = reshape (griddatan([x(:), y(:), z(:)], v, [xi(:), yi(:), zi(:)], 'linear'), size (xi)); +%! vi = griddata3 (x, y, z, v, xi, yi, zi, 'linear'); +%! vv = vi - xi.^2 - yi.^2 - zi.^2; +%! assert (max(abs(vv(:))), 0, 0.1) + +%!test +%! rand('state', 0); +%! x = 2 * rand(1000, 1) - 1; +%! y = 2 * rand(1000, 1) - 1; +%! z = 2 * rand(1000, 1) - 1; +%! v = x.^2 + y.^2 + z.^2; +%! [xi, yi, zi] = meshgrid (-0.8:0.2:0.8); +%! ##vi = reshape (griddatan([x(:), y(:), z(:)], v, [xi(:), yi(:), zi(:)], 'linear'), size (xi)); +%! vi = griddata3 (x, y, z, v, xi, yi, zi, 'nearest'); +%! vv = vi - xi.^2 - yi.^2 - zi.^2; +%! assert (max(abs(vv(:))), 0, 0.1)