From d09eb8b7a14d2aa3d0842f2b3c8d403d25cc9e12 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Wed, 20 Dec 2023 14:56:06 -0600 Subject: [PATCH] WIP: Update to scijava-ops-indexer --- pom.xml | 25 +-- .../imglib2/algorithm/binary/Thresholder.java | 2 +- .../componenttree/BuildComponentTree.java | 4 +- .../componenttree/mser/MserTree.java | 10 +- .../pixellist/PixelListComponentTree.java | 8 +- .../convolution/fast_gauss/FastGauss.java | 8 +- .../convolution/kernel/Kernel1D.java | 14 +- .../kernel/SeparableKernelConvolution.java | 11 +- .../edge/SubpixelEdgelDetection.java | 2 +- .../net/imglib2/algorithm/fill/FloodFill.java | 6 +- .../net/imglib2/algorithm/gauss3/Gauss3.java | 4 +- .../algorithm/gradient/PartialDerivative.java | 10 +- .../algorithm/hough/HoughTransforms.java | 14 +- .../algorithm/kdtree/ConvexPolytope.java | 2 +- .../imglib2/algorithm/kdtree/HyperPlane.java | 2 +- .../labeling/ConnectedComponentAnalysis.java | 6 +- .../labeling/ConnectedComponents.java | 4 +- .../java/net/imglib2/algorithm/lazy/Lazy.java | 6 +- .../algorithm/localextrema/LocalExtrema.java | 22 +-- .../net/imglib2/algorithm/math/ImgMath.java | 142 +++++++++--------- .../algorithm/morphology/BlackTopHat.java | 2 +- .../imglib2/algorithm/morphology/Closing.java | 22 +-- .../algorithm/morphology/Dilation.java | 32 ++-- .../imglib2/algorithm/morphology/Erosion.java | 24 +-- .../imglib2/algorithm/morphology/Opening.java | 18 +-- .../morphology/StructuringElements.java | 19 +-- .../imglib2/algorithm/morphology/TopHat.java | 24 +-- .../distance/DistanceTransform.java | 36 ++--- .../morphology/table2d/Branchpoints.java | 4 +- .../algorithm/morphology/table2d/Bridge.java | 2 +- .../algorithm/morphology/table2d/Clean.java | 4 +- .../morphology/table2d/Endpoints.java | 4 +- .../algorithm/morphology/table2d/Fill.java | 4 +- .../algorithm/morphology/table2d/Hbreak.java | 4 +- .../algorithm/morphology/table2d/Life.java | 4 +- .../morphology/table2d/Majority.java | 4 +- .../algorithm/morphology/table2d/Remove.java | 4 +- .../algorithm/morphology/table2d/Spur.java | 4 +- .../algorithm/morphology/table2d/Spur1.java | 4 +- .../algorithm/morphology/table2d/Spur2.java | 4 +- .../algorithm/morphology/table2d/Thicken.java | 4 +- .../algorithm/morphology/table2d/Thin.java | 4 +- .../algorithm/morphology/table2d/Thin1.java | 4 +- .../algorithm/morphology/table2d/Thin2.java | 4 +- .../algorithm/morphology/table2d/Vbreak.java | 4 +- .../java/net/imglib2/algorithm/stats/Max.java | 4 +- .../java/net/imglib2/algorithm/stats/Min.java | 2 +- .../imglib2/algorithm/stats/Normalize.java | 2 +- .../net/imglib2/algorithm/tree/TreeUtils.java | 4 +- .../net/imglib2/algorithm/util/Grids.java | 18 +-- .../algorithm/util/ParallelizeOverBlocks.java | 12 +- 51 files changed, 298 insertions(+), 289 deletions(-) diff --git a/pom.xml b/pom.xml index 5604c7804..b2fd77bd3 100644 --- a/pom.xml +++ b/pom.xml @@ -201,7 +201,7 @@ Jean-Yves Tinevez and Michael Zinsmaier. sign,deploy-to-scijava 6.2.0 - + true @@ -280,29 +280,30 @@ Jean-Yves Tinevez and Michael Zinsmaier. - - maven-javadoc-plugin - - --allow-script-in-comments -header '<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>' - - - maven-compiler-plugin - com.github.therapi - therapi-runtime-javadoc-scribe - 0.12.0 + org.scijava + scijava-ops-indexer + 0-SNAPSHOT true + true - -Ajavadoc.packages=${therapi.packages} + -Aparse.ops="${scijava.parse.ops}" + -Aop.version="${project.version}" + + maven-javadoc-plugin + + --allow-script-in-comments -header '<script type="text/javascript" src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML"></script>' + + diff --git a/src/main/java/net/imglib2/algorithm/binary/Thresholder.java b/src/main/java/net/imglib2/algorithm/binary/Thresholder.java index 3c0cfc0ab..5a7f2e68f 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='org.scijava.function.Functions.Arity4' + * @implNote op name='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 5699dc4e4..d0ce65ca8 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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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 a77de50f9..4ea7aed18 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='org.scijava.function.Functions.Arity7' + * @implNote op name='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='org.scijava.function.Functions.Arity7' + * @implNote op name='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='org.scijava.function.Functions.Arity8' + * @implNote op name='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='org.scijava.function.Functions.Arity8' + * @implNote op name='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='org.scijava.function.Functions.Arity9' + * @implNote op name='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 e80bd613e..00fbfc81d 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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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 ca084e0c7..3986e7eaf 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='java.util.function.Function' + * @implNote op name='convolveFastGauss',type=Function */ public static Convolution< RealType< ? > > convolution( final double sigma ) { @@ -87,7 +87,7 @@ public class FastGauss } /** - * @implNote op name='convolveFastGauss',type='java.util.function.BiFunction' + * @implNote op name='convolveFastGauss',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='org.scijava.function.Computers.Arity2' + * @implNote op name='convolveFastGauss',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='org.scijava.function.Computers.Arity2' + * @implNote op name='convolveFastGauss',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/convolution/kernel/Kernel1D.java b/src/main/java/net/imglib2/algorithm/convolution/kernel/Kernel1D.java index 4783063a3..37e54bae7 100644 --- a/src/main/java/net/imglib2/algorithm/convolution/kernel/Kernel1D.java +++ b/src/main/java/net/imglib2/algorithm/convolution/kernel/Kernel1D.java @@ -53,10 +53,11 @@ public class Kernel1D /** * Creates a one-dimensional symmetric convolution kernel. * - * @implNote op name='create.kernel1DSymmetric',type='java.util.function.Function' + * @implNote op name='create.kernel1DSymmetric',type=Function * @param halfKernel * the upper half (starting at the center pixel) of the symmetric * convolution kernel. + * @return a {@link Kernel1D} used for one dimensional convolutions */ public static Kernel1D symmetric( final double... halfKernel ) { @@ -69,7 +70,7 @@ public static Kernel1D symmetric( final double... halfKernel ) /** * Similar to {@link #symmetric(double[])} but creates an array of * one-dimensional convolution kernels. - * @implNote op name='create.kernel1DSymmetric',type='java.util.function.Function' + * @implNote op name='create.kernel1DSymmetric',type=Function */ public static Kernel1D[] symmetric( final double[][] halfKernels ) { @@ -79,12 +80,13 @@ public static Kernel1D[] symmetric( final double[][] halfKernels ) /** * Creates a one-dimensional asymmetric convolution kernel. * - * @implNote op name='create.kernel1DAsymmetric',type='java.util.function.BiFunction' + * @implNote op name='create.kernel1DAsymmetric',type=Function * @param fullKernel * an array containing the values of the kernel * @param originIndex * the index of the array element which is the origin of the * kernel + * @return an asymmetric {@link Kernel1D} used for one dimensional convolutions */ public static Kernel1D asymmetric( final double[] fullKernel, final int originIndex ) { @@ -97,7 +99,7 @@ public static Kernel1D asymmetric( final double[] fullKernel, final int originIn /** * Creates a one-dimensional asymmetric convolution kernel, where the origin * of the kernel is in the middle. - * @implNote op name='create.kernel1DCentralAsymmetric',type='java.util.function.Function' + * @implNote op name='create.kernel1DCentralAsymmetric',type=Function */ public static Kernel1D centralAsymmetric( final double... kernel ) { @@ -107,7 +109,7 @@ public static Kernel1D centralAsymmetric( final double... kernel ) /** * Similar to {@link #asymmetric(double[], int)} but creates an array of * one-dimensional convolution kernels. - * @implNote op name='create.kernel1DAsymmetric',type='java.util.function.BiFunction' + * @implNote op name='create.kernel1DAsymmetric',type=Function */ public static Kernel1D[] asymmetric( final double[][] fullKernels, final int[] originIndices ) { @@ -118,7 +120,7 @@ public static Kernel1D[] asymmetric( final double[][] fullKernels, final int[] o /** * Similar to {@link #centralAsymmetric(double...)} but creates an array of * one-dimensional convolution kernels. - * @implNote op name='create.kernel1DCentralAsymmetric',type='java.util.function.Function' + * @implNote op name='create.kernel1DCentralAsymmetric',type=Function */ public static Kernel1D[] centralAsymmetric( final double[][] kernels ) { diff --git a/src/main/java/net/imglib2/algorithm/convolution/kernel/SeparableKernelConvolution.java b/src/main/java/net/imglib2/algorithm/convolution/kernel/SeparableKernelConvolution.java index 0ee944919..89764d6ef 100644 --- a/src/main/java/net/imglib2/algorithm/convolution/kernel/SeparableKernelConvolution.java +++ b/src/main/java/net/imglib2/algorithm/convolution/kernel/SeparableKernelConvolution.java @@ -68,7 +68,9 @@ public class SeparableKernelConvolution * } * * - * @implNote op name='filter.convolveSeparable',type='java.util.function.Function' + * @param kernels the kernel(s) to use in the convolution + * @return a {@link Convolution} object that can convolve an image + * @implNote op name='filter.convolveSeparable',type=Function * @see Convolution */ public static Convolution< NumericType< ? > > convolution( final Kernel1D... kernels ) @@ -90,7 +92,10 @@ public class SeparableKernelConvolution * } * * - * @implNote op name='filter.convolveSeparable',type='java.util.function.BiFunction' + * @param kernel the kernel to use in the convolution + * @param direction the direction to use in the convolution + * @return a {@link Convolution} object that can convolve an image + * @implNote op name='filter.convolveSeparable',type=Function * @see Convolution */ public static Convolution< NumericType< ? > > convolution1d( final Kernel1D kernel, final int direction ) @@ -108,7 +113,7 @@ public class SeparableKernelConvolution * in their own precision. The source type S and target type T are either * both {@link RealType RealTypes} or both the same type. * - * @implNote op name='filter.convolveSeparable',type='org.scijava.function.Computers.Arity2' + * @implNote op name='filter.convolveSeparable',type=Computer * @param kernels * an array containing kernels for every dimension. * @param source diff --git a/src/main/java/net/imglib2/algorithm/edge/SubpixelEdgelDetection.java b/src/main/java/net/imglib2/algorithm/edge/SubpixelEdgelDetection.java index 45d7a56a8..7362b4c8a 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='org.scijava.function.Functions.Arity3' + * @implNote op name='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 f83747623..b738bada5 100644 --- a/src/main/java/net/imglib2/algorithm/fill/FloodFill.java +++ b/src/main/java/net/imglib2/algorithm/fill/FloodFill.java @@ -120,7 +120,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='org.scijava.function.Computers.Arity4' + * @implNote op name='floodFill', type=Computer * @param source * input * @param seed @@ -212,7 +212,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='org.scijava.function.Computers.Arity5' + * @implNote op name='floodFill', type=Computer * @param source * input * @param seed @@ -347,7 +347,7 @@ public static < T, U > void fill( * last, and the primary input (the input image) comes first. *

* - * @implNote op name='floodFill', type='org.scijava.function.Computers.Arity5' + * @implNote op name='floodFill', 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 34f8e329d..970beb4bd 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='org.scijava.function.Computers.Arity2' + * @implNote op name='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='org.scijava.function.Computers.Arity2' + * @implNote op name='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 ba463eed6..01fc7cec4 100644 --- a/src/main/java/net/imglib2/algorithm/gradient/PartialDerivative.java +++ b/src/main/java/net/imglib2/algorithm/gradient/PartialDerivative.java @@ -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='org.scijava.function.Computers.Arity2' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Computers.Arity2' + * @implNote op name='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='org.scijava.function.Computers.Arity2' + * @implNote op name='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='org.scijava.function.Computers.Arity2' + * @implNote op name='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 86a3d2262..fd3a5ffed 100644 --- a/src/main/java/net/imglib2/algorithm/hough/HoughTransforms.java +++ b/src/main/java/net/imglib2/algorithm/hough/HoughTransforms.java @@ -198,7 +198,7 @@ public static < T extends Comparable< T > > List< Point > pickLinePeaks( * parameter with the results. * * @implNote op names='voteLines', - * type='org.scijava.function.Computers.Arity1' + * type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -244,7 +244,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='org.scijava.function.Computers.Arity2' + * @implNote op name='voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -296,7 +296,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='org.scijava.function.Computers.Arity3' + * @implNote op names='voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -357,7 +357,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='org.scijava.function.Computers.Arity4' + * @implNote op name='voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -541,7 +541,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='org.scijava.function.Computers.Arity4' + * @implNote op name='voteLines', type=Computer * @param input * - the {@link RandomAccessibleInterval} to run the Hough Line * Transform over @@ -574,7 +574,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='java.util.function.BiFunction' + * @implNote op name='getIntercept', type=Function * @param rho * - the {@code rho} of the line * @param theta @@ -593,7 +593,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='java.util.function.Function' + * @implNote op name='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 bc51e7324..758ddf639 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='java.util.function.BiFunction' + * @implNote op name='transform', 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 d67a546cc..a3aa015d1 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='java.util.function.BiFunction' + * @implNote op name='transform', 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 57b9af162..40e52f426 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='org.scijava.function.Computers.Arity1' + * @implNote op name='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='org.scijava.function.Computers.Arity2' + * @implNote op name='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='org.scijava.function.Computers.Arity5' + * @implNote op name='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 eade32777..52a8bf1e1 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='org.scijava.function.Computers.Arity3' + * @implNote op name='labelAllConnectedComponents', 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='org.scijava.function.Computers.Arity4' + * @implNote op name='labelAllConnectedComponents', 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 b28534752..dfbc9a094 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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity5' + * @implNote op name='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='org.scijava.function.Functions.Arity5' + * @implNote op name='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 4e221a50b..2de64a7b9 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='org.scijava.function.Functions.Arity5' + * @implNote op name='findLocalExtrema', 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='org.scijava.function.Functions.Arity6' + * @implNote op name='findLocalExtrema', 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='org.scijava.function.Functions.Arity6' + * @implNote op name='findLocalExtrema', 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='org.scijava.function.Functions.Arity7' + * @implNote op name='findLocalExtrema', 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='org.scijava.function.Functions.Arity2' + * @implNote op name='findLocalExtrema', 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='org.scijava.function.Functions.Arity3' + * @implNote op name='findLocalExtrema', 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='org.scijava.function.Functions.Arity3' + * @implNote op name='findLocalExtrema', 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='org.scijava.function.Functions.Arity4' + * @implNote op name='findLocalExtrema', 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='java.util.function.BiFunction' + * @implNote op name='getRequiredBorderSize', 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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='getBiggestDimension', 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 5ea877975..6599de4ab 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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='viewFloats', type=Function * @param operation * @return */ @@ -200,7 +200,7 @@ static public final RandomAccessibleInterval< FloatType > viewFloats( final View } /** - * @implNote op name='add', type='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity5' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity5' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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 8c66f6355..8532cd1a6 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/BlackTopHat.java +++ b/src/main/java/net/imglib2/algorithm/morphology/BlackTopHat.java @@ -303,7 +303,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='org.scijava.function.Computers.Arity3' + * @implNote op name='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 6aebb9192..3bb3aaed3 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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity5' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity5' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity5' + * @implNote op name='close', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strels @@ -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='org.scijava.function.Computers.Arity5' + * @implNote op name='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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity6_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity6_1' + * @implNote op name='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 1d45c44e3..33bfc029b 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/Dilation.java +++ b/src/main/java/net/imglib2/algorithm/morphology/Dilation.java @@ -76,7 +76,7 @@ public class Dilation * pixels, contrary to grayscale structuring elements. This allows to simply * use a {@link Shape} as a type for these structuring elements. * - * @implNote op names='dilate', type='org.scijava.function.Functions.Arity3' + * @implNote op names='dilate', type=Function * @param source * the source image. * @param strels @@ -122,7 +122,7 @@ public static < T extends RealType< T > > Img< T > dilate( final Img< T > source * image. This normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op names='dilate', type='org.scijava.function.Functions.Arity4' + * @implNote op names='dilate', type=Function * @param source * the source image. * @param strels @@ -162,7 +162,7 @@ public static < T extends Type< T > & Comparable< T > > Img< T > dilate( final I * pixels, contrary to grayscale structuring elements. This allows to simply * use a {@link Shape} as a type for these structuring elements. * - * @implNote op names='dilate', type='org.scijava.function.Functions.Arity3' + * @implNote op names='dilate', type=Function * @param source * the source image. * @param strel @@ -203,7 +203,7 @@ public static < T extends RealType< T >> Img< T > dilate( final Img< T > source, * image. This normally unseen parameter is required to operate on * {@code T extends Comparable & Type}. * - * @implNote op names='dilate', type='org.scijava.function.Functions.Arity4' + * @implNote op names='dilate', type=Function * @param source * the source image. * @param strel @@ -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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity5_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity5_1' + * @implNote op name='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 39f86e796..bbd2029b1 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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity4' + * @implNote op name='erode', type=Function * @param source * the source image. * @param strel diff --git a/src/main/java/net/imglib2/algorithm/morphology/Opening.java b/src/main/java/net/imglib2/algorithm/morphology/Opening.java index f57f8a000..43ee9f880 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/Opening.java +++ b/src/main/java/net/imglib2/algorithm/morphology/Opening.java @@ -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='org.scijava.function.Functions.Arity5' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity5' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity5' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity5' + * @implNote op name='erode', type=Computer * @param source * the {@link RandomAccessible} to operate on. * @param strel @@ -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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity6_1' + * @implNote op name='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 e7ae398e8..d6011599f 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='java.util.function.BiFunction' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='java.util.function.Function' + * @implNote op name='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='java.util.function.BiFunction' + * @implNote op name='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='org.scijava.function.Functions.Arity3' + * @implNote op name='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,13 +630,14 @@ 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='java.util.function.BiFunction' + * @implNote op name='periodicLine', type=Function * @param span * the span of the neighborhood, so that it will iterate over * {@code 2 × span + 1} pixels. * @param increments * the values by which each element of the position vector is to * be incremented when iterating. + * @return a {@link Shape} structuring element. * @see [1] * Jones and Soilles.Periodic lines: Definition, cascades, and diff --git a/src/main/java/net/imglib2/algorithm/morphology/TopHat.java b/src/main/java/net/imglib2/algorithm/morphology/TopHat.java index f4ee28286..a417704de 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/TopHat.java +++ b/src/main/java/net/imglib2/algorithm/morphology/TopHat.java @@ -79,7 +79,7 @@ public class TopHat * the list is empty, the source image is returned. *

* - * @implNote op names='topHat, whiteTopHat', type='org.scijava.function.Functions.Arity3' + * @implNote op names='topHat, whiteTopHat', type=Function * @param source * the source image. * @param strels @@ -124,7 +124,7 @@ public static < T extends RealType< T >> Img< T > topHat( final Img< T > source, * parameters are required to operate on * {@code T extends Comparable & Type}. * - * @implNote op names='topHat, whiteTopHat', type='org.scijava.function.Functions.Arity5' + * @implNote op names='topHat, whiteTopHat', type=Function * @param source * the source image. * @param strels @@ -164,7 +164,7 @@ public static < T extends Type< T > & Comparable< T > & Sub< T > > Img< T > topH * pixels, contrary to grayscale structuring elements. This allows to simply * use a {@link Shape} as a type for these structuring elements. * - * @implNote op names='topHat, whiteTopHat', type='org.scijava.function.Functions.Arity3' + * @implNote op names='topHat, whiteTopHat', type=Function * @param source * the source image. * @param strel @@ -203,7 +203,7 @@ public static < T extends RealType< T >> Img< T > topHat( final Img< T > source, * parameters are required to operate on * {@code T extends Comparable & Sub}. * - * @implNote op names='topHat, whiteTopHat', type='org.scijava.function.Functions.Arity5' + * @implNote op names='topHat, whiteTopHat', type=Function * @param source * the source image. * @param strel @@ -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='org.scijava.function.Computers.Arity3' + * @implNote op name='topHat, 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='org.scijava.function.Computers.Arity5' + * @implNote op name='topHat, 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='org.scijava.function.Computers.Arity3' + * @implNote op name='topHat, 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='org.scijava.function.Computers.Arity5' + * @implNote op name='topHat, 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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='topHat, 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='org.scijava.function.Inplaces.Arity6_1' + * @implNote op name='topHat, 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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='topHat, 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='org.scijava.function.Inplaces.Arity6_1' + * @implNote op name='topHat, 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 8fa2809ef..e98da90e8 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='org.scijava.function.Inplaces.Arity3_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity5_1' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity5' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Inplaces.Arity2_1' + * @implNote op name='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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity3' + * @implNote op name='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='org.scijava.function.Computers.Arity5' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Computers.Arity6' + * @implNote op name='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='org.scijava.function.Inplaces.Arity4_1' + * @implNote op name='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='org.scijava.function.Computers.Arity2' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Computers.Arity4' + * @implNote op name='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='org.scijava.function.Computers.Arity5' + * @implNote op name='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 9a278c4b0..41bfdc72d 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 28156c10d..725df4943 100644 --- a/src/main/java/net/imglib2/algorithm/morphology/table2d/Bridge.java +++ b/src/main/java/net/imglib2/algorithm/morphology/table2d/Bridge.java @@ -75,7 +75,7 @@ public static < T extends BooleanType< T > > Img< T > bridge( final Img< T > sou } /** - * @implNote op name='bridge', type='org.scijava.function.Computers.Arity1' + * @implNote op name='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 56558278c..33b8851eb 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 fe3ea3ec2..4443c9ead 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 2bd914676..0dd229be4 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 73c80ed1a..eb515f30a 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 32149cdc4..ed28d3185 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 3d6916216..2b7fb5d1d 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 2f27a7506..254fecbd9 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 140f3ac30..32bc954c5 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 04152a94d..98ed3eebf 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 9a66f4f1b..3189f18b7 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 d8cc91748..6870f32d8 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 d89d9c5e3..424d473e0 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 500970b80..5aff55f2f 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 a6aafea0d..76a0d27b4 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 59f6fa3c3..d7cc78a01 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Computers.Arity1' + * @implNote op name='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 439465cfd..aac24218c 100644 --- a/src/main/java/net/imglib2/algorithm/stats/Max.java +++ b/src/main/java/net/imglib2/algorithm/stats/Max.java @@ -47,12 +47,12 @@ public class Max /** * Find the maximum value and its position in an {@link IterableInterval}. * - * @implNote op name='findMax', type='java.util.function.Function' + * @implNote op name='findMax', type=Function * @param iterable * input interval. * @return a cursor positioned on the global maximum. If several maxima with * the same value exist, the cursor is on the first one. - * @implNote op name='stats.max', type='java.util.function.Function' + * @implNote op name='stats.max', type=Function */ public static < T extends Comparable< T > > Cursor< T > findMax( final IterableInterval< T > iterable ) { diff --git a/src/main/java/net/imglib2/algorithm/stats/Min.java b/src/main/java/net/imglib2/algorithm/stats/Min.java index f0e6e3c12..489fc4cf4 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='java.util.function.Function' + * @implNote op name='findMin', 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 e4519bf79..1f7248e92 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='org.scijava.function.Inplaces.Arity3_1' + * @implNote op name='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 060fc2ae7..cbe2d091e 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='java.util.function.Function' + * @implNote op name='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='org.scijava.function.Inplaces.Arity2_1' + * @implNote op name='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 9ca9fe831..963be5405 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='java.util.function.BiFunction' + * @implNote op name='collectAllContainedIntervalsWithGridPositions', 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='org.scijava.function.Functions.Arity3' + * @implNote op name='collectAllContainedIntervalsWithGridPositions', 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='java.util.function.BiFunction' + * @implNote op name='collectAllContainedIntervals', 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='org.scijava.function.Functions.Arity3' + * @implNote op name='collectAllContainedIntervals', 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='java.util.function.BiFunction' + * @implNote op name='collectAllOffsets', 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='org.scijava.function.Functions.Arity3' + * @implNote op name='collectAllOffsets', 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='org.scijava.function.Functions.Arity3' + * @implNote op name='collectAllOffsets', 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='org.scijava.function.Functions.Arity4' + * @implNote op name='collectAllOffsets', 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='org.scijava.function.Functions.Arity3' + * @implNote op name='croppedIntervalAndGridPosition', 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 690e6624e..eb73c80ef 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='org.scijava.function.Functions.Arity5' + * @implNote op name='parallelizeAndWait', 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='org.scijava.function.Functions.Arity5' + * @implNote op name='parallelize', 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='org.scijava.function.Functions.Arity6' + * @implNote op name='parallelizeAndWait', 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='org.scijava.function.Functions.Arity6' + * @implNote op name='parallelize', 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='org.scijava.function.Functions.Arity4' + * @implNote op name='parallelizeAndWait', 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='org.scijava.function.Functions.Arity4' + * @implNote op name='parallelize', type=Function * @param func * {@link Function} to be applied to each block as specified by * first parameter {@link Interval}.