diff --git a/pom.xml b/pom.xml index b2fd77bd3..cb078f63a 100644 --- a/pom.xml +++ b/pom.xml @@ -293,8 +293,8 @@ Jean-Yves Tinevez and Michael Zinsmaier. true true - -Aparse.ops="${scijava.parse.ops}" - -Aop.version="${project.version}" + -Aparse.ops=${scijava.parse.ops} + -Aop.version=${project.version} diff --git a/src/main/java/net/imglib2/algorithm/binary/Thresholder.java b/src/main/java/net/imglib2/algorithm/binary/Thresholder.java index 5a7f2e68f..6eb03abee 100644 --- a/src/main/java/net/imglib2/algorithm/binary/Thresholder.java +++ b/src/main/java/net/imglib2/algorithm/binary/Thresholder.java @@ -59,7 +59,7 @@ public class Thresholder * Returns a new boolean {@link Img} generated by thresholding the values of * the source image. * - * @implNote op name='threshold',type=Function + * @implNote op name='binary.threshold',type=Function * @param source * the image to threshold. * @param threshold diff --git a/src/main/java/net/imglib2/algorithm/componenttree/BuildComponentTree.java b/src/main/java/net/imglib2/algorithm/componenttree/BuildComponentTree.java index d0ce65ca8..2b7718d7b 100644 --- a/src/main/java/net/imglib2/algorithm/componenttree/BuildComponentTree.java +++ b/src/main/java/net/imglib2/algorithm/componenttree/BuildComponentTree.java @@ -87,7 +87,7 @@ public final class BuildComponentTree< T extends Type< T >, C extends PartialCom * tree structure. An implementations of {@link PartialComponent.Handler} is * provided for example by {@link PixelListComponentTree}. * - * @implNote op name='buildComponentTree',type=Function + * @implNote op name='componenttree.buildComponentTree',type=Function * @param input * input image. * @param componentGenerator @@ -112,7 +112,7 @@ public static < T extends Type< T >, C extends PartialComponent< T, C > > void b * tree structure. An implementations of {@link PartialComponent.Handler} is * provided for example by {@link PixelListComponentTree}. * - * @implNote op name='buildComponentTree',type=Function + * @implNote op name='componenttree.buildComponentTree',type=Function * @param input * input image of a comparable value type. * @param componentGenerator diff --git a/src/main/java/net/imglib2/algorithm/componenttree/mser/MserTree.java b/src/main/java/net/imglib2/algorithm/componenttree/mser/MserTree.java index 4ea7aed18..6f440739f 100644 --- a/src/main/java/net/imglib2/algorithm/componenttree/mser/MserTree.java +++ b/src/main/java/net/imglib2/algorithm/componenttree/mser/MserTree.java @@ -106,7 +106,7 @@ public final class MserTree< T extends Type< T > > implements ComponentForest< M * using an {@link ArrayImgFactory} or {@link CellImgFactory} depending on * input image size. * - * @implNote op name='buildMserTree',type=Function + * @implNote op name='componenttree.buildMserTree',type=Function * @param input * the input image. * @param delta @@ -135,7 +135,7 @@ public static < T extends RealType< T > > MserTree< T > buildMserTree( final Ran * using an {@link ArrayImgFactory} or {@link CellImgFactory} depending on * input image size. * - * @implNote op name='buildMserTree',type=Function + * @implNote op name='componenttree.buildMserTree',type=Function * @param input * the input image. * @param delta @@ -162,7 +162,7 @@ public static < T extends RealType< T > > MserTree< T > buildMserTree( final Ran /** * Build a MSER tree from an input image. * - * @implNote op name='buildMserTree',type=Function + * @implNote op name='componenttree.buildMserTree',type=Function * @param input * the input image. * @param delta @@ -202,7 +202,7 @@ public static < T extends RealType< T > > MserTree< T > buildMserTree( final Ran * using an {@link ArrayImgFactory} or {@link CellImgFactory} depending on * input image size. * - * @implNote op name='buildMserTree',type=Function + * @implNote op name='componenttree.buildMserTree',type=Function * @param input * the input image. * @param computeDelta @@ -231,7 +231,7 @@ public static < T extends Type< T > > MserTree< T > buildMserTree( final RandomA /** * Build a MSER tree from an input image. * - * @implNote op name='buildMserTree',type=Function + * @implNote op name='componenttree.buildMserTree',type=Function * @param input * the input image. * @param computeDelta diff --git a/src/main/java/net/imglib2/algorithm/componenttree/pixellist/PixelListComponentTree.java b/src/main/java/net/imglib2/algorithm/componenttree/pixellist/PixelListComponentTree.java index 00fbfc81d..846c2fee0 100644 --- a/src/main/java/net/imglib2/algorithm/componenttree/pixellist/PixelListComponentTree.java +++ b/src/main/java/net/imglib2/algorithm/componenttree/pixellist/PixelListComponentTree.java @@ -74,7 +74,7 @@ public final class PixelListComponentTree< T extends Type< T > > implements Comp * using an {@link ArrayImgFactory} or {@link CellImgFactory} depending on * input image size. * - * @implNote op name='buildPixelListComponentTree',type=Function + * @implNote op name='componenttree.buildPixelListComponentTree',type=Function * @param input * the input image. * @param type @@ -93,7 +93,7 @@ public static < T extends RealType< T > > PixelListComponentTree< T > buildCompo /** * Build a component tree from an input image. * - * @implNote op name='buildPixelListComponentTree',type=Function + * @implNote op name='componenttree.buildPixelListComponentTree',type=Function * @param input * the input image. * @param type @@ -122,7 +122,7 @@ public static < T extends RealType< T > > PixelListComponentTree< T > buildCompo * using an {@link ArrayImgFactory} or {@link CellImgFactory} depending on * input image size. * - * @implNote op name='buildPixelListComponentTree',type=Function + * @implNote op name='componenttree.buildPixelListComponentTree',type=Function * @param input * the input image. * @param maxValue @@ -141,7 +141,7 @@ public static < T extends Type< T > > PixelListComponentTree< T > buildComponent /** * Build a component tree from an input image. * - * @implNote op name='buildPixelListComponentTree',type=Function + * @implNote op name='componenttree.buildPixelListComponentTree',type=Function * @param input * the input image. * @param maxValue diff --git a/src/main/java/net/imglib2/algorithm/convolution/fast_gauss/FastGauss.java b/src/main/java/net/imglib2/algorithm/convolution/fast_gauss/FastGauss.java index 3986e7eaf..fe86e890f 100644 --- a/src/main/java/net/imglib2/algorithm/convolution/fast_gauss/FastGauss.java +++ b/src/main/java/net/imglib2/algorithm/convolution/fast_gauss/FastGauss.java @@ -79,7 +79,7 @@ public class FastGauss } /** - * @implNote op name='convolveFastGauss',type=Function + * @implNote op name='convolve.fastGauss',type=Function */ public static Convolution< RealType< ? > > convolution( final double sigma ) { @@ -87,7 +87,7 @@ public class FastGauss } /** - * @implNote op name='convolveFastGauss',type=Function + * @implNote op name='convolve.fastGauss',type=Function */ public static Convolution< RealType< ? > > convolution1d( final double sigma, final int direction ) { @@ -95,7 +95,7 @@ public class FastGauss } /** - * @implNote op name='convolveFastGauss',type=Computer + * @implNote op name='convolve.fastGauss',type=Computer */ public static void convolve( final double[] sigmas, final RandomAccessible< ? extends RealType< ? > > input, final RandomAccessibleInterval< ? extends RealType< ? > > output ) { @@ -103,7 +103,7 @@ public static void convolve( final double[] sigmas, final RandomAccessible< ? ex } /** - * @implNote op name='convolveFastGauss',type=Computer + * @implNote op name='convolve.fastGauss',type=Computer */ public static void convolve( final double sigma, final RandomAccessible< ? extends RealType< ? > > input, final RandomAccessibleInterval< ? extends RealType< ? > > output ) { diff --git a/src/main/java/net/imglib2/algorithm/dog/DifferenceOfGaussian.java b/src/main/java/net/imglib2/algorithm/dog/DifferenceOfGaussian.java index 6aff30686..f7d43d365 100644 --- a/src/main/java/net/imglib2/algorithm/dog/DifferenceOfGaussian.java +++ b/src/main/java/net/imglib2/algorithm/dog/DifferenceOfGaussian.java @@ -74,7 +74,7 @@ public class DifferenceOfGaussian * only in that its parameter order is tailored to an Op. The output comes * last, and the primary input (the input image) comes first. * - * @implNote op name="DoG", type="org.scijava.function.Computers.Arity4" + * @implNote op name="filter.DoG", type="org.scijava.function.Computers.Arity4" * @param input * the input image extended to infinity (or at least covering the * same interval as the dog result image, plus borders for @@ -145,7 +145,7 @@ public static < I extends NumericType< I >, T extends NumericType< T > & NativeT * only in that its parameter order is tailored to an Op. The output comes * last, and the primary input (the input image) comes first. * - * @implNote op name="DoG", type="org.scijava.function.Computers.Arity5" + * @implNote op name="filter.DoG", type="org.scijava.function.Computers.Arity5" * @param input * the input image extended to infinity (or at least covering the * same interval as the dog result image, plus borders for diff --git a/src/main/java/net/imglib2/algorithm/edge/SubpixelEdgelDetection.java b/src/main/java/net/imglib2/algorithm/edge/SubpixelEdgelDetection.java index 7362b4c8a..b76b3f35b 100644 --- a/src/main/java/net/imglib2/algorithm/edge/SubpixelEdgelDetection.java +++ b/src/main/java/net/imglib2/algorithm/edge/SubpixelEdgelDetection.java @@ -74,7 +74,7 @@ public class SubpixelEdgelDetection * Note: The input image type must be a signed type! Otherwise gradient * computation will not work. * - * @implNote op name='subpixelEdgels', type=Function + * @implNote op name='edge.subpixelEdgels', type=Function * @param input * input image * @param factory diff --git a/src/main/java/net/imglib2/algorithm/fill/FloodFill.java b/src/main/java/net/imglib2/algorithm/fill/FloodFill.java index b738bada5..330ca2127 100644 --- a/src/main/java/net/imglib2/algorithm/fill/FloodFill.java +++ b/src/main/java/net/imglib2/algorithm/fill/FloodFill.java @@ -34,13 +34,15 @@ package net.imglib2.algorithm.fill; -import java.util.concurrent.ExecutorService; import java.util.function.BiPredicate; import java.util.function.Consumer; import gnu.trove.list.TLongList; import gnu.trove.list.array.TLongArrayList; -import net.imglib2.*; +import net.imglib2.Cursor; +import net.imglib2.Localizable; +import net.imglib2.RandomAccess; +import net.imglib2.RandomAccessible; import net.imglib2.algorithm.neighborhood.Neighborhood; import net.imglib2.algorithm.neighborhood.Shape; import net.imglib2.type.Type; @@ -120,7 +122,7 @@ public static < T extends Type< T >, U extends Type< U > > void fill( * last, and the primary input (the input image) comes first. *

* - * @implNote op name='floodFill', type=Computer + * @implNote op name='fill.flood', type=Computer * @param source * input * @param seed @@ -212,7 +214,7 @@ public static < T, U extends Type< U > > void fill( * last, and the primary input (the input image) comes first. *

* - * @implNote op name='floodFill', type=Computer + * @implNote op name='fill.flood', type=Computer * @param source * input * @param seed @@ -347,7 +349,7 @@ public static < T, U > void fill( * last, and the primary input (the input image) comes first. *

* - * @implNote op name='floodFill', type=Computer + * @implNote op name='fill.flood', type=Computer * @param source * input * @param seed diff --git a/src/main/java/net/imglib2/algorithm/gauss3/Gauss3.java b/src/main/java/net/imglib2/algorithm/gauss3/Gauss3.java index 970beb4bd..fa5466954 100644 --- a/src/main/java/net/imglib2/algorithm/gauss3/Gauss3.java +++ b/src/main/java/net/imglib2/algorithm/gauss3/Gauss3.java @@ -74,7 +74,7 @@ public final class Gauss3 * {@link Parallelization} context. (By default, it will use the * {@link ForkJoinPool#commonPool() common ForkJoinPool}) * - * @implNote op name='gauss', type=Computer + * @implNote op name='filter.gauss', type=Computer * @param sigma * standard deviation of isotropic Gaussian. * @param source @@ -117,7 +117,7 @@ public static < S extends NumericType< S >, T extends NumericType< T > > void ga * {@link Parallelization} context. (By default, it will use the * {@link ForkJoinPool#commonPool() common ForkJoinPool}) * - * @implNote op name='gauss', type=Computer + * @implNote op name='filter.gauss', type=Computer * @param sigma * standard deviation in every dimension. * @param source diff --git a/src/main/java/net/imglib2/algorithm/gradient/PartialDerivative.java b/src/main/java/net/imglib2/algorithm/gradient/PartialDerivative.java index 01fc7cec4..27201a530 100644 --- a/src/main/java/net/imglib2/algorithm/gradient/PartialDerivative.java +++ b/src/main/java/net/imglib2/algorithm/gradient/PartialDerivative.java @@ -40,11 +40,11 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; -import java.util.function.BiPredicate; -import java.util.function.Consumer; -import net.imglib2.*; -import net.imglib2.algorithm.neighborhood.Shape; +import net.imglib2.Cursor; +import net.imglib2.FinalInterval; +import net.imglib2.RandomAccessible; +import net.imglib2.RandomAccessibleInterval; import net.imglib2.loops.LoopBuilder; import net.imglib2.type.numeric.NumericType; import net.imglib2.util.Intervals; @@ -100,7 +100,7 @@ public static < T extends NumericType< T > > void gradientCentralDifference2( fi * last, and the primary input (the input image) comes first. *

* - * @implNote op name='gradientCentralDifference2', type=Computer + * @implNote op name='filter.gradientCentralDifference2', type=Computer * @param source * source image, has to provide valid data in the interval of the * gradient image plus a one pixel border in dimension. @@ -201,7 +201,7 @@ public static < T extends NumericType< T > > void gradientCentralDifferenceParal * last, and the primary input (the input image) comes first. *

* - * @implNote op name='gradientCentralDifferenceParallel', type=Computer + * @implNote op name='filter.gradientCentralDifferenceParallel', type=Computer * @param source * source image, has to provide valid data in the interval of the * gradient image plus a one pixel border in dimension. @@ -265,7 +265,7 @@ public static < T extends NumericType< T > > void gradientCentralDifference( fin * last, and the primary input (the input image) comes first. *

* - * @implNote op name='gradientCentralDifference', type=Computer + * @implNote op name='filter.gradientCentralDifference', type=Computer * @param source * source image, has to provide valid data in the interval of the * gradient image plus a one pixel border in dimension. @@ -313,7 +313,7 @@ public static < T extends NumericType< T > > void gradientBackwardDifference( fi * last, and the primary input (the input image) comes first. *

* - * @implNote op name='gradientBackwardDifference', type=Computer + * @implNote op name='filter.gradientBackwardDifference', type=Computer * @param source source image, has to provide valid data in the interval of * the gradient image plus a one pixel border in dimension. * @param dimension along which dimension the partial derivatives are computed @@ -358,7 +358,7 @@ public static < T extends NumericType< T > > void gradientForwardDifference( fin * last, and the primary input (the input image) comes first. *

* - * @implNote op name='gradientForwardDifference', type=Computer + * @implNote op name='filter.gradientForwardDifference', type=Computer * @param source source image, has to provide valid data in the interval of * the gradient image plus a one pixel border in dimension. * @param dimension along which dimension the partial derivatives are computed diff --git a/src/main/java/net/imglib2/algorithm/hough/HoughTransforms.java b/src/main/java/net/imglib2/algorithm/hough/HoughTransforms.java index fd3a5ffed..17343e344 100644 --- a/src/main/java/net/imglib2/algorithm/hough/HoughTransforms.java +++ b/src/main/java/net/imglib2/algorithm/hough/HoughTransforms.java @@ -37,7 +37,11 @@ import java.util.List; import java.util.function.Predicate; -import net.imglib2.*; +import net.imglib2.Cursor; +import net.imglib2.Dimensions; +import net.imglib2.Point; +import net.imglib2.RandomAccess; +import net.imglib2.RandomAccessibleInterval; import net.imglib2.algorithm.localextrema.LocalExtrema; import net.imglib2.algorithm.localextrema.LocalExtrema.MaximumCheck; import net.imglib2.type.numeric.IntegerType; @@ -101,6 +105,7 @@ private static int defaultRho( final Dimensions dimensions ) * Returns the size of the vote space output image given an input * {@link RandomAccessibleInterval}. * + * @implNote op names='filter.hough.getVotespaceSize', type=Function * @param dimensions * - the {@link Dimensions} over which the Hough Line Transform * will be run @@ -115,6 +120,7 @@ public static long[] getVotespaceSize( final Dimensions dimensions ) * Returns the size of the vote space output image given an input * {@link RandomAccessibleInterval}. * + * @implNote op names='filter.hough.getVotespaceSize', type=Function * @param dimensions * - the {@link Dimensions} over which the Hough Line Transform * will be run @@ -131,6 +137,7 @@ public static long[] getVotespaceSize( final Dimensions dimensions, final int nT * Returns the size of the voteSpace output image given desired {@code nRho} * and {@code nTheta} values. * + * @implNote op names='filter.hough.getVotespaceSize', type=Function * @param nRho * - the number of bins for rho resolution * @param nTheta @@ -145,6 +152,7 @@ public static long[] getVotespaceSize( final int nRho, final int nTheta ) /** * Pick vote space peaks with a {@link LocalExtrema}. * + * @implNote op names='filter.hough.pickLinePeaks', type=Function * @param voteSpace * - the {@link RandomAccessibleInterval} containing the output * of a Hough Transform vote @@ -166,6 +174,7 @@ public static < T extends IntegerType< T > > List< Point > pickLinePeaks( /** * Pick vote space peaks with a {@link LocalExtrema}. * + * @implNote op names='filter.hough.pickLinePeaks', type=Function * @param voteSpace * - the {@link RandomAccessibleInterval} containing the output * of a Hough Transform vote @@ -197,7 +206,7 @@ public static < T extends Comparable< T > > List< Point > pickLinePeaks( * Runs a Hough Line Tranform on an image and populates the vote space * parameter with the results. * - * @implNote op names='voteLines', + * @implNote op names='filter.hough.voteLines', * type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line @@ -244,7 +253,7 @@ public static < T extends Comparable< T >, U extends IntegerType< U > > void vot * last, and the primary input (the input image) comes first. *

* - * @implNote op name='voteLines', type=Computer + * @implNote op name='filter.hough.voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -296,7 +305,7 @@ public static < T extends Comparable< T >, U extends IntegerType< U > > void vot * last, and the primary input (the input image) comes first. *

* - * @implNote op names='voteLines', type=Computer + * @implNote op names='filter.hough.voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -357,7 +366,7 @@ public static < T extends Comparable< T >, U extends IntegerType< U > > void vot * last, and the primary input (the input image) comes first. *

* - * @implNote op name='voteLines', type=Computer + * @implNote op name='filter.hough.voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -541,7 +550,7 @@ public static < T, U extends IntegerType< U > > void voteLines( * last, and the primary input (the input image) comes first. *

* - * @implNote op name='voteLines', type=Computer + * @implNote op name='filter.hough.voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -574,7 +583,7 @@ public static < T, U extends IntegerType< U > > void voteLines( * y-intercept value. Used with {@link HoughTransforms#getSlope} to create * line equations. * - * @implNote op name='getIntercept', type=Function + * @implNote op name='filter.hough.getIntercept', type=Function * @param rho * - the {@code rho} of the line * @param theta @@ -593,7 +602,7 @@ public static double getIntercept( final long rho, final long theta ) * value. Used with {@link HoughTransforms#getIntercept} to create line * equations. * - * @implNote op name='getSlope', type=Function + * @implNote op name='filter.hough.getSlope', type=Function * @param theta * - the {@code theta} of the line * @return {@code double} - the y-intercept of the line diff --git a/src/main/java/net/imglib2/algorithm/kdtree/ConvexPolytope.java b/src/main/java/net/imglib2/algorithm/kdtree/ConvexPolytope.java index 758ddf639..bc7a45a36 100644 --- a/src/main/java/net/imglib2/algorithm/kdtree/ConvexPolytope.java +++ b/src/main/java/net/imglib2/algorithm/kdtree/ConvexPolytope.java @@ -65,7 +65,7 @@ public ConvexPolytope( final HyperPlane... hyperplanes ) /** * Apply an {@link AffineGet affine transformation} to a {@link HyperPlane}. * - * @implNote op name='transform', type=Function + * @implNote op name='transform.affine', type=Function * @param polytope * a polytope. * @param transform diff --git a/src/main/java/net/imglib2/algorithm/kdtree/HyperPlane.java b/src/main/java/net/imglib2/algorithm/kdtree/HyperPlane.java index a3aa015d1..76d38fbb0 100644 --- a/src/main/java/net/imglib2/algorithm/kdtree/HyperPlane.java +++ b/src/main/java/net/imglib2/algorithm/kdtree/HyperPlane.java @@ -74,7 +74,7 @@ public double getDistance() /** * Apply an {@link AffineGet affine transformation} to a {@link HyperPlane}. * - * @implNote op name='transform', type=Function + * @implNote op name='transform.affine', type=Function * @param plane * a plane. * @param transform diff --git a/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponentAnalysis.java b/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponentAnalysis.java index 40e52f426..f4e72ce29 100644 --- a/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponentAnalysis.java +++ b/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponentAnalysis.java @@ -117,7 +117,7 @@ public static < T > ToLongBiFunction< Localizable, T > idFromIntervalIndexer( fi * generalization for higher dimenions over a binary mask. {@code mask} and * {@code labeling} are expected to have equal min and max. * - * @implNote op name='connectedComponents', type=Computer + * @implNote op name='labeling.connectedComponents', type=Computer * @param mask * Boolean mask to distinguish foreground ({@code true}) from * background ({@code false}). @@ -185,7 +185,7 @@ public static < B extends BooleanType< B >, L extends IntegerType< L > > void co * last, and the primary input (the input image) comes first. *

* - * @implNote op name='connectedComponents', type=Computer + * @implNote op name='labeling.connectedComponents', type=Computer * @param mask * Boolean mask to distinguish foreground ({@code true}) from * background ({@code false}). @@ -268,7 +268,7 @@ public static < B extends BooleanType< B >, L extends IntegerType< L > > void co * last, and the primary input (the input image) comes first. *

* - * @implNote op name='connectedComponents', type=Computer + * @implNote op name='labeling.connectedComponents', type=Computer * @param mask * Boolean mask to distinguish foreground ({@code true}) from * background ({@code false}). diff --git a/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponents.java b/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponents.java index 52a8bf1e1..c5c9658a0 100644 --- a/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponents.java +++ b/src/main/java/net/imglib2/algorithm/labeling/ConnectedComponents.java @@ -126,7 +126,7 @@ public static < T extends IntegerType< T >, L, I extends IntegerType< I > > void * last, and the primary input (the input image) comes first. *

* - * @implNote op name='labelAllConnectedComponents', type=Computer + * @implNote op name='labeling.connectedComponents', type=Computer * @param input * input image with pixels != 0 belonging to foreground. * @param labelGenerator @@ -203,7 +203,7 @@ public static < T extends IntegerType< T >, L, I extends IntegerType< I > > void * last, and the primary input (the input image) comes first. *

* - * @implNote op name='labelAllConnectedComponents', type=Computer + * @implNote op name='labeling.connectedComponents', type=Computer * @param input * input image with pixels != 0 belonging to foreground. * @param labelGenerator diff --git a/src/main/java/net/imglib2/algorithm/lazy/Lazy.java b/src/main/java/net/imglib2/algorithm/lazy/Lazy.java index dfbc9a094..f34714625 100644 --- a/src/main/java/net/imglib2/algorithm/lazy/Lazy.java +++ b/src/main/java/net/imglib2/algorithm/lazy/Lazy.java @@ -81,7 +81,7 @@ private Lazy() /** * Create a memory {@link CachedCellImg} with a cell {@link Cache}. * - * @implNote op name='create', type=Function + * @implNote op names='create.cellImg, create', type=Function * @param grid * @param cache * @param type @@ -127,7 +127,7 @@ else if ( DoubleType.class.isInstance( type ) ) /** * Create a memory {@link CachedCellImg} with a {@link CellLoader}. * - * @implNote op name='create', type=Function + * @implNote op name='create.cellImg,create', type=Function * @param targetInterval * @param blockSize * @param type @@ -159,7 +159,7 @@ else if ( DoubleType.class.isInstance( type ) ) * Create a memory {@link CachedCellImg} with a cell generator * {@link Consumer}. * - * @implNote op name='create', type=Function + * @implNote op name='create.cellImg, create', type=Function * @param targetInterval * @param blockSize * @param type diff --git a/src/main/java/net/imglib2/algorithm/localextrema/LocalExtrema.java b/src/main/java/net/imglib2/algorithm/localextrema/LocalExtrema.java index 2de64a7b9..04e25b70c 100644 --- a/src/main/java/net/imglib2/algorithm/localextrema/LocalExtrema.java +++ b/src/main/java/net/imglib2/algorithm/localextrema/LocalExtrema.java @@ -167,7 +167,7 @@ public static < P, T > ArrayList< P > findLocalExtrema( final RandomAccessibleIn * {@code source} accordingly. The returned coordinate list is valid * for the original {@code source}. * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema within this * {@link RandomAccessibleInterval} @@ -209,7 +209,7 @@ public static < P, T > List< P > findLocalExtrema( * {@code source} accordingly. The returned coordinate list is valid * for the original {@code source}. * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema within this * {@link RandomAccessibleInterval} @@ -250,7 +250,7 @@ public static < P, T > List< P > findLocalExtrema( * The task is parallelized along the longest dimension of * {@code interval} * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema of the function defined by this * {@link RandomAccessible} @@ -290,7 +290,7 @@ public static < P, T > List< P > findLocalExtrema( * test for being an extremum can be specified as an implementation of the * {@link LocalNeighborhoodCheck} interface. * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema of the function defined by this * {@link RandomAccessible} @@ -371,7 +371,7 @@ public static < P, T > List< P > findLocalExtrema( * expand {@code source} accordingly. The returned coordinate list is * valid for the original {@code source}. * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema within this * {@link RandomAccessibleInterval} @@ -398,7 +398,7 @@ public static < P, T > List< P > findLocalExtrema( * {@code source} accordingly. The returned coordinate list is valid * for the original {@code source}. * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema within this * {@link RandomAccessibleInterval} @@ -433,7 +433,7 @@ public static < P, T > List< P > findLocalExtrema( * * The local neighborhood is defined as {@link RectangleShape} with span 1. * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema within this {@link RandomAccessible} * @param interval @@ -458,7 +458,7 @@ public static < P, T > List< P > findLocalExtrema( * test for being an extremum can be specified as an implementation of the * {@link LocalNeighborhoodCheck} interface. * - * @implNote op name='findLocalExtrema', type=Function + * @implNote op name='image.localExtrema', type=Function * @param source * Find local extrema within this {@link RandomAccessible} * @param interval @@ -503,7 +503,7 @@ public static < P, T > List< P > findLocalExtrema( * determining by how much a {@link RandomAccessibleInterval} should be * expanded to include min and max positions in the local extrema search. * - * @implNote op name='getRequiredBorderSize', type=Function + * @implNote op name='geom.borderSize', type=Function * @param shape * Defines the local neighborhood * @param nDim @@ -532,7 +532,7 @@ public static long[] getRequiredBorderSize( final Shape shape, final int nDim ) * Shrink a {@link RandomAccessibleInterval} symmetrically, i.e. the margin * is applied both to min and max. * - * @implNote op name='shrink', type=Function + * @implNote op name='image.shrink', type=Function * @param source * @param margin * @return @@ -548,7 +548,7 @@ public static < T > IntervalView< T > shrink( final RandomAccessibleInterval< T /** * - * @implNote op name='getBiggestDimension', type=Function + * @implNote op name='image.biggestDimension', type=Function * @param interval * @return The biggest dimension of interval. */ diff --git a/src/main/java/net/imglib2/algorithm/math/ImgMath.java b/src/main/java/net/imglib2/algorithm/math/ImgMath.java index 6599de4ab..6d86d6362 100644 --- a/src/main/java/net/imglib2/algorithm/math/ImgMath.java +++ b/src/main/java/net/imglib2/algorithm/math/ImgMath.java @@ -115,7 +115,7 @@ public class ImgMath { /** - * @implNote op name='compute', type=Function + * @implNote op name='math.compute', type=Function */ static public final Compute compute( final IFunction operation ) { @@ -123,7 +123,7 @@ static public final Compute compute( final IFunction operation ) } /** - * @implNote op name='compute', type=Function + * @implNote op name='math.compute', type=Function */ static public final < I extends RealType< I > > Compute compute( final RandomAccessibleInterval< I > src ) { @@ -131,7 +131,7 @@ static public final < I extends RealType< I > > Compute compute( final RandomAcc } /** - * @implNote op name='computeIntoFloats', type=Function + * @implNote op name='math.computeIntoFloats', type=Function */ static public final RandomAccessibleInterval< FloatType > computeIntoFloats( final IFunction operation ) { @@ -139,7 +139,7 @@ static public final RandomAccessibleInterval< FloatType > computeIntoFloats( fin } /** - * @implNote op name='computeInto', type=Function + * @implNote op name='math.computeInto', type=Function */ static public final < O extends RealType< O > > RandomAccessibleInterval< O > computeInto( final IFunction operation, @@ -149,7 +149,7 @@ static public final < O extends RealType< O > > RandomAccessibleInterval< O > co } /** - * @implNote op name='computeInto', type=Function + * @implNote op name='math.computeInto', type=Function */ static public final < O extends RealType< O > > RandomAccessibleInterval< O > computeInto( final IFunction operation, @@ -160,7 +160,7 @@ static public final < O extends RealType< O > > RandomAccessibleInterval< O > co } /** - * @implNote op name='computeIntoImg', type=Function + * @implNote op name='math.computeIntoImg', type=Function */ static public final < O extends NativeType< O > & RealType< O > > RandomAccessibleInterval< O > computeIntoImg( final IFunction operation ) { @@ -168,7 +168,7 @@ static public final < O extends NativeType< O > & RealType< O > > RandomAccessib } /** - * @implNote op name='computeIntoArrayImg', type=Function + * @implNote op name='math.computeIntoArrayImg', type=Function */ static public final < O extends NativeType< O > & RealType< O > > RandomAccessibleInterval< O > computeIntoArrayImg( final IFunction operation ) { @@ -178,7 +178,7 @@ static public final < O extends NativeType< O > & RealType< O > > RandomAccessib /** * Almost all {@code IFunction} are also {@code ViewableFunction}. * - * @implNote op name='view', type=Function + * @implNote op name='math.view', type=Function * @param operation * @return */ @@ -190,7 +190,7 @@ static public final < O extends RealType< O > > RandomAccessibleInterval< O > vi /** * Almost all {@code IFunction} are also {@code ViewableFunction}. * - * @implNote op name='viewFloats', type=Function + * @implNote op name='math.viewFloats', type=Function * @param operation * @return */ @@ -200,7 +200,7 @@ static public final RandomAccessibleInterval< FloatType > viewFloats( final View } /** - * @implNote op name='add', type=Function + * @implNote op name='math.add', type=Function */ static public final Add add( final Object o1, final Object o2 ) { @@ -208,7 +208,7 @@ static public final Add add( final Object o1, final Object o2 ) } /** - * @implNote op name='add', type=Function + * @implNote op name='math.add', type=Function */ static public final Add add( final Object... obs ) { @@ -216,7 +216,7 @@ static public final Add add( final Object... obs ) } /** - * @implNote op name='sub', type=Function + * @implNote op name='math.sub', type=Function */ static public final Sub sub( final Object o1, final Object o2 ) { @@ -224,7 +224,7 @@ static public final Sub sub( final Object o1, final Object o2 ) } /** - * @implNote op name='sub', type=Function + * @implNote op name='math.sub', type=Function */ static public final Sub sub( final Object... obs ) { @@ -232,7 +232,7 @@ static public final Sub sub( final Object... obs ) } /** - * @implNote op name='minus', type=Function + * @implNote op name='math.minus', type=Function */ static public final Minus minus( final Object o1 ) { @@ -240,7 +240,7 @@ static public final Minus minus( final Object o1 ) } /** - * @implNote op name='mul', type=Function + * @implNote op name='math.mul', type=Function */ static public final Mul mul( final Object o1, final Object o2 ) { @@ -248,7 +248,7 @@ static public final Mul mul( final Object o1, final Object o2 ) } /** - * @implNote op name='mul', type=Function + * @implNote op name='math.mul', type=Function */ static public final Mul mul( final Object... obs ) { @@ -256,7 +256,7 @@ static public final Mul mul( final Object... obs ) } /** - * @implNote op name='div', type=Function + * @implNote op name='math.div', type=Function */ static public final Div div( final Object o1, final Object o2 ) { @@ -264,7 +264,7 @@ static public final Div div( final Object o1, final Object o2 ) } /** - * @implNote op name='div', type=Function + * @implNote op name='math.div', type=Function */ static public final Div div( final Object... obs ) { @@ -272,7 +272,7 @@ static public final Div div( final Object... obs ) } /** - * @implNote op name='pow', type=Function + * @implNote op name='math.pow', type=Function */ static public final Pow pow( final Object o1, final Object o2 ) { @@ -280,7 +280,7 @@ static public final Pow pow( final Object o1, final Object o2 ) } /** - * @implNote op name='power', type=Function + * @implNote op name='math.power', type=Function */ static public final Pow power( final Object o1, final Object o2 ) { @@ -288,7 +288,7 @@ static public final Pow power( final Object o1, final Object o2 ) } /** - * @implNote op name='max', type=Function + * @implNote op name='math.max', type=Function */ static public final Max max( final Object o1, final Object o2 ) { @@ -296,7 +296,7 @@ static public final Max max( final Object o1, final Object o2 ) } /** - * @implNote op name='max', type=Function + * @implNote op name='math.max', type=Function */ static public final Max max( final Object... obs ) { @@ -304,7 +304,7 @@ static public final Max max( final Object... obs ) } /** - * @implNote op name='maximum', type=Function + * @implNote op name='math.maximum', type=Function */ static public final Max maximum( final Object o1, final Object o2 ) { @@ -312,7 +312,7 @@ static public final Max maximum( final Object o1, final Object o2 ) } /** - * @implNote op name='maximum', type=Function + * @implNote op name='math.maximum', type=Function */ static public final Max maximum( final Object... obs ) { @@ -320,7 +320,7 @@ static public final Max maximum( final Object... obs ) } /** - * @implNote op name='min', type=Function + * @implNote op name='math.min', type=Function */ static public final Min min( final Object o1, final Object o2 ) { @@ -328,7 +328,7 @@ static public final Min min( final Object o1, final Object o2 ) } /** - * @implNote op name='min', type=Function + * @implNote op name='math.min', type=Function */ static public final Min min( final Object... obs ) { @@ -336,7 +336,7 @@ static public final Min min( final Object... obs ) } /** - * @implNote op name='minimum', type=Function + * @implNote op name='math.minimum', type=Function */ static public final Min minimum( final Object o1, final Object o2 ) { @@ -344,7 +344,7 @@ static public final Min minimum( final Object o1, final Object o2 ) } /** - * @implNote op name='minimum', type=Function + * @implNote op name='math.minimum', type=Function */ static public final Min minimum( final Object... obs ) { @@ -352,7 +352,7 @@ static public final Min minimum( final Object... obs ) } /** - * @implNote op name='log', type=Function + * @implNote op name='math.log', type=Function */ static public final Log log( final Object o1 ) { @@ -360,7 +360,7 @@ static public final Log log( final Object o1 ) } /** - * @implNote op name='logarithm', type=Function + * @implNote op name='math.logarithm', type=Function */ static public final Log logarithm( final Object o1 ) { @@ -368,7 +368,7 @@ static public final Log logarithm( final Object o1 ) } /** - * @implNote op name='exp', type=Function + * @implNote op name='math.exp', type=Function */ static public final Exp exp( final Object o1 ) { @@ -376,7 +376,7 @@ static public final Exp exp( final Object o1 ) } /** - * @implNote op name='let', type=Function + * @implNote op name='math.let', type=Function */ static public final Let let( final String varName, final Object varValue, final Object body ) { @@ -384,7 +384,7 @@ static public final Let let( final String varName, final Object varValue, final } /** - * @implNote op name='let', type=Function + * @implNote op name='math.let', type=Function */ static public final Let let( final Object[] pairs, final Object body ) { @@ -392,7 +392,7 @@ static public final Let let( final Object[] pairs, final Object body ) } /** - * @implNote op name='let', type=Function + * @implNote op name='math.let', type=Function */ static public final Let let( final Object... obs ) { @@ -400,7 +400,7 @@ static public final Let let( final Object... obs ) } /** - * @implNote op name='var', type=Function + * @implNote op name='math.var', type=Function */ static public final Var var( final String name ) { @@ -408,7 +408,7 @@ static public final Var var( final String name ) } /** - * @implNote op name='eq', type=Function + * @implNote op name='math.eq', type=Function */ static public final Equal EQ( final Object o1, final Object o2 ) { @@ -416,7 +416,7 @@ static public final Equal EQ( final Object o1, final Object o2 ) } /** - * @implNote op name='equal', type=Function + * @implNote op name='math.equal', type=Function */ static public final Equal equal( final Object o1, final Object o2 ) { @@ -424,7 +424,7 @@ static public final Equal equal( final Object o1, final Object o2 ) } /** - * @implNote op name='neq', type=Function + * @implNote op name='math.neq', type=Function */ static public final NotEqual NEQ( final Object o1, final Object o2 ) { @@ -432,7 +432,7 @@ static public final NotEqual NEQ( final Object o1, final Object o2 ) } /** - * @implNote op name='notEqual', type=Function + * @implNote op name='math.notEqual', type=Function */ static public final NotEqual notEqual( final Object o1, final Object o2 ) { @@ -440,7 +440,7 @@ static public final NotEqual notEqual( final Object o1, final Object o2 ) } /** - * @implNote op name='lt', type=Function + * @implNote op name='math.lt', type=Function */ static public final LessThan LT( final Object o1, final Object o2 ) { @@ -448,7 +448,7 @@ static public final LessThan LT( final Object o1, final Object o2 ) } /** - * @implNote op name='lessThan', type=Function + * @implNote op name='math.lessThan', type=Function */ static public final LessThan lessThan( final Object o1, final Object o2 ) { @@ -456,7 +456,7 @@ static public final LessThan lessThan( final Object o1, final Object o2 ) } /** - * @implNote op name='gt', type=Function + * @implNote op name='math.gt', type=Function */ static public final GreaterThan GT( final Object o1, final Object o2 ) { @@ -464,7 +464,7 @@ static public final GreaterThan GT( final Object o1, final Object o2 ) } /** - * @implNote op name='greaterThan', type=Function + * @implNote op name='math.greaterThan', type=Function */ static public final GreaterThan greaterThan( final Object o1, final Object o2 ) { @@ -472,7 +472,7 @@ static public final GreaterThan greaterThan( final Object o1, final Object o2 ) } /** - * @implNote op name='if', type=Function + * @implNote op name='math.if', type=Function */ static public final If IF( final Object o1, final Object o2, final Object o3 ) { @@ -480,7 +480,7 @@ static public final If IF( final Object o1, final Object o2, final Object o3 ) } /** - * @implNote op name='then', type=Function + * @implNote op name='math.then', type=Function */ static public final Then THEN( final Object o ) { @@ -488,7 +488,7 @@ static public final Then THEN( final Object o ) } /** - * @implNote op name='else', type=Function + * @implNote op name='math.else', type=Function */ static public final Else ELSE( final Object o ) { @@ -496,7 +496,7 @@ static public final Else ELSE( final Object o ) } /** - * @implNote op name='and', type=Function + * @implNote op name='math.and', type=Function */ static public final AndLogical AND( final Object o1, final Object o2 ) { @@ -504,7 +504,7 @@ static public final AndLogical AND( final Object o1, final Object o2 ) } /** - * @implNote op name='and', type=Function + * @implNote op name='math.and', type=Function */ static public final AndLogical AND( final Object... o ) { @@ -512,7 +512,7 @@ static public final AndLogical AND( final Object... o ) } /** - * @implNote op name='or', type=Function + * @implNote op name='math.or', type=Function */ static public final OrLogical OR( final Object o1, final Object o2 ) { @@ -520,7 +520,7 @@ static public final OrLogical OR( final Object o1, final Object o2 ) } /** - * @implNote op name='or', type=Function + * @implNote op name='math.or', type=Function */ static public final OrLogical OR( final Object... o ) { @@ -528,7 +528,7 @@ static public final OrLogical OR( final Object... o ) } /** - * @implNote op name='xor', type=Function + * @implNote op name='math.xor', type=Function */ static public final XorLogical XOR( final Object o1, final Object o2 ) { @@ -536,7 +536,7 @@ static public final XorLogical XOR( final Object o1, final Object o2 ) } /** - * @implNote op name='xor', type=Function + * @implNote op name='math.xor', type=Function */ static public final XorLogical XOR( final Object... o ) { @@ -544,7 +544,7 @@ static public final XorLogical XOR( final Object... o ) } /** - * @implNote op name='not', type=Function + * @implNote op name='math.not', type=Function */ static public final NotLogical NOT( final Object o ) { @@ -552,7 +552,7 @@ static public final NotLogical NOT( final Object o ) } /** - * @implNote op name='img', type=Function + * @implNote op name='math.img', type=Function */ static public final < T extends RealType< T > > ImgSource< T > img( final RandomAccessibleInterval< T > rai ) { @@ -561,7 +561,7 @@ static public final < T extends RealType< T > > ImgSource< T > img( final Random /** * Synonym of {@code img(RandomAccessibleInterval)}, given that {@code img} is a widely used variable name. - * @implNote op name='intervalSource', type=Function + * @implNote op name='math.intervalSource', type=Function */ static public final < T extends RealType< T > > ImgSource< T > intervalSource( final RandomAccessibleInterval< T > rai ) { @@ -569,7 +569,7 @@ static public final < T extends RealType< T > > ImgSource< T > intervalSource( f } /** - * @implNote op name='number', type=Function + * @implNote op name='math.number', type=Function */ static public final NumberSource number( final Number number ) { @@ -577,7 +577,7 @@ static public final NumberSource number( final Number number ) } /** - * @implNote op name='block', type=Function + * @implNote op name='math.block', type=Function */ static public final < T extends RealType< T > > BlockReadSource< T > block( final RandomAccessible< T > src, final long[] radius ) { @@ -585,7 +585,7 @@ static public final < T extends RealType< T > > BlockReadSource< T > block( fina } /** - * @implNote op name='block', type=Function + * @implNote op name='math.block', type=Function */ static public final < T extends RealType< T > > BlockReadSource< T > block( final RandomAccessible< T > src, final long radius ) { @@ -593,7 +593,7 @@ static public final < T extends RealType< T > > BlockReadSource< T > block( fina } /** - * @implNote op name='block', type=Function + * @implNote op name='math.block', type=Function */ static public final < T extends RealType< T > > BlockReadSource< T > block( final RandomAccessible< T > src, final long[][] corners ) { @@ -601,7 +601,7 @@ static public final < T extends RealType< T > > BlockReadSource< T > block( fina } /** - * @implNote op name='offset', type=Function + * @implNote op name='math.offset', type=Function */ static public final < T extends RealType< T > > RandomAccessibleSource< T > offset( final RandomAccessible< T > src, final long[] offset ) { @@ -609,7 +609,7 @@ static public final < T extends RealType< T > > RandomAccessibleSource< T > offs } /** - * @implNote op name='offset', type=Function + * @implNote op name='math.offset', type=Function */ static public final < T extends RealType< T > > OffsetSource< T > offset( final IFunction f, final long[] offset ) { @@ -617,7 +617,7 @@ static public final < T extends RealType< T > > OffsetSource< T > offset( final } /** - * @implNote op name='source', type=Function + * @implNote op name='math.source', type=Function */ static public final < T extends RealType< T > > IFunction source( final RandomAccessible< T > src ) { @@ -627,7 +627,7 @@ static public final < T extends RealType< T > > IFunction source( final RandomAc } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final List< Point > positions, final T value, final double radius ) { @@ -635,7 +635,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final Lis } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final List< Point > positions, final T value, final double radius, final Object outside ) { @@ -643,7 +643,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final Lis } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final List< Point > positions, final T value, final double radius, final Object outside, final Interval interval ) { @@ -651,7 +651,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final Lis } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final List< Point > positions, final List< T > values, final double radius ) { @@ -659,7 +659,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final Lis } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final List< Point > positions, final List< T > values, final double radius, final Object outside ) { @@ -667,7 +667,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final Lis } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final List< Point > positions, final List< T > values, final double radius, final Object outside, final Interval interval ) { @@ -675,7 +675,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final Lis } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final KDTree< T > kdtree, final double radius ) { @@ -683,7 +683,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final KDT } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final KDTree< T > kdtree, final double radius, final Object outside ) { @@ -691,7 +691,7 @@ static public final < T extends RealType< T > > KDTreeSource< T > gen( final KDT } /** - * @implNote op name='gen', type=Function + * @implNote op name='math.gen', type=Function */ static public final < T extends RealType< T > > KDTreeSource< T > gen( final KDTree< T > kdtree, final double radius, final Object outside, final Interval interval ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/BlackTopHat.java b/src/main/java/net/imglib2/algorithm/morphology/BlackTopHat.java index 8532cd1a6..466a43f5a 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/BlackTopHat.java +++ b/src/main/java/net/imglib2/algorithm/morphology/BlackTopHat.java @@ -34,10 +34,11 @@ package net.imglib2.algorithm.morphology; import java.util.List; -import java.util.function.BiPredicate; -import java.util.function.Consumer; -import net.imglib2.*; +import net.imglib2.Interval; +import net.imglib2.IterableInterval; +import net.imglib2.RandomAccessible; +import net.imglib2.RandomAccessibleInterval; import net.imglib2.algorithm.neighborhood.Shape; import net.imglib2.img.Img; import net.imglib2.img.ImgFactory; @@ -77,7 +78,7 @@ public class BlackTopHat * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is returned. * - * @implNote op name='blackTopHat', type='org.scijava.function.Function.Arity3' + * @implNote op name='morphology.blackTopHat', type='org.scijava.function.Function.Arity3' * @param source * the source image. * @param strels @@ -121,7 +122,7 @@ public static < T extends RealType< T >> Img< T > blackTopHat( final Img< T > so * parameters are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='blackTopHat', type='org.scijava.function.Function.Arity5' + * @implNote op name='morphology.blackTopHat', type='org.scijava.function.Function.Arity5' * @param source * the source image. * @param strels @@ -161,7 +162,7 @@ public static < T extends Type< T > & Comparable< T > & Sub< T > > Img< T > blac * contrary to grayscale structuring elements. This allows to simply use a * {@link Shape} as a type for these structuring elements. * - * @implNote op name='blackTopHat', type='org.scijava.function.Function.Arity3' + * @implNote op name='morphology.blackTopHat', type='org.scijava.function.Function.Arity3' * @param source * the source image. * @param strel @@ -199,7 +200,7 @@ public static < T extends RealType< T >> Img< T > blackTopHat( final Img< T > so * image, and the converse for the max value. These normally unseen * parameters are required to operate on {@code T extends Comparable & Sub}. * - * @implNote op name='blackTopHat', type='org.scijava.function.Function.Arity5' + * @implNote op name='morphology.blackTopHat', type='org.scijava.function.Function.Arity5' * @param source * the source image. * @param strel @@ -303,7 +304,7 @@ public static < T extends RealType< T > > void blackTopHat( final RandomAccessib * last, and the primary input (the input image) comes first. *

* - * @implNote op name='blackTopHat', type=Computer + * @implNote op name='morphology.blackTopHat', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels diff --git a/src/main/java/net/imglib2/algorithm/morphology/Closing.java b/src/main/java/net/imglib2/algorithm/morphology/Closing.java index 3bb3aaed3..b4b2bb73f 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/Closing.java +++ b/src/main/java/net/imglib2/algorithm/morphology/Closing.java @@ -64,7 +64,7 @@ public class Closing * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is returned. * - * @implNote op name='close', type=Function + * @implNote op name='morphology.close', type=Function * @param source * the {@link Img} to operate on. * @param strels @@ -106,7 +106,7 @@ public static final < T extends RealType< T >> Img< T > close( final Img< T > so * parameters are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='close', type=Function + * @implNote op name='morphology.close', type=Function * @param source * the {@link Img} to operate on. * @param strels @@ -141,7 +141,7 @@ public static final < T extends Type< T > & Comparable< T > > Img< T > close( fi *

* The closing operation is simply a dilation followed by an erosion. * - * @implNote op name='close', type=Function + * @implNote op name='morphology.close', type=Function * @param source * the {@link Img} to operate on. * @param strel @@ -178,7 +178,7 @@ public static final < T extends RealType< T >> Img< T > close( final Img< T > so * parameters are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='close', type=Function + * @implNote op name='morphology.close', type=Function * @param source * the {@link Img} to operate on. * @param strel @@ -285,7 +285,7 @@ public static < T extends RealType< T > > void close( final RandomAccessible< T * last, and the primary input (the input image) comes first. *

* - * @implNote op name='close', type=Computer + * @implNote op name='morphology.close', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels @@ -412,7 +412,7 @@ public static < T extends Type< T > & Comparable< T > > void close( final Random * last, and the primary input (the input image) comes first. *

* - * @implNote op name='close', type=Computer + * @implNote op name='morphology.close', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels @@ -507,7 +507,7 @@ public static < T extends RealType< T > > void close( final RandomAccessible< T * last, and the primary input (the input image) comes first. *

* - * @implNote op name='close', type='org.scijava.function.Computer.Arity3' + * @implNote op name='morphology.close', type='org.scijava.function.Computer.Arity3' * @param source * the {@link RandomAccessible} to operate on. * @param strel @@ -624,7 +624,7 @@ public static < T extends Type< T > & Comparable< T > > void close( final Random * last, and the primary input (the input image) comes first. *

* - * @implNote op name='close', type=Computer + * @implNote op name='morphology.close', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strel @@ -670,7 +670,7 @@ public static < T extends Type< T > & Comparable< T > > void close( final Random * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is returned. * - * @implNote op name='close', type=Inplace1 + * @implNote op name='morphology.close', type=Inplace1 * @param source * the source image. * @param interval @@ -723,7 +723,7 @@ public static < T extends RealType< T > > void closeInPlace( final RandomAccessi * are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='close', type=Inplace1 + * @implNote op name='morphology.close', type=Inplace1 * @param source * the source image. * @param interval @@ -775,7 +775,7 @@ public static < T extends Type< T > & Comparable< T >> void closeInPlace( final * are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='close', type=Inplace1 + * @implNote op name='morphology.close', type=Inplace1 * @param source * the source image. * @param interval @@ -828,7 +828,7 @@ public static < T extends RealType< T > > void closeInPlace( final RandomAccessi * are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='close', type=Inplace1 + * @implNote op name='morphology.close', type=Inplace1 * @param source * the source image. * @param interval diff --git a/src/main/java/net/imglib2/algorithm/morphology/Dilation.java b/src/main/java/net/imglib2/algorithm/morphology/Dilation.java index 33bfc029b..24582c5cf 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/Dilation.java +++ b/src/main/java/net/imglib2/algorithm/morphology/Dilation.java @@ -302,7 +302,7 @@ public static < T extends RealType< T >> void dilate( final RandomAccessible< T * last, and the primary input (the input image) comes first. *

* - * @implNote op name='dilate', type=Computer + * @implNote op name='morphology.dilate', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -454,7 +454,7 @@ public static < T extends Type< T > & Comparable< T > > void dilate( final Rando * last, and the primary input (the input image) comes first. *

* - * @implNote op name='dilate', type=Computer + * @implNote op name='morphology.dilate', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -541,7 +541,7 @@ public static < T extends RealType< T >> void dilate( final RandomAccessible< T * last, and the primary input (the input image) comes first. *

* - * @implNote op name='dilate', type=Computer + * @implNote op name='morphology.dilate', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -755,7 +755,7 @@ public void run() * last, and the primary input (the input image) comes first. *

* - * @implNote op name='dilate', type=Computer + * @implNote op name='morphology.dilate', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -809,7 +809,7 @@ public static < T extends Type< T > & Comparable< T > > void dilate( final Rando * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='dilateFull', type=Function + * @implNote op name='morphology.dilateFull', type=Function * @param source * the source image. * @param strels @@ -868,7 +868,7 @@ public static < T extends RealType< T > > Img< T > dilateFull( final Img< T > so * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='dilateFull', type=Function + * @implNote op name='morphology.dilateFull', type=Function * @param source * the source image. * @param strels @@ -921,7 +921,7 @@ public static < T extends Type< T > & Comparable< T > > Img< T > dilateFull( fin * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='dilateFull', type=Function + * @implNote op name='morphology.dilateFull', type=Function * @param source * the source image. * @param strel @@ -982,7 +982,7 @@ public static < T extends RealType< T >> Img< T > dilateFull( final Img< T > sou * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='dilateFull', type=Function + * @implNote op name='morphology.dilateFull', type=Function * @param source * the source image. * @param strel @@ -1037,7 +1037,7 @@ public static < T extends Type< T > & Comparable< T > > Img< T > dilateFull( fin * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is returned. * - * @implNote op name='dilate', type=Inplace1 + * @implNote op name='morphology.dilate', type=Inplace1 * @param source * the source image. * @param interval @@ -1087,7 +1087,7 @@ public static < T extends RealType< T > > void dilateInPlace( final RandomAccess * image. This normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='dilate', type=Inplace1 + * @implNote op name='morphology.dilate', type=Inplace1 * @param source * the source image. * @param interval @@ -1131,7 +1131,7 @@ public static < T extends Type< T > & Comparable< T > > void dilateInPlace( fina * e.g. {@link Views#extendValue(RandomAccessibleInterval, Type)} *

* - * @implNote op name='dilate', type=Inplace1 + * @implNote op name='morphology.dilate', type=Inplace1 * @param source * the source image. * @param interval @@ -1184,7 +1184,7 @@ public static < T extends RealType< T > > void dilateInPlace( final RandomAccess * image. This normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='dilate', type=Inplace1 + * @implNote op name='morphology.dilate', type=Inplace1 * @param source * the source image. * @param interval diff --git a/src/main/java/net/imglib2/algorithm/morphology/Erosion.java b/src/main/java/net/imglib2/algorithm/morphology/Erosion.java index bbd2029b1..597c20a98 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/Erosion.java +++ b/src/main/java/net/imglib2/algorithm/morphology/Erosion.java @@ -76,7 +76,7 @@ public class Erosion * pixels, contrary to grayscale structuring elements. This allows to simply * use a {@link Shape} as a type for these structuring elements. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strels @@ -122,7 +122,7 @@ public static < T extends RealType< T > > Img< T > erode( final Img< T > source, * normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strels @@ -162,7 +162,7 @@ public static < T extends Type< T > & Comparable< T > > Img< T > erode( final Im * pixels, contrary to grayscale structuring elements. This allows to simply * use a {@link Shape} as a type for these structuring elements. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strel @@ -203,7 +203,7 @@ public static < T extends RealType< T >> Img< T > erode( final Img< T > source, * normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strel @@ -302,7 +302,7 @@ public static < T extends RealType< T >> void erode( final RandomAccessible< T > * last, and the primary input (the input image) comes first. *

* - * @implNote op name='erode', type=Computer + * @implNote op name='morphology.erode', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -453,7 +453,7 @@ public static < T extends Type< T > & Comparable< T > > void erode( final Random * last, and the primary input (the input image) comes first. *

* - * @implNote op name='erode', type=Computer + * @implNote op name='morphology.erode', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -539,7 +539,7 @@ public static < T extends RealType< T >> void erode( final RandomAccessible< T > * last, and the primary input (the input image) comes first. *

* - * @implNote op name='erode', type=Computer + * @implNote op name='morphology.erode', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -752,7 +752,7 @@ public void run() * last, and the primary input (the input image) comes first. *

* - * @implNote op name='erode', type=Computer + * @implNote op name='morphology.erode', type=Computer * @param source * the source {@link RandomAccessible}, must be sufficiently * padded. @@ -805,7 +805,7 @@ public static < T extends Type< T > & Comparable< T > > void erode( final Random * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strels @@ -864,7 +864,7 @@ public static < T extends RealType< T > > Img< T > erodeFull( final Img< T > sou * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strels @@ -917,7 +917,7 @@ public static < T extends Type< T > & Comparable< T > > Img< T > erodeFull( fina * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strel @@ -978,7 +978,7 @@ public static < T extends RealType< T >> Img< T > erodeFull( final Img< T > sour * dimensions equals to the maximum of the number of dimension of both * source and structuring element. * - * @implNote op name='erode', type=Function + * @implNote op name='morphology.erode', type=Function * @param source * the source image. * @param strel @@ -1033,7 +1033,7 @@ public static < T extends Type< T > & Comparable< T > > Img< T > erodeFull( fina * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is returned. * - * @implNote op name='erode', type='org.scijava.function.Inplace.Arity4_1' + * @implNote op name='morphology.erode', type='org.scijava.function.Inplace.Arity4_1' * @param source * the source image. * @param interval @@ -1083,7 +1083,7 @@ public static < T extends RealType< T > > void erodeInPlace( final RandomAccessi * normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='erode', type='org.scijava.function.Inplace.Arity5_1' + * @implNote op name='morphology.erode', type='org.scijava.function.Inplace.Arity5_1' * @param source * the source image. * @param interval @@ -1127,7 +1127,7 @@ public static < T extends Type< T > & Comparable< T > > void erodeInPlace( final * e.g. {@link Views#extendValue(RandomAccessibleInterval, Type)} *

* - * @implNote op name='erode', type='org.scijava.function.Inplace.Arity4_1' + * @implNote op name='morphology.erode', type='org.scijava.function.Inplace.Arity4_1' * @param source * the source image. * @param interval @@ -1177,7 +1177,7 @@ public static < T extends RealType< T > > void erodeInPlace( final RandomAccessi * normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='erode', type='org.scijava.function.Inplace.Arity5_1' + * @implNote op name='morphology.erode', type='org.scijava.function.Inplace.Arity5_1' * @param source * the source image. * @param interval diff --git a/src/main/java/net/imglib2/algorithm/morphology/Opening.java b/src/main/java/net/imglib2/algorithm/morphology/Opening.java index 43ee9f880..620612ce5 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/Opening.java +++ b/src/main/java/net/imglib2/algorithm/morphology/Opening.java @@ -71,7 +71,7 @@ public class Opening * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is returned. * - * @implNote op name='open', type='org.scijava.function.Function.Arity3' + * @implNote op name='morphology.open', type='org.scijava.function.Function.Arity3' * @param source * the {@link Img} to operate on. * @param strels @@ -113,7 +113,7 @@ public static final < T extends RealType< T >> Img< T > open( final Img< T > sou * parameters are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='open', type=Function + * @implNote op name='morphology.open', type=Function * @param source * the {@link Img} to operate on. * @param strels @@ -148,7 +148,7 @@ public static final < T extends Type< T > & Comparable< T > > Img< T > open( fin *

* The opening operation is simply an erosion followed by a dilation. * - * @implNote op name='open', type=Function + * @implNote op name='morphology.open', type=Function * @param source * the {@link Img} to operate on. * @param strel @@ -185,7 +185,7 @@ public static final < T extends RealType< T >> Img< T > open( final Img< T > sou * parameters are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='open', type=Function + * @implNote op name='morphology.open', type=Function * @param source * the {@link Img} to operate on. * @param strel @@ -292,7 +292,7 @@ public static < T extends RealType< T > > void open( final RandomAccessible< T > * last, and the primary input (the input image) comes first. *

* - * @implNote op name='erode', type=Computer + * @implNote op name='morphology.erode', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels @@ -418,7 +418,7 @@ public static < T extends Type< T > & Comparable< T > > void open( final RandomA * last, and the primary input (the input image) comes first. *

* - * @implNote op name='erode', type=Computer + * @implNote op name='morphology.erode', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels @@ -512,7 +512,7 @@ public static < T extends RealType< T > > void open( final RandomAccessible< T > * last, and the primary input (the input image) comes first. *

* - * @implNote op name='open', type=Computer + * @implNote op name='morphology.open', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strel @@ -628,7 +628,7 @@ public static < T extends Type< T > & Comparable< T > > void open( final RandomA * last, and the primary input (the input image) comes first. *

* - * @implNote op name='erode', type=Computer + * @implNote op name='morphology.erode', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strel @@ -673,7 +673,7 @@ public static < T extends Type< T > & Comparable< T > > void open( final RandomA * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is left untouched. * - * @implNote op name='open', type='org.scijava.function.Functions.Arity4_1' + * @implNote op name='morphology.open', type='org.scijava.function.Functions.Arity4_1' * @param source * the source image. * @param interval @@ -726,7 +726,7 @@ public static < T extends RealType< T > > void openInPlace( final RandomAccessib * are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='open', type='org.scijava.function.Functions.Arity6_1' + * @implNote op name='morphology.open', type='org.scijava.function.Functions.Arity6_1' * @param source * the source image. * @param interval @@ -770,7 +770,7 @@ public static < T extends Type< T > & Comparable< T >> void openInPlace( final R * padded to properly cover the target range plus the shape size. See * e.g. {@link Views#extendValue(RandomAccessibleInterval, Type)}. * - * @implNote op name='open', type=Inplace1 + * @implNote op name='morphology.open', type=Inplace1 * @param source * the source image. * @param interval @@ -818,7 +818,7 @@ public static < T extends RealType< T > > void openInPlace( final RandomAccessib * are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op name='open', type=Inplace1 + * @implNote op name='morphology.open', type=Inplace1 * @param source * the source image. * @param interval diff --git a/src/main/java/net/imglib2/algorithm/morphology/StructuringElements.java b/src/main/java/net/imglib2/algorithm/morphology/StructuringElements.java index d6011599f..0c55b5cc9 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/StructuringElements.java +++ b/src/main/java/net/imglib2/algorithm/morphology/StructuringElements.java @@ -88,7 +88,7 @@ public class StructuringElements * This methods relies on heuristics to determine automatically what * decomposition level to use. * - * @implNote op name='disk', type=Function + * @implNote op name='create.disk', type=Function * @param radius * the radius of the disk, so that it extends over * {@code 2 × radius + 1} in all dimensions @@ -146,7 +146,7 @@ else if ( radius < 17 ) * select the level of approximation. For other dimensionalities, no * optimization are available yet and the parameter is ignored. * - * @implNote op name='disk', type=Function + * @implNote op name='create.disk', type=Function * @param radius * the radius of the disk, so that it extends over * {@code 2 × radius + 1} in all dimensions @@ -293,7 +293,7 @@ else if ( decomposition == 8 || decomposition == 4 || decomposition == 6 ) * dimensionality and target dimensionality do not match. Non-decomposed * version are dimension-generic. * - * @implNote op name='square', type=Function + * @implNote op name='create.square', type=Function * @param radius * the radius of the square. * @param dimensionality @@ -343,7 +343,7 @@ public static final List< Shape > square( final int radius, final int dimensiona * This method determines whether it is worth returning a decomposed strel * based on simple heuristics. * - * @implNote op name='square', type=Function + * @implNote op name='create.square', type=Function * @param radius * the radius of the square. * @param dimensionality @@ -374,7 +374,7 @@ public static final List< Shape > square( final int radius, final int dimensiona * of orthogonal lines and yield the exact same results on any of the * morphological operations. * - * @implNote op name='rectangle', type=Function + * @implNote op name='create.rectangle', type=Function * @param halfSpans * an {@code int[]} array containing the half-span of the * symmetric rectangle in each dimension. The total extent of the @@ -428,7 +428,7 @@ public static final List< Shape > rectangle( final int[] halfSpans, final boolea * morphological operations. This method uses a simple heuristic to decide * whether to decompose the rectangle or not. * - * @implNote op name='rectangle', type=Function + * @implNote op name='create.rectangle', type=Function * @param halfSpans * an {@code int[]} array containing the half-span of the * symmetric rectangle in each dimension. The total extent of the @@ -484,7 +484,7 @@ public static final List< Shape > rectangle( final int halfSpans[] ) * fall back on a linear decomposition, still very effective (see [1] as * well). * - * @implNote op name='diamond', type=Function + * @implNote op name='create.diamond', type=Function * @param radius * the desired radius of the diamond structuring element. The * strel will extend over {@code 2 × radius + 1} in all @@ -534,7 +534,7 @@ public static final List< Shape > diamond( final int radius, final int dimension * fall back on a linear decomposition, still very effective (see [1] as * well). * - * @implNote op name='diamond', type=Function + * @implNote op name='create.diamond', type=Function * @param radius * the desired radius of the diamond structuring element. The * strel will extend over {@code 2 × radius + 1} in all @@ -630,7 +630,7 @@ public static final List< Shape > diamond( final int radius, final int dimension * * The importance of periodic lines is explained in [1]. * - * @implNote op name='periodicLine', type=Function + * @implNote op name='create.periodicLine', type=Function * @param span * the span of the neighborhood, so that it will iterate over * {@code 2 × span + 1} pixels. diff --git a/src/main/java/net/imglib2/algorithm/morphology/TopHat.java b/src/main/java/net/imglib2/algorithm/morphology/TopHat.java index a417704de..09c156c8b 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/TopHat.java +++ b/src/main/java/net/imglib2/algorithm/morphology/TopHat.java @@ -307,7 +307,7 @@ public static < T extends RealType< T >> void topHat( final RandomAccessible< T * last, and the primary input (the input image) comes first. *

* - * @implNote op name='topHat, whiteTopHat', type=Computer + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels @@ -426,7 +426,7 @@ public static < T extends Type< T > & Comparable< T > & Sub< T >> void topHat( f * last, and the primary input (the input image) comes first. *

* - * @implNote op name='topHat, whiteTopHat', type=Computer + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels @@ -518,7 +518,7 @@ public static < T extends RealType< T >> void topHat( final RandomAccessible< T * last, and the primary input (the input image) comes first. *

* - * @implNote op name='topHat, whiteTopHat', type=Computer + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strel @@ -625,7 +625,7 @@ public static < T extends Type< T > & Comparable< T > & Sub< T >> void topHat( f * last, and the primary input (the input image) comes first. *

* - * @implNote op name='topHat, whiteTopHat', type=Computer + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strel @@ -672,7 +672,7 @@ public static < T extends Type< T > & Comparable< T > & Sub< T >> void topHat( f * decomposition. Each shape is processed in order as given in the list. If * the list is empty, the source image is left untouched. * - * @implNote op name='topHat, whiteTopHat', type=Inplace1 + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Inplace1 * @param source * the source image. * @param interval @@ -728,7 +728,7 @@ public static < T extends RealType< T >> void topHatInPlace( final RandomAccessi * required to operate on * {@code T extends Comparable & Sub}. * - * @implNote op name='topHat, whiteTopHat', type=Inplace1 + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Inplace1 * @param source * the source image. * @param interval @@ -779,7 +779,7 @@ public static < T extends Type< T > & Comparable< T > & Sub< T >> void topHatInP * padded to properly cover the target range plus the shape size. See * e.g. {@link Views#extendValue(RandomAccessibleInterval, Type)}. * - * @implNote op name='topHat, whiteTopHat', type=Inplace1 + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Inplace1 * @param source * the source image. * @param interval @@ -830,7 +830,7 @@ public static < T extends RealType< T >> void topHatInPlace( final RandomAccessi * required to operate on * {@code T extends Comparable & Sub}. * - * @implNote op name='topHat, whiteTopHat', type=Inplace1 + * @implNote op name='morphology.topHat, morphology.whiteTopHat', type=Inplace1 * @param source * the source image. * @param interval diff --git a/src/main/java/net/imglib2/algorithm/morphology/distance/DistanceTransform.java b/src/main/java/net/imglib2/algorithm/morphology/distance/DistanceTransform.java index e98da90e8..5c6add021 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/distance/DistanceTransform.java +++ b/src/main/java/net/imglib2/algorithm/morphology/distance/DistanceTransform.java @@ -112,7 +112,7 @@ public static enum DISTANCE_TYPE * can be weighted (individually for each dimension, if desired) against the * image values via the weights parameter. * - * @implNote op name='distanceTransform', type=Inplace1 + * @implNote op name='image.distanceTransform', type=Inplace1 * @param source * Input function on which distance transform should be computed. * @param distanceType @@ -141,7 +141,7 @@ public static < T extends RealType< T > > void transform( * can be weighted (individually for each dimension, if desired) against the * image values via the weights parameter. * - * @implNote op name='distanceTransform', type=Inplace1 + * @implNote op name='image.distanceTransform', type=Inplace1 * @param source * Input function on which distance transform should be computed. * @param distanceType @@ -222,7 +222,7 @@ public static < T extends RealType< T >, U extends RealType< U > > void transfor * last, and the primary input (the input image) comes first. *

* - * @implNote op name='distanceTransform', type=Computer + * @implNote op name='image.distanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param distanceType @@ -301,7 +301,7 @@ public static < T extends RealType< T >, U extends RealType< U > > void transfor * weighted (individually for each dimension, if desired) against the image * values via the weights parameter. * - * @implNote op name='distanceTransform', type=Computer + * @implNote op name='image.distanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param distanceType @@ -408,7 +408,7 @@ public static < T extends RealType< T >, U extends RealType< U >, V extends Real * last, and the primary input (the input image) comes first. *

* - * @implNote op name='distanceTransform', type=Computer + * @implNote op name='image.distanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param tmp @@ -569,7 +569,7 @@ public static < T extends RealType< T >, U extends RealType< U >, V extends Real * {@link Distance} d. Intermediate and final results will be stored in * {@code source} ({@link DoubleType} recommended). * - * @implNote op name='distanceTransform', type=Inplace1 + * @implNote op name='image.distanceTransform', type=Inplace1 * @param source * Input function on which distance transform should be computed. * @param d @@ -591,7 +591,7 @@ public static < T extends RealType< T > > void transform( * {@link Distance} d. Intermediate and final results will be stored in * {@code source} ({@link DoubleType} recommended). * - * @implNote op name='distanceTransform', type=Inplace1 + * @implNote op name='image.distanceTransform', type=Inplace1 * @param source * Input function on which distance transform should be computed. * @param d @@ -729,7 +729,7 @@ public static < T extends RealType< T >, U extends RealType< U > > void transfor * last, and the primary input (the input image) comes first. *

* - * @implNote op name='distanceTransform', type=Computer + * @implNote op name='image.distanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param d @@ -836,7 +836,7 @@ public static < T extends RealType< T >, U extends RealType< U >, V extends Real * last, and the primary input (the input image) comes first. *

* - * @implNote op name='distanceTransform', type=Computer + * @implNote op name='image.distanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param tmp @@ -1031,7 +1031,7 @@ public static < B extends BooleanType< B >, U extends RealType< U > > void binar * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param distanceType @@ -1113,7 +1113,7 @@ public static < B extends BooleanType< B >, U extends RealType< U > > void binar * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param distanceType @@ -1207,7 +1207,7 @@ public static < B extends BooleanType< B >, U extends RealType< U >, V extends R * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param tmp @@ -1305,7 +1305,7 @@ public static < B extends BooleanType< B >, U extends RealType< U >, V extends R * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param tmp @@ -1353,7 +1353,7 @@ public static < B extends BooleanType< B >, U extends RealType< U >, V extends R * {@link Distance} d. Intermediate and final results will be stored in * source ({@link DoubleType} recommended). * - * @implNote op name='binaryDistanceTransform', type=Inplace1 + * @implNote op name='image.binaryDistanceTransform', type=Inplace1 * @param source * Input function on which distance transform should be computed. * @param d @@ -1416,7 +1416,7 @@ public static < B extends BooleanType< B >, U extends RealType< U > > void binar * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param d @@ -1484,7 +1484,7 @@ public static < B extends BooleanType< B >, U extends RealType< U > > void binar * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param target @@ -1563,7 +1563,7 @@ public static < B extends BooleanType< B >, U extends RealType< U >, V extends R * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param tmp @@ -1647,7 +1647,7 @@ public static < B extends BooleanType< B >, U extends RealType< U >, V extends R * last, and the primary input (the input image) comes first. *

* - * @implNote op name='binaryDistanceTransform', type=Computer + * @implNote op name='image.binaryDistanceTransform', type=Computer * @param source * Input function on which distance transform should be computed. * @param tmp diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Branchpoints.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Branchpoints.java index 41bfdc72d..0e500b61d 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Branchpoints.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Branchpoints.java @@ -70,7 +70,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='branchpoints', type=Function + * @implNote op name='morphology.branchpoints', type=Function */ public static < T extends BooleanType< T > > Img< T > branchpoints( final Img< T > source ) { @@ -78,7 +78,7 @@ public static < T extends BooleanType< T > > Img< T > branchpoints( final Img< T } /** - * @implNote op name='branchpoints', type=Computer + * @implNote op name='morphology.branchpoints', type=Computer */ public static < T extends BooleanType< T > > void branchpoints( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Bridge.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Bridge.java index 725df4943..ed2aecbed 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Bridge.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Bridge.java @@ -67,7 +67,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='bridge', type='java.util.function.function' + * @implNote op name='morphology.bridge', type='java.util.function.function' */ public static < T extends BooleanType< T > > Img< T > bridge( final Img< T > source ) { @@ -75,7 +75,7 @@ public static < T extends BooleanType< T > > Img< T > bridge( final Img< T > sou } /** - * @implNote op name='bridge', type=Computer + * @implNote op name='morphology.bridge', type=Computer */ public static < T extends BooleanType< T > > void bridge( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Clean.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Clean.java index 33b8851eb..7e7e33e8b 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Clean.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Clean.java @@ -66,7 +66,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='clean', type=Function + * @implNote op name='morphology.clean', type=Function */ public static < T extends BooleanType< T > > Img< T > clean( final Img< T > source ) { @@ -74,7 +74,7 @@ public static < T extends BooleanType< T > > Img< T > clean( final Img< T > sour } /** - * @implNote op name='clean', type=Computer + * @implNote op name='morphology.clean', type=Computer */ public static < T extends BooleanType< T > > void clean( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Endpoints.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Endpoints.java index 4443c9ead..7691d823c 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Endpoints.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Endpoints.java @@ -68,7 +68,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='endpoints', type=Function + * @implNote op name='morphology.endpoints', type=Function */ public static < T extends BooleanType< T > > Img< T > endpoints( final Img< T > source ) { @@ -76,7 +76,7 @@ public static < T extends BooleanType< T > > Img< T > endpoints( final Img< T > } /** - * @implNote op name='endpoints', type=Computer + * @implNote op name='morphology.endpoints', type=Computer */ public static < T extends BooleanType< T > > void endpoints( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Fill.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Fill.java index 0dd229be4..0e6e3f009 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Fill.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Fill.java @@ -66,7 +66,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='fill', type=Function + * @implNote op name='morphology.fill', type=Function */ public static < T extends BooleanType< T > > Img< T > fill( final Img< T > source ) { @@ -74,7 +74,7 @@ public static < T extends BooleanType< T > > Img< T > fill( final Img< T > sourc } /** - * @implNote op name='fill', type=Computer + * @implNote op name='morphology.fill', type=Computer */ public static < T extends BooleanType< T > > void fill( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Hbreak.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Hbreak.java index eb515f30a..2b8588c20 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Hbreak.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Hbreak.java @@ -66,7 +66,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='hbreak', type=Function + * @implNote op name='morphology.hbreak', type=Function */ public static < T extends BooleanType< T > > Img< T > hbreak( final Img< T > source ) { @@ -74,7 +74,7 @@ public static < T extends BooleanType< T > > Img< T > hbreak( final Img< T > sou } /** - * @implNote op name='hbreak', type=Computer + * @implNote op name='morphology.hbreak', type=Computer */ public static < T extends BooleanType< T > > void hbreak( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Life.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Life.java index ed28d3185..729ac0c4e 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Life.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Life.java @@ -66,7 +66,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='life', type=Function + * @implNote op name='morphology.life', type=Function */ public static < T extends BooleanType< T > > Img< T > life( final Img< T > source ) { @@ -74,7 +74,7 @@ public static < T extends BooleanType< T > > Img< T > life( final Img< T > sourc } /** - * @implNote op name='life', type=Computer + * @implNote op name='morphology.life', type=Computer */ public static < T extends BooleanType< T > > void life( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Majority.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Majority.java index 2b7fb5d1d..0d423d899 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Majority.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Majority.java @@ -67,7 +67,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='majority', type=Function + * @implNote op name='morphology.majority', type=Function */ public static < T extends BooleanType< T > > Img< T > majority( final Img< T > source ) { @@ -75,7 +75,7 @@ public static < T extends BooleanType< T > > Img< T > majority( final Img< T > s } /** - * @implNote op name='majority', type=Computer + * @implNote op name='morphology.majority', type=Computer */ public static < T extends BooleanType< T > > void majority( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Remove.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Remove.java index 254fecbd9..9e3eb6163 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Remove.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Remove.java @@ -67,7 +67,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='remove', type=Function + * @implNote op name='morphology.remove', type=Function */ public static < T extends BooleanType< T > > Img< T > remove( final Img< T > source ) { @@ -75,7 +75,7 @@ public static < T extends BooleanType< T > > Img< T > remove( final Img< T > sou } /** - * @implNote op name='remove', type=Computer + * @implNote op name='morphology.remove', type=Computer */ public static < T extends BooleanType< T > > void remove( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur.java index 32bc954c5..5ff8a4df2 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur.java @@ -58,7 +58,7 @@ public class Spur { /** - * @implNote op name='spur', type=Function + * @implNote op name='morphology.spur', type=Function */ public static < T extends BooleanType< T > > Img< T > spur( final Img< T > source ) { @@ -66,7 +66,7 @@ public static < T extends BooleanType< T > > Img< T > spur( final Img< T > sourc } /** - * @implNote op name='spur', type=Computer + * @implNote op name='morphology.spur', type=Computer */ public static < T extends BooleanType< T > > void spur( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur1.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur1.java index 98ed3eebf..697ed6d78 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur1.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur1.java @@ -58,7 +58,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='spur1', type=Function + * @implNote op name='morphology.spur1', type=Function */ public static < T extends BooleanType< T > > Img< T > spur1( final Img< T > source ) { @@ -66,7 +66,7 @@ public static < T extends BooleanType< T > > Img< T > spur1( final Img< T > sour } /** - * @implNote op name='spur1', type=Computer + * @implNote op name='morphology.spur1', type=Computer */ public static < T extends BooleanType< T > > void spur1( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur2.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur2.java index 3189f18b7..f8d72e156 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur2.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Spur2.java @@ -58,7 +58,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='spur2', type=Function + * @implNote op name='morphology.spur2', type=Function */ public static < T extends BooleanType< T > > Img< T > spur2( final Img< T > source ) { @@ -66,7 +66,7 @@ public static < T extends BooleanType< T > > Img< T > spur2( final Img< T > sour } /** - * @implNote op name='spur2', type=Computer + * @implNote op name='morphology.spur2', type=Computer */ public static < T extends BooleanType< T > > void spur2( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thicken.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thicken.java index 6870f32d8..3d27926da 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thicken.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thicken.java @@ -73,7 +73,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='thicken', type=Function + * @implNote op name='morphology.thicken', type=Function */ public static < T extends BooleanType< T > > Img< T > thicken( final Img< T > source ) { @@ -81,7 +81,7 @@ public static < T extends BooleanType< T > > Img< T > thicken( final Img< T > so } /** - * @implNote op name='thicken', type=Computer + * @implNote op name='morphology.thicken', type=Computer */ public static < T extends BooleanType< T > > void thicken( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin.java index 424d473e0..d3cef3025 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin.java @@ -72,7 +72,7 @@ public class Thin { /** - * @implNote op name='thin', type=Function + * @implNote op name='morphology.thin', type=Function */ public static < T extends BooleanType< T > > Img< T > thin( final Img< T > source ) { @@ -80,7 +80,7 @@ public static < T extends BooleanType< T > > Img< T > thin( final Img< T > sourc } /** - * @implNote op name='thin', type=Computer + * @implNote op name='morphology.thin', type=Computer */ public static < T extends BooleanType< T > > void thin( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin1.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin1.java index 5aff55f2f..7cb01f6fe 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin1.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin1.java @@ -58,7 +58,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='thin1', type=Function + * @implNote op name='morphology.thin1', type=Function */ public static < T extends BooleanType< T > > Img< T > thin1( final Img< T > source ) { @@ -66,7 +66,7 @@ public static < T extends BooleanType< T > > Img< T > thin1( final Img< T > sour } /** - * @implNote op name='thin1', type=Computer + * @implNote op name='morphology.thin1', type=Computer */ public static < T extends BooleanType< T > > void thin1( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin2.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin2.java index 76a0d27b4..0adc469f5 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin2.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Thin2.java @@ -58,7 +58,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='thin2', type=Function + * @implNote op name='morphology.thin2', type=Function */ public static < T extends BooleanType< T > > Img< T > thin2( final Img< T > source ) { @@ -66,7 +66,7 @@ public static < T extends BooleanType< T > > Img< T > thin2( final Img< T > sour } /** - * @implNote op name='thin2', type=Computer + * @implNote op name='morphology.thin2', type=Computer */ public static < T extends BooleanType< T > > void thin2( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/morphology/table2d/Vbreak.java b/src/main/java/net/imglib2/algorithm/morphology/table2d/Vbreak.java index d7cc78a01..09e2f4b60 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Vbreak.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Vbreak.java @@ -66,7 +66,7 @@ protected boolean getExtendedValue() } /** - * @implNote op name='vbreak', type=Function + * @implNote op name='morphology.vbreak', type=Function */ public static < T extends BooleanType< T > > Img< T > vbreak( final Img< T > source ) { @@ -74,7 +74,7 @@ public static < T extends BooleanType< T > > Img< T > vbreak( final Img< T > sou } /** - * @implNote op name='vbreak', type=Computer + * @implNote op name='morphology.vbreak', type=Computer */ public static < T extends BooleanType< T > > void vbreak( final RandomAccessible< T > source, final IterableInterval< T > target ) { diff --git a/src/main/java/net/imglib2/algorithm/stats/Max.java b/src/main/java/net/imglib2/algorithm/stats/Max.java index aac24218c..c6679f483 100644 --- a/src/main/java/net/imglib2/algorithm/stats/Max.java +++ b/src/main/java/net/imglib2/algorithm/stats/Max.java @@ -47,7 +47,7 @@ public class Max /** * Find the maximum value and its position in an {@link IterableInterval}. * - * @implNote op name='findMax', type=Function + * @implNote op name='stats.max', type=Function * @param iterable * input interval. * @return a cursor positioned on the global maximum. If several maxima with diff --git a/src/main/java/net/imglib2/algorithm/stats/Min.java b/src/main/java/net/imglib2/algorithm/stats/Min.java index 489fc4cf4..3c04242b5 100644 --- a/src/main/java/net/imglib2/algorithm/stats/Min.java +++ b/src/main/java/net/imglib2/algorithm/stats/Min.java @@ -47,7 +47,7 @@ public class Min /** * Find the minimum value and its position in an {@link IterableInterval}. * - * @implNote op name='findMin', type=Function + * @implNote op name='stats.min', type=Function * @param iterable * input interval. * @return a cursor positioned on the global minimum. If several minima with diff --git a/src/main/java/net/imglib2/algorithm/stats/Normalize.java b/src/main/java/net/imglib2/algorithm/stats/Normalize.java index 1f7248e92..a64a8b07c 100644 --- a/src/main/java/net/imglib2/algorithm/stats/Normalize.java +++ b/src/main/java/net/imglib2/algorithm/stats/Normalize.java @@ -43,7 +43,7 @@ public class Normalize /** * Normalize values of an {@link IterableInterval} to the range [min, max]. * - * @implNote op name='normalize', type=Inplace1 + * @implNote op name='stats.normalize', type=Inplace1 * @param iterable * the interval to be normalized. * @param min diff --git a/src/main/java/net/imglib2/algorithm/tree/TreeUtils.java b/src/main/java/net/imglib2/algorithm/tree/TreeUtils.java index cbe2d091e..f2b526628 100644 --- a/src/main/java/net/imglib2/algorithm/tree/TreeUtils.java +++ b/src/main/java/net/imglib2/algorithm/tree/TreeUtils.java @@ -42,7 +42,7 @@ public class TreeUtils /** * Find all leaf nodes of a forest. * - * @implNote op name='getLeafs', type=Function + * @implNote op name='tree.getLeafs', type=Function * @param forest * the forest * @return set of leaf nodes. @@ -71,7 +71,7 @@ public static interface Consumer< T > /** * Call {@link Consumer#accept(Object)} on op for every node in the forest. * - * @implNote op name='forEach', type=Inplace1 + * @implNote op name='tree.forEach', type=Inplace1 * @param forest * the forest * @param op diff --git a/src/main/java/net/imglib2/algorithm/util/Grids.java b/src/main/java/net/imglib2/algorithm/util/Grids.java index 963be5405..64530c8c4 100644 --- a/src/main/java/net/imglib2/algorithm/util/Grids.java +++ b/src/main/java/net/imglib2/algorithm/util/Grids.java @@ -213,7 +213,7 @@ public static void forEachOffset( * Get all blocks of size {@code blockSize} contained within an interval * specified by {@code dimensions} and their positions within a cell grid. * - * @implNote op name='collectAllContainedIntervalsWithGridPositions', type=Function + * @implNote op name='grid.partition', type=Function * @param dimensions * @param blockSize * @return list of blocks as specified by {@link Interval} and the position @@ -230,7 +230,7 @@ public static List< Pair< Interval, long[] > > collectAllContainedIntervalsWithG * specified by {@code min}, {@code max} and their positions within a cell * grid. * - * @implNote op name='collectAllContainedIntervalsWithGridPositions', type=Function + * @implNote op name='grid.partition', type=Function * @param min * @param max * @param blockSize @@ -247,7 +247,7 @@ public static List< Pair< Interval, long[] > > collectAllContainedIntervalsWithG * Get all blocks of size {@code blockSize} contained within an interval * specified by {@code dimensions} and their positions within a cell grid. * - * @implNote op name='collectAllContainedIntervals', type=Function + * @implNote op name='grid.partition', type=Function * @param dimensions * @param blockSize * @return list of blocks as specified by {@link Interval} @@ -263,7 +263,7 @@ public static List< Interval > collectAllContainedIntervals( final long[] dimens * specified by {@code min}, {@code max} and their positions within a cell * grid. * - * @implNote op name='collectAllContainedIntervals', type=Function + * @implNote op name='grid.partition', type=Function * @param min * @param max * @param blockSize @@ -279,7 +279,7 @@ public static List< Interval > collectAllContainedIntervals( final long[] min, f * Get all blocks of size {@code blockSize} contained within an interval * specified by {@code dimensions}. * - * @implNote op name='collectAllOffsets', type=Function + * @implNote op name='grid.partition', type=Function * @param dimensions * @param blockSize * @return list of blocks defined by minimum @@ -294,7 +294,7 @@ public static List< long[] > collectAllOffsets( final long[] dimensions, final i * Get all blocks of size {@code blockSize} contained within an interval * specified by {@code dimensions}. * - * @implNote op name='collectAllOffsets', type=Function + * @implNote op name='grid.partition', type=Function * @param dimensions * @param blockSize * @param func @@ -312,7 +312,7 @@ public static < T > List< T > collectAllOffsets( final long[] dimensions, final * Get all blocks of size {@code blockSize} contained within an interval * specified by {@code min} and {@code max}. * - * @implNote op name='collectAllOffsets', type=Function + * @implNote op name='grid.partition', type=Function * @param min * @param max * @param blockSize @@ -328,7 +328,7 @@ public static List< long[] > collectAllOffsets( final long[] min, final long[] m * Get all blocks of size {@code blockSize} contained within an interval * specified by {@code min} and {@code max}. * - * @implNote op name='collectAllOffsets', type=Function + * @implNote op name='grid.partition', type=Function * @param min * @param max * @param blockSize @@ -474,7 +474,7 @@ public static Function< long[], Pair< Interval, long[] > > croppedIntervalAndGri * into a {@link Pair} of {@link Interval} and {@link long[]} that specify * the block and its position in grid coordinates. * - * @implNote op name='croppedIntervalAndGridPosition', type=Function + * @implNote op name='grid.partition', type=Function * @param min * minimum of the grid * @param max diff --git a/src/main/java/net/imglib2/algorithm/util/ParallelizeOverBlocks.java b/src/main/java/net/imglib2/algorithm/util/ParallelizeOverBlocks.java index eb73c80ef..56aa3a6bc 100644 --- a/src/main/java/net/imglib2/algorithm/util/ParallelizeOverBlocks.java +++ b/src/main/java/net/imglib2/algorithm/util/ParallelizeOverBlocks.java @@ -61,7 +61,7 @@ public class ParallelizeOverBlocks * * Submit blocked tasks and wait for execution. * - * @implNote op name='parallelizeAndWait', type=Function + * @implNote op name='grid.parallelize', type=Function * @param func * {@link Function} to be applied to each block as specified by * first parameter {@link Interval}. @@ -89,7 +89,7 @@ public static < T > List< T > parallelizeAndWait( * * Submit blocked tasks and wait for execution. * - * @implNote op name='parallelize', type=Function + * @implNote op name='grid.parallelizeAsync', type=Function * @param func * {@link Function} to be applied to each block as specified by * first parameter {@link Interval}. @@ -114,7 +114,7 @@ public static < T > List< Future< List< T > > > parallelize( * * Submit blocked tasks and wait for execution. * - * @implNote op name='parallelizeAndWait', type=Function + * @implNote op name='grid.parallelize', type=Function * @param func * {@link Function} to be applied to each block as specified by * first parameter {@link Interval}. @@ -148,7 +148,7 @@ public static < T > List< T > parallelizeAndWait( * * Submit blocked tasks and wait for execution. * - * @implNote op name='parallelize', type=Function + * @implNote op name='grid.parallelizeAsync', type=Function * @param func * {@link Function} to be applied to each block as specified by * first parameter {@link Interval}. @@ -181,7 +181,7 @@ public static < T > List< Future< List< T > > > parallelize( * * Submit blocked tasks and wait for execution. * - * @implNote op name='parallelizeAndWait', type=Function + * @implNote op name='grid.parallelize', type=Function * @param func * {@link Function} to be applied to each block as specified by * first parameter {@link Interval}. @@ -211,7 +211,7 @@ public static < T > List< T > parallelizeAndWait( * * Submit blocked tasks and wait for execution. * - * @implNote op name='parallelize', type=Function + * @implNote op name='grid.parallelizeAsync', type=Function * @param func * {@link Function} to be applied to each block as specified by * first parameter {@link Interval}.