Mercurial > octave-antonio
annotate scripts/general/interpn.m @ 14868:5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
* lin2mu.m, loadaudio.m, wavread.m, accumarray.m, bicubic.m, celldisp.m,
colon.m, cplxpair.m, dblquad.m, divergence.m, genvarname.m, gradient.m,
int2str.m, interp1.m, interp1q.m, interp2.m, interpn.m, loadobj.m, nthargout.m,
__isequal__.m, __splinen__.m, quadgk.m, quadl.m, quadv.m, rat.m, rot90.m,
rotdim.m, saveobj.m, subsindex.m, triplequad.m, delaunay3.m, griddata.m,
inpolygon.m, tsearchn.m, voronoi.m, get_first_help_sentence.m, which.m,
gray2ind.m, pink.m, dlmwrite.m, strread.m, textread.m, textscan.m, housh.m,
ishermitian.m, issymmetric.m, krylov.m, logm.m, null.m, rref.m,
compare_versions.m, copyfile.m, dump_prefs.m, edit.m, fileparts.m,
getappdata.m, isappdata.m, movefile.m, orderfields.m, parseparams.m,
__xzip__.m, rmappdata.m, setappdata.m, swapbytes.m, unpack.m, ver.m, fminbnd.m,
fminunc.m, fsolve.m, glpk.m, lsqnonneg.m, qp.m, sqp.m, configure_make.m,
copy_files.m, describe.m, get_description.m, get_forge_pkg.m, install.m,
installed_packages.m, is_architecture_dependent.m, load_package_dirs.m,
print_package_description.m, rebuild.m, repackage.m, save_order.m, shell.m,
allchild.m, ancestor.m, area.m, axes.m, axis.m, clabel.m, close.m, colorbar.m,
comet.m, comet3.m, contour.m, cylinder.m, ezmesh.m, ezsurf.m, findobj.m,
fplot.m, hist.m, isocolors.m, isonormals.m, isosurface.m, isprop.m, legend.m,
mesh.m, meshz.m, pareto.m, pcolor.m, peaks.m, plot3.m, plotmatrix.m, plotyy.m,
polar.m, print.m, __add_datasource__.m, __add_default_menu__.m,
__axes_limits__.m, __bar__.m, __clabel__.m, __contour__.m, __errcomm__.m,
__errplot__.m, __ezplot__.m, __file_filter__.m, __fltk_print__.m,
__ghostscript__.m, __gnuplot_print__.m, __go_draw_axes__.m,
__go_draw_figure__.m, __interp_cube__.m, __marching_cube__.m, __patch__.m,
__pie__.m, __plt__.m, __print_parse_opts__.m, __quiver__.m, __scatter__.m,
__stem__.m, __tight_eps_bbox__.m, __uigetdir_fltk__.m, __uigetfile_fltk__.m,
__uiputfile_fltk__.m, quiver.m, quiver3.m, rectangle.m, refreshdata.m,
ribbon.m, scatter.m, semilogy.m, shading.m, slice.m, subplot.m, surface.m,
surfl.m, surfnorm.m, text.m, uigetfile.m, uiputfile.m, whitebg.m, deconv.m,
mkpp.m, pchip.m, polyaffine.m, polyder.m, polygcd.m, polyout.m, polyval.m,
ppint.m, ppjumps.m, ppval.m, residue.m, roots.m, spline.m, splinefit.m,
addpref.m, getpref.m, setpref.m, ismember.m, setxor.m, arch_fit.m, arch_rnd.m,
arch_test.m, autoreg_matrix.m, diffpara.m, fftconv.m, filter2.m, hanning.m,
hurst.m, periodogram.m, triangle_sw.m, sinc.m, spectral_xdf.m, spencer.m,
stft.m, synthesis.m, unwrap.m, yulewalker.m, bicgstab.m, gmres.m, pcg.m, pcr.m,
__sprand_impl__.m, speye.m, spfun.m, sprandn.m, spstats.m, svds.m,
treelayout.m, treeplot.m, bessel.m, factor.m, legendre.m, perms.m, primes.m,
magic.m, toeplitz.m, corr.m, cov.m, mean.m, median.m, mode.m, qqplot.m,
quantile.m, ranks.m, zscore.m, logistic_regression_likelihood.m,
bartlett_test.m, chisquare_test_homogeneity.m, chisquare_test_independence.m,
kolmogorov_smirnov_test.m, run_test.m, u_test.m, wilcoxon_test.m, z_test.m,
z_test_2.m, bin2dec.m, dec2base.m, mat2str.m, strcat.m, strchr.m, strjust.m,
strtok.m, substr.m, untabify.m, assert.m, demo.m, example.m, fail.m, speed.m,
test.m, now.m: Use Octave coding conventions for cuddling parentheses in
scripts directory.
author | Rik <octave@nomad.inbox5.com> |
---|---|
date | Tue, 17 Jul 2012 07:08:39 -0700 |
parents | f3d52523cde1 |
children | 486c3e2731ff |
rev | line source |
---|---|
14138
72c96de7a403
maint: update copyright notices for 2012
John W. Eaton <jwe@octave.org>
parents:
13173
diff
changeset
|
1 ## Copyright (C) 2007-2012 David Bateman |
6702 | 2 ## |
3 ## This file is part of Octave. | |
4 ## | |
5 ## Octave is free software; you can redistribute it and/or modify it | |
6 ## under the terms of the GNU General Public License as published by | |
7016 | 7 ## the Free Software Foundation; either version 3 of the License, or (at |
8 ## your option) any later version. | |
6702 | 9 ## |
10 ## Octave is distributed in the hope that it will be useful, but | |
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of | |
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
13 ## General Public License for more details. | |
14 ## | |
15 ## You should have received a copy of the GNU General Public License | |
7016 | 16 ## along with Octave; see the file COPYING. If not, see |
17 ## <http://www.gnu.org/licenses/>. | |
6702 | 18 |
19 ## -*- texinfo -*- | |
10846
a4f482e66b65
Grammarcheck more of the documentation.
Rik <octave@nomad.inbox5.com>
parents:
10821
diff
changeset
|
20 ## @deftypefn {Function File} {@var{vi} =} interpn (@var{x1}, @var{x2}, @dots{}, @var{v}, @var{y1}, @var{y2}, @dots{}) |
6702 | 21 ## @deftypefnx {Function File} {@var{vi} =} interpn (@var{v}, @var{y1}, @var{y2}, @dots{}) |
22 ## @deftypefnx {Function File} {@var{vi} =} interpn (@var{v}, @var{m}) | |
23 ## @deftypefnx {Function File} {@var{vi} =} interpn (@var{v}) | |
24 ## @deftypefnx {Function File} {@var{vi} =} interpn (@dots{}, @var{method}) | |
25 ## @deftypefnx {Function File} {@var{vi} =} interpn (@dots{}, @var{method}, @var{extrapval}) | |
26 ## | |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
27 ## Perform @var{n}-dimensional interpolation, where @var{n} is at least two. |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
28 ## Each element of the @var{n}-dimensional array @var{v} represents a value |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
29 ## at a location given by the parameters @var{x1}, @var{x2}, @dots{}, @var{xn}. |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
30 ## The parameters @var{x1}, @var{x2}, @dots{}, @var{xn} are either |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
31 ## @var{n}-dimensional arrays of the same size as the array @var{v} in |
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14247
diff
changeset
|
32 ## the "ndgrid" format or vectors. The parameters @var{y1}, etc. respect a |
9209
923c7cb7f13f
Simplify TeXinfo files by eliminating redundant @iftex followed by @tex construction.
Rik <rdrider0-list@yahoo.com>
parents:
9070
diff
changeset
|
33 ## similar format to @var{x1}, etc., and they represent the points at which |
6702 | 34 ## the array @var{vi} is interpolated. |
35 ## | |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
36 ## If @var{x1}, @dots{}, @var{xn} are omitted, they are assumed to be |
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
37 ## @code{x1 = 1 : size (@var{v}, 1)}, etc. If @var{m} is specified, then |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
38 ## the interpolation adds a point half way between each of the interpolation |
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
39 ## points. This process is performed @var{m} times. If only @var{v} is |
6702 | 40 ## specified, then @var{m} is assumed to be @code{1}. |
41 ## | |
42 ## Method is one of: | |
43 ## | |
44 ## @table @asis | |
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14247
diff
changeset
|
45 ## @item "nearest" |
9070
e9dc2ed2ec0f
Cleanup documentation for poly.texi, interp.texi, geometry.texi
Rik <rdrider0-list@yahoo.com>
parents:
9051
diff
changeset
|
46 ## Return the nearest neighbor. |
10821
693e22af08ae
Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents:
10819
diff
changeset
|
47 ## |
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14247
diff
changeset
|
48 ## @item "linear" |
9070
e9dc2ed2ec0f
Cleanup documentation for poly.texi, interp.texi, geometry.texi
Rik <rdrider0-list@yahoo.com>
parents:
9051
diff
changeset
|
49 ## Linear interpolation from nearest neighbors. |
10821
693e22af08ae
Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents:
10819
diff
changeset
|
50 ## |
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14247
diff
changeset
|
51 ## @item "cubic" |
9070
e9dc2ed2ec0f
Cleanup documentation for poly.texi, interp.texi, geometry.texi
Rik <rdrider0-list@yahoo.com>
parents:
9051
diff
changeset
|
52 ## Cubic interpolation from four nearest neighbors (not implemented yet). |
10821
693e22af08ae
Grammarcheck documentation of m-files
Rik <octave@nomad.inbox5.com>
parents:
10819
diff
changeset
|
53 ## |
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14247
diff
changeset
|
54 ## @item "spline" |
12175
2090995ca588
Correct en-dash,em-dash instances in docstrings.
Rik <octave@nomad.inbox5.com>
parents:
11587
diff
changeset
|
55 ## Cubic spline interpolation---smooth first and second derivatives |
6702 | 56 ## throughout the curve. |
57 ## @end table | |
58 ## | |
14359
7277fe922e99
doc: Use Octave preference for double quote in docstrings in scripts/
Rik <octave@nomad.inbox5.com>
parents:
14247
diff
changeset
|
59 ## The default method is "linear". |
6702 | 60 ## |
8116 | 61 ## If @var{extrapval} is the scalar value, use it to replace the values |
9051
1bf0ce0930be
Grammar check TexInfo in all .m files
Rik <rdrider0-list@yahoo.com>
parents:
8920
diff
changeset
|
62 ## beyond the endpoints with that number. If @var{extrapval} is missing, |
8116 | 63 ## assume NA. |
6702 | 64 ## @seealso{interp1, interp2, spline, ndgrid} |
65 ## @end deftypefn | |
66 | |
67 function vi = interpn (varargin) | |
68 | |
69 method = "linear"; | |
6742 | 70 extrapval = NA; |
6702 | 71 nargs = nargin; |
72 | |
13151 | 73 if (nargin < 1 || ! isnumeric (varargin{1})) |
6702 | 74 print_usage (); |
75 endif | |
76 | |
7208 | 77 if (ischar (varargin{end})) |
78 method = varargin{end}; | |
6702 | 79 nargs = nargs - 1; |
13151 | 80 elseif (nargs > 1 && ischar (varargin{end - 1})) |
7208 | 81 if (! isnumeric (varargin{end}) || ! isscalar (varargin{end})) |
10635
d1978e7364ad
Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
82 error ("interpn: extrapal is expected to be a numeric scalar"); |
6702 | 83 endif |
7208 | 84 method = varargin{end - 1}; |
8116 | 85 extrapval = varargin{end}; |
6702 | 86 nargs = nargs - 2; |
87 endif | |
88 | |
89 if (nargs < 3) | |
7208 | 90 v = varargin{1}; |
6702 | 91 m = 1; |
92 if (nargs == 2) | |
13151 | 93 if (ischar (varargin{2})) |
94 method = varargin{2}; | |
13161
6b6d0e51bd2f
scripts/general/interpn.m: fix(m)==m is faster than round(m)==m
Ben Abbott <bpabbott@mac.com>
parents:
13151
diff
changeset
|
95 elseif (isnumeric (m) && isscalar (m) && fix (m) == m) |
13151 | 96 m = varargin{2}; |
97 else | |
98 print_usage (); | |
6702 | 99 endif |
100 endif | |
101 sz = size (v); | |
102 nd = ndims (v); | |
103 x = cell (1, nd); | |
104 y = cell (1, nd); | |
105 for i = 1 : nd; | |
106 x{i} = 1 : sz(i); | |
107 y{i} = 1 : (1 / (2 ^ m)) : sz(i); | |
108 endfor | |
13151 | 109 y{1} = y{1}.'; |
110 [y{:}] = ndgrid (y{:}); | |
7208 | 111 elseif (! isvector (varargin{1}) && nargs == (ndims (varargin{1}) + 1)) |
112 v = varargin{1}; | |
6702 | 113 sz = size (v); |
114 nd = ndims (v); | |
115 x = cell (1, nd); | |
116 y = varargin (2 : nargs); | |
117 for i = 1 : nd; | |
118 x{i} = 1 : sz(i); | |
119 endfor | |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
120 elseif (rem (nargs, 2) == 1 && nargs == |
10549 | 121 (2 * ndims (varargin{ceil (nargs / 2)})) + 1) |
6702 | 122 nv = ceil (nargs / 2); |
7208 | 123 v = varargin{nv}; |
6702 | 124 sz = size (v); |
125 nd = ndims (v); | |
126 x = varargin (1 : (nv - 1)); | |
127 y = varargin ((nv + 1) : nargs); | |
128 else | |
10635
d1978e7364ad
Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
129 error ("interpn: wrong number or incorrectly formatted input arguments"); |
6702 | 130 endif |
131 | |
12931
cefd568ea073
Replace function handles with function names in cellfun calls for 15% speedup.
Rik <octave@nomad.inbox5.com>
parents:
12175
diff
changeset
|
132 if (any (! cellfun ("isvector", x))) |
6702 | 133 for i = 2 : nd |
134 if (! size_equal (x{1}, x{i}) || ! size_equal (x{i}, v)) | |
10635
d1978e7364ad
Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
135 error ("interpn: dimensional mismatch"); |
6702 | 136 endif |
137 idx (1 : nd) = {1}; | |
138 idx (i) = ":"; | |
6721 | 139 x{i} = x{i}(idx{:})(:); |
6702 | 140 endfor |
141 idx (1 : nd) = {1}; | |
142 idx (1) = ":"; | |
6721 | 143 x{1} = x{1}(idx{:})(:); |
6702 | 144 endif |
145 | |
7421 | 146 method = tolower (method); |
6702 | 147 |
12931
cefd568ea073
Replace function handles with function names in cellfun calls for 15% speedup.
Rik <octave@nomad.inbox5.com>
parents:
12175
diff
changeset
|
148 all_vectors = all (cellfun ("isvector", y)); |
cefd568ea073
Replace function handles with function names in cellfun calls for 15% speedup.
Rik <octave@nomad.inbox5.com>
parents:
12175
diff
changeset
|
149 different_lengths = numel (unique (cellfun ("numel", y))) > 1; |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
150 if (all_vectors && different_lengths) |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
151 [foobar(1:numel(y)).y] = ndgrid (y{:}); |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
152 y = {foobar.y}; |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
153 endif |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
154 |
6702 | 155 if (strcmp (method, "linear")) |
156 vi = __lin_interpn__ (x{:}, v, y{:}); | |
6742 | 157 vi (isna (vi)) = extrapval; |
6702 | 158 elseif (strcmp (method, "nearest")) |
159 yshape = size (y{1}); | |
160 yidx = cell (1, nd); | |
161 for i = 1 : nd | |
162 y{i} = y{i}(:); | |
7671
4fbaba9abec1
implement compiled binary lookup
Jaroslav Hajek <highegg@gmail.com>
parents:
7561
diff
changeset
|
163 yidx{i} = lookup (x{i}, y{i}, "lr"); |
6702 | 164 endfor |
165 idx = cell (1,nd); | |
166 for i = 1 : nd | |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
167 idx{i} = yidx{i} + (y{i} - x{i}(yidx{i})(:) >= x{i}(yidx{i} + 1)(:) - y{i}); |
6702 | 168 endfor |
169 vi = v (sub2ind (sz, idx{:})); | |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
170 idx = zeros (prod (yshape), 1); |
6702 | 171 for i = 1 : nd |
172 idx |= y{i} < min (x{i}(:)) | y{i} > max (x{i}(:)); | |
173 endfor | |
174 vi(idx) = extrapval; | |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
175 vi = reshape (vi, yshape); |
6721 | 176 elseif (strcmp (method, "spline")) |
12931
cefd568ea073
Replace function handles with function names in cellfun calls for 15% speedup.
Rik <octave@nomad.inbox5.com>
parents:
12175
diff
changeset
|
177 if (any (! cellfun ("isvector", y))) |
7423 | 178 for i = 2 : nd |
10549 | 179 if (! size_equal (y{1}, y{i})) |
10635
d1978e7364ad
Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
180 error ("interpn: dimensional mismatch"); |
10549 | 181 endif |
182 idx (1 : nd) = {1}; | |
183 idx (i) = ":"; | |
184 y{i} = y{i}(idx{:}); | |
7423 | 185 endfor |
186 idx (1 : nd) = {1}; | |
187 idx (1) = ":"; | |
188 y{1} = y{1}(idx{:}); | |
189 endif | |
7421 | 190 |
6702 | 191 vi = __splinen__ (x, v, y, extrapval, "interpn"); |
7421 | 192 |
7423 | 193 if (size_equal (y{:})) |
194 ly = length (y{1}); | |
195 idx = cell (1, ly); | |
196 q = cell (1, nd); | |
197 for i = 1 : ly | |
10549 | 198 q(:) = i; |
199 idx {i} = q; | |
7423 | 200 endfor |
14868
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
201 vi = vi (cellfun (@(x) sub2ind (size (vi), x{:}), idx)); |
5d3a684236b0
maint: Use Octave coding conventions for cuddling parentheses in scripts directory
Rik <octave@nomad.inbox5.com>
parents:
14363
diff
changeset
|
202 vi = reshape (vi, size (y{1})); |
7423 | 203 endif |
11587
c792872f8942
all script files: untabify and strip trailing whitespace
John W. Eaton <jwe@octave.org>
parents:
11523
diff
changeset
|
204 elseif (strcmp (method, "cubic")) |
10635
d1978e7364ad
Print name of function in error() string messages.
Rik <octave@nomad.inbox5.com>
parents:
10549
diff
changeset
|
205 error ("interpn: cubic interpolation not yet implemented"); |
6702 | 206 else |
11472
1740012184f9
Use uppercase for variable names in error() strings to match Info documentation. Only m-files done.
Rik <octave@nomad.inbox5.com>
parents:
10846
diff
changeset
|
207 error ("interpn: unrecognized interpolation METHOD"); |
6702 | 208 endif |
209 | |
210 endfunction | |
211 | |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
212 |
6702 | 213 %!demo |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
214 %! clf; |
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
|
215 %! 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
|
216 %! 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
|
217 %! 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
|
218 %! 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
|
219 %! 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
|
220 %! mesh (xi, yi, interpn (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
|
221 %! [x,y] = meshgrid (x,y); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
222 %! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; |
6702 | 223 |
224 %!demo | |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
225 %! clf; |
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
|
226 %! 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
|
227 %! 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
|
228 %! 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
|
229 %! 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
|
230 %! 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
|
231 %! mesh (xi, yi, interpn (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
|
232 %! [x,y] = meshgrid (x,y); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
233 %! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; |
6702 | 234 |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
235 %!#demo # FIXME: Uncomment when support for "cubic" has been added |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
236 %! clf; |
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
|
237 %! 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
|
238 %! 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
|
239 %! 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
|
240 %! 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
|
241 %! 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
|
242 %! mesh (xi, yi, interpn (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
|
243 %! [x,y] = meshgrid (x,y); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
244 %! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; |
6702 | 245 |
246 %!demo | |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
247 %! clf; |
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
|
248 %! 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
|
249 %! 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
|
250 %! 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
|
251 %! 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
|
252 %! 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
|
253 %! mesh (xi, yi, interpn (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
|
254 %! [x,y] = meshgrid (x,y); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
255 %! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; |
6721 | 256 |
257 %!demo | |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
258 %! clf; |
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
|
259 %! colormap ("default"); |
6721 | 260 %! x = y = z = -1:1; |
261 %! f = @(x,y,z) x.^2 - y - z.^2; | |
262 %! [xx, yy, zz] = meshgrid (x, y, z); | |
263 %! v = f (xx,yy,zz); | |
264 %! xi = yi = zi = -1:0.1:1; | |
265 %! [xxi, yyi, zzi] = ndgrid (xi, yi, zi); | |
14363
f3d52523cde1
Use Octave coding conventions in all m-file %!test blocks
Rik <octave@nomad.inbox5.com>
parents:
14359
diff
changeset
|
266 %! vi = interpn (x, y, z, v, xxi, yyi, zzi, "spline"); |
6721 | 267 %! mesh (yi, zi, squeeze (vi(1,:,:))); |
268 | |
7421 | 269 %!test |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
270 %! [x,y,z] = ndgrid (0:2); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
271 %! f = x + y + z; |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
272 %! assert (interpn (x,y,z,f,[.5 1.5],[.5 1.5],[.5 1.5]), [1.5, 4.5]); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
273 %! assert (interpn (x,y,z,f,[.51 1.51],[.51 1.51],[.51 1.51],"nearest"), [3, 6]); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
274 %! assert (interpn (x,y,z,f,[.5 1.5],[.5 1.5],[.5 1.5],"spline"), [1.5, 4.5]); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
275 %! assert (interpn (x,y,z,f,x,y,z), f); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
276 %! assert (interpn (x,y,z,f,x,y,z,"nearest"), f); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
277 %! assert (interpn (x,y,z,f,x,y,z,"spline"), f); |
7561
a938cd7869b2
__lin_interpn__.cc: handle decreasing coordinate values
Alexander Barth
parents:
7424
diff
changeset
|
278 |
a938cd7869b2
__lin_interpn__.cc: handle decreasing coordinate values
Alexander Barth
parents:
7424
diff
changeset
|
279 %!test |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
280 %! [x, y, z] = ndgrid (0:2, 1:4, 2:6); |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
281 %! f = x + y + z; |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
282 %! xi = [0.5 1.0 1.5]; yi = [1.5 2.0 2.5 3.5]; zi = [2.5 3.5 4.0 5.0 5.5]; |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
283 %! fi = interpn (x, y, z, f, xi, yi, zi); |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
284 %! [xi, yi, zi] = ndgrid (xi, yi, zi); |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
285 %! assert (fi, xi + yi + zi); |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
286 |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
287 %!test |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
288 %! xi = 0:2; yi = 1:4; zi = 2:6; |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
289 %! [x, y, z] = ndgrid (xi, yi, zi); |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
290 %! f = x + y + z; |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
291 %! fi = interpn (x, y, z, f, xi, yi, zi, "nearest"); |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
292 %! assert (fi, x + y + z); |
10819
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
293 |
f3c984d45dcb
interpn.m: Convert interpolation vectors of non-equal length to nd-arrays.
Ben Abbott <bpabbott@mac.com>
parents:
10793
diff
changeset
|
294 %!test |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
295 %! [x,y,z] = ndgrid (0:2); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
296 %! f = x.^2 + y.^2 + z.^2; |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
297 %! assert (interpn (x,y,-z,f,1.5,1.5,-1.5), 7.5); |
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:
9245
diff
changeset
|
298 |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
299 %!test # for Matlab-compatible rounding for "nearest" |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
300 %! x = meshgrid (1:4); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
301 %! assert (interpn (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:
9245
diff
changeset
|
302 |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
303 %!test |
13151 | 304 %! z = zeros (3, 3, 3); |
305 %! zout = zeros (5, 5, 5); | |
306 %! z(:,:,1) = [1 3 5; 3 5 7; 5 7 9]; | |
307 %! z(:,:,2) = z(:,:,1) + 2; | |
308 %! z(:,:,3) = z(:,:,2) + 2; | |
309 %! for n = 1:5 | |
310 %! zout(:,:,n) = [1 2 3 4 5; | |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
311 %! 2 3 4 5 6; |
13151 | 312 %! 3 4 5 6 7; |
313 %! 4 5 6 7 8; | |
314 %! 5 6 7 8 9] + (n-1); | |
14237
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
315 %! endfor |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
316 %! tol = 10*eps; |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
317 %! assert (interpn (z), zout, tol); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
318 %! assert (interpn (z, "linear"), zout, tol); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
319 %! assert (interpn (z, "spline"), zout, tol); |
11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Rik <octave@nomad.inbox5.com>
parents:
14138
diff
changeset
|
320 |