changeset 24266:c372b091f622

maint: merge stable to default.
author Rik <rik@octave.org>
date Thu, 16 Nov 2017 18:12:23 -0800
parents 3b302b2890d7 (current diff) 4746bd294c54 (diff)
children ba51a6fd6a18
files scripts/general/accumarray.m scripts/geometry/delaunay.m
diffstat 2 files changed, 14 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/general/accumarray.m	Thu Nov 16 16:06:31 2017 -0500
+++ b/scripts/general/accumarray.m	Thu Nov 16 18:12:23 2017 -0800
@@ -47,8 +47,8 @@
 ## The elements of the returned array that have no subscripts associated
 ## with them are set to zero.  Defining @var{fillval} to some other value
 ## allows these values to be defined.  This behavior changes, however,
-## for certain values of @var{func}.  If @var{func} is @code{min}
-## (respectively, @code{max}) then the result will be filled with the
+## for certain values of @var{func}.  If @var{func} is @code{@@min}
+## (respectively, @code{@@max}) then the result will be filled with the
 ## minimum (respectively, maximum) integer if @var{vals} is of integral
 ## type, logical false (respectively, logical true) if @var{vals} is of
 ## logical type, zero if @var{fillval} is zero and all values are
--- a/scripts/geometry/delaunay.m	Thu Nov 16 16:06:31 2017 -0500
+++ b/scripts/geometry/delaunay.m	Thu Nov 16 18:12:23 2017 -0800
@@ -24,20 +24,20 @@
 ## Compute the Delaunay triangulation for a 2-D or 3-D set of points.
 ##
 ## For 2-D sets, the return value @var{tri} is a set of triangles which
-## satisfies the Delaunay circum-circle criterion, i.e., only a single data
-## point from [@var{x}, @var{y}] is within the circum-circle of the defining
-## triangle.  The set of triangles @var{tri} is a matrix of size [n, 3].  Each
-## row defines a triangle and the three columns are the three vertices of the
-## triangle.  The value of @code{@var{tri}(i,j)} is an index into @var{x} and
-## @var{y} for the location of the j-th vertex of the i-th triangle.
+## satisfies the Delaunay circum-circle criterion, i.e., no data point from
+## [@var{x}, @var{y}] is within the circum-circle of the defining triangle.
+## The set of triangles @var{tri} is a matrix of size [n, 3].  Each row defines
+## a triangle and the three columns are the three vertices of the triangle.
+## The value of @code{@var{tri}(i,j)} is an index into @var{x} and @var{y} for
+## the location of the j-th vertex of the i-th triangle.
 ##
 ## For 3-D sets, the return value @var{tetr} is a set of tetrahedrons which
-## satisfies the Delaunay circum-circle criterion, i.e., only a single data
-## point from [@var{x}, @var{y}, @var{z}] is within the circum-circle of the
-## defining tetrahedron.  The set of tetrahedrons is a matrix of size [n, 4].
-## Each row defines a tetrahedron and the four columns are the four vertices of
-## the tetrahedron.  The value of @code{@var{tetr}(i,j)} is an index into
-## @var{x}, @var{y}, @var{z} for the location of the j-th vertex of the i-th
+## satisfies the Delaunay circum-circle criterion, i.e., no data point from
+## [@var{x}, @var{y}, @var{z}] is within the circum-circle of the defining
+## tetrahedron.  The set of tetrahedrons is a matrix of size [n, 4].  Each row
+## defines a tetrahedron and the four columns are the four vertices of the
+## tetrahedron.  The value of @code{@var{tetr}(i,j)} is an index into @var{x},
+## @var{y}, @var{z} for the location of the j-th vertex of the i-th
 ## tetrahedron.
 ##
 ## The input @var{x} may also be a matrix with two or three columns where the