Mercurial > hg > octave-max
diff scripts/geometry/voronoi.m @ 13879:440d7914cf01
fix regression in __voronoi__ and convhulln option processing
* __voronoi__.cc (F__voronoi__): Allow user-supplied options to
completely replace defaults.
* convhulln.cc (F__convhulln__): Likewise.
* __voronoi__.cc (F__voronoi__): New argument, caller.
* voronoi.m, voronoin.m: Pass name of function to __voronoi__.
* voronoin.m: Don't check options here.
* voronoi.m: Don't check nargout.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 17 Nov 2011 13:47:12 -0500 |
| parents | 7ff0bdc3dc4c |
| children | 5f0bb45e615c |
line wrap: on
line diff
--- a/scripts/geometry/voronoi.m +++ b/scripts/geometry/voronoi.m @@ -70,8 +70,6 @@ if (nargin < 1) print_usage (); - elseif (nargout > 2) - error ("voronoi: No more than two output arguments supported"); endif narg = 1; @@ -131,7 +129,9 @@ ybox = [xmin - scale * xdelta; xmax + scale * xdelta; ... xmax + scale * xdelta; xmin - scale * xdelta]; - [p, c, infi] = __voronoi__ ([[x(:) ; xbox(:)], [y(:); ybox(:)]], opts{:}); + [p, c, infi] = __voronoi__ ("voronoi", + [[x(:) ; xbox(:)], [y(:); ybox(:)]], + opts{:}); idx = find (! infi); ll = length (idx);