octave: scripts/general/interp2.m annotate

annotate scripts/general/interp2.m @ 23572:0703d31e1ec0

new script for updating test status for fixed bugs * build-aux/update-bug-status.sh: New script. * build-aux/module.mk: New file. * Makefile.am: Include it. * scripts/module.mk (FCN_FILES_WITH_TESTS): New variable.

author	John W. Eaton <jwe@octave.org>
date	Fri, 09 Jun 2017 17:40:34 -0400
parents	b6144e6dda9e
children	1b4f4ec53b4a

rev	line source
23219 3ac9f9ecfae5 maint: Update copyright dates. John W. Eaton <jwe@octave.org> parents: 23083 diff changeset	1 ## Copyright (C) 2000-2017 Kai Habel
8920 eb63fbe60fab update copyright notices John W. Eaton <jwe@octave.org> parents: 8828 diff changeset	2 ## Copyright (C) 2009 Jaroslav Hajek
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	3 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	4 ## This file is part of Octave.
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	5 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	6 ## Octave is free software; you can redistribute it and/or modify it
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	7 ## under the terms of the GNU General Public License as published by
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22729 diff changeset	8 ## the Free Software Foundation; either version 3 of the License, or
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22729 diff changeset	9 ## (at your option) any later version.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	10 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	11 ## Octave is distributed in the hope that it will be useful, but
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	12 ## WITHOUT ANY WARRANTY; without even the implied warranty of
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22729 diff changeset	13 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22729 diff changeset	14 ## GNU General Public License for more details.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	15 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	16 ## You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	17 ## along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7001 diff changeset	18 ## <http://www.gnu.org/licenses/>.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	19
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	20 ## -- texinfo --
20852 516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20735 diff changeset	21 ## @deftypefn {} {@var{zi} =} interp2 (@var{x}, @var{y}, @var{z}, @var{xi}, @var{yi})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20735 diff changeset	22 ## @deftypefnx {} {@var{zi} =} interp2 (@var{z}, @var{xi}, @var{yi})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20735 diff changeset	23 ## @deftypefnx {} {@var{zi} =} interp2 (@var{z}, @var{n})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20735 diff changeset	24 ## @deftypefnx {} {@var{zi} =} interp2 (@var{z})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20735 diff changeset	25 ## @deftypefnx {} {@var{zi} =} interp2 (@dots{}, @var{method})
516bb87ea72e 2015 Code Sprint: remove class of function from docstring for all m-files. Rik <rik@octave.org> parents: 20735 diff changeset	26 ## @deftypefnx {} {@var{zi} =} interp2 (@dots{}, @var{method}, @var{extrap})
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	27 ##
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	28 ## Two-dimensional interpolation.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	29 ##
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	30 ## Interpolate reference data @var{x}, @var{y}, @var{z} to determine @var{zi}
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	31 ## at the coordinates @var{xi}, @var{yi}. The reference data @var{x}, @var{y}
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	32 ## can be matrices, as returned by @code{meshgrid}, in which case the sizes of
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	33 ## @var{x}, @var{y}, and @var{z} must be equal. If @var{x}, @var{y} are
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	34 ## vectors describing a grid then @code{length (@var{x}) == columns (@var{z})}
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	35 ## and @code{length (@var{y}) == rows (@var{z})}. In either case the input
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	36 ## data must be strictly monotonic.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	37 ##
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	38 ## If called without @var{x}, @var{y}, and just a single reference data matrix
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	39 ## @var{z}, the 2-D region
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	40 ## @code{@var{x} = 1:columns (@var{z}), @var{y} = 1:rows (@var{z})} is assumed.
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	41 ## This saves memory if the grid is regular and the distance between points is
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	42 ## not important.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	43 ##
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	44 ## If called with a single reference data matrix @var{z} and a refinement
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	45 ## value @var{n}, then perform interpolation over a grid where each original
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	46 ## interval has been recursively subdivided @var{n} times. This results in
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	47 ## @code{2^@var{n}-1} additional points for every interval in the original
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	48 ## grid. If @var{n} is omitted a value of 1 is used. As an example, the
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	49 ## interval [0,1] with @code{@var{n}==2} results in a refined interval with
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	50 ## points at [0, 1/4, 1/2, 3/4, 1].
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	51 ##
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	52 ## The interpolation @var{method} is one of:
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	53 ##
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	54 ## @table @asis
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	55 ## @item @qcode{"nearest"}
6218 c1b66b74937d [project @ 2006-12-27 17:43:50 by jwe] jwe parents: 6157 diff changeset	56 ## Return the nearest neighbor.
10821 693e22af08ae Grammarcheck documentation of m-files Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	57 ##
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	58 ## @item @qcode{"linear"} (default)
6218 c1b66b74937d [project @ 2006-12-27 17:43:50 by jwe] jwe parents: 6157 diff changeset	59 ## Linear interpolation from nearest neighbors.
10821 693e22af08ae Grammarcheck documentation of m-files Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	60 ##
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	61 ## @item @qcode{"pchip"}
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	62 ## Piecewise cubic Hermite interpolating polynomial---shape-preserving
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	63 ## interpolation with smooth first derivative.
10821 693e22af08ae Grammarcheck documentation of m-files Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	64 ##
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	65 ## @item @qcode{"cubic"}
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	66 ## Cubic interpolation (same as @qcode{"pchip"}).
10821 693e22af08ae Grammarcheck documentation of m-files Rik <octave@nomad.inbox5.com> parents: 10793 diff changeset	67 ##
17281 bc924baa2c4e doc: Add new @qcode macro for code samples which are quoted. Rik <rik@octave.org> parents: 15467 diff changeset	68 ## @item @qcode{"spline"}
12175 2090995ca588 Correct en-dash,em-dash instances in docstrings. Rik <octave@nomad.inbox5.com> parents: 11589 diff changeset	69 ## Cubic spline interpolation---smooth first and second derivatives
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	70 ## throughout the curve.
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	71 ## @end table
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	72 ##
19795 ca7599ae464d doc: Grammarcheck documentation ahead of 4.0 release. Rik <rik@octave.org> parents: 19697 diff changeset	73 ## @var{extrap} is a scalar number. It replaces values beyond the endpoints
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	74 ## with @var{extrap}. Note that if @var{extrapval} is used, @var{method} must
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	75 ## be specified as well. If @var{extrap} is omitted and the @var{method} is
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	76 ## @qcode{"spline"}, then the extrapolated values of the @qcode{"spline"} are
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	77 ## used. Otherwise the default @var{extrap} value for any other @var{method}
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	78 ## is @qcode{"NA"}.
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	79 ## @seealso{interp1, interp3, interpn, meshgrid}
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	80 ## @end deftypefn
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	81
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	82 function ZI = interp2 (varargin)
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	83
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	84 narginchk (1, 7);
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	85 nargs = nargin;
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	86
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	87 Z = X = Y = XI = YI = n = [];
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	88 method = "linear";
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	89 extrap = [];
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	90
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	91 ## Check for method and extrap
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	92 if (nargs > 1 && ischar (varargin{end-1}))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	93 if (! isnumeric (varargin{end}) \|\| ! isscalar (varargin{end}))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	94 error ("interp2: EXTRAP must be a numeric scalar");
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	95 endif
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	96 extrap = varargin{end};
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	97 method = varargin{end-1};
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	98 nargs -= 2;
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	99 elseif (ischar (varargin{end}))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	100 method = varargin{end};
20735 418ae0cb752f Replace ++,-- with in-place operators for performance. Rik <rik@octave.org> parents: 19833 diff changeset	101 nargs -= 1;
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	102 endif
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	103 if (method(1) == "*")
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	104 warning ("interp2: ignoring unsupported '*' flag to METHOD");
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	105 method(1) = [];
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	106 endif
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	107 method = validatestring (method, ...
21173 5ecdcc6320d9 Fix regressions caused by ismatrix definition change (partial fix bug #47036). Colin Macdonald <cbm@m.fsf.org> parents: 19833 diff changeset	108 {"nearest", "linear", "pchip", "cubic", "spline"});
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	109
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	110 ## Read numeric input
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	111 switch (nargs)
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	112 case 1
376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	113 Z = varargin{1};
13149 ab17591254fc scripts/general/interp2.m: Fix bug #30295. Ben Abbott <bpabbott@mac.com> parents: 12175 diff changeset	114 n = 1;
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	115 case 2
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	116 [Z, n] = deal (varargin{1:nargs});
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	117 case 3
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	118 [Z, XI, YI] = deal (varargin{1:nargs});
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	119 case 5
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	120 [X, Y, Z, XI, YI] = deal (varargin{1:nargs});
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	121 otherwise
376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	122 print_usage ();
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	123 endswitch
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	124
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	125 ## Type checking
21173 5ecdcc6320d9 Fix regressions caused by ismatrix definition change (partial fix bug #47036). Colin Macdonald <cbm@m.fsf.org> parents: 19833 diff changeset	126 if (! isnumeric (Z) \|\| isscalar (Z) \|\| ! ismatrix (Z))
18664 900b524d9072 interp2: Verify Z matrix is 2-D (bug #41267). Rik <rik@octave.org> parents: 18641 diff changeset	127 error ("interp2: Z must be a 2-D matrix");
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	128 endif
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	129 if (! isempty (n) && ! (isscalar (n) && n >= 0 && n == fix (n)))
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	130 error ("interp2: N must be an integer >= 0");
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	131 endif
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	132
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	133 ## Define X, Y, XI, YI if needed
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	134 [zr, zc] = size (Z);
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	135 if (isempty (X))
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	136 X = 1:zc;
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	137 Y = 1:zr;
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	138 endif
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	139 if (! isnumeric (X) \|\| ! isnumeric (Y))
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	140 error ("interp2: X, Y must be numeric matrices");
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	141 endif
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	142 if (! isempty (n))
13149 ab17591254fc scripts/general/interp2.m: Fix bug #30295. Ben Abbott <bpabbott@mac.com> parents: 12175 diff changeset	143 ## Calculate the interleaved input vectors.
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	144 p = 2^n;
c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	145 XI = (p:p*zc)/p;
c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	146 YI = (p:p*zr)'/p;
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	147 endif
5838 376e02b2ce70 [project @ 2006-06-01 20:23:53 by jwe] jwe parents: 5837 diff changeset	148 if (! isnumeric (XI) \|\| ! isnumeric (YI))
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	149 error ("interp2: XI, YI must be numeric");
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	150 endif
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	151
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	152 if (isvector (X) && isvector (Y))
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	153 X = X(:); Y = Y(:);
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	154 elseif (size_equal (X, Y))
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	155 X = X(1,:).'; Y = Y(:,1);
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	156 else
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	157 error ("interp2: X and Y must be matrices of equal size");
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	158 endif
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	159 if (columns (Z) != length (X) \|\| rows (Z) != length (Y))
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	160 error ("interp2: X and Y size must match the dimensions of Z");
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	161 endif
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	162 dx = diff (X);
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	163 if (all (dx < 0))
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	164 X = flipud (X);
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19596 diff changeset	165 Z = fliplr (Z);
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	166 elseif (any (dx <= 0))
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	167 error ("interp2: X must be strictly monotonic");
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	168 endif
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	169 dy = diff (Y);
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	170 if (all (dy < 0))
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	171 Y = flipud (Y);
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19596 diff changeset	172 Z = flipud (Z);
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	173 elseif (any (dy <= 0))
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	174 error ("interp2: Y must be strictly monotonic");
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	175 endif
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	176
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	177 if (any (strcmp (method, {"nearest", "linear", "pchip", "cubic"})))
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	178
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	179 ## If Xi and Yi are vectors of different orientation build a grid
22729 66d73a5a48b0 interp2.m: Clean up code. Rik <rik@octave.org> parents: 22727 diff changeset	180 if ((isrow (XI) && iscolumn (YI)) \|\| (iscolumn (XI) && isrow (YI)))
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	181 [XI, YI] = meshgrid (XI, YI);
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	182 elseif (! size_equal (XI, YI))
11472 1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done. Rik <octave@nomad.inbox5.com> parents: 11108 diff changeset	183 error ("interp2: XI and YI must be matrices of equal size");
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	184 endif
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	185
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	186 ## if XI, YI are vectors, X and Y should share their orientation.
22729 66d73a5a48b0 interp2.m: Clean up code. Rik <rik@octave.org> parents: 22727 diff changeset	187 if (isrow (XI))
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	188 if (rows (X) != 1)
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	189 X = X.';
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	190 endif
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	191 if (rows (Y) != 1)
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	192 Y = Y.';
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	193 endif
22729 66d73a5a48b0 interp2.m: Clean up code. Rik <rik@octave.org> parents: 22727 diff changeset	194 elseif (iscolumn (XI))
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	195 if (columns (X) != 1)
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	196 X = X.';
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	197 endif
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	198 if (columns (Y) != 1)
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	199 Y = Y.';
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	200 endif
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	201 endif
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	202
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	203 xidx = lookup (X, XI, "lr");
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	204 yidx = lookup (Y, YI, "lr");
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	205
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	206 if (strcmp (method, "linear"))
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	207 ## each quad satisfies the equation z(x,y)=a+bx+cy+d*xy
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	208 ##
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	209 ## a-b
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	210 ## \| \|
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	211 ## c-d
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	212 a = Z(1:(zr - 1), 1:(zc - 1));
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	213 b = Z(1:(zr - 1), 2:zc) - a;
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	214 c = Z(2:zr, 1:(zc - 1)) - a;
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	215 d = Z(2:zr, 2:zc) - a - b - c;
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	216
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	217 ## scale XI, YI values to a 1-spaced grid
10326 ade59ae10e80 slight optimization in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 10320 diff changeset	218 Xsc = (XI - X(xidx)) ./ (diff (X)(xidx));
ade59ae10e80 slight optimization in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 10320 diff changeset	219 Ysc = (YI - Y(yidx)) ./ (diff (Y)(yidx));
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	220
10328 2210d3070543 further memory optimization in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 10326 diff changeset	221 ## Get 2D index.
2210d3070543 further memory optimization in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 10326 diff changeset	222 idx = sub2ind (size (a), yidx, xidx);
22727 125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	223 ## Dispose of the 1D indices at this point to save memory.
11589 b0084095098e missing semicolons in script files John W. Eaton <jwe@octave.org> parents: 11587 diff changeset	224 clear xidx yidx;
10328 2210d3070543 further memory optimization in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 10326 diff changeset	225
22727 125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	226 ## Apply plane equation
125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	227 ## Handle case where idx and coefficients are both vectors and resulting
125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	228 ## coeff(idx) follows orientation of coeff, rather than that of idx.
125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	229 forient = @(x) reshape (x, size (idx));
125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	230 ZI = forient (a(idx)) ...
125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	231 + forient (b(idx)) .* Xsc ...
125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	232 + forient (c(idx)) .* Ysc ...
125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	233 + forient (d(idx)) .* Xsc.*Ysc;
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	234
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	235 elseif (strcmp (method, "nearest"))
10427 62bb59f927b1 scripts/general/interp2.m, scripts/general/interpn.m: For nearest neighbour interpolation ceil (instead of floor) at the center of the data intervals to be compatible with Matlab. Add test. Soren Hauberg <hauberg@gmail.com> parents: 10328 diff changeset	236 ii = (XI - X(xidx) >= X(xidx + 1) - XI);
62bb59f927b1 scripts/general/interp2.m, scripts/general/interpn.m: For nearest neighbour interpolation ceil (instead of floor) at the center of the data intervals to be compatible with Matlab. Add test. Soren Hauberg <hauberg@gmail.com> parents: 10328 diff changeset	237 jj = (YI - Y(yidx) >= Y(yidx + 1) - YI);
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	238 idx = sub2ind (size (Z), yidx+jj, xidx+ii);
b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	239 ZI = Z(idx);
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	240
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	241 elseif (strcmp (method, "pchip") \|\| strcmp (method, "cubic"))
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	242
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	243 if (length (X) < 2 \|\| length (Y) < 2)
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	244 error ("interp2: %s requires at least 2 points in each dimension",
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	245 method);
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	246 endif
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	247
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	248 ## first order derivatives
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	249 DX = __pchip_deriv__ (X, Z, 2);
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	250 DY = __pchip_deriv__ (Y, Z, 1);
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	251 ## Compute mixed derivatives row-wise and column-wise, use the average.
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	252 DXY = (__pchip_deriv__ (X, DY, 2) + __pchip_deriv__ (Y, DX, 1))/2;
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	253
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	254 ## do the bicubic interpolation
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	255 hx = diff (X); hx = hx(xidx);
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	256 hy = diff (Y); hy = hy(yidx);
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	257
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	258 tx = (XI - X(xidx)) ./ hx;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	259 ty = (YI - Y(yidx)) ./ hy;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	260
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	261 ## construct the cubic hermite base functions in x, y
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	262
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	263 ## formulas:
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	264 ## b{1,1} = ( 2t.^3 - 3t.^2 + 1);
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	265 ## b{2,1} = h.( t.^3 - 2t.^2 + t );
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	266 ## b{1,2} = (-2t.^3 + 3t.^2 );
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	267 ## b{2,2} = h.*( t.^3 - t.^2 );
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	268
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	269 ## optimized equivalents of the above:
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	270 t1 = tx.^2;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	271 t2 = tx.*t1 - t1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	272 xb{2,2} = hx.*t2;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	273 t1 = t2 - t1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	274 xb{2,1} = hx.*(t1 + tx);
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	275 t2 += t1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	276 xb{1,2} = -t2;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	277 xb{1,1} = t2 + 1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	278
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	279 t1 = ty.^2;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	280 t2 = ty.*t1 - t1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	281 yb{2,2} = hy.*t2;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	282 t1 = t2 - t1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	283 yb{2,1} = hy.*(t1 + ty);
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	284 t2 += t1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	285 yb{1,2} = -t2;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	286 yb{1,1} = t2 + 1;
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	287
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	288 ZI = zeros (size (XI));
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	289 for i = 1:2
10549 95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10427 diff changeset	290 for j = 1:2
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10427 diff changeset	291 zidx = sub2ind (size (Z), yidx+(j-1), xidx+(i-1));
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10427 diff changeset	292 ZI += xb{1,i} .* yb{1,j} .* Z(zidx);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10427 diff changeset	293 ZI += xb{2,i} .* yb{1,j} .* DX(zidx);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10427 diff changeset	294 ZI += xb{1,i} .* yb{2,j} .* DY(zidx);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10427 diff changeset	295 ZI += xb{2,i} .* yb{2,j} .* DXY(zidx);
95c3e38098bf Untabify .m scripts Rik <code@nomad.inbox5.com> parents: 10427 diff changeset	296 endfor
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	297 endfor
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	298
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	299 endif
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	300
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	301 else
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	302
10780 6e7590d003dc Fix bugs in interp2 (bug #29601) Thorsten Meyer <thorsten.meyier@gmx.de> parents: 10635 diff changeset	303 ## Check dimensions of XI and YI
13149 ab17591254fc scripts/general/interp2.m: Fix bug #30295. Ben Abbott <bpabbott@mac.com> parents: 12175 diff changeset	304 if (isvector (XI) && isvector (YI) && ! size_equal (XI, YI))
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	305 XI = XI(:).'; YI = YI(:);
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	306 elseif (! size_equal (XI, YI))
11472 1740012184f9 Use uppercase for variable names in error() strings to match Info documentation. Only m-files done. Rik <octave@nomad.inbox5.com> parents: 11108 diff changeset	307 error ("interp2: XI and YI must be matrices of equal size");
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	308 endif
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	309
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	310 if (strcmp (method, "spline"))
9755 4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	311 if (isgriddata (XI) && isgriddata (YI'))
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	312 ZI = __splinen__ ({Y, X}, Z, {YI(:,1), XI(1,:)}, extrap, "spline");
9755 4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	313 else
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	314 error ("interp2: XI, YI must have uniform spacing ('meshgrid' format)");
9755 4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	315 endif
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	316 endif
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	317
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	318 return; # spline doesn't need NA extrapolation value (MATLAB compatibility)
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	319
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	320 endif
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	321
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19795 diff changeset	322 ## extrapolation 'extrap'
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	323 if (isempty (extrap))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	324 extrap = NA;
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	325 endif
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19795 diff changeset	326
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	327 if (X(1) < X(end))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	328 if (Y(1) < Y(end))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	329 ZI(XI < X(1,1) \| XI > X(end) \| YI < Y(1,1) \| YI > Y(end)) = extrap;
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	330 else
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	331 ZI(XI < X(1) \| XI > X(end) \| YI < Y(end) \| YI > Y(1)) = extrap;
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	332 endif
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	333 else
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	334 if (Y(1) < Y(end))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	335 ZI(XI < X(end) \| XI > X(1) \| YI < Y(1) \| YI > Y(end)) = extrap;
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	336 else
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	337 ZI(XI < X(1,end) \| XI > X(1) \| YI < Y(end) \| YI > Y(1)) = extrap;
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	338 endif
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	339 endif
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	340
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	341 endfunction
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	342
9755 4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	343 function b = isgriddata (X)
4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	344 d1 = diff (X, 1, 1);
22729 66d73a5a48b0 interp2.m: Clean up code. Rik <rik@octave.org> parents: 22727 diff changeset	345 b = ! any (d1(:) != 0);
9755 4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	346 endfunction
4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	347
4f4873f6f873 general/interp2.m: improved error checking and support for bicubic interpolation when X and Y are meshgrid format Soren Hauberg <hauberg@gmail.com> parents: 9399 diff changeset	348
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	349 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	350 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	351 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	352 %! A = [13,-1,12;5,4,3;1,6,2];
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	353 %! x = [0,1,4]; y = [10,11,12];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	354 %! xi = linspace (min (x), max (x), 17);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	355 %! yi = linspace (min (y), max (y), 26)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	356 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "linear"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	357 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	358 %! hold on; plot3 (x,y,A,"b*"); hold off;
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	359
55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	360 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	361 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	362 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	363 %! [x,y,A] = peaks (10);
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	364 %! x = x(1,:)'; y = y(:,1);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	365 %! xi = linspace (min (x), max (x), 41);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	366 %! yi = linspace (min (y), max (y), 41)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	367 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "linear"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	368 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	369 %! hold on; plot3 (x,y,A,"b*"); hold off;
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	370
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	371 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	372 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	373 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	374 %! A = [13,-1,12;5,4,3;1,6,2];
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	375 %! x = [0,1,4]; y = [10,11,12];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	376 %! xi = linspace (min (x), max (x), 17);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	377 %! yi = linspace (min (y), max (y), 26)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	378 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "nearest"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	379 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	380 %! hold on; plot3 (x,y,A,"b*"); hold off;
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	381
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	382 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	383 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	384 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	385 %! [x,y,A] = peaks (10);
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	386 %! x = x(1,:)'; y = y(:,1);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	387 %! xi = linspace (min (x), max (x), 41);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	388 %! yi = linspace (min (y), max (y), 41)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	389 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "nearest"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	390 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	391 %! hold on; plot3 (x,y,A,"b*"); hold off;
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	392
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	393 ## 'pchip' commented out since it is the same as 'cubic'
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	394 %!#demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	395 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	396 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	397 %! A = [13,-1,12;5,4,3;1,6,2];
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	398 %! x = [0,1,2]; y = [10,11,12];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	399 %! xi = linspace (min (x), max (x), 17);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	400 %! yi = linspace (min (y), max (y), 26)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	401 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "pchip"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	402 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	403 %! hold on; plot3 (x,y,A,"b*"); hold off;
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	404
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	405 ## 'pchip' commented out since it is the same as 'cubic'
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	406 %!#demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	407 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	408 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	409 %! [x,y,A] = peaks (10);
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	410 %! x = x(1,:)'; y = y(:,1);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	411 %! xi = linspace (min (x), max (x), 41);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	412 %! yi = linspace (min (y), max (y), 41)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	413 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "pchip"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	414 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	415 %! hold on; plot3 (x,y,A,"b*"); hold off;
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	416
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	417 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	418 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	419 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	420 %! A = [13,-1,12;5,4,3;1,6,2];
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	421 %! x = [0,1,2]; y = [10,11,12];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	422 %! xi = linspace (min (x), max (x), 17);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	423 %! yi = linspace (min (y), max (y), 26)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	424 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "cubic"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	425 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	426 %! hold on; plot3 (x,y,A,"b*"); hold off;
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	427
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	428 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	429 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	430 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	431 %! [x,y,A] = peaks (10);
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	432 %! x = x(1,:)'; y = y(:,1);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	433 %! xi = linspace (min (x), max (x), 41);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	434 %! yi = linspace (min (y), max (y), 41)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	435 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "cubic"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	436 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	437 %! hold on; plot3 (x,y,A,"b*"); hold off;
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	438
010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	439 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	440 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	441 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	442 %! A = [13,-1,12;5,4,3;1,6,2];
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	443 %! x = [0,1,2]; y = [10,11,12];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	444 %! xi = linspace (min (x), max (x), 17);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	445 %! yi = linspace (min (y), max (y), 26)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	446 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "spline"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	447 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	448 %! hold on; plot3 (x,y,A,"b*"); hold off;
6702 b2391d403ed2 [project @ 2007-06-12 21:39:26 by dbateman] dbateman parents: 6448 diff changeset	449
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	450 %!demo
14247 c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	451 %! clf;
c4fa5e0b6193 test: Make surface demos reproducible by setting colormap to default at start of demo. Rik <octave@nomad.inbox5.com> parents: 14237 diff changeset	452 %! colormap ("default");
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	453 %! [x,y,A] = peaks (10);
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	454 %! x = x(1,:)'; y = y(:,1);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	455 %! xi = linspace (min (x), max (x), 41);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	456 %! yi = linspace (min (y), max (y), 41)';
14237 11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	457 %! mesh (xi,yi,interp2 (x,y,A,xi,yi, "spline"));
11949c9795a0 Revamp %!demos in m-files to use Octave coding conventions on spacing, etc. Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	458 %! [x,y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	459 %! hold on; plot3 (x,y,A,"b*"); hold off;
8712 010e15c7be9a support pchip method in interp2 Jaroslav Hajek <highegg@gmail.com> parents: 8479 diff changeset	460
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	461 %!test # simple test
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	462 %! x = [1,2,3];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	463 %! y = [4,5,6,7];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	464 %! [X, Y] = meshgrid (x, y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	465 %! orig = X.^2 + Y.^3;
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	466 %! xi = [1.2,2, 1.5];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	467 %! yi = [6.2, 4.0, 5.0]';
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	468 %!
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	469 %! expected = ...
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	470 %! [243, 245.4, 243.9;
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	471 %! 65.6, 68, 66.5;
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	472 %! 126.6, 129, 127.5];
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	473 %! result = interp2 (x,y,orig, xi, yi);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	474 %!
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	475 %! assert (result, expected, 1000*eps);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	476
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	477 %!test # 2^n refinement form
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	478 %! x = [1,2,3];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	479 %! y = [4,5,6,7];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	480 %! [X, Y] = meshgrid (x, y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	481 %! orig = X.^2 + Y.^3;
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	482 %! xi = [1:0.25:3]; yi = [4:0.25:7]';
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	483 %! expected = interp2 (x,y,orig, xi, yi);
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	484 %! result = interp2 (orig, 2);
11587 c792872f8942 all script files: untabify and strip trailing whitespace John W. Eaton <jwe@octave.org> parents: 11536 diff changeset	485 %!
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	486 %! assert (result, expected, 10*eps);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	487
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	488 %!test # matrix slice
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	489 %! A = eye (4);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	490 %! assert (interp2 (A,[1:4],[1:4]), [1,1,1,1]);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	491
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	492 %!test # non-gridded XI,YI
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	493 %! A = eye (4);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	494 %! assert (interp2 (A,[1,2;3,4],[1,3;2,4]), [1,0;0,1]);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	495
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	496 %!test # for values outside of boundaries
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	497 %! x = [1,2,3];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	498 %! y = [4,5,6,7];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	499 %! [X, Y] = meshgrid (x,y);
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	500 %! orig = X.^2 + Y.^3;
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	501 %! xi = [0,4];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	502 %! yi = [3,8]';
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	503 %! assert (interp2 (x,y,orig, xi, yi), [NA,NA;NA,NA]);
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	504 %! assert (interp2 (x,y,orig, xi, yi,"linear", 0), [0,0;0,0]);
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	505 %! assert (interp2 (x,y,orig, xi, yi,"linear", 2), [2,2;2,2]);
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	506 %! assert (interp2 (x,y,orig, xi, yi,"spline", 2), [2,2;2,2]);
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	507 %! assert (interp2 (x,y,orig, xi, yi,"linear", 0+1i), [0+1i,0+1i;0+1i,0+1i]);
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	508 %! assert (interp2 (x,y,orig, xi, yi,"spline"), [27,43;512,528]);
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	509
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	510 %!test # for values at boundaries
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	511 %! A = [1,2;3,4];
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	512 %! x = [0,1];
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	513 %! y = [2,3]';
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	514 %! assert (interp2 (x,y,A,x,y,"linear"), A);
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	515 %! assert (interp2 (x,y,A,x,y,"nearest"), A);
5837 55404f3b0da1 [project @ 2006-06-01 19:05:31 by jwe] jwe parents: diff changeset	516
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	517 %!test # for Matlab-compatible rounding for 'nearest'
10427 62bb59f927b1 scripts/general/interp2.m, scripts/general/interpn.m: For nearest neighbour interpolation ceil (instead of floor) at the center of the data intervals to be compatible with Matlab. Add test. Soren Hauberg <hauberg@gmail.com> parents: 10328 diff changeset	518 %! X = meshgrid (1:4);
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	519 %! assert (interp2 (X, 2.5, 2.5, "nearest"), 3);
10427 62bb59f927b1 scripts/general/interp2.m, scripts/general/interpn.m: For nearest neighbour interpolation ceil (instead of floor) at the center of the data intervals to be compatible with Matlab. Add test. Soren Hauberg <hauberg@gmail.com> parents: 10328 diff changeset	520
22489 93ea313301f9 test: Add bug ids (<#####>) to BIST tests. Rik <rik@octave.org> parents: 21317 diff changeset	521 ## re-order monotonically decreasing
23572 0703d31e1ec0 new script for updating test status for fixed bugs John W. Eaton <jwe@octave.org> parents: 23571 diff changeset	522 %!assert <41838> (interp2 ([1 2 3], [3 2 1], magic (3), 2.5, 3), 3.5)
0703d31e1ec0 new script for updating test status for fixed bugs John W. Eaton <jwe@octave.org> parents: 23571 diff changeset	523 %!assert <41838> (interp2 ([3 2 1], [1 2 3], magic (3), 1.5, 1), 3.5)
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	524
22727 125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	525 ## Linear interpretation with vector XI doesn't lead to matrix output
23572 0703d31e1ec0 new script for updating test status for fixed bugs John W. Eaton <jwe@octave.org> parents: 23571 diff changeset	526 %!assert <49506> (interp2 ([2 3], [2 3 4], [1 2; 3 4; 5 6], [2 3], 3, "linear"), [3 4])
22727 125391edc71b interp2.m: Re-orient vector/vector indexing in "linear" to fix output sizie (bug #49506). Rik <rik@octave.org> parents: 22489 diff changeset	527
13149 ab17591254fc scripts/general/interp2.m: Fix bug #30295. Ben Abbott <bpabbott@mac.com> parents: 12175 diff changeset	528 %!shared z, zout, tol
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	529 %! z = [1 3 5; 3 5 7; 5 7 9];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	530 %! zout = [1 2 3 4 5; 2 3 4 5 6; 3 4 5 6 7; 4 5 6 7 8; 5 6 7 8 9];
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	531 %! tol = 2 * eps;
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	532 %!
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	533 %!assert (interp2 (z), zout, tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	534 %!assert (interp2 (z, "linear"), zout, tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	535 %!assert (interp2 (z, "pchip"), zout, tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	536 %!assert (interp2 (z, "cubic"), zout, 10 * tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	537 %!assert (interp2 (z, "spline"), zout, tol)
19593 446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	538 %!assert (interp2 (z, [2 3 1], [2 2 2]', "linear"), repmat ([5, 7, 3], [3, 1]), tol)
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	539 %!assert (interp2 (z, [2 3 1], [2 2 2]', "pchip"), repmat ([5, 7, 3], [3, 1]), tol)
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	540 %!assert (interp2 (z, [2 3 1], [2 2 2]', "cubic"), repmat ([5, 7, 3], [3, 1]), 10 * tol)
446c46af4b42 strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 17744 diff changeset	541 %!assert (interp2 (z, [2 3 1], [2 2 2]', "spline"), repmat ([5, 7, 3], [3, 1]), tol)
14363 f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	542 %!assert (interp2 (z, [2 3 1], [2 2 2], "linear"), [5 7 3], tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	543 %!assert (interp2 (z, [2 3 1], [2 2 2], "pchip"), [5 7 3], tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	544 %!assert (interp2 (z, [2 3 1], [2 2 2], "cubic"), [5 7 3], 10 * tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	545 %!assert (interp2 (z, [2 3 1], [2 2 2], "spline"), [5 7 3], tol)
f3d52523cde1 Use Octave coding conventions in all m-file %!test blocks Rik <octave@nomad.inbox5.com> parents: 14359 diff changeset	546
19833 9fc020886ae9 maint: Clean up m-files to follow Octave coding conventions. Rik <rik@octave.org> parents: 19795 diff changeset	547 ## Test input validation
21173 5ecdcc6320d9 Fix regressions caused by ismatrix definition change (partial fix bug #47036). Colin Macdonald <cbm@m.fsf.org> parents: 19833 diff changeset	548 %!error interp2 (1, 1, 1, 1, 1, 2) # only 5 numeric inputs
5ecdcc6320d9 Fix regressions caused by ismatrix definition change (partial fix bug #47036). Colin Macdonald <cbm@m.fsf.org> parents: 19833 diff changeset	549 %!error interp2 (1, 1, 1, 1, 1, 2, 2) # only 5 numeric inputs
18664 900b524d9072 interp2: Verify Z matrix is 2-D (bug #41267). Rik <rik@octave.org> parents: 18641 diff changeset	550 %!error <Z must be a 2-D matrix> interp2 ({1})
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	551 %!error <Z must be a 2-D matrix> interp2 (1,1,1)
18664 900b524d9072 interp2: Verify Z matrix is 2-D (bug #41267). Rik <rik@octave.org> parents: 18641 diff changeset	552 %!error <Z must be a 2-D matrix> interp2 (ones (2,2,2))
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	553 %!error <N must be an integer .= 0> interp2 (ones (2), ones (2))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	554 %!error <N must be an integer .= 0> interp2 (ones (2), -1)
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	555 %!error <N must be an integer .= 0> interp2 (ones (2), 1.5)
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	556 %!warning <ignoring unsupported '\' flag> interp2 (rand (3,3), 1, "linear");
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	557 %!error <EXTRAP must be a numeric scalar> interp2 (1, 1, 1, 1, 1, 'linear', {1})
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	558 %!error <EXTRAP must be a numeric scalar> interp2 (1, 1, 1, 1, 1, 'linear', ones (2,2))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	559 %!error <EXTRAP must be a numeric scalar> interp2 (1, 1, 1, 1, 1, 'linear', "abc")
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	560 %!error <EXTRAP must be a numeric scalar> interp2 (1, 1, 1, 1, 1, 'linear', "extrap")
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	561 %!error <X, Y must be numeric matrices> interp2 ({1}, 1, ones (2), 1, 1)
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	562 %!error <X, Y must be numeric matrices> interp2 (1, {1}, ones (2), 1, 1)
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	563 %!error <XI, YI must be numeric> interp2 (1, 1, ones (2), {1}, 1)
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	564 %!error <XI, YI must be numeric> interp2 (1, 1, ones (2), 1, {1})
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	565 %!error <X and Y must be matrices of equal size> interp2 (ones(2,2), 1, ones (2), 1, 1)
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	566 %!error <X and Y must be matrices of equal size> interp2 (ones(2,2), ones(2,3), ones (2), 1, 1)
18606 0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	567 %!error <X and Y size must match the dimensions of Z> interp2 (1:3, 1:3, ones (3,2), 1, 1)
0ede4dbb37f1 Overhaul interp1, interp2, interp3 functions. Rik <rik@octave.org> parents: 18587 diff changeset	568 %!error <X and Y size must match the dimensions of Z> interp2 (1:2, 1:2, ones (3,2), 1, 1)
18641 4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	569 %!error <X must be strictly monotonic> interp2 ([1 0 2], 1:3, ones (3,3), 1, 1)
4792a115c735 interp2.m: Add input validation for strictly monotonic x,y (bug #41838). Rik <rik@octave.org> parents: 18606 diff changeset	570 %!error <Y must be strictly monotonic> interp2 (1:3, [1 0 2], ones (3,3), 1, 1)
19658 5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	571 %!error <XI and YI must be matrices of equal size> interp2 (1:2, 1:2, ones (2), ones(2,2), 1)
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	572 %!error <XI and YI must be matrices of equal size> interp2 (1:2, 1:2, ones (2), 1, ones(2,2))
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	573 %!error <XI, YI must have uniform spacing> interp2 (1:2, 1:2, ones (2), [1 2 4], [1 2 3], "spline")
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	574 %!error <XI, YI must have uniform spacing> interp2 (1:2, 1:2, ones (2), [1 2 3], [1 2 4], "spline")
5a59c0e1203d Modified the "extrap" option for interp2, interp3, and interpn (bug #44002). Kai T. Ohlhus <k.ohlhus@gmail.com> parents: 19597 diff changeset	575 %!error interp2 (1, 1, 1, 1, 1, "foobar")

Mercurial > octave

annotate scripts/general/interp2.m @ 23572:0703d31e1ec0