Mercurial > hg > octave-nkf
diff scripts/general/interp2.m @ 14237:11949c9795a0
Revamp %!demos in m-files to use Octave coding conventions on spacing, etc.
Add clf() to all demos using plot features to get reproducibility.
Use 64 as input to all colormaps (jet (64)) to get reproducibility.
* bicubic.m, cell2mat.m, celldisp.m, cplxpair.m, interp1.m, interp2.m,
interpft.m, interpn.m, profile.m, profshow.m, convhull.m, delaunay.m,
griddata.m, inpolygon.m, voronoi.m, autumn.m, bone.m, contrast.m, cool.m,
copper.m, flag.m, gmap40.m, gray.m, hot.m, hsv.m, image.m, imshow.m, jet.m,
ocean.m, pink.m, prism.m, rainbow.m, spring.m, summer.m, white.m, winter.m,
condest.m, onenormest.m, axis.m, clabel.m, colorbar.m, comet.m, comet3.m,
compass.m, contour.m, contour3.m, contourf.m, cylinder.m, daspect.m,
ellipsoid.m, errorbar.m, ezcontour.m, ezcontourf.m, ezmesh.m, ezmeshc.m,
ezplot.m, ezplot3.m, ezpolar.m, ezsurf.m, ezsurfc.m, feather.m, fill.m,
fplot.m, grid.m, hold.m, isosurface.m, legend.m, loglog.m, loglogerr.m,
pareto.m, patch.m, pbaspect.m, pcolor.m, pie.m, pie3.m, plot3.m, plotmatrix.m,
plotyy.m, polar.m, quiver.m, quiver3.m, rectangle.m, refreshdata.m, ribbon.m,
rose.m, scatter.m, scatter3.m, semilogx.m, semilogxerr.m, semilogy.m,
semilogyerr.m, shading.m, slice.m, sombrero.m, stairs.m, stem.m, stem3.m,
subplot.m, surf.m, surfc.m, surfl.m, surfnorm.m, text.m, title.m, trimesh.m,
triplot.m, trisurf.m, uigetdir.m, uigetfile.m, uimenu.m, uiputfile.m,
waitbar.m, xlim.m, ylim.m, zlim.m, mkpp.m, pchip.m, polyaffine.m, spline.m,
bicgstab.m, cgs.m, gplot.m, pcg.m, pcr.m, treeplot.m, strtok.m, demo.m,
example.m, rundemos.m, speed.m, test.m, calendar.m, datestr.m, datetick.m,
weekday.m: Revamp %!demos to use Octave coding conventions on spacing, etc.
| author | Rik <octave@nomad.inbox5.com> |
|---|---|
| date | Fri, 20 Jan 2012 12:59:53 -0800 |
| parents | 72c96de7a403 |
| children | c4fa5e0b6193 |
line wrap: on
line diff
--- a/scripts/general/interp2.m +++ b/scripts/general/interp2.m @@ -446,99 +446,99 @@ %!demo -%! A=[13,-1,12;5,4,3;1,6,2]; -%! x=[0,1,4]; y=[10,11,12]; -%! xi=linspace(min(x),max(x),17); -%! yi=linspace(min(y),max(y),26)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'linear')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! A = [13,-1,12;5,4,3;1,6,2]; +%! x = [0,1,4]; y = [10,11,12]; +%! xi = linspace (min(x), max(x), 17); +%! yi = linspace (min(y), max(y), 26)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "linear")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! [x,y,A] = peaks(10); +%! [x,y,A] = peaks (10); %! x = x(1,:)'; y = y(:,1); -%! xi=linspace(min(x),max(x),41); -%! yi=linspace(min(y),max(y),41)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'linear')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! xi = linspace (min(x), max(x), 41); +%! yi = linspace (min(y), max(y), 41)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "linear")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! A=[13,-1,12;5,4,3;1,6,2]; -%! x=[0,1,4]; y=[10,11,12]; -%! xi=linspace(min(x),max(x),17); -%! yi=linspace(min(y),max(y),26)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'nearest')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! A = [13,-1,12;5,4,3;1,6,2]; +%! x = [0,1,4]; y = [10,11,12]; +%! xi = linspace (min(x), max(x), 17); +%! yi = linspace (min(y), max(y), 26)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "nearest")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! [x,y,A] = peaks(10); +%! [x,y,A] = peaks (10); %! x = x(1,:)'; y = y(:,1); -%! xi=linspace(min(x),max(x),41); -%! yi=linspace(min(y),max(y),41)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'nearest')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! xi = linspace (min(x), max(x), 41); +%! yi = linspace (min(y), max(y), 41)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "nearest")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! A=[13,-1,12;5,4,3;1,6,2]; -%! x=[0,1,2]; y=[10,11,12]; -%! xi=linspace(min(x),max(x),17); -%! yi=linspace(min(y),max(y),26)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'pchip')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! A = [13,-1,12;5,4,3;1,6,2]; +%! x = [0,1,2]; y = [10,11,12]; +%! xi = linspace (min(x), max(x), 17); +%! yi = linspace (min(y), max(y), 26)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "pchip")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! [x,y,A] = peaks(10); +%! [x,y,A] = peaks (10); %! x = x(1,:)'; y = y(:,1); -%! xi=linspace(min(x),max(x),41); -%! yi=linspace(min(y),max(y),41)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'pchip')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! xi = linspace (min(x), max(x), 41); +%! yi = linspace (min(y), max(y), 41)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "pchip")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! A=[13,-1,12;5,4,3;1,6,2]; -%! x=[0,1,2]; y=[10,11,12]; -%! xi=linspace(min(x),max(x),17); -%! yi=linspace(min(y),max(y),26)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'cubic')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! A = [13,-1,12;5,4,3;1,6,2]; +%! x = [0,1,2]; y = [10,11,12]; +%! xi = linspace (min(x), max(x), 17); +%! yi = linspace (min(y), max(y), 26)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "cubic")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! [x,y,A] = peaks(10); +%! [x,y,A] = peaks (10); %! x = x(1,:)'; y = y(:,1); -%! xi=linspace(min(x),max(x),41); -%! yi=linspace(min(y),max(y),41)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'cubic')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! xi = linspace (min(x), max(x), 41); +%! yi = linspace (min(y), max(y), 41)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "cubic")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! A=[13,-1,12;5,4,3;1,6,2]; -%! x=[0,1,2]; y=[10,11,12]; -%! xi=linspace(min(x),max(x),17); -%! yi=linspace(min(y),max(y),26)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'spline')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! A = [13,-1,12;5,4,3;1,6,2]; +%! x = [0,1,2]; y = [10,11,12]; +%! xi = linspace (min(x), max(x), 17); +%! yi = linspace (min(y), max(y), 26)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "spline")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!demo -%! [x,y,A] = peaks(10); +%! [x,y,A] = peaks (10); %! x = x(1,:)'; y = y(:,1); -%! xi=linspace(min(x),max(x),41); -%! yi=linspace(min(y),max(y),41)'; -%! mesh(xi,yi,interp2(x,y,A,xi,yi,'spline')); -%! [x,y] = meshgrid(x,y); -%! hold on; plot3(x(:),y(:),A(:),"b*"); hold off; +%! xi = linspace (min(x), max(x), 41); +%! yi = linspace (min(y), max(y), 41)'; +%! mesh (xi,yi,interp2 (x,y,A,xi,yi, "spline")); +%! [x,y] = meshgrid (x,y); +%! hold on; plot3 (x(:),y(:),A(:),"b*"); hold off; %!test % simple test %! x = [1,2,3]; %! y = [4,5,6,7]; -%! [X, Y] = meshgrid(x,y); +%! [X, Y] = meshgrid (x,y); %! Orig = X.^2 + Y.^3; %! xi = [1.2,2, 1.5]; %! yi = [6.2, 4.0, 5.0]'; @@ -547,7 +547,7 @@ %! [243, 245.4, 243.9; %! 65.6, 68, 66.5; %! 126.6, 129, 127.5]; -%! Result = interp2(x,y,Orig, xi, yi); +%! Result = interp2 (x,y,Orig, xi, yi); %! %! assert(Result, Expected, 1000*eps);