Mercurial > hg > octave-lyh
diff scripts/geometry/griddata.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/geometry/griddata.m +++ b/scripts/geometry/griddata.m @@ -140,38 +140,43 @@ endif endfunction -%!testif HAVE_QHULL -%! [xx,yy]=meshgrid(linspace(-1,1,32)); -%! x = xx(:); -%! x = x + 10 * (2 * round(rand(size(x))) - 1) * eps; -%! y = yy(:); -%! y = y + 10 * (2 * round(rand(size(y))) - 1) * eps; -%! z = sin(2*(x.^2+y.^2)); -%! zz = griddata(x,y,z,xx,yy,'linear'); -%! zz2 = sin(2*(xx.^2+yy.^2)); -%! zz2(isnan(zz)) = NaN; -%! assert (zz, zz2, 100 * eps) + +%!demo +%! clf; +%! x = 2*rand (100,1) - 1; +%! y = 2*rand (size (x)) - 1; +%! z = sin (2*(x.^2 + y.^2)); +%! [xx,yy] = meshgrid (linspace (-1,1,32)); +%! griddata (x,y,z,xx,yy); +%! title ("nonuniform grid sampled at 100 points"); + +%!demo +%! clf; +%! x = 2*rand (1000,1) - 1; +%! y = 2*rand (size (x)) - 1; +%! z = sin (2*(x.^2 + y.^2)); +%! [xx,yy] = meshgrid (linspace (-1,1,32)); +%! griddata (x,y,z,xx,yy); +%! title ("nonuniform grid sampled at 1000 points"); %!demo -%! x=2*rand(100,1)-1; -%! y=2*rand(size(x))-1; -%! z=sin(2*(x.^2+y.^2)); -%! [xx,yy]=meshgrid(linspace(-1,1,32)); -%! griddata(x,y,z,xx,yy); -%! title('nonuniform grid sampled at 100 points'); +%! clf; +%! x = 2*rand (1000,1) - 1; +%! y = 2*rand (size (x)) - 1; +%! z = sin (2*(x.^2 + y.^2)); +%! [xx,yy] = meshgrid (linspace (-1, 1, 32)); +%! griddata (x,y,z,xx,yy,"nearest"); +%! title ("nonuniform grid sampled at 1000 points with nearest neighbor"); -%!demo -%! x=2*rand(1000,1)-1; -%! y=2*rand(size(x))-1; -%! z=sin(2*(x.^2+y.^2)); -%! [xx,yy]=meshgrid(linspace(-1,1,32)); -%! griddata(x,y,z,xx,yy); -%! title('nonuniform grid sampled at 1000 points'); +%!testif HAVE_QHULL +%! [xx,yy] = meshgrid (linspace (-1,1,32)); +%! x = xx(:); +%! x = x + 10*(2*round (rand (size(x))) - 1) * eps; +%! y = yy(:); +%! y = y + 10*(2*round (rand (size(y))) - 1) * eps; +%! z = sin (2*(x.^2 + y.^2)); +%! zz = griddata (x,y,z,xx,yy,"linear"); +%! zz2 = sin (2*(xx.^2 + yy.^2)); +%! zz2(isnan (zz)) = NaN; +%! assert (zz, zz2, 100*eps); -%!demo -%! x=2*rand(1000,1)-1; -%! y=2*rand(size(x))-1; -%! z=sin(2*(x.^2+y.^2)); -%! [xx,yy]=meshgrid(linspace(-1,1,32)); -%! griddata(x,y,z,xx,yy,'nearest'); -%! title('nonuniform grid sampled at 1000 points with nearest neighbor');