From fb69b99c15a277d96bb56d5b3f9845866d5da3be Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 28 Jun 2021 14:58:51 -0500 Subject: [PATCH 01/31] Add package cycle enforcer to incubator --- pom.xml | 25 +++++++++++++++++++++++++ scijava/scijava-ops/pom.xml | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 11d82d0e3..86e1fbcd9 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,31 @@ + + maven-enforcer-plugin + + + de.andrena.tools.nopackagecycles + no-package-cycles-enforcer-rule + 1.0.9 + + + + + enforce-no-package-cycles + + enforce + + test + + + + + + + + diff --git a/scijava/scijava-ops/pom.xml b/scijava/scijava-ops/pom.xml index 16494dfa9..892246bcf 100644 --- a/scijava/scijava-ops/pom.xml +++ b/scijava/scijava-ops/pom.xml @@ -103,7 +103,7 @@ bsd_2 SciJava developers. - true + ${scijava.allowedDuplicateClasses},com.github.therapi.runtimejavadoc.repack.com.eclipsesource.json.* ${scijava-ops.allowedDuplicateClasses} From 71796e358a5c21d5101fe5e523a12c8cd700dadd Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 28 Jun 2021 15:12:15 -0500 Subject: [PATCH 02/31] Move Op to org.scijava.ops --- .../src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java | 2 +- .../java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java | 2 +- .../main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java | 2 +- .../main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java | 2 +- .../java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java | 2 +- .../main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java | 2 +- .../main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java | 2 +- .../src/main/java/net/imagej/ops2/copy/CopyArrayImg.java | 2 +- .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java | 2 +- .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java | 2 +- .../src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java | 2 +- .../src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java | 2 +- .../imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java | 2 +- .../src/main/java/net/imagej/ops2/copy/CopyType.java | 2 +- .../java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java | 2 +- .../imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java | 2 +- .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java | 2 +- .../net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java | 2 +- .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java | 2 +- .../main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java | 2 +- .../java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java | 2 +- .../java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java | 2 +- .../imagej/ops2/deconvolve/accelerate/VectorAccelerator.java | 2 +- .../src/main/java/net/imagej/ops2/eval/DefaultEval.java | 2 +- .../main/java/net/imagej/ops2/features/haralick/DefaultASM.java | 2 +- .../imagej/ops2/features/haralick/DefaultClusterPromenence.java | 2 +- .../net/imagej/ops2/features/haralick/DefaultClusterShade.java | 2 +- .../java/net/imagej/ops2/features/haralick/DefaultContrast.java | 2 +- .../net/imagej/ops2/features/haralick/DefaultCorrelation.java | 2 +- .../imagej/ops2/features/haralick/DefaultDifferenceEntropy.java | 2 +- .../ops2/features/haralick/DefaultDifferenceVariance.java | 2 +- .../java/net/imagej/ops2/features/haralick/DefaultEntropy.java | 2 +- .../java/net/imagej/ops2/features/haralick/DefaultICM1.java | 2 +- .../java/net/imagej/ops2/features/haralick/DefaultICM2.java | 2 +- .../java/net/imagej/ops2/features/haralick/DefaultIFDM.java | 2 +- .../imagej/ops2/features/haralick/DefaultMaxProbability.java | 2 +- .../net/imagej/ops2/features/haralick/DefaultSumAverage.java | 2 +- .../net/imagej/ops2/features/haralick/DefaultSumEntropy.java | 2 +- .../net/imagej/ops2/features/haralick/DefaultSumVariance.java | 2 +- .../ops2/features/haralick/DefaultTextureHomogeneity.java | 2 +- .../java/net/imagej/ops2/features/haralick/DefaultVariance.java | 2 +- .../java/net/imagej/ops2/features/haralick/helper/CoocHXY.java | 2 +- .../net/imagej/ops2/features/haralick/helper/CoocMeanX.java | 2 +- .../net/imagej/ops2/features/haralick/helper/CoocMeanY.java | 2 +- .../java/net/imagej/ops2/features/haralick/helper/CoocPX.java | 2 +- .../net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java | 2 +- .../net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java | 2 +- .../java/net/imagej/ops2/features/haralick/helper/CoocPY.java | 2 +- .../java/net/imagej/ops2/features/haralick/helper/CoocStdX.java | 2 +- .../java/net/imagej/ops2/features/haralick/helper/CoocStdY.java | 2 +- .../ops2/features/hog/HistogramOfOrientedGradients2D.java | 2 +- .../main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java | 2 +- .../imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java | 2 +- .../imagej/ops2/features/tamura2d/DefaultContrastFeature.java | 2 +- .../ops2/features/tamura2d/DefaultDirectionalityFeature.java | 2 +- .../imagej/ops2/features/zernike/DefaultMagnitudeFeature.java | 2 +- .../net/imagej/ops2/features/zernike/DefaultPhaseFeature.java | 2 +- .../imagej/ops2/features/zernike/helper/ZernikeComputer.java | 2 +- .../java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java | 2 +- .../java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java | 2 +- .../main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java | 2 +- .../main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java | 2 +- .../java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java | 2 +- .../java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java | 2 +- .../java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java | 2 +- .../java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java | 2 +- .../net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java | 2 +- .../imagej/ops2/filter/derivative/PartialDerivativesRAI.java | 2 +- .../ops2/filter/derivativeGauss/DefaultDerivativeGauss.java | 2 +- .../src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java | 2 +- .../main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java | 2 +- .../java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java | 2 +- .../src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java | 2 +- .../src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java | 2 +- .../net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java | 2 +- .../java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java | 2 +- .../net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java | 2 +- .../main/java/net/imagej/ops2/filter/hessian/HessianRAI.java | 2 +- .../main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java | 2 +- .../main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java | 2 +- .../main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java | 2 +- .../java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java | 2 +- .../java/net/imagej/ops2/filter/median/DefaultMedianFilter.java | 2 +- .../main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java | 2 +- .../java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java | 2 +- .../net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java | 2 +- .../src/main/java/net/imagej/ops2/filter/pad/PadInput.java | 2 +- .../java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java | 2 +- .../main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java | 2 +- .../net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java | 2 +- .../net/imagej/ops2/filter/pad/PaddingIntervalCentered.java | 2 +- .../java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java | 2 +- .../java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java | 2 +- .../src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java | 2 +- .../java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java | 2 +- .../net/imagej/ops2/filter/variance/DefaultVarianceFilter.java | 2 +- .../java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java | 2 +- .../src/main/java/net/imagej/ops2/geom/CentroidII.java | 2 +- .../src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java | 2 +- .../src/main/java/net/imagej/ops2/geom/CentroidMesh.java | 2 +- .../src/main/java/net/imagej/ops2/geom/CentroidPolygon.java | 2 +- .../main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java | 2 +- .../imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java | 2 +- .../ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java | 2 +- .../net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java | 2 +- .../main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java | 2 +- .../net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultElongation.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java | 2 +- .../imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java | 2 +- .../main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java | 2 +- .../net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java | 2 +- .../imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java | 2 +- .../net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java | 2 +- .../imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java | 2 +- .../main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java | 2 +- .../net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java | 2 +- .../main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java | 2 +- .../imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java | 2 +- .../java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java | 2 +- .../ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java | 2 +- .../net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java | 2 +- .../ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java | 2 +- .../imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java | 2 +- .../net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java | 2 +- .../net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java | 2 +- .../net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java | 2 +- .../ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java | 2 +- .../ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java | 2 +- .../net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java | 2 +- .../imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java | 2 +- .../src/main/java/net/imagej/ops2/help/HelpForName.java | 2 +- .../src/main/java/net/imagej/ops2/identity/DefaultIdentity.java | 2 +- .../src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java | 2 +- .../ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java | 2 +- .../image/distancetransform/CalibratedDistanceTransformer.java | 2 +- .../distancetransform/DefaultDistanceTransformCalibration.java | 2 +- .../ops2/image/distancetransform/DistanceTransformer.java | 2 +- .../imagej/ops2/image/equation/DefaultCoordinatesEquation.java | 2 +- .../java/net/imagej/ops2/image/equation/DefaultEquation.java | 2 +- .../src/main/java/net/imagej/ops2/image/fill/DefaultFill.java | 2 +- .../src/main/java/net/imagej/ops2/image/fill/FillRAI.java | 2 +- .../java/net/imagej/ops2/image/histogram/HistogramCreate.java | 2 +- .../java/net/imagej/ops2/image/integral/DefaultIntegralImg.java | 2 +- .../java/net/imagej/ops2/image/integral/SquareIntegralImg.java | 2 +- .../java/net/imagej/ops2/image/integral/WrappedIntegralImg.java | 2 +- .../net/imagej/ops2/image/normalize/NormalizeIIComputer.java | 2 +- .../net/imagej/ops2/image/normalize/NormalizeIIFunction.java | 2 +- .../java/net/imagej/ops2/image/normalize/NormalizeIILazy.java | 2 +- .../imagej/ops2/image/normalize/NormalizeIILazyFunction.java | 2 +- .../main/java/net/imagej/ops2/image/watershed/Watershed.java | 2 +- .../java/net/imagej/ops2/image/watershed/WatershedBinary.java | 2 +- .../imagej/ops2/image/watershed/WatershedBinarySingleSigma.java | 2 +- .../java/net/imagej/ops2/image/watershed/WatershedSeeded.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment00.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment01.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment02.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment03.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment10.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment11.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment12.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment20.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment21.java | 2 +- .../imagemoments/centralmoments/DefaultCentralMoment30.java | 2 +- .../imagemoments/centralmoments/IterableCentralMoment00.java | 2 +- .../imagemoments/centralmoments/IterableCentralMoment11.java | 2 +- .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java | 2 +- .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java | 2 +- .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java | 2 +- .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java | 2 +- .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java | 2 +- .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java | 2 +- .../java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java | 2 +- .../net/imagej/ops2/imagemoments/moments/DefaultMoment00.java | 2 +- .../net/imagej/ops2/imagemoments/moments/DefaultMoment01.java | 2 +- .../net/imagej/ops2/imagemoments/moments/DefaultMoment10.java | 2 +- .../net/imagej/ops2/imagemoments/moments/DefaultMoment11.java | 2 +- .../DefaultNormalizedCentralMoment02.java | 2 +- .../DefaultNormalizedCentralMoment03.java | 2 +- .../DefaultNormalizedCentralMoment11.java | 2 +- .../DefaultNormalizedCentralMoment12.java | 2 +- .../DefaultNormalizedCentralMoment20.java | 2 +- .../DefaultNormalizedCentralMoment21.java | 2 +- .../DefaultNormalizedCentralMoment30.java | 2 +- .../src/main/java/net/imagej/ops2/labeling/MergeLabeling.java | 2 +- .../src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java | 2 +- .../src/main/java/net/imagej/ops2/logic/Default.java | 2 +- .../src/main/java/net/imagej/ops2/logic/Ternary.java | 2 +- .../imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java | 2 +- .../imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java | 2 +- .../imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/ExtractHoles.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/FillHoles.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/Outline.java | 2 +- .../main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java | 2 +- .../main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java | 2 +- .../java/net/imagej/ops2/morphology/thin/ThinMorphological.java | 2 +- .../java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java | 2 +- .../java/net/imagej/ops2/project/DefaultProjectParallel.java | 2 +- .../net/imagej/ops2/project/ProjectRAIToIterableInterval.java | 2 +- .../ops2/segment/detectJunctions/DefaultDetectJunctions.java | 2 +- .../imagej/ops2/segment/detectRidges/DefaultDetectRidges.java | 2 +- .../src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java | 2 +- .../main/java/net/imagej/ops2/stats/DefaultGeometricMean.java | 2 +- .../main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultMax.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultMean.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultMedian.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultMin.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultMinMax.java | 2 +- .../java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java | 2 +- .../java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java | 2 +- .../java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java | 2 +- .../java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java | 2 +- .../java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultPercentile.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultQuantile.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultSize.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultSkewness.java | 2 +- .../java/net/imagej/ops2/stats/DefaultStandardDeviation.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultSum.java | 2 +- .../main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java | 2 +- .../main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java | 2 +- .../src/main/java/net/imagej/ops2/stats/DefaultVariance.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IntegralMean.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IntegralSum.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IntegralVariance.java | 2 +- .../main/java/net/imagej/ops2/stats/IterableGeometricMean.java | 2 +- .../main/java/net/imagej/ops2/stats/IterableHarmonicMean.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableMax.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableMean.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableMin.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableMinMax.java | 2 +- .../java/net/imagej/ops2/stats/IterableMoment3AboutMean.java | 2 +- .../java/net/imagej/ops2/stats/IterableMoment4AboutMean.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableSize.java | 2 +- .../java/net/imagej/ops2/stats/IterableStandardDeviation.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableSum.java | 2 +- .../main/java/net/imagej/ops2/stats/IterableSumOfInverses.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java | 2 +- .../main/java/net/imagej/ops2/stats/IterableSumOfSquares.java | 2 +- .../src/main/java/net/imagej/ops2/stats/IterableVariance.java | 2 +- .../net/imagej/ops2/stats/regression/leastSquares/Quadric.java | 2 +- .../java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java | 2 +- .../java/net/imagej/ops2/thread/chunker/DefaultChunker.java | 2 +- .../java/net/imagej/ops2/threshold/ApplyThresholdMethod.java | 2 +- .../net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java | 2 +- .../net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java | 2 +- .../imagej/ops2/threshold/apply/ApplyThresholdComparable.java | 2 +- .../imagej/ops2/threshold/apply/ApplyThresholdComparator.java | 2 +- .../net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java | 2 +- .../java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java | 2 +- .../ops2/threshold/intermodes/ComputeIntermodesThreshold.java | 2 +- .../imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java | 2 +- .../java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java | 2 +- .../threshold/localBernsen/ComputeLocalBernsenThreshold.java | 2 +- .../ops2/threshold/localBernsen/LocalBernsenThreshold.java | 2 +- .../threshold/localContrast/ComputeLocalContrastThreshold.java | 2 +- .../ops2/threshold/localContrast/LocalContrastThreshold.java | 2 +- .../ops2/threshold/localMean/ComputeLocalMeanThreshold.java | 2 +- .../threshold/localMean/ComputeLocalMeanThresholdIntegral.java | 2 +- .../net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java | 2 +- .../ops2/threshold/localMedian/ComputeLocalMedianThreshold.java | 2 +- .../imagej/ops2/threshold/localMedian/LocalMedianThreshold.java | 2 +- .../threshold/localMidGrey/ComputeLocalMidGreyThreshold.java | 2 +- .../ops2/threshold/localMidGrey/LocalMidGreyThreshold.java | 2 +- .../threshold/localNiblack/ComputeLocalNiblackThreshold.java | 2 +- .../localNiblack/ComputeLocalNiblackThresholdIntegral.java | 2 +- .../ops2/threshold/localNiblack/LocalNiblackThreshold.java | 2 +- .../localPhansalkar/ComputeLocalPhansalkarThreshold.java | 2 +- .../ComputeLocalPhansalkarThresholdIntegral.java | 2 +- .../threshold/localPhansalkar/LocalPhansalkarThreshold.java | 2 +- .../threshold/localSauvola/ComputeLocalSauvolaThreshold.java | 2 +- .../localSauvola/ComputeLocalSauvolaThresholdIntegral.java | 2 +- .../ops2/threshold/localSauvola/LocalSauvolaThreshold.java | 2 +- .../ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java | 2 +- .../threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java | 2 +- .../net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java | 2 +- .../ops2/threshold/minError/ComputeMinErrorThreshold.java | 2 +- .../imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java | 2 +- .../imagej/ops2/threshold/moments/ComputeMomentsThreshold.java | 2 +- .../net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java | 2 +- .../ops2/threshold/percentile/ComputePercentileThreshold.java | 2 +- .../threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java | 2 +- .../net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java | 2 +- .../ops2/threshold/shanbhag/ComputeShanbhagThreshold.java | 2 +- .../ops2/threshold/triangle/ComputeTriangleThreshold.java | 2 +- .../java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java | 2 +- .../src/main/java/net/imagej/ops2/topology/BoxCount.java | 2 +- .../topology/eulerCharacteristic/EulerCharacteristic26N.java | 2 +- .../eulerCharacteristic/EulerCharacteristic26NFloating.java | 2 +- .../ops2/topology/eulerCharacteristic/EulerCorrection.java | 2 +- .../src/main/java/net/imagej/ops2/transform/Transforms.java | 2 +- .../src/test/java/net/imagej/ops2/AbstractOpTest.java | 2 +- .../src/main/java/org/scijava/ops/{core => }/Op.java | 2 +- .../ops/adapt/complexLift/ComputersToFunctionsAndLift.java | 2 +- .../ops/adapt/complexLift/FunctionsToComputersAndLift.java | 2 +- .../ops/adapt/functional/ComputersToFunctionsViaFunction.java | 2 +- .../ops/adapt/functional/ComputersToFunctionsViaSource.java | 2 +- .../org/scijava/ops/adapt/functional/FunctionsToComputers.java | 2 +- .../org/scijava/ops/adapt/functional/InplacesToFunctions.java | 2 +- .../org/scijava/ops/conversionLoss/IdentityLossReporter.java | 2 +- .../main/java/org/scijava/ops/impl/DefaultOpEnvironment.java | 2 +- .../src/main/java/org/scijava/ops/matcher/OpRef.java | 2 +- .../src/main/java/org/scijava/ops/math/Normalize.java | 2 +- .../src/main/java/org/scijava/ops/simplify/Identity.java | 2 +- .../java/org/scijava/ops/simplify/PrimitiveListSimplifier.java | 2 +- .../main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java | 2 +- .../scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java | 2 +- .../scijava-ops/src/main/java/org/scijava/ops/stats/Size.java | 2 +- .../scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java | 2 +- .../src/test/java/org/scijava/ops/OpCachingTest.java | 1 - .../src/test/java/org/scijava/ops/OpPriorityTest.java | 1 - scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java | 1 - .../java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java | 2 +- .../test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java | 2 +- .../src/test/java/org/scijava/ops/monitor/OpMonitorTest.java | 2 +- .../src/test/java/org/scijava/ops/util/OpsAsParametersTest.java | 2 +- .../src/test/java/org/scijava/param/JavadocParameterTest.java | 2 +- 341 files changed, 338 insertions(+), 341 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core => }/Op.java (78%) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java index 77ba621b1..e0703369b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java @@ -38,8 +38,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java index e4acb798b..e2ce3e89f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRank.java @@ -38,7 +38,7 @@ import net.imglib2.util.IterablePair; import net.imglib2.util.Pair; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java index 06610fad5..e0ad20bf4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java @@ -49,8 +49,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.util.IntArray; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java index e2d059afe..58f305dde 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java @@ -48,8 +48,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java index 119249d3d..40385a7ac 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pearsons/DefaultPearsons.java @@ -35,7 +35,7 @@ import net.imglib2.util.IterablePair; import net.imglib2.util.Pair; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java index 12fd44582..34515e1d5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java @@ -32,7 +32,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java index 25fbdef37..18b4c638f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java @@ -32,7 +32,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java index e432081f6..814923429 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java @@ -39,8 +39,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java index 98a7f9051..9edc5dc11 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyII.java @@ -36,8 +36,8 @@ import net.imglib2.IterableInterval; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.util.Maps; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java index cf5095a2b..0cb0dfcef 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java @@ -35,8 +35,8 @@ import net.imglib2.type.NativeType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java index 0c2396ee7..dddee6cfa 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java @@ -38,8 +38,8 @@ import net.imglib2.util.Util; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java index e222106e9..39dc59340 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java @@ -37,7 +37,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java index cde9a0502..d0bebd24d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java @@ -35,8 +35,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java index 05091042a..ddcb0417e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java @@ -32,7 +32,7 @@ import net.imglib2.type.Type; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java index 61f4e6dbe..ad3eb4d89 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java @@ -42,8 +42,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java index 96b3a708c..6fbb947a0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java @@ -50,8 +50,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Inplaces; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java index dc38791cd..15e690fed 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java @@ -45,8 +45,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Inplaces; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java index 88a3c09e5..e207f9a30 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java @@ -44,8 +44,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java index 675247b3d..2855491ea 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java @@ -47,8 +47,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java index 84970386b..3f4bd0762 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java @@ -48,8 +48,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java index 6cfcd7e31..3958377eb 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java @@ -45,8 +45,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java index f935f3595..a103f71f7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java index 304bff97e..4bb65d8d7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java @@ -46,8 +46,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.util.Adapt; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java index 267ac66b8..d9c454e1b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java @@ -32,8 +32,8 @@ import java.util.Map; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpService; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java index fac2492a4..e2ea01efd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultASM.java @@ -33,7 +33,7 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java index 514beb672..2ef4f3d8c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterPromenence.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java index 21acc51b1..6226c6927 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultClusterShade.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java index 9cf3a7563..40c537e7a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultContrast.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java index 861f91bf7..ea36119b4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultCorrelation.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java index a470cb1dc..1602ec07a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceEntropy.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java index 5ddc6258e..0375c9fc8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultDifferenceVariance.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java index 01549ac90..1b13d68fd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultEntropy.java @@ -33,7 +33,7 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java index b6dc94184..4f6c21052 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java index 7d90b1835..732e8758e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java index 964fba7c7..c2c314a23 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultIFDM.java @@ -33,7 +33,7 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java index cfa41f0c7..61efd7f59 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultMaxProbability.java @@ -33,7 +33,7 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java index 2ce292067..2a96f1f8d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumAverage.java @@ -36,8 +36,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java index 4d4a17d21..aa0abcbd0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumEntropy.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java index b74f2e3e8..b13d2f940 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java index 9e16eac80..e48830613 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultTextureHomogeneity.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java index 6f5ae7a83..f05cbb29b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultVariance.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java index b37c590e8..c044a10f6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocHXY.java @@ -31,8 +31,8 @@ import java.util.function.Function; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java index 43a742f6c..f25e0865f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanX.java @@ -32,8 +32,8 @@ import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java index a6ccb65c0..59f22517d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocMeanY.java @@ -33,8 +33,8 @@ import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java index b6a711f38..399fad6a6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPX.java @@ -30,7 +30,7 @@ import java.util.function.Function; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java index b79869a27..a4e3662c3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXMinusY.java @@ -30,7 +30,7 @@ import java.util.function.Function; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java index 97c9cccce..ca9153c64 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPXPlusY.java @@ -30,7 +30,7 @@ import java.util.function.Function; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java index b84c82366..9513243e6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocPY.java @@ -30,7 +30,7 @@ import java.util.function.Function; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java index fc24e7851..5a2c851d7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdX.java @@ -32,8 +32,8 @@ import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java index 6c40c7b96..a4e52c429 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/helper/CoocStdY.java @@ -33,8 +33,8 @@ import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java index d557fb9d6..071a48311 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java @@ -59,8 +59,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java index f7f35a782..c51bde4a6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java @@ -43,8 +43,8 @@ import net.imglib2.view.Views; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java index 335d7a3e0..eb3dd031e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java @@ -48,8 +48,8 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java index 04b2c2bbc..2f9638cf7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java index 202b29e58..64f8c8644 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java @@ -45,8 +45,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java index 9252f17d4..2c79367c4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java @@ -35,8 +35,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java index 4937afbb8..d27eb0058 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java @@ -35,8 +35,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java index f51bcf457..1d7f2f180 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Functions; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java index 0a07487c5..b72da5994 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java index 9945b4933..550c5e919 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java @@ -41,7 +41,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java index 6d1d1d78e..905914e97 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java @@ -37,8 +37,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java index ad271293d..3a859d9b7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java @@ -47,8 +47,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java index afbc123ab..a4a3af15a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java @@ -39,7 +39,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java index fd21790dd..77a129e06 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java @@ -45,8 +45,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java index 638438f16..3cb9cccb6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java @@ -36,8 +36,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java index f29971d66..f1359dfb3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java @@ -44,8 +44,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java index 89d7a3c35..ace9c701e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java @@ -41,8 +41,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java index 41b4d9353..736baae5a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java @@ -39,8 +39,8 @@ import net.imglib2.view.composite.RealComposite; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java index 923c89517..7d0635698 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java @@ -42,8 +42,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java index 2c64a2fdb..f4387abb1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java @@ -39,8 +39,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java index 8b41dead8..c7fb7a2d2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.NumericType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java index 019133f5c..53aa7f38a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java @@ -35,8 +35,8 @@ import net.imglib2.img.Img; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java index 2cddc479a..1ebc23d5d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java @@ -38,7 +38,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java index 5f8df82a7..b0a8ed9fb 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java @@ -41,8 +41,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java index 866e586fd..28e2aff17 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java @@ -33,7 +33,7 @@ import net.imglib2.algorithm.fft2.FFTMethods; import org.scijava.function.Functions; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java index e6e1bb0fa..ba97379bf 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java @@ -37,7 +37,7 @@ import net.imglib2.util.ValuePair; import org.scijava.function.Functions; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java index 39db46c80..52e8e38c3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/DefaultComputeFFTSize.java @@ -33,7 +33,7 @@ import net.imglib2.Dimensions; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java index 116719a50..263686782 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java @@ -39,8 +39,8 @@ import net.imglib2.view.composite.RealComposite; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java index 0b3c11048..ab093b056 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java index 04cb5f9b3..d0a24033d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java @@ -36,7 +36,7 @@ import net.imglib2.type.numeric.ComplexType; import org.scijava.function.Inplaces; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java index a83103e03..0d9d72ed4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java @@ -36,8 +36,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java index 3219a60fe..1511007a4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java @@ -36,8 +36,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java index ce4bfa967..2c710475f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java @@ -35,8 +35,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java index 2301e5821..8a6d313bf 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java @@ -35,8 +35,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java index 7feee4227..18f0e9e63 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadInputFFT.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.ComplexType; import org.scijava.Priority; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.util.Adapt; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java index ec494e634..067e3eada 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/DefaultPadShiftKernelFFT.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.ComplexType; import org.scijava.Priority; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.util.Adapt; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java index 25d12a71a..e83a07894 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java @@ -42,8 +42,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java index 966f25fcd..22d5b9d31 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInputFFTMethods.java @@ -37,8 +37,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.util.Adapt; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java index c23d88450..4ea0a55db 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernel.java @@ -40,8 +40,8 @@ import net.imglib2.util.Util; import net.imglib2.view.Views; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java index 926343b4c..2c7e6e562 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadShiftKernelFFTMethods.java @@ -37,8 +37,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.util.Adapt; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java index 51c080c23..8cb3adb0d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalCentered.java @@ -39,7 +39,7 @@ import net.imglib2.type.numeric.ComplexType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java index 4e5e883e3..03f1c32a9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PaddingIntervalOrigin.java @@ -37,7 +37,7 @@ import net.imglib2.type.numeric.ComplexType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java index 34219be0e..05fc0e11e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java @@ -38,8 +38,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java index 954aca598..109e6162c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java index 3e7cd81ba..a7961a3b2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java @@ -50,8 +50,8 @@ import org.scijava.Cancelable; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java index fb0e1c031..2b55e6151 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java @@ -36,8 +36,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java index fc1db37c4..e3337eac2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java @@ -42,7 +42,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java index 79fb51871..65525e556 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidII.java @@ -36,7 +36,7 @@ import net.imglib2.RealPoint; import net.imglib2.roi.IterableRegion; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java index 2d972fab8..032947322 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidLabelRegion.java @@ -36,7 +36,7 @@ import net.imglib2.roi.IterableRegion; import net.imglib2.roi.labeling.LabelRegion; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java index d01519873..c90c39c0a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidMesh.java @@ -36,8 +36,8 @@ import net.imglib2.RealPoint; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java index 629a84a7d..165349c08 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/CentroidPolygon.java @@ -36,8 +36,8 @@ import net.imglib2.roi.geom.real.Polygon2D; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java index d6c5ce5fb..14f6cea77 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/DefaultCenterOfGravity.java @@ -38,7 +38,7 @@ import net.imglib2.roi.IterableRegion; import net.imglib2.type.numeric.RealType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java index 3d73db642..e0e803bb5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/SizeII.java @@ -35,7 +35,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java index 416764793..da027659f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundarySizeConvexHullPolygon.java @@ -33,7 +33,7 @@ import net.imglib2.roi.geom.real.Polygon2D; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java index bfdf6ab4d..e37b9a7c3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoundingBox.java @@ -39,7 +39,7 @@ import net.imglib2.roi.geom.real.DefaultWritablePolygon2D; import net.imglib2.roi.geom.real.Polygon2D; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java index d4c6f3408..df1b47507 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultBoxivityPolygon.java @@ -33,7 +33,7 @@ import net.imglib2.roi.geom.real.Polygon2D; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java index 0030e60f7..4c0fe94e9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java index d061e3b51..e9a3f2a36 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultContour.java @@ -44,7 +44,7 @@ import net.imglib2.util.Util; import net.imglib2.view.Views; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java index b6bef5532..6432ec156 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexHull2D.java @@ -40,7 +40,7 @@ import net.imglib2.roi.geom.real.DefaultWritablePolygon2D; import net.imglib2.roi.geom.real.Polygon2D; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java index 4fef58a19..715e62ba9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultConvexityPolygon.java @@ -32,7 +32,7 @@ import net.imglib2.roi.geom.real.Polygon2D; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java index 75bde0bcf..0fc7017f7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java index 070bdb662..8ec5f9793 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java index ee2e20dc1..41b49f1d4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java @@ -34,7 +34,7 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java index 6d0758a9a..db0475f77 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java @@ -34,7 +34,7 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java index 84cc30313..63e8cc9ec 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java index a1fd149d3..cbf7f39ec 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java @@ -36,8 +36,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java index e46451bff..382504813 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeret.java @@ -38,8 +38,8 @@ import net.imglib2.util.Pair; import net.imglib2.util.ValuePair; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java index fd015c68a..7646ea1ed 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java @@ -36,8 +36,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java index a8c547d76..5595c321a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java @@ -36,8 +36,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java index 7bec34a20..cbc9565c3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeret.java @@ -41,8 +41,8 @@ import org.apache.commons.math3.geometry.euclidean.twod.Line; import org.apache.commons.math3.geometry.euclidean.twod.Vector2D; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java index c65b92617..4f7224cac 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java @@ -36,8 +36,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java index e473611f3..5adcecd55 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java @@ -36,8 +36,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java index 2b7a8be23..8767bb9d9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java @@ -36,8 +36,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java index 6bd2096fd..88b72c028 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorMajorAxis.java @@ -42,7 +42,7 @@ import net.imglib2.util.Pair; import net.imglib2.util.ValuePair; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java index c556d79ce..b2076f0ea 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java @@ -37,7 +37,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java index 4c15ebb1b..2f1131268 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java index 1d83cd341..a4d8817ba 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizeConvexHullPolygon.java @@ -33,7 +33,7 @@ import net.imglib2.roi.geom.real.Polygon2D; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java index 3ea7ec1b8..18fc5b126 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java @@ -37,7 +37,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java index e629b3e8d..04ef57348 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSmallestEnclosingRectangle.java @@ -40,8 +40,8 @@ import net.imglib2.roi.geom.real.Polygon2D; import net.imglib2.type.numeric.real.DoubleType; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java index 08edb1ea0..076a2319e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSolidityPolygon.java @@ -33,7 +33,7 @@ import net.imglib2.roi.geom.real.Polygon2D; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java index 8aeebbe8a..4f31522c4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java @@ -36,8 +36,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java index 847126045..6179e8c28 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java @@ -34,7 +34,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java index 8890d89ec..55c8554b3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultBoxivityMesh.java @@ -33,7 +33,7 @@ import net.imagej.ops2.geom.AbstractBoxivity; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java index de62a5729..1a99d7b35 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java @@ -36,8 +36,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java index d9ffa2b1a..179e29ac2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java @@ -47,7 +47,7 @@ import net.imglib2.util.ValuePair; import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java index 1892d94f0..af39027cd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexityMesh.java @@ -33,7 +33,7 @@ import net.imagej.ops2.geom.AbstractConvexity; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java index 5c84b1338..efd502ee0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3D.java @@ -38,8 +38,8 @@ import org.apache.commons.math3.linear.BlockRealMatrix; import org.apache.commons.math3.linear.RealMatrix; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java index 80a2c394c..b4405aa0a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultInertiaTensor3DMesh.java @@ -38,8 +38,8 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.apache.commons.math3.linear.BlockRealMatrix; import org.apache.commons.math3.linear.RealMatrix; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java index 51c2042a9..027a6d504 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java @@ -38,8 +38,8 @@ import org.apache.commons.math3.linear.RealMatrix; import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java index 2bd07cf41..86f142be0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java @@ -45,8 +45,8 @@ import org.apache.commons.math3.util.MathArrays; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java index ada6ec30f..57f404196 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java @@ -38,8 +38,8 @@ import org.apache.commons.math3.linear.RealMatrix; import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java index b27ead05c..1b96f50c9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSolidityMesh.java @@ -33,7 +33,7 @@ import net.imagej.ops2.geom.AbstractSolidity; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java index c3f4f1406..cab0deb43 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java @@ -38,8 +38,8 @@ import org.apache.commons.math3.linear.RealMatrix; import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java index 710cac142..9843d1443 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java @@ -36,8 +36,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java index 6d02b9449..1b7c6f173 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java @@ -36,7 +36,7 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java index 11f308f6e..0f390ec00 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceAreaConvexHullMesh.java @@ -33,7 +33,7 @@ import net.imagej.ops2.geom.AbstractBoundarySizeConvexHull; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java index 56e51ce8c..767c6b2ce 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java @@ -36,8 +36,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java index a26b86718..d763b2432 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java @@ -34,7 +34,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java index 8eb4259ae..3beeddd1a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeConvexHullMesh.java @@ -33,7 +33,7 @@ import net.imagej.ops2.geom.AbstractSizeConvexHull; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java index 37b689026..f56b42084 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVolumeMesh.java @@ -36,7 +36,7 @@ import org.apache.commons.math3.util.MathArrays; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java index 650bbf40a..00705c05f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java @@ -44,8 +44,8 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java index c6a0a8649..5c62728a7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/HelpForName.java @@ -32,9 +32,9 @@ import java.util.function.BiFunction; import org.scijava.Priority; +import org.scijava.ops.Op; import org.scijava.ops.OpInfo; import org.scijava.ops.OpService; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java index 1cb16e37b..8fe08fe70 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java @@ -30,7 +30,7 @@ package net.imagej.ops2.identity; import org.scijava.function.Inplaces; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java index a2baae844..c8ee6ac57 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java @@ -37,8 +37,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java index 007c93cfa..5c2845ee6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java @@ -7,8 +7,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java index fde760a76..67c08ac8d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java @@ -36,7 +36,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java index 0a4541e73..ab5a15d67 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java @@ -42,7 +42,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java index 5ec6e8997..9a545d57b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java @@ -36,7 +36,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java index b2f2e8049..ee72d1e08 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java @@ -36,7 +36,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java index dcafa9136..c17fbbdd9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java @@ -41,8 +41,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpExecutionException; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.script.ScriptLanguage; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java index 86b441d4a..f2ead8904 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java @@ -35,7 +35,7 @@ import net.imglib2.type.Type; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java index 017a9f5ed..8ab99befe 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java @@ -35,7 +35,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java index b8d99bea2..8027c3154 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/histogram/HistogramCreate.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Pair; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java index c869a9385..0659d7086 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java @@ -36,7 +36,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java index 7153f412e..b1608b6ec 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java @@ -36,7 +36,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java index 87116dee4..597f54ac1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/WrappedIntegralImg.java @@ -38,7 +38,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java index fd2f7039d..d307e6376 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java @@ -39,8 +39,8 @@ import net.imglib2.util.Util; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java index 0e36656be..6b8ecc05c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java @@ -37,8 +37,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java index 1866fb7ae..6f200e1ea 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java @@ -37,8 +37,8 @@ import net.imglib2.util.Util; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java index eb4ead609..4302115b7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java index 68f1b4f19..a30d47bbd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java @@ -56,8 +56,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java index a84016dab..12621f782 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java @@ -43,8 +43,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java index 49d7457fb..870642eb6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java @@ -44,8 +44,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java index d0a25e0dc..1af0a1129 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java @@ -66,8 +66,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java index 48cad5858..88431dac5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java index 454441834..ab26a9f75 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment01.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java index ea10b10f4..a8c96c9d7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java @@ -39,8 +39,8 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java index ba894c0d8..53a9a134c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java @@ -39,8 +39,8 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java index d273b9368..ff79fc2c3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment10.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java index b660dfdd5..8d56811de 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java index c77454664..8f11371c8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java @@ -39,8 +39,8 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java index 4c1fc580c..d2c1b01f0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java @@ -38,8 +38,8 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java index 7d0559b99..8a3eafdd7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java @@ -39,8 +39,8 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java index 57b15443c..e824cbe6e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java @@ -39,8 +39,8 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java index 657d1240e..c912e75a1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java @@ -35,7 +35,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java index 83228c0c2..c1be9aed1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java @@ -35,7 +35,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java index 928a036a0..d5445f935 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java index 40fa04956..ca71ec854 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java index 9fc923ed4..358da38ae 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java index 7e2fb5da8..6ffd15c3a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java index 52c5fd0ad..49b3c677a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java index 382ef3ab2..5a6abb7a2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java index dd14aeb09..411c64566 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java index 1b48082c2..79c6b63f9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment00.java @@ -39,7 +39,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java index 3cfebeb53..86fece070 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment01.java @@ -39,7 +39,7 @@ import net.imglib2.util.Intervals; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java index 23ac2e3e4..a8116c551 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment10.java @@ -39,7 +39,7 @@ import net.imglib2.util.Intervals; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java index 41ff2a155..56c041ab8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/moments/DefaultMoment11.java @@ -39,7 +39,7 @@ import net.imglib2.util.Intervals; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java index f725020d7..e1bf84cb5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java index 9d87f64c4..74b4e3d80 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java index 20b817932..7b80a7e8d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java index bdd5be083..95ea34ab5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java index 4e697c690..d9b7200b8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java index 357044e9c..dda6e4d4f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java index d255c56f8..c9fba1ee7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java index 0ab083109..082f4eaf5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java @@ -47,8 +47,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java index 7d14e598b..9f3bfda27 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java @@ -42,8 +42,8 @@ import net.imglib2.type.numeric.integer.IntType; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java index 9de65c4ff..a694d5c97 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java @@ -33,7 +33,7 @@ import net.imglib2.type.Type; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java index a081ffb24..b4a1fda59 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java @@ -33,7 +33,7 @@ import net.imglib2.type.Type; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java index 91f1d762e..949cf16a5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java @@ -39,7 +39,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java index db32240c4..b43529227 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java index bc7c6b314..bbf0200d3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java index 43c5e417b..20863d1d5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java @@ -38,8 +38,8 @@ import net.imglib2.type.BooleanType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java index 7f59e3a07..d5871e9a7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java @@ -38,8 +38,8 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java index b8fb462aa..bdd21e7a6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java @@ -45,7 +45,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java index 2a1cbbd77..b6b26ba0c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinGuoHall.java @@ -32,7 +32,7 @@ import net.imglib2.RandomAccessibleInterval; import net.imglib2.type.logic.BitType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java index fd6135f11..865fc2d13 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinHilditch.java @@ -32,7 +32,7 @@ import net.imglib2.RandomAccessibleInterval; import net.imglib2.type.logic.BitType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java index a1947976c..4bc6d4f15 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinMorphological.java @@ -32,7 +32,7 @@ import net.imglib2.RandomAccessibleInterval; import net.imglib2.type.logic.BitType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java index dc1c016a6..0ea8fe3ec 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/thin/ThinZhangSuen.java @@ -32,7 +32,7 @@ import net.imglib2.RandomAccessibleInterval; import net.imglib2.type.logic.BitType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java index c8c143904..b0ec412ff 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java @@ -38,7 +38,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java index f5c8503f4..f7e703936 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java @@ -38,7 +38,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java index 93ad55e8f..ccf043191 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectJunctions/DefaultDetectJunctions.java @@ -44,8 +44,8 @@ import net.imglib2.roi.util.RealLocalizableRealPositionable; import net.imglib2.util.Intervals; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java index a1aedaf8b..fe67e32f3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java @@ -48,8 +48,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java index 5720cd114..d88766a7a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java @@ -34,7 +34,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java index 0b33f523d..a6c7ccf22 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java @@ -33,8 +33,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java index ad5595f31..c8d361d05 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java @@ -33,8 +33,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java index 5a01ae663..ef9d8d9b1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java @@ -33,8 +33,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java index 28650f6f3..1469d83c2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java @@ -37,8 +37,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java index d93209a77..17fd594f3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java index e88389cbb..098212ca7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java index 2aff0a2d1..de413137d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java @@ -37,8 +37,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java index df8fc3053..798b14636 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMinMax.java @@ -40,7 +40,7 @@ import net.imglib2.util.ValuePair; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java index 93451520e..eb193a150 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java index ece6214f2..61991eae3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java index 4199af8b9..d61f4ca19 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java index 44f113680..97ca54592 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java index f964754c7..e00a62792 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java @@ -38,8 +38,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java index dad171964..7ddadf4a1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java @@ -32,8 +32,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java index 39492dde9..31042e585 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java @@ -37,7 +37,7 @@ import net.imglib2.util.Intervals; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.util.ArrayUtils; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java index 97b268bb5..1d1861b5f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java @@ -33,7 +33,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java index 5a012c8ce..bdd0a21b0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java @@ -33,8 +33,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java index 9e3997a63..76300169b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java index 32242e25c..4c6eb739e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java @@ -37,7 +37,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java index 8c0179599..84a40ae25 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java @@ -38,8 +38,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java index 5c0358c20..ff1acb5cb 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java @@ -39,8 +39,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java index 68e8e6114..29b08c0b3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java @@ -37,8 +37,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java index 583ff142d..63e4728cb 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java index 7dfeac133..1b7c8b1cd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java @@ -39,7 +39,7 @@ import net.imglib2.view.composite.Composite; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java index 7291125b8..f6d2d2ae1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java @@ -37,7 +37,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java index 583807604..314c72b71 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java @@ -39,7 +39,7 @@ import net.imglib2.view.composite.Composite; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java index b29378a85..c067a3cb4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java index b2dd83b76..d86d0b8cd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java index 6b15a3cce..833505194 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java index 24cddf2c1..8f3dce783 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java index 230b48049..b7e71f8d6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java index 5267eee1a..49879cfc2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMinMax.java @@ -36,7 +36,7 @@ import net.imglib2.util.Pair; import net.imglib2.util.ValuePair; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java index 41ce223b6..a2d177eef 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java @@ -32,8 +32,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java index d32189ebc..b6c9d0572 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java @@ -32,8 +32,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java index d98453016..05884460b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java index 55cc3566f..5cb99df23 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java index 9aac30fb6..f5c1de51f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java @@ -32,7 +32,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java index bdee0346a..c41b19009 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java @@ -32,7 +32,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java index 4a76ac047..26e7f7b96 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java @@ -32,7 +32,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java index 7ee4918a9..943771bd6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java @@ -32,7 +32,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java index 397549f45..77df9d3f2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java @@ -33,7 +33,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java index 8371e0a35..f93d0af9c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/regression/leastSquares/Quadric.java @@ -38,7 +38,7 @@ import org.ojalgo.matrix.BasicMatrix; import org.ojalgo.matrix.PrimitiveMatrix; import org.ojalgo.random.Deterministic; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java index 4c23fd830..ddb1db5f9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java @@ -35,7 +35,7 @@ import org.scijava.Priority; import org.scijava.function.Inplaces; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java index 87469b974..d93512ccc 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java @@ -35,7 +35,7 @@ import java.util.concurrent.Future; import org.scijava.function.Inplaces; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java index a6ff3106e..53c1a480b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethod.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java index 26b2037f7..8dbcf2298 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java @@ -42,8 +42,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java index dedc603bd..d456c0d67 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyConstantThreshold.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.util.Adapt; import org.scijava.ops.util.Maps; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java index c964f6c05..4e1fad0f9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java @@ -32,7 +32,7 @@ import net.imglib2.type.logic.BitType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java index 2c5563c79..16dc9cb03 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java @@ -34,7 +34,7 @@ import net.imglib2.type.logic.BitType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java index e3f90b391..44ae98d05 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/huang/ComputeHuangThreshold.java @@ -33,7 +33,7 @@ import net.imglib2.histogram.Histogram1d; import net.imglib2.type.numeric.RealType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; //NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java index e404c539e..d0cc01c4c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ij1/ComputeIJ1Threshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java index c2beb0527..451fd9935 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/intermodes/ComputeIntermodesThreshold.java @@ -35,8 +35,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; +import org.scijava.ops.Op; import org.scijava.ops.OpExecutionException; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java index 28a512059..e5660c56b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/isoData/ComputeIsoDataThreshold.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; +import org.scijava.ops.Op; import org.scijava.ops.OpExecutionException; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java index c5bdda399..5b5d75c32 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/li/ComputeLiThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java index 2096baf89..60264f32a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java @@ -37,8 +37,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java index ab76e4a23..a2f9c54d3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java index d7d0dae54..d2ea329dd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java @@ -36,8 +36,8 @@ import net.imglib2.util.Pair; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java index 39b3c1f0e..ad7fbd76d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java index b497a99d2..60a51653c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java @@ -35,8 +35,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java index 835f0f689..d6df3ae26 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java @@ -39,8 +39,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java index 52ea914f0..00aa40d9a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java @@ -48,8 +48,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java index 559adf6ab..9d366d4bc 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java @@ -34,8 +34,8 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java index 09df42dea..0b5206769 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java index b52fd1d5c..18a7c6e2a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java @@ -37,8 +37,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java index a5d4472b1..da588b56c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java @@ -39,8 +39,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java index 408c69e57..aa36c26e4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java @@ -35,8 +35,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java index 839e20d04..4b589d86d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java index 2207cb076..e5461fd0c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java @@ -47,8 +47,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java index eba2b1289..e04e15117 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java @@ -35,8 +35,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java index b23fdcf0d..f6fec2136 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java index 178fa124e..6a546ecee 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java @@ -47,8 +47,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java index 160079dc1..7976c5cf8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java @@ -35,8 +35,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java index 51d391c13..b99a6897c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java index dbd982b53..32631af2e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java @@ -47,8 +47,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java index 105142e28..591f34e69 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxEntropy/ComputeMaxEntropyThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java index 0d56ed52f..a90f10106 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/maxLikelihood/ComputeMaxLikelihoodThreshold.java @@ -35,7 +35,7 @@ import net.imglib2.histogram.Histogram1d; import net.imglib2.type.numeric.RealType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // This plugin code ported from the original MatLab code of the max likelihood diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java index d7d016fa0..29faffec7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/mean/ComputeMeanThreshold.java @@ -33,7 +33,7 @@ import net.imglib2.histogram.Histogram1d; import net.imglib2.type.numeric.RealType; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java index 50b01cad0..abd70abe0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minError/ComputeMinErrorThreshold.java @@ -36,8 +36,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; +import org.scijava.ops.Op; import org.scijava.ops.OpExecutionException; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java index d814b4971..9a6e6bbaa 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/minimum/ComputeMinimumThreshold.java @@ -35,7 +35,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java index 0e48ff8d6..507d439a7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/moments/ComputeMomentsThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java index f77a7381a..c851cc96b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/otsu/ComputeOtsuThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java index 6d34013b7..0b3dcdffe 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/percentile/ComputePercentileThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java index 389188f1d..bcc8870b1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/renyiEntropy/ComputeRenyiEntropyThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java index 9401e1074..2abcd7c12 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/rosin/ComputeRosinThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java index 07831106a..a813983b6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/shanbhag/ComputeShanbhagThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java index 1866271ac..00c949c64 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/triangle/ComputeTriangleThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java index 4d83f6708..fe17fd56f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/yen/ComputeYenThreshold.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.RealType; import org.scijava.Priority; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; // NB - this plugin adapted from Gabriel Landini's code of his AutoThreshold diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java index 4e548c4e5..3a00217dc 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java @@ -47,7 +47,7 @@ import net.imglib2.view.Views; import org.scijava.function.Functions; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java index d7ae08b84..86298788e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java @@ -34,7 +34,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java index 3d207a1c4..366c34252 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java @@ -33,7 +33,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java index 9cdd7a0b1..690d7a828 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java @@ -37,7 +37,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java index 21ed480e4..63ff42c0e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpField; -import org.scijava.ops.core.Op; import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java index 72042d2c1..4c7df5f41 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java @@ -50,8 +50,8 @@ import org.junit.jupiter.api.BeforeAll; import org.scijava.Context; import org.scijava.cache.CacheService; +import org.scijava.ops.Op; import org.scijava.ops.OpService; -import org.scijava.ops.core.Op; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.PluginService; import org.scijava.thread.ThreadService; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/Op.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java similarity index 78% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/Op.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java index c6105ef4c..485783fd2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/Op.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/Op.java @@ -1,4 +1,4 @@ -package org.scijava.ops.core; +package org.scijava.ops; import org.scijava.plugin.SciJavaPlugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java index 665eadafc..79b3dd7f7 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java @@ -74,8 +74,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java index 3ec18b5e8..ab0ea811e 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java index 67e06bcb0..9bf2868b2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java @@ -39,8 +39,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java index 6ef32930c..9d0b7ebe2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java @@ -41,8 +41,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Producer; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java index cf7816485..ead54e7cc 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java @@ -40,8 +40,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Producer; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java index 7a7d0dc65..b783268a7 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java @@ -40,8 +40,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java index a23e5e1ac..c89ff6ae9 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java @@ -1,8 +1,8 @@ package org.scijava.ops.conversionLoss; -import org.scijava.ops.core.Op; import org.scijava.ops.hints.BaseOpHints.Simplification; +import org.scijava.ops.Op; import org.scijava.ops.hints.OpHints; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index ba7df6fa9..8749981ac 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -53,6 +53,7 @@ import org.scijava.InstantiableException; import org.scijava.Priority; import org.scijava.log.LogService; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; import org.scijava.ops.OpDependencyMember; import org.scijava.ops.OpEnvironment; @@ -61,7 +62,6 @@ import org.scijava.ops.OpInstance; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; -import org.scijava.ops.core.Op; import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.BaseOpHints.Adaptation; import org.scijava.ops.hints.BaseOpHints.DependencyMatching; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java index e2247ff94..9d506b080 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java @@ -38,9 +38,9 @@ import java.util.Objects; import org.scijava.log.Logger; +import org.scijava.ops.Op; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; -import org.scijava.ops.core.Op; import org.scijava.types.Types; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java index 6c06a225e..31af65a0e 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java @@ -3,7 +3,7 @@ import java.util.Arrays; import org.scijava.function.Functions; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java index ef9361593..81e2b3d7f 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java @@ -3,8 +3,8 @@ import java.util.function.Function; -import org.scijava.ops.core.Op; import org.scijava.ops.hints.BaseOpHints.Simplification; +import org.scijava.ops.Op; import org.scijava.ops.hints.OpHints; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java index 67c715b8c..a0fc7f910 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveListSimplifier.java @@ -3,7 +3,7 @@ import java.util.List; import java.util.function.Function; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java index 6c6745c59..82f99ae1e 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java @@ -9,11 +9,11 @@ import java.util.stream.Collectors; import org.scijava.Priority; +import org.scijava.ops.Op; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; import org.scijava.ops.conversionLoss.LossReporter; -import org.scijava.ops.core.Op; import org.scijava.ops.hints.BaseOpHints.Adaptation; import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.hints.Hints; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java index c173c46ed..6db29c485 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Mean.java @@ -3,8 +3,8 @@ import java.util.function.BiFunction; import java.util.function.Function; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; import org.scijava.plugin.Plugin; public class Mean { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java index 7119fd12e..f9c34d8df 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/stats/Size.java @@ -4,7 +4,7 @@ import java.util.function.Function; import java.util.stream.StreamSupport; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; public class Size { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java index b4feb8242..1819e5c65 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java @@ -14,8 +14,8 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; +import org.scijava.ops.Op; import org.scijava.ops.core.OneToOneCommand; -import org.scijava.ops.core.Op; /** * Utility providing adaptation between {@link Op} types. diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java index 865232878..33c8d2796 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java @@ -40,7 +40,6 @@ import org.junit.jupiter.api.Assertions; import org.scijava.Context; import org.scijava.function.Producer; -import org.scijava.ops.core.Op; import org.scijava.ops.core.OpCollection; import org.scijava.ops.impl.DefaultOpEnvironment; import org.scijava.ops.impl.MatchingConditions; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java index 8a8ca26ba..aee9ea41f 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpPriorityTest.java @@ -33,7 +33,6 @@ import org.junit.Test; import org.scijava.Priority; import org.scijava.function.Producer; -import org.scijava.ops.core.Op; import org.scijava.types.Nil; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java index 084fd1ecb..4d1c6b7d5 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java @@ -5,7 +5,6 @@ import java.util.function.Function; import org.scijava.function.Computers; -import org.scijava.ops.core.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java index f1b9b9bb8..4af1519b6 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java @@ -7,9 +7,9 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; import org.scijava.ops.OpField; -import org.scijava.ops.core.Op; import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java index ea16621d5..d9463fbb0 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java @@ -11,7 +11,7 @@ import org.scijava.function.Computers; import org.scijava.function.Producer; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.types.Any; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java index 6961c8e56..9cc3810a2 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java @@ -12,7 +12,7 @@ import org.junit.Test; import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.ops.util.FunctionUtils; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java index aaa805886..e239a9e1d 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java @@ -8,8 +8,8 @@ import org.junit.Test; import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.Op; import org.scijava.ops.OpField; -import org.scijava.ops.core.Op; import org.scijava.ops.core.OpCollection; import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java index 1a6a416dc..71bd28788 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java @@ -16,12 +16,12 @@ import org.scijava.function.Computers; import org.scijava.function.Inplaces; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.Op; import org.scijava.ops.OpDependency; import org.scijava.ops.OpField; import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; -import org.scijava.ops.core.Op; import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; From c9c265926f8bd0255486988a9dad47a58171d9d8 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 28 Jun 2021 15:15:07 -0500 Subject: [PATCH 03/31] Move OpCollection to org.scijava.ops --- .../src/main/java/net/imagej/ops2/convert/ConvertTypes.java | 2 +- .../src/main/java/net/imagej/ops2/convert/Converters.java | 2 +- .../src/main/java/net/imagej/ops2/create/CreateTypes.java | 2 +- .../src/main/java/net/imagej/ops2/create/Creators.java | 2 +- .../main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java | 2 +- .../src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java | 2 +- .../net/imagej/ops2/image/integral/AbstractIntegralImg.java | 2 +- .../src/main/java/net/imagej/ops2/image/invert/Inverters.java | 2 +- .../src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java | 2 +- .../src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java | 2 +- .../main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java | 2 +- .../src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java | 2 +- .../main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java | 2 +- .../src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/BlackTopHats.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/Closes.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/Dilations.java | 2 +- .../java/net/imagej/ops2/morphology/DistanceTransforms.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/Erosions.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/FloodFills.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/Opens.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/Table2Ds.java | 2 +- .../src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java | 2 +- .../src/main/java/net/imagej/ops2/transform/Transforms.java | 2 +- .../java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java | 2 +- .../java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java | 2 +- .../src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java | 2 +- .../java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java | 2 +- .../java/net/imagej/ops2/types/minValue/MinValueRealTypes.java | 2 +- .../src/test/java/net/imagej/ops2/slice/SliceTest.java | 2 +- .../src/test/java/net/imagej/ops2/types/TypeExtractorTests.java | 2 +- .../net/imagej/ops2/types/adapt/LiftComputersToRAITest.java | 2 +- .../net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java | 2 +- .../src/main/java/org/scijava/ops/{core => }/OpCollection.java | 2 +- scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java | 1 - .../org/scijava/ops/adapt/functional/InplacesToFunctions.java | 2 +- .../main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java | 2 +- .../java/org/scijava/ops/adapt/lift/ComputerToIterables.java | 2 +- .../main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java | 2 +- .../java/org/scijava/ops/adapt/lift/FunctionToIterables.java | 2 +- .../main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java | 2 +- .../scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java | 2 +- .../org/scijava/ops/conversionLoss/PrimitiveLossReporters.java | 2 +- .../src/main/java/org/scijava/ops/copy/CopyOpCollection.java | 2 +- .../main/java/org/scijava/ops/create/CreateOpCollection.java | 2 +- .../main/java/org/scijava/ops/impl/DefaultOpEnvironment.java | 2 +- scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java | 2 +- .../src/main/java/org/scijava/ops/math/MathOpCollection.java | 2 +- .../scijava-ops/src/main/java/org/scijava/ops/math/Power.java | 2 +- .../scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java | 2 +- .../scijava-ops/src/main/java/org/scijava/ops/math/Zero.java | 2 +- .../org/scijava/ops/simplify/PrimitiveArraySimplifiers.java | 2 +- .../java/org/scijava/ops/simplify/PrimitiveSimplifiers.java | 2 +- .../src/test/java/org/scijava/ops/OpCachingTest.java | 1 - .../java/org/scijava/ops/OpMethodDependencyPositionTest.java | 1 - .../scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java | 1 - .../src/test/java/org/scijava/ops/OpMethodTestOps.java | 1 - .../java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java | 2 +- .../ops/adapt/functional/ComputerToFunctionAdaptTestOps.java | 2 +- .../ops/adapt/functional/FunctionToComputerAdaptTestOps.java | 2 +- .../java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java | 2 +- .../java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java | 2 +- .../java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java | 2 +- .../org/scijava/ops/core/builder/OpBuilderNoOutputTest.java | 2 +- .../java/org/scijava/ops/core/builder/OpBuilderTestOps.java | 2 +- .../src/test/java/org/scijava/ops/hints/AdaptationHintTest.java | 2 +- .../test/java/org/scijava/ops/hints/SimplificationHintTest.java | 2 +- .../java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java | 2 +- .../test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java | 2 +- .../org/scijava/ops/simplify/SimplificationAdaptationTest.java | 2 +- .../org/scijava/ops/simplify/SimplificationPriorityTest.java | 2 +- .../src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java | 2 +- .../src/test/java/org/scijava/ops/simplify/SimplifyTest.java | 2 +- .../src/test/java/org/scijava/ops/util/OpsAsParametersTest.java | 2 +- .../src/test/java/org/scijava/param/JavadocParameterTest.java | 2 +- 75 files changed, 70 insertions(+), 75 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core => }/OpCollection.java (86%) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java index 42ed0532f..17d604834 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java @@ -52,8 +52,8 @@ import net.imglib2.type.numeric.real.FloatType; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java index 0cfec5064..d07d9a303 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java @@ -6,8 +6,8 @@ import net.imglib2.type.Type; import org.scijava.function.Functions; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java index 0284a33b9..8e6305b6a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java @@ -19,8 +19,8 @@ import net.imglib2.type.numeric.real.FloatType; import org.scijava.function.Producer; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java index 1c3357e06..127a95d60 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java @@ -50,8 +50,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; import org.scijava.function.Producer; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java index 2b2970849..9c18fc0bf 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java @@ -37,8 +37,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java index 822952bc1..8738143a7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java @@ -47,8 +47,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java index 130994197..c04f09d60 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/AbstractIntegralImg.java @@ -37,7 +37,7 @@ import net.imglib2.view.Views; import org.scijava.function.Computers; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java index b27516e18..7f6a29422 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/Inverters.java @@ -13,8 +13,8 @@ import net.imglib2.util.Util; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java index 50eef28f0..9e9564799 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java @@ -37,8 +37,8 @@ import org.joml.Vector3d; import org.joml.Vector3f; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java index 8ff58a48d..ffa853768 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java @@ -32,8 +32,8 @@ import net.imglib2.type.BooleanType; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java index 65d4306f6..563f02494 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java @@ -34,8 +34,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java index a0012071b..ccb11bca4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java @@ -32,8 +32,8 @@ import net.imglib2.type.numeric.RealType; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java index 5618692a6..16ab64985 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java @@ -33,8 +33,8 @@ import net.imglib2.type.numeric.NumericType; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java index fdd63a9fd..a5cf84cb2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/UnaryRealTypeMath.java @@ -36,8 +36,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java index 3723b627e..e43d392d8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/BlackTopHats.java @@ -14,8 +14,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java index 120c09a5e..779f6bab4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Closes.java @@ -14,8 +14,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java index dae7f33e3..a021844b7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Dilations.java @@ -14,8 +14,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java index 2320045a1..c61fec18e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java @@ -10,9 +10,9 @@ import org.scijava.function.Computers; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; import org.scijava.ops.core.ExceptionUtils; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java index cc1741188..e61ed8fc5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Erosions.java @@ -14,8 +14,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java index 518b84101..b2ca7a942 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java @@ -14,8 +14,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java index 3751f44ef..050eaf44e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Opens.java @@ -14,8 +14,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java index e3ffded8a..c3e1e1351 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java @@ -21,8 +21,8 @@ import net.imglib2.type.BooleanType; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java index c7e634d9e..2bde0e35e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/WhiteTopHats.java @@ -14,8 +14,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java index 63ff42c0e..b012e216e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/transform/Transforms.java @@ -35,8 +35,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java index 2213c607e..018bb372e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java @@ -8,8 +8,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java index 60177b1f7..3cf61831c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java @@ -14,8 +14,8 @@ import org.scijava.Priority; import org.scijava.function.Functions; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java index a252ea346..669669185 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/RAIToIIOps.java @@ -6,8 +6,8 @@ import net.imglib2.RandomAccessibleInterval; import net.imglib2.view.Views; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java index 6d96cc1b3..30d3920c2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/maxValue/MaxValueRealTypes.java @@ -24,8 +24,8 @@ import net.imglib2.type.numeric.real.DoubleType; import net.imglib2.type.numeric.real.FloatType; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java index df6dc9824..af28ece70 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/minValue/MinValueRealTypes.java @@ -24,8 +24,8 @@ import net.imglib2.type.numeric.real.DoubleType; import net.imglib2.type.numeric.real.FloatType; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java index e5427250d..c8cc021ca 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/slice/SliceTest.java @@ -51,7 +51,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.scijava.function.Computers; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java index b23dbe6d1..f907e6f71 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/TypeExtractorTests.java @@ -13,8 +13,8 @@ import net.imglib2.type.numeric.integer.UnsignedByteType; import org.junit.jupiter.api.Test; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.types.TypeExtractor; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java index 7456fdba3..af0e78c73 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftComputersToRAITest.java @@ -11,8 +11,8 @@ import org.junit.jupiter.api.Test; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.types.Nil; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java index f08f2ef3b..e0c082e95 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAITest.java @@ -15,8 +15,8 @@ import org.junit.jupiter.api.Test; import org.scijava.function.Functions; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java similarity index 86% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpCollection.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java index 1413c3816..3b6d79a2b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpCollection.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCollection.java @@ -1,4 +1,4 @@ -package org.scijava.ops.core; +package org.scijava.ops; import org.scijava.plugin.SciJavaPlugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java index 2c46e9970..eecb7c70f 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpField.java @@ -6,7 +6,6 @@ import java.lang.annotation.Target; import org.scijava.Priority; -import org.scijava.ops.core.OpCollection; /** Annotates an op declared as a field in an {@link OpCollection}. */ @Retention(RetentionPolicy.RUNTIME) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java index b783268a7..55ab08e92 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java @@ -41,8 +41,8 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java index 110be871c..111be587a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java @@ -37,8 +37,8 @@ import java.util.function.Function; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java index a96ccaf0f..627584125 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java @@ -38,8 +38,8 @@ import java.util.function.Function; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java index 74d03ee08..c66bca664 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java @@ -39,8 +39,8 @@ import java.util.function.Function; import org.scijava.function.Functions; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java index 692299db2..4991d429c 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java @@ -39,8 +39,8 @@ import java.util.function.Function; import org.scijava.function.Functions; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java index 4a4b3429b..728fb6ab0 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java @@ -37,8 +37,8 @@ import java.util.function.Function; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java index 0c9074269..1c8002a95 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java @@ -1,7 +1,7 @@ package org.scijava.ops.conversionLoss; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.OpHints; import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java index c159ec686..a069a780f 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java @@ -1,8 +1,8 @@ package org.scijava.ops.conversionLoss; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.hints.OpHints; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java index 83975861d..2e2c21cc3 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/copy/CopyOpCollection.java @@ -2,8 +2,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java index 4a3a63da2..c00f304a4 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java @@ -5,8 +5,8 @@ import org.scijava.Priority; import org.scijava.function.Producer; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index 8749981ac..d784c01c3 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -54,6 +54,7 @@ import org.scijava.Priority; import org.scijava.log.LogService; import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; import org.scijava.ops.OpDependencyMember; import org.scijava.ops.OpEnvironment; @@ -62,7 +63,6 @@ import org.scijava.ops.OpInstance; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.BaseOpHints.Adaptation; import org.scijava.ops.hints.BaseOpHints.DependencyMatching; import org.scijava.ops.hints.BaseOpHints.Simplification; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java index c0ab872ac..71324f789 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Add.java @@ -11,8 +11,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java index 8496b50ca..575f20bf1 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/MathOpCollection.java @@ -4,8 +4,8 @@ import java.util.function.BinaryOperator; import org.scijava.Priority; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java index 1be85150e..2f971f6a8 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Power.java @@ -3,8 +3,8 @@ import java.util.function.BiFunction; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java index 64f0806ce..02107ec02 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Sqrt.java @@ -4,8 +4,8 @@ import org.scijava.function.Computers; import org.scijava.function.Inplaces; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java index 85da2fc89..51d251142 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java @@ -3,8 +3,8 @@ import java.util.stream.IntStream; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java index 8d9ad13de..a10fcc1ff 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java @@ -3,8 +3,8 @@ import java.util.function.Function; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.hints.OpHints; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java index 9c279ed91..8b7e01bf0 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java @@ -3,8 +3,8 @@ import java.util.function.Function; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.hints.OpHints; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java index 33c8d2796..21978b9f2 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java @@ -40,7 +40,6 @@ import org.junit.jupiter.api.Assertions; import org.scijava.Context; import org.scijava.function.Producer; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.impl.DefaultOpEnvironment; import org.scijava.ops.impl.MatchingConditions; import org.scijava.ops.provenance.OpHistoryService; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java index 666cd7f77..6cb0d1d87 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodDependencyPositionTest.java @@ -8,7 +8,6 @@ import org.junit.Test; import org.scijava.function.Computers; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java index 1677c2599..f454725ac 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java @@ -42,7 +42,6 @@ import org.scijava.function.Computers; import org.scijava.function.Inplaces; import org.scijava.function.Producer; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java index f7743923c..1d9eefcd0 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java @@ -37,7 +37,6 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java index 9f5d60ed0..d6d084597 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java @@ -38,10 +38,10 @@ import org.scijava.function.Computers; import org.scijava.function.Producer; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction; import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.core.builder.OpBuilder; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java index 722eee90f..be74f6a3c 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java @@ -35,8 +35,8 @@ package org.scijava.ops.adapt.functional; import org.scijava.function.Computers; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java index cf9ea9d4b..2844e7d9e 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java @@ -38,8 +38,8 @@ import java.util.function.Function; import org.scijava.function.Functions; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java index e97b12d0c..d11b3bec6 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java @@ -38,8 +38,8 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java index cfe47e3a9..3a4868175 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java @@ -41,8 +41,8 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java index 1992f51e2..3c927a211 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java @@ -38,8 +38,8 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Inplaces; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java index 12c6070d5..cbf6a1141 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java @@ -8,8 +8,8 @@ import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java index 17bc33297..a5204bdd6 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java @@ -36,8 +36,8 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java index 08f282423..fdb3549ec 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java @@ -6,8 +6,8 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.function.Computers; import org.scijava.ops.hints.BaseOpHints.Adaptation; import org.scijava.ops.hints.impl.DefaultHints; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java index c9bf4b1b3..6b88523b0 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java @@ -7,8 +7,8 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.BaseOpHints.Adaptation; import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.hints.impl.DefaultHints; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java index 4af1519b6..4d6c61c3a 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java @@ -8,9 +8,9 @@ import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java index 7c966f4f7..5a5c6d3f7 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java @@ -8,8 +8,8 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.core.builder.OpBuilder; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java index 75e3ab6d3..8c5b7f11b 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationAdaptationTest.java @@ -4,8 +4,8 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java index ae605f733..159198392 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java @@ -8,9 +8,9 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; import org.scijava.ops.conversionLoss.LossReporter; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.hints.OpHints; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java index b193a353d..896a908fb 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyIOTest.java @@ -9,8 +9,8 @@ import org.scijava.function.Computers; import org.scijava.function.Inplaces; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java index cff119a6c..2c0515c4b 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplifyTest.java @@ -7,8 +7,8 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java index e239a9e1d..8c2e31247 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java @@ -9,8 +9,8 @@ import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java index 71bd28788..88e98727a 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java @@ -17,12 +17,12 @@ import org.scijava.function.Inplaces; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; import org.scijava.ops.OpField; import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; -import org.scijava.ops.core.OpCollection; import org.scijava.plugin.Plugin; /** From d3121a079eea9f862c2bcbc5dec0f7c77138cefe Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 28 Jun 2021 16:10:11 -0500 Subject: [PATCH 04/31] Move OpBuilder to org.scijava.ops OpEnvironment returns an OpBuilder, so OpBuilder should be in the same package --- .../test/java/net/imagej/ops2/coloc/ColocalisationTest.java | 2 +- .../src/test/java/net/imagej/ops2/convert/ConvertMapTest.java | 2 +- .../src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java | 2 +- .../imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java | 2 +- .../java/net/imagej/ops2/create/CreateKernelBiGaussTest.java | 2 +- .../ops2/features/hog/HistogramOfOrientedGradients2DTest.java | 2 +- .../ops2/filter/derivative/PartialDerivativeFilterTest.java | 2 +- .../net/imagej/ops2/filter/hessian/HessianFilterTest.java | 2 +- .../test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java | 2 +- .../java/net/imagej/ops2/filter/sobel/SobelFilterTest.java | 2 +- .../imagej/ops2/filter/vesselness/FrangiVesselnessTest.java | 2 +- .../src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java | 2 +- .../src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java | 2 +- .../image/distancetransform/DefaultDistanceTransformTest.java | 2 +- .../ops2/image/distancetransform/DistanceTransform3DTest.java | 2 +- .../net/imagej/ops2/image/histogram/DefaultHistogramTest.java | 2 +- .../java/net/imagej/ops2/image/normalize/NormalizeTest.java | 2 +- .../net/imagej/ops2/image/watershed/WatershedBinaryTest.java | 2 +- .../java/net/imagej/ops2/image/watershed/WatershedTest.java | 2 +- .../test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java | 2 +- .../test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java | 2 +- .../test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java | 2 +- .../src/test/java/net/imagej/ops2/logic/ConditionalTest.java | 2 +- scijava/scijava-ops/src/main/java/module-info.java | 3 --- .../java/org/scijava/ops/{core/builder => }/OpBuilder.java | 2 +- .../src/main/java/org/scijava/ops/OpEnvironment.java | 1 - .../scijava-ops/src/main/java/org/scijava/ops/OpService.java | 1 - .../ops/adapt/complexLift/ComputersToFunctionsAndLift.java | 2 +- .../ops/adapt/complexLift/FunctionsToComputersAndLift.java | 2 +- .../ops/adapt/functional/ComputersToFunctionsViaFunction.java | 2 +- .../ops/adapt/functional/ComputersToFunctionsViaSource.java | 2 +- .../scijava/ops/adapt/functional/FunctionsToComputers.java | 2 +- .../org/scijava/ops/adapt/functional/InplacesToFunctions.java | 2 +- .../java/org/scijava/ops/adapt/lift/ComputerToArrays.java | 2 +- .../java/org/scijava/ops/adapt/lift/ComputerToIterables.java | 2 +- .../java/org/scijava/ops/adapt/lift/FunctionToArrays.java | 2 +- .../java/org/scijava/ops/adapt/lift/FunctionToIterables.java | 2 +- .../main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java | 2 +- .../src/test/java/org/scijava/ops/AutoTransformTest.java | 1 - .../org/scijava/ops/{core/builder => }/OpBuilderTest.java | 2 +- .../org/scijava/ops/{core/builder => }/OpBuilderTestOps.java | 4 ++-- .../src/test/java/org/scijava/ops/OpMethodTest.java | 1 + .../src/test/java/org/scijava/ops/OpMethodTestOps.java | 1 + .../java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java | 2 +- .../adapt/complexLift/ComputerToFunctionIterablesTest.java | 2 +- .../adapt/complexLift/FunctionToComputerIterablesTest.java | 2 +- .../ops/adapt/functional/ComputerToFunctionAdaptTest.java | 2 +- .../ops/adapt/functional/ComputerToFunctionAdaptTestOps.java | 2 +- .../ops/adapt/functional/FunctionToComputerAdaptTest.java | 2 +- .../ops/adapt/functional/FunctionToComputerAdaptTestOps.java | 2 +- .../ops/adapt/functional/InplaceToFunctionAdaptTest.java | 2 +- .../java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java | 2 +- .../org/scijava/ops/adapt/lift/ComputerToIterablesTest.java | 2 +- .../java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java | 2 +- .../org/scijava/ops/adapt/lift/FunctionToIterablesTest.java | 2 +- .../java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java | 2 +- .../org/scijava/ops/core/builder/OpBuilderNoOutputTest.java | 1 + .../java/org/scijava/ops/matcher/MatchingWithGCSTTest.java | 2 +- .../test/java/org/scijava/ops/provenance/ProvenanceTest.java | 2 +- .../test/java/org/scijava/ops/util/OpsAsParametersTest.java | 2 +- scijava/scijava-ops/templates/main/java/module-info.vm | 2 -- .../java/org/scijava/ops/{core/builder => }/OpBuilder.list | 0 .../main/java/org/scijava/ops/{core/builder => }/OpBuilder.vm | 2 +- .../ops/adapt/complexLift/ComputersToFunctionsAndLift.vm | 2 +- .../ops/adapt/complexLift/FunctionsToComputersAndLift.vm | 2 +- .../ops/adapt/functional/ComputersToFunctionsViaFunction.vm | 2 +- .../ops/adapt/functional/ComputersToFunctionsViaSource.vm | 2 +- .../org/scijava/ops/adapt/functional/FunctionsToComputers.vm | 2 +- .../org/scijava/ops/adapt/functional/InplacesToFunctions.vm | 4 ++-- .../main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm | 2 +- .../java/org/scijava/ops/adapt/lift/ComputerToIterables.vm | 2 +- .../main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm | 2 +- .../java/org/scijava/ops/adapt/lift/FunctionToIterables.vm | 2 +- .../main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm | 2 +- .../org/scijava/ops/{core/builder => }/OpBuilderTest.list | 0 .../java/org/scijava/ops/{core/builder => }/OpBuilderTest.vm | 2 +- .../org/scijava/ops/{core/builder => }/OpBuilderTestOps.list | 0 .../org/scijava/ops/{core/builder => }/OpBuilderTestOps.vm | 4 ++-- .../templates/test/java/org/scijava/ops/OpMethodTest.vm | 2 +- .../templates/test/java/org/scijava/ops/OpMethodTestOps.vm | 2 +- .../ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm | 2 +- .../ops/adapt/complexLift/FunctionToComputerIterablesTest.vm | 2 +- .../ops/adapt/functional/ComputerToFunctionAdaptTest.vm | 2 +- .../ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm | 2 +- .../ops/adapt/functional/FunctionToComputerAdaptTest.vm | 2 +- .../ops/adapt/functional/FunctionToComputerAdaptTestOps.vm | 2 +- .../ops/adapt/functional/InplaceToFunctionAdaptTest.vm | 2 +- .../java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm | 2 +- .../org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm | 2 +- .../java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm | 2 +- .../org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm | 2 +- .../java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm | 2 +- 92 files changed, 87 insertions(+), 92 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core/builder => }/OpBuilder.java (99%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{core/builder => }/OpBuilderTest.java (99%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{core/builder => }/OpBuilderTestOps.java (99%) rename scijava/scijava-ops/templates/main/java/org/scijava/ops/{core/builder => }/OpBuilder.list (100%) rename scijava/scijava-ops/templates/main/java/org/scijava/ops/{core/builder => }/OpBuilder.vm (99%) rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTest.list (100%) rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTest.vm (99%) rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTestOps.list (100%) rename scijava/scijava-ops/templates/test/java/org/scijava/ops/{core/builder => }/OpBuilderTestOps.vm (97%) diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java index 84906856e..a768395f3 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java @@ -59,8 +59,8 @@ import org.scijava.app.StatusService; import org.scijava.cache.CacheService; import org.scijava.io.location.FileLocation; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpService; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.PluginService; import org.scijava.thread.ThreadService; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java index baa029624..54ab97359 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/convert/ConvertMapTest.java @@ -42,7 +42,7 @@ import net.imglib2.util.Intervals; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * Tests that the {@code convert} ops work on {@link Img} objects via diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java index a4ade1b69..d47df5c0b 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyArrayImgTest.java @@ -41,7 +41,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.util.MersenneTwisterFast; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java index f37dfcc81..e95257ecd 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernel2ndDerivBiGaussTest.java @@ -38,7 +38,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java index 7253ceec0..027da3ee4 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelBiGaussTest.java @@ -38,7 +38,7 @@ import net.imglib2.type.numeric.real.DoubleType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java index a52a0c486..ebf047468 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2DTest.java @@ -39,8 +39,8 @@ import net.imglib2.type.numeric.real.FloatType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java index 34bb5ec0a..1a7762338 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/derivative/PartialDerivativeFilterTest.java @@ -43,7 +43,7 @@ import net.imglib2.view.composite.RealComposite; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java index 940f283ff..8eb655c69 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/hessian/HessianFilterTest.java @@ -42,7 +42,7 @@ import net.imglib2.view.composite.RealComposite; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java index e0364ff52..2edd1da28 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/mean/MeanFilterTest.java @@ -10,7 +10,7 @@ import net.imglib2.type.numeric.integer.ByteType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class MeanFilterTest extends AbstractOpTest{ diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java index 550aa52a8..803527c17 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/sobel/SobelFilterTest.java @@ -40,7 +40,7 @@ import net.imglib2.util.Util; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java index fe2172ff0..e087a908d 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java @@ -48,8 +48,8 @@ import org.junit.jupiter.api.Test; import org.scijava.Context; import org.scijava.cache.CacheService; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpService; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.ops.provenance.OpHistory; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.PluginService; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java index 209bbfe3e..566f23c79 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java @@ -44,7 +44,7 @@ import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * This class tests the {@link DefaultConvexHull3D} implementation. The number diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java index e842c3045..fb63cc11c 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/ascii/ASCIITest.java @@ -38,7 +38,7 @@ import net.imglib2.util.Pair; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java index 94230f259..20686415b 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformTest.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.real.FloatType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; import org.scijava.util.MersenneTwisterFast; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java index d782d3692..b072ff63b 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/distancetransform/DistanceTransform3DTest.java @@ -38,8 +38,8 @@ import net.imglib2.type.numeric.real.FloatType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; import org.scijava.util.MersenneTwisterFast; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java index 409eae0ae..9467439a0 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/histogram/DefaultHistogramTest.java @@ -9,7 +9,7 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java index 8720141fa..abfb77813 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/normalize/NormalizeTest.java @@ -41,7 +41,7 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java index 4be48f061..f96b881af 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedBinaryTest.java @@ -45,8 +45,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; /** diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java index 935a00d61..9d861ae11 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/watershed/WatershedTest.java @@ -51,7 +51,7 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; import org.scijava.types.Nil; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java index dbba18b43..a11df24ba 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3dTest.java @@ -39,7 +39,7 @@ import org.joml.Quaterniondc; import org.joml.Vector3d; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * Tests for {@link Rotate3d}. diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java index 508658959..73cdeb339 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/linalg/rotate/Rotate3fTest.java @@ -39,7 +39,7 @@ import org.joml.Quaternionfc; import org.joml.Vector3f; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * Tests for {@link Rotate3f}. diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java index ff9eb39fa..b2ca28123 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/BooleanTypeLogicTest.java @@ -36,7 +36,7 @@ import net.imglib2.type.logic.BitType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * Tests {@link BooleanTypeLogic}. diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java index dc9551010..6f4b3a511 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/logic/ConditionalTest.java @@ -36,7 +36,7 @@ import net.imglib2.type.numeric.integer.ByteType; import org.junit.jupiter.api.Test; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * Tests {@link Ternary} and {@link Default}. diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java index 92d5debcc..191c887bc 100644 --- a/scijava/scijava-ops/src/main/java/module-info.java +++ b/scijava/scijava-ops/src/main/java/module-info.java @@ -7,8 +7,6 @@ //TODO: rearrange packages to export only needed classes exports org.scijava.ops; //contains OpDependency interface - exports org.scijava.ops.core; // contains OpCollection, Op interfaces - exports org.scijava.ops.core.builder; // contains OpBuilder classes exports org.scijava.ops.matcher; exports org.scijava.ops.math; exports org.scijava.ops.simplify; @@ -20,7 +18,6 @@ opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc; opens org.scijava.ops.log to therapi.runtime.javadoc; - opens org.scijava.ops.core.builder to therapi.runtime.javadoc; opens org.scijava.ops.copy to therapi.runtime.javadoc; opens org.scijava.ops.hints to therapi.runtime.javadoc; opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java similarity index 99% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java index 5015fedfc..e471459b5 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/builder/OpBuilder.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java @@ -32,7 +32,7 @@ * corresponding template in templates/ and rerun bin/generate.groovy. */ -package org.scijava.ops.core.builder; +package org.scijava.ops; import java.lang.reflect.Type; import java.util.function.BiFunction; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java index d9b815c8c..10b89dd90 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java @@ -31,7 +31,6 @@ import java.lang.reflect.Type; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.ops.hints.Hints; import org.scijava.ops.matcher.OpRef; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java index 150871589..cd597bd8d 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java @@ -28,7 +28,6 @@ */ package org.scijava.ops; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.ops.impl.DefaultOpEnvironment; import org.scijava.plugin.Plugin; import org.scijava.service.AbstractService; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java index 79b3dd7f7..7e9f6b8ee 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.java @@ -74,8 +74,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; -import org.scijava.ops.Op; import org.scijava.ops.OpDependency; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java index ab0ea811e..a3aaa5cad 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.java @@ -40,8 +40,8 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; -import org.scijava.ops.Op; import org.scijava.ops.OpDependency; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java index 9bf2868b2..d87cc3780 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.java @@ -39,8 +39,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; -import org.scijava.ops.Op; import org.scijava.ops.OpDependency; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java index 9d0b7ebe2..ee70eb362 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.java @@ -41,8 +41,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Producer; -import org.scijava.ops.Op; import org.scijava.ops.OpDependency; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java index ead54e7cc..0037ac545 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.java @@ -40,8 +40,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Producer; -import org.scijava.ops.Op; import org.scijava.ops.OpDependency; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java index 55ab08e92..c3f5e132e 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.java @@ -40,9 +40,9 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; +import org.scijava.ops.OpDependency; import org.scijava.ops.Op; import org.scijava.ops.OpCollection; -import org.scijava.ops.OpDependency; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java index 111be587a..eebd67cb5 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.java @@ -37,8 +37,8 @@ import java.util.function.Function; import org.scijava.function.Computers; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java index 627584125..c70930437 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java @@ -38,8 +38,8 @@ import java.util.function.Function; import org.scijava.function.Computers; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java index c66bca664..25f1a5689 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.java @@ -39,8 +39,8 @@ import java.util.function.Function; import org.scijava.function.Functions; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java index 4991d429c..0c6cb0452 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.java @@ -39,8 +39,8 @@ import java.util.function.Function; import org.scijava.function.Functions; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java index 728fb6ab0..3e58d7558 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.java @@ -37,8 +37,8 @@ import java.util.function.Function; import org.scijava.function.Inplaces; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java index f8785a351..076301020 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/AutoTransformTest.java @@ -38,7 +38,6 @@ import org.junit.Test; import org.scijava.function.Computers; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; //TODO: think about removing this class diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java similarity index 99% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java index b51f6da8f..6846fe0e4 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTest.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.core.builder; +package org.scijava.ops; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java similarity index 99% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java index a5204bdd6..7e7df8702 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderTestOps.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.core.builder; +package org.scijava.ops; import java.util.function.BiFunction; import java.util.function.Function; @@ -36,8 +36,8 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java index f454725ac..8fd968092 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java @@ -42,6 +42,7 @@ import org.scijava.function.Computers; import org.scijava.function.Inplaces; import org.scijava.function.Producer; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java index 1d9eefcd0..9a9907031 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java @@ -37,6 +37,7 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java index d6d084597..ba17419ce 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java @@ -38,11 +38,11 @@ import org.scijava.function.Computers; import org.scijava.function.Producer; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction; import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java index cff69061f..3b54fed83 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.java @@ -42,7 +42,7 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java index b4d70ac2c..cfca57cbb 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.java @@ -40,7 +40,7 @@ import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; public class FunctionToComputerIterablesTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java index 0a0498d0f..d7f8b4c59 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.java @@ -38,7 +38,7 @@ import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java index be74f6a3c..453f7aeab 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.java @@ -35,8 +35,8 @@ package org.scijava.ops.adapt.functional; import org.scijava.function.Computers; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java index 5c0656393..b30eabb53 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.java @@ -37,7 +37,7 @@ import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; public class FunctionToComputerAdaptTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java index 2844e7d9e..93bf96dfb 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.java @@ -38,8 +38,8 @@ import java.util.function.Function; import org.scijava.function.Functions; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java index 5946ac834..43039aa61 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.java @@ -40,7 +40,7 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java index d11b3bec6..0903cf7a6 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.java @@ -38,8 +38,8 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java index 9da2f3b43..eb9b6e8fa 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.java @@ -42,7 +42,7 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * Tests the adaptation of {@link Computers} running on a type into diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java index 3a4868175..79d3285db 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.java @@ -41,8 +41,8 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java index df63676ce..fecffb2ce 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.java @@ -40,7 +40,7 @@ import org.junit.Test; import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java index 3c927a211..4a049ed93 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.java @@ -38,8 +38,8 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Inplaces; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java index cbf6a1141..dcac1b7f0 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java @@ -8,6 +8,7 @@ import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; import org.scijava.param.Parameter; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java index 5a5c6d3f7..37597f5c9 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithGCSTTest.java @@ -8,9 +8,9 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java index 54e79c9ee..9b41fc2fa 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java @@ -17,7 +17,7 @@ import org.scijava.ops.OpField; import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.ops.hints.Hints; import org.scijava.ops.hints.impl.DefaultHints; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java index 8c2e31247..91661493e 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java @@ -9,9 +9,9 @@ import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.builder.OpBuilder; import org.scijava.types.Nil; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm index d42f7c123..60119399a 100644 --- a/scijava/scijava-ops/templates/main/java/module-info.vm +++ b/scijava/scijava-ops/templates/main/java/module-info.vm @@ -13,8 +13,6 @@ module org.scijava.ops { #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava")) //TODO: rearrange packages to export only needed classes exports org.scijava.ops; //contains OpDependency interface - exports org.scijava.ops.core; // contains OpCollection, Op interfaces - exports org.scijava.ops.core.builder; // contains OpBuilder classes exports org.scijava.ops.matcher; exports org.scijava.ops.math; exports org.scijava.ops.simplify; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list similarity index 100% rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.list rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm similarity index 99% rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm index ecccf660b..289c11fc8 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/core/builder/OpBuilder.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm @@ -32,7 +32,7 @@ * corresponding template in templates/ and rerun bin/generate.groovy. */ -package org.scijava.ops.core.builder; +package org.scijava.ops; import java.lang.reflect.Type; import java.util.function.BiFunction; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm index c05667e64..93da58b1e 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/ComputersToFunctionsAndLift.vm @@ -75,7 +75,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm index 59d0088c8..72f65052c 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/complexLift/FunctionsToComputersAndLift.vm @@ -41,7 +41,7 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm index 788fd0d0f..ac0e65fc3 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaFunction.vm @@ -40,7 +40,7 @@ import java.util.function.Function; import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm index 389325b38..99306c671 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/ComputersToFunctionsViaSource.vm @@ -42,7 +42,7 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Producer; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm index e0b00c492..f4879200b 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/FunctionsToComputers.vm @@ -41,7 +41,7 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Producer; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; +import org.scijava.ops.Op; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm index f3e3a1183..7e29a5268 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/functional/InplacesToFunctions.vm @@ -41,8 +41,8 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.ops.OpDependency; -import org.scijava.ops.core.Op; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; #set($classArity = $maxArity + 1) diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm index 8ed29b630..b20e6bc33 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToArrays.vm @@ -38,7 +38,7 @@ import java.util.function.Function; import org.scijava.function.Computers; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm index 702bb69ac..3b02876a8 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm @@ -39,7 +39,7 @@ import java.util.function.Function; import org.scijava.function.Computers; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm index 88af66634..f98763699 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToArrays.vm @@ -40,7 +40,7 @@ import java.util.function.Function; import org.scijava.function.Functions; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm index 1bff435b9..f8bf9c9a3 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/FunctionToIterables.vm @@ -40,7 +40,7 @@ import java.util.function.Function; import org.scijava.function.Functions; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm index cead7be70..a90ec37f6 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/InplaceToArrays.vm @@ -38,7 +38,7 @@ import java.util.function.Function; import org.scijava.function.Inplaces; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.list b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.list similarity index 100% rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.list rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.list diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm similarity index 99% rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm index e64ba305b..ddcb664f4 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTest.vm @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.core.builder; +package org.scijava.ops; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.list b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.list similarity index 100% rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.list rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.list diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm similarity index 97% rename from scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm rename to scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm index 9be64ce4b..e10b8b0c3 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/core/builder/OpBuilderTestOps.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpBuilderTestOps.vm @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.core.builder; +package org.scijava.ops; import java.util.function.BiFunction; import java.util.function.Function; @@ -37,7 +37,7 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm index f614927f6..2e06fa1f2 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTest.vm @@ -42,7 +42,7 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.function.Inplaces; import org.scijava.function.Producer; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm index c022cc5d1..4361862ac 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/OpMethodTestOps.vm @@ -37,7 +37,7 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm index cc834c67f..965ee580f 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/ComputerToFunctionIterablesTest.vm @@ -42,7 +42,7 @@ import java.util.List; import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm index f0ef64fe6..a2f7e80c4 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/complexLift/FunctionToComputerIterablesTest.vm @@ -40,7 +40,7 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; public class FunctionToComputerIterablesTest extends AbstractTestEnvironment { #foreach($arity in [1..$maxArity]) diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm index 014aa1284..b37305228 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTest.vm @@ -38,7 +38,7 @@ package org.scijava.ops.adapt.functional; import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; public class ComputerToFunctionAdaptTest extends AbstractTestEnvironment { #foreach($arity in [1..$maxArity]) diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm index 64acd53c6..1e3de0e7f 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/ComputerToFunctionAdaptTestOps.vm @@ -36,7 +36,7 @@ package org.scijava.ops.adapt.functional; import org.scijava.function.Computers; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm index 0f0917d04..bc8298360 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTest.vm @@ -37,7 +37,7 @@ package org.scijava.ops.adapt.functional; import org.junit.Assert; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; public class FunctionToComputerAdaptTest extends AbstractTestEnvironment { #foreach($arity in [1..$maxArity]) diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm index 723e9503e..42676adbe 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/FunctionToComputerAdaptTestOps.vm @@ -39,7 +39,7 @@ import java.util.function.Function; import org.scijava.function.Functions; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm index d86ab3e9a..48df13f20 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/functional/InplaceToFunctionAdaptTest.vm @@ -40,7 +40,7 @@ import java.util.Arrays; import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class InplaceToFunctionAdaptTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm index bc4d2e290..202abac4d 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToArraysTest.vm @@ -39,7 +39,7 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm index acf32683f..e0d7ae304 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/ComputerToIterablesTest.vm @@ -42,7 +42,7 @@ import java.util.List; import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; /** * Tests the adaptation of {@link Computers} running on a type into diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm index e1ea8eec7..3730150da 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToArraysTest.vm @@ -42,7 +42,7 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm index 6d7599b89..2c79a9387 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/FunctionToIterablesTest.vm @@ -40,7 +40,7 @@ import java.util.List; import org.junit.Test; import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.core.builder.OpBuilder; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm index 2235a214a..61a50a6a3 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/adapt/lift/InplaceToArraysTest.vm @@ -39,7 +39,7 @@ import org.junit.jupiter.api.Assertions; import org.scijava.function.Inplaces; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.OpField; -import org.scijava.ops.core.OpCollection; +import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; /** From 078f56a08defea4e4510d6c83724e8e12549cd94 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 28 Jun 2021 16:33:10 -0500 Subject: [PATCH 05/31] Move Hints/OpHints to org.scijava.ops Since OpEnvironments have Hints, the Hints need to be in the base package. --- scijava/scijava-ops/src/main/java/module-info.java | 3 +-- .../org/scijava/ops/{hints => }/BaseOpHints.java | 2 +- .../java/org/scijava/ops/{hints => }/Hints.java | 4 ++-- .../src/main/java/org/scijava/ops/OpBuilder.java | 2 +- .../main/java/org/scijava/ops/OpEnvironment.java | 1 - .../java/org/scijava/ops/{hints => }/OpHints.java | 2 +- .../src/main/java/org/scijava/ops/OpInfo.java | 4 +--- .../ops/conversionLoss/IdentityLossReporter.java | 4 ++-- .../ops/conversionLoss/LossReporterWrapper.java | 4 ++-- .../PrimitiveArrayLossReporters.java | 4 ++-- .../ops/conversionLoss/PrimitiveLossReporters.java | 4 ++-- .../ops/{hints/impl => hint}/AbstractHints.java | 4 ++-- .../ops/{hints/impl => hint}/AdaptationHints.java | 6 +++--- .../ops/{hints/impl => hint}/DefaultHints.java | 10 +++++----- .../ops/{hints/impl => hint}/ImmutableHints.java | 4 ++-- .../{hints/impl => hint}/SimplificationHints.java | 6 +++--- .../org/scijava/ops/impl/DefaultOpEnvironment.java | 14 +++++++------- .../org/scijava/ops/impl/MatchingConditions.java | 2 +- .../org/scijava/ops/matcher/DefaultOpMatcher.java | 6 +++--- .../org/scijava/ops/matcher/OpAdaptationInfo.java | 8 ++++---- .../java/org/scijava/ops/matcher/OpClassInfo.java | 4 ++-- .../java/org/scijava/ops/matcher/OpFieldInfo.java | 4 ++-- .../java/org/scijava/ops/matcher/OpMatcher.java | 2 +- .../java/org/scijava/ops/matcher/OpMethodInfo.java | 4 ++-- .../java/org/scijava/ops/matcher/OpWrappers.java | 4 ++-- .../java/org/scijava/ops/simplify/Identity.java | 4 ++-- .../ops/simplify/InfoSimplificationGenerator.java | 2 +- .../ops/simplify/PrimitiveArraySimplifiers.java | 4 ++-- .../scijava/ops/simplify/PrimitiveSimplifiers.java | 4 ++-- .../org/scijava/ops/simplify/SimplifiedOpInfo.java | 10 +++++----- .../org/scijava/ops/simplify/SimplifiedOpRef.java | 13 +++++-------- .../java/org/scijava/ops/util/ComputerUtils.java | 2 +- .../java/org/scijava/ops/util/FunctionUtils.java | 2 +- .../java/org/scijava/ops/util/InplaceUtils.java | 2 +- .../main/java/org/scijava/ops/util/OpWrapper.java | 2 +- .../{core/builder => }/OpBuilderNoOutputTest.java | 3 +-- .../test/java/org/scijava/ops/OpMethodTest.java | 1 - .../test/java/org/scijava/ops/OpMethodTestOps.java | 1 - .../org/scijava/ops/hints/AdaptationHintTest.java | 6 ++++-- .../scijava/ops/hints/SimplificationHintTest.java | 8 +++++--- .../org/scijava/ops/provenance/ProvenanceTest.java | 6 +++--- .../ops/simplify/SimplificationPriorityTest.java | 4 ++-- .../main/java/org/scijava/ops/OpBuilder.vm | 2 +- .../java/org/scijava/ops/matcher/OpWrappers.vm | 14 +++++++------- .../java/org/scijava/ops/util/ComputerUtils.vm | 2 +- .../java/org/scijava/ops/util/FunctionUtils.vm | 2 +- .../main/java/org/scijava/ops/util/InplaceUtils.vm | 2 +- 47 files changed, 101 insertions(+), 107 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints => }/BaseOpHints.java (94%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints => }/Hints.java (91%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints => }/OpHints.java (89%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/AbstractHints.java (92%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/AdaptationHints.java (85%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/DefaultHints.java (71%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/ImmutableHints.java (88%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{hints/impl => hint}/SimplificationHints.java (88%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{core/builder => }/OpBuilderNoOutputTest.java (91%) diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java index 191c887bc..5010452e3 100644 --- a/scijava/scijava-ops/src/main/java/module-info.java +++ b/scijava/scijava-ops/src/main/java/module-info.java @@ -19,7 +19,7 @@ opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc; opens org.scijava.ops.log to therapi.runtime.javadoc; opens org.scijava.ops.copy to therapi.runtime.javadoc; - opens org.scijava.ops.hints to therapi.runtime.javadoc; + opens org.scijava.ops.hint to therapi.runtime.javadoc; opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc; opens org.scijava.ops.math to therapi.runtime.javadoc; opens org.scijava.ops.adapt.lift to therapi.runtime.javadoc; @@ -27,7 +27,6 @@ opens org.scijava.ops.impl to therapi.runtime.javadoc, org.scijava; opens org.scijava.ops.monitor to therapi.runtime.javadoc; opens org.scijava.ops.provenance to therapi.runtime.javadoc; - opens org.scijava.ops.hints.impl to therapi.runtime.javadoc; opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc; opens org.scijava.ops to therapi.runtime.javadoc, org.scijava; opens org.scijava.ops.util to therapi.runtime.javadoc; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/BaseOpHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java similarity index 94% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/BaseOpHints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java index 647222a02..0e5f8aa25 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/BaseOpHints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/BaseOpHints.java @@ -1,4 +1,4 @@ -package org.scijava.ops.hints; +package org.scijava.ops; import java.lang.annotation.Annotation; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java similarity index 91% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java index af66b188d..4b7fb1f42 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/Hints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java @@ -1,11 +1,11 @@ -package org.scijava.ops.hints; +package org.scijava.ops; import java.util.Deque; import java.util.Map; import java.util.UUID; -import org.scijava.ops.hints.BaseOpHints.Simplification; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.provenance.OpHistory; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java index e471459b5..141183305 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java @@ -43,7 +43,7 @@ import org.scijava.function.Inplaces; import org.scijava.function.Producer; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.ops.util.ComputerUtils; import org.scijava.ops.util.FunctionUtils; import org.scijava.ops.util.InplaceUtils; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java index 10b89dd90..55c10e687 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java @@ -31,7 +31,6 @@ import java.lang.reflect.Type; -import org.scijava.ops.hints.Hints; import org.scijava.ops.matcher.OpRef; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/OpHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java similarity index 89% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/OpHints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java index b245c4e17..b624069d4 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/OpHints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHints.java @@ -1,5 +1,5 @@ -package org.scijava.ops.hints; +package org.scijava.ops; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java index de0747cfa..0f99368a2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java @@ -8,9 +8,7 @@ import java.util.Map; import org.scijava.log.Logger; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.OpHints; -import org.scijava.ops.hints.impl.ImmutableHints; +import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.matcher.OpCandidate; import org.scijava.ops.matcher.OpRef; import org.scijava.param.ValidityException; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java index c89ff6ae9..9659ed887 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/IdentityLossReporter.java @@ -1,9 +1,9 @@ package org.scijava.ops.conversionLoss; -import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.Op; -import org.scijava.ops.hints.OpHints; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java index 26fcbb1cd..a7b62f51b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java @@ -3,9 +3,9 @@ import java.lang.reflect.Type; import java.util.UUID; +import org.scijava.ops.BaseOpHints.DependencyMatching; +import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; -import org.scijava.ops.hints.BaseOpHints.DependencyMatching; -import org.scijava.ops.hints.Hints; import org.scijava.ops.provenance.OpExecutionSummary; import org.scijava.ops.provenance.OpHistory; import org.scijava.ops.util.OpWrapper; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java index 1c8002a95..29781f59b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveArrayLossReporters.java @@ -2,8 +2,8 @@ import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.hints.OpHints; -import org.scijava.ops.hints.BaseOpHints.Simplification; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java index a069a780f..f2d428fc4 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/PrimitiveLossReporters.java @@ -3,8 +3,8 @@ import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.OpHints; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AbstractHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java similarity index 92% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AbstractHints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java index 7ca7bb648..11fa46d05 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AbstractHints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AbstractHints.java @@ -1,11 +1,11 @@ -package org.scijava.ops.hints.impl; +package org.scijava.ops.hint; import java.util.HashMap; import java.util.Map; import java.util.NoSuchElementException; import java.util.UUID; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; /** * Abstract class containing behavior common to most {@link Hints} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AdaptationHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java similarity index 85% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AdaptationHints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java index f151c8153..d910a88ff 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/AdaptationHints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/AdaptationHints.java @@ -1,12 +1,12 @@ -package org.scijava.ops.hints.impl; +package org.scijava.ops.hint; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.BaseOpHints.Adaptation; +import org.scijava.ops.Hints; +import org.scijava.ops.BaseOpHints.Adaptation; /** * A set of {@link Hints} governing Adaptation procedures. diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/DefaultHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java similarity index 71% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/DefaultHints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java index ef7862d4b..f37ee34db 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/DefaultHints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/DefaultHints.java @@ -1,13 +1,13 @@ -package org.scijava.ops.hints.impl; +package org.scijava.ops.hint; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.BaseOpHints.Adaptation; -import org.scijava.ops.hints.BaseOpHints.DependencyMatching; -import org.scijava.ops.hints.BaseOpHints.Simplification; +import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.BaseOpHints.DependencyMatching; +import org.scijava.ops.BaseOpHints.Simplification; +import org.scijava.ops.Hints; /** * Default Implementation of {@link Hints} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/ImmutableHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java similarity index 88% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/ImmutableHints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java index 6e45e6e31..d3c2613e8 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/ImmutableHints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/ImmutableHints.java @@ -1,10 +1,10 @@ -package org.scijava.ops.hints.impl; +package org.scijava.ops.hint; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; /** * A {@link Hints} not modifiable after creation. diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/SimplificationHints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java similarity index 88% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/SimplificationHints.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java index b6d4b42f3..b99c31d90 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/hints/impl/SimplificationHints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/hint/SimplificationHints.java @@ -1,12 +1,12 @@ -package org.scijava.ops.hints.impl; +package org.scijava.ops.hint; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.BaseOpHints.Simplification; +import org.scijava.ops.Hints; +import org.scijava.ops.BaseOpHints.Simplification; public class SimplificationHints extends AbstractHints { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index d784c01c3..c950a2bde 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -53,6 +53,10 @@ import org.scijava.InstantiableException; import org.scijava.Priority; import org.scijava.log.LogService; +import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.BaseOpHints.DependencyMatching; +import org.scijava.ops.BaseOpHints.Simplification; +import org.scijava.ops.Hints; import org.scijava.ops.Op; import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; @@ -63,13 +67,9 @@ import org.scijava.ops.OpInstance; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; -import org.scijava.ops.hints.BaseOpHints.Adaptation; -import org.scijava.ops.hints.BaseOpHints.DependencyMatching; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.impl.AdaptationHints; -import org.scijava.ops.hints.impl.DefaultHints; -import org.scijava.ops.hints.impl.SimplificationHints; +import org.scijava.ops.hint.AdaptationHints; +import org.scijava.ops.hint.DefaultHints; +import org.scijava.ops.hint.SimplificationHints; import org.scijava.ops.matcher.DefaultOpMatcher; import org.scijava.ops.matcher.DependencyMatchingException; import org.scijava.ops.matcher.MatchingUtils; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java index 85c4b29bd..b25ec8605 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java @@ -3,7 +3,7 @@ import java.util.Objects; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.ops.matcher.OpRef; public class MatchingConditions { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java index dbd71d3b3..3b8d8d6a6 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java @@ -44,12 +44,12 @@ import java.util.function.Predicate; import org.scijava.log.Logger; +import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.impl.DefaultHints; +import org.scijava.ops.BaseOpHints.Simplification; +import org.scijava.ops.hint.DefaultHints; import org.scijava.ops.matcher.OpCandidate.StatusCode; import org.scijava.ops.simplify.InfoSimplificationGenerator; import org.scijava.service.AbstractService; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java index d46dd9882..03ce14ba1 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java @@ -8,13 +8,13 @@ import java.util.function.Function; import java.util.stream.Collectors; +import org.scijava.ops.Hints; import org.scijava.ops.OpDependencyMember; +import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.hints.BaseOpHints.Adaptation; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.OpHints; -import org.scijava.ops.hints.impl.ImmutableHints; +import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.hint.ImmutableHints; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; import org.scijava.struct.Struct; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java index 7a8a4173a..6e69658fb 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java @@ -36,11 +36,11 @@ import java.util.List; import org.scijava.Priority; +import org.scijava.ops.Hints; import org.scijava.ops.OpDependencyMember; +import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.OpHints; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java index f75ed601e..1b434466a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java @@ -37,11 +37,11 @@ import java.util.List; import org.scijava.Priority; +import org.scijava.ops.Hints; import org.scijava.ops.OpField; +import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.OpHints; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; import org.scijava.param.ValidityProblem; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java index 02b4a2ccd..61c28db31 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java @@ -31,8 +31,8 @@ import java.util.List; +import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; /** * Finds Ops which match an {@link OpRef}. diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java index 35f1c392e..88180e45a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java @@ -43,13 +43,13 @@ import java.util.stream.Collectors; import org.scijava.Priority; +import org.scijava.ops.Hints; import org.scijava.ops.OpDependency; import org.scijava.ops.OpDependencyMember; +import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.OpHints; import org.scijava.ops.util.Adapt; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java index 8b7e5ea82..865bfbfbd 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java @@ -15,9 +15,9 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; +import org.scijava.ops.BaseOpHints.DependencyMatching; +import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; -import org.scijava.ops.hints.BaseOpHints.DependencyMatching; -import org.scijava.ops.hints.Hints; import org.scijava.ops.provenance.OpExecutionSummary; import org.scijava.ops.provenance.OpHistory; import org.scijava.ops.util.OpWrapper; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java index 81e2b3d7f..6aaa382a2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/Identity.java @@ -3,9 +3,9 @@ import java.util.function.Function; -import org.scijava.ops.hints.BaseOpHints.Simplification; import org.scijava.ops.Op; -import org.scijava.ops.hints.OpHints; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.plugin.Plugin; @OpHints(hints = { Simplification.FORBIDDEN }) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java index 2d22f1e24..a26fbbe0a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java @@ -9,10 +9,10 @@ import java.util.Map; import java.util.Optional; +import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.hints.Hints; import org.scijava.ops.matcher.OpMatchingException; import org.scijava.ops.matcher.OpRef; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java index a10fcc1ff..b2b470174 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveArraySimplifiers.java @@ -5,8 +5,8 @@ import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.OpHints; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.plugin.Plugin; import org.scijava.util.ObjectArray; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java index 8b7e01bf0..b2c825e57 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/PrimitiveSimplifiers.java @@ -5,8 +5,8 @@ import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.OpHints; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java index 82f99ae1e..1a3bf6862 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java @@ -9,16 +9,16 @@ import java.util.stream.Collectors; import org.scijava.Priority; +import org.scijava.ops.Hints; import org.scijava.ops.Op; import org.scijava.ops.OpEnvironment; +import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; +import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.conversionLoss.LossReporter; -import org.scijava.ops.hints.BaseOpHints.Adaptation; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.OpHints; -import org.scijava.ops.hints.impl.ImmutableHints; +import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.matcher.OpMatchingException; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java index fcb1a8c82..78c16bdc0 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java @@ -5,18 +5,15 @@ import java.util.List; import java.util.Optional; -import org.scijava.ops.OpEnvironment; -import org.scijava.ops.OpInfo; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.impl.DefaultHints; -import org.scijava.ops.hints.BaseOpHints.Adaptation; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.matcher.OpMatchingException; import org.scijava.function.Computers; import org.scijava.function.Computers.Arity1; +import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.BaseOpHints.Simplification; +import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; +import org.scijava.ops.hint.DefaultHints; +import org.scijava.ops.matcher.OpMatchingException; import org.scijava.ops.matcher.OpRef; import org.scijava.types.Nil; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java index 0f65080b2..2f64c817a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java @@ -15,7 +15,7 @@ import org.scijava.function.Computers; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.types.Nil; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java index ca6b34954..60eaed736 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java @@ -17,7 +17,7 @@ import org.scijava.function.Functions; import org.scijava.function.Producer; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.types.Nil; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java index 329ece2af..40dc9b1ee 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java @@ -17,7 +17,7 @@ import org.scijava.function.Inplaces; import org.scijava.function.Mutable; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.types.Nil; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java index f42138593..810f941b0 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java @@ -4,8 +4,8 @@ import java.lang.reflect.Type; import java.util.UUID; +import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; -import org.scijava.ops.hints.Hints; import org.scijava.ops.provenance.OpHistory; import org.scijava.plugin.SciJavaPlugin; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java similarity index 91% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java index dcac1b7f0..d642ba3d6 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/core/builder/OpBuilderNoOutputTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java @@ -1,5 +1,5 @@ -package org.scijava.ops.core.builder; +package org.scijava.ops; import java.lang.reflect.Type; import java.util.ArrayList; @@ -7,7 +7,6 @@ import org.junit.Assert; import org.junit.Test; -import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.OpBuilder; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java index 8fd968092..313bd23f7 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTest.java @@ -44,7 +44,6 @@ import org.scijava.function.Producer; import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; -import org.scijava.struct.ItemIO; import org.scijava.types.Nil; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java index 9a9907031..d67e346fe 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpMethodTestOps.java @@ -39,7 +39,6 @@ import org.scijava.function.Producer; import org.scijava.ops.OpCollection; import org.scijava.plugin.Plugin; -import org.scijava.struct.ItemIO; @Plugin(type = OpCollection.class) public class OpMethodTestOps { diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java index fdb3549ec..a7c4d7955 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/AdaptationHintTest.java @@ -6,11 +6,13 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.Hints; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.hint.DefaultHints; import org.scijava.function.Computers; -import org.scijava.ops.hints.BaseOpHints.Adaptation; -import org.scijava.ops.hints.impl.DefaultHints; import org.scijava.ops.matcher.OpMatchingException; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java index 6b88523b0..618d6d3dd 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/hints/SimplificationHintTest.java @@ -7,11 +7,13 @@ import org.junit.Test; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.Hints; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.hints.BaseOpHints.Adaptation; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.impl.DefaultHints; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.BaseOpHints.Simplification; +import org.scijava.ops.hint.DefaultHints; import org.scijava.ops.matcher.OpMatchingException; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java index 9b41fc2fa..6fb17de2f 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java @@ -13,13 +13,13 @@ import org.scijava.Priority; import org.scijava.function.Producer; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.Hints; +import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; import org.scijava.ops.OpField; import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; -import org.scijava.ops.OpCollection; -import org.scijava.ops.hints.Hints; -import org.scijava.ops.hints.impl.DefaultHints; +import org.scijava.ops.hint.DefaultHints; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java index 159198392..44824d677 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/simplify/SimplificationPriorityTest.java @@ -10,9 +10,9 @@ import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; +import org.scijava.ops.OpHints; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.conversionLoss.LossReporter; -import org.scijava.ops.hints.BaseOpHints.Simplification; -import org.scijava.ops.hints.OpHints; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm index 289c11fc8..364961f5e 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm @@ -43,7 +43,7 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.ops.util.ComputerUtils; import org.scijava.ops.util.FunctionUtils; import org.scijava.ops.util.InplaceUtils; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm index 10efa2822..07e5ee540 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm @@ -15,11 +15,11 @@ import org.scijava.function.Container; import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; +import org.scijava.ops.BaseOpHints.DependencyMatching; +import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; -import org.scijava.ops.hints.BaseOpHints.DependencyMatching; -import org.scijava.ops.hints.Hints; import org.scijava.ops.provenance.OpExecutionSummary; -import org.scijava.ops.provenance.OpHistoryService; +import org.scijava.ops.provenance.OpHistory; import org.scijava.ops.util.OpWrapper; import org.scijava.plugin.Plugin; import org.scijava.types.GenericTyped; @@ -32,7 +32,7 @@ public class OpWrappers { public static class ProducerOpWrapper implements OpWrapper> { @Override - public Producer wrap(final Producer op, final OpInfo info, final Hints hints, final OpHistoryService history, final UUID executionID, final Type reifiedType) { + public Producer wrap(final Producer op, final OpInfo info, final Hints hints, final OpHistory history, final UUID executionID, final Type reifiedType) { class GenericTypedProducer implements Producer, GenericTyped { @Override @@ -73,7 +73,7 @@ public class OpWrappers { final $fg op, // final OpInfo info, // final Hints hints, // - final OpHistoryService history, // + final OpHistory history, // final UUID executionID, // final Type reifiedType) { @@ -121,7 +121,7 @@ public class OpWrappers { final $cg op, // final OpInfo info, // final Hints hints, // - final OpHistoryService history, // + final OpHistory history, // final UUID executionID, // final Type reifiedType) { @@ -169,7 +169,7 @@ public class OpWrappers { final $ig op, // final OpInfo info, // final Hints hints, // - final OpHistoryService history, // + final OpHistory history, // final UUID executionID, // final Type reifiedType) { diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm index cc07a76ad..d01e5ef63 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm @@ -15,7 +15,7 @@ import java.util.function.Consumer; import org.scijava.function.Computers; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.types.Nil; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm index af0e19b48..fb28b968e 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm @@ -17,7 +17,7 @@ import java.util.function.Function; import org.scijava.function.Functions; import org.scijava.function.Producer; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.types.Nil; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm index c6dfd4bd5..7bacb1459 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm @@ -17,7 +17,7 @@ import java.util.stream.Collectors; import org.scijava.function.Inplaces; import org.scijava.function.Mutable; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.hints.Hints; +import org.scijava.ops.Hints; import org.scijava.types.Nil; import org.scijava.types.Types; From eb53ac4afd0e8cac7faa0190196dfee8976db384 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 09:51:14 -0500 Subject: [PATCH 06/31] Extract OpService interface --- .../src/main/java/org/scijava/ops/OpInfo.java | 5 -- .../main/java/org/scijava/ops/OpService.java | 26 ++----- .../scijava/ops/impl/DefaultOpService.java | 78 +++++++++++++++++++ .../scijava/ops/matcher/OpAdaptationInfo.java | 9 --- .../org/scijava/ops/matcher/OpClassInfo.java | 6 ++ .../org/scijava/ops/matcher/OpFieldInfo.java | 8 ++ .../org/scijava/ops/matcher/OpMethodInfo.java | 7 ++ .../ops/simplify/SimplifiedOpInfo.java | 9 --- 8 files changed, 104 insertions(+), 44 deletions(-) create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java index 0f99368a2..2dfe28db6 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java @@ -34,11 +34,6 @@ public interface OpInfo extends Comparable { /** Gets the hints declared in the {@link OpHints} annotation */ Hints declaredHints(); - default Hints formHints(OpHints h) { - if (h == null) return new ImmutableHints(new String[0]); - return new ImmutableHints(h.hints()); - } - /** Gets the op's input parameters. */ default List> inputs() { return OpUtils.inputs(struct()); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java index cd597bd8d..8b059552a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpService.java @@ -26,24 +26,19 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ + package org.scijava.ops; -import org.scijava.ops.impl.DefaultOpEnvironment; -import org.scijava.plugin.Plugin; -import org.scijava.service.AbstractService; import org.scijava.service.SciJavaService; -import org.scijava.service.Service; /** * Service to provide a list of available ops structured in a prefix tree and to * search for ops matching specified types. * + * @author Gabriel Selzer * @author David Kolb */ -@Plugin(type = Service.class) -public class OpService extends AbstractService implements SciJavaService { - - private OpEnvironment env; +public interface OpService extends SciJavaService { /** * Begins declaration of an op matching request for locating an op with a @@ -55,20 +50,9 @@ public class OpService extends AbstractService implements SciJavaService { * @return An {@link OpBuilder} for refining the search criteria for an op. * @see OpBuilder */ - public OpBuilder op(final String opName) { - return env().op(opName); - } + public OpBuilder op(final String opName); /** Retrieves the motherlode of available ops. */ - public OpEnvironment env() { - if (env == null) initEnv(); - return env; - } - - // -- Helper methods - lazy initialization -- + public OpEnvironment env(); - private synchronized void initEnv() { - if (env != null) return; - env = new DefaultOpEnvironment(context()); - } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java new file mode 100644 index 000000000..20ff30013 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpService.java @@ -0,0 +1,78 @@ +/* + * #%L + * SciJava Operations: a framework for reusable algorithms. + * %% + * Copyright (C) 2018 SciJava developers. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ + +package org.scijava.ops.impl; + +import org.scijava.ops.OpBuilder; +import org.scijava.ops.OpEnvironment; +import org.scijava.ops.OpService; +import org.scijava.plugin.Plugin; +import org.scijava.service.AbstractService; +import org.scijava.service.Service; + +/** + * Service to provide a list of available ops structured in a prefix tree and to + * search for ops matching specified types. + * + * @author David Kolb + */ +@Plugin(type = Service.class) +public class DefaultOpService extends AbstractService implements OpService { + + private OpEnvironment env; + + /** + * Begins declaration of an op matching request for locating an op with a + * particular name. Additional criteria are specified as chained method calls + * on the returned {@link OpBuilder} object. See {@link OpBuilder} for + * examples. + * + * @param opName The name of the op to be matched. + * @return An {@link OpBuilder} for refining the search criteria for an op. + * @see OpBuilder + */ + @Override + public OpBuilder op(final String opName) { + return env().op(opName); + } + + /** Retrieves the motherlode of available ops. */ + @Override + public OpEnvironment env() { + if (env == null) initEnv(); + return env; + } + + // -- Helper methods - lazy initialization -- + + private synchronized void initEnv() { + if (env != null) return; + env = new DefaultOpEnvironment(context()); + } +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java index 03ce14ba1..47e6158b9 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java @@ -56,15 +56,6 @@ public OpAdaptationInfo(OpInfo srcInfo, Type type, Function adap this.hints = new ImmutableHints(hintList.toArray(String[]::new)); } - @Override - public Hints formHints(OpHints h) { - // NB we don't use Arrays.toList() here because we cannot add to that list! - List hintList = Arrays.stream(h.hints()).collect(Collectors.toList()); - hintList.remove(Adaptation.ALLOWED); - hintList.add(Adaptation.FORBIDDEN); - return new ImmutableHints(hintList.toArray(String[]::new)); - } - @Override public List> dependencies() { return srcInfo.dependencies(); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java index 6e69658fb..b1cd7c8d2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java @@ -41,6 +41,7 @@ import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; +import org.scijava.ops.hint.ImmutableHints; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; import org.scijava.plugin.Plugin; @@ -190,4 +191,9 @@ private static double priorityFromAnnotation(Class annotationBearer) { return opAnnotation == null ? Priority.NORMAL : opAnnotation.priority(); } + private Hints formHints(OpHints h) { + if (h == null) return new ImmutableHints(new String[0]); + return new ImmutableHints(h.hints()); + } + } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java index 1b434466a..2e4e0f19d 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java @@ -42,6 +42,7 @@ import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; +import org.scijava.ops.hint.ImmutableHints; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; import org.scijava.param.ValidityProblem; @@ -186,4 +187,11 @@ public String toString() { return OpUtils.opString(this); } + // -- Helper methods -- // + + private Hints formHints(OpHints h) { + if (h == null) return new ImmutableHints(new String[0]); + return new ImmutableHints(h.hints()); + } + } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java index 88180e45a..c10b784cc 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java @@ -50,6 +50,7 @@ import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; +import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.util.Adapt; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; @@ -359,4 +360,10 @@ public AnnotatedElement getAnnotationBearer() { return method; } + // -- Helper methods -- // + + private Hints formHints(OpHints h) { + if (h == null) return new ImmutableHints(new String[0]); + return new ImmutableHints(h.hints()); + } } \ No newline at end of file diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java index 1a3bf6862..e5e5e5f7b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java @@ -61,15 +61,6 @@ public SimplifiedOpInfo(OpInfo info, OpEnvironment env, SimplificationMetadata m this.hints = new ImmutableHints(hintList.toArray(String[]::new)); } - @Override - public Hints formHints(OpHints h) { - // NB we don't use Arrays.toList() here because we cannot add to that list! - List hintList = Arrays.stream(h.hints()).collect(Collectors.toList()); - hintList.remove(Adaptation.ALLOWED); - hintList.add(Adaptation.FORBIDDEN); - return new ImmutableHints(hintList.toArray(String[]::new)); - } - public OpInfo srcInfo() { return srcInfo; } From a0b69e6b3e74b032bf5cf3ded63225d886df39ee Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 11:36:00 -0500 Subject: [PATCH 07/31] Extract OpRef interface This commit also makes some changes to SimplifiedOpRef that make it more correct. I chose to throw UnsupportedOperationException for many of the standard OpRef methods because the concrete type that the SimplifiedOpRef is asking for is rather indeterminate - it is really asking for an Op that is of a set of Types, so to pin a particualar set of arguments, a particular output type, etc. is not possible until you have a SimplifiedOpInfo to narrow down these Types. Similarly, we throw an UnsupportedOperationException for typesMatch because the typing of the SimplifiedOpRef is unclear. We could match against all possible permutations of the input/output types, but we don't really have enough information about how to form the opType. We could probably find a way to devise all opType permutations, but this would be a pretty computationally expensive method to run, so for now we'll just throw an error --- .../java/org/scijava/ops/OpEnvironment.java | 1 - .../src/main/java/org/scijava/ops/OpInfo.java | 2 - .../src/main/java/org/scijava/ops/OpRef.java | 140 ++++++++++++++++++ .../main/java/org/scijava/ops/OpUtils.java | 1 - .../ops/impl/DefaultOpEnvironment.java | 15 +- .../scijava/ops/impl/MatchingConditions.java | 2 +- .../scijava/ops/matcher/DefaultOpMatcher.java | 1 + .../matcher/{OpRef.java => DefaultOpRef.java} | 100 ++++--------- .../matcher/DependencyMatchingException.java | 2 + .../scijava/ops/matcher/MatchingResult.java | 1 + .../org/scijava/ops/matcher/OpCandidate.java | 1 + .../org/scijava/ops/matcher/OpMatcher.java | 1 + .../ops/matcher/OpMatchingException.java | 2 + .../simplify/InfoSimplificationGenerator.java | 4 +- .../ops/simplify/SimplificationUtils.java | 2 +- .../scijava/ops/simplify/SimplifiedOpRef.java | 86 +++++++++-- .../scijava/ops/{ => impl}/OpCachingTest.java | 12 +- 17 files changed, 273 insertions(+), 100 deletions(-) create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{OpRef.java => DefaultOpRef.java} (64%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => impl}/OpCachingTest.java (92%) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java index 55c10e687..ae5929c03 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpEnvironment.java @@ -31,7 +31,6 @@ import java.lang.reflect.Type; -import org.scijava.ops.matcher.OpRef; import org.scijava.types.Nil; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java index 2dfe28db6..3f5a6c508 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java @@ -8,9 +8,7 @@ import java.util.Map; import org.scijava.log.Logger; -import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.matcher.OpCandidate; -import org.scijava.ops.matcher.OpRef; import org.scijava.param.ValidityException; import org.scijava.struct.Member; import org.scijava.struct.Struct; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java new file mode 100644 index 000000000..93c149e1d --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpRef.java @@ -0,0 +1,140 @@ +/* + * #%L + * ImageJ software for multidimensional image processing and analysis. + * %% + * Copyright (C) 2014 - 2018 ImageJ developers. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ + +package org.scijava.ops; + +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.util.Arrays; +import java.util.Map; +import java.util.Objects; + +import org.scijava.ops.matcher.OpMatcher; +import org.scijava.types.Types; + +/** + * Data structure which identifies an op by name and/or type(s) and/or argument + * type(s), along with a list of input arguments. + *

+ * With the help of the {@link OpMatcher}, an {@code OpRef} holds all + * information needed to create an appropriate {@link Op}. + *

+ * + * @author Christian Dietz (University of Konstanz) + * @author Curtis Rueden + */ +public interface OpRef { + + // -- OpRef methods -- + + /** Gets the name of the op. */ + public String getName(); + + /** Gets the type which the op must match. */ + public Type getType(); + + /** + * Gets the op's output type constraint, or null for no constraint. + */ + public Type getOutType(); + + /** Gets the op's arguments. */ + public Type[] getArgs(); + + /** + * Gets a label identifying the op's scope (i.e., its name and/or types). + */ + public String getLabel(); + + public boolean typesMatch(final Type opType); + + /** + * Determines whether the specified type satisfies the op's required types + * using {@link Types#isApplicable(Type[], Type[])}. + */ + public boolean typesMatch(final Type opType, final Map, Type> typeVarAssigns); + + // -- Object methods -- + + default String refString() { + String n = getName() == null ? "" : "Name: \"" + getName() + "\", Types: "; + n += getType() + "\n"; + n += "Input Types: \n"; + for (Type arg : getArgs()) { + n += "\t\t* "; + n += arg == null ? "" : arg.getTypeName(); + n += "\n"; + } + n += "Output Type: \n"; + n += "\t\t* "; + n += getOutType() == null ? "" : getOutType().getTypeName(); + n += "\n"; + return n.substring(0, n.length() - 1); + } + + default boolean refEquals(final Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final OpRef other = (OpRef) obj; + if (!Objects.equals(getName(), other.getName())) + return false; + if (!Objects.equals(getType(), other.getType())) + return false; + if (!Objects.equals(getOutType(), other.getOutType())) + return false; + if (!Arrays.equals(getArgs(), other.getArgs())) + return false; + return true; + } + + default int refHashCode() { + return Arrays.deepHashCode(new Object[] {getName(), getType(), getOutType(), getArgs()}); + } + + // -- Utility methods -- + + public static Type[] filterNulls(final Type... types) { + Type[] ts = Arrays.stream(types).filter(t -> t != null).toArray(Type[]::new); + return ts == null ? null : ts; + } + + // -- Helper methods -- + + static void append(final StringBuilder sb, final String s) { + if (s == null) + return; + if (sb.length() > 0) + sb.append("/"); + sb.append(s); + } +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java index 42b4ea12d..7a73e86a8 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java @@ -40,7 +40,6 @@ import org.scijava.ops.matcher.OpCandidate; import org.scijava.ops.matcher.OpCandidate.StatusCode; import org.scijava.ops.matcher.OpMatcher; -import org.scijava.ops.matcher.OpRef; import org.scijava.param.ParameterMember; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index c950a2bde..d6677132f 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -66,11 +66,13 @@ import org.scijava.ops.OpInfo; import org.scijava.ops.OpInstance; import org.scijava.ops.OpMethod; +import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; import org.scijava.ops.hint.AdaptationHints; import org.scijava.ops.hint.DefaultHints; import org.scijava.ops.hint.SimplificationHints; import org.scijava.ops.matcher.DefaultOpMatcher; +import org.scijava.ops.matcher.DefaultOpRef; import org.scijava.ops.matcher.DependencyMatchingException; import org.scijava.ops.matcher.MatchingUtils; import org.scijava.ops.matcher.OpAdaptationInfo; @@ -81,7 +83,6 @@ import org.scijava.ops.matcher.OpMatcher; import org.scijava.ops.matcher.OpMatchingException; import org.scijava.ops.matcher.OpMethodInfo; -import org.scijava.ops.matcher.OpRef; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.ops.simplify.SimplifiedOpInfo; import org.scijava.ops.util.OpWrapper; @@ -198,7 +199,11 @@ public T op(final String opName, final Nil specialType, @Override public T op(final OpInfo info, final Nil specialType, final Nil[] inTypes, final Nil outType) { - return op(info, specialType, inTypes, outType, getHints()); + try { + return findOp(info, specialType, inTypes, outType, getHints()); + } catch (OpMatchingException e) { + throw new IllegalArgumentException(e); + } } @Override @@ -249,7 +254,7 @@ public void register(final OpInfo info, final String name) { @SuppressWarnings("unchecked") private T findOp(final String opName, final Nil specialType, final Nil[] inTypes, final Nil outType, Hints hints) throws OpMatchingException { - final OpRef ref = OpRef.fromTypes(opName, specialType.getType(), outType != null ? outType.getType() : null, + final OpRef ref = DefaultOpRef.fromTypes(opName, specialType.getType(), outType != null ? outType.getType() : null, toTypes(inTypes)); MatchingConditions conditions = MatchingConditions.from(ref, hints, true); generateOpInstance(conditions); @@ -260,7 +265,7 @@ private T findOp(final String opName, final Nil specialType, final Nil private T findOp(final OpInfo info, final Nil specialType, final Nil[] inTypes, final Nil outType, Hints hints) throws OpMatchingException { - OpRef ref = OpRef.fromTypes(specialType.getType(), outType.getType(), + OpRef ref = DefaultOpRef.fromTypes(specialType.getType(), outType.getType(), toTypes(inTypes)); MatchingConditions conditions = MatchingConditions.from(ref, hints, true); generateOpInstance(conditions, info); @@ -717,7 +722,7 @@ private OpRef inferOpRef(Type type, String name, Map, Type> type error += ". This is not supported."; throw new OpMatchingException(error); } - return new OpRef(name, type, mappedOutputs[0], mappedInputs); + return new DefaultOpRef(name, type, mappedOutputs[0], mappedInputs); } private void initOpDirectory() { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java index b25ec8605..77c96d147 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/MatchingConditions.java @@ -4,7 +4,7 @@ import java.util.Objects; import org.scijava.ops.Hints; -import org.scijava.ops.matcher.OpRef; +import org.scijava.ops.OpRef; public class MatchingConditions { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java index 3b8d8d6a6..5e5d03fcf 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java @@ -47,6 +47,7 @@ import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.hint.DefaultHints; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java similarity index 64% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java index 9d506b080..c101472e6 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpRef.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java @@ -32,15 +32,11 @@ import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; -import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import java.util.Objects; -import org.scijava.log.Logger; import org.scijava.ops.Op; -import org.scijava.ops.OpEnvironment; -import org.scijava.ops.OpInfo; +import org.scijava.ops.OpRef; import org.scijava.types.Types; /** @@ -54,7 +50,7 @@ * @author Christian Dietz (University of Konstanz) * @author Curtis Rueden */ -public class OpRef { +public class DefaultOpRef implements OpRef { /** Name of the op, or null for any name. */ private final String name; @@ -70,12 +66,16 @@ public class OpRef { // -- Static construction methods -- - public static OpRef fromTypes(final Type type, final Type outType, final Type... args) { - return new OpRef(null, type, outType, filterNulls(args)); + public static DefaultOpRef fromTypes(final Type type, final Type outType, + final Type... args) + { + return new DefaultOpRef(null, type, outType, OpRef.filterNulls(args)); } - public static OpRef fromTypes(final String name, final Type type, final Type outType, final Type... args) { - return new OpRef(name, type, outType, filterNulls(args)); + public static DefaultOpRef fromTypes(final String name, final Type type, + final Type outType, final Type... args) + { + return new DefaultOpRef(name, type, outType, OpRef.filterNulls(args)); } // -- Constructor -- @@ -83,16 +83,14 @@ public static OpRef fromTypes(final String name, final Type type, final Type out /** * Creates a new op reference. * - * @param name - * name of the op, or null for any name. - * @param type - * type which the ops must match. - * @param outType - * the op's required output type. - * @param args - * arguments to the op. + * @param name name of the op, or null for any name. + * @param type type which the ops must match. + * @param outType the op's required output type. + * @param args arguments to the op. */ - public OpRef(final String name, final Type type, final Type outType, final Type[] args) { + public DefaultOpRef(final String name, final Type type, final Type outType, + final Type[] args) + { this.name = name; this.type = type; this.outType = outType; @@ -102,11 +100,13 @@ public OpRef(final String name, final Type type, final Type outType, final Type[ // -- OpRef methods -- /** Gets the name of the op. */ + @Override public String getName() { return name; } /** Gets the type which the op must match. */ + @Override public Type getType() { return type; } @@ -114,11 +114,13 @@ public Type getType() { /** * Gets the op's output type constraint, or null for no constraint. */ + @Override public Type getOutType() { return outType; } /** Gets the op's arguments. */ + @Override public Type[] getArgs() { return args.clone(); } @@ -126,15 +128,17 @@ public Type[] getArgs() { /** * Gets a label identifying the op's scope (i.e., its name and/or types). */ + @Override public String getLabel() { final StringBuilder sb = new StringBuilder(); - append(sb, name); + OpRef.append(sb, name); if (type != null) { - append(sb, Types.name(type)); + OpRef.append(sb, Types.name(type)); } return sb.toString(); } + @Override public boolean typesMatch(final Type opType) { return typesMatch(opType, new HashMap<>()); } @@ -143,7 +147,10 @@ public boolean typesMatch(final Type opType) { * Determines whether the specified type satisfies the op's required types * using {@link Types#isApplicable(Type[], Type[])}. */ - public boolean typesMatch(final Type opType, final Map, Type> typeVarAssigns) { + @Override + public boolean typesMatch(final Type opType, + final Map, Type> typeVarAssigns) + { if (type == null) return true; if (type instanceof ParameterizedType) { if (!MatchingUtils.checkGenericAssignability(opType, @@ -164,60 +171,17 @@ public boolean typesMatch(final Type opType, final Map, Type> ty @Override public String toString() { - String n = name == null ? "" : "Name: \"" + name + "\", Types: "; - n += type + "\n"; - n += "Input Types: \n"; - for (Type arg : args) { - n += "\t\t* "; - n += arg == null ? "" : arg.getTypeName(); - n += "\n"; - } - n += "Output Type: \n"; - n += "\t\t* "; - n += outType == null ? "" : outType.getTypeName(); - n += "\n"; - return n.substring(0, n.length() - 1); + return refString(); } @Override public boolean equals(final Object obj) { - if (this == obj) - return true; - if (obj == null) - return false; - if (getClass() != obj.getClass()) - return false; - final OpRef other = (OpRef) obj; - if (!Objects.equals(name, other.name)) - return false; - if (!Objects.equals(type, other.type)) - return false; - if (!Objects.equals(outType, other.outType)) - return false; - if (!Arrays.equals(args, other.args)) - return false; - return true; + return refEquals(obj); } @Override public int hashCode() { - return Arrays.deepHashCode(new Object[] {name, type, outType, args}); + return refHashCode(); } - // -- Utility methods -- - - public static Type[] filterNulls(final Type... types) { - Type[] ts = Arrays.stream(types).filter(t -> t != null).toArray(Type[]::new); - return ts == null ? null : ts; - } - - // -- Helper methods -- - - private void append(final StringBuilder sb, final String s) { - if (s == null) - return; - if (sb.length() > 0) - sb.append("/"); - sb.append(s); - } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java index c76d9458b..7ce7561cb 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DependencyMatchingException.java @@ -1,6 +1,8 @@ package org.scijava.ops.matcher; +import org.scijava.ops.OpRef; + /** * An {@link OpMatchingException} caused by another {@code OpMatchingException} * thrown when resolving dependencies. We illustrate the need for diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java index 9bd856f94..e55b1f185 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java @@ -3,6 +3,7 @@ import java.util.ArrayList; import java.util.List; +import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; import org.scijava.ops.simplify.SimplifiedOpInfo; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java index c3d3f1672..83eccd7b3 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java @@ -37,6 +37,7 @@ import org.scijava.log.Logger; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; import org.scijava.param.ValidityProblem; import org.scijava.struct.Member; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java index 61c28db31..a91a00456 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java @@ -33,6 +33,7 @@ import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; +import org.scijava.ops.OpRef; /** * Finds Ops which match an {@link OpRef}. diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java index 9788ae674..d2977dd02 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java @@ -1,5 +1,7 @@ package org.scijava.ops.matcher; +import org.scijava.ops.OpRef; + /** * Indicates that no op matching a given {@link OpRef} could be found. * diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java index a26fbbe0a..1bdb75547 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java @@ -12,9 +12,9 @@ import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; import org.scijava.ops.matcher.OpMatchingException; -import org.scijava.ops.matcher.OpRef; import org.scijava.types.Types; @@ -54,7 +54,7 @@ public OpInfo generateSuitableInfo(OpEnvironment env, OpRef originalRef, Hints h } public OpInfo generateSuitableInfo(SimplifiedOpRef ref) { - if(!Types.isAssignable(Types.raw(info.opType()), Types.raw(ref.getType()))) + if(!Types.isAssignable(Types.raw(info.opType()), ref.rawType())) throw new IllegalArgumentException("OpInfo and OpRef do not share an Op type"); TypePair[] argPairings = generatePairings(ref); TypePair outPairing = generateOutPairing(ref); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java index a983240d1..42c1cbf00 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java @@ -23,8 +23,8 @@ import org.scijava.function.Mutable; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpRef; import org.scijava.ops.matcher.MatchingUtils; -import org.scijava.ops.matcher.OpRef; import org.scijava.ops.util.AnnotationUtils; import org.scijava.param.ParameterStructs; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java index 78c16bdc0..2c5e88f98 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java @@ -2,7 +2,10 @@ package org.scijava.ops.simplify; import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Optional; import org.scijava.function.Computers; @@ -12,41 +15,45 @@ import org.scijava.ops.Hints; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpRef; import org.scijava.ops.hint.DefaultHints; import org.scijava.ops.matcher.OpMatchingException; -import org.scijava.ops.matcher.OpRef; import org.scijava.types.Nil; import org.scijava.types.Types; -public class SimplifiedOpRef extends OpRef { +public class SimplifiedOpRef implements OpRef { + + /** Name of the op, or null for any name. */ + private final String name; + + /** Raw type of the request */ + private final Class rawType; private final OpRef srcRef; private final List> simplifierSets; private final List outputFocusers; private final Optional> copyOp; - private SimplifiedOpRef(String name, Type type, Type outType, - Type[] args) - { - super(name, type, outType, args); - throw new UnsupportedOperationException("Simplified OpRef requires original OpRef!"); - } - private SimplifiedOpRef(OpRef ref, OpEnvironment env) { // TODO: this is probably incorrect - super(ref.getName(), ref.getType(), ref.getOutType(), ref.getArgs()); + this.name = ref.getName(); + this.rawType = Types.raw(ref.getType()); this.srcRef = ref; this.simplifierSets = SimplificationUtils.simplifyArgs(env, ref.getArgs()); - this.outputFocusers = SimplificationUtils.getFocusers(env, ref.getOutType()); + this.outputFocusers = SimplificationUtils.getFocusers(env, ref + .getOutType()); this.copyOp = Optional.empty(); } - private SimplifiedOpRef(OpRef ref, OpEnvironment env, Computers.Arity1 copyOp) { - // TODO: this is probably incorrect - super(ref.getName(), ref.getType(), ref.getOutType(), ref.getArgs()); + private SimplifiedOpRef(OpRef ref, OpEnvironment env, + Computers.Arity1 copyOp) + { + this.name = ref.getName(); + this.rawType = Types.raw(ref.getType()); this.srcRef = ref; this.simplifierSets = SimplificationUtils.simplifyArgs(env, ref.getArgs()); - this.outputFocusers = SimplificationUtils.getFocusers(env, ref.getOutType()); + this.outputFocusers = SimplificationUtils.getFocusers(env, ref + .getOutType()); this.copyOp = Optional.of(copyOp); } @@ -54,6 +61,10 @@ public OpRef srcRef() { return srcRef; } + public Class rawType() { + return rawType; + } + public List> simplifierSets() { return simplifierSets; } @@ -66,7 +77,9 @@ public List outputFocusers() { return copyOp; } - public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref, Hints hints) throws OpMatchingException { + public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref, + Hints hints) throws OpMatchingException + { Class opType = Types.raw(ref.getType()); int mutableIndex = SimplificationUtils.findMutableArgIndex(opType); if (mutableIndex == -1) return new SimplifiedOpRef(ref, env); @@ -112,4 +125,45 @@ public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref, Hin return (Arity1) env.op("copy", Nil.of(copierType), new Nil[] {copyNil, copyNil}, copyNil, hintsCopy); } + @Override + public String getName() { + return name; + } + + @Override + public Type getType() { + throw new UnsupportedOperationException( + "The type of a SimplifiedOpRef is indeterminate; it must be matched with a OpInfo to form a concrete Type"); + } + + @Override + public Type getOutType() { + throw new UnsupportedOperationException( + "The output type of a SimplifiedOpRef is indeterminate; it must be matched with a OpInfo to form a concrete Type"); + } + + @Override + public Type[] getArgs() { + throw new UnsupportedOperationException( + "The output type of a SimplifiedOpRef is indeterminate; it must be matched with a OpInfo to form a concrete Type"); + } + + @Override + public String getLabel() { + return "Simplification of " + srcRef.getLabel(); + } + + @Override + public boolean typesMatch(Type opType) { + return typesMatch(opType, new HashMap<>()); + } + + @Override + public boolean typesMatch(Type opType, + Map, Type> typeVarAssigns) + { + throw new UnsupportedOperationException( + "The type of a SimplifiedOpRef is indeterminate; it must be matched with an OpInfo to form a concrete Type!"); + } + } diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java similarity index 92% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java index 21978b9f2..0eaf3ed88 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCachingTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops; +package org.scijava.ops.impl; import static org.junit.Assert.fail; @@ -40,8 +40,14 @@ import org.junit.jupiter.api.Assertions; import org.scijava.Context; import org.scijava.function.Producer; -import org.scijava.ops.impl.DefaultOpEnvironment; -import org.scijava.ops.impl.MatchingConditions; +import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.Op; +import org.scijava.ops.OpCollection; +import org.scijava.ops.OpDependency; +import org.scijava.ops.OpEnvironment; +import org.scijava.ops.OpField; +import org.scijava.ops.OpInstance; +import org.scijava.ops.OpService; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.Plugin; import org.scijava.plugin.PluginService; From 3c29298c5af24728d2f0b8357c905e743086e1c0 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 11:57:28 -0500 Subject: [PATCH 08/31] OpMatchingException: Extend RuntimeException This prevents us from having to declare it. There was no reason why we should --- .../ops/impl/DefaultOpEnvironment.java | 28 +++++++------------ .../scijava/ops/matcher/DefaultOpMatcher.java | 4 +-- .../scijava/ops/matcher/MatchingResult.java | 2 +- .../org/scijava/ops/matcher/OpMatcher.java | 4 +-- .../ops/matcher/OpMatchingException.java | 2 +- .../simplify/InfoSimplificationGenerator.java | 3 +- .../ops/simplify/SimplifiedOpInfo.java | 6 +--- .../scijava/ops/simplify/SimplifiedOpRef.java | 2 +- 8 files changed, 19 insertions(+), 32 deletions(-) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index d6677132f..cd20048b3 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -253,7 +253,7 @@ public void register(final OpInfo info, final String name) { @SuppressWarnings("unchecked") private T findOp(final String opName, final Nil specialType, final Nil[] inTypes, - final Nil outType, Hints hints) throws OpMatchingException { + final Nil outType, Hints hints) { final OpRef ref = DefaultOpRef.fromTypes(opName, specialType.getType(), outType != null ? outType.getType() : null, toTypes(inTypes)); MatchingConditions conditions = MatchingConditions.from(ref, hints, true); @@ -287,7 +287,7 @@ private Type[] toTypes(Nil... nils) { * @param info * @throws OpMatchingException */ - private void generateOpInstance(final MatchingConditions conditions, final OpInfo info) throws OpMatchingException { + private void generateOpInstance(final MatchingConditions conditions, final OpInfo info) { // create new OpCandidate from ref and info Map, Type> typeVarAssigns = new HashMap<>(); if (!conditions.ref().typesMatch(info.opType(), typeVarAssigns)) @@ -327,9 +327,8 @@ private Object wrapViaCache(MatchingConditions conditions, * * @param conditions - the {@link MatchingConditions} outlining the * requirements that must be fulfilled by the Op returned - * @throws OpMatchingException */ - private void generateOpInstance(final MatchingConditions conditions) throws OpMatchingException + private void generateOpInstance(final MatchingConditions conditions) { // see if the ref has been matched already OpInstance cachedOp = getInstance(conditions); @@ -360,7 +359,7 @@ private OpInstance getInstance(MatchingConditions conditions) { return opCache.get(conditions); } - private OpCandidate findOpCandidate(OpRef ref, Hints hints) throws OpMatchingException{ + private OpCandidate findOpCandidate(OpRef ref, Hints hints) { try { // attempt to find a direct match return matcher.findSingleMatch(this, ref, hints); @@ -395,7 +394,7 @@ private OpCandidate findOpCandidate(OpRef ref, Hints hints) throws OpMatchingExc } } - private OpCandidate findSimplifiedOp(OpRef ref, Hints hints) throws OpMatchingException { + private OpCandidate findSimplifiedOp(OpRef ref, Hints hints) { Hints simplificationHints = SimplificationHints.generateHints(hints, false); return matcher.findSingleMatch(this, ref, simplificationHints); } @@ -406,10 +405,8 @@ private OpCandidate findSimplifiedOp(OpRef ref, Hints hints) throws OpMatchingEx * * @param candidate * @return an Op with all needed dependencies - * @throws OpMatchingException */ private Object instantiateOp(final OpCandidate candidate, Hints hints) - throws OpMatchingException { final List instances = resolveOpDependencies(candidate, hints); Object op = candidate.createOp(wrappedDeps(instances, hints.executionChainID())); @@ -491,7 +488,7 @@ private List> filterWrapperSuperclasses( return list; } - private List resolveOpDependencies(OpCandidate candidate, Hints hints) throws OpMatchingException { + private List resolveOpDependencies(OpCandidate candidate, Hints hints) { return resolveOpDependencies(candidate.opInfo(), candidate.typeVarAssigns(), hints); } @@ -511,11 +508,8 @@ private void initWrappers() { * injected * @param typeVarAssigns - the mapping of {@link TypeVariable}s in the * {@code OpInfo} to {@link Type}s given in the request. - * @throws OpMatchingException if the type of the specified object is not - * functional, if the Op matching the functional type and the name - * could not be found, if an exception occurs during injection */ - private List resolveOpDependencies(OpInfo info, Map, Type> typeVarAssigns, Hints hints) throws OpMatchingException { + private List resolveOpDependencies(OpInfo info, Map, Type> typeVarAssigns, Hints hints) { final List> dependencies = info.dependencies(); final List resolvedDependencies = new ArrayList<>(dependencies.size()); @@ -564,9 +558,8 @@ private List resolveOpDependencies(OpInfo info, Map depExceptions = new ArrayList<>(); for (final OpInfo adaptor : infos("adapt")) { @@ -634,7 +627,6 @@ private OpCandidate adaptOp(OpRef ref, Hints hints) throws OpMatchingException { } private OpCandidate findAdaptationCandidate(final OpRef srcOpRef, final Hints hints) - throws OpMatchingException { Hints adaptationHints = AdaptationHints.generateHints(hints, false); final OpCandidate srcCandidate = findOpCandidate(srcOpRef, adaptationHints); @@ -658,7 +650,7 @@ else if (!Types.isAssignable(opType, adaptTo, map)) { } private OpRef inferOpRef(OpDependencyMember dependency, - Map, Type> typeVarAssigns) throws OpMatchingException + Map, Type> typeVarAssigns) { final Type mappedDependencyType = Types.mapVarToTypes(new Type[] { dependency.getType() }, typeVarAssigns)[0]; @@ -696,7 +688,7 @@ private OpRef inferOpRef(OpDependencyMember dependency, * @return null if the specified type has no functional method */ private OpRef inferOpRef(Type type, String name, Map, Type> typeVarAssigns) - throws OpMatchingException { + { List fmts = ParameterStructs.findFunctionalMethodTypes(type); if (fmts == null) return null; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java index 5e5d03fcf..507201184 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java @@ -73,12 +73,12 @@ public DefaultOpMatcher(final Logger log) { } @Override - public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref) throws OpMatchingException { + public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref) { return findMatch(env, ref).singleMatch(); } @Override - public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref, final Hints hints) throws OpMatchingException { + public OpCandidate findSingleMatch(final OpEnvironment env, final OpRef ref, final Hints hints) { return findMatch(env, ref, hints).singleMatch(); } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java index e55b1f185..8d088252b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java @@ -43,7 +43,7 @@ public List getMatches() { return matches; } - public OpCandidate singleMatch() throws OpMatchingException { + public OpCandidate singleMatch() { if (matches.size() == 1) { // if (log.isDebug()) { // log.debug("Selected '" + match.getRef().getLabel() + "' op: " + diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java index a91a00456..4d4006c83 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java @@ -43,9 +43,9 @@ //TODO javadoc public interface OpMatcher { - OpCandidate findSingleMatch(OpEnvironment env, OpRef ref) throws OpMatchingException; + OpCandidate findSingleMatch(OpEnvironment env, OpRef ref); - OpCandidate findSingleMatch(OpEnvironment env, OpRef ref, Hints hints) throws OpMatchingException; + OpCandidate findSingleMatch(OpEnvironment env, OpRef ref, Hints hints); MatchingResult findMatch(OpEnvironment env, OpRef ref); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java index d2977dd02..d29b1aaa7 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatchingException.java @@ -7,7 +7,7 @@ * * @author David Kolb */ -public class OpMatchingException extends Exception { +public class OpMatchingException extends RuntimeException { private static final long serialVersionUID = 2334342967056340218L; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java index 1bdb75547..10b687024 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/InfoSimplificationGenerator.java @@ -14,7 +14,6 @@ import org.scijava.ops.OpInfo; import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; -import org.scijava.ops.matcher.OpMatchingException; import org.scijava.types.Types; @@ -48,7 +47,7 @@ public OpInfo srcInfo() { return info; } - public OpInfo generateSuitableInfo(OpEnvironment env, OpRef originalRef, Hints hints) throws OpMatchingException { + public OpInfo generateSuitableInfo(OpEnvironment env, OpRef originalRef, Hints hints) { SimplifiedOpRef simpleRef = SimplifiedOpRef.simplificationOf(env, originalRef, hints); return generateSuitableInfo(simpleRef); } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java index e5e5e5f7b..0be15c7e8 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java @@ -3,20 +3,16 @@ import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.stream.Collectors; import org.scijava.Priority; +import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.Hints; import org.scijava.ops.Op; import org.scijava.ops.OpEnvironment; -import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.BaseOpHints.Adaptation; -import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.conversionLoss.LossReporter; import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.matcher.OpMatchingException; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java index 2c5e88f98..5667703f7 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpRef.java @@ -78,7 +78,7 @@ public List outputFocusers() { } public static SimplifiedOpRef simplificationOf(OpEnvironment env, OpRef ref, - Hints hints) throws OpMatchingException + Hints hints) { Class opType = Types.raw(ref.getType()); int mutableIndex = SimplificationUtils.findMutableArgIndex(opType); From 487f19262d81d3afcc23eda22fcaa7d20eb26ebb Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 12:51:40 -0500 Subject: [PATCH 09/31] Move OpCandidate to org.scijava.ops --- .../net/imagej/ops2/help/AbstractHelp.java | 2 +- .../ops/{matcher => }/OpCandidate.java | 20 ++--- .../src/main/java/org/scijava/ops/OpInfo.java | 1 - .../main/java/org/scijava/ops/OpUtils.java | 74 +------------------ .../ops/impl/DefaultOpEnvironment.java | 4 +- .../scijava/ops/matcher/DefaultOpMatcher.java | 3 +- .../scijava/ops/matcher/MatchingResult.java | 71 +++++++++++++++++- .../org/scijava/ops/matcher/OpMatcher.java | 1 + 8 files changed, 85 insertions(+), 91 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{matcher => }/OpCandidate.java (92%) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java index ff14d734d..0d90657ab 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/help/AbstractHelp.java @@ -33,9 +33,9 @@ import java.util.Iterator; import java.util.List; +import org.scijava.ops.OpCandidate; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.matcher.OpCandidate; /** * Base class for help operations. diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java similarity index 92% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java index 83eccd7b3..27833ea99 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpCandidate.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.matcher; +package org.scijava.ops; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; @@ -35,10 +35,7 @@ import java.util.Map; import org.scijava.log.Logger; -import org.scijava.ops.OpEnvironment; -import org.scijava.ops.OpInfo; -import org.scijava.ops.OpRef; -import org.scijava.ops.OpUtils; +import org.scijava.ops.matcher.OpMatcher; import org.scijava.param.ValidityProblem; import org.scijava.struct.Member; import org.scijava.struct.Struct; @@ -214,19 +211,18 @@ public String toString() { return info.toString(); } - public StructInstance createOpInstance(List dependencies) throws OpMatchingException + public StructInstance createOpInstance(List dependencies) { - if (!getStatusCode().equals(StatusCode.MATCH)) { - throw new OpMatchingException( - "Status of candidate to create op from indicates a problem: " + getStatus()); + if (getStatusCode().equals(StatusCode.MATCH)) { + return opInfo().createOpInstance(dependencies); } - StructInstance inst = opInfo().createOpInstance(dependencies); - return inst; + throw new IllegalStateException( + "Status of candidate to create op from indicates a problem: " + + getStatus()); } public Object createOp(List dependencies) - throws OpMatchingException { return createOpInstance(dependencies).object(); } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java index 3f5a6c508..8251c0616 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java @@ -8,7 +8,6 @@ import java.util.Map; import org.scijava.log.Logger; -import org.scijava.ops.matcher.OpCandidate; import org.scijava.param.ValidityException; import org.scijava.struct.Member; import org.scijava.struct.Struct; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java index 7a73e86a8..5c0494f98 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java @@ -36,10 +36,7 @@ import java.util.Objects; import java.util.stream.Collectors; -import org.scijava.ops.matcher.MatchingResult; -import org.scijava.ops.matcher.OpCandidate; -import org.scijava.ops.matcher.OpCandidate.StatusCode; -import org.scijava.ops.matcher.OpMatcher; +import org.scijava.ops.OpCandidate.StatusCode; import org.scijava.param.ParameterMember; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; @@ -255,11 +252,10 @@ public static List> injectableMembers(Struct struct) { * several matches that do not have equal output types, the output type may not * completely match the request as only raw type assignability will be checked * at the moment. - * @see OpMatcher#typesMatch(OpCandidate) * @param matches * @return */ - private static boolean typeCheckingIncomplete(List matches) { + public static boolean typeCheckingIncomplete(List matches) { Type outputType = null; for (OpCandidate match : matches) { Type ts = output(match).getType(); @@ -277,72 +273,6 @@ public static Type[] getTypes(List> members) { return members.stream().map(m -> m.getType()).toArray(Type[]::new); } - /** - * Gets a string with an analysis of a particular match request failure. - *

- * This method is used to generate informative exception messages when no - * matches, or too many matches, are found. - *

- * - * @param res - * The result of type matching - * @return A multi-line string describing the situation: 1) the type of - * match failure; 2) the list of matching ops (if any); 3) the - * request itself; and 4) the list of candidates including status - * (i.e., whether it matched, and if not, why not). - */ - public static String matchInfo(final MatchingResult res) { - final StringBuilder sb = new StringBuilder(); - - List candidates = res.getCandidates(); - List matches = res.getMatches(); - - final OpRef ref = res.getOriginalQueries().get(0); - if (matches.isEmpty()) { - // no matches - sb.append("No matching '" + ref.getLabel() + "' op\n"); - } else { - // multiple matches - final double priority = getPriority(matches.get(0)); - sb.append("Multiple '" + ref.getLabel() + "' ops of priority " + priority + ":\n"); - if (typeCheckingIncomplete(matches)) { - sb.append("Incomplete output type checking may have occured!\n"); - } - int count = 0; - for (final OpCandidate match : matches) { - sb.append(++count + ". "); - sb.append(match.toString() + "\n"); - } - } - - // fail, with information about the request and candidates - sb.append("\n"); - sb.append("Request:\n"); - sb.append("-\t" + ref.toString() + "\n"); - sb.append("\n"); - sb.append("Candidates:\n"); - if (candidates.isEmpty()) { - sb.append("-\t No candidates found!"); - } - int count = 0; - for (final OpCandidate candidate : candidates) { - sb.append(++count + ". "); - sb.append("\t" + opString(candidate.opInfo(), candidate.getStatusItem()) + "\n"); - final String status = candidate.getStatus(); - if (status != null) - sb.append("\t" + status + "\n"); - if (candidate.getStatusCode() == StatusCode.DOES_NOT_CONFORM) { - // TODO: Conformity not yet implemented - // // show argument values when a contingent op rejects them - // for (final ModuleItem item : inputs(info)) { - // final Object value = item.getValue(candidate.getModule()); - // sb.append("\t\t" + item.getName() + " = " + value + "\n"); - // } - } - } - return sb.toString(); - } - public static String opString(final OpInfo info) { return opString(info, null); } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index cd20048b3..5b6bf3039 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -56,8 +56,10 @@ import org.scijava.ops.BaseOpHints.Adaptation; import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.BaseOpHints.Simplification; +import org.scijava.ops.OpCandidate.StatusCode; import org.scijava.ops.Hints; import org.scijava.ops.Op; +import org.scijava.ops.OpCandidate; import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; import org.scijava.ops.OpDependencyMember; @@ -76,8 +78,6 @@ import org.scijava.ops.matcher.DependencyMatchingException; import org.scijava.ops.matcher.MatchingUtils; import org.scijava.ops.matcher.OpAdaptationInfo; -import org.scijava.ops.matcher.OpCandidate; -import org.scijava.ops.matcher.OpCandidate.StatusCode; import org.scijava.ops.matcher.OpClassInfo; import org.scijava.ops.matcher.OpFieldInfo; import org.scijava.ops.matcher.OpMatcher; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java index 507201184..d668c09b1 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java @@ -45,13 +45,14 @@ import org.scijava.log.Logger; import org.scijava.ops.Hints; +import org.scijava.ops.OpCandidate; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; import org.scijava.ops.BaseOpHints.Simplification; +import org.scijava.ops.OpCandidate.StatusCode; import org.scijava.ops.hint.DefaultHints; -import org.scijava.ops.matcher.OpCandidate.StatusCode; import org.scijava.ops.simplify.InfoSimplificationGenerator; import org.scijava.service.AbstractService; import org.scijava.struct.Member; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java index 8d088252b..8d7dbfbe0 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingResult.java @@ -3,9 +3,10 @@ import java.util.ArrayList; import java.util.List; +import org.scijava.ops.OpCandidate; +import org.scijava.ops.OpCandidate.StatusCode; import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; -import org.scijava.ops.simplify.SimplifiedOpInfo; /** * Class representing the result from type matching done by the @@ -60,7 +61,73 @@ public OpCandidate singleMatch() { } // There is no clear matching Op - final String analysis = OpUtils.matchInfo(this); + final String analysis = MatchingResult.matchInfo(this); throw new OpMatchingException(analysis); } + + /** + * Gets a string with an analysis of a particular match request failure. + *

+ * This method is used to generate informative exception messages when no + * matches, or too many matches, are found. + *

+ * + * @param res + * The result of type matching + * @return A multi-line string describing the situation: 1) the type of + * match failure; 2) the list of matching ops (if any); 3) the + * request itself; and 4) the list of candidates including status + * (i.e., whether it matched, and if not, why not). + */ + public static String matchInfo(final MatchingResult res) { + final StringBuilder sb = new StringBuilder(); + + List candidates = res.getCandidates(); + List matches = res.getMatches(); + + final OpRef ref = res.getOriginalQueries().get(0); + if (matches.isEmpty()) { + // no matches + sb.append("No matching '" + ref.getLabel() + "' op\n"); + } else { + // multiple matches + final double priority = OpUtils.getPriority(matches.get(0)); + sb.append("Multiple '" + ref.getLabel() + "' ops of priority " + priority + ":\n"); + if (OpUtils.typeCheckingIncomplete(matches)) { + sb.append("Incomplete output type checking may have occured!\n"); + } + int count = 0; + for (final OpCandidate match : matches) { + sb.append(++count + ". "); + sb.append(match.toString() + "\n"); + } + } + + // fail, with information about the request and candidates + sb.append("\n"); + sb.append("Request:\n"); + sb.append("-\t" + ref.toString() + "\n"); + sb.append("\n"); + sb.append("Candidates:\n"); + if (candidates.isEmpty()) { + sb.append("-\t No candidates found!"); + } + int count = 0; + for (final OpCandidate candidate : candidates) { + sb.append(++count + ". "); + sb.append("\t" + OpUtils.opString(candidate.opInfo(), candidate.getStatusItem()) + "\n"); + final String status = candidate.getStatus(); + if (status != null) + sb.append("\t" + status + "\n"); + if (candidate.getStatusCode() == StatusCode.DOES_NOT_CONFORM) { + // TODO: Conformity not yet implemented + // // show argument values when a contingent op rejects them + // for (final ModuleItem item : inputs(info)) { + // final Object value = item.getValue(candidate.getModule()); + // sb.append("\t\t" + item.getName() + " = " + value + "\n"); + // } + } + } + return sb.toString(); + } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java index 4d4006c83..c0708145f 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMatcher.java @@ -32,6 +32,7 @@ import java.util.List; import org.scijava.ops.Hints; +import org.scijava.ops.OpCandidate; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpRef; From 1e6c35bd24260723191aaf6c9a09ff9c68bf7fd2 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 12:56:48 -0500 Subject: [PATCH 10/31] Move util tests from org.scijava.ops to util package --- .../test/java/org/scijava/ops/{ => util}/AdaptersTest.java | 3 ++- .../java/org/scijava/ops/{ => util}/ComputersTest.java | 3 ++- .../java/org/scijava/ops/{ => util}/FunctionsTest.java | 3 ++- .../test/java/org/scijava/ops/{ => util}/InplacesTest.java | 3 ++- .../src/test/java/org/scijava/ops/{ => util}/LiftTest.java | 7 ++----- 5 files changed, 10 insertions(+), 9 deletions(-) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/AdaptersTest.java (97%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/ComputersTest.java (96%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/FunctionsTest.java (96%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/InplacesTest.java (96%) rename scijava/scijava-ops/src/test/java/org/scijava/ops/{ => util}/LiftTest.java (95%) diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AdaptersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java similarity index 97% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/AdaptersTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java index d54d907aa..d558346f5 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AdaptersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/AdaptersTest.java @@ -27,13 +27,14 @@ * #L% */ -package org.scijava.ops; +package org.scijava.ops.util; import java.util.function.BiFunction; import org.junit.Test; import org.scijava.types.Nil; import org.scijava.function.Computers; +import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.util.Adapt; public class AdaptersTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/ComputersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java similarity index 96% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/ComputersTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java index 28b665ed7..bd91e7664 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/ComputersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java @@ -27,10 +27,11 @@ * #L% */ -package org.scijava.ops; +package org.scijava.ops.util; import org.junit.Test; import org.scijava.function.Computers; +import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.util.ComputerUtils; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/FunctionsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java similarity index 96% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/FunctionsTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java index 1584e3500..2d5dcac36 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/FunctionsTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java @@ -27,13 +27,14 @@ * #L% */ -package org.scijava.ops; +package org.scijava.ops.util; import java.util.function.BiFunction; import java.util.function.Function; import org.junit.Test; import org.scijava.function.Functions; +import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.util.FunctionUtils; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/InplacesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java similarity index 96% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/InplacesTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java index be4055298..b106d4b45 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/InplacesTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java @@ -27,10 +27,11 @@ * #L% */ -package org.scijava.ops; +package org.scijava.ops.util; import org.junit.Test; import org.scijava.function.Inplaces; +import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.util.InplaceUtils; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/LiftTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java similarity index 95% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/LiftTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java index 650fe6667..835fd86b5 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/LiftTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops; +package org.scijava.ops.util; import com.google.common.collect.Streams; @@ -39,11 +39,8 @@ import org.junit.Assert; import org.junit.Test; import org.scijava.function.Computers; -import org.scijava.function.Functions; +import org.scijava.ops.AbstractTestEnvironment; import org.scijava.types.Nil; -import org.scijava.ops.util.ComputerUtils; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.ops.util.Maps; public class LiftTest extends AbstractTestEnvironment { From e04e63faf6672c99690211324ca1d9c699c3d71e Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 13:37:35 -0500 Subject: [PATCH 11/31] Move OpWrapper to org.scijava.ops package --- .../src/main/java/org/scijava/ops/{util => }/OpWrapper.java | 2 +- .../org/scijava/ops/conversionLoss/LossReporterWrapper.java | 2 +- .../main/java/org/scijava/ops/impl/DefaultOpEnvironment.java | 2 +- .../src/main/java/org/scijava/ops/matcher/OpWrappers.java | 2 +- .../templates/main/java/org/scijava/ops/matcher/OpWrappers.vm | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{util => }/OpWrapper.java (95%) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java similarity index 95% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java index 810f941b0..56dad4885 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpWrapper.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java @@ -1,4 +1,4 @@ -package org.scijava.ops.util; +package org.scijava.ops; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java index a7b62f51b..abb9071de 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java @@ -6,9 +6,9 @@ import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpWrapper; import org.scijava.ops.provenance.OpExecutionSummary; import org.scijava.ops.provenance.OpHistory; -import org.scijava.ops.util.OpWrapper; import org.scijava.plugin.Plugin; import org.scijava.types.GenericTyped; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index 5b6bf3039..6930309ee 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -70,6 +70,7 @@ import org.scijava.ops.OpMethod; import org.scijava.ops.OpRef; import org.scijava.ops.OpUtils; +import org.scijava.ops.OpWrapper; import org.scijava.ops.hint.AdaptationHints; import org.scijava.ops.hint.DefaultHints; import org.scijava.ops.hint.SimplificationHints; @@ -85,7 +86,6 @@ import org.scijava.ops.matcher.OpMethodInfo; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.ops.simplify.SimplifiedOpInfo; -import org.scijava.ops.util.OpWrapper; import org.scijava.param.FunctionalMethodType; import org.scijava.param.ParameterStructs; import org.scijava.plugin.Parameter; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java index 865bfbfbd..d5bd98efa 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java @@ -18,9 +18,9 @@ import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpWrapper; import org.scijava.ops.provenance.OpExecutionSummary; import org.scijava.ops.provenance.OpHistory; -import org.scijava.ops.util.OpWrapper; import org.scijava.plugin.Plugin; import org.scijava.types.GenericTyped; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm index 07e5ee540..ccdba9740 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm @@ -18,9 +18,9 @@ import org.scijava.function.Producer; import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; +import org.scijava.ops.OpWrapper; import org.scijava.ops.provenance.OpExecutionSummary; import org.scijava.ops.provenance.OpHistory; -import org.scijava.ops.util.OpWrapper; import org.scijava.plugin.Plugin; import org.scijava.types.GenericTyped; From 1992e365f913a692b616974cf2687628fadfd9ef Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 15:00:01 -0500 Subject: [PATCH 12/31] Remove HashMaps from FifaceUtils classes --- .../java/org/scijava/function/Computers.java | 41 ++++ .../java/org/scijava/function/Functions.java | 39 ++++ .../java/org/scijava/function/Inplaces.java | 189 ++++++++++++++++++ .../java/org/scijava/function/Computers.vm | 27 +++ .../java/org/scijava/function/Functions.vm | 25 +++ .../java/org/scijava/function/Inplaces.vm | 59 ++++++ .../org/scijava/ops/util/ComputerUtils.java | 44 ---- .../org/scijava/ops/util/FunctionUtils.java | 50 +---- .../org/scijava/ops/util/InplaceUtils.java | 175 +--------------- .../org/scijava/ops/util/ComputerUtils.vm | 30 --- .../org/scijava/ops/util/FunctionUtils.vm | 36 +--- .../java/org/scijava/ops/util/InplaceUtils.vm | 45 +---- 12 files changed, 398 insertions(+), 362 deletions(-) diff --git a/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java b/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java index 7e5d30b8b..955b509fe 100644 --- a/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java +++ b/scijava/scijava-function/src/main/java/org/scijava/function/Computers.java @@ -5,6 +5,7 @@ package org.scijava.function; +import java.util.HashMap; import java.util.function.BiConsumer; import java.util.function.Consumer; @@ -32,6 +33,46 @@ private Computers() { // NB: Prevent instantiation of utility class. } + // -- Static Utility Methods -- // + + /** + * All known computer types and their arities. The entries are sorted by + * arity, i.e., the {@code i}-th entry has an arity of {@code i}. + */ + public static final HashMap, Integer> ALL_COMPUTERS; + + static { + ALL_COMPUTERS = new HashMap<>(); + ALL_COMPUTERS.put(Computers.Arity0.class, 0); + ALL_COMPUTERS.put(Computers.Arity1.class, 1); + ALL_COMPUTERS.put(Computers.Arity2.class, 2); + ALL_COMPUTERS.put(Computers.Arity3.class, 3); + ALL_COMPUTERS.put(Computers.Arity4.class, 4); + ALL_COMPUTERS.put(Computers.Arity5.class, 5); + ALL_COMPUTERS.put(Computers.Arity6.class, 6); + ALL_COMPUTERS.put(Computers.Arity7.class, 7); + ALL_COMPUTERS.put(Computers.Arity8.class, 8); + ALL_COMPUTERS.put(Computers.Arity9.class, 9); + ALL_COMPUTERS.put(Computers.Arity10.class, 10); + ALL_COMPUTERS.put(Computers.Arity11.class, 11); + ALL_COMPUTERS.put(Computers.Arity12.class, 12); + ALL_COMPUTERS.put(Computers.Arity13.class, 13); + ALL_COMPUTERS.put(Computers.Arity14.class, 14); + ALL_COMPUTERS.put(Computers.Arity15.class, 15); + ALL_COMPUTERS.put(Computers.Arity16.class, 16); + } + + /** + * @return {@code true} if the given type is a known + * computer type, {@code false} otherwise.
+ * Note that only the type itself and not its type hierarchy is + * considered. + * @throws NullPointerException If {@code c} is {@code null}. + */ + public static boolean isComputer(Class c) { + return ALL_COMPUTERS.containsKey(c); + } + @FunctionalInterface public interface Arity0 extends diff --git a/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java b/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java index 679e55189..5a1a6037b 100644 --- a/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java +++ b/scijava/scijava-function/src/main/java/org/scijava/function/Functions.java @@ -5,6 +5,7 @@ package org.scijava.function; +import java.util.HashMap; import java.util.Objects; import java.util.function.BiFunction; import java.util.function.Function; @@ -31,6 +32,44 @@ private Functions() { // NB: Prevent instantiation of utility class. } + /** + * All known function types and their arities. The entries are sorted by + * arity, i.e., the {@code i}-th entry has an arity of {@code i}. + */ + public static final HashMap> ALL_FUNCTIONS; + + static { + ALL_FUNCTIONS = new HashMap<>(10); + ALL_FUNCTIONS.put(0, Producer.class); + ALL_FUNCTIONS.put(1, Function.class); + ALL_FUNCTIONS.put(2, BiFunction.class); + ALL_FUNCTIONS.put(3, Functions.Arity3.class); + ALL_FUNCTIONS.put(4, Functions.Arity4.class); + ALL_FUNCTIONS.put(5, Functions.Arity5.class); + ALL_FUNCTIONS.put(6, Functions.Arity6.class); + ALL_FUNCTIONS.put(7, Functions.Arity7.class); + ALL_FUNCTIONS.put(8, Functions.Arity8.class); + ALL_FUNCTIONS.put(9, Functions.Arity9.class); + ALL_FUNCTIONS.put(10, Functions.Arity10.class); + ALL_FUNCTIONS.put(11, Functions.Arity11.class); + ALL_FUNCTIONS.put(12, Functions.Arity12.class); + ALL_FUNCTIONS.put(13, Functions.Arity13.class); + ALL_FUNCTIONS.put(14, Functions.Arity14.class); + ALL_FUNCTIONS.put(15, Functions.Arity15.class); + ALL_FUNCTIONS.put(16, Functions.Arity16.class); + } + + /** + * @return {@code true} if the given type is a known + * function type, {@code false} otherwise.
+ * Note that only the type itself and not its type hierarchy is + * considered. + * @throws NullPointerException If {@code c} is {@code null}. + */ + public static boolean isFunction(Class c) { + return ALL_FUNCTIONS.containsValue(c); + } + /** * A 3-arity specialization of {@link Function}. * diff --git a/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java b/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java index a02159d31..9cfcb9277 100644 --- a/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java +++ b/scijava/scijava-function/src/main/java/org/scijava/function/Inplaces.java @@ -5,8 +5,14 @@ package org.scijava.function; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.function.BiConsumer; import java.util.function.Consumer; +import java.util.stream.Collectors; /** * Container class for inplace-style functional interfaces at various @@ -43,6 +49,171 @@ private Inplaces() { // NB: Prevent instantiation of container class. } + /** + * All known inplace types and their arities and mutable positions. The + * entries are sorted by arity and mutable position. + */ + public static final Map, InplaceInfo> ALL_INPLACES; + + static { + final Map, InplaceInfo> inplaces = new LinkedHashMap<>(22); + inplaces.put(Inplaces.Arity1.class, new InplaceInfo(1, 0)); + inplaces.put(Inplaces.Arity2_1.class, new InplaceInfo(2, 0)); + inplaces.put(Inplaces.Arity2_2.class, new InplaceInfo(2, 1)); + inplaces.put(Inplaces.Arity3_1.class, new InplaceInfo(3, 0)); + inplaces.put(Inplaces.Arity3_2.class, new InplaceInfo(3, 1)); + inplaces.put(Inplaces.Arity3_3.class, new InplaceInfo(3, 2)); + inplaces.put(Inplaces.Arity4_1.class, new InplaceInfo(4, 0)); + inplaces.put(Inplaces.Arity4_2.class, new InplaceInfo(4, 1)); + inplaces.put(Inplaces.Arity4_3.class, new InplaceInfo(4, 2)); + inplaces.put(Inplaces.Arity4_4.class, new InplaceInfo(4, 3)); + inplaces.put(Inplaces.Arity5_1.class, new InplaceInfo(5, 0)); + inplaces.put(Inplaces.Arity5_2.class, new InplaceInfo(5, 1)); + inplaces.put(Inplaces.Arity5_3.class, new InplaceInfo(5, 2)); + inplaces.put(Inplaces.Arity5_4.class, new InplaceInfo(5, 3)); + inplaces.put(Inplaces.Arity5_5.class, new InplaceInfo(5, 4)); + inplaces.put(Inplaces.Arity6_1.class, new InplaceInfo(6, 0)); + inplaces.put(Inplaces.Arity6_2.class, new InplaceInfo(6, 1)); + inplaces.put(Inplaces.Arity6_3.class, new InplaceInfo(6, 2)); + inplaces.put(Inplaces.Arity6_4.class, new InplaceInfo(6, 3)); + inplaces.put(Inplaces.Arity6_5.class, new InplaceInfo(6, 4)); + inplaces.put(Inplaces.Arity6_6.class, new InplaceInfo(6, 5)); + inplaces.put(Inplaces.Arity7_1.class, new InplaceInfo(7, 0)); + inplaces.put(Inplaces.Arity7_2.class, new InplaceInfo(7, 1)); + inplaces.put(Inplaces.Arity7_3.class, new InplaceInfo(7, 2)); + inplaces.put(Inplaces.Arity7_4.class, new InplaceInfo(7, 3)); + inplaces.put(Inplaces.Arity7_5.class, new InplaceInfo(7, 4)); + inplaces.put(Inplaces.Arity7_6.class, new InplaceInfo(7, 5)); + inplaces.put(Inplaces.Arity7_7.class, new InplaceInfo(7, 6)); + inplaces.put(Inplaces.Arity8_1.class, new InplaceInfo(8, 0)); + inplaces.put(Inplaces.Arity8_2.class, new InplaceInfo(8, 1)); + inplaces.put(Inplaces.Arity8_3.class, new InplaceInfo(8, 2)); + inplaces.put(Inplaces.Arity8_4.class, new InplaceInfo(8, 3)); + inplaces.put(Inplaces.Arity8_5.class, new InplaceInfo(8, 4)); + inplaces.put(Inplaces.Arity8_6.class, new InplaceInfo(8, 5)); + inplaces.put(Inplaces.Arity8_7.class, new InplaceInfo(8, 6)); + inplaces.put(Inplaces.Arity8_8.class, new InplaceInfo(8, 7)); + inplaces.put(Inplaces.Arity9_1.class, new InplaceInfo(9, 0)); + inplaces.put(Inplaces.Arity9_2.class, new InplaceInfo(9, 1)); + inplaces.put(Inplaces.Arity9_3.class, new InplaceInfo(9, 2)); + inplaces.put(Inplaces.Arity9_4.class, new InplaceInfo(9, 3)); + inplaces.put(Inplaces.Arity9_5.class, new InplaceInfo(9, 4)); + inplaces.put(Inplaces.Arity9_6.class, new InplaceInfo(9, 5)); + inplaces.put(Inplaces.Arity9_7.class, new InplaceInfo(9, 6)); + inplaces.put(Inplaces.Arity9_8.class, new InplaceInfo(9, 7)); + inplaces.put(Inplaces.Arity9_9.class, new InplaceInfo(9, 8)); + inplaces.put(Inplaces.Arity10_1.class, new InplaceInfo(10, 0)); + inplaces.put(Inplaces.Arity10_2.class, new InplaceInfo(10, 1)); + inplaces.put(Inplaces.Arity10_3.class, new InplaceInfo(10, 2)); + inplaces.put(Inplaces.Arity10_4.class, new InplaceInfo(10, 3)); + inplaces.put(Inplaces.Arity10_5.class, new InplaceInfo(10, 4)); + inplaces.put(Inplaces.Arity10_6.class, new InplaceInfo(10, 5)); + inplaces.put(Inplaces.Arity10_7.class, new InplaceInfo(10, 6)); + inplaces.put(Inplaces.Arity10_8.class, new InplaceInfo(10, 7)); + inplaces.put(Inplaces.Arity10_9.class, new InplaceInfo(10, 8)); + inplaces.put(Inplaces.Arity10_10.class, new InplaceInfo(10, 9)); + inplaces.put(Inplaces.Arity11_1.class, new InplaceInfo(11, 0)); + inplaces.put(Inplaces.Arity11_2.class, new InplaceInfo(11, 1)); + inplaces.put(Inplaces.Arity11_3.class, new InplaceInfo(11, 2)); + inplaces.put(Inplaces.Arity11_4.class, new InplaceInfo(11, 3)); + inplaces.put(Inplaces.Arity11_5.class, new InplaceInfo(11, 4)); + inplaces.put(Inplaces.Arity11_6.class, new InplaceInfo(11, 5)); + inplaces.put(Inplaces.Arity11_7.class, new InplaceInfo(11, 6)); + inplaces.put(Inplaces.Arity11_8.class, new InplaceInfo(11, 7)); + inplaces.put(Inplaces.Arity11_9.class, new InplaceInfo(11, 8)); + inplaces.put(Inplaces.Arity11_10.class, new InplaceInfo(11, 9)); + inplaces.put(Inplaces.Arity11_11.class, new InplaceInfo(11, 10)); + inplaces.put(Inplaces.Arity12_1.class, new InplaceInfo(12, 0)); + inplaces.put(Inplaces.Arity12_2.class, new InplaceInfo(12, 1)); + inplaces.put(Inplaces.Arity12_3.class, new InplaceInfo(12, 2)); + inplaces.put(Inplaces.Arity12_4.class, new InplaceInfo(12, 3)); + inplaces.put(Inplaces.Arity12_5.class, new InplaceInfo(12, 4)); + inplaces.put(Inplaces.Arity12_6.class, new InplaceInfo(12, 5)); + inplaces.put(Inplaces.Arity12_7.class, new InplaceInfo(12, 6)); + inplaces.put(Inplaces.Arity12_8.class, new InplaceInfo(12, 7)); + inplaces.put(Inplaces.Arity12_9.class, new InplaceInfo(12, 8)); + inplaces.put(Inplaces.Arity12_10.class, new InplaceInfo(12, 9)); + inplaces.put(Inplaces.Arity12_11.class, new InplaceInfo(12, 10)); + inplaces.put(Inplaces.Arity12_12.class, new InplaceInfo(12, 11)); + inplaces.put(Inplaces.Arity13_1.class, new InplaceInfo(13, 0)); + inplaces.put(Inplaces.Arity13_2.class, new InplaceInfo(13, 1)); + inplaces.put(Inplaces.Arity13_3.class, new InplaceInfo(13, 2)); + inplaces.put(Inplaces.Arity13_4.class, new InplaceInfo(13, 3)); + inplaces.put(Inplaces.Arity13_5.class, new InplaceInfo(13, 4)); + inplaces.put(Inplaces.Arity13_6.class, new InplaceInfo(13, 5)); + inplaces.put(Inplaces.Arity13_7.class, new InplaceInfo(13, 6)); + inplaces.put(Inplaces.Arity13_8.class, new InplaceInfo(13, 7)); + inplaces.put(Inplaces.Arity13_9.class, new InplaceInfo(13, 8)); + inplaces.put(Inplaces.Arity13_10.class, new InplaceInfo(13, 9)); + inplaces.put(Inplaces.Arity13_11.class, new InplaceInfo(13, 10)); + inplaces.put(Inplaces.Arity13_12.class, new InplaceInfo(13, 11)); + inplaces.put(Inplaces.Arity13_13.class, new InplaceInfo(13, 12)); + inplaces.put(Inplaces.Arity14_1.class, new InplaceInfo(14, 0)); + inplaces.put(Inplaces.Arity14_2.class, new InplaceInfo(14, 1)); + inplaces.put(Inplaces.Arity14_3.class, new InplaceInfo(14, 2)); + inplaces.put(Inplaces.Arity14_4.class, new InplaceInfo(14, 3)); + inplaces.put(Inplaces.Arity14_5.class, new InplaceInfo(14, 4)); + inplaces.put(Inplaces.Arity14_6.class, new InplaceInfo(14, 5)); + inplaces.put(Inplaces.Arity14_7.class, new InplaceInfo(14, 6)); + inplaces.put(Inplaces.Arity14_8.class, new InplaceInfo(14, 7)); + inplaces.put(Inplaces.Arity14_9.class, new InplaceInfo(14, 8)); + inplaces.put(Inplaces.Arity14_10.class, new InplaceInfo(14, 9)); + inplaces.put(Inplaces.Arity14_11.class, new InplaceInfo(14, 10)); + inplaces.put(Inplaces.Arity14_12.class, new InplaceInfo(14, 11)); + inplaces.put(Inplaces.Arity14_13.class, new InplaceInfo(14, 12)); + inplaces.put(Inplaces.Arity14_14.class, new InplaceInfo(14, 13)); + inplaces.put(Inplaces.Arity15_1.class, new InplaceInfo(15, 0)); + inplaces.put(Inplaces.Arity15_2.class, new InplaceInfo(15, 1)); + inplaces.put(Inplaces.Arity15_3.class, new InplaceInfo(15, 2)); + inplaces.put(Inplaces.Arity15_4.class, new InplaceInfo(15, 3)); + inplaces.put(Inplaces.Arity15_5.class, new InplaceInfo(15, 4)); + inplaces.put(Inplaces.Arity15_6.class, new InplaceInfo(15, 5)); + inplaces.put(Inplaces.Arity15_7.class, new InplaceInfo(15, 6)); + inplaces.put(Inplaces.Arity15_8.class, new InplaceInfo(15, 7)); + inplaces.put(Inplaces.Arity15_9.class, new InplaceInfo(15, 8)); + inplaces.put(Inplaces.Arity15_10.class, new InplaceInfo(15, 9)); + inplaces.put(Inplaces.Arity15_11.class, new InplaceInfo(15, 10)); + inplaces.put(Inplaces.Arity15_12.class, new InplaceInfo(15, 11)); + inplaces.put(Inplaces.Arity15_13.class, new InplaceInfo(15, 12)); + inplaces.put(Inplaces.Arity15_14.class, new InplaceInfo(15, 13)); + inplaces.put(Inplaces.Arity15_15.class, new InplaceInfo(15, 14)); + inplaces.put(Inplaces.Arity16_1.class, new InplaceInfo(16, 0)); + inplaces.put(Inplaces.Arity16_2.class, new InplaceInfo(16, 1)); + inplaces.put(Inplaces.Arity16_3.class, new InplaceInfo(16, 2)); + inplaces.put(Inplaces.Arity16_4.class, new InplaceInfo(16, 3)); + inplaces.put(Inplaces.Arity16_5.class, new InplaceInfo(16, 4)); + inplaces.put(Inplaces.Arity16_6.class, new InplaceInfo(16, 5)); + inplaces.put(Inplaces.Arity16_7.class, new InplaceInfo(16, 6)); + inplaces.put(Inplaces.Arity16_8.class, new InplaceInfo(16, 7)); + inplaces.put(Inplaces.Arity16_9.class, new InplaceInfo(16, 8)); + inplaces.put(Inplaces.Arity16_10.class, new InplaceInfo(16, 9)); + inplaces.put(Inplaces.Arity16_11.class, new InplaceInfo(16, 10)); + inplaces.put(Inplaces.Arity16_12.class, new InplaceInfo(16, 11)); + inplaces.put(Inplaces.Arity16_13.class, new InplaceInfo(16, 12)); + inplaces.put(Inplaces.Arity16_14.class, new InplaceInfo(16, 13)); + inplaces.put(Inplaces.Arity16_15.class, new InplaceInfo(16, 14)); + inplaces.put(Inplaces.Arity16_16.class, new InplaceInfo(16, 15)); + ALL_INPLACES = Collections.unmodifiableMap(inplaces); + } + + /** + * @return {@code true} if the given type is a known + * inplace type, {@code false} otherwise.
+ * Note that only the type itself and not its type hierarchy is + * considered. + * @throws NullPointerException If {@code c} is {@code null}. + */ + public static boolean isInplace(Class c) { + return ALL_INPLACES.containsKey(c); + } + + public static List> getInplacesOfArity(final int arity) { + return ALL_INPLACES.entrySet().stream() // + .filter(e -> e.getValue().arity() == arity) // + .map(Entry, InplaceInfo>::getKey) // + .collect(Collectors.toList()); + } + @FunctionalInterface public interface Arity1 extends Consumer { @@ -1329,4 +1500,22 @@ public interface Arity16_16, Integer> ALL_COMPUTERS; + + static { + ALL_COMPUTERS = new HashMap<>(); +#foreach($arity in $arities) + ALL_COMPUTERS.put(Computers.Arity${arity}.class, $arity); +#end + } + + /** + * @return {@code true} if the given type is a known + * computer type, {@code false} otherwise.
+ * Note that only the type itself and not its type hierarchy is + * considered. + * @throws NullPointerException If {@code c} is {@code null}. + */ + public static boolean isComputer(Class c) { + return ALL_COMPUTERS.containsKey(c); + } + #foreach($arity in $arities) #set($rawClass = "Arity$arity") #set($genericParams = $generics.call($arity)) diff --git a/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm b/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm index 4121de4a8..321a7e627 100644 --- a/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm +++ b/scijava/scijava-function/templates/main/java/org/scijava/function/Functions.vm @@ -5,6 +5,7 @@ package org.scijava.function; +import java.util.HashMap; import java.util.Objects; import java.util.function.BiFunction; import java.util.function.Function; @@ -32,6 +33,30 @@ public final class Functions { // NB: Prevent instantiation of utility class. } + /** + * All known function types and their arities. The entries are sorted by + * arity, i.e., the {@code i}-th entry has an arity of {@code i}. + */ + public static final HashMap> ALL_FUNCTIONS; + + static { + ALL_FUNCTIONS = new HashMap<>(10); +#foreach($arity in [0..$maxArity]) + ALL_FUNCTIONS.put($arity, ${functionArity.call($arity)}.class); +#end + } + + /** + * @return {@code true} if the given type is a known + * function type, {@code false} otherwise.
+ * Note that only the type itself and not its type hierarchy is + * considered. + * @throws NullPointerException If {@code c} is {@code null}. + */ + public static boolean isFunction(Class c) { + return ALL_FUNCTIONS.containsValue(c); + } + #foreach($arity in $arities) /** * A ${arity}-arity specialization of {@link Function}. diff --git a/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm b/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm index 8a06d9074..bd9e47a7b 100644 --- a/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm +++ b/scijava/scijava-function/templates/main/java/org/scijava/function/Inplaces.vm @@ -5,8 +5,14 @@ package org.scijava.function; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; import java.util.function.BiConsumer; import java.util.function.Consumer; +import java.util.stream.Collectors; /** * Container class for inplace-style functional interfaces at various @@ -43,6 +49,41 @@ public final class Inplaces { // NB: Prevent instantiation of container class. } + /** + * All known inplace types and their arities and mutable positions. The + * entries are sorted by arity and mutable position. + */ + public static final Map, InplaceInfo> ALL_INPLACES; + + static { + final Map, InplaceInfo> inplaces = new LinkedHashMap<>(22); +#foreach($arity in $arities) +#foreach($a in [1..$arity]) +#set($inplaceIndex = $a - 1) + inplaces.put($inplaceClass.call($arity, $a), new InplaceInfo(${arity}, $inplaceIndex)); +#end +#end + ALL_INPLACES = Collections.unmodifiableMap(inplaces); + } + + /** + * @return {@code true} if the given type is a known + * inplace type, {@code false} otherwise.
+ * Note that only the type itself and not its type hierarchy is + * considered. + * @throws NullPointerException If {@code c} is {@code null}. + */ + public static boolean isInplace(Class c) { + return ALL_INPLACES.containsKey(c); + } + + public static List> getInplacesOfArity(final int arity) { + return ALL_INPLACES.entrySet().stream() // + .filter(e -> e.getValue().arity() == arity) // + .map(Entry, InplaceInfo>::getKey) // + .collect(Collectors.toList()); + } + @FunctionalInterface public interface Arity1 extends Consumer { @@ -80,4 +121,22 @@ public final class Inplaces { #end #end + public static class InplaceInfo { + + private final int arity; + private final int mutablePosition; + + public InplaceInfo(final int arity, final int mutablePosition) { + this.arity = arity; + this.mutablePosition = mutablePosition; + } + + public int arity() { + return arity; + } + + public int mutablePosition() { + return mutablePosition; + } + } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java index 2f64c817a..1fb5af9be 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java @@ -5,12 +5,7 @@ package org.scijava.ops.util; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; - import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.Map; import java.util.function.Consumer; import org.scijava.function.Computers; @@ -43,45 +38,6 @@ private ComputerUtils() { // NB: Prevent instantiation of utility class. } - /** - * All known computer types and their arities. The entries are sorted by - * arity, i.e., the {@code i}-th entry has an arity of {@code i}. - */ - public static final BiMap, Integer> ALL_COMPUTERS; - - static { - final Map, Integer> computers = new HashMap<>(); - computers.put(Computers.Arity0.class, 0); - computers.put(Computers.Arity1.class, 1); - computers.put(Computers.Arity2.class, 2); - computers.put(Computers.Arity3.class, 3); - computers.put(Computers.Arity4.class, 4); - computers.put(Computers.Arity5.class, 5); - computers.put(Computers.Arity6.class, 6); - computers.put(Computers.Arity7.class, 7); - computers.put(Computers.Arity8.class, 8); - computers.put(Computers.Arity9.class, 9); - computers.put(Computers.Arity10.class, 10); - computers.put(Computers.Arity11.class, 11); - computers.put(Computers.Arity12.class, 12); - computers.put(Computers.Arity13.class, 13); - computers.put(Computers.Arity14.class, 14); - computers.put(Computers.Arity15.class, 15); - computers.put(Computers.Arity16.class, 16); - ALL_COMPUTERS = ImmutableBiMap.copyOf(computers); - } - - /** - * @return {@code true} if the given type is a {@link #ALL_COMPUTERS known} - * computer type, {@code false} otherwise.
- * Note that only the type itself and not its type hierarchy is - * considered. - * @throws NullPointerException If {@code type} is {@code null}. - */ - public static boolean isComputer(Type type) { - return ALL_COMPUTERS.containsKey(Types.raw(type)); - } - @SuppressWarnings("unchecked") public static Computers.Arity0 match(final OpEnvironment env, final String opName, final Nil outType) { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java index 60eaed736..f2c02f715 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java @@ -5,11 +5,7 @@ package org.scijava.ops.util; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; - import java.lang.reflect.Type; -import java.util.HashMap; import java.util.Map; import java.util.function.BiFunction; import java.util.function.Function; @@ -33,45 +29,6 @@ private FunctionUtils() { // NB: Prevent instantiation of utility class. } - /** - * All known function types and their arities. The entries are sorted by - * arity, i.e., the {@code i}-th entry has an arity of {@code i}. - */ - public static final BiMap> ALL_FUNCTIONS; - - static { - final Map> functions = new HashMap<>(10); - functions.put(0, Producer.class); - functions.put(1, Function.class); - functions.put(2, BiFunction.class); - functions.put(3, Functions.Arity3.class); - functions.put(4, Functions.Arity4.class); - functions.put(5, Functions.Arity5.class); - functions.put(6, Functions.Arity6.class); - functions.put(7, Functions.Arity7.class); - functions.put(8, Functions.Arity8.class); - functions.put(9, Functions.Arity9.class); - functions.put(10, Functions.Arity10.class); - functions.put(11, Functions.Arity11.class); - functions.put(12, Functions.Arity12.class); - functions.put(13, Functions.Arity13.class); - functions.put(14, Functions.Arity14.class); - functions.put(15, Functions.Arity15.class); - functions.put(16, Functions.Arity16.class); - ALL_FUNCTIONS = ImmutableBiMap.copyOf(functions); - } - - /** - * @return {@code true} if the given type is a {@link #ALL_FUNCTIONS known} - * function type, {@code false} otherwise.
- * Note that only the type itself and not its type hierarchy is - * considered. - * @throws NullPointerException If {@code type} is {@code null}. - */ - public static boolean isFunction(Type type) { - return ALL_FUNCTIONS.containsValue(Types.raw(type)); - } - @SuppressWarnings({ "unchecked" }) public static Producer match(final OpEnvironment env, final String opName, final Nil outType) { @@ -280,8 +237,11 @@ public static Functions.ArityN matchN(final OpEnvironment env, final String opName, final Nil outType, final Nil... inTypes) { - Object op = matchHelper(env, opName, ALL_FUNCTIONS.get(inTypes.length), - outType, inTypes); + Map.Entry> c = Functions.ALL_FUNCTIONS // + .entrySet().stream() // + .filter(e -> e.getKey() == inTypes.length) // + .findAny().get(); + Object op = matchHelper(env, opName, c.getValue(), outType, inTypes); if (op instanceof Producer) { return Functions.nary((Producer) op); } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java index 40dc9b1ee..01a8be4e2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java @@ -6,18 +6,15 @@ package org.scijava.ops.util; import java.lang.reflect.Type; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import java.util.function.Consumer; -import java.util.stream.Collectors; +import org.scijava.function.Computers; +import org.scijava.function.Consumers; import org.scijava.function.Inplaces; import org.scijava.function.Mutable; -import org.scijava.ops.OpEnvironment; +import org.scijava.function.Producer; import org.scijava.ops.Hints; +import org.scijava.ops.OpEnvironment; import org.scijava.types.Nil; import org.scijava.types.Types; @@ -56,170 +53,6 @@ private InplaceUtils() { // NB: Prevent instantiation of container class. } - /** - * All known inplace types and their arities and mutable positions. The - * entries are sorted by arity and mutable position. - */ - public static final Map, InplaceInfo> ALL_INPLACES; - - static { - final Map, InplaceInfo> inplaces = new LinkedHashMap<>(22); - inplaces.put(Inplaces.Arity1.class, new InplaceInfo(1, 0)); - inplaces.put(Inplaces.Arity2_1.class, new InplaceInfo(2, 0)); - inplaces.put(Inplaces.Arity2_2.class, new InplaceInfo(2, 1)); - inplaces.put(Inplaces.Arity3_1.class, new InplaceInfo(3, 0)); - inplaces.put(Inplaces.Arity3_2.class, new InplaceInfo(3, 1)); - inplaces.put(Inplaces.Arity3_3.class, new InplaceInfo(3, 2)); - inplaces.put(Inplaces.Arity4_1.class, new InplaceInfo(4, 0)); - inplaces.put(Inplaces.Arity4_2.class, new InplaceInfo(4, 1)); - inplaces.put(Inplaces.Arity4_3.class, new InplaceInfo(4, 2)); - inplaces.put(Inplaces.Arity4_4.class, new InplaceInfo(4, 3)); - inplaces.put(Inplaces.Arity5_1.class, new InplaceInfo(5, 0)); - inplaces.put(Inplaces.Arity5_2.class, new InplaceInfo(5, 1)); - inplaces.put(Inplaces.Arity5_3.class, new InplaceInfo(5, 2)); - inplaces.put(Inplaces.Arity5_4.class, new InplaceInfo(5, 3)); - inplaces.put(Inplaces.Arity5_5.class, new InplaceInfo(5, 4)); - inplaces.put(Inplaces.Arity6_1.class, new InplaceInfo(6, 0)); - inplaces.put(Inplaces.Arity6_2.class, new InplaceInfo(6, 1)); - inplaces.put(Inplaces.Arity6_3.class, new InplaceInfo(6, 2)); - inplaces.put(Inplaces.Arity6_4.class, new InplaceInfo(6, 3)); - inplaces.put(Inplaces.Arity6_5.class, new InplaceInfo(6, 4)); - inplaces.put(Inplaces.Arity6_6.class, new InplaceInfo(6, 5)); - inplaces.put(Inplaces.Arity7_1.class, new InplaceInfo(7, 0)); - inplaces.put(Inplaces.Arity7_2.class, new InplaceInfo(7, 1)); - inplaces.put(Inplaces.Arity7_3.class, new InplaceInfo(7, 2)); - inplaces.put(Inplaces.Arity7_4.class, new InplaceInfo(7, 3)); - inplaces.put(Inplaces.Arity7_5.class, new InplaceInfo(7, 4)); - inplaces.put(Inplaces.Arity7_6.class, new InplaceInfo(7, 5)); - inplaces.put(Inplaces.Arity7_7.class, new InplaceInfo(7, 6)); - inplaces.put(Inplaces.Arity8_1.class, new InplaceInfo(8, 0)); - inplaces.put(Inplaces.Arity8_2.class, new InplaceInfo(8, 1)); - inplaces.put(Inplaces.Arity8_3.class, new InplaceInfo(8, 2)); - inplaces.put(Inplaces.Arity8_4.class, new InplaceInfo(8, 3)); - inplaces.put(Inplaces.Arity8_5.class, new InplaceInfo(8, 4)); - inplaces.put(Inplaces.Arity8_6.class, new InplaceInfo(8, 5)); - inplaces.put(Inplaces.Arity8_7.class, new InplaceInfo(8, 6)); - inplaces.put(Inplaces.Arity8_8.class, new InplaceInfo(8, 7)); - inplaces.put(Inplaces.Arity9_1.class, new InplaceInfo(9, 0)); - inplaces.put(Inplaces.Arity9_2.class, new InplaceInfo(9, 1)); - inplaces.put(Inplaces.Arity9_3.class, new InplaceInfo(9, 2)); - inplaces.put(Inplaces.Arity9_4.class, new InplaceInfo(9, 3)); - inplaces.put(Inplaces.Arity9_5.class, new InplaceInfo(9, 4)); - inplaces.put(Inplaces.Arity9_6.class, new InplaceInfo(9, 5)); - inplaces.put(Inplaces.Arity9_7.class, new InplaceInfo(9, 6)); - inplaces.put(Inplaces.Arity9_8.class, new InplaceInfo(9, 7)); - inplaces.put(Inplaces.Arity9_9.class, new InplaceInfo(9, 8)); - inplaces.put(Inplaces.Arity10_1.class, new InplaceInfo(10, 0)); - inplaces.put(Inplaces.Arity10_2.class, new InplaceInfo(10, 1)); - inplaces.put(Inplaces.Arity10_3.class, new InplaceInfo(10, 2)); - inplaces.put(Inplaces.Arity10_4.class, new InplaceInfo(10, 3)); - inplaces.put(Inplaces.Arity10_5.class, new InplaceInfo(10, 4)); - inplaces.put(Inplaces.Arity10_6.class, new InplaceInfo(10, 5)); - inplaces.put(Inplaces.Arity10_7.class, new InplaceInfo(10, 6)); - inplaces.put(Inplaces.Arity10_8.class, new InplaceInfo(10, 7)); - inplaces.put(Inplaces.Arity10_9.class, new InplaceInfo(10, 8)); - inplaces.put(Inplaces.Arity10_10.class, new InplaceInfo(10, 9)); - inplaces.put(Inplaces.Arity11_1.class, new InplaceInfo(11, 0)); - inplaces.put(Inplaces.Arity11_2.class, new InplaceInfo(11, 1)); - inplaces.put(Inplaces.Arity11_3.class, new InplaceInfo(11, 2)); - inplaces.put(Inplaces.Arity11_4.class, new InplaceInfo(11, 3)); - inplaces.put(Inplaces.Arity11_5.class, new InplaceInfo(11, 4)); - inplaces.put(Inplaces.Arity11_6.class, new InplaceInfo(11, 5)); - inplaces.put(Inplaces.Arity11_7.class, new InplaceInfo(11, 6)); - inplaces.put(Inplaces.Arity11_8.class, new InplaceInfo(11, 7)); - inplaces.put(Inplaces.Arity11_9.class, new InplaceInfo(11, 8)); - inplaces.put(Inplaces.Arity11_10.class, new InplaceInfo(11, 9)); - inplaces.put(Inplaces.Arity11_11.class, new InplaceInfo(11, 10)); - inplaces.put(Inplaces.Arity12_1.class, new InplaceInfo(12, 0)); - inplaces.put(Inplaces.Arity12_2.class, new InplaceInfo(12, 1)); - inplaces.put(Inplaces.Arity12_3.class, new InplaceInfo(12, 2)); - inplaces.put(Inplaces.Arity12_4.class, new InplaceInfo(12, 3)); - inplaces.put(Inplaces.Arity12_5.class, new InplaceInfo(12, 4)); - inplaces.put(Inplaces.Arity12_6.class, new InplaceInfo(12, 5)); - inplaces.put(Inplaces.Arity12_7.class, new InplaceInfo(12, 6)); - inplaces.put(Inplaces.Arity12_8.class, new InplaceInfo(12, 7)); - inplaces.put(Inplaces.Arity12_9.class, new InplaceInfo(12, 8)); - inplaces.put(Inplaces.Arity12_10.class, new InplaceInfo(12, 9)); - inplaces.put(Inplaces.Arity12_11.class, new InplaceInfo(12, 10)); - inplaces.put(Inplaces.Arity12_12.class, new InplaceInfo(12, 11)); - inplaces.put(Inplaces.Arity13_1.class, new InplaceInfo(13, 0)); - inplaces.put(Inplaces.Arity13_2.class, new InplaceInfo(13, 1)); - inplaces.put(Inplaces.Arity13_3.class, new InplaceInfo(13, 2)); - inplaces.put(Inplaces.Arity13_4.class, new InplaceInfo(13, 3)); - inplaces.put(Inplaces.Arity13_5.class, new InplaceInfo(13, 4)); - inplaces.put(Inplaces.Arity13_6.class, new InplaceInfo(13, 5)); - inplaces.put(Inplaces.Arity13_7.class, new InplaceInfo(13, 6)); - inplaces.put(Inplaces.Arity13_8.class, new InplaceInfo(13, 7)); - inplaces.put(Inplaces.Arity13_9.class, new InplaceInfo(13, 8)); - inplaces.put(Inplaces.Arity13_10.class, new InplaceInfo(13, 9)); - inplaces.put(Inplaces.Arity13_11.class, new InplaceInfo(13, 10)); - inplaces.put(Inplaces.Arity13_12.class, new InplaceInfo(13, 11)); - inplaces.put(Inplaces.Arity13_13.class, new InplaceInfo(13, 12)); - inplaces.put(Inplaces.Arity14_1.class, new InplaceInfo(14, 0)); - inplaces.put(Inplaces.Arity14_2.class, new InplaceInfo(14, 1)); - inplaces.put(Inplaces.Arity14_3.class, new InplaceInfo(14, 2)); - inplaces.put(Inplaces.Arity14_4.class, new InplaceInfo(14, 3)); - inplaces.put(Inplaces.Arity14_5.class, new InplaceInfo(14, 4)); - inplaces.put(Inplaces.Arity14_6.class, new InplaceInfo(14, 5)); - inplaces.put(Inplaces.Arity14_7.class, new InplaceInfo(14, 6)); - inplaces.put(Inplaces.Arity14_8.class, new InplaceInfo(14, 7)); - inplaces.put(Inplaces.Arity14_9.class, new InplaceInfo(14, 8)); - inplaces.put(Inplaces.Arity14_10.class, new InplaceInfo(14, 9)); - inplaces.put(Inplaces.Arity14_11.class, new InplaceInfo(14, 10)); - inplaces.put(Inplaces.Arity14_12.class, new InplaceInfo(14, 11)); - inplaces.put(Inplaces.Arity14_13.class, new InplaceInfo(14, 12)); - inplaces.put(Inplaces.Arity14_14.class, new InplaceInfo(14, 13)); - inplaces.put(Inplaces.Arity15_1.class, new InplaceInfo(15, 0)); - inplaces.put(Inplaces.Arity15_2.class, new InplaceInfo(15, 1)); - inplaces.put(Inplaces.Arity15_3.class, new InplaceInfo(15, 2)); - inplaces.put(Inplaces.Arity15_4.class, new InplaceInfo(15, 3)); - inplaces.put(Inplaces.Arity15_5.class, new InplaceInfo(15, 4)); - inplaces.put(Inplaces.Arity15_6.class, new InplaceInfo(15, 5)); - inplaces.put(Inplaces.Arity15_7.class, new InplaceInfo(15, 6)); - inplaces.put(Inplaces.Arity15_8.class, new InplaceInfo(15, 7)); - inplaces.put(Inplaces.Arity15_9.class, new InplaceInfo(15, 8)); - inplaces.put(Inplaces.Arity15_10.class, new InplaceInfo(15, 9)); - inplaces.put(Inplaces.Arity15_11.class, new InplaceInfo(15, 10)); - inplaces.put(Inplaces.Arity15_12.class, new InplaceInfo(15, 11)); - inplaces.put(Inplaces.Arity15_13.class, new InplaceInfo(15, 12)); - inplaces.put(Inplaces.Arity15_14.class, new InplaceInfo(15, 13)); - inplaces.put(Inplaces.Arity15_15.class, new InplaceInfo(15, 14)); - inplaces.put(Inplaces.Arity16_1.class, new InplaceInfo(16, 0)); - inplaces.put(Inplaces.Arity16_2.class, new InplaceInfo(16, 1)); - inplaces.put(Inplaces.Arity16_3.class, new InplaceInfo(16, 2)); - inplaces.put(Inplaces.Arity16_4.class, new InplaceInfo(16, 3)); - inplaces.put(Inplaces.Arity16_5.class, new InplaceInfo(16, 4)); - inplaces.put(Inplaces.Arity16_6.class, new InplaceInfo(16, 5)); - inplaces.put(Inplaces.Arity16_7.class, new InplaceInfo(16, 6)); - inplaces.put(Inplaces.Arity16_8.class, new InplaceInfo(16, 7)); - inplaces.put(Inplaces.Arity16_9.class, new InplaceInfo(16, 8)); - inplaces.put(Inplaces.Arity16_10.class, new InplaceInfo(16, 9)); - inplaces.put(Inplaces.Arity16_11.class, new InplaceInfo(16, 10)); - inplaces.put(Inplaces.Arity16_12.class, new InplaceInfo(16, 11)); - inplaces.put(Inplaces.Arity16_13.class, new InplaceInfo(16, 12)); - inplaces.put(Inplaces.Arity16_14.class, new InplaceInfo(16, 13)); - inplaces.put(Inplaces.Arity16_15.class, new InplaceInfo(16, 14)); - inplaces.put(Inplaces.Arity16_16.class, new InplaceInfo(16, 15)); - ALL_INPLACES = Collections.unmodifiableMap(inplaces); - } - - /** - * @return {@code true} if the given type is a {@link #ALL_INPLACES known} - * inplace type, {@code false} otherwise.
- * Note that only the type itself and not its type hierarchy is - * considered. - * @throws NullPointerException If {@code type} is {@code null}. - */ - public static boolean isInplace(Type type) { - return ALL_INPLACES.containsKey(Types.raw(type)); - } - - public static List> getInplacesOfArity(final int arity) { - return ALL_INPLACES.entrySet().stream() // - .filter(e -> e.getValue().arity() == arity) // - .map(Entry, InplaceInfo>::getKey) // - .collect(Collectors.toList()); - } @SuppressWarnings({ "unchecked" }) public static Inplaces.Arity1 match(final OpEnvironment env, final String opName, final Nil ioType) diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm index d01e5ef63..d72c8b4ac 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm @@ -5,12 +5,7 @@ package org.scijava.ops.util; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; - import java.lang.reflect.Type; -import java.util.HashMap; -import java.util.Map; import java.util.function.Consumer; import org.scijava.function.Computers; @@ -43,31 +38,6 @@ public final class ComputerUtils { // NB: Prevent instantiation of utility class. } - /** - * All known computer types and their arities. The entries are sorted by - * arity, i.e., the {@code i}-th entry has an arity of {@code i}. - */ - public static final BiMap, Integer> ALL_COMPUTERS; - - static { - final Map, Integer> computers = new HashMap<>(); -#foreach($arity in $arities) - computers.put(Computers.Arity${arity}.class, $arity); -#end - ALL_COMPUTERS = ImmutableBiMap.copyOf(computers); - } - - /** - * @return {@code true} if the given type is a {@link #ALL_COMPUTERS known} - * computer type, {@code false} otherwise.
- * Note that only the type itself and not its type hierarchy is - * considered. - * @throws NullPointerException If {@code type} is {@code null}. - */ - public static boolean isComputer(Type type) { - return ALL_COMPUTERS.containsKey(Types.raw(type)); - } - #foreach($arity in [0..$maxArity]) @SuppressWarnings("unchecked") public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity)) diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm index fb28b968e..f0c4061fa 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm @@ -5,11 +5,7 @@ package org.scijava.ops.util; -import com.google.common.collect.BiMap; -import com.google.common.collect.ImmutableBiMap; - import java.lang.reflect.Type; -import java.util.HashMap; import java.util.Map; import java.util.function.BiFunction; import java.util.function.Function; @@ -33,31 +29,6 @@ public final class FunctionUtils { // NB: Prevent instantiation of utility class. } - /** - * All known function types and their arities. The entries are sorted by - * arity, i.e., the {@code i}-th entry has an arity of {@code i}. - */ - public static final BiMap> ALL_FUNCTIONS; - - static { - final Map> functions = new HashMap<>(10); -#foreach($arity in [0..$maxArity]) - functions.put($arity, ${functionArity.call($arity)}.class); -#end - ALL_FUNCTIONS = ImmutableBiMap.copyOf(functions); - } - - /** - * @return {@code true} if the given type is a {@link #ALL_FUNCTIONS known} - * function type, {@code false} otherwise.
- * Note that only the type itself and not its type hierarchy is - * considered. - * @throws NullPointerException If {@code type} is {@code null}. - */ - public static boolean isFunction(Type type) { - return ALL_FUNCTIONS.containsValue(Types.raw(type)); - } - #foreach($arity in [0..$maxArity]) @SuppressWarnings({ "unchecked" }) public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity)) @@ -78,8 +49,11 @@ public final class FunctionUtils { public static Functions.ArityN matchN(final OpEnvironment env, final String opName, final Nil outType, final Nil... inTypes) { - Object op = matchHelper(env, opName, ALL_FUNCTIONS.get(inTypes.length), - outType, inTypes); + Map.Entry> c = Functions.ALL_FUNCTIONS // + .entrySet().stream() // + .filter(e -> e.getKey() == inTypes.length) // + .findAny().get(); + Object op = matchHelper(env, opName, c.getValue(), outType, inTypes); if (op instanceof Producer) { return Functions.nary((Producer) op); } diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm index 7bacb1459..c3a28c725 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm @@ -6,18 +6,15 @@ package org.scijava.ops.util; import java.lang.reflect.Type; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; import java.util.function.Consumer; -import java.util.stream.Collectors; +import org.scijava.function.Computers; +import org.scijava.function.Consumers; import org.scijava.function.Inplaces; import org.scijava.function.Mutable; -import org.scijava.ops.OpEnvironment; +import org.scijava.function.Producer; import org.scijava.ops.Hints; +import org.scijava.ops.OpEnvironment; import org.scijava.types.Nil; import org.scijava.types.Types; @@ -56,40 +53,6 @@ public final class InplaceUtils { // NB: Prevent instantiation of container class. } - /** - * All known inplace types and their arities and mutable positions. The - * entries are sorted by arity and mutable position. - */ - public static final Map, InplaceInfo> ALL_INPLACES; - - static { - final Map, InplaceInfo> inplaces = new LinkedHashMap<>(22); -#foreach($arity in $arities) -#foreach($a in [1..$arity]) -#set($inplaceIndex = $a - 1) - inplaces.put($inplaceClass.call($arity, $a), new InplaceInfo(${arity}, $inplaceIndex)); -#end -#end - ALL_INPLACES = Collections.unmodifiableMap(inplaces); - } - - /** - * @return {@code true} if the given type is a {@link #ALL_INPLACES known} - * inplace type, {@code false} otherwise.
- * Note that only the type itself and not its type hierarchy is - * considered. - * @throws NullPointerException If {@code type} is {@code null}. - */ - public static boolean isInplace(Type type) { - return ALL_INPLACES.containsKey(Types.raw(type)); - } - - public static List> getInplacesOfArity(final int arity) { - return ALL_INPLACES.entrySet().stream() // - .filter(e -> e.getValue().arity() == arity) // - .map(Entry, InplaceInfo>::getKey) // - .collect(Collectors.toList()); - } #foreach($arity in $arities) #foreach($a in [1..$arity]) From e227db9b2f451bb76318af7766cb1efa10926101 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 29 Jun 2021 15:55:44 -0500 Subject: [PATCH 13/31] Move fiface utility methods to OpBuilder --- .../main/java/org/scijava/ops/OpBuilder.java | 3678 +++++++++++++---- .../org/scijava/ops/util/InplaceUtils.java | 544 +-- .../scijava/ops/matcher/OpWrappersTest.java | 342 +- .../org/scijava/ops/util/InplacesTest.java | 6 +- .../main/java/org/scijava/ops/OpBuilder.list | 58 + .../main/java/org/scijava/ops/OpBuilder.vm | 175 +- .../org/scijava/ops/util/InplaceUtils.list | 4 +- .../scijava/ops/matcher/OpWrappersTest.list | 4 +- .../org/scijava/ops/matcher/OpWrappersTest.vm | 12 +- 9 files changed, 3546 insertions(+), 1277 deletions(-) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java index 141183305..413b5eee5 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpBuilder.java @@ -42,11 +42,6 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; -import org.scijava.ops.OpEnvironment; -import org.scijava.ops.Hints; -import org.scijava.ops.util.ComputerUtils; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.ops.util.InplaceUtils; import org.scijava.types.Nil; import org.scijava.types.Types; @@ -508,7 +503,7 @@ public Type getType() { } public Computers.Arity0 computer() { - return ComputerUtils.match(env, opName, outType); + return matchComputer(env, opName, outType); } public O create() { @@ -516,7 +511,7 @@ public O create() { } public Computers.Arity0 computer(Hints hints) { - return ComputerUtils.match(env, opName, outType, hints); + return matchComputer(env, opName, outType, hints); } public O create(Hints hints) { @@ -540,7 +535,7 @@ public Arity0_OV(final O out) { } public Computers.Arity0 computer() { - return ComputerUtils.match(env, opName, type(out)); + return matchComputer(env, opName, type(out)); } public void compute() { @@ -548,7 +543,7 @@ public void compute() { } public Computers.Arity0 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(out), hints); + return matchComputer(env, opName, type(out), hints); } public void compute(final Hints hints) { @@ -576,23 +571,23 @@ public Arity1_IT_OT(final Nil in1Type, final Nil outType) } public Function function() { - return FunctionUtils.match(env, opName, in1Type, outType); + return matchFunction(env, opName, in1Type, outType); } public Function function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, outType, hints); + return matchFunction(env, opName, in1Type, outType, hints); } public Computers.Arity1 computer() { - return ComputerUtils.match(env, opName, in1Type, outType); + return matchComputer(env, opName, in1Type, outType); } public Computers.Arity1 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, outType, hints); + return matchComputer(env, opName, in1Type, outType, hints); } public Inplaces.Arity1 inplace() { - return InplaceUtils.match(env, opName, in1Type); + return matchInplace(env, opName, in1Type); } } @@ -621,15 +616,15 @@ public Arity1_IT_OT outType(final Nil outType) { } public Function function() { - return FunctionUtils.match(env, opName, in1Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, Nil.of(Object.class)); } public Function function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, Nil.of(Object.class), hints); } public Inplaces.Arity1 inplace() { - return InplaceUtils.match(env, opName, in1Type); + return matchInplace(env, opName, in1Type); } } @@ -653,19 +648,19 @@ public Arity1_IV_OT(final I1 in1, final Nil outType) } public Function function() { - return FunctionUtils.match(env, opName, type(in1), outType); + return matchFunction(env, opName, type(in1), outType); } public Function function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), outType, hints); + return matchFunction(env, opName, type(in1), outType, hints); } public Computers.Arity1 computer() { - return ComputerUtils.match(env, opName, type(in1), outType); + return matchComputer(env, opName, type(in1), outType); } public Computers.Arity1 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), outType, hints); + return matchComputer(env, opName, type(in1), outType, hints); } public O apply() { @@ -706,21 +701,21 @@ public Arity1_IV_OT outType(final Nil outType) { } public Function function() { - return FunctionUtils.match(env, opName, type(in1), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), Nil.of(Object.class)); } public Function function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), Nil.of(Object.class), hints); } public Inplaces.Arity1 inplace() { checkInplaceRefs(1, in1); - return InplaceUtils.match(env, opName, type(in1)); + return matchInplace(env, opName, type(in1)); } public Inplaces.Arity1 inplace(final Hints hints) { checkInplaceRefs(1, in1); - return InplaceUtils.match(env, opName, type(in1), hints); + return matchInplace(env, opName, type(in1), hints); } public Object apply() { @@ -759,7 +754,7 @@ public Arity1_IV_OV(final I1 in1, final O out) } public Computers.Arity1 computer() { - return ComputerUtils.match(env, opName, type(in1), type(out)); + return matchComputer(env, opName, type(in1), type(out)); } public void compute() { @@ -767,7 +762,7 @@ public void compute() { } public Computers.Arity1 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(out), hints); + return matchComputer(env, opName, type(in1), type(out), hints); } public void compute(final Hints hints) { @@ -775,7 +770,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 2, input type given, output type given. * @@ -798,27 +792,27 @@ public Arity2_IT_OT(final Nil in1Type, final Nil in2Type, final Nil o } public BiFunction function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, outType); + return matchFunction(env, opName, in1Type, in2Type, outType); } public BiFunction function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, outType, hints); } public Computers.Arity2 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, outType); + return matchComputer(env, opName, in1Type, in2Type, outType); } public Computers.Arity2 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, outType, hints); } public Inplaces.Arity2_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type); + return matchInplace1(env, opName, in1Type, in2Type); } public Inplaces.Arity2_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type); + return matchInplace2(env, opName, in1Type, in2Type); } } @@ -850,19 +844,19 @@ public Arity2_IT_OT outType(final Nil outType) { } public BiFunction function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, Nil.of(Object.class)); } public BiFunction function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, Nil.of(Object.class), hints); } public Inplaces.Arity2_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type); + return matchInplace1(env, opName, in1Type, in2Type); } public Inplaces.Arity2_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type); + return matchInplace2(env, opName, in1Type, in2Type); } } @@ -889,19 +883,19 @@ public Arity2_IV_OT(final I1 in1, final I2 in2, final Nil outType) } public BiFunction function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), outType); + return matchFunction(env, opName, type(in1), type(in2), outType); } public BiFunction function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), outType, hints); } public Computers.Arity2 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), outType); + return matchComputer(env, opName, type(in1), type(in2), outType); } public Computers.Arity2 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), outType, hints); } public O apply() { @@ -945,31 +939,31 @@ public Arity2_IV_OT outType(final Nil outType) { } public BiFunction function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), Nil.of(Object.class)); } public BiFunction function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), Nil.of(Object.class), hints); } public Inplaces.Arity2_1 inplace1() { checkInplaceRefs(1, in1, in2); - return InplaceUtils.match1(env, opName, type(in1), type(in2)); + return matchInplace1(env, opName, type(in1), type(in2)); } public Inplaces.Arity2_2 inplace2() { checkInplaceRefs(2, in1, in2); - return InplaceUtils.match2(env, opName, type(in1), type(in2)); + return matchInplace2(env, opName, type(in1), type(in2)); } public Inplaces.Arity2_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2); - return InplaceUtils.match1(env, opName, type(in1), type(in2), hints); + return matchInplace1(env, opName, type(in1), type(in2), hints); } public Inplaces.Arity2_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2); - return InplaceUtils.match2(env, opName, type(in1), type(in2), hints); + return matchInplace2(env, opName, type(in1), type(in2), hints); } public Object apply() { @@ -1019,7 +1013,7 @@ public Arity2_IV_OV(final I1 in1, final I2 in2, final O out) } public Computers.Arity2 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(out)); } public void compute() { @@ -1027,7 +1021,7 @@ public void compute() { } public Computers.Arity2 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(out), hints); } public void compute(final Hints hints) { @@ -1035,7 +1029,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 3, input type given, output type given. * @@ -1061,31 +1054,31 @@ public Arity3_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity3 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, outType); } public Functions.Arity3 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, outType, hints); } public Computers.Arity3 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, outType); } public Computers.Arity3 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, outType, hints); } public Inplaces.Arity3_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type); } public Inplaces.Arity3_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type); } public Inplaces.Arity3_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type); } } @@ -1120,23 +1113,23 @@ public Arity3_IT_OT outType(final Nil outType) { } public Functions.Arity3 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class)); } public Functions.Arity3 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, Nil.of(Object.class), hints); } public Inplaces.Arity3_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type); } public Inplaces.Arity3_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type); } public Inplaces.Arity3_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type); } } @@ -1166,19 +1159,19 @@ public Arity3_IV_OT(final I1 in1, final I2 in2, final I3 in3, final Nil outTy } public Functions.Arity3 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), outType); } public Functions.Arity3 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), outType, hints); } public Computers.Arity3 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), outType); } public Computers.Arity3 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), outType, hints); } public O apply() { @@ -1225,41 +1218,41 @@ public Arity3_IV_OT outType(final Nil outType) { } public Functions.Arity3 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class)); } public Functions.Arity3 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), Nil.of(Object.class), hints); } public Inplaces.Arity3_1 inplace1() { checkInplaceRefs(1, in1, in2, in3); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3)); } public Inplaces.Arity3_2 inplace2() { checkInplaceRefs(2, in1, in2, in3); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3)); } public Inplaces.Arity3_3 inplace3() { checkInplaceRefs(3, in1, in2, in3); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3)); } public Inplaces.Arity3_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), hints); } public Inplaces.Arity3_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), hints); } public Inplaces.Arity3_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), hints); } public Object apply() { @@ -1320,7 +1313,7 @@ public Arity3_IV_OV(final I1 in1, final I2 in2, final I3 in3, final O out) } public Computers.Arity3 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(out)); } public void compute() { @@ -1328,7 +1321,7 @@ public void compute() { } public Computers.Arity3 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(out), hints); } public void compute(final Hints hints) { @@ -1336,7 +1329,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 4, input type given, output type given. * @@ -1365,35 +1357,35 @@ public Arity4_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity4 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, outType); } public Functions.Arity4 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints); } public Computers.Arity4 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, outType); } public Computers.Arity4 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, outType, hints); } public Inplaces.Arity4_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type); } public Inplaces.Arity4_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type); } public Inplaces.Arity4_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type); } public Inplaces.Arity4_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type); } } @@ -1431,27 +1423,27 @@ public Arity4_IT_OT outType(final Nil outType) { } public Functions.Arity4 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class)); } public Functions.Arity4 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, Nil.of(Object.class), hints); } public Inplaces.Arity4_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type); } public Inplaces.Arity4_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type); } public Inplaces.Arity4_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type); } public Inplaces.Arity4_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type); } } @@ -1484,19 +1476,19 @@ public Arity4_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Functions.Arity4 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), outType); } public Functions.Arity4 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints); } public Computers.Arity4 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), outType); } public Computers.Arity4 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), outType, hints); } public O apply() { @@ -1546,51 +1538,51 @@ public Arity4_IV_OT outType(final Nil outType) { } public Functions.Arity4 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class)); } public Functions.Arity4 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), Nil.of(Object.class), hints); } public Inplaces.Arity4_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4)); } public Inplaces.Arity4_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4)); } public Inplaces.Arity4_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4)); } public Inplaces.Arity4_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4)); } public Inplaces.Arity4_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), hints); } public Inplaces.Arity4_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), hints); } public Inplaces.Arity4_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), hints); } public Inplaces.Arity4_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), hints); } public Object apply() { @@ -1662,7 +1654,7 @@ public Arity4_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Computers.Arity4 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(out)); } public void compute() { @@ -1670,7 +1662,7 @@ public void compute() { } public Computers.Arity4 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(out), hints); } public void compute(final Hints hints) { @@ -1678,7 +1670,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 5, input type given, output type given. * @@ -1710,39 +1701,39 @@ public Arity5_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity5 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType); } public Functions.Arity5 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints); } public Computers.Arity5 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType); } public Computers.Arity5 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, outType, hints); } public Inplaces.Arity5_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } } @@ -1783,31 +1774,31 @@ public Arity5_IT_OT outType(final Nil outType) { } public Functions.Arity5 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class)); } public Functions.Arity5 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, Nil.of(Object.class), hints); } public Inplaces.Arity5_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } public Inplaces.Arity5_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type); } } @@ -1843,19 +1834,19 @@ public Arity5_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Functions.Arity5 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType); } public Functions.Arity5 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints); } public Computers.Arity5 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType); } public Computers.Arity5 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), outType, hints); } public O apply() { @@ -1908,61 +1899,61 @@ public Arity5_IV_OT outType(final Nil outType) { } public Functions.Arity5 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class)); } public Functions.Arity5 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), Nil.of(Object.class), hints); } public Inplaces.Arity5_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); } public Inplaces.Arity5_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); } public Inplaces.Arity5_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); } public Inplaces.Arity5_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); } public Inplaces.Arity5_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5)); } public Inplaces.Arity5_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); } public Inplaces.Arity5_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); } public Inplaces.Arity5_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); } public Inplaces.Arity5_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); } public Inplaces.Arity5_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), hints); } public Object apply() { @@ -2045,7 +2036,7 @@ public Arity5_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Computers.Arity5 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out)); } public void compute() { @@ -2053,7 +2044,7 @@ public void compute() { } public Computers.Arity5 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(out), hints); } public void compute(final Hints hints) { @@ -2061,7 +2052,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 6, input type given, output type given. * @@ -2096,43 +2086,43 @@ public Arity6_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity6 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType); } public Functions.Arity6 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints); } public Computers.Arity6 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType); } public Computers.Arity6 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, outType, hints); } public Inplaces.Arity6_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } } @@ -2176,35 +2166,35 @@ public Arity6_IT_OT outType(final Nil outType) } public Functions.Arity6 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class)); } public Functions.Arity6 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, Nil.of(Object.class), hints); } public Inplaces.Arity6_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } public Inplaces.Arity6_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); } } @@ -2243,19 +2233,19 @@ public Arity6_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Functions.Arity6 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType); } public Functions.Arity6 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints); } public Computers.Arity6 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType); } public Computers.Arity6 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), outType, hints); } public O apply() { @@ -2311,71 +2301,71 @@ public Arity6_IV_OT outType(final Nil outType) } public Functions.Arity6 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class)); } public Functions.Arity6 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), Nil.of(Object.class), hints); } public Inplaces.Arity6_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); } public Inplaces.Arity6_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); } public Inplaces.Arity6_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); } public Inplaces.Arity6_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); } public Inplaces.Arity6_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); } public Inplaces.Arity6_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6)); } public Inplaces.Arity6_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); } public Inplaces.Arity6_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); } public Inplaces.Arity6_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); } public Inplaces.Arity6_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); } public Inplaces.Arity6_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); } public Inplaces.Arity6_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), hints); } public Object apply() { @@ -2469,7 +2459,7 @@ public Arity6_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Computers.Arity6 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out)); } public void compute() { @@ -2477,7 +2467,7 @@ public void compute() { } public Computers.Arity6 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(out), hints); } public void compute(final Hints hints) { @@ -2485,7 +2475,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 7, input type given, output type given. * @@ -2523,47 +2512,47 @@ public Arity7_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity7 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType); } public Functions.Arity7 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints); } public Computers.Arity7 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType); } public Computers.Arity7 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, outType, hints); } public Inplaces.Arity7_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } } @@ -2610,39 +2599,39 @@ public Arity7_IT_OT outType(final Nil outT } public Functions.Arity7 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class)); } public Functions.Arity7 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, Nil.of(Object.class), hints); } public Inplaces.Arity7_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } public Inplaces.Arity7_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); } } @@ -2684,19 +2673,19 @@ public Arity7_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Functions.Arity7 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType); } public Functions.Arity7 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints); } public Computers.Arity7 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType); } public Computers.Arity7 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), outType, hints); } public O apply() { @@ -2755,81 +2744,81 @@ public Arity7_IV_OT outType(final Nil outT } public Functions.Arity7 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class)); } public Functions.Arity7 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), Nil.of(Object.class), hints); } public Inplaces.Arity7_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); } public Inplaces.Arity7_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); } public Inplaces.Arity7_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); } public Inplaces.Arity7_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); } public Inplaces.Arity7_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); } public Inplaces.Arity7_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); } public Inplaces.Arity7_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7)); } public Inplaces.Arity7_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); } public Inplaces.Arity7_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); } public Inplaces.Arity7_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); } public Inplaces.Arity7_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); } public Inplaces.Arity7_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); } public Inplaces.Arity7_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); } public Inplaces.Arity7_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), hints); } public Object apply() { @@ -2934,7 +2923,7 @@ public Arity7_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Computers.Arity7 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out)); } public void compute() { @@ -2942,7 +2931,7 @@ public void compute() { } public Computers.Arity7 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(out), hints); } public void compute(final Hints hints) { @@ -2950,7 +2939,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 8, input type given, output type given. * @@ -2991,51 +2979,51 @@ public Arity8_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity8 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType); } public Functions.Arity8 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints); } public Computers.Arity8 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType); } public Computers.Arity8 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, outType, hints); } public Inplaces.Arity8_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } } @@ -3085,43 +3073,43 @@ public Arity8_IT_OT outType(final Nil } public Functions.Arity8 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class)); } public Functions.Arity8 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, Nil.of(Object.class), hints); } public Inplaces.Arity8_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } public Inplaces.Arity8_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); } } @@ -3166,19 +3154,19 @@ public Arity8_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Functions.Arity8 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType); } public Functions.Arity8 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints); } public Computers.Arity8 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType); } public Computers.Arity8 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), outType, hints); } public O apply() { @@ -3240,91 +3228,91 @@ public Arity8_IV_OT outType(final Nil } public Functions.Arity8 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class)); } public Functions.Arity8 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), Nil.of(Object.class), hints); } public Inplaces.Arity8_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8)); } public Inplaces.Arity8_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Inplaces.Arity8_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Inplaces.Arity8_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Inplaces.Arity8_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Inplaces.Arity8_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Inplaces.Arity8_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Inplaces.Arity8_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Inplaces.Arity8_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), hints); } public Object apply() { @@ -3440,7 +3428,7 @@ public Arity8_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Computers.Arity8 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out)); } public void compute() { @@ -3448,7 +3436,7 @@ public void compute() { } public Computers.Arity8 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(out), hints); } public void compute(final Hints hints) { @@ -3456,7 +3444,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 9, input type given, output type given. * @@ -3500,55 +3487,55 @@ public Arity9_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity9 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType); } public Functions.Arity9 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints); } public Computers.Arity9 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType); } public Computers.Arity9 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, outType, hints); } public Inplaces.Arity9_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } } @@ -3601,47 +3588,47 @@ public Arity9_IT_OT outType(final Nil } public Functions.Arity9 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class)); } public Functions.Arity9 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, Nil.of(Object.class), hints); } public Inplaces.Arity9_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } public Inplaces.Arity9_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); } } @@ -3689,19 +3676,19 @@ public Arity9_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Functions.Arity9 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType); } public Functions.Arity9 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints); } public Computers.Arity9 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType); } public Computers.Arity9 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), outType, hints); } public O apply() { @@ -3766,101 +3753,101 @@ public Arity9_IV_OT outType(final Nil } public Functions.Arity9 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class)); } public Functions.Arity9 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), Nil.of(Object.class), hints); } public Inplaces.Arity9_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9)); } public Inplaces.Arity9_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Inplaces.Arity9_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), hints); } public Object apply() { @@ -3987,7 +3974,7 @@ public Arity9_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fina } public Computers.Arity9 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out)); } public void compute() { @@ -3995,7 +3982,7 @@ public void compute() { } public Computers.Arity9 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(out), hints); } public void compute(final Hints hints) { @@ -4003,7 +3990,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 10, input type given, output type given. * @@ -4050,59 +4036,59 @@ public Arity10_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity10 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType); } public Functions.Arity10 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints); } public Computers.Arity10 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType); } public Computers.Arity10 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, outType, hints); } public Inplaces.Arity10_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } } @@ -4158,51 +4144,51 @@ public Arity10_IT_OT outType(fin } public Functions.Arity10 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class)); } public Functions.Arity10 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, Nil.of(Object.class), hints); } public Inplaces.Arity10_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } public Inplaces.Arity10_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); } } @@ -4253,19 +4239,19 @@ public Arity10_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Functions.Arity10 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType); } public Functions.Arity10 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints); } public Computers.Arity10 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType); } public Computers.Arity10 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), outType, hints); } public O apply() { @@ -4333,111 +4319,111 @@ public Arity10_IV_OT outType(fin } public Functions.Arity10 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class)); } public Functions.Arity10 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), Nil.of(Object.class), hints); } public Inplaces.Arity10_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_10 inplace10() { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10)); } public Inplaces.Arity10_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Inplaces.Arity10_10 inplace10(final Hints hints) { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), hints); } public Object apply() { @@ -4575,7 +4561,7 @@ public Arity10_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Computers.Arity10 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out)); } public void compute() { @@ -4583,7 +4569,7 @@ public void compute() { } public Computers.Arity10 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(out), hints); } public void compute(final Hints hints) { @@ -4591,7 +4577,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 11, input type given, output type given. * @@ -4641,63 +4626,63 @@ public Arity11_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity11 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType); } public Functions.Arity11 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints); } public Computers.Arity11 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType); } public Computers.Arity11 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, outType, hints); } public Inplaces.Arity11_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } } @@ -4756,55 +4741,55 @@ public Arity11_IT_OT outTyp } public Functions.Arity11 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class)); } public Functions.Arity11 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, Nil.of(Object.class), hints); } public Inplaces.Arity11_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } public Inplaces.Arity11_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); } } @@ -4858,19 +4843,19 @@ public Arity11_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Functions.Arity11 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType); } public Functions.Arity11 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints); } public Computers.Arity11 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType); } public Computers.Arity11 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), outType, hints); } public O apply() { @@ -4941,121 +4926,121 @@ public Arity11_IV_OT outTyp } public Functions.Arity11 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class)); } public Functions.Arity11 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), Nil.of(Object.class), hints); } public Inplaces.Arity11_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_10 inplace10() { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_11 inplace11() { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11)); } public Inplaces.Arity11_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_10 inplace10(final Hints hints) { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Inplaces.Arity11_11 inplace11(final Hints hints) { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), hints); } public Object apply() { @@ -5204,7 +5189,7 @@ public Arity11_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Computers.Arity11 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out)); } public void compute() { @@ -5212,7 +5197,7 @@ public void compute() { } public Computers.Arity11 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(out), hints); } public void compute(final Hints hints) { @@ -5220,7 +5205,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 12, input type given, output type given. * @@ -5273,67 +5257,67 @@ public Arity12_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity12 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType); } public Functions.Arity12 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints); } public Computers.Arity12 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType); } public Computers.Arity12 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, outType, hints); } public Inplaces.Arity12_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } } @@ -5395,59 +5379,59 @@ public Arity12_IT_OT o } public Functions.Arity12 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class)); } public Functions.Arity12 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, Nil.of(Object.class), hints); } public Inplaces.Arity12_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } public Inplaces.Arity12_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); } } @@ -5504,19 +5488,19 @@ public Arity12_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Functions.Arity12 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType); } public Functions.Arity12 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints); } public Computers.Arity12 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType); } public Computers.Arity12 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), outType, hints); } public O apply() { @@ -5590,131 +5574,131 @@ public Arity12_IV_OT o } public Functions.Arity12 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class)); } public Functions.Arity12 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), Nil.of(Object.class), hints); } public Inplaces.Arity12_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_10 inplace10() { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_11 inplace11() { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_12 inplace12() { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12)); } public Inplaces.Arity12_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_10 inplace10(final Hints hints) { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_11 inplace11(final Hints hints) { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Inplaces.Arity12_12 inplace12(final Hints hints) { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), hints); } public Object apply() { @@ -5874,7 +5858,7 @@ public Arity12_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Computers.Arity12 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out)); } public void compute() { @@ -5882,7 +5866,7 @@ public void compute() { } public Computers.Arity12 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(out), hints); } public void compute(final Hints hints) { @@ -5890,7 +5874,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 13, input type given, output type given. * @@ -5946,71 +5929,71 @@ public Arity13_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity13 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType); } public Functions.Arity13 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints); } public Computers.Arity13 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType); } public Computers.Arity13 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, outType, hints); } public Inplaces.Arity13_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } } @@ -6075,63 +6058,63 @@ public Arity13_IT_OT function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class)); } public Functions.Arity13 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, Nil.of(Object.class), hints); } public Inplaces.Arity13_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } public Inplaces.Arity13_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); } } @@ -6191,19 +6174,19 @@ public Arity13_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Functions.Arity13 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType); } public Functions.Arity13 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints); } public Computers.Arity13 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType); } public Computers.Arity13 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), outType, hints); } public O apply() { @@ -6280,141 +6263,141 @@ public Arity13_IV_OT function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class)); } public Functions.Arity13 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), Nil.of(Object.class), hints); } public Inplaces.Arity13_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_10 inplace10() { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_11 inplace11() { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_12 inplace12() { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_13 inplace13() { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13)); } public Inplaces.Arity13_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_10 inplace10(final Hints hints) { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_11 inplace11(final Hints hints) { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_12 inplace12(final Hints hints) { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Inplaces.Arity13_13 inplace13(final Hints hints) { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), hints); } public Object apply() { @@ -6585,7 +6568,7 @@ public Arity13_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Computers.Arity13 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out)); } public void compute() { @@ -6593,7 +6576,7 @@ public void compute() { } public Computers.Arity13 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(out), hints); } public void compute(final Hints hints) { @@ -6601,7 +6584,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 14, input type given, output type given. * @@ -6660,75 +6642,75 @@ public Arity14_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity14 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType); } public Functions.Arity14 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints); } public Computers.Arity14 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType); } public Computers.Arity14 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, outType, hints); } public Inplaces.Arity14_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_14 inplace14() { - return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } } @@ -6796,67 +6778,67 @@ public Arity14_IT_OT function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class)); } public Functions.Arity14 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, Nil.of(Object.class), hints); } public Inplaces.Arity14_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } public Inplaces.Arity14_14 inplace14() { - return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); } } @@ -6919,19 +6901,19 @@ public Arity14_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Functions.Arity14 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType); } public Functions.Arity14 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints); } public Computers.Arity14 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType); } public Computers.Arity14 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), outType, hints); } public O apply() { @@ -7011,151 +6993,151 @@ public Arity14_IV_OT function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class)); } public Functions.Arity14 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), Nil.of(Object.class), hints); } public Inplaces.Arity14_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_10 inplace10() { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_11 inplace11() { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_12 inplace12() { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_13 inplace13() { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_14 inplace14() { checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); + return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14)); } public Inplaces.Arity14_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_10 inplace10(final Hints hints) { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_11 inplace11(final Hints hints) { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_12 inplace12(final Hints hints) { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_13 inplace13(final Hints hints) { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Inplaces.Arity14_14 inplace14(final Hints hints) { checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14); - return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); + return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), hints); } public Object apply() { @@ -7337,7 +7319,7 @@ public Arity14_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Computers.Arity14 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out)); } public void compute() { @@ -7345,7 +7327,7 @@ public void compute() { } public Computers.Arity14 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(out), hints); } public void compute(final Hints hints) { @@ -7353,7 +7335,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 15, input type given, output type given. * @@ -7415,79 +7396,79 @@ public Arity15_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity15 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType); } public Functions.Arity15 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints); } public Computers.Arity15 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType); } public Computers.Arity15 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, outType, hints); } public Inplaces.Arity15_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_14 inplace14() { - return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_15 inplace15() { - return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } } @@ -7558,71 +7539,71 @@ public Arity15_IT_OT function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class)); } public Functions.Arity15 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, Nil.of(Object.class), hints); } public Inplaces.Arity15_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_14 inplace14() { - return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } public Inplaces.Arity15_15 inplace15() { - return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); } } @@ -7688,19 +7669,19 @@ public Arity15_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Functions.Arity15 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType); } public Functions.Arity15 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints); } public Computers.Arity15 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType); } public Computers.Arity15 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), outType, hints); } public O apply() { @@ -7783,161 +7764,161 @@ public Arity15_IV_OT function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class)); } public Functions.Arity15 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), Nil.of(Object.class), hints); } public Inplaces.Arity15_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_10 inplace10() { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_11 inplace11() { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_12 inplace12() { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_13 inplace13() { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_14 inplace14() { checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_15 inplace15() { checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); + return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15)); } public Inplaces.Arity15_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_10 inplace10(final Hints hints) { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_11 inplace11(final Hints hints) { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_12 inplace12(final Hints hints) { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_13 inplace13(final Hints hints) { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_14 inplace14(final Hints hints) { checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Inplaces.Arity15_15 inplace15(final Hints hints) { checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15); - return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); + return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), hints); } public Object apply() { @@ -8130,7 +8111,7 @@ public Arity15_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Computers.Arity15 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out)); } public void compute() { @@ -8138,7 +8119,7 @@ public void compute() { } public Computers.Arity15 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(out), hints); } public void compute(final Hints hints) { @@ -8146,7 +8127,6 @@ public void compute(final Hints hints) { } } - /** * Builder with arity 16, input type given, output type given. * @@ -8211,83 +8191,83 @@ public Arity16_IT_OT(final Nil in1Type, final Nil in2Type, final Nil } public Functions.Arity16 function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType); } public Functions.Arity16 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints); } public Computers.Arity16 computer() { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType); } public Computers.Arity16 computer(final Hints hints) { - return ComputerUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints); + return matchComputer(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, outType, hints); } public Inplaces.Arity16_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_14 inplace14() { - return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_15 inplace15() { - return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_16 inplace16() { - return InplaceUtils.match16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } } @@ -8361,75 +8341,75 @@ public Arity16_IT_OT function() { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class)); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class)); } public Functions.Arity16 function(final Hints hints) { - return FunctionUtils.match(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class), hints); + return matchFunction(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type, Nil.of(Object.class), hints); } public Inplaces.Arity16_1 inplace1() { - return InplaceUtils.match1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace1(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_2 inplace2() { - return InplaceUtils.match2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace2(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_3 inplace3() { - return InplaceUtils.match3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace3(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_4 inplace4() { - return InplaceUtils.match4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace4(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_5 inplace5() { - return InplaceUtils.match5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace5(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_6 inplace6() { - return InplaceUtils.match6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace6(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_7 inplace7() { - return InplaceUtils.match7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace7(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_8 inplace8() { - return InplaceUtils.match8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace8(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_9 inplace9() { - return InplaceUtils.match9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace9(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_10 inplace10() { - return InplaceUtils.match10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace10(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_11 inplace11() { - return InplaceUtils.match11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace11(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_12 inplace12() { - return InplaceUtils.match12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace12(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_13 inplace13() { - return InplaceUtils.match13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace13(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_14 inplace14() { - return InplaceUtils.match14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace14(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_15 inplace15() { - return InplaceUtils.match15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace15(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } public Inplaces.Arity16_16 inplace16() { - return InplaceUtils.match16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + return matchInplace16(env, opName, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); } } @@ -8498,19 +8478,19 @@ public Arity16_IV_OT(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Functions.Arity16 function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType); } public Functions.Arity16 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints); } public Computers.Arity16 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType); } public Computers.Arity16 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), outType, hints); } public O apply() { @@ -8596,171 +8576,171 @@ public Arity16_IV_OT function() { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class)); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class)); } public Functions.Arity16 function(final Hints hints) { - return FunctionUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class), hints); + return matchFunction(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), Nil.of(Object.class), hints); } public Inplaces.Arity16_1 inplace1() { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_2 inplace2() { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_3 inplace3() { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_4 inplace4() { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_5 inplace5() { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_6 inplace6() { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_7 inplace7() { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_8 inplace8() { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_9 inplace9() { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_10 inplace10() { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_11 inplace11() { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_12 inplace12() { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_13 inplace13() { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_14 inplace14() { checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_15 inplace15() { checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_16 inplace16() { checkInplaceRefs(16, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); + return matchInplace16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16)); } public Inplaces.Arity16_1 inplace1(final Hints hints) { checkInplaceRefs(1, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace1(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_2 inplace2(final Hints hints) { checkInplaceRefs(2, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace2(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_3 inplace3(final Hints hints) { checkInplaceRefs(3, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace3(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_4 inplace4(final Hints hints) { checkInplaceRefs(4, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace4(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_5 inplace5(final Hints hints) { checkInplaceRefs(5, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace5(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_6 inplace6(final Hints hints) { checkInplaceRefs(6, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace6(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_7 inplace7(final Hints hints) { checkInplaceRefs(7, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace7(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_8 inplace8(final Hints hints) { checkInplaceRefs(8, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace8(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_9 inplace9(final Hints hints) { checkInplaceRefs(9, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace9(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_10 inplace10(final Hints hints) { checkInplaceRefs(10, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace10(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_11 inplace11(final Hints hints) { checkInplaceRefs(11, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace11(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_12 inplace12(final Hints hints) { checkInplaceRefs(12, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace12(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_13 inplace13(final Hints hints) { checkInplaceRefs(13, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace13(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_14 inplace14(final Hints hints) { checkInplaceRefs(14, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace14(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_15 inplace15(final Hints hints) { checkInplaceRefs(15, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace15(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Inplaces.Arity16_16 inplace16(final Hints hints) { checkInplaceRefs(16, in1, in2, in3, in4, in5, in6, in7, in8, in9, in10, in11, in12, in13, in14, in15, in16); - return InplaceUtils.match16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); + return matchInplace16(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), hints); } public Object apply() { @@ -8964,7 +8944,7 @@ public Arity16_IV_OV(final I1 in1, final I2 in2, final I3 in3, final I4 in4, fin } public Computers.Arity16 computer() { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out)); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out)); } public void compute() { @@ -8972,7 +8952,7 @@ public void compute() { } public Computers.Arity16 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out), hints); + return matchComputer(env, opName, type(in1), type(in2), type(in3), type(in4), type(in5), type(in6), type(in7), type(in8), type(in9), type(in10), type(in11), type(in12), type(in13), type(in14), type(in15), type(in16), type(out), hints); } public void compute(final Hints hints) { @@ -8981,4 +8961,2118 @@ public void compute(final Hints hints) { } + @SuppressWarnings({ "unchecked" }) + public static Producer matchFunction(final OpEnvironment env, final String opName, final Nil outType) + { + return matchFunctionHelper(env, opName, Producer.class, outType); + } + + @SuppressWarnings({ "unchecked" }) + public static Function matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Function.class, outType, in1Type); + } + + @SuppressWarnings({ "unchecked" }) + public static BiFunction matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType) + { + return matchFunctionHelper(env, opName, BiFunction.class, outType, in1Type, in2Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity3 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity3.class, outType, in1Type, in2Type, in3Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity4 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity5 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity6 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity7 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity8 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity9 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity10 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity11 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity12 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity13 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity14 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity15 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity16 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType) + { + return matchFunctionHelper(env, opName, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Producer matchFunction(final OpEnvironment env, final String opName, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Producer.class, outType); + } + + @SuppressWarnings({ "unchecked" }) + public static Function matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Function.class, outType, in1Type); + } + + @SuppressWarnings({ "unchecked" }) + public static BiFunction matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, BiFunction.class, outType, in1Type, in2Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity3 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity3.class, outType, in1Type, in2Type, in3Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity4 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity5 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity6 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity7 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity8 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity9 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity10 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity11 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity12 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity13 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity14 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity15 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + } + + @SuppressWarnings({ "unchecked" }) + public static Functions.Arity16 matchFunction(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType, final Hints hints) + { + return matchFunctionHelper(env, opName, hints, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchFunctionHelper(final OpEnvironment env, final String opName, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchFunctionHelper(final OpEnvironment env, final String opName, final Hints hints, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity0 matchComputer(final OpEnvironment env, final String opName, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity0.class, outType); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity1 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity1.class, outType, in1Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity2 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity2.class, outType, in1Type, in2Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity3 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity3.class, outType, in1Type, in2Type, in3Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity4 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity5 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity6 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity7 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity8 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity9 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity10 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity11 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity12 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity13 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity14 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity15 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity16 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType) + { + return matchComputerHelper(env, opName, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity0 matchComputer(final OpEnvironment env, final String opName, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity0.class, outType); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity1 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity1.class, outType, in1Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity2 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity2.class, outType, in1Type, in2Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity3 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity3.class, outType, in1Type, in2Type, in3Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity4 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity5 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity6 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity7 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity8 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity9 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity10 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity11 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity12 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity13 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity14 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity15 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); + } + + @SuppressWarnings("unchecked") + public static Computers.Arity16 matchComputer(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType, final Hints hints) + { + return matchComputerHelper(env, opName, hints, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchComputerHelper(final OpEnvironment env, final String opName, final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + final Nil[] nils = new Nil[inTypes.length + 1]; + System.arraycopy(inTypes, 0, nils, 0, inTypes.length); + nils[nils.length - 1] = outType; + return (T) env.op(opName, Nil.of(specialType), nils, outType); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchComputerHelper(final OpEnvironment env, final String opName, final Hints hints, final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + final Nil[] nils = new Nil[inTypes.length + 1]; + System.arraycopy(inTypes, 0, nils, 0, inTypes.length); + nils[nils.length - 1] = outType; + return (T) env.op(opName, Nil.of(specialType), nils, outType, hints); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity1 matchInplace(final OpEnvironment env, final String opName, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity1.class, ioType, new Nil[] {ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity2_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity2_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity3_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity3_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity3_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_16 matchInplace16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType) + { + return matchInplaceHelper(env, opName, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType}); + } + + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity1 matchInplace(final OpEnvironment env, final String opName, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity1.class, ioType, new Nil[] {ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity2_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity2_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity3_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity3_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity3_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity4_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity5_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity6_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity7_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity8_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity9_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity10_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity11_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity12_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity13_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity14_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity15_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type}); + } + + @SuppressWarnings({ "unchecked" }) + public static Inplaces.Arity16_16 matchInplace16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType, final Hints hints) + { + return matchInplaceHelper(env, opName, hints, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType}); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchInplaceHelper(final OpEnvironment env, final String opName, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchInplaceHelper(final OpEnvironment env, final String opName, final Hints hints, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); + } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java index 01a8be4e2..50132e47b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java @@ -55,1634 +55,1634 @@ private InplaceUtils() { @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity1 match(final OpEnvironment env, final String opName, final Nil ioType) + public static Inplaces.Arity1 matchInplace(final OpEnvironment env, final String opName, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity1.class, ioType, new Nil[] {ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type) + public static Inplaces.Arity2_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type) { return matchHelper(env, opName, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType) + public static Inplaces.Arity2_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type) + public static Inplaces.Arity3_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type) { return matchHelper(env, opName, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type) + public static Inplaces.Arity3_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type) { return matchHelper(env, opName, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType) + public static Inplaces.Arity3_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type) + public static Inplaces.Arity4_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type) { return matchHelper(env, opName, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type) + public static Inplaces.Arity4_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type) { return matchHelper(env, opName, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type) + public static Inplaces.Arity4_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type) { return matchHelper(env, opName, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType) + public static Inplaces.Arity4_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type) + public static Inplaces.Arity5_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type) { return matchHelper(env, opName, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type) + public static Inplaces.Arity5_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type) { return matchHelper(env, opName, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type) + public static Inplaces.Arity5_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type) { return matchHelper(env, opName, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type) + public static Inplaces.Arity5_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type) { return matchHelper(env, opName, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType) + public static Inplaces.Arity5_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) + public static Inplaces.Arity6_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) { return matchHelper(env, opName, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) + public static Inplaces.Arity6_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) { return matchHelper(env, opName, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type) + public static Inplaces.Arity6_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type) { return matchHelper(env, opName, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type) + public static Inplaces.Arity6_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type) { return matchHelper(env, opName, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type) + public static Inplaces.Arity6_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type) { return matchHelper(env, opName, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType) + public static Inplaces.Arity6_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) + public static Inplaces.Arity7_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) { return matchHelper(env, opName, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) + public static Inplaces.Arity7_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) { return matchHelper(env, opName, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) + public static Inplaces.Arity7_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) { return matchHelper(env, opName, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type) + public static Inplaces.Arity7_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type) { return matchHelper(env, opName, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type) + public static Inplaces.Arity7_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type) { return matchHelper(env, opName, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type) + public static Inplaces.Arity7_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type) { return matchHelper(env, opName, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType) + public static Inplaces.Arity7_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + public static Inplaces.Arity8_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) { return matchHelper(env, opName, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + public static Inplaces.Arity8_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) { return matchHelper(env, opName, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + public static Inplaces.Arity8_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) { return matchHelper(env, opName, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) + public static Inplaces.Arity8_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) { return matchHelper(env, opName, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type) + public static Inplaces.Arity8_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type) { return matchHelper(env, opName, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type) + public static Inplaces.Arity8_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type) { return matchHelper(env, opName, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type) + public static Inplaces.Arity8_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type) { return matchHelper(env, opName, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType) + public static Inplaces.Arity8_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + public static Inplaces.Arity9_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + public static Inplaces.Arity9_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + public static Inplaces.Arity9_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + public static Inplaces.Arity9_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) + public static Inplaces.Arity9_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type) + public static Inplaces.Arity9_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type) + public static Inplaces.Arity9_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type) + public static Inplaces.Arity9_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type) { return matchHelper(env, opName, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType) + public static Inplaces.Arity9_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type) + public static Inplaces.Arity10_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type) + public static Inplaces.Arity10_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type) { return matchHelper(env, opName, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType) + public static Inplaces.Arity10_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type) + public static Inplaces.Arity11_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type) + public static Inplaces.Arity11_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type) { return matchHelper(env, opName, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType) + public static Inplaces.Arity11_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type) + public static Inplaces.Arity12_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type) + public static Inplaces.Arity12_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type) { return matchHelper(env, opName, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType) + public static Inplaces.Arity12_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type) + public static Inplaces.Arity13_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type) + public static Inplaces.Arity13_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type) { return matchHelper(env, opName, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType) + public static Inplaces.Arity13_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type) + public static Inplaces.Arity14_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type) + public static Inplaces.Arity14_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type) { return matchHelper(env, opName, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_14 match14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType) + public static Inplaces.Arity14_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type) + public static Inplaces.Arity15_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_14 match14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type) + public static Inplaces.Arity15_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type) { return matchHelper(env, opName, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_15 match15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType) + public static Inplaces.Arity15_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_14 match14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type) + public static Inplaces.Arity16_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_15 match15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type) + public static Inplaces.Arity16_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type) { return matchHelper(env, opName, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_16 match16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType) + public static Inplaces.Arity16_16 matchInplace16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType) { return matchHelper(env, opName, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity1 match(final OpEnvironment env, final String opName, final Nil ioType, final Hints hints) + public static Inplaces.Arity1 matchInplace(final OpEnvironment env, final String opName, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity1.class, ioType, new Nil[] {ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Hints hints) + public static Inplaces.Arity2_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity2_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Hints hints) + public static Inplaces.Arity3_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Hints hints) + public static Inplaces.Arity3_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity3_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Hints hints) + public static Inplaces.Arity4_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Hints hints) + public static Inplaces.Arity4_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Hints hints) + public static Inplaces.Arity4_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity4_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) + public static Inplaces.Arity5_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) + public static Inplaces.Arity5_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Hints hints) + public static Inplaces.Arity5_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Hints hints) + public static Inplaces.Arity5_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity5_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) + public static Inplaces.Arity6_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) + public static Inplaces.Arity6_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) + public static Inplaces.Arity6_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Hints hints) + public static Inplaces.Arity6_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Hints hints) + public static Inplaces.Arity6_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity6_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + public static Inplaces.Arity7_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + public static Inplaces.Arity7_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + public static Inplaces.Arity7_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) + public static Inplaces.Arity7_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Hints hints) + public static Inplaces.Arity7_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Hints hints) + public static Inplaces.Arity7_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity7_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + public static Inplaces.Arity8_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + public static Inplaces.Arity8_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + public static Inplaces.Arity8_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + public static Inplaces.Arity8_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) + public static Inplaces.Arity8_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Hints hints) + public static Inplaces.Arity8_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Hints hints) + public static Inplaces.Arity8_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity8_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Hints hints) + public static Inplaces.Arity9_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity9_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Hints hints) + public static Inplaces.Arity10_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity10_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Hints hints) + public static Inplaces.Arity11_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity11_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Hints hints) + public static Inplaces.Arity12_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity12_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Hints hints) + public static Inplaces.Arity13_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity13_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Hints hints) + public static Inplaces.Arity14_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_14 match14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity14_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_14 match14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Hints hints) + public static Inplaces.Arity15_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_15 match15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity15_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_1 match1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_2 match2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_3 match3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_4 match4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_5 match5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_6 match6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_7 match7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_8 match8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_9 match9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_10 match10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_11 match11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_12 match12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_13 match13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_14 match14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_15 match15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type, final Hints hints) + public static Inplaces.Arity16_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type}); } @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_16 match16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType, final Hints hints) + public static Inplaces.Arity16_16 matchInplace16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType, final Hints hints) { return matchHelper(env, opName, hints, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType}); } diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java index 7721049ee..dc561899b 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/OpWrappersTest.java @@ -16,9 +16,7 @@ import org.scijava.function.Inplaces; import org.scijava.function.Producer; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.util.ComputerUtils; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.ops.util.InplaceUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.GenericTyped; import org.scijava.types.Nil; @@ -33,7 +31,7 @@ public class OpWrappersTest extends AbstractTestEnvironment { @Test public void testWrapProducer() { Nil nilDouble = Nil.of(Double.class); - Producer op = FunctionUtils.match(ops.env(), "test.addDoubles", nilDouble); + Producer op = OpBuilder.matchFunction(ops.env(), "test.addDoubles", nilDouble); assertTrue(op instanceof GenericTyped); } @@ -41,7 +39,7 @@ public void testWrapProducer() { public void testWrapFunction1() { Nil nilDouble = Nil.of(Double.class); Function op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -50,7 +48,7 @@ public void testWrapFunction1() { public void testWrapFunction2() { Nil nilDouble = Nil.of(Double.class); BiFunction op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -59,7 +57,7 @@ public void testWrapFunction2() { public void testWrapFunction3() { Nil nilDouble = Nil.of(Double.class); Functions.Arity3 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -68,7 +66,7 @@ public void testWrapFunction3() { public void testWrapFunction4() { Nil nilDouble = Nil.of(Double.class); Functions.Arity4 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -77,7 +75,7 @@ public void testWrapFunction4() { public void testWrapFunction5() { Nil nilDouble = Nil.of(Double.class); Functions.Arity5 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -86,7 +84,7 @@ public void testWrapFunction5() { public void testWrapFunction6() { Nil nilDouble = Nil.of(Double.class); Functions.Arity6 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -95,7 +93,7 @@ public void testWrapFunction6() { public void testWrapFunction7() { Nil nilDouble = Nil.of(Double.class); Functions.Arity7 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -104,7 +102,7 @@ public void testWrapFunction7() { public void testWrapFunction8() { Nil nilDouble = Nil.of(Double.class); Functions.Arity8 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -113,7 +111,7 @@ public void testWrapFunction8() { public void testWrapFunction9() { Nil nilDouble = Nil.of(Double.class); Functions.Arity9 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -122,7 +120,7 @@ public void testWrapFunction9() { public void testWrapFunction10() { Nil nilDouble = Nil.of(Double.class); Functions.Arity10 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -131,7 +129,7 @@ public void testWrapFunction10() { public void testWrapFunction11() { Nil nilDouble = Nil.of(Double.class); Functions.Arity11 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -140,7 +138,7 @@ public void testWrapFunction11() { public void testWrapFunction12() { Nil nilDouble = Nil.of(Double.class); Functions.Arity12 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -149,7 +147,7 @@ public void testWrapFunction12() { public void testWrapFunction13() { Nil nilDouble = Nil.of(Double.class); Functions.Arity13 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -158,7 +156,7 @@ public void testWrapFunction13() { public void testWrapFunction14() { Nil nilDouble = Nil.of(Double.class); Functions.Arity14 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -167,7 +165,7 @@ public void testWrapFunction14() { public void testWrapFunction15() { Nil nilDouble = Nil.of(Double.class); Functions.Arity15 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -176,7 +174,7 @@ public void testWrapFunction15() { public void testWrapFunction16() { Nil nilDouble = Nil.of(Double.class); Functions.Arity16 op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -185,7 +183,7 @@ public void testWrapFunction16() { public void testWrapComputer1() { Nil nilDouble = Nil.of(double[].class); Computers.Arity1 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -193,7 +191,7 @@ public void testWrapComputer1() { public void testWrapComputer2() { Nil nilDouble = Nil.of(double[].class); Computers.Arity2 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -201,7 +199,7 @@ public void testWrapComputer2() { public void testWrapComputer3() { Nil nilDouble = Nil.of(double[].class); Computers.Arity3 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -209,7 +207,7 @@ public void testWrapComputer3() { public void testWrapComputer4() { Nil nilDouble = Nil.of(double[].class); Computers.Arity4 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -217,7 +215,7 @@ public void testWrapComputer4() { public void testWrapComputer5() { Nil nilDouble = Nil.of(double[].class); Computers.Arity5 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -225,7 +223,7 @@ public void testWrapComputer5() { public void testWrapComputer6() { Nil nilDouble = Nil.of(double[].class); Computers.Arity6 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -233,7 +231,7 @@ public void testWrapComputer6() { public void testWrapComputer7() { Nil nilDouble = Nil.of(double[].class); Computers.Arity7 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -241,7 +239,7 @@ public void testWrapComputer7() { public void testWrapComputer8() { Nil nilDouble = Nil.of(double[].class); Computers.Arity8 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -249,7 +247,7 @@ public void testWrapComputer8() { public void testWrapComputer9() { Nil nilDouble = Nil.of(double[].class); Computers.Arity9 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -257,7 +255,7 @@ public void testWrapComputer9() { public void testWrapComputer10() { Nil nilDouble = Nil.of(double[].class); Computers.Arity10 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -265,7 +263,7 @@ public void testWrapComputer10() { public void testWrapComputer11() { Nil nilDouble = Nil.of(double[].class); Computers.Arity11 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -273,7 +271,7 @@ public void testWrapComputer11() { public void testWrapComputer12() { Nil nilDouble = Nil.of(double[].class); Computers.Arity12 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -281,7 +279,7 @@ public void testWrapComputer12() { public void testWrapComputer13() { Nil nilDouble = Nil.of(double[].class); Computers.Arity13 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -289,7 +287,7 @@ public void testWrapComputer13() { public void testWrapComputer14() { Nil nilDouble = Nil.of(double[].class); Computers.Arity14 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -297,7 +295,7 @@ public void testWrapComputer14() { public void testWrapComputer15() { Nil nilDouble = Nil.of(double[].class); Computers.Arity15 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -305,7 +303,7 @@ public void testWrapComputer15() { public void testWrapComputer16() { Nil nilDouble = Nil.of(double[].class); Computers.Arity16 op = // - ComputerUtils.match(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchComputer(ops.env(), "test.addArrays", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -313,7 +311,7 @@ public void testWrapComputer16() { public void testWrapInplace1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity1 op = // - InplaceUtils.match(ops.env(), "test.mulArrays1_1", nilDouble); + OpBuilder.matchInplace(ops.env(), "test.mulArrays1_1", nilDouble); assertTrue(op instanceof GenericTyped); } @@ -321,7 +319,7 @@ public void testWrapInplace1() { public void testWrapInplace2_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity2_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays2_1", nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays2_1", nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -329,7 +327,7 @@ public void testWrapInplace2_1() { public void testWrapInplace2_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity2_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays2_2", nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays2_2", nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -337,7 +335,7 @@ public void testWrapInplace2_2() { public void testWrapInplace3_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity3_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays3_1", nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays3_1", nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -345,7 +343,7 @@ public void testWrapInplace3_1() { public void testWrapInplace3_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity3_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays3_2", nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays3_2", nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -353,7 +351,7 @@ public void testWrapInplace3_2() { public void testWrapInplace3_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity3_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays3_3", nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays3_3", nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -361,7 +359,7 @@ public void testWrapInplace3_3() { public void testWrapInplace4_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity4_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays4_1", nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays4_1", nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -369,7 +367,7 @@ public void testWrapInplace4_1() { public void testWrapInplace4_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity4_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays4_2", nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays4_2", nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -377,7 +375,7 @@ public void testWrapInplace4_2() { public void testWrapInplace4_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity4_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays4_3", nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays4_3", nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -385,7 +383,7 @@ public void testWrapInplace4_3() { public void testWrapInplace4_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity4_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays4_4", nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays4_4", nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -393,7 +391,7 @@ public void testWrapInplace4_4() { public void testWrapInplace5_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity5_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays5_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays5_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -401,7 +399,7 @@ public void testWrapInplace5_1() { public void testWrapInplace5_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity5_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays5_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays5_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -409,7 +407,7 @@ public void testWrapInplace5_2() { public void testWrapInplace5_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity5_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays5_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays5_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -417,7 +415,7 @@ public void testWrapInplace5_3() { public void testWrapInplace5_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity5_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays5_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays5_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -425,7 +423,7 @@ public void testWrapInplace5_4() { public void testWrapInplace5_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity5_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays5_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays5_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -433,7 +431,7 @@ public void testWrapInplace5_5() { public void testWrapInplace6_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity6_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays6_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays6_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -441,7 +439,7 @@ public void testWrapInplace6_1() { public void testWrapInplace6_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity6_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays6_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays6_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -449,7 +447,7 @@ public void testWrapInplace6_2() { public void testWrapInplace6_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity6_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays6_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays6_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -457,7 +455,7 @@ public void testWrapInplace6_3() { public void testWrapInplace6_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity6_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays6_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays6_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -465,7 +463,7 @@ public void testWrapInplace6_4() { public void testWrapInplace6_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity6_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays6_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays6_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -473,7 +471,7 @@ public void testWrapInplace6_5() { public void testWrapInplace6_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity6_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays6_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays6_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -481,7 +479,7 @@ public void testWrapInplace6_6() { public void testWrapInplace7_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity7_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays7_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays7_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -489,7 +487,7 @@ public void testWrapInplace7_1() { public void testWrapInplace7_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity7_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays7_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays7_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -497,7 +495,7 @@ public void testWrapInplace7_2() { public void testWrapInplace7_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity7_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays7_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays7_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -505,7 +503,7 @@ public void testWrapInplace7_3() { public void testWrapInplace7_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity7_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays7_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays7_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -513,7 +511,7 @@ public void testWrapInplace7_4() { public void testWrapInplace7_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity7_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays7_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays7_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -521,7 +519,7 @@ public void testWrapInplace7_5() { public void testWrapInplace7_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity7_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays7_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays7_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -529,7 +527,7 @@ public void testWrapInplace7_6() { public void testWrapInplace7_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity7_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays7_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays7_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -537,7 +535,7 @@ public void testWrapInplace7_7() { public void testWrapInplace8_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays8_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays8_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -545,7 +543,7 @@ public void testWrapInplace8_1() { public void testWrapInplace8_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays8_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays8_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -553,7 +551,7 @@ public void testWrapInplace8_2() { public void testWrapInplace8_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays8_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays8_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -561,7 +559,7 @@ public void testWrapInplace8_3() { public void testWrapInplace8_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays8_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays8_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -569,7 +567,7 @@ public void testWrapInplace8_4() { public void testWrapInplace8_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays8_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays8_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -577,7 +575,7 @@ public void testWrapInplace8_5() { public void testWrapInplace8_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays8_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays8_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -585,7 +583,7 @@ public void testWrapInplace8_6() { public void testWrapInplace8_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays8_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays8_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -593,7 +591,7 @@ public void testWrapInplace8_7() { public void testWrapInplace8_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity8_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays8_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays8_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -601,7 +599,7 @@ public void testWrapInplace8_8() { public void testWrapInplace9_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays9_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays9_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -609,7 +607,7 @@ public void testWrapInplace9_1() { public void testWrapInplace9_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays9_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays9_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -617,7 +615,7 @@ public void testWrapInplace9_2() { public void testWrapInplace9_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays9_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays9_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -625,7 +623,7 @@ public void testWrapInplace9_3() { public void testWrapInplace9_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays9_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays9_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -633,7 +631,7 @@ public void testWrapInplace9_4() { public void testWrapInplace9_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays9_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays9_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -641,7 +639,7 @@ public void testWrapInplace9_5() { public void testWrapInplace9_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays9_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays9_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -649,7 +647,7 @@ public void testWrapInplace9_6() { public void testWrapInplace9_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays9_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays9_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -657,7 +655,7 @@ public void testWrapInplace9_7() { public void testWrapInplace9_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays9_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays9_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -665,7 +663,7 @@ public void testWrapInplace9_8() { public void testWrapInplace9_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity9_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays9_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays9_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -673,7 +671,7 @@ public void testWrapInplace9_9() { public void testWrapInplace10_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays10_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays10_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -681,7 +679,7 @@ public void testWrapInplace10_1() { public void testWrapInplace10_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays10_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays10_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -689,7 +687,7 @@ public void testWrapInplace10_2() { public void testWrapInplace10_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays10_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays10_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -697,7 +695,7 @@ public void testWrapInplace10_3() { public void testWrapInplace10_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays10_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays10_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -705,7 +703,7 @@ public void testWrapInplace10_4() { public void testWrapInplace10_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays10_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays10_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -713,7 +711,7 @@ public void testWrapInplace10_5() { public void testWrapInplace10_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays10_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays10_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -721,7 +719,7 @@ public void testWrapInplace10_6() { public void testWrapInplace10_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays10_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays10_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -729,7 +727,7 @@ public void testWrapInplace10_7() { public void testWrapInplace10_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays10_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays10_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -737,7 +735,7 @@ public void testWrapInplace10_8() { public void testWrapInplace10_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays10_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays10_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -745,7 +743,7 @@ public void testWrapInplace10_9() { public void testWrapInplace10_10() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity10_10 op = // - InplaceUtils.match10(ops.env(), "test.mulArrays10_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace10(ops.env(), "test.mulArrays10_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -753,7 +751,7 @@ public void testWrapInplace10_10() { public void testWrapInplace11_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays11_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays11_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -761,7 +759,7 @@ public void testWrapInplace11_1() { public void testWrapInplace11_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays11_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays11_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -769,7 +767,7 @@ public void testWrapInplace11_2() { public void testWrapInplace11_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays11_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays11_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -777,7 +775,7 @@ public void testWrapInplace11_3() { public void testWrapInplace11_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays11_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays11_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -785,7 +783,7 @@ public void testWrapInplace11_4() { public void testWrapInplace11_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays11_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays11_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -793,7 +791,7 @@ public void testWrapInplace11_5() { public void testWrapInplace11_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays11_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays11_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -801,7 +799,7 @@ public void testWrapInplace11_6() { public void testWrapInplace11_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays11_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays11_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -809,7 +807,7 @@ public void testWrapInplace11_7() { public void testWrapInplace11_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays11_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays11_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -817,7 +815,7 @@ public void testWrapInplace11_8() { public void testWrapInplace11_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays11_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays11_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -825,7 +823,7 @@ public void testWrapInplace11_9() { public void testWrapInplace11_10() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_10 op = // - InplaceUtils.match10(ops.env(), "test.mulArrays11_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace10(ops.env(), "test.mulArrays11_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -833,7 +831,7 @@ public void testWrapInplace11_10() { public void testWrapInplace11_11() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity11_11 op = // - InplaceUtils.match11(ops.env(), "test.mulArrays11_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace11(ops.env(), "test.mulArrays11_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -841,7 +839,7 @@ public void testWrapInplace11_11() { public void testWrapInplace12_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays12_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays12_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -849,7 +847,7 @@ public void testWrapInplace12_1() { public void testWrapInplace12_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays12_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays12_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -857,7 +855,7 @@ public void testWrapInplace12_2() { public void testWrapInplace12_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays12_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays12_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -865,7 +863,7 @@ public void testWrapInplace12_3() { public void testWrapInplace12_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays12_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays12_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -873,7 +871,7 @@ public void testWrapInplace12_4() { public void testWrapInplace12_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays12_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays12_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -881,7 +879,7 @@ public void testWrapInplace12_5() { public void testWrapInplace12_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays12_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays12_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -889,7 +887,7 @@ public void testWrapInplace12_6() { public void testWrapInplace12_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays12_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays12_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -897,7 +895,7 @@ public void testWrapInplace12_7() { public void testWrapInplace12_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays12_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays12_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -905,7 +903,7 @@ public void testWrapInplace12_8() { public void testWrapInplace12_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays12_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays12_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -913,7 +911,7 @@ public void testWrapInplace12_9() { public void testWrapInplace12_10() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_10 op = // - InplaceUtils.match10(ops.env(), "test.mulArrays12_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace10(ops.env(), "test.mulArrays12_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -921,7 +919,7 @@ public void testWrapInplace12_10() { public void testWrapInplace12_11() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_11 op = // - InplaceUtils.match11(ops.env(), "test.mulArrays12_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace11(ops.env(), "test.mulArrays12_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -929,7 +927,7 @@ public void testWrapInplace12_11() { public void testWrapInplace12_12() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity12_12 op = // - InplaceUtils.match12(ops.env(), "test.mulArrays12_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace12(ops.env(), "test.mulArrays12_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -937,7 +935,7 @@ public void testWrapInplace12_12() { public void testWrapInplace13_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays13_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays13_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -945,7 +943,7 @@ public void testWrapInplace13_1() { public void testWrapInplace13_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays13_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays13_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -953,7 +951,7 @@ public void testWrapInplace13_2() { public void testWrapInplace13_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays13_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays13_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -961,7 +959,7 @@ public void testWrapInplace13_3() { public void testWrapInplace13_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays13_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays13_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -969,7 +967,7 @@ public void testWrapInplace13_4() { public void testWrapInplace13_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays13_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays13_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -977,7 +975,7 @@ public void testWrapInplace13_5() { public void testWrapInplace13_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays13_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays13_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -985,7 +983,7 @@ public void testWrapInplace13_6() { public void testWrapInplace13_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays13_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays13_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -993,7 +991,7 @@ public void testWrapInplace13_7() { public void testWrapInplace13_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays13_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays13_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1001,7 +999,7 @@ public void testWrapInplace13_8() { public void testWrapInplace13_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays13_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays13_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1009,7 +1007,7 @@ public void testWrapInplace13_9() { public void testWrapInplace13_10() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_10 op = // - InplaceUtils.match10(ops.env(), "test.mulArrays13_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace10(ops.env(), "test.mulArrays13_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1017,7 +1015,7 @@ public void testWrapInplace13_10() { public void testWrapInplace13_11() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_11 op = // - InplaceUtils.match11(ops.env(), "test.mulArrays13_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace11(ops.env(), "test.mulArrays13_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1025,7 +1023,7 @@ public void testWrapInplace13_11() { public void testWrapInplace13_12() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_12 op = // - InplaceUtils.match12(ops.env(), "test.mulArrays13_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace12(ops.env(), "test.mulArrays13_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1033,7 +1031,7 @@ public void testWrapInplace13_12() { public void testWrapInplace13_13() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity13_13 op = // - InplaceUtils.match13(ops.env(), "test.mulArrays13_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace13(ops.env(), "test.mulArrays13_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1041,7 +1039,7 @@ public void testWrapInplace13_13() { public void testWrapInplace14_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays14_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays14_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1049,7 +1047,7 @@ public void testWrapInplace14_1() { public void testWrapInplace14_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays14_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays14_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1057,7 +1055,7 @@ public void testWrapInplace14_2() { public void testWrapInplace14_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays14_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays14_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1065,7 +1063,7 @@ public void testWrapInplace14_3() { public void testWrapInplace14_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays14_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays14_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1073,7 +1071,7 @@ public void testWrapInplace14_4() { public void testWrapInplace14_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays14_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays14_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1081,7 +1079,7 @@ public void testWrapInplace14_5() { public void testWrapInplace14_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays14_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays14_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1089,7 +1087,7 @@ public void testWrapInplace14_6() { public void testWrapInplace14_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays14_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays14_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1097,7 +1095,7 @@ public void testWrapInplace14_7() { public void testWrapInplace14_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays14_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays14_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1105,7 +1103,7 @@ public void testWrapInplace14_8() { public void testWrapInplace14_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays14_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays14_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1113,7 +1111,7 @@ public void testWrapInplace14_9() { public void testWrapInplace14_10() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_10 op = // - InplaceUtils.match10(ops.env(), "test.mulArrays14_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace10(ops.env(), "test.mulArrays14_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1121,7 +1119,7 @@ public void testWrapInplace14_10() { public void testWrapInplace14_11() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_11 op = // - InplaceUtils.match11(ops.env(), "test.mulArrays14_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace11(ops.env(), "test.mulArrays14_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1129,7 +1127,7 @@ public void testWrapInplace14_11() { public void testWrapInplace14_12() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_12 op = // - InplaceUtils.match12(ops.env(), "test.mulArrays14_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace12(ops.env(), "test.mulArrays14_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1137,7 +1135,7 @@ public void testWrapInplace14_12() { public void testWrapInplace14_13() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_13 op = // - InplaceUtils.match13(ops.env(), "test.mulArrays14_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace13(ops.env(), "test.mulArrays14_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1145,7 +1143,7 @@ public void testWrapInplace14_13() { public void testWrapInplace14_14() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity14_14 op = // - InplaceUtils.match14(ops.env(), "test.mulArrays14_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace14(ops.env(), "test.mulArrays14_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1153,7 +1151,7 @@ public void testWrapInplace14_14() { public void testWrapInplace15_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays15_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays15_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1161,7 +1159,7 @@ public void testWrapInplace15_1() { public void testWrapInplace15_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays15_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays15_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1169,7 +1167,7 @@ public void testWrapInplace15_2() { public void testWrapInplace15_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays15_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays15_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1177,7 +1175,7 @@ public void testWrapInplace15_3() { public void testWrapInplace15_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays15_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays15_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1185,7 +1183,7 @@ public void testWrapInplace15_4() { public void testWrapInplace15_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays15_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays15_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1193,7 +1191,7 @@ public void testWrapInplace15_5() { public void testWrapInplace15_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays15_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays15_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1201,7 +1199,7 @@ public void testWrapInplace15_6() { public void testWrapInplace15_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays15_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays15_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1209,7 +1207,7 @@ public void testWrapInplace15_7() { public void testWrapInplace15_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays15_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays15_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1217,7 +1215,7 @@ public void testWrapInplace15_8() { public void testWrapInplace15_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays15_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays15_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1225,7 +1223,7 @@ public void testWrapInplace15_9() { public void testWrapInplace15_10() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_10 op = // - InplaceUtils.match10(ops.env(), "test.mulArrays15_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace10(ops.env(), "test.mulArrays15_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1233,7 +1231,7 @@ public void testWrapInplace15_10() { public void testWrapInplace15_11() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_11 op = // - InplaceUtils.match11(ops.env(), "test.mulArrays15_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace11(ops.env(), "test.mulArrays15_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1241,7 +1239,7 @@ public void testWrapInplace15_11() { public void testWrapInplace15_12() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_12 op = // - InplaceUtils.match12(ops.env(), "test.mulArrays15_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace12(ops.env(), "test.mulArrays15_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1249,7 +1247,7 @@ public void testWrapInplace15_12() { public void testWrapInplace15_13() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_13 op = // - InplaceUtils.match13(ops.env(), "test.mulArrays15_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace13(ops.env(), "test.mulArrays15_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1257,7 +1255,7 @@ public void testWrapInplace15_13() { public void testWrapInplace15_14() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_14 op = // - InplaceUtils.match14(ops.env(), "test.mulArrays15_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace14(ops.env(), "test.mulArrays15_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1265,7 +1263,7 @@ public void testWrapInplace15_14() { public void testWrapInplace15_15() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity15_15 op = // - InplaceUtils.match15(ops.env(), "test.mulArrays15_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace15(ops.env(), "test.mulArrays15_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1273,7 +1271,7 @@ public void testWrapInplace15_15() { public void testWrapInplace16_1() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_1 op = // - InplaceUtils.match1(ops.env(), "test.mulArrays16_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace1(ops.env(), "test.mulArrays16_1", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1281,7 +1279,7 @@ public void testWrapInplace16_1() { public void testWrapInplace16_2() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_2 op = // - InplaceUtils.match2(ops.env(), "test.mulArrays16_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace2(ops.env(), "test.mulArrays16_2", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1289,7 +1287,7 @@ public void testWrapInplace16_2() { public void testWrapInplace16_3() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_3 op = // - InplaceUtils.match3(ops.env(), "test.mulArrays16_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace3(ops.env(), "test.mulArrays16_3", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1297,7 +1295,7 @@ public void testWrapInplace16_3() { public void testWrapInplace16_4() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_4 op = // - InplaceUtils.match4(ops.env(), "test.mulArrays16_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace4(ops.env(), "test.mulArrays16_4", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1305,7 +1303,7 @@ public void testWrapInplace16_4() { public void testWrapInplace16_5() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_5 op = // - InplaceUtils.match5(ops.env(), "test.mulArrays16_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace5(ops.env(), "test.mulArrays16_5", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1313,7 +1311,7 @@ public void testWrapInplace16_5() { public void testWrapInplace16_6() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_6 op = // - InplaceUtils.match6(ops.env(), "test.mulArrays16_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace6(ops.env(), "test.mulArrays16_6", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1321,7 +1319,7 @@ public void testWrapInplace16_6() { public void testWrapInplace16_7() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_7 op = // - InplaceUtils.match7(ops.env(), "test.mulArrays16_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace7(ops.env(), "test.mulArrays16_7", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1329,7 +1327,7 @@ public void testWrapInplace16_7() { public void testWrapInplace16_8() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_8 op = // - InplaceUtils.match8(ops.env(), "test.mulArrays16_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace8(ops.env(), "test.mulArrays16_8", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1337,7 +1335,7 @@ public void testWrapInplace16_8() { public void testWrapInplace16_9() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_9 op = // - InplaceUtils.match9(ops.env(), "test.mulArrays16_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace9(ops.env(), "test.mulArrays16_9", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1345,7 +1343,7 @@ public void testWrapInplace16_9() { public void testWrapInplace16_10() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_10 op = // - InplaceUtils.match10(ops.env(), "test.mulArrays16_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace10(ops.env(), "test.mulArrays16_10", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1353,7 +1351,7 @@ public void testWrapInplace16_10() { public void testWrapInplace16_11() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_11 op = // - InplaceUtils.match11(ops.env(), "test.mulArrays16_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace11(ops.env(), "test.mulArrays16_11", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1361,7 +1359,7 @@ public void testWrapInplace16_11() { public void testWrapInplace16_12() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_12 op = // - InplaceUtils.match12(ops.env(), "test.mulArrays16_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace12(ops.env(), "test.mulArrays16_12", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1369,7 +1367,7 @@ public void testWrapInplace16_12() { public void testWrapInplace16_13() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_13 op = // - InplaceUtils.match13(ops.env(), "test.mulArrays16_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace13(ops.env(), "test.mulArrays16_13", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1377,7 +1375,7 @@ public void testWrapInplace16_13() { public void testWrapInplace16_14() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_14 op = // - InplaceUtils.match14(ops.env(), "test.mulArrays16_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace14(ops.env(), "test.mulArrays16_14", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1385,7 +1383,7 @@ public void testWrapInplace16_14() { public void testWrapInplace16_15() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_15 op = // - InplaceUtils.match15(ops.env(), "test.mulArrays16_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace15(ops.env(), "test.mulArrays16_15", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } @@ -1393,7 +1391,7 @@ public void testWrapInplace16_15() { public void testWrapInplace16_16() { Nil nilDouble = Nil.of(double[].class); Inplaces.Arity16_16 op = // - InplaceUtils.match16(ops.env(), "test.mulArrays16_16", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); + OpBuilder.matchInplace16(ops.env(), "test.mulArrays16_16", nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble, nilDouble); assertTrue(op instanceof GenericTyped); } diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java index b106d4b45..ce35a3610 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/InplacesTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.scijava.function.Inplaces; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.util.InplaceUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class InplacesTest extends AbstractTestEnvironment { @@ -42,7 +42,7 @@ public class InplacesTest extends AbstractTestEnvironment { @Test public void testUnaryInplaces() { - Inplaces.Arity1 inplaceSqrt = InplaceUtils.match(ops.env(), "math.sqrt", nilDoubleArray); + Inplaces.Arity1 inplaceSqrt = OpBuilder.matchInplace(ops.env(), "math.sqrt", nilDoubleArray); final double[] a1 = { 4, 100, 36 }; inplaceSqrt.mutate(a1); assert arrayEquals(a1, 2.0, 10.0, 6.0); @@ -50,7 +50,7 @@ public void testUnaryInplaces() { @Test public void testBinaryInplaces() { - final Inplaces.Arity2_1 inplaceAdd = InplaceUtils.match1(ops.env(), "math.add", nilDoubleArray, + final Inplaces.Arity2_1 inplaceAdd = OpBuilder.matchInplace1(ops.env(), "math.add", nilDoubleArray, nilDoubleArray); final double[] a1 = { 3, 5, 7 }; final double[] a2 = { 2, 4, 9 }; diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list index a3866eb1d..f4f87aae9 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.list @@ -48,6 +48,7 @@ inputClassesToTypes = ``` ``` inputTypesArgs = ``` { arity -> + arity == 0 ? '' : String.join(', ', (1..arity).stream().map{a -> "final Nil in${a}Type"}.collect()) } ``` @@ -58,16 +59,73 @@ inputTypesFromArgs = ``` ``` inputTypesArgsWithOutput = ``` { arity -> + arity == 0 ? 'final Nil outType' : String.join(', ', (1..arity).stream().map{a -> "final Nil in${a}Type"}.collect()) + ', final Nil outType' } ``` inputTypes = ``` { arity -> + arity == 0 ? '' : String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect()) } ``` inputTypesWithOutput = ``` { arity -> + arity == 0 ? 'outType' : String.join(', ', (1..arity).stream().map{a -> "in${a}Type"}.collect()) + ', outType' } ``` +simplifiedClass = ``` +{ arity, num -> + simplifiedInplace(arity, num) + '.class' +} +``` +inplaceClass = ``` +{ arity, num -> + inplaceType(arity, num) + '.class' +} +``` +matchName = ``` +{ arity, num -> + arity == 1 ? "matchInplace" : + "matchInplace${num}" +} +``` +inplaceTypeVarNums = ``` +{ arity, io -> + (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity) +} +``` +inplaceGenericsList = ``` +{ arity, io -> + inplaceTypeVarNums(arity, io).stream().map{a -> "I$a"}.collect() +} +``` +inplaceGenerics = ``` +{ arity, io -> + '<' + String.join(', ', inplaceGenericsList(arity, io)) + '>' +} +``` +matchParams = ``` +{ arity, io -> + String.join(', ', inplaceGenericsList(arity, io).stream().map{a -> + a.charAt(1) == 'O'? + "final Nil<$a> ${a.toLowerCase()}Type" : + "final Nil<$a> in${a.substring(1)}Type"}.collect()) +} +``` +typeVarNums = ``` +{ arity, io -> + (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity) +} +``` +basicParamsList = ``` +{ arity, io -> + typeVarNums(arity, io).stream().map{a -> a == 'O' ? "ioType" : "in${a}Type"}.collect() +} +``` +basicParams = ``` +{ arity, io -> + String.join(', ', basicParamsList(arity, io)) +} +``` \ No newline at end of file diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm index 364961f5e..3781e30d8 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/OpBuilder.vm @@ -42,11 +42,6 @@ import org.scijava.function.Computers; import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; -import org.scijava.ops.OpEnvironment; -import org.scijava.ops.Hints; -import org.scijava.ops.util.ComputerUtils; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.ops.util.InplaceUtils; import org.scijava.types.Nil; import org.scijava.types.Types; @@ -240,7 +235,7 @@ public class OpBuilder { } public Computers.Arity0 computer() { - return ComputerUtils.match(env, opName, outType); + return matchComputer(env, opName, outType); } public O create() { @@ -248,7 +243,7 @@ public class OpBuilder { } public Computers.Arity0 computer(Hints hints) { - return ComputerUtils.match(env, opName, outType, hints); + return matchComputer(env, opName, outType, hints); } public O create(Hints hints) { @@ -272,7 +267,7 @@ public class OpBuilder { } public Computers.Arity0 computer() { - return ComputerUtils.match(env, opName, type(out)); + return matchComputer(env, opName, type(out)); } public void compute() { @@ -280,7 +275,7 @@ public class OpBuilder { } public Computers.Arity0 computer(final Hints hints) { - return ComputerUtils.match(env, opName, type(out), hints); + return matchComputer(env, opName, type(out), hints); } public void compute(final Hints hints) { @@ -315,24 +310,24 @@ public class OpBuilder { } public $functionArity.call($arity)$generics.call($arity) function() { - return FunctionUtils.match(env, opName, $inputTypesWithOutput.call($arity)); + return matchFunction(env, opName, $inputTypesWithOutput.call($arity)); } public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) { - return FunctionUtils.match(env, opName, $inputTypesWithOutput.call($arity), hints); + return matchFunction(env, opName, $inputTypesWithOutput.call($arity), hints); } public Computers.Arity${arity}$generics.call($arity) computer() { - return ComputerUtils.match(env, opName, $inputTypesWithOutput.call($arity)); + return matchComputer(env, opName, $inputTypesWithOutput.call($arity)); } public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) { - return ComputerUtils.match(env, opName, $inputTypesWithOutput.call($arity), hints); + return matchComputer(env, opName, $inputTypesWithOutput.call($arity), hints); } #foreach($a in [1..$arity]) public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() { - return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity)); + return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity)); } #end @@ -368,16 +363,16 @@ public class OpBuilder { } public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() { - return FunctionUtils.match(env, opName, $inputTypes.call($arity), Nil.of(Object.class)); + return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class)); } public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) { - return FunctionUtils.match(env, opName, $inputTypes.call($arity), Nil.of(Object.class), hints); + return matchFunction(env, opName, $inputTypes.call($arity), Nil.of(Object.class), hints); } #foreach($a in [1..$arity]) public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() { - return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity)); + return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypes.call($arity)); } #end @@ -408,19 +403,19 @@ public class OpBuilder { } public $functionArity.call($arity)$generics.call($arity) function() { - return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType); + return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType); } public $functionArity.call($arity)$generics.call($arity) function(final Hints hints) { - return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType, hints); + return matchFunction(env, opName, $inputTypesFromArgs.call($arity), outType, hints); } public Computers.Arity${arity}$generics.call($arity) computer() { - return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType); + return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType); } public Computers.Arity${arity}$generics.call($arity) computer(final Hints hints) { - return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), outType, hints); + return matchComputer(env, opName, $inputTypesFromArgs.call($arity), outType, hints); } public O apply() { @@ -467,24 +462,24 @@ public class OpBuilder { } public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function() { - return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class)); + return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class)); } public $functionArity.call($arity)$genericsWildcardFunction.call($arity) function(final Hints hints) { - return FunctionUtils.match(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class), hints); + return matchFunction(env, opName, $inputTypesFromArgs.call($arity), Nil.of(Object.class), hints); } #foreach($a in [1..$arity]) public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}() { checkInplaceRefs($a, $inputObjects.call($arity)); - return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity)); + return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity)); } #end #foreach($a in [1..$arity]) public Inplaces.Arity$inplaceSuffix.call($arity, $a)$genericsWithoutOutput.call($arity) inplace${inplaceMatchNumber.call($arity, $a)}(final Hints hints) { checkInplaceRefs($a, $inputObjects.call($arity)); - return InplaceUtils.match${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity), hints); + return matchInplace${inplaceMatchNumber.call($arity, $a)}(env, opName, $inputTypesFromArgs.call($arity), hints); } #end @@ -534,7 +529,7 @@ public class OpBuilder { } public Computers.Arity${arity}${generics.call($arity)} computer() { - return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), type(out)); + return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out)); } public void compute() { @@ -542,7 +537,7 @@ public class OpBuilder { } public Computers.Arity${arity}${generics.call($arity)} computer(final Hints hints) { - return ComputerUtils.match(env, opName, $inputTypesFromArgs.call($arity), type(out), hints); + return matchComputer(env, opName, $inputTypesFromArgs.call($arity), type(out), hints); } public void compute(final Hints hints) { @@ -550,6 +545,132 @@ public class OpBuilder { } } +#end + +#foreach($arity in [0..$maxArity]) + @SuppressWarnings({ "unchecked" }) + public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity)) + { + return matchFunctionHelper(env, opName, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity)); + } + +#end +#foreach($arity in [0..$maxArity]) + @SuppressWarnings({ "unchecked" }) + public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) matchFunction(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints) + { + return matchFunctionHelper(env, opName, hints, ${functionArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity)); + } + +#end + @SuppressWarnings({ "unchecked" }) + private static T matchFunctionHelper(final OpEnvironment env, final String opName, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchFunctionHelper(final OpEnvironment env, final String opName, final Hints hints, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); + } + +#foreach($arity in [0..$maxArity]) + @SuppressWarnings("unchecked") + public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity)) + { + return matchComputerHelper(env, opName, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity)); + } + +#end +#foreach($arity in [0..$maxArity]) + @SuppressWarnings("unchecked") + public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) matchComputer(final OpEnvironment env, final String opName, $inputTypesArgsWithOutput.call($arity), final Hints hints) + { + return matchComputerHelper(env, opName, hints, ${computerArity.call($arity)}.class, outType#if( $arity == 0)#{else}, #end$inputTypes.call($arity)); + } + +#end + @SuppressWarnings({ "unchecked" }) + private static T matchComputerHelper(final OpEnvironment env, final String opName, final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + final Nil[] nils = new Nil[inTypes.length + 1]; + System.arraycopy(inTypes, 0, nils, 0, inTypes.length); + nils[nils.length - 1] = outType; + return (T) env.op(opName, Nil.of(specialType), nils, outType); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchComputerHelper(final OpEnvironment env, final String opName, final Hints hints, final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length + 1]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + types[types.length - 1] = outType.getType(); + final Type specialType = Types.parameterize(opClass, types); + final Nil[] nils = new Nil[inTypes.length + 1]; + System.arraycopy(inTypes, 0, nils, 0, inTypes.length); + nils[nils.length - 1] = outType; + return (T) env.op(opName, Nil.of(specialType), nils, outType, hints); + } + +#foreach($arity in $arities) +#foreach($a in [1..$arity]) + @SuppressWarnings({ "unchecked" }) + public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a)) + { + return matchInplaceHelper(env, opName, ${inplaceClass.call($arity, $a)}, ioType, new Nil[] {${basicParams.call($arity, $a)}}); + } #end +#end + +#foreach($arity in $arities) +#foreach($a in [1..$arity]) + @SuppressWarnings({ "unchecked" }) + public static $inplaceGenerics.call($arity, $a) $inplaceType.call($arity, $a)$inplaceGenerics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a), final Hints hints) + { + return matchInplaceHelper(env, opName, hints, ${inplaceType.call($arity, $a)}.class, ioType, new Nil[] {${basicParams.call($arity, $a)}}); + } + +#end +#end + @SuppressWarnings({ "unchecked" }) + private static T matchInplaceHelper(final OpEnvironment env, final String opName, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType); + } + + @SuppressWarnings({ "unchecked" }) + private static T matchInplaceHelper(final OpEnvironment env, final String opName, final Hints hints, + final Class opClass, final Nil outType, final Nil... inTypes) + { + final Type[] types = new Type[inTypes.length]; + for (int i = 0; i < inTypes.length; i++) + types[i] = inTypes[i].getType(); + final Type specialType = Types.parameterize(opClass, types); + return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); + } } diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list index 0cb053054..1461fe4bc 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list @@ -49,8 +49,8 @@ basicParams = ``` ``` matchName = ``` { arity, num -> - arity == 1 ? "match" : - "match${num}" + arity == 1 ? "matchInplace" : + "matchInplace${num}" } ``` matchParams = ``` diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list index f7e22fb47..bf49f4a14 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.list @@ -20,7 +20,7 @@ nilDoubleList = ``` ``` matchName = ``` { arity, num -> - arity == 1 ? "match" : - "match${num}" + arity == 1 ? "matchInplace" : + "matchInplace${num}" } ``` diff --git a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm index 7c3dc856e..f5436ebed 100644 --- a/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm +++ b/scijava/scijava-ops/templates/test/java/org/scijava/ops/matcher/OpWrappersTest.vm @@ -16,9 +16,7 @@ import org.scijava.function.Functions; import org.scijava.function.Inplaces; import org.scijava.function.Producer; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.util.ComputerUtils; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.ops.util.InplaceUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.GenericTyped; import org.scijava.types.Nil; @@ -33,7 +31,7 @@ public class OpWrappersTest extends AbstractTestEnvironment { @Test public void testWrapProducer() { Nil nilDouble = Nil.of(Double.class); - Producer op = FunctionUtils.match(ops.env(), "test.addDoubles", nilDouble); + Producer op = OpBuilder.matchFunction(ops.env(), "test.addDoubles", nilDouble); assertTrue(op instanceof GenericTyped); } @@ -42,7 +40,7 @@ public class OpWrappersTest extends AbstractTestEnvironment { public void testWrapFunction$arity() { Nil nilDouble = Nil.of(Double.class); $functionArity.call($arity)$doubleTypeParams.call($arity) op = // - FunctionUtils.match(ops.env(), "test.addDoubles", // + OpBuilder.matchFunction(ops.env(), "test.addDoubles", // $nilDoubleList.call($arity)); assertTrue(op instanceof GenericTyped); } @@ -53,7 +51,7 @@ public class OpWrappersTest extends AbstractTestEnvironment { public void testWrapComputer$arity() { Nil nilDouble = Nil.of(double[].class); $computerArity.call($arity)$doubleArrayTypeParams.call($arity) op = // - ComputerUtils.match(ops.env(), "test.addArrays", $nilDoubleList.call($arity)); + OpBuilder.matchComputer(ops.env(), "test.addArrays", $nilDoubleList.call($arity)); assertTrue(op instanceof GenericTyped); } @@ -65,7 +63,7 @@ public class OpWrappersTest extends AbstractTestEnvironment { public void testWrapInplace$inplaceSuffix.call($arity, $a)() { Nil nilDouble = Nil.of(double[].class); $inplaceType.call($arity, $a)$doubleArrayTypeParams.call($t) op = // - InplaceUtils.$matchName.call($arity, $a)(ops.env(), "test.mulArrays${arity}_${a}", $nilDoubleList.call($t)); + OpBuilder.$matchName.call($arity, $a)(ops.env(), "test.mulArrays${arity}_${a}", $nilDoubleList.call($t)); assertTrue(op instanceof GenericTyped); } From 921c6ff5216626686da7582d846cf871d42a4bb7 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Wed, 30 Jun 2021 10:13:39 -0500 Subject: [PATCH 14/31] Remove match methods from fiface util classes --- .../net/imagej/ops2/eval/OpEvaluator.java | 5 +- .../geom2d/LabelRegionToPolygonConverter.java | 7 +- .../geom/geom3d/mesh/RAIToMeshConverter.java | 7 +- .../net/imagej/ops2/coloc/icq/LiICQTest.java | 7 +- .../coloc/kendallTau/KendallTauBRankTest.java | 9 +- .../ops2/coloc/maxTKendallTau/MTKTTest.java | 13 +- .../coloc/pearsons/DefaultPearsonsTest.java | 6 +- .../net/imagej/ops2/copy/CopyRAITest.java | 6 +- .../imagej/ops2/create/CreateImgPlusTest.java | 9 +- .../net/imagej/ops2/create/CreateImgTest.java | 27 +- .../ops2/create/CreateKernelGaborTest.java | 17 +- .../ops2/create/CreateKernelGaussTest.java | 9 +- .../ops2/create/CreateKernelLogTest.java | 9 +- .../ops2/create/CreateLabelingTest.java | 13 +- .../ops2/filter/convolve/ConvolveTest.java | 6 +- .../ops2/image/integral/IntegralImgTest.java | 6 +- .../ops2/math/UnaryRealTypeMathTest.java | 8 +- .../net/imagej/ops2/project/ProjectTest.java | 4 +- .../ops2/threshold/AbstractThresholdTest.java | 5 +- .../ops2/threshold/ComputeThresholdTest.java | 4 +- .../apply/ApplyManualThresholdTest.java | 4 +- .../threshold/apply/LocalThresholdTest.java | 103 +- .../CollapseNumericViewTest.java | 10 +- .../CollapseRealViewTest.java | 13 +- .../collapseView/CollapseViewTest.java | 13 +- .../concatenateView/ConcatenateViewTest.java | 10 +- .../DropSingletonDimensionsViewTest.java | 9 +- .../ExtendBorderViewTest.java | 9 +- .../ExtendMirrorDoubleViewTest.java | 9 +- .../ExtendMirrorSingleViewTest.java | 9 +- .../ExtendPeriodicViewTest.java | 9 +- .../ExtendRandomViewTest.java | 9 +- .../extendValueView/ExtendValueViewTest.java | 9 +- .../transform/extendView/ExtendViewTest.java | 9 +- .../extendZeroView/ExtendZeroViewTest.java | 9 +- .../FlatIterableViewTest.java | 9 +- .../hyperSliceView/HyperSliceViewTest.java | 13 +- .../interpolateView/InterpolateViewTest.java | 9 +- .../intervalView/IntervalViewTest.java | 13 +- .../invertAxisView/InvertAxisViewTest.java | 13 +- .../transform/offsetView/OffsetViewTest.java | 17 +- .../permuteView/PermuteViewTest.java | 45 +- .../transform/rasterView/RasterViewTest.java | 9 +- .../transform/rotateView/RotateViewTest.java | 17 +- .../transform/shearView/ShearViewTest.java | 13 +- .../transform/stackView/StackViewTest.java | 11 +- .../subsampleView/SubsampleViewTest.java | 13 +- .../translateView/TranslateViewTest.java | 9 +- .../unshearView/UnshearViewTest.java | 13 +- .../zeroMinView/ZeroMinViewTest.java | 7 +- .../org/scijava/ops/util/ComputerUtils.java | 272 --- .../org/scijava/ops/util/FunctionUtils.java | 217 --- .../org/scijava/ops/util/InplaceUtils.java | 1731 ----------------- .../scijava/ops/monitor/OpMonitorTest.java | 10 +- .../java/org/scijava/ops/stats/MeanTest.java | 5 +- .../org/scijava/ops/util/ComputersTest.java | 6 +- .../org/scijava/ops/util/FunctionsTest.java | 9 +- .../java/org/scijava/ops/util/LiftTest.java | 5 +- .../scijava/ops/util/OpsAsParametersTest.java | 7 +- .../org/scijava/ops/util/ComputerUtils.list | 24 - .../org/scijava/ops/util/ComputerUtils.vm | 84 - .../org/scijava/ops/util/FunctionUtils.vm | 29 - .../org/scijava/ops/util/InplaceUtils.list | 83 - .../java/org/scijava/ops/util/InplaceUtils.vm | 119 -- 64 files changed, 309 insertions(+), 2914 deletions(-) delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list delete mode 100644 scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java index adbafa415..12546598f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java @@ -37,15 +37,16 @@ import java.util.Map; import org.scijava.function.Functions; +import org.scijava.ops.Op; import org.scijava.ops.OpService; import org.scijava.ops.util.FunctionUtils; -import org.scijava.types.Nil; -import org.scijava.types.TypeService; import org.scijava.parsington.Operator; import org.scijava.parsington.Operators; import org.scijava.parsington.Variable; import org.scijava.parsington.eval.AbstractStandardStackEvaluator; import org.scijava.parsington.eval.Evaluator; +import org.scijava.types.Nil; +import org.scijava.types.TypeService; /** * A Parsington {@link Evaluator} using available {@link Op}s. diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java index c8172bd9f..6bc274c3e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/LabelRegionToPolygonConverter.java @@ -41,12 +41,11 @@ import org.scijava.convert.AbstractConverter; import org.scijava.convert.ConversionRequest; import org.scijava.convert.Converter; -import org.scijava.function.Functions; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpService; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.types.Nil; import org.scijava.plugin.Parameter; import org.scijava.plugin.Plugin; +import org.scijava.types.Nil; /** * Converts a {@link LabelRegion} to a polygon @@ -67,7 +66,7 @@ public class LabelRegionToPolygonConverter extends @Override public T convert(final Object src, final Class dest) { if (contourFunc == null) { - contourFunc = FunctionUtils.match(ops.env(), "geom.contour", new Nil>() {}, new Nil() {}, + contourFunc = OpBuilder.matchFunction(ops.env(), "geom.contour", new Nil>() {}, new Nil() {}, new Nil() {}); } // FIXME: can we make this faster? diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java index 37e03d465..fdcae963a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java @@ -41,12 +41,11 @@ import org.scijava.convert.AbstractConverter; import org.scijava.convert.ConversionRequest; import org.scijava.convert.Converter; -import org.scijava.function.Functions; +import org.scijava.ops.OpBuilder; import org.scijava.ops.OpService; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.types.Nil; import org.scijava.plugin.Parameter; import org.scijava.plugin.Plugin; +import org.scijava.types.Nil; /** * Converts a RandomAccessibleInterval to a Mesh @@ -68,7 +67,7 @@ public class RAIToMeshConverter > extends @Override public T convert(Object src, Class dest) { if (marchingCubesFunc == null) { - marchingCubesFunc = FunctionUtils.match(ops.env(), "geom.marchingCubes", new Nil>() {}, + marchingCubesFunc = OpBuilder.matchFunction(ops.env(), "geom.marchingCubes", new Nil>() {}, new Nil() {}); } if (src instanceof IterableInterval) { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java index 25140e084..d2b8903e1 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/icq/LiICQTest.java @@ -44,10 +44,9 @@ import net.imglib2.type.numeric.real.FloatType; import org.junit.jupiter.api.Test; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.types.Nil; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; +import org.scijava.types.Nil; /** * Tests {@link net.imagej.ops2.coloc.icq.LiICQ}. @@ -102,7 +101,7 @@ public void testPValue() { 0x01234567); Img ch2 = ColocalisationTest.produceMeanBasedNoiseImage(new FloatType(), 24, 24, mean, spread, sigma, 0x98765432); - BiFunction, RandomAccessibleInterval, Double> op = FunctionUtils.match(ops.env(), "coloc.icq", + BiFunction, RandomAccessibleInterval, Double> op = OpBuilder.matchFunction(ops.env(), "coloc.icq", new Nil>() {}, new Nil>() {}, new Nil() {}); PValueResult value = new PValueResult(); ops.op("coloc.pValue").input(ch1, ch2, op, es).output(value).compute(); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java index 5a3a961a5..eaadb5be8 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/kendallTau/KendallTauBRankTest.java @@ -29,9 +29,9 @@ package net.imagej.ops2.coloc.kendallTau; +import static org.junit.Assume.assumeTrue; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -import static org.junit.Assume.assumeTrue; import java.util.Iterator; import java.util.concurrent.ExecutorService; @@ -50,10 +50,9 @@ import net.imglib2.util.Pair; import org.junit.jupiter.api.Test; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.types.Nil; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; +import org.scijava.types.Nil; /** * Tests {@link net.imagej.ops2.Ops.Coloc.KendallTau}. @@ -128,7 +127,7 @@ public void testPValue() { 0x98765432); Nil> nilI = new Nil>() {}; Nil> nilRAI = new Nil>() {}; - BiFunction, RandomAccessibleInterval, Double> op = FunctionUtils.match(ops.env(), + BiFunction, RandomAccessibleInterval, Double> op = OpBuilder.matchFunction(ops.env(), "coloc.kendallTau", nilRAI, nilRAI, new Nil() {}); // BiFunction, RandomAccessibleInterval, Double> raiOp = op( // "transform.raiToIterable").input(op).outType( diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java index b5a858e16..6f59caf5b 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/maxTKendallTau/MTKTTest.java @@ -47,10 +47,9 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.types.Nil; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; +import org.scijava.types.Nil; /** * Tests {@link net.imagej.ops2.Ops.Coloc.MaxTKendallTau}. @@ -209,7 +208,7 @@ public void testMTKTpValueNone() { Img vImage1 = ArrayImgs.doubles(values1, values1.length); Img vImage2 = ArrayImgs.doubles(values2, values2.length); BiFunction, RandomAccessibleInterval, Double> op = - FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); + OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); PValueResult value = new PValueResult(); ops.op("coloc.pValue").input(vImage1, vImage2, op, 5, es).output(value).compute(); assertEquals(0.0, value.getPValue(), 0.0); @@ -229,7 +228,7 @@ public void testMTKTpValueAll() { Img vImage1 = ArrayImgs.doubles(values1, values1.length); Img vImage2 = ArrayImgs.doubles(values2, values2.length); BiFunction, RandomAccessibleInterval, Double> op = - FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); + OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); PValueResult value = new PValueResult(); ops.op("coloc.pValue").input(vImage1, vImage2, op, 5, es).output(value).compute(); assertEquals(0.0, value.getPValue(), 0.0); @@ -247,7 +246,7 @@ public void testMTKTpValueRandom() { Img ch2 = ColocalisationTest.produceMeanBasedNoiseImage(new FloatType(), 24, 24, mean, spread, sigma, 0x98765432); BiFunction, RandomAccessibleInterval, Double> op = - FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); + OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); PValueResult value = new PValueResult(); ops.op("coloc.pValue").input(ch1, ch2, op, 10, es).output(value).compute(); assertEquals(0.2, value.getPValue(), 0.0); @@ -262,7 +261,7 @@ public void testMTKTpValueImage() { RandomAccessibleInterval cropCh2 = Views.interval(zeroCorrelationImageCh2, new long[] { 0, 0, 0 }, new long[] { 20, 20, 0 }); BiFunction, RandomAccessibleInterval, Double> op = - FunctionUtils.match(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); + OpBuilder.matchFunction(ops.env(), "coloc.maxTKendallTau", new Nil>() {}, new Nil>() {}, new Nil() {}); final int[] blockSize = new int[cropCh1.numDimensions()]; for (int d = 0; d < blockSize.length; d++) { final long size = (long) Math.floor(Math.sqrt(cropCh1.dimension(d))); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java index 0700ea586..e168e6de5 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/pearsons/DefaultPearsonsTest.java @@ -40,9 +40,9 @@ import net.imglib2.type.numeric.real.FloatType; import org.junit.jupiter.api.Test; -import org.scijava.types.Nil; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.thread.ThreadService; +import org.scijava.types.Nil; /** * Tests {@link DefaultPearsons}. @@ -107,7 +107,7 @@ public void testPValue() { Img ch2 = ColocalisationTest.produceMeanBasedNoiseImage(new FloatType(), 24, 24, mean, spread, sigma, 0x98765432); BiFunction, RandomAccessibleInterval, Double> op = - FunctionUtils.match(ops.env(), "coloc.pearsons", new Nil>() {}, new Nil>() {}, new Nil() {}); + OpBuilder.matchFunction(ops.env(), "coloc.pearsons", new Nil>() {}, new Nil>() {}, new Nil() {}); PValueResult value = new PValueResult(); ops.op("coloc.pValue").input(ch1, ch2, op, es).output(value).compute(); assertEquals(0.66, value.getPValue(), 0.0); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java index 08060fc8a..15344f33f 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/copy/CopyRAITest.java @@ -49,7 +49,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.scijava.function.Computers; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; import org.scijava.util.MersenneTwisterFast; @@ -150,8 +150,8 @@ public void copyRAIWithOutputTest() { public void copyRAIDifferentSizeTest() { // create a copy op - final Computers.Arity1, RandomAccessibleInterval> copy = ComputerUtils - .match(ops.env(), "copy.rai", new Nil>() {}, + final Computers.Arity1, RandomAccessibleInterval> copy = OpBuilder + .matchComputer(ops.env(), "copy.rai", new Nil>() {}, new Nil>() {}); assertNotNull(copy); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java index 87392eafb..56b8b2d9c 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgPlusTest.java @@ -35,16 +35,15 @@ import java.util.function.Function; import net.imagej.ImgPlus; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Dimensions; import net.imglib2.FinalDimensions; import net.imglib2.img.Img; import net.imglib2.type.numeric.real.DoubleType; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests several ways to create an image @@ -57,8 +56,8 @@ public class CreateImgPlusTest extends AbstractOpTest { @Test public void createImgPlusTest() { - BiFunction> createImgFunc = FunctionUtils.match(ops.env(), "create.img", new Nil() {}, new Nil() {}, new Nil>() {}); - Function, ImgPlus> imgPlusFunction = FunctionUtils.match(ops.env(), "create.imgPlus", new Nil>() {}, new Nil>() {}); + BiFunction> createImgFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() {}, new Nil() {}, new Nil>() {}); + Function, ImgPlus> imgPlusFunction = OpBuilder.matchFunction(ops.env(), "create.imgPlus", new Nil>() {}, new Nil>() {}); assertEquals(imgPlusFunction.apply(createImgFunc.apply(new FinalDimensions(new long[] { 10, 9, 8 }), new DoubleType())).getClass(), ImgPlus.class); } } diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java index 7cd219c3a..202e63259 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateImgTest.java @@ -35,6 +35,7 @@ import java.util.function.BiFunction; import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Dimensions; import net.imglib2.FinalDimensions; import net.imglib2.FinalInterval; @@ -57,10 +58,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; import org.scijava.util.MersenneTwisterFast; @@ -94,7 +93,7 @@ public void testImageMinimum() { } // create img - final Function> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil() { + final Function> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil>() { }); final Img img = createFunc.apply(new FinalInterval(min, max)); @@ -120,7 +119,7 @@ public void testImageDimensions() { } // create img - BiFunction> createFunc = FunctionUtils.match(ops.env(), "create.img", + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil() { }, new Nil>() { @@ -135,13 +134,13 @@ public void testImageDimensions() { @Test public void testImgFromImg() { // create img - BiFunction> createFuncDimsType = FunctionUtils.match(ops.env(), "create.img", + BiFunction> createFuncDimsType = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil() { }, new Nil>() { }); final Img img = createFuncDimsType.apply(new FinalDimensions(1), new ByteType()); - Function, Img> createFuncImg = FunctionUtils.match(ops.env(), "create.img", + Function, Img> createFuncImg = OpBuilder.matchFunction(ops.env(), "create.img", new Nil>() { }, new Nil>() { }); @@ -157,7 +156,7 @@ public void testImageFactory() { final Dimensions dim = new FinalDimensions(10, 10, 10); Functions.Arity3, Img> createFunc = - FunctionUtils.match(ops.env(), "create.img", new Nil() + OpBuilder.matchFunction(ops.env(), "create.img", new Nil() {}, new Nil() {}, new Nil>() {}, new Nil>() {}); @@ -178,7 +177,7 @@ public void testImageFactory() { public void testImageType() { final Dimensions dim = new FinalDimensions(10, 10, 10); - BiFunction> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil() {}, new Nil() {}, new Nil>() {}); + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() {}, new Nil() {}, new Nil>() {}); assertEquals(BitType.class, ((Img) createFunc.apply(dim, (T) new BitType())).firstElement().getClass(), "Image Type: "); @@ -202,7 +201,7 @@ public void testImageType() { @Test public void testCreateFromImgSameType() { final Img input = PlanarImgs.bytes(10, 10, 10); - BiFunction> createFunc = FunctionUtils.match(ops.env(), "create.img", + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil() { }, new Nil>() { @@ -218,7 +217,7 @@ public void testCreateFromImgSameType() { @Test public void testCreateFromImgDifferentType() { final Img input = PlanarImgs.bytes(10, 10, 10); - BiFunction> createFunc = FunctionUtils.match(ops.env(), "create.img", + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil() { }, new Nil>() { @@ -236,7 +235,7 @@ public void testCreateFromRaiDifferentType() { final IntervalView input = Views.interval(PlanarImgs.bytes(10, 10, 10), new FinalInterval(new long[] { 10, 10, 1 })); - BiFunction> createFunc = FunctionUtils.match(ops.env(), "create.img", + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil() { }, new Nil>() { @@ -260,7 +259,7 @@ public void testCreateFromRaiDifferentType() { public void testCreateFromIntegerArray() { final Integer[] dims = new Integer[] { 25, 25, 10 }; - Function> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil() { + Function> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil>() { }); final Img res = createFunc.apply(dims); @@ -278,7 +277,7 @@ public void testCreateFromIntegerArray() { public void testCreateFromLongArray() { final Long[] dims = new Long[] { 25l, 25l, 10l }; - Function> createFunc = FunctionUtils.match(ops.env(), "create.img", new Nil() { + Function> createFunc = OpBuilder.matchFunction(ops.env(), "create.img", new Nil() { }, new Nil>() { }); final Img res = createFunc.apply(dims); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java index 21de4e9c3..b8e37b84e 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java @@ -33,6 +33,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imagej.ops2.create.kernel.DefaultCreateKernelGabor; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessibleInterval; @@ -42,10 +43,8 @@ import net.imglib2.type.numeric.real.FloatType; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -62,28 +61,28 @@ public > void testKernelGabor() { final double[] period = { 4.0, 1.0 }; // define functions used in the test - Functions.Arity3> createFunc = FunctionUtils.match(ops.env(), + Functions.Arity3> createFunc = OpBuilder.matchFunction(ops.env(), "create.kernelGabor", new Nil() { }, new Nil() { }, new Nil() { }, new Nil>() { }); - BiFunction> createFuncSingleSigma = FunctionUtils - .match(ops.env(), "create.kernelGabor", new Nil() { + BiFunction> createFuncSingleSigma = OpBuilder + .matchFunction(ops.env(), "create.kernelGabor", new Nil() { }, new Nil() { }, new Nil>() { }); - BiFunction> createFuncDouble = FunctionUtils.match(ops.env(), + BiFunction> createFuncDouble = OpBuilder.matchFunction(ops.env(), "create.kernelGabor", new Nil() { }, new Nil() { }, new Nil>() { }); - BiFunction> createFuncFloat = FunctionUtils.match(ops.env(), + BiFunction> createFuncFloat = OpBuilder.matchFunction(ops.env(), "create.kernelGabor", new Nil() { }, new Nil() { }, new Nil>() { }); - BiFunction> createFuncComplexDouble = FunctionUtils.match(ops.env(), + BiFunction> createFuncComplexDouble = OpBuilder.matchFunction(ops.env(), "create.kernelGabor", new Nil() { }, new Nil() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java index a81aa9d0d..fe887c224 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaussTest.java @@ -34,14 +34,13 @@ import java.util.function.BiFunction; import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessibleInterval; import net.imglib2.type.numeric.real.DoubleType; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@code CreateKernelGaussDoubleType} and @@ -57,12 +56,12 @@ public void testKernelGauss() { final double sigma = 5.0; final double[] sigmas = {sigma, sigma}; - BiFunction> createFunc = FunctionUtils.match(ops.env(), "create.kernelGauss", new Nil() {}, new Nil() {}, new Nil>() {}); + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.kernelGauss", new Nil() {}, new Nil() {}, new Nil>() {}); final RandomAccessibleInterval gaussianKernel = // createFunc.apply(sigma, sigmas.length); - Function> createFunc2 = FunctionUtils.match(ops.env(), "create.kernelGauss", new Nil() {}, new Nil>() {}); + Function> createFunc2 = OpBuilder.matchFunction(ops.env(), "create.kernelGauss", new Nil() {}, new Nil>() {}); final RandomAccessibleInterval gaussianKernel2 = // diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java index bfe971b2b..97d76b591 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelLogTest.java @@ -34,14 +34,13 @@ import java.util.function.BiFunction; import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessibleInterval; import net.imglib2.type.numeric.real.DoubleType; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@code CreateKernelLogDoubleType} and @@ -57,7 +56,7 @@ public void testKernelLog() { final double sigma = 5.0; final double[] sigmas = { sigma, sigma }; - BiFunction> func1 = FunctionUtils.match(ops.env(), + BiFunction> func1 = OpBuilder.matchFunction(ops.env(), "create.kernelLog", new Nil() { }, new Nil() { }, new Nil>() { @@ -66,7 +65,7 @@ public void testKernelLog() { final RandomAccessibleInterval logKernel = // func1.apply(sigma, sigmas.length); - Function> func2 = FunctionUtils.match(ops.env(), "create.kernelLog", + Function> func2 = OpBuilder.matchFunction(ops.env(), "create.kernelLog", new Nil() { }, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java index 691c9f0bf..45b4ae7ac 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateLabelingTest.java @@ -34,6 +34,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Dimensions; import net.imglib2.FinalDimensions; import net.imglib2.img.Img; @@ -45,10 +46,8 @@ import net.imglib2.util.Intervals; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; import org.scijava.util.MersenneTwisterFast; @@ -70,7 +69,7 @@ public void testImageDimensions() { final MersenneTwisterFast randomGenerator = new MersenneTwisterFast(SEED); // TODO can we keep this? - BiFunction> createFunc = FunctionUtils.match(ops.env(), + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.imgLabeling", new Nil() { }, new Nil() { }, new Nil>() { @@ -100,8 +99,8 @@ public void testImageFactory() { final Dimensions dim = new FinalDimensions(10, 10, 10); - Functions.Arity3, ImgLabeling> createFunc = FunctionUtils - .match(ops.env(), "create.imgLabeling", new Nil() { + Functions.Arity3, ImgLabeling> createFunc = OpBuilder + .matchFunction(ops.env(), "create.imgLabeling", new Nil() { }, new Nil() { }, new Nil>() { }, new Nil>() { @@ -136,7 +135,7 @@ public void testImageType() { @SuppressWarnings("unchecked") private ImgLabeling createLabelingWithType(final I type) { - BiFunction> createFunc = FunctionUtils.match(ops.env(), + BiFunction> createFunc = OpBuilder.matchFunction(ops.env(), "create.imgLabeling", new Nil() { }, new Nil() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java index b96c6d0d8..34aefc8cd 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/convolve/ConvolveTest.java @@ -149,19 +149,19 @@ // // // Op used to pad the input // final BinaryFunctionOp, Dimensions, RandomAccessibleInterval> padOp = -// (BinaryFunctionOp) FunctionUtils.match(ops.env(), PadInputFFTMethods.class, +// (BinaryFunctionOp) OpBuilder.matchFunction(ops.env(), PadInputFFTMethods.class, // RandomAccessibleInterval.class, RandomAccessibleInterval.class, // Dimensions.class, true); // // // Op used to pad the kernel // final BinaryFunctionOp, Dimensions, RandomAccessibleInterval> padKernelOp = -// (BinaryFunctionOp) FunctionUtils.match(ops.env(), PadShiftKernelFFTMethods.class, +// (BinaryFunctionOp) OpBuilder.matchFunction(ops.env(), PadShiftKernelFFTMethods.class, // RandomAccessibleInterval.class, RandomAccessibleInterval.class, // Dimensions.class, true); // // // Op used to create the complex FFTs // UnaryFunctionOp> createOp = -// (UnaryFunctionOp) FunctionUtils.match(ops.env(), CreateOutputFFTMethods.class, +// (UnaryFunctionOp) OpBuilder.matchFunction(ops.env(), CreateOutputFFTMethods.class, // RandomAccessibleInterval.class, Dimensions.class, // new ComplexFloatType(), true); // diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java index 7ce703189..e4b71f7cd 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/image/integral/IntegralImgTest.java @@ -49,7 +49,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.scijava.function.Computers; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -78,8 +78,8 @@ public void before() throws Exception { @Test public void testIntegralImageSimilarity() { // should match DefaultIntegralImg - Computers.Arity1, RandomAccessibleInterval> defaultOp = ComputerUtils - .match(ops.env(), "image.integral", new Nil>() { + Computers.Arity1, RandomAccessibleInterval> defaultOp = OpBuilder + .matchComputer(ops.env(), "image.integral", new Nil>() { }, new Nil>() { }); defaultOp.compute(in, out1); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java index a8ba48a10..470c2d0be 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/math/UnaryRealTypeMathTest.java @@ -38,12 +38,10 @@ import net.imglib2.type.numeric.real.DoubleType; import net.imglib2.type.numeric.real.FloatType; -import org.junit.Rule; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.rules.ExpectedException; import org.scijava.function.Computers; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -528,7 +526,7 @@ private void assertRandomGaussian(final double i, final double o, final double i final DoubleType out = new DoubleType(); final long seed = 0xcafebabe12345678L; final Random rng = new Random(seed); - final Computers.Arity2 op = ComputerUtils.match(ops.env(), "math.randomGaussian", + final Computers.Arity2 op = OpBuilder.matchComputer(ops.env(), "math.randomGaussian", new Nil() {}, new Nil() {}, new Nil() {}); op.compute(in, rng, out); assertEquals(o, out.get(), 0); @@ -549,7 +547,7 @@ private void assertRandomUniform(final double i, final double o, final double i2 final DoubleType out = new DoubleType(); final long seed = 0xcafebabe12345678L; final Random rng = new Random(seed); - final Computers.Arity2 op = ComputerUtils.match(ops.env(), "math.randomUniform", + final Computers.Arity2 op = OpBuilder.matchComputer(ops.env(), "math.randomUniform", new Nil() {}, new Nil() {}, new Nil() {}); op.compute(in, rng, out); assertEquals(o, out.get(), 0); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java index 419ab5c18..fa6947b39 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/project/ProjectTest.java @@ -40,7 +40,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.scijava.function.Computers; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class ProjectTest extends AbstractOpTest { @@ -71,7 +71,7 @@ public void initImg() { out1 = TestImgGeneration.unsignedByteArray(false, 10, 10); out2 = TestImgGeneration.unsignedByteArray(false, 10, 10); - op = ComputerUtils.match(ops.env(), "stats.sum", new Nil>() {}, + op = OpBuilder.matchComputer(ops.env(), "stats.sum", new Nil>() {}, new Nil() {}); } diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java index 983c57366..154000c05 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/AbstractThresholdTest.java @@ -46,8 +46,7 @@ import net.imglib2.type.numeric.integer.UnsignedShortType; import org.junit.jupiter.api.BeforeEach; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; import org.scijava.util.ListUtils; @@ -85,7 +84,7 @@ public void initialize() { } } - createFunc = FunctionUtils.match(ops.env(), "image.histogram", new Nil>() {}, new Nil() {}, new Nil>() {}); + createFunc = OpBuilder.matchFunction(ops.env(), "image.histogram", new Nil>() {}, new Nil() {}, new Nil>() {}); } protected Histogram1d histogram() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java index 8b05ae5e2..bea79d915 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/ComputeThresholdTest.java @@ -35,7 +35,7 @@ import org.junit.jupiter.api.Test; import org.scijava.function.Computers; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -182,7 +182,7 @@ private void testComputeThresholdOp(final int expectedOutput, private Computers.Arity1, UnsignedShortType> getComputeThresholdOp(final String name) { - return ComputerUtils.match(ops.env(), name, + return OpBuilder.matchComputer(ops.env(), name, new Nil>() {}, new Nil() {}); } diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java index eec8d50e7..04f71ee81 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/ApplyManualThresholdTest.java @@ -39,7 +39,7 @@ import org.junit.jupiter.api.Test; import org.scijava.function.Computers; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -52,7 +52,7 @@ public class ApplyManualThresholdTest extends AbstractThresholdTest { @Test public void testApplyThreshold() throws IncompatibleTypeException { Computers.Arity3, UnsignedShortType, Comparator, Iterable> createFunc = - ComputerUtils.match(ops.env(), "threshold.apply", + OpBuilder.matchComputer(ops.env(), "threshold.apply", new Nil>() {}, new Nil() {}, new Nil>() diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java index 1cd4b428a..ef3e231e7 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/threshold/apply/LocalThresholdTest.java @@ -74,11 +74,10 @@ import net.imglib2.util.Pair; import net.imglib2.view.Views; -import org.junit.Before; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.scijava.function.Computers; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -265,8 +264,8 @@ public void before() throws Exception { @Test public void testLocalBernsenThreshold() { final Computers.Arity5, Shape, Double, Double, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localBernsen", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localBernsen", // new Nil>() {}, // new Nil() {}, // new Nil() {}, // @@ -286,8 +285,8 @@ public void testLocalBernsenThreshold() { @Test public void testLocalContrastThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localContrast", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localContrast", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -305,8 +304,8 @@ public void testLocalContrastThreshold() { @Test public void testLocalHuangThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.huang", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.huang", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -324,8 +323,8 @@ public void testLocalHuangThreshold() { @Test public void testLocalIJ1Threshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.ij1", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.ij1", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -343,8 +342,8 @@ public void testLocalIJ1Threshold() { @Test public void testLocalIntermodesThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.intermodes", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.intermodes", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -363,8 +362,8 @@ public void testLocalIntermodesThreshold() { public void testLocalIsoDataThreshold() { // NB: Test fails for RectangleShapes of span 1 final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.isoData", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.isoData", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -382,8 +381,8 @@ public void testLocalIsoDataThreshold() { @Test public void testLocalLiThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.li", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.li", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -401,8 +400,8 @@ public void testLocalLiThreshold() { @Test public void testLocalMaxEntropyThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.maxEntropy", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.maxEntropy", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -421,8 +420,8 @@ public void testLocalMaxEntropyThreshold() { public void testLocalMaxLikelihoodThreshold() { // NB: Test fails for RectangleShapes of up to span==2 final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.maxLikelihood", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.maxLikelihood", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -440,8 +439,8 @@ public void testLocalMaxLikelihoodThreshold() { @Test public void testLocalThresholdMean() { final Computers.Arity4, Shape, Double, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localMean", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localMean", // new Nil>() {}, // new Nil() {}, // new Nil() {}, // @@ -502,8 +501,8 @@ public void testLocalThresholdMean() { @Test public void testLocalMedianThreshold() { final Computers.Arity4, Shape, Double, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localMedian", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localMedian", // new Nil>() {}, // new Nil() {}, // new Nil() {}, // @@ -522,8 +521,8 @@ public void testLocalMedianThreshold() { @Test public void testLocalMidGreyThreshold() { final Computers.Arity4, Shape, Double, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localMidGrey", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localMidGrey", // new Nil>() {}, // new Nil() {}, // new Nil() {}, // @@ -542,8 +541,8 @@ public void testLocalMidGreyThreshold() { @Test public void testLocalMinErrorThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.minError", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.minError", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -561,8 +560,8 @@ public void testLocalMinErrorThreshold() { @Test public void testLocalMinimumThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.minimum", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.minimum", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -580,8 +579,8 @@ public void testLocalMinimumThreshold() { @Test public void testLocalMomentsThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.moments", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.moments", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -599,8 +598,8 @@ public void testLocalMomentsThreshold() { @Test public void testLocalNiblackThreshold() { final Computers.Arity5, Shape, Double, Double, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localNiblack", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localNiblack", // new Nil>() {}, // new Nil() {}, // new Nil() {}, // @@ -662,8 +661,8 @@ public void testLocalNiblackThreshold() { @Test public void testLocalOtsuThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.otsu", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.otsu", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -681,8 +680,8 @@ public void testLocalOtsuThreshold() { @Test public void testLocalPercentileThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.percentile", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.percentile", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -700,8 +699,8 @@ public void testLocalPercentileThreshold() { @Test public void testLocalPhansalkar() { final Computers.Arity5, Shape, Double, Double, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localPhansalkar", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localPhansalkar", // new Nil>() {}, // new Nil() {}, // new Nil() {}, // @@ -765,8 +764,8 @@ public void testLocalPhansalkar() { @Test public void testLocalRenyiEntropyThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.renyiEntropy", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.renyiEntropy", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -784,8 +783,8 @@ public void testLocalRenyiEntropyThreshold() { @Test public void testLocalSauvola() { final Computers.Arity5, Shape, Double, Double, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.localSauvola", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.localSauvola", // new Nil>() {}, // new Nil() {}, // new Nil() {}, // @@ -847,8 +846,8 @@ public void testLocalSauvola() { @Test public void testLocalShanbhagThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.shanbhag", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.shanbhag", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -866,8 +865,8 @@ public void testLocalShanbhagThreshold() { @Test public void testLocalTriangleThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.triangle", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.triangle", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -885,8 +884,8 @@ public void testLocalTriangleThreshold() { @Test public void testLocalYenThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.yen", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.yen", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // @@ -904,8 +903,8 @@ public void testLocalYenThreshold() { @Test public void testLocalRosinThreshold() { final Computers.Arity3, Shape, // - OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = ComputerUtils - .match(ops.env(), "threshold.rosin", // + OutOfBoundsFactory>, RandomAccessibleInterval> opToTest = OpBuilder + .matchComputer(ops.env(), "threshold.rosin", // new Nil>() {}, // new Nil() {}, // new Nil>>() {}, // diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java index 9624d4aa7..3f328af3b 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseNumericView/CollapseNumericViewTest.java @@ -33,6 +33,7 @@ import java.util.function.BiFunction; import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; @@ -44,10 +45,7 @@ import net.imglib2.view.composite.NumericComposite; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -81,8 +79,8 @@ public void defaultCollapseNumericTest() { assertEquals(il2.numDimensions(), opr.numDimensions()); - BiFunction, Integer, CompositeView>> collapseFuncRA = FunctionUtils - .match(ops.env(), "transform.collapseNumericView", + BiFunction, Integer, CompositeView>> collapseFuncRA = OpBuilder + .matchFunction(ops.env(), "transform.collapseNumericView", new Nil>() { }, new Nil() { }, diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java index 8a5bffdf2..afa64d7b9 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseRealView/CollapseRealViewTest.java @@ -33,6 +33,7 @@ import java.util.function.BiFunction; import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; @@ -44,10 +45,8 @@ import net.imglib2.view.composite.RealComposite; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.CollapseRealView} ops. @@ -66,8 +65,8 @@ public void defaultCollapseRealTest() { Img img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 }); - Function, CompositeIntervalView>> collapseFunc = FunctionUtils - .match(ops.env(), "transform.collapseRealView", new Nil>() { + Function, CompositeIntervalView>> collapseFunc = OpBuilder + .matchFunction(ops.env(), "transform.collapseRealView", new Nil>() { }, new Nil>>() { }); @@ -77,8 +76,8 @@ public void defaultCollapseRealTest() { assertEquals(il2.numDimensions(), opr.numDimensions()); - BiFunction, Integer, CompositeView>> collapseFuncRA = FunctionUtils - .match(ops.env(), "transform.collapseRealView", new Nil>() { + BiFunction, Integer, CompositeView>> collapseFuncRA = OpBuilder + .matchFunction(ops.env(), "transform.collapseRealView", new Nil>() { }, new Nil() { }, new Nil>>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java index 4944c9385..49acee2a2 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/collapseView/CollapseViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; @@ -43,10 +44,8 @@ import net.imglib2.view.composite.GenericComposite; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.CollapseView} ops. @@ -64,8 +63,8 @@ public class CollapseViewTest extends AbstractOpTest { public void defaultCollapseTest() { Img img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 }); - Function, CompositeIntervalView>> collapseFunc = FunctionUtils - .match(ops.env(), "transform.collapseView", new Nil>() { + Function, CompositeIntervalView>> collapseFunc = OpBuilder + .matchFunction(ops.env(), "transform.collapseView", new Nil>() { }, new Nil>>() { }); @@ -80,8 +79,8 @@ public void collapseRATest() { Img img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10, 10 }); - Function, CompositeView>> collapseFunc = FunctionUtils - .match(ops.env(), "transform.collapseView", new Nil>() { + Function, CompositeView>> collapseFunc = OpBuilder + .matchFunction(ops.env(), "transform.collapseView", new Nil>() { }, new Nil>>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java index 2a6c334e1..cc76e764d 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/concatenateView/ConcatenateViewTest.java @@ -49,7 +49,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; import org.scijava.util.MersenneTwisterFast; @@ -108,8 +108,8 @@ private static > void testEqual(final RandomAccessibleI @Test public void defaultConcatenateTest() { - BiFunction>, RandomAccessibleInterval> concatFunc = FunctionUtils - .match(ops.env(), "transform.concatenateView", new Nil() { + BiFunction>, RandomAccessibleInterval> concatFunc = OpBuilder + .matchFunction(ops.env(), "transform.concatenateView", new Nil() { }, new Nil>>() { }, new Nil>() { }); @@ -123,8 +123,8 @@ public void defaultConcatenateTest() { @Test public void concatenateWithAccessModeTest() { - Functions.Arity3>, RandomAccessibleInterval> concatFunc = FunctionUtils - .match(ops.env(), "transform.concatenateView", new Nil() { + Functions.Arity3>, RandomAccessibleInterval> concatFunc = OpBuilder + .matchFunction(ops.env(), "transform.concatenateView", new Nil() { }, new Nil() { }, new Nil>>() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java index fef57752f..6de6c9a27 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/dropSingleDimensionsView/DropSingletonDimensionsViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; import net.imglib2.img.array.ArrayImgFactory; @@ -39,9 +40,7 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -59,8 +58,8 @@ public class DropSingletonDimensionsViewTest extends AbstractOpTest { @Test public void dropSingletonDimensionsTest() { - Function, RandomAccessibleInterval> dropFunc = FunctionUtils - .match(ops.env(), "transform.dropSingletonDimensionsView", new Nil>() { + Function, RandomAccessibleInterval> dropFunc = OpBuilder + .matchFunction(ops.env(), "transform.dropSingletonDimensionsView", new Nil>() { }, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java index 6af6df524..6ce1067a6 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendBorderView/ExtendBorderViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ExtendBorderView} ops. @@ -63,8 +62,8 @@ public class ExtendBorderViewTest extends AbstractOpTest { @Test public void extendBorderTest() { - Function, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendBorderView", raiNil, + Function, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendBorderView", raiNil, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java index 1faad5470..f6428bb93 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorDoubleView/ExtendMirrorDoubleViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ExtendMirrorDoubleView} ops. @@ -63,8 +62,8 @@ public class ExtendMirrorDoubleViewTest extends AbstractOpTest { @Test public void extendMirrorDoubleTest() { - Function, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendMirrorDoubleView", raiNil, + Function, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendMirrorDoubleView", raiNil, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java index a4c39bb47..9ad7b254e 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendMirrorSingleView/ExtendMirrorSingleViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ExtendMirrorSingleView} ops. @@ -63,8 +62,8 @@ public class ExtendMirrorSingleViewTest extends AbstractOpTest { @Test public void extendMirrorSingleTest() { - Function, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendMirrorSingleView", raiNil, + Function, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendMirrorSingleView", raiNil, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java index bd72fe6b7..a3d899618 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendPeriodicView/ExtendPeriodicViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ExtendPeriodicView} ops. @@ -63,8 +62,8 @@ public class ExtendPeriodicViewTest extends AbstractOpTest { @Test public void extendPeriodicTest() { - Function, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendPeriodicView", raiNil, + Function, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendPeriodicView", raiNil, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java index 5154908d9..cd4e89453 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendRandomView/ExtendRandomViewTest.java @@ -30,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -39,10 +40,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -64,8 +63,8 @@ public class ExtendRandomViewTest extends AbstractOpTest { @Test public void extendRandomTest() { - Functions.Arity3, Double, Double, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendRandomView", raiNil, doubleNil, doubleNil, + Functions.Arity3, Double, Double, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendRandomView", raiNil, doubleNil, doubleNil, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java index ba2294171..2635486ab 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendValueView/ExtendValueViewTest.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ExtendValueView} ops. @@ -63,8 +62,8 @@ public class ExtendValueViewTest extends AbstractOpTest { @Test public void extendValueTest() { - BiFunction, DoubleType, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendValueView", raiNil, new Nil() { + BiFunction, DoubleType, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendValueView", raiNil, new Nil() { }, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java index b6223c1ad..c2e2f6d71 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendView/ExtendViewTest.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -43,10 +44,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ExtendView} ops. @@ -65,8 +64,8 @@ public class ExtendViewTest extends AbstractOpTest { @Test public void defaultExtendTest() { - BiFunction, OutOfBoundsFactory>, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendView", raiNil, + BiFunction, OutOfBoundsFactory>, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendView", raiNil, new Nil>>() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java index 61549d7a3..fbbb589b1 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/extendZeroView/ExtendZeroViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ExtendZeroView} ops. @@ -63,8 +62,8 @@ public class ExtendZeroViewTest extends AbstractOpTest { @Test public void extendZeroTest() { - Function, RandomAccessible> extendFunc = FunctionUtils - .match(ops.env(), "transform.extendZeroView", raiNil, + Function, RandomAccessible> extendFunc = OpBuilder + .matchFunction(ops.env(), "transform.extendZeroView", raiNil, new Nil>() { }); Img img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java index 13dd51bb1..02b8f4e9d 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/flatIterableView/FlatIterableViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Cursor; import net.imglib2.IterableInterval; import net.imglib2.RandomAccessibleInterval; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.FlatIterableView} ops. @@ -64,8 +63,8 @@ public class FlatIterableViewTest extends AbstractOpTest { @Test public void defaultFlatIterableTest() { - Function, IterableInterval> flatIterableFunc = FunctionUtils - .match(ops.env(), "transform.flatIterableView", raiNil, iiNil); + Function, IterableInterval> flatIterableFunc = OpBuilder + .matchFunction(ops.env(), "transform.flatIterableView", raiNil, iiNil); Img img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java index a4e58ccad..1cd95c34e 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/hyperSliceView/HyperSliceViewTest.java @@ -30,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; @@ -40,10 +41,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -74,8 +73,8 @@ public static RandomAccessible deinterval(RandomAccessibleInterval inp @Test public void defaultHyperSliceTest() { - Functions.Arity3, Integer, Long, MixedTransformView> hyperSliceFunc = FunctionUtils - .match(ops.env(), "transform.hyperSliceView", raNil, integerNil, longNil, + Functions.Arity3, Integer, Long, MixedTransformView> hyperSliceFunc = OpBuilder + .matchFunction(ops.env(), "transform.hyperSliceView", raNil, integerNil, longNil, new Nil>() { }); @@ -95,8 +94,8 @@ public void defaultHyperSliceTest() { @Test public void IntervalHyperSliceTest() { - Functions.Arity3, Integer, Long, IntervalView> hyperSliceFunc = FunctionUtils - .match(ops.env(), "transform.hyperSliceView", raiNil, integerNil, longNil, + Functions.Arity3, Integer, Long, IntervalView> hyperSliceFunc = OpBuilder + .matchFunction(ops.env(), "transform.hyperSliceView", raiNil, integerNil, longNil, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java index 504a7655d..340d8dee2 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/interpolateView/InterpolateViewTest.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RealRandomAccess; import net.imglib2.RealRandomAccessible; @@ -42,10 +43,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; import org.scijava.util.MersenneTwisterFast; /** @@ -65,8 +64,8 @@ public class InterpolateViewTest extends AbstractOpTest { @Test public void defaultInterpolateTest() { - BiFunction, FloorInterpolatorFactory, RealRandomAccessible> interpolateFunc = FunctionUtils - .match(ops.env(), "transform.interpolateView", new Nil>() { + BiFunction, FloorInterpolatorFactory, RealRandomAccessible> interpolateFunc = OpBuilder + .matchFunction(ops.env(), "transform.interpolateView", new Nil>() { }, new Nil>() { }, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java index 778e511bb..2566b740e 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/intervalView/IntervalViewTest.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Cursor; import net.imglib2.Interval; import net.imglib2.RandomAccess; @@ -43,10 +44,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; import org.scijava.util.MersenneTwisterFast; @@ -67,8 +66,8 @@ public class IntervalViewTest extends AbstractOpTest { @Test public void defaultIntervalTest() { - BiFunction, Interval, IntervalView> intervalFunc = FunctionUtils - .match(ops.env(), "transform.intervalView", new Nil>() { + BiFunction, Interval, IntervalView> intervalFunc = OpBuilder + .matchFunction(ops.env(), "transform.intervalView", new Nil>() { }, new Nil() { }, new Nil>() { }); @@ -94,8 +93,8 @@ public void defaultIntervalTest() { @Test public void intervalMinMaxTest() { - Functions.Arity3, long[], long[], IntervalView> intervalFunc = FunctionUtils - .match(ops.env(), "transform.intervalView", new Nil>() { + Functions.Arity3, long[], long[], IntervalView> intervalFunc = OpBuilder + .matchFunction(ops.env(), "transform.intervalView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java index ff2126da8..205374b8d 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/invertAxisView/InvertAxisViewTest.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; @@ -42,9 +43,7 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -67,8 +66,8 @@ public static RandomAccessible deinterval(RandomAccessibleInterval inp @Test public void defaultInvertAxisTest() { - BiFunction, Integer, MixedTransformView> invertFunc = FunctionUtils - .match(ops.env(), "transform.invertAxisView", new Nil>() { + BiFunction, Integer, MixedTransformView> invertFunc = OpBuilder + .matchFunction(ops.env(), "transform.invertAxisView", new Nil>() { }, new Nil() { }, new Nil>() { }); @@ -89,8 +88,8 @@ public void defaultInvertAxisTest() { @Test public void intervalInvertAxisTest() { - BiFunction, Integer, IntervalView> invertFunc = FunctionUtils - .match(ops.env(), "transform.invertAxisView", new Nil>() { + BiFunction, Integer, IntervalView> invertFunc = OpBuilder + .matchFunction(ops.env(), "transform.invertAxisView", new Nil>() { }, new Nil() { }, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java index ebbc55bae..efe48cbd5 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/offsetView/OffsetViewTest.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.FinalInterval; import net.imglib2.Interval; import net.imglib2.RandomAccessible; @@ -44,10 +45,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -65,8 +64,8 @@ public class OffsetViewTest extends AbstractOpTest { @Test public void defaultOffsetTest() { - BiFunction, long[], MixedTransformView> offsetFunc = FunctionUtils - .match(ops.env(), "transform.offsetView", new Nil>() { + BiFunction, long[], MixedTransformView> offsetFunc = OpBuilder + .matchFunction(ops.env(), "transform.offsetView", new Nil>() { }, new Nil() { }, new Nil>() { }); @@ -87,8 +86,8 @@ public void defaultOffsetTest() { @Test public void defaultOffsetIntervalTest() { - BiFunction, Interval, IntervalView> offsetFunc = FunctionUtils - .match(ops.env(), "transform.offsetView", new Nil>() { + BiFunction, Interval, IntervalView> offsetFunc = OpBuilder + .matchFunction(ops.env(), "transform.offsetView", new Nil>() { }, new Nil() { }, new Nil>() { }); @@ -109,8 +108,8 @@ public void defaultOffsetIntervalTest() { @Test public void defaultOffsetStartEndTest() { - Functions.Arity3, long[], long[], IntervalView> offsetFunc = FunctionUtils - .match(ops.env(), "transform.offsetView", new Nil>() { + Functions.Arity3, long[], long[], IntervalView> offsetFunc = OpBuilder + .matchFunction(ops.env(), "transform.offsetView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java index 441e7ddd5..f3b3e1be0 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/permuteView/PermuteViewTest.java @@ -33,6 +33,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Cursor; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; @@ -47,10 +48,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; import org.scijava.util.MersenneTwisterFast; @@ -76,8 +75,8 @@ public static RandomAccessible deinterval(RandomAccessibleInterval inp @Test public void defaultPermuteTest() { - Functions.Arity3, Integer, Integer, MixedTransformView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteView", new Nil>() { + Functions.Arity3, Integer, Integer, MixedTransformView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { @@ -99,8 +98,8 @@ public void defaultPermuteTest() { @Test public void defaultPermuteCoordinatesTest() { - BiFunction, int[], IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesView", new Nil>() { + BiFunction, int[], IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesView", new Nil>() { }, new Nil() { }, new Nil>() { }); @@ -125,8 +124,8 @@ public void defaultPermuteCoordinatesTest() { @Test public void permuteCoordinatesOfDimensionTest() { - Functions.Arity3, int[], Integer, IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesView", new Nil>() { + Functions.Arity3, int[], Integer, IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { @@ -153,8 +152,8 @@ public void permuteCoordinatesOfDimensionTest() { @Test public void defaultPermuteCoordinatesInverseTest() { - BiFunction, int[], IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesInverseView", + BiFunction, int[], IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesInverseView", new Nil>() { }, new Nil() { }, new Nil>() { @@ -180,8 +179,8 @@ public void defaultPermuteCoordinatesInverseTest() { @Test public void permuteCoordinatesInverseOfDimensionTest() { - Functions.Arity3, int[], Integer, IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesInverseView", + Functions.Arity3, int[], Integer, IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesInverseView", new Nil>() { }, new Nil() { }, new Nil() { @@ -211,8 +210,8 @@ public void permuteCoordinatesInverseOfDimensionTest() { @Test public void testIntervalPermute() { - Functions.Arity3, Integer, Integer, IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteView", + Functions.Arity3, Integer, Integer, IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteView", new Nil>() { }, new Nil() { }, new Nil() { @@ -240,8 +239,8 @@ public void testIntervalPermute() { @Test public void testIntervalPermuteCoordinates() { - BiFunction, int[], IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesView", new Nil>() { + BiFunction, int[], IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesView", new Nil>() { }, new Nil() { }, new Nil>() { }); @@ -270,8 +269,8 @@ public void testIntervalPermuteCoordinates() { @Test public void testIntervalPermuteDimensionCoordinates() { - Functions.Arity3, int[], Integer, IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesInverseView", + Functions.Arity3, int[], Integer, IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesInverseView", new Nil>() { }, new Nil() { }, new Nil() { @@ -303,8 +302,8 @@ public void testIntervalPermuteDimensionCoordinates() { @Test public void testIntervalPermuteInverseCoordinates() { - BiFunction, int[], IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesInverseView", + BiFunction, int[], IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesInverseView", new Nil>() { }, new Nil() { }, new Nil>() { @@ -335,8 +334,8 @@ public void testIntervalPermuteInverseCoordinates() { @Test public void testIntervalPermuteInverseDimensionCoordinates() { - Functions.Arity3, int[], Integer, IntervalView> permuteFunc = FunctionUtils - .match(ops.env(), "transform.permuteCoordinatesInverseView", + Functions.Arity3, int[], Integer, IntervalView> permuteFunc = OpBuilder + .matchFunction(ops.env(), "transform.permuteCoordinatesInverseView", new Nil>() { }, new Nil() { }, new Nil() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java index 0dc18a725..3e75ae8e0 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rasterView/RasterViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Cursor; import net.imglib2.RandomAccess; import net.imglib2.RealRandomAccessible; @@ -43,10 +44,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; import org.scijava.util.MersenneTwisterFast; /** @@ -66,8 +65,8 @@ public class RasterViewTest extends AbstractOpTest { @Test public void defaultRasterTest() { - Function, RandomAccessibleOnRealRandomAccessible> rasterFunc = FunctionUtils - .match(ops.env(), "transform.rasterView", new Nil>() { + Function, RandomAccessibleOnRealRandomAccessible> rasterFunc = OpBuilder + .matchFunction(ops.env(), "transform.rasterView", new Nil>() { }, new Nil>() { }); Img img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java index 607e64a82..38dec3153 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/rotateView/RotateViewTest.java @@ -30,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; @@ -41,10 +42,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -67,8 +66,8 @@ public static RandomAccessible deinterval(RandomAccessibleInterval inp @Test public void testDefaultRotate() { - Functions.Arity3, Integer, Integer, MixedTransformView> rotateFunc = FunctionUtils - .match(ops.env(), "transform.rotateView", new Nil>() { + Functions.Arity3, Integer, Integer, MixedTransformView> rotateFunc = OpBuilder + .matchFunction(ops.env(), "transform.rotateView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { @@ -90,8 +89,8 @@ public void testDefaultRotate() { @Test public void testIntervalRotate() { - Functions.Arity3, Integer, Integer, IntervalView> rotateFunc = FunctionUtils - .match(ops.env(), "transform.rotateView", new Nil>() { + Functions.Arity3, Integer, Integer, IntervalView> rotateFunc = OpBuilder + .matchFunction(ops.env(), "transform.rotateView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { @@ -117,8 +116,8 @@ public void testIntervalRotate() { @Test public void testIntervalRotateInterval() { - Functions.Arity3, Integer, Integer, IntervalView> rotateFunc = FunctionUtils - .match(ops.env(), "transform.rotateView", new Nil>() { + Functions.Arity3, Integer, Integer, IntervalView> rotateFunc = OpBuilder + .matchFunction(ops.env(), "transform.rotateView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java index 7bcb42312..162be50b2 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/shearView/ShearViewTest.java @@ -30,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Cursor; import net.imglib2.FinalInterval; import net.imglib2.Interval; @@ -43,10 +44,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -65,8 +64,8 @@ public class ShearViewTest extends AbstractOpTest { @Test public void defaultShearTest() { - Functions.Arity3, Integer, Integer, TransformView> shearFunc = FunctionUtils - .match(ops.env(), "transform.shearView", new Nil>() { + Functions.Arity3, Integer, Integer, TransformView> shearFunc = OpBuilder + .matchFunction(ops.env(), "transform.shearView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { @@ -96,8 +95,8 @@ public void defaultShearTest() { @Test public void ShearIntervalTest() { - Functions.Arity4, Interval, Integer, Integer, IntervalView> shearFunc = FunctionUtils - .match(ops.env(), "transform.shearView", new Nil>() { + Functions.Arity4, Interval, Integer, Integer, IntervalView> shearFunc = OpBuilder + .matchFunction(ops.env(), "transform.shearView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java index f46e3e977..40e9c3c99 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/stackView/StackViewTest.java @@ -35,6 +35,7 @@ import java.util.function.BiFunction; import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; import net.imglib2.img.array.ArrayImgFactory; @@ -43,10 +44,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.StackView} ops. @@ -63,7 +62,7 @@ public class StackViewTest extends AbstractOpTest { @Test public void defaultStackTest() { Function>, RandomAccessibleInterval> stackFunc = - FunctionUtils.match(ops.env(), "transform.stackView", + OpBuilder.matchFunction(ops.env(), "transform.stackView", new Nil>>() {}, new Nil>() {}); @@ -82,8 +81,8 @@ public void defaultStackTest() { @Test public void stackWithAccessModeTest() { - BiFunction>, RandomAccessibleInterval> stackFunc = FunctionUtils - .match(ops.env(), "transform.stackView", new Nil() { + BiFunction>, RandomAccessibleInterval> stackFunc = OpBuilder + .matchFunction(ops.env(), "transform.stackView", new Nil() { }, new Nil>>() { }, new Nil>() { }); diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java index 590acd324..384c84c96 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/subsampleView/SubsampleViewTest.java @@ -33,6 +33,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Cursor; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessible; @@ -47,10 +48,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; import org.scijava.util.MersenneTwisterFast; /** @@ -70,7 +69,7 @@ public class SubsampleViewTest extends AbstractOpTest { @Test public void defaultSubsampleTest() { - BiFunction, Long, SubsampleView> subsampleFunc = FunctionUtils.match(ops.env(), + BiFunction, Long, SubsampleView> subsampleFunc = OpBuilder.matchFunction(ops.env(), "transform.subsampleView", new Nil>() { }, new Nil() { }, new Nil>() { @@ -98,7 +97,7 @@ public void defaultSubsampleTest() { @Test public void defaultSubsampleStepsTest() { - BiFunction, long[], SubsampleView> subsampleFunc = FunctionUtils.match(ops.env(), + BiFunction, long[], SubsampleView> subsampleFunc = OpBuilder.matchFunction(ops.env(), "transform.subsampleView", new Nil>() { }, new Nil() { }, new Nil>() { @@ -126,7 +125,7 @@ public void defaultSubsampleStepsTest() { @Test public void testIntervalSubsample() { - BiFunction, Long, SubsampleIntervalView> subsampleFunc = FunctionUtils.match(ops.env(), + BiFunction, Long, SubsampleIntervalView> subsampleFunc = OpBuilder.matchFunction(ops.env(), "transform.subsampleView", new Nil>() { }, new Nil() { }, new Nil>() { @@ -156,7 +155,7 @@ public void testIntervalSubsample() { @Test public void testIntervalSubsampleSteps() { - BiFunction, long[], SubsampleIntervalView> subsampleFunc = FunctionUtils.match(ops.env(), + BiFunction, long[], SubsampleIntervalView> subsampleFunc = OpBuilder.matchFunction(ops.env(), "transform.subsampleView", new Nil>() { }, new Nil() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java index 405cfa457..db1b873a5 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/translateView/TranslateViewTest.java @@ -33,6 +33,7 @@ import java.util.function.BiFunction; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.RandomAccessibleInterval; import net.imglib2.img.Img; @@ -45,10 +46,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.TranslateView} ops. @@ -71,7 +70,7 @@ public static RandomAccessible deinterval(RandomAccessibleInterval inp @Test public void defaultTranslateTest() { - BiFunction, long[], MixedTransformView> translateFunc = FunctionUtils.match(ops.env(), + BiFunction, long[], MixedTransformView> translateFunc = OpBuilder.matchFunction(ops.env(), "transform.translateView", new Nil>() { }, new Nil() { }, new Nil>() { @@ -93,7 +92,7 @@ public void defaultTranslateTest() { @Test public void testIntervalTranslate() { - BiFunction, long[], IntervalView> translateFunc = FunctionUtils.match(ops.env(), + BiFunction, long[], IntervalView> translateFunc = OpBuilder.matchFunction(ops.env(), "transform.translateView", new Nil>() { }, new Nil() { }, new Nil>() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java index d3f57aecf..9725fb8cb 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/unshearView/UnshearViewTest.java @@ -30,6 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.Cursor; import net.imglib2.FinalInterval; import net.imglib2.Interval; @@ -43,10 +44,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; - import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; /** @@ -63,8 +62,8 @@ public class UnshearViewTest extends AbstractOpTest { @Test public void defaultUnshearTest() { - Functions.Arity3, Integer, Integer, TransformView> unshearFunc = FunctionUtils - .match(ops.env(), "transform.unshearView", new Nil>() { + Functions.Arity3, Integer, Integer, TransformView> unshearFunc = OpBuilder + .matchFunction(ops.env(), "transform.unshearView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil>() { @@ -93,8 +92,8 @@ public void defaultUnshearTest() { @Test public void UnshearIntervalTest() { - Functions.Arity4, Interval, Integer, Integer, IntervalView> unshearFunc = FunctionUtils - .match(ops.env(), "transform.unshearView", new Nil>() { + Functions.Arity4, Interval, Integer, Integer, IntervalView> unshearFunc = OpBuilder + .matchFunction(ops.env(), "transform.unshearView", new Nil>() { }, new Nil() { }, new Nil() { }, new Nil() { diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java index ad8ca3e40..112372925 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/transform/zeroMinView/ZeroMinViewTest.java @@ -32,6 +32,7 @@ import java.util.function.Function; +import net.imagej.ops2.AbstractOpTest; import net.imglib2.RandomAccessible; import net.imglib2.img.Img; import net.imglib2.img.array.ArrayImgFactory; @@ -40,10 +41,8 @@ import net.imglib2.view.Views; import org.junit.jupiter.api.Test; -import net.imagej.ops2.AbstractOpTest; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; -import org.scijava.function.Functions; -import org.scijava.ops.util.FunctionUtils; /** * Tests {@link net.imagej.ops2.Ops.Transform.ZeroMinView} ops. @@ -61,7 +60,7 @@ public class ZeroMinViewTest extends AbstractOpTest { public void defaultZeroMinTest() { Function, IntervalView> zeroMinFunc = - FunctionUtils.match(ops.env(), "transform.zeroMinView", + OpBuilder.matchFunction(ops.env(), "transform.zeroMinView", new Nil>() {}, new Nil>() {}); Img img = new ArrayImgFactory<>(new DoubleType()).create(new int[] { 10, 10 }); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java deleted file mode 100644 index 1fb5af9be..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/ComputerUtils.java +++ /dev/null @@ -1,272 +0,0 @@ -/* - * This is autogenerated source code -- DO NOT EDIT. Instead, edit the - * corresponding template in templates/ and rerun bin/generate.groovy. - */ - -package org.scijava.ops.util; - -import java.lang.reflect.Type; -import java.util.function.Consumer; - -import org.scijava.function.Computers; -import org.scijava.ops.OpEnvironment; -import org.scijava.ops.Hints; -import org.scijava.types.Nil; -import org.scijava.types.Types; - -/** - * Container class for computer-style functional interfaces at various - * arities. - *

- * A computer has functional method {@code compute} with a number of arguments - * corresponding to the arity, plus an additional argument for the preallocated - * output to be populated by the computation. - *

- *

- * Each computer interface implements a corresponding {@link Consumer}-style - * interface (see {@link Consumers}) with arity+1; the consumer's {@code accept} - * method simply delegates to {@code compute}. This pattern allows computer ops - * to be used directly as consumers as needed. - *

- * - * @author Curtis Rueden - * @author Gabriel Selzer - */ -public final class ComputerUtils { - - private ComputerUtils() { - // NB: Prevent instantiation of utility class. - } - - @SuppressWarnings("unchecked") - public static Computers.Arity0 match(final OpEnvironment env, final String opName, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity0.class, outType); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity1 match(final OpEnvironment env, final String opName, final Nil inType, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity1.class, outType, inType); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity2 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity2.class, outType, in1Type, in2Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity3 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity3.class, outType, in1Type, in2Type, in3Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity4 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity5 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity6 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity7 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity8 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity9 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity10 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity11 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity12 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity13 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity14 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity15 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity16 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType) - { - return matchHelper(env, opName, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity0 match(final OpEnvironment env, final String opName, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity0.class, outType); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity1 match(final OpEnvironment env, final String opName, final Nil inType, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity1.class, outType, inType); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity2 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity2.class, outType, in1Type, in2Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity3 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity3.class, outType, in1Type, in2Type, in3Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity4 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity5 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity6 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity7 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity8 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity9 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity10 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity11 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity12 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity13 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity14 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity15 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); - } - - @SuppressWarnings("unchecked") - public static Computers.Arity16 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Computers.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); - } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length + 1]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - types[types.length - 1] = outType.getType(); - final Type specialType = Types.parameterize(opClass, types); - final Nil[] nils = new Nil[inTypes.length + 1]; - System.arraycopy(inTypes, 0, nils, 0, inTypes.length); - nils[nils.length - 1] = outType; - return (T) env.op(opName, Nil.of(specialType), nils, outType); - } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Hints hints, final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length + 1]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - types[types.length - 1] = outType.getType(); - final Type specialType = Types.parameterize(opClass, types); - final Nil[] nils = new Nil[inTypes.length + 1]; - System.arraycopy(inTypes, 0, nils, 0, inTypes.length); - nils[nils.length - 1] = outType; - return (T) env.op(opName, Nil.of(specialType), nils, outType, hints); - } -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java index f2c02f715..bd05a2d33 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/FunctionUtils.java @@ -29,210 +29,6 @@ private FunctionUtils() { // NB: Prevent instantiation of utility class. } - @SuppressWarnings({ "unchecked" }) - public static Producer match(final OpEnvironment env, final String opName, final Nil outType) - { - return matchHelper(env, opName, Producer.class, outType); - } - - @SuppressWarnings({ "unchecked" }) - public static Function match(final OpEnvironment env, final String opName, final Nil inType, final Nil outType) - { - return matchHelper(env, opName, Function.class, outType, inType); - } - - @SuppressWarnings({ "unchecked" }) - public static BiFunction match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType) - { - return matchHelper(env, opName, BiFunction.class, outType, in1Type, in2Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity3 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity3.class, outType, in1Type, in2Type, in3Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity4 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity5 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity6 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity7 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity8 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity9 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity10 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity11 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity12 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity13 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity14 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity15 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity16 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType) - { - return matchHelper(env, opName, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Producer match(final OpEnvironment env, final String opName, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Producer.class, outType); - } - - @SuppressWarnings({ "unchecked" }) - public static Function match(final OpEnvironment env, final String opName, final Nil inType, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Function.class, outType, inType); - } - - @SuppressWarnings({ "unchecked" }) - public static BiFunction match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, BiFunction.class, outType, in1Type, in2Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity3 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity3.class, outType, in1Type, in2Type, in3Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity4 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity4.class, outType, in1Type, in2Type, in3Type, in4Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity5 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity5.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity6 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity6.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity7 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity7.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity8 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity8.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity9 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity9.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity10 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity10.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity11 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity11.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity12 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity12.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity13 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity13.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity14 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity14.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity15 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity15.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type); - } - - @SuppressWarnings({ "unchecked" }) - public static Functions.Arity16 match(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Nil outType, final Hints hints) - { - return matchHelper(env, opName, hints, Functions.Arity16.class, outType, in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type); - } - @SuppressWarnings({ "unchecked" }) public static Functions.ArityN matchN(final OpEnvironment env, final String opName, final Nil outType, final Nil... inTypes) @@ -304,17 +100,4 @@ private static T matchHelper(final OpEnvironment env, final String opName, final Type specialType = Types.parameterize(opClass, types); return (T) env.op(opName, Nil.of(specialType), inTypes, outType); } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Hints hints, - final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length + 1]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - types[types.length - 1] = outType.getType(); - final Type specialType = Types.parameterize(opClass, types); - return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); - } - } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java deleted file mode 100644 index 50132e47b..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/InplaceUtils.java +++ /dev/null @@ -1,1731 +0,0 @@ -/* - * This is autogenerated source code -- DO NOT EDIT. Instead, edit the - * corresponding template in templates/ and rerun bin/generate.groovy. - */ - -package org.scijava.ops.util; - -import java.lang.reflect.Type; -import java.util.function.Consumer; - -import org.scijava.function.Computers; -import org.scijava.function.Consumers; -import org.scijava.function.Inplaces; -import org.scijava.function.Mutable; -import org.scijava.function.Producer; -import org.scijava.ops.Hints; -import org.scijava.ops.OpEnvironment; -import org.scijava.types.Nil; -import org.scijava.types.Types; - -/** - * Container class for inplace-style functional interfaces at various - * arities. - *

- * An inplace has functional method {@code mutate} with a number of arguments - * corresponding to the arity. Any of the arguments annotated - * with @{@link Mutable} may be mutated during execution. Some interfaces narrow - * this behavior to only a specific argument; most ops in practice will - * implement one of these narrowed interfaces. For example, - * {@link Inplaces.Arity2_1} is a binary inplace op that mutates the first of - * two arguments—e.g., an {@code a /= b} division operation would be an - * {@link Inplaces.Arity2_1}, whereas {@code b = a / b} would be an - * {@link Inplaces.Arity2_2}. - *

- *

- * Each inplace interface implements a corresponding {@link Consumer}-style - * interface (see {@link Consumers}) with same arity; the consumer's - * {@code accept} method simply delegates to {@code mutate}. This pattern allows - * inplace ops to be used directly as consumers as needed. - *

- *

- * Note that there is no nullary (arity 0) inplace interface, because there - * would be no arguments to mutate; see also {@link Consumers.Arity0}, - * {@link Computers.Arity0} and {@link Producer}. - *

- * - * @author Curtis Rueden - * @author Gabriel Selzer - */ -public final class InplaceUtils { - - private InplaceUtils() { - // NB: Prevent instantiation of container class. - } - - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity1 matchInplace(final OpEnvironment env, final String opName, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity1.class, ioType, new Nil[] {ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type) - { - return matchHelper(env, opName, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type) - { - return matchHelper(env, opName, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type) - { - return matchHelper(env, opName, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type) - { - return matchHelper(env, opName, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type) - { - return matchHelper(env, opName, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type) - { - return matchHelper(env, opName, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type) - { - return matchHelper(env, opName, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type) - { - return matchHelper(env, opName, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type) - { - return matchHelper(env, opName, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type) - { - return matchHelper(env, opName, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) - { - return matchHelper(env, opName, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type) - { - return matchHelper(env, opName, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type) - { - return matchHelper(env, opName, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type) - { - return matchHelper(env, opName, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type) - { - return matchHelper(env, opName, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) - { - return matchHelper(env, opName, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) - { - return matchHelper(env, opName, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type) - { - return matchHelper(env, opName, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type) - { - return matchHelper(env, opName, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type) - { - return matchHelper(env, opName, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type) - { - return matchHelper(env, opName, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) - { - return matchHelper(env, opName, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) - { - return matchHelper(env, opName, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) - { - return matchHelper(env, opName, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type) - { - return matchHelper(env, opName, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type) - { - return matchHelper(env, opName, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type) - { - return matchHelper(env, opName, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type) - { - return matchHelper(env, opName, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type) - { - return matchHelper(env, opName, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type) - { - return matchHelper(env, opName, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type) - { - return matchHelper(env, opName, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type) - { - return matchHelper(env, opName, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type) - { - return matchHelper(env, opName, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type) - { - return matchHelper(env, opName, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type) - { - return matchHelper(env, opName, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type) - { - return matchHelper(env, opName, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_16 matchInplace16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType) - { - return matchHelper(env, opName, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType}); - } - - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity1 matchInplace(final OpEnvironment env, final String opName, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity1.class, ioType, new Nil[] {ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity2_1.class, ioType, new Nil[] {ioType, in2Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity2_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity2_2.class, ioType, new Nil[] {in1Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity3_1.class, ioType, new Nil[] {ioType, in2Type, in3Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity3_2.class, ioType, new Nil[] {in1Type, ioType, in3Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity3_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity3_3.class, ioType, new Nil[] {in1Type, in2Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity4_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity4_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity4_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity4_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity4_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity5_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity5_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity5_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity5_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity5_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity5_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity6_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity6_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity6_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity6_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity6_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity6_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity6_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity7_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity7_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity7_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity7_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity7_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity7_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity7_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity7_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity8_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity8_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity9_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity9_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity10_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity10_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity11_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity11_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity12_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity12_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity13_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity13_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity14_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity14_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity15_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity15_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_1 matchInplace1(final OpEnvironment env, final String opName, final Nil ioType, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_1.class, ioType, new Nil[] {ioType, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_2 matchInplace2(final OpEnvironment env, final String opName, final Nil in1Type, final Nil ioType, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_2.class, ioType, new Nil[] {in1Type, ioType, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_3 matchInplace3(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil ioType, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_3.class, ioType, new Nil[] {in1Type, in2Type, ioType, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_4 matchInplace4(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil ioType, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_4.class, ioType, new Nil[] {in1Type, in2Type, in3Type, ioType, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_5 matchInplace5(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil ioType, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_5.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, ioType, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_6 matchInplace6(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil ioType, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_6.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, ioType, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_7 matchInplace7(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil ioType, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_7.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, ioType, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_8 matchInplace8(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil ioType, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_8.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, ioType, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_9 matchInplace9(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil ioType, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_9.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, ioType, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_10 matchInplace10(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil ioType, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_10.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, ioType, in11Type, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_11 matchInplace11(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil ioType, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_11.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, ioType, in12Type, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_12 matchInplace12(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil ioType, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_12.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, ioType, in13Type, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_13 matchInplace13(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil ioType, final Nil in14Type, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_13.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, ioType, in14Type, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_14 matchInplace14(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil ioType, final Nil in15Type, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_14.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, ioType, in15Type, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_15 matchInplace15(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil ioType, final Nil in16Type, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_15.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, ioType, in16Type}); - } - - @SuppressWarnings({ "unchecked" }) - public static Inplaces.Arity16_16 matchInplace16(final OpEnvironment env, final String opName, final Nil in1Type, final Nil in2Type, final Nil in3Type, final Nil in4Type, final Nil in5Type, final Nil in6Type, final Nil in7Type, final Nil in8Type, final Nil in9Type, final Nil in10Type, final Nil in11Type, final Nil in12Type, final Nil in13Type, final Nil in14Type, final Nil in15Type, final Nil ioType, final Hints hints) - { - return matchHelper(env, opName, hints, Inplaces.Arity16_16.class, ioType, new Nil[] {in1Type, in2Type, in3Type, in4Type, in5Type, in6Type, in7Type, in8Type, in9Type, in10Type, in11Type, in12Type, in13Type, in14Type, in15Type, ioType}); - } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, - final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - final Type specialType = Types.parameterize(opClass, types); - return (T) env.op(opName, Nil.of(specialType), inTypes, outType); - } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Hints hints, - final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - final Type specialType = Types.parameterize(opClass, types); - return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); - } - - public static class InplaceInfo { - - private final int arity; - private final int mutablePosition; - - public InplaceInfo(final int arity, final int mutablePosition) { - this.arity = arity; - this.mutablePosition = mutablePosition; - } - - public int arity() { - return arity; - } - - public int mutablePosition() { - return mutablePosition; - } - } - -} diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java index 9cc3810a2..b349c2036 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/monitor/OpMonitorTest.java @@ -10,11 +10,9 @@ import org.junit.Assert; import org.junit.Test; -import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; -import org.scijava.ops.util.FunctionUtils; -import org.scijava.param.Parameter; +import org.scijava.ops.OpBuilder; import org.scijava.plugin.Plugin; import org.scijava.types.Nil; @@ -32,7 +30,7 @@ public class OpMonitorTest extends AbstractTestEnvironment { */ @Test(expected = CancellationException.class) public void testCancellation() { - Function bigOp = FunctionUtils.match(ops.env(), "test.opMonitor", new Nil() {}, + Function bigOp = OpBuilder.matchFunction(ops.env(), "test.opMonitor", new Nil() {}, new Nil() {}); OpMonitor monitor = new DefaultOpMonitor(); monitor.cancel(); @@ -49,7 +47,7 @@ public void testCancellation() { */ @Test(expected = CancellationException.class) public void testCancellationDifferentThread() throws InterruptedException { - Function bigOp = FunctionUtils.match(ops.env(), "test.opMonitor", new Nil() {}, + Function bigOp = OpBuilder.matchFunction(ops.env(), "test.opMonitor", new Nil() {}, new Nil() {}); OpMonitor monitor = new DefaultOpMonitor(); try { @@ -65,7 +63,7 @@ public void testCancellationDifferentThread() throws InterruptedException { @Test public void testProgress() throws InterruptedException, ExecutionException{ - BiFunction bigOp = FunctionUtils.match(ops.env(), "test.progress", new Nil() {}, + BiFunction bigOp = OpBuilder.matchFunction(ops.env(), "test.progress", new Nil() {}, new Nil() {}, new Nil() {}); OpMonitor monitor = new DefaultOpMonitor(); diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java index 82e8e75be..9e81b6d27 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/stats/MeanTest.java @@ -7,9 +7,8 @@ import java.util.function.Function; import org.junit.Test; -import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class MeanTest extends AbstractTestEnvironment{ @@ -17,7 +16,7 @@ public class MeanTest extends AbstractTestEnvironment{ @Test public void regressionTest() { - Function, Double> goodFunc = FunctionUtils.match(ops.env(), "stats.mean", new Nil>() {}, new Nil() {}); + Function, Double> goodFunc = OpBuilder.matchFunction(ops.env(), "stats.mean", new Nil>() {}, new Nil() {}); List goodNums = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); double expected = 5.5; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java index bd91e7664..ab40372be 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/ComputersTest.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.util.ComputerUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class ComputersTest extends AbstractTestEnvironment { @@ -42,7 +42,7 @@ public class ComputersTest extends AbstractTestEnvironment { @Test public void testUnaryComputers() { - Computers.Arity1 sqrtComputer = ComputerUtils.match(ops.env(), + Computers.Arity1 sqrtComputer = OpBuilder.matchComputer(ops.env(), "math.sqrt", nilDoubleArray, nilDoubleArray); double[] result = new double[3]; @@ -53,7 +53,7 @@ public void testUnaryComputers() { @Test public void testBinaryComputers() { Computers.Arity2 addComputer = // - ComputerUtils.match(ops.env(), "math.add", nilDoubleArray, nilDoubleArray, + OpBuilder.matchComputer(ops.env(), "math.add", nilDoubleArray, nilDoubleArray, nilDoubleArray); double[] result = new double[3]; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java index 2d5dcac36..5243415b9 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/FunctionsTest.java @@ -33,9 +33,8 @@ import java.util.function.Function; import org.junit.Test; -import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; -import org.scijava.ops.util.FunctionUtils; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class FunctionsTest extends AbstractTestEnvironment { @@ -45,19 +44,19 @@ public class FunctionsTest extends AbstractTestEnvironment { @Test public void testUnaryFunctions() { - Function sqrtFunction = FunctionUtils.match(ops.env(), "math.sqrt", nilDouble, nilDouble); + Function sqrtFunction = OpBuilder.matchFunction(ops.env(), "math.sqrt", nilDouble, nilDouble); double answer = sqrtFunction.apply(16.0); assert 4.0 == answer; } @Test public void testBinaryFunctions() { - BiFunction addFunction = FunctionUtils.match(ops.env(), "math.add", nilDouble, nilDouble, + BiFunction addFunction = OpBuilder.matchFunction(ops.env(), "math.add", nilDouble, nilDouble, nilDouble); double answer = addFunction.apply(16.0, 14.0); assert 30.0 == answer; - BiFunction powerFunction = FunctionUtils.match(ops.env(), "math.pow", nilDouble, + BiFunction powerFunction = OpBuilder.matchFunction(ops.env(), "math.pow", nilDouble, nilDouble, nilDouble); answer = powerFunction.apply(2.0, 10.0); assert 1024.0 == answer; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java index 835fd86b5..c625f1c91 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/LiftTest.java @@ -40,6 +40,7 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.ops.AbstractTestEnvironment; +import org.scijava.ops.OpBuilder; import org.scijava.types.Nil; public class LiftTest extends AbstractTestEnvironment { @@ -52,7 +53,7 @@ public class LiftTest extends AbstractTestEnvironment { @Test public void testliftFunction(){ - Function powFunction = FunctionUtils.match(ops.env(), "test.liftFunction", nilDouble, nilDouble); + Function powFunction = OpBuilder.matchFunction(ops.env(), "test.liftFunction", nilDouble, nilDouble); Function, Iterable> liftedToIterable = Maps.FunctionMaps.Iterables.liftBoth(powFunction); Iterable res2 = liftedToIterable.apply(Arrays.asList(1.0, 2.0, 3.0, 4.0)); @@ -70,7 +71,7 @@ private static double[] toArray(Iterable iter) { @Test public void testliftComputer() { - Computers.Arity1 powComputer = ComputerUtils.match(ops.env(), "test.liftComputer", nilDoubleArray, nilDoubleArray); + Computers.Arity1 powComputer = OpBuilder.matchComputer(ops.env(), "test.liftComputer", nilDoubleArray, nilDoubleArray); Computers.Arity1, Iterable> liftedToIterable = Maps.ComputerMaps.Iterables .liftBoth(powComputer); diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java index 91661493e..7a916ed88 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/util/OpsAsParametersTest.java @@ -6,14 +6,13 @@ import java.util.function.Function; import org.junit.Test; -import org.scijava.function.Functions; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; import org.scijava.ops.OpBuilder; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.types.Nil; import org.scijava.plugin.Plugin; +import org.scijava.types.Nil; @Plugin(type = OpCollection.class) public class OpsAsParametersTest extends AbstractTestEnvironment { @@ -50,7 +49,7 @@ public void TestOpWithOpFieldWithoutRun() { list.add(20.5); list.add(4.0d); - BiFunction, Function, List> thing = FunctionUtils.match(ops.env(), + BiFunction, Function, List> thing = OpBuilder.matchFunction(ops.env(), "test.parameter.op", new Nil>() { }, new Nil>() { }, new Nil>() { @@ -68,7 +67,7 @@ public void TestOpWithOpClass() { list.add(20.5); list.add(4.0d); - Function funcClass = FunctionUtils.match(ops.env(), "test.parameter.class", new Nil() { + Function funcClass = OpBuilder.matchFunction(ops.env(), "test.parameter.class", new Nil() { }, new Nil() { }); diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list deleted file mode 100644 index cbfb06e6c..000000000 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.list +++ /dev/null @@ -1,24 +0,0 @@ -.include Globals.list -arities = (0..maxArity).collect() - -[ComputerUtils.java] -nilArgs = ``` -{ arity -> - names = nilNames(arity) - outType = names.remove(names.size() - 1) - names = [outType] + names - String.join(', ', names) -} -``` -matchParams = ``` -{ arity -> - // contains "I1, I2, ..., IN, O" - generics = genericParamTypes(arity) - // contains "in1, in2, ..., inN, out" - names = nilNames(arity) - // constructing strings of the term "final Nil in1" - nilArgs = (0..arity).stream().map{a -> "final Nil<${generics[a]}> ${names[a]}"}.collect() - String.join(', ', nilArgs) -} -``` - diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm deleted file mode 100644 index d72c8b4ac..000000000 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/ComputerUtils.vm +++ /dev/null @@ -1,84 +0,0 @@ -/* - * This is autogenerated source code -- DO NOT EDIT. Instead, edit the - * corresponding template in templates/ and rerun bin/generate.groovy. - */ - -package org.scijava.ops.util; - -import java.lang.reflect.Type; -import java.util.function.Consumer; - -import org.scijava.function.Computers; -import org.scijava.ops.OpEnvironment; -import org.scijava.ops.Hints; -import org.scijava.types.Nil; -import org.scijava.types.Types; - -/** - * Container class for computer-style functional interfaces at various - * arities. - *

- * A computer has functional method {@code compute} with a number of arguments - * corresponding to the arity, plus an additional argument for the preallocated - * output to be populated by the computation. - *

- *

- * Each computer interface implements a corresponding {@link Consumer}-style - * interface (see {@link Consumers}) with arity+1; the consumer's {@code accept} - * method simply delegates to {@code compute}. This pattern allows computer ops - * to be used directly as consumers as needed. - *

- * - * @author Curtis Rueden - * @author Gabriel Selzer - */ -public final class ComputerUtils { - - private ComputerUtils() { - // NB: Prevent instantiation of utility class. - } - -#foreach($arity in [0..$maxArity]) - @SuppressWarnings("unchecked") - public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity)) - { - return matchHelper(env, opName, ${computerArity.call($arity)}.class, $nilArgs.call($arity)); - } - -#end -#foreach($arity in [0..$maxArity]) - @SuppressWarnings("unchecked") - public static $generics.call($arity) $computerArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity), final Hints hints) - { - return matchHelper(env, opName, hints, ${computerArity.call($arity)}.class, $nilArgs.call($arity)); - } - -#end - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length + 1]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - types[types.length - 1] = outType.getType(); - final Type specialType = Types.parameterize(opClass, types); - final Nil[] nils = new Nil[inTypes.length + 1]; - System.arraycopy(inTypes, 0, nils, 0, inTypes.length); - nils[nils.length - 1] = outType; - return (T) env.op(opName, Nil.of(specialType), nils, outType); - } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Hints hints, final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length + 1]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - types[types.length - 1] = outType.getType(); - final Type specialType = Types.parameterize(opClass, types); - final Nil[] nils = new Nil[inTypes.length + 1]; - System.arraycopy(inTypes, 0, nils, 0, inTypes.length); - nils[nils.length - 1] = outType; - return (T) env.op(opName, Nil.of(specialType), nils, outType, hints); - } -} diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm index f0c4061fa..d7248f865 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/FunctionUtils.vm @@ -29,22 +29,6 @@ public final class FunctionUtils { // NB: Prevent instantiation of utility class. } -#foreach($arity in [0..$maxArity]) - @SuppressWarnings({ "unchecked" }) - public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity)) - { - return matchHelper(env, opName, ${functionArity.call($arity)}.class, $nilArgs.call($arity)); - } - -#end -#foreach($arity in [0..$maxArity]) - @SuppressWarnings({ "unchecked" }) - public static $generics.call($arity) $functionArity.call($arity)$generics.call($arity) match(final OpEnvironment env, final String opName, $matchParams.call($arity), final Hints hints) - { - return matchHelper(env, opName, hints, ${functionArity.call($arity)}.class, $nilArgs.call($arity)); - } - -#end @SuppressWarnings({ "unchecked" }) public static Functions.ArityN matchN(final OpEnvironment env, final String opName, final Nil outType, final Nil... inTypes) @@ -77,17 +61,4 @@ public final class FunctionUtils { final Type specialType = Types.parameterize(opClass, types); return (T) env.op(opName, Nil.of(specialType), inTypes, outType); } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Hints hints, - final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length + 1]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - types[types.length - 1] = outType.getType(); - final Type specialType = Types.parameterize(opClass, types); - return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); - } - } diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list deleted file mode 100644 index 1461fe4bc..000000000 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.list +++ /dev/null @@ -1,83 +0,0 @@ -.include Globals.list -arities = (1..maxArity).collect() - -[InplaceUtils.java] -simplifiedClass = ``` -{ arity, num -> - simplifiedInplace(arity, num) + '.class' -} -``` -inplaceClass = ``` -{ arity, num -> - inplaceType(arity, num) + '.class' -} -``` -typeVarNums = ``` -{ arity, io -> - (1..arity).subList(0, io - 1) + 'O' + (1..arity).subList(io, arity) -} -``` -genericsList = ``` -{ arity, io -> - typeVarNums(arity, io).stream().map{a -> "I$a"}.collect() -} -``` -generics = ``` -{ arity, io -> - '<' + String.join(', ', genericsList(arity, io)) + '>' -} -``` -allMutableGenericsList = ``` -{ arity -> - (1..arity).stream().map{a -> "IO$a"}.collect() -} -``` -allMutableGenerics = ``` -{ arity -> - '<' + String.join(', ', allMutableGenericsList.call(arity)) + '>' -} -``` -basicParamsList = ``` -{ arity, io -> - typeVarNums(arity, io).stream().map{a -> a == 'O' ? "ioType" : "in${a}Type"}.collect() -} -``` -basicParams = ``` -{ arity, io -> - String.join(', ', basicParamsList(arity, io)) -} -``` -matchName = ``` -{ arity, num -> - arity == 1 ? "matchInplace" : - "matchInplace${num}" -} -``` -matchParams = ``` -{ arity, io -> - String.join(', ', genericsList(arity, io).stream().map{a -> - a.charAt(1) == 'O'? - "final Nil<$a> ${a.toLowerCase()}Type" : - "final Nil<$a> in${a.substring(1)}Type"}.collect()) -} -``` -typeArgs = ``` -{ arity, io -> - String.join(', ', basicParamsList(arity, io).stream().map{a -> "${a}.getType()"}.collect()) -} -``` -allMutableMutateParams = ``` -{ arity -> - String.join(', ', allMutableGenericsList(arity).stream().map{a -> "@Mutable $a ${a.toLowerCase()}"}.collect()) -} -``` -allMutableMutateArgs = ``` -{ arity -> - String.join(', ', allMutableGenericsList(arity).stream().map{a -> "${a.toLowerCase()}"}.collect()) -} -``` -mutateArgs = ``` -{ arity, io -> - String.join(', ', genericsList(arity, io).stream().map{a -> a.substring(1) == 'O' ? "@Mutable IO io" : "$a in${a.substring(1)}"}.collect()) - } -``` diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm deleted file mode 100644 index c3a28c725..000000000 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/util/InplaceUtils.vm +++ /dev/null @@ -1,119 +0,0 @@ -/* - * This is autogenerated source code -- DO NOT EDIT. Instead, edit the - * corresponding template in templates/ and rerun bin/generate.groovy. - */ - -package org.scijava.ops.util; - -import java.lang.reflect.Type; -import java.util.function.Consumer; - -import org.scijava.function.Computers; -import org.scijava.function.Consumers; -import org.scijava.function.Inplaces; -import org.scijava.function.Mutable; -import org.scijava.function.Producer; -import org.scijava.ops.Hints; -import org.scijava.ops.OpEnvironment; -import org.scijava.types.Nil; -import org.scijava.types.Types; - -/** - * Container class for inplace-style functional interfaces at various - * arities. - *

- * An inplace has functional method {@code mutate} with a number of arguments - * corresponding to the arity. Any of the arguments annotated - * with @{@link Mutable} may be mutated during execution. Some interfaces narrow - * this behavior to only a specific argument; most ops in practice will - * implement one of these narrowed interfaces. For example, - * {@link Inplaces.Arity2_1} is a binary inplace op that mutates the first of - * two arguments—e.g., an {@code a /= b} division operation would be an - * {@link Inplaces.Arity2_1}, whereas {@code b = a / b} would be an - * {@link Inplaces.Arity2_2}. - *

- *

- * Each inplace interface implements a corresponding {@link Consumer}-style - * interface (see {@link Consumers}) with same arity; the consumer's - * {@code accept} method simply delegates to {@code mutate}. This pattern allows - * inplace ops to be used directly as consumers as needed. - *

- *

- * Note that there is no nullary (arity 0) inplace interface, because there - * would be no arguments to mutate; see also {@link Consumers.Arity0}, - * {@link Computers.Arity0} and {@link Producer}. - *

- * - * @author Curtis Rueden - * @author Gabriel Selzer - */ -public final class InplaceUtils { - - private InplaceUtils() { - // NB: Prevent instantiation of container class. - } - - -#foreach($arity in $arities) -#foreach($a in [1..$arity]) - @SuppressWarnings({ "unchecked" }) - public static $generics.call($arity, $a) $inplaceType.call($arity, $a)$generics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a)) - { - return matchHelper(env, opName, ${inplaceClass.call($arity, $a)}, ioType, new Nil[] {${basicParams.call($arity, $a)}}); - } - -#end -#end - -#foreach($arity in $arities) -#foreach($a in [1..$arity]) - @SuppressWarnings({ "unchecked" }) - public static $generics.call($arity, $a) $inplaceType.call($arity, $a)$generics.call($arity, $a) $matchName.call($arity, $a)(final OpEnvironment env, final String opName, $matchParams.call($arity, $a), final Hints hints) - { - return matchHelper(env, opName, hints, ${inplaceType.call($arity, $a)}.class, ioType, new Nil[] {${basicParams.call($arity, $a)}}); - } - -#end -#end - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, - final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - final Type specialType = Types.parameterize(opClass, types); - return (T) env.op(opName, Nil.of(specialType), inTypes, outType); - } - - @SuppressWarnings({ "unchecked" }) - private static T matchHelper(final OpEnvironment env, final String opName, final Hints hints, - final Class opClass, final Nil outType, final Nil... inTypes) - { - final Type[] types = new Type[inTypes.length]; - for (int i = 0; i < inTypes.length; i++) - types[i] = inTypes[i].getType(); - final Type specialType = Types.parameterize(opClass, types); - return (T) env.op(opName, Nil.of(specialType), inTypes, outType, hints); - } - - public static class InplaceInfo { - - private final int arity; - private final int mutablePosition; - - public InplaceInfo(final int arity, final int mutablePosition) { - this.arity = arity; - this.mutablePosition = mutablePosition; - } - - public int arity() { - return arity; - } - - public int mutablePosition() { - return mutablePosition; - } - } - -} From ce7a982b7420aa33ad6e8115028cd9af50575e7a Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Wed, 30 Jun 2021 13:12:09 -0500 Subject: [PATCH 15/31] Export MatchingUtils methods to scijava-types These methods do not depend on Ops, so we should export them for broader usage --- .../ops/impl/DefaultOpEnvironment.java | 4 +- .../org/scijava/ops/matcher/DefaultOpRef.java | 3 +- .../scijava/ops/matcher/MatchingUtils.java | 995 +----------------- .../ops/simplify/SimplificationUtils.java | 9 +- .../org/scijava/param/ParameterStructs.java | 7 +- .../ops/matcher/MatchingUtilsTest.java | 17 +- .../src/main/java/module-info.java | 1 + .../types/inference/GenericAssignability.java | 767 ++++++++++++++ .../inference/TypeInferenceException.java | 19 + .../scijava/types/inference/TypeMapping.java | 110 ++ .../types/inference/TypeVarAssigns.java | 134 +++ .../types/inference/WildcardTypeMapping.java | 123 +++ .../inference}/InferTypeVariablesTest.java | 428 ++++---- 13 files changed, 1379 insertions(+), 1238 deletions(-) create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java rename scijava/{scijava-ops/src/test/java/org/scijava/ops/matcher => scijava-types/src/test/java/org/scijava/types/inference}/InferTypeVariablesTest.java (64%) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index 6930309ee..316e442e5 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -77,7 +77,6 @@ import org.scijava.ops.matcher.DefaultOpMatcher; import org.scijava.ops.matcher.DefaultOpRef; import org.scijava.ops.matcher.DependencyMatchingException; -import org.scijava.ops.matcher.MatchingUtils; import org.scijava.ops.matcher.OpAdaptationInfo; import org.scijava.ops.matcher.OpClassInfo; import org.scijava.ops.matcher.OpFieldInfo; @@ -95,6 +94,7 @@ import org.scijava.types.Nil; import org.scijava.types.TypeService; import org.scijava.types.Types; +import org.scijava.types.inference.GenericAssignability; import org.scijava.util.ClassUtils; /** @@ -637,7 +637,7 @@ private boolean adaptOpOutputSatisfiesRefTypes(Type adaptTo, Map Type opType = ref.getType(); // TODO: clean this logic -- can this just be ref.typesMatch() ? if (opType instanceof ParameterizedType) { - if (!MatchingUtils.checkGenericAssignability(adaptTo, + if (!GenericAssignability.checkGenericAssignability(adaptTo, (ParameterizedType) opType, map, true)) { return false; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java index c101472e6..6f4a2d8f7 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java @@ -38,6 +38,7 @@ import org.scijava.ops.Op; import org.scijava.ops.OpRef; import org.scijava.types.Types; +import org.scijava.types.inference.GenericAssignability; /** * Data structure which identifies an op by name and/or type(s) and/or argument @@ -153,7 +154,7 @@ public boolean typesMatch(final Type opType, { if (type == null) return true; if (type instanceof ParameterizedType) { - if (!MatchingUtils.checkGenericAssignability(opType, + if (!GenericAssignability.checkGenericAssignability(opType, (ParameterizedType) type, typeVarAssigns, true)) { return false; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java index 0bf89a671..eee5b7fef 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java @@ -32,24 +32,14 @@ package org.scijava.ops.matcher; -import com.google.common.base.Objects; - -import java.lang.reflect.GenericArrayType; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; import java.lang.reflect.TypeVariable; -import java.lang.reflect.WildcardType; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; import org.scijava.types.Any; import org.scijava.types.Nil; @@ -151,294 +141,6 @@ static int checkGenericOutputsAssignability(Type[] froms, Type[] tos, return -1; } - /** - * Checks whether it would be legal to assign the {@link Type} source to the - * specified {@link ParameterizedType} destination (which could possibly be a - * supertype of the source type). Thereby, possible {@link TypeVariable}s - * contained in the parameters of the source are tried to be inferred in the - * sense of empty angle brackets when a new object is created: - * - * 
-	 * 
-	 * List<Integer> listOfInts = new ArrayList<>();
-	 *
- * - * Hence, the types to put between the brackets are tried to be determined. - * Inference will be done by simple matching of an encountered - * {@link TypeVariable} in the source to the corresponding type in the - * parameters of the destination. If an {@link TypeVariable} is encountered - * more than once, the corresponding type in the destination needs to - * perfectly match. Else, false will be returned.
- *
- * Examples: - *
    - * If we have a class: - *
  • - * - * 
    -	 * class NumberSupplier<M extends Number> implements Supplier<M>
-	 *
    • - *
- *
    - * The following check will return true: - *
  • - * - * 
    -	 * checkGenericAssignability(NumberSupplier.class, new
-	 * Nil<Supplier<Double>>() {}.getType())
    • - *
- * - *
    - * Which will check if the following assignment would be legal: - *
  • - * - * 
    -	 * Supplier<Double> list = new NumberSupplier<>()
    • - *
- * - *
    - * Here, the parameter {@code } can be inferred to be of - * type {@code Double} from the type {@code Supplier} - *
- *
    - * Consequently the following will return false: - *
  • - * - * 
    -	 * checkGenericAssignability(NumberSupplier.class, new
-	 * Nil<Supplier<String>>() {}.getType())
    • - *
- *
    - * {@code } can't be inferred, as type {@code String} is not - * within the bounds of {@code M}. - *
- *
    - * Furthermore, the following will return false for: - * {@code class NumberFunc implements Function}: - *
  • - * - * 
    -	 * checkGenericAssignability(NumberSupplier.class, new
-	 * Nil<Function<Double, Integer>>() {}.getType())
    • - *
- *
    - * {@code } can't be inferred, as types {@code Double} and - * {@code Integer} are ambiguous for {@code M}. - *
- * - * @param src the type for which assignment should be checked from - * @param dest the parameterized type for which assignment should be checked - * to - * @param typeVarAssigns the map of {@link TypeVariable}s to {@link Type}s to - * populate with what would occur in this scenario; must be empty or - * null - * @param safeAssignability used to determine if we want to check if the - * src->dest assignment would be safely assignable even though it - * would cause a compiler error if we explicitly tried to do this - * (useful pretty much only for Op matching) - * @return whether and assignment of source to destination would be a legal - * java statement - */ - public static boolean checkGenericAssignability(Type src, - ParameterizedType dest, Map, Type> typeVarAssigns, - boolean safeAssignability) - { - if (typeVarAssigns == null) { - typeVarAssigns = new HashMap<>(); - } - else if (!typeVarAssigns.isEmpty()) { - throw new IllegalArgumentException( - "Expected empty typeVarAssigns but contained " + typeVarAssigns.size() + - " entries"); - } - - // fail fast when raw types are not assignable - if (!Types.isAssignable(Types.raw(src), Types.raw(dest))) return false; - - // when raw types are assignable, check the type variables of src and dest - Type[] srcTypes = typeParamsAgainstClass(src, Types.raw(dest)); - Type[] destTypes = dest.getActualTypeArguments(); - - // if there are no type parameters in src (w.r.t. dest), do a basic - // assignability check. - if (srcTypes.length == 0) return Types.isAssignable(src, dest); - // if there are type parameters, do a more complicated assignability check. - boolean result = checkGenericAssignability(srcTypes, destTypes, src, dest, - typeVarAssigns, safeAssignability); - return result; - } - - /** - * Obtains the type parameters of {@link Type} {@code src} with respect - * to the {@link Class} {@code dest}. When {@code src} has no type - * parameters (or is not a subclass of {@code dest}), an empty array is - * returned. - * - * @param src - the {@code Type} whose type parameters will be returned. - * @param superclass - the {@code Class} against which we want the type parameters of {@code src} - * @return an array of {@code Type}s denoting the type - */ - private static Type[] typeParamsAgainstClass(Type src, Class superclass) { - // only classes and ParameterizedTypes can have type parameters - if (!(src instanceof Class || src instanceof ParameterizedType)) return new Type[0]; - Type superSrc = superType(src, superclass); - if (superSrc == null) return new Type[0]; - if (superSrc instanceof ParameterizedType) return ((ParameterizedType) superSrc).getActualTypeArguments(); - return getParams(Types.raw(src), superclass); - } - - /** - * This method is designed to handle edge cases when calling - * {@link Types#getExactSuperType(Type, Class)}. When - * {@code getExactSuperType} returns an error, this usually implies some funny - * business going on with the {@link Type} that was passed to it. We are not - * interested in supporting this business, since it usually results from poor - * practice in Class construction. TODO: determine some way of conveying to - * the user that GenTyRef doesn't like their inputs. - * - * @param src - * @param superClass - * @return - the supertype of {@code src} with rawtype {@code superClass}, or - * {@code null} if no such supertype exists. - */ - private static Type superType(Type src, Class superClass) { - try { - return Types.getExactSuperType(src, superClass); - } catch (AssertionError e) { - // can be thrown when - return null; - } - } - - /** - * @param src - * the type for which assignment should be checked from - * @param dest - * the parameterized type for which assignment should be checked to - * @param safeAssignability - * used to determine if we want to check if the src->dest assignment - * would be safely assignable even though it would cause a compiler - * error if we explicitly tried to do this (useful pretty much only - * for Op matching) - * @return whether and assignment of source to destination would be a legal java - * statement - */ - public static boolean checkGenericAssignability(Type src, ParameterizedType dest, boolean safeAssignability) { - return checkGenericAssignability(src, dest, null, safeAssignability); - } - - /** - * @param srcTypes the Type arguments for the source Type - * @param destTypes the Type arguments for the destination Type - * @param src the type for which assignment should be checked from - * @param dest the parameterized type for which assignment should be checked - * to - * @param typeVarAssigns the map of {@link TypeVariable}s to - * {@link TypeMapping}s that would occur in this scenario - * @param safeAssignability used to determine if we want to check if the - * src->dest assignment would be safely assignable even though it - * would cause a compiler error if we explicitly tried to do this - * (useful pretty much only for Op matching) - * @return whether and assignment of source to destination would be a legal - * java statement - */ - private static boolean checkGenericAssignability(Type[] srcTypes, Type[] destTypes, Type src, Type dest, - Map, Type> typeVarAssigns, boolean safeAssignability) { - // if the number of type arguments does not match, the types can't be - // assignable - if (srcTypes.length != destTypes.length) { - return false; - } - - try { - // Try to infer type variables contained in the type arguments of - // sry - inferTypeVariables(srcTypes, destTypes, typeVarAssigns); - } catch (IllegalArgumentException e) { - // types can't be inferred - // TODO: Consider the situations in which it is okay that the type - // variables cannot be inferred. For example, if we have a - // Function, Comparable> and we ask for a - // Function, it is okay that we cannot infer the T of - // Comparable from Object since a Comparable is an Object for any T. - // It would be nice if we could just return false any time we catch a - // TypeInferenceException, but until we sort this out, we cannot do so. - return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns, src, dest); - } - - // Map TypeVariables in src to Types - Class matchingRawType = Types.raw(dest); - Type[] mappedSrcTypes = mapVarToTypes(srcTypes, typeVarAssigns); - Type inferredSrcType = Types.parameterize(matchingRawType, mappedSrcTypes); - - // Check assignability - if (Types.isAssignable(inferredSrcType, dest, typeVarAssigns)) return true; - - return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns, src, - dest); - } - - /** - * We know that the special types for the Op candidate and what we asked for are - * the same (i.e. that we are trying to determine if one Function can be - * assigned to another Function). There are some situations (that are - * particularly common when using ops.run()) where the Function SHOULD NOT - * NORMALLY MATCH UP but WE KNOW IT WILL BE SAFE TO ASSIGN. This method attempts - * to tease those situations out as a last resort. - * - * @param destTypes - * - the array of Parameterized types of the OpInfo we called the - * matcher on (in the case of ops.run(), it is a Type array of the - * types of the args we passed through.) - * @param typeVarAssigns - * - a Map of all of the Type Variables already determined. - * @param dest - * - the speical type of the Op that we want to find a match for - * (determined by the user / ops.run()) - * @return boolean - true if we can safely match this Op even though the types - * do not directly match up. False otherwise. - */ - public static boolean isSafeAssignable(Type[] destTypes, Map, Type> typeVarAssigns, Type src, - Type dest) { - - Method[] destMethods = Arrays.stream(Types.raw(dest).getDeclaredMethods()) - .filter(method -> Modifier.isAbstract(method.getModifiers())).toArray(Method[]::new); - if (destMethods.length == 0) { - throw new IllegalArgumentException(src + " does not have an abstract method!"); - } - Type[] params = Types.getExactParameterTypes(destMethods[0], src); - Type returnType = Types.getExactReturnType(destMethods[0], src); - for (int i = 0; i < params.length; i++) { - if (!Types.isAssignable(destTypes[i], params[i], typeVarAssigns)) - return false; - } - - // Computers will have void as their return type, meaning that there is no - // output to check. - if (returnType == void.class) - return true; - - return Types.isAssignable(returnType, destTypes[destTypes.length - 1], typeVarAssigns); - } - - /** - * Exception indicating that type vars could not be inferred. - */ - static class TypeInferenceException extends RuntimeException { - /** - * - */ - private static final long serialVersionUID = 7147530827546663700L; - - public TypeInferenceException() { - super(); - } - - public TypeInferenceException(String message) { - super(message); - } - } - /** * Map type vars in specified type list to types using the specified map. In * doing so, type vars mapping to other type vars will not be followed but @@ -450,386 +152,11 @@ public TypeInferenceException(String message) { * (that are present in {@code typeAssigns}) are mapped to the * associated values within the {@code Map}. */ - private static Type[] mapVarToTypes(Type[] typesToMap, Map, Type> typeAssigns) { + public static Type[] mapVarToTypes(Type[] typesToMap, Map, Type> typeAssigns) { return Arrays.stream(typesToMap).map(type -> Types.unrollVariables(typeAssigns, type, false)) .toArray(Type[]::new); } - /** - * Tries to infer type vars contained in types from corresponding types from - * inferFrom, putting them into the specified map. When a - * {@link TypeInferenceException} is thrown, the caller should assume that - * some of the mappings within {@code typeMappings} are incorrect. - * - * @param types - the types containing {@link TypeVariable}s - * @param inferFroms - the types used to infer the {@link TypeVariable}s - * within {@code types} - * @param typeVarAssigns - the mapping of {@link TypeVariable}s to - * {@link Type}s - */ - public static void inferTypeVariables(Type[] types, Type[] inferFroms, Map, Type> typeVarAssigns) { - Map, TypeMapping> typeMappings = new HashMap<>(); - try { - inferTypeVariables(types, inferFroms, typeMappings, true); - typeVarAssigns.putAll(new TypeVarAssigns(typeMappings)); - } - catch (TypeInferenceException e) { - throw new IllegalArgumentException(e); - } - } - - private static void inferTypeVariables(Type[] types, Type[] inferFroms, - Map, TypeMapping> typeMappings, boolean malleable) - { - // Ensure that the user has not passed a null map - if (typeMappings == null) throw new IllegalArgumentException( - "Type Variable map is null, cannot store mappings of TypeVariables to Types!"); - - if (types.length != inferFroms.length) throw new TypeInferenceException( - "Could not infer type variables: Type arrays must be of the same size"); - - for (int i = 0; i < types.length; i++) { - inferTypeVariables(types[i], inferFroms[i], typeMappings, malleable); - } - // Check if the inferred types satisfy their bounds - // TODO: can we do this in an efficient manner? - TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings); - if (!Types.typesSatisfyVariables(typeVarAssigns)) { - throw new TypeInferenceException(); - } - } - - /** - * Tries to infer type vars contained in types from corresponding types from - * inferFrom, putting them into the specified map. When a - * {@link TypeInferenceException} is thrown, the caller should assume that - * some of the mappings within {@code typeMappings} are incorrect. - * - * @param type - * @param inferFrom - * @param typeMappings - */ - static void inferTypeVariablesWithTypeMappings(Type type[], Type[] inferFrom, - Map, TypeMapping> typeMappings) - { - inferTypeVariables(type, inferFrom, typeMappings, true); - } - - /** - * Tries to infer type vars contained in types from corresponding types from - * inferFrom, putting them into the specified map. When a - * {@link TypeInferenceException} is thrown, the caller should assume that - * some of the mappings within {@code typeMappings} are incorrect. - * - * @param type - * @param inferFrom - * @param typeMappings - */ - static void inferTypeVariables(Type type, Type inferFrom, Map, TypeMapping> typeMappings) { - inferTypeVariables(type, inferFrom, typeMappings, true); - } - - private static void inferTypeVariables(Type type, Type inferFrom, - Map, TypeMapping> typeMappings, boolean malleable) - { - if (type instanceof TypeVariable) { - inferTypeVariables((TypeVariable) type, inferFrom, typeMappings, malleable); - } - else if (type instanceof ParameterizedType) { - inferTypeVariables((ParameterizedType) type, inferFrom, typeMappings); - } - else if (type instanceof WildcardType) { - inferTypeVariables((WildcardType) type, inferFrom, typeMappings); - } - else if (type instanceof GenericArrayType) { - inferTypeVariables((GenericArrayType) type, inferFrom, typeMappings); - } - else if (type instanceof Class) { - inferTypeVariables((Class) type, inferFrom, typeMappings); - } - - } - - private static void inferTypeVariables(TypeVariable type, Type inferFrom, - Map, TypeMapping> typeMappings, boolean malleable) - { - TypeMapping typeData = typeMappings.get(type); - // If current is not null then we have already encountered that - // variable. If so, we require them to be exactly the same, and throw a - // TypeInferenceException if they are not. - if (typeData != null) { - typeData.refine(inferFrom, malleable); - } - else { - resolveTypeInMap(type, inferFrom, typeMappings, malleable); - // Bounds could also contain type vars, hence possibly go into - // recursion - for (Type bound : type.getBounds()) { - if (bound instanceof TypeVariable && typeMappings.get(bound) != null) { - // If the bound of the current var (let's call it A) to - // infer is also a var (let's call it B): - // If we already encountered B, we check if the current - // type to infer from is assignable to - // the already inferred type for B. In this case we do - // not require equality as one var is - // bounded by another and it is not the same. E.g. - // assume we want to infer the types of vars: - // - - - A extends Number, B extends A - // From types: - // - - - Number, Double - // First A is bound to Number, next B to Double. Then we - // check the bounds for B. We encounter A, - // for which we already inferred Number. Hence, it - // suffices to check whether Double can be assigned - // to Number, it does not have to be equal as it is just - // a transitive bound for B. - Type typeAssignForBound = typeMappings.get(bound).getType(); - if (!Types.isAssignable(inferFrom, typeAssignForBound)) { - throw new TypeInferenceException(); - } - } - else { - // Else go into recursion as we encountered a new var. - inferTypeVariables(bound, inferFrom, typeMappings); - } - } - - } - } - - private static void inferTypeVariables(ParameterizedType type, Type inferFrom, - Map, TypeMapping> typeMappings) - { - if (inferFrom instanceof WildcardType) { - inferFrom = getInferrableBound((WildcardType) inferFrom); - } - if (inferFrom instanceof Any) { - Any any = (Any) inferFrom; - mapTypeVarsToAny(type, any, typeMappings); - return; - } - // Finding the supertype here is really important. Suppose that we are - // inferring from a StrangeThing extends Thing and our - // Op requires a Thing. We need to ensure that T gets - // resolved to a Double and NOT a Long. - Type superInferFrom = Types.getExactSuperType(inferFrom, Types.raw(type)); - if (superInferFrom instanceof ParameterizedType) { - ParameterizedType paramInferFrom = (ParameterizedType) superInferFrom; - inferTypeVariables(type.getActualTypeArguments(), paramInferFrom - .getActualTypeArguments(), typeMappings, false); - } - else if (superInferFrom instanceof Class) { - TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings); - Type mappedType = Types.mapVarToTypes(type, typeVarAssigns); - // Use isAssignable to attempt to infer the type variables present in type - if (!Types.isAssignable(superInferFrom, mappedType, typeVarAssigns)) { - throw new TypeInferenceException(inferFrom + - " cannot be implicitly cast to " + mappedType + - ", thus it is impossible to infer type variables for " + inferFrom); - } - // for all remaining unmapped type vars, map to Any - mapTypeVarsToAny(type, typeMappings); - } - // -- edge cases -> do our best -- // - else if (superInferFrom == null) { - // edge case 1: if inferFrom is an Object, superInferFrom will be null - // when type is some interface. - if (Object.class.equals(inferFrom)) { - mapTypeVarsToAny(type, typeMappings); - return; - } - // edge case 2: if inferFrom is a superType of type, we can get (some of) - // the types of type by finding the exact superType of type w.r.t. - // inferFrom. - Type superTypeOfType = Types.getExactSuperType(type, Types.raw( - inferFrom)); - if (superTypeOfType == null) { - throw new TypeInferenceException(inferFrom + - " cannot be implicitly cast to " + type + - ", thus it is impossible to infer type variables for " + inferFrom); - } - inferTypeVariables(superTypeOfType, inferFrom, typeMappings, false); - mapTypeVarsToAny(type, typeMappings); - } - // TODO: elaborate - else throw new IllegalStateException(superInferFrom + - " is the supertype of " + inferFrom + " with respect to " + type + - ", however this cannot be (since " + type + - " is a ParamterizedType)! (Only a ParameterizedType, Class, or null " + - "can be returned from Types.getExactSuperType when it is called with a ParameterizedType!)"); - } - - private static void mapTypeVarsToAny(Type type, - Map, TypeMapping> typeMappings) - { - mapTypeVarsToAny(type, new Any(), typeMappings); - } - - private static void mapTypeVarsToAny(Type type, Any any, - Map, TypeMapping> typeMappings) - { - if (!Types.containsTypeVars(type)) return; - - if (type instanceof TypeVariable) { - if (typeMappings.containsKey(type)) return; - TypeVariable typeVar = (TypeVariable) type; - typeMappings.put(typeVar, suitableTypeMapping(typeVar, any, true)); - } - else if (type instanceof ParameterizedType) { - ParameterizedType pType = (ParameterizedType) type; - Type[] typeParams = pType.getActualTypeArguments(); - for (Type typeParam : typeParams) { - mapTypeVarsToAny(typeParam, typeMappings); - } - } - else if (type instanceof WildcardType) { - WildcardType wildcard = (WildcardType) type; - for (Type lowerBound : wildcard.getLowerBounds()) - mapTypeVarsToAny(lowerBound, typeMappings); - for (Type upperBound : wildcard.getUpperBounds()) - mapTypeVarsToAny(upperBound, typeMappings); - } - else if (type instanceof Class) { - Class clazz = (Class) type; - for (Type typeParam : clazz.getTypeParameters()) - mapTypeVarsToAny(typeParam, typeMappings); - } - } - - private static void inferTypeVariables(WildcardType type, Type inferFrom, Map, TypeMapping> typeMappings) { - Type inferrableBound = getInferrableBound(type); - if (inferFrom instanceof WildcardType) { - // NB if both type and inferFrom are Wildcards, it doesn't really matter - // (for the purpose of Type inference) whether those Wildcards have a - // defined upper or lower bound. It is only important that we compare - // those defined bounds, even if one is an upper bound and the other is a - // lower bound. If the Wildcards are not assignable (which is (always?) - // the case when one bound is an upper bound and the other is a lower - // bound), it is still possible to infer the type variables; despite doing - // so, checkGenericAssignability will return false. - inferFrom = getInferrableBound((WildcardType) inferFrom); - } - if (inferrableBound instanceof TypeVariable) { - resolveTypeInMap((TypeVariable) inferrableBound, inferFrom, typeMappings, true); - } - else if (inferrableBound instanceof ParameterizedType) { - ParameterizedType parameterizedUpperBound = - (ParameterizedType) inferrableBound; - inferTypeVariables(parameterizedUpperBound, inferFrom, typeMappings, - true); - } - // TODO: consider checking inferrableBounds instanceof Class - } - - private static void resolveTypeInMap(TypeVariable typeVar, Type newType, - Map, TypeMapping> typeMappings, boolean malleability) - { - if (typeMappings.containsKey(typeVar)) { - typeMappings.get(typeVar).refine(newType, malleability); - } - else { - typeMappings.put(typeVar, suitableTypeMapping(typeVar, newType, - malleability)); - } - } - - private static TypeMapping suitableTypeMapping(TypeVariable typeVar, - Type newType, boolean malleability) - { - if (newType instanceof WildcardType) { - return new WildcardTypeMapping(typeVar, (WildcardType) newType, - malleability); - } - return new TypeMapping(typeVar, newType, malleability); - } - - private static void inferTypeVariables(Class type, Type inferFrom, Map, TypeMapping> typeMappings) { - if( inferFrom instanceof TypeVariable){ - TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings); - // If current type var is absent put it to the map. Otherwise, - // we already encountered that var. - // Hence, we require them to be exactly the same. - if(Types.isAssignable(type, inferFrom, typeVarAssigns)) { - Type current = typeVarAssigns.putIfAbsent((TypeVariable) inferFrom, type); - if (current != null) { - if (current instanceof Any) { - typeVarAssigns.put((TypeVariable) inferFrom, type); - } - else if (!Objects.equal(type, current)) { - throw new TypeInferenceException(); - } - } - } - } - } - - private static void inferTypeVariables(GenericArrayType type, Type inferFrom, - Map, TypeMapping> typeMappings) - { - if (inferFrom instanceof Class && ((Class) inferFrom).isArray()) { - Type componentType = type.getGenericComponentType(); - Type componentInferFrom = ((Class) inferFrom).getComponentType(); - inferTypeVariables(componentType, componentInferFrom, typeMappings); - } - else if (inferFrom instanceof WildcardType) { - Type inferrableBound = getInferrableBound((WildcardType) inferFrom); - inferTypeVariables(type, inferrableBound, typeMappings); - } - else throw new TypeInferenceException(inferFrom + - " cannot be implicitly cast to " + type + - ", thus it is impossible to infer type variables for " + inferFrom); - } - - /** - * Current java language specifications allow either: - *
    - *
  • one {@code Object} upper bound and one lower bound - *
  • one (arbitrary) upper bound and no lower bounds - *
- * We rely on this fact for the purposes of inferring type variables. - * - * @param type - * @return the singular {@link Type} that bounds this - * {@link TypeVariable}. The returned {@code Type} could be - * either a lower or upper bound (we do not care for the - * sole purpose of type inference). - */ - private static Type getInferrableBound(WildcardType type) { - Type[] lBounds = type.getLowerBounds(); - Type[] uBounds = type.getUpperBounds(); - if (lBounds.length == 1 && uBounds.length == 1 && - uBounds[0] == Object.class) return lBounds[0]; - else if (lBounds.length == 0 && uBounds.length == 1) return uBounds[0]; - else throw new IllegalArgumentException( - "Illegal WildcardType: Current Java Language Specification does not allow " + - type + " to simultaneously have upper bounds " + uBounds + - " and lower bounds " + lBounds); - } - - /** - * Finds the type parameters of the most specific super type of the specified - * subType whose erasure is the specified superErasure. Hence, will return the - * type parameters of superErasure possibly narrowed down by subType. If - * superErasure is not raw or not a super type of subType, an empty array will - * be returned. - * - * @param subType - * the type to narrow down type parameters - * @param superErasure - * the erasure of an super type of subType to get the parameters from - * @return type parameters of superErasure possibly narrowed down by subType, or - * empty type array if no exists or superErasure is not a super type of - * subtype - */ - public static Type[] getParams(Class subType, Class superErasure) { - Type pt = Types.parameterizeRaw(subType); - Type superType = Types.getExactSuperType(pt, superErasure); - if (superType != null && superType instanceof ParameterizedType) { - return ((ParameterizedType) superType).getActualTypeArguments(); - } - return new Type[0]; - } - /** * Gets the "useful" class information carries on the given object, which * depends on the actual type of the object. @@ -893,324 +220,4 @@ public static int findCastLevels(final Class dest, final Class origin) { } return -1; } - - /** - * A data structure retaining information about the mapping of a - * {@link TypeVariable} to a {@link Type} within a type-inferring context. - * - * @author Gabriel Selzer - */ - static class TypeMapping { - - protected final TypeVariable typeVar; - protected Type mappedType; - - /** - * A boolean describing whether {@code mappedType} can be mutated in within - * this set of {@link Type}s. The most common scenario in which a - * {@link Type} cannot be mutated is when it is a type parameter of a - * {@link ParameterizedType}. Once {@code malleable} is set to - * {@code false}, {@code mappedType} cannot change, and - * {@link TypeMapping#refine(Type, boolean)} will throw a - * {@link TypeInferenceException} so long as {@code newType} is not the - * exact same {@code Type} as {@mappedType}. - */ - boolean malleable; - - public TypeMapping(TypeVariable typeVar, Type mappedType, - boolean malleable) - { - this.typeVar = typeVar; - this.mappedType = mappedType; - this.malleable = malleable; - } - - /** - * Attempts to accommodate {@code newType} into the current mapping between - * {@code typeVar} and {@code mappedType} given the existing - * malleability of {@code mappedType} and the malleability imposed by - * {@code newType}. If {@code newType} cannot be accommodated, a - * {@link TypeInferenceException} will be thrown. Note that it is not a - * guarantee that either the existing {@code mappedType} or {@code newType} - * will become the new {@link #mappedType} after the method ends; - * {@link #mappedType} could be a supertype of these two {@link Type}s. - * - * @param otherType - the type that will be refined into {@link #mappedType} - * @param newTypeMalleability - the malleability of {@code otherType}, - * determined by the context from which {@code otherType} came. - */ - public void refine(Type otherType, boolean newTypeMalleability) - { - malleable &= newTypeMalleability; - if (mappedType instanceof Any) { - mappedType = otherType; - return; - } - if (otherType instanceof Any) { - return; - } - if (malleable) { - // TODO: consider the correct value of that boolean - Type superType = Types.greatestCommonSuperType(new Type[] { otherType, - mappedType }, false); - if (Types.isAssignable(superType, typeVar)) { - mappedType = superType; - return; - } - throw new TypeInferenceException(typeVar + - " cannot simultaneoustly be mapped to " + otherType + " and " + - mappedType); - } - if (Objects.equal(mappedType, otherType)) return; - throw new TypeInferenceException(typeVar + - " cannot simultaneoustly be mapped to " + otherType + " and " + - mappedType); - } - - /** - * @return the {@link Type} associated with this {@link TypeVariable} - */ - public Type getType() { - return mappedType; - } - - @Override - public int hashCode() { - return Objects.hashCode(typeVar, mappedType, malleable); - } - - @Override - public boolean equals(Object o) { - if (!(o instanceof TypeMapping)) return false; - final TypeMapping that = (TypeMapping) o; - return Objects.equal(typeVar, that.typeVar) && // - Objects.equal(mappedType, that.mappedType) && // - Objects.equal(malleable, that.malleable); - } - - @Override - public String toString() { - return mappedType.toString(); - } - } - - /** - * A data structure retaining information about the mapping of a - * {@link TypeVariable} to a {@link Type} bounded by a {@link WildcardType} - * within a type-inferring context. - * - * @author Gabriel Selzer - */ - static class WildcardTypeMapping extends TypeMapping { - - private List lowerBoundList; - - public WildcardTypeMapping(TypeVariable typeVar, WildcardType mappedType, - boolean malleable) - { - super(typeVar, getUpperBound(mappedType), malleable); - lowerBoundList = new ArrayList<>(); - Type mappedTypeLowerBound = getLowerBound(mappedType); - if (mappedTypeLowerBound != null) { - lowerBoundList.add(mappedTypeLowerBound); - } - } - - /** - * Attempts to accommodate {@code newType} into the current mapping between - * {@code typeVar} and {@code mappedType} given the existing - * malleability of {@code mappedType} and the malleability imposed by - * {@code newType}. If {@code newType} cannot be accommodated, a - * {@link TypeInferenceException} will be thrown. Note that it is not a - * guarantee that either the existing {@code mappedType} or {@code newType} - * will become the new {@link #mappedType} after the method ends; - * {@link #mappedType} could be a supertype of these two {@link Type}s. - * - * @param otherType - the type that will be refined into {@link #mappedType} - * @param newTypeMalleability - the malleability of {@code otherType}, - * determined by the context from which {@code otherType} came. - */ - @Override - public void refine(Type otherType, boolean newTypeMalleability) - { - if (otherType instanceof WildcardType) { - refineWildcard((WildcardType) otherType, newTypeMalleability); - } - else { - super.refine(otherType, newTypeMalleability); - } - for (Type lowerBound : lowerBoundList) { - if (!Types.isAssignable(lowerBound, mappedType)) - throw new TypeInferenceException(typeVar + - " cannot simultaneoustly be mapped to " + otherType + " and " + - mappedType); - } - } - - private void refineWildcard(WildcardType otherType, - boolean newTypeMalleability) - { - Type otherLowerBound = getLowerBound(otherType); - if (otherLowerBound != null) { - lowerBoundList.add(otherLowerBound); - } - Type otherUpperBound = getUpperBound(otherType); - super.refine(otherUpperBound, newTypeMalleability); - } - - /** - * Current Java Language Specifications allow only one upper bound on any - * {@link WildcardType}. This method returns that singular bound, or - * {@code null} if this {@code WildcardType} has no upper bound. - * - * @param newType - the {@link WildcardType} for which we will find the - * upper bound - * @return the upper bound of {@code newType} - */ - private static Type getUpperBound(WildcardType newType) { - Type[] upperBounds = newType.getUpperBounds(); - if (upperBounds.length == 0) { - return Object.class; - } - else if (upperBounds.length == 1) { - return upperBounds[0]; - } - else { - throw new TypeInferenceException(newType + // - " is an impossible WildcardType. " + // - "The Java language specification currently prevents multiple upper bounds " + // - Arrays.toString(upperBounds)); // - } - } - - /** - * Current Java Language Specifications allow only one lower bound on any - * {@link WildcardType}. This method returns that singular bound, or - * {@code null} if this {@code WildcardType} has no lower bound. - * - * @param newType - the {@link WildcardType} for which we will find the - * lower bound - * @return the lower bound of {@code newType} - */ - private static Type getLowerBound(WildcardType newType) { - Type[] lowerBounds = newType.getLowerBounds(); - if (lowerBounds.length == 0) { - return null; - } - else if (lowerBounds.length == 1) { - return lowerBounds[0]; - } - throw new TypeInferenceException(newType + // - " is an impossible WildcardType. " + // - "The Java language specification currently prevents multiple lower bounds " + // - Arrays.toString(lowerBounds)); // - } - } - - /** - * Adapter class wrapping a {@code Map} into a - * {@code Map} for use with {@link Types} API. - */ - private static class TypeVarAssigns implements Map, Type> { - - private Map, TypeMapping> map; - - public TypeVarAssigns(Map, TypeMapping> map) { - this.map = map; - } - - @Override - public boolean containsKey( Object key) { - return map.containsKey(key); - } - - @Override - public Type put(TypeVariable typeVar, Type type) { - final TypeMapping previousMapping = // - map.put(typeVar, suitableTypeMapping(typeVar, type, isMalleable(typeVar))); - return previousMapping == null ? null : previousMapping.getType(); - } - - @Override - public Type putIfAbsent(TypeVariable typeVar, Type type) { - if (!map.containsKey(typeVar)) return put(typeVar, type); - return get(typeVar); - } - - @Override - public Type get(Object key) { - TypeMapping value = map.get(key); - return value == null ? null : value.getType(); - } - - @Override - public int size() { - return map.size(); - } - - @Override - public boolean isEmpty() { - return map.isEmpty(); - } - - @Override - public boolean containsValue(Object value) { - return map.containsValue(value); - } - - @Override - public Type remove(Object key) { - TypeMapping value = map.remove(key); - return value == null ? null : value.getType(); - } - - @Override - public void putAll(Map, ? extends Type> m) { - for (Map.Entry, ? extends Type> e : m.entrySet()) { - put(e.getKey(), e.getValue()); - } - } - - @Override - public void clear() { - map.clear(); - } - - @Override - public Set> keySet() { - return map.keySet(); - } - - @Override - public Collection values() { - return map.values().stream().map(v -> v.getType()).collect(Collectors.toList()); - } - - @Override - public Set, Type>> entrySet() { - return map.entrySet().stream().map(e -> { - return new Map.Entry, Type>() { - - @Override - public TypeVariable getKey() { - return e.getKey(); - } - - @Override - public Type getValue() { - return get(getKey()); - } - - @Override - public Type setValue(Type value) { - return put(getKey(), value); - } - }; - }).collect(Collectors.toSet()); - } - - private boolean isMalleable(TypeVariable typeVar) { - return map.containsKey(typeVar) && map.get(typeVar).malleable; - } - } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java index 42c1cbf00..b9bd9f7f9 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java @@ -29,6 +29,7 @@ import org.scijava.param.ParameterStructs; import org.scijava.types.Nil; import org.scijava.types.Types; +import org.scijava.types.inference.GenericAssignability; import javassist.CannotCompileException; import javassist.ClassPool; @@ -72,12 +73,12 @@ public static ParameterizedType retypeOpType(Type originalOpType, Type[] newArgs // solve input types Type[] genericParameterTypes = paramTypesFromOpType(opType, fMethod); - MatchingUtils.inferTypeVariables(genericParameterTypes, newArgs, typeVarAssigns); + GenericAssignability.inferTypeVariables(genericParameterTypes, newArgs, typeVarAssigns); // solve output type Type genericReturnType = returnTypeFromOpType(opType, fMethod); if (genericReturnType != void.class) { - MatchingUtils.inferTypeVariables(new Type[] {genericReturnType}, new Type[] {newOutType}, typeVarAssigns); + GenericAssignability.inferTypeVariables(new Type[] {genericReturnType}, new Type[] {newOutType}, typeVarAssigns); } // build new (read: simplified) Op type @@ -109,7 +110,7 @@ private static Type[] typesFromOpType(Class opType, Method fMethod, Type... t Type genericDeclaringClass = Types.parameterizeRaw(declaringClass); Type genericClass = Types.parameterizeRaw(opType); Type superGenericClass = Types.getExactSuperType(genericClass, declaringClass); - MatchingUtils.inferTypeVariables(new Type[] {genericDeclaringClass}, new Type[] {superGenericClass}, map); + GenericAssignability.inferTypeVariables(new Type[] {genericDeclaringClass}, new Type[] {superGenericClass}, map); return Types.mapVarToTypes(types, map); } @@ -163,7 +164,7 @@ public static int findMutableArgIndex(Class c) { public static Type resolveMutatorTypeArgs(Type inferFrom, Type mutatorInferFrom, Type unresolvedType) { if(!Types.containsTypeVars(unresolvedType)) return unresolvedType; Map, Type> map = new HashMap<>(); - MatchingUtils.inferTypeVariables(new Type[] {mutatorInferFrom}, new Type[] {inferFrom}, map); + GenericAssignability.inferTypeVariables(new Type[] {mutatorInferFrom}, new Type[] {inferFrom}, map); return Types.mapVarToTypes(unresolvedType, map); } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java index 96b5a8322..77e0a78f2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java @@ -4,7 +4,6 @@ import io.leangen.geantyref.AnnotationFormatException; import io.leangen.geantyref.TypeFactory; -import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Modifier; @@ -30,7 +29,6 @@ import org.scijava.ops.OpDependencyMember; import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; -import org.scijava.ops.matcher.MatchingUtils; import org.scijava.ops.simplify.Simplifier; import org.scijava.ops.util.AnnotationUtils; import org.scijava.struct.ItemIO; @@ -38,6 +36,7 @@ import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; import org.scijava.types.Types; +import org.scijava.types.inference.GenericAssignability; import org.scijava.util.ClassUtils; /** @@ -302,9 +301,9 @@ public static Type getOpMethodType(Class opClass, Method opMethod) // map params of OpMethod to type variables of abstract method of functional // interface (along with return type if applicable) // TODO: not sure how this handles when there are type variables. - MatchingUtils.inferTypeVariables(typeMethodParams, getOpParamTypes(opMethodParams), typeVarAssigns); + GenericAssignability.inferTypeVariables(typeMethodParams, getOpParamTypes(opMethodParams), typeVarAssigns); if (abstractMethod.getReturnType() != void.class) { - MatchingUtils.inferTypeVariables(new Type[] {abstractMethod.getGenericReturnType()}, new Type[] {opMethod.getGenericReturnType()}, typeVarAssigns); + GenericAssignability.inferTypeVariables(new Type[] {abstractMethod.getGenericReturnType()}, new Type[] {opMethod.getGenericReturnType()}, typeVarAssigns); } // parameterize opClass diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java index 84c753df2..b0dda7a94 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java @@ -46,6 +46,7 @@ import org.junit.jupiter.api.Assertions; import org.scijava.types.Nil; import org.scijava.types.Types; +import org.scijava.types.inference.GenericAssignability; public class MatchingUtilsTest { @@ -58,7 +59,7 @@ private void assertAll(Class from, boolean condition, Nil... tos) { private void assertAll(Class from, boolean condition, Type... tos) { for (Type to : tos) { if (to instanceof ParameterizedType) { - assertTrue(MatchingUtils.checkGenericAssignability(from, (ParameterizedType) to, false) == condition); + assertTrue(GenericAssignability.checkGenericAssignability(from, (ParameterizedType) to, false) == condition); } else { assertTrue(Types.isAssignable(from, to, new HashMap, Type>()) == condition); } @@ -508,7 +509,7 @@ public void testSuperWildcardToSuperWildcard() { // unfortunately we cannot use assertAll since it is impossible to create a // Class implementing List - boolean success = MatchingUtils.checkGenericAssignability(listT.getType(), + boolean success = GenericAssignability.checkGenericAssignability(listT.getType(), (ParameterizedType) listWildcard.getType(), false); Assert.assertTrue(success); } @@ -519,22 +520,22 @@ public void testNonReifiableFunction() { final Nil> doubleFunc = new Nil<>() {}; final Nil> integerFunc = new Nil<>() {}; - boolean successDouble = MatchingUtils.checkGenericAssignability(fooFunc + boolean successDouble = GenericAssignability.checkGenericAssignability(fooFunc .getClass(), (ParameterizedType) doubleFunc.getType(), false); Assert.assertTrue(successDouble); - boolean successInteger = MatchingUtils.checkGenericAssignability(fooFunc + boolean successInteger = GenericAssignability.checkGenericAssignability(fooFunc .getClass(), (ParameterizedType) integerFunc.getType(), false); Assert.assertTrue(successInteger); } @Test(expected = NullPointerException.class) public void testIsAssignableNullToNull() { - MatchingUtils.checkGenericAssignability(null, null, false); + GenericAssignability.checkGenericAssignability(null, null, false); } @Test(expected = NullPointerException.class) public void testIsAssignableClassToNull() { - MatchingUtils.checkGenericAssignability(Object.class, null, false); + GenericAssignability.checkGenericAssignability(Object.class, null, false); } @Test @@ -554,9 +555,9 @@ public void testIsAssignableOutputToObject() { final Type fooSource = new Nil>>() {}.getType(); final Type fooFunc = new Nil>() {}.getType(); - Assertions.assertFalse(MatchingUtils.checkGenericAssignability(fooSource, + Assertions.assertFalse(GenericAssignability.checkGenericAssignability(fooSource, (ParameterizedType) fooFunc, false)); - Assertions.assertTrue(MatchingUtils.checkGenericAssignability(fooSource, + Assertions.assertTrue(GenericAssignability.checkGenericAssignability(fooSource, (ParameterizedType) fooFunc, true)); } diff --git a/scijava/scijava-types/src/main/java/module-info.java b/scijava/scijava-types/src/main/java/module-info.java index 0a51f22fc..92fa052b8 100644 --- a/scijava/scijava-types/src/main/java/module-info.java +++ b/scijava/scijava-types/src/main/java/module-info.java @@ -1,6 +1,7 @@ module org.scijava.types { exports org.scijava.types; + exports org.scijava.types.inference; opens org.scijava.types.extractors to org.scijava; opens org.scijava.types to org.scijava; diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java new file mode 100644 index 000000000..33f8fd093 --- /dev/null +++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/GenericAssignability.java @@ -0,0 +1,767 @@ + +package org.scijava.types.inference; + +import com.google.common.base.Objects; + +import java.lang.reflect.GenericArrayType; +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; + +import org.scijava.types.Any; +import org.scijava.types.Nil; +import org.scijava.types.Types; + +public class GenericAssignability { + + /** + * @param src the type for which assignment should be checked from + * @param dest the parameterized type for which assignment should be checked + * to + * @param safeAssignability used to determine if we want to check if the + * src->dest assignment would be safely assignable even though it + * would cause a compiler error if we explicitly tried to do this + * (useful pretty much only for Op matching) + * @return whether and assignment of source to destination would be a legal + * java statement + */ + public static boolean checkGenericAssignability(Type src, + ParameterizedType dest, boolean safeAssignability) + { + return GenericAssignability.checkGenericAssignability(src, dest, null, + safeAssignability); + } + + /** + * Checks whether it would be legal to assign the {@link Type} source to the + * specified {@link ParameterizedType} destination (which could possibly be a + * supertype of the source type). Thereby, possible {@link TypeVariable}s + * contained in the parameters of the source are tried to be inferred in the + * sense of empty angle brackets when a new object is created: + * + * 
+	 * 
+	 * List<Integer> listOfInts = new ArrayList<>();
+	 *
+ * + * Hence, the types to put between the brackets are tried to be determined. + * Inference will be done by simple matching of an encountered + * {@link TypeVariable} in the source to the corresponding type in the + * parameters of the destination. If an {@link TypeVariable} is encountered + * more than once, the corresponding type in the destination needs to + * perfectly match. Else, false will be returned.
+ *
+ * Examples: + *
    + * If we have a class: + *
  • + * + * 
    +	 * class NumberSupplier<M extends Number> implements Supplier<M>
+	 *
    • + *
+ *
    + * The following check will return true: + *
  • + * + * 
    +	 * checkGenericAssignability(NumberSupplier.class, new
+	 * Nil<Supplier<Double>>() {}.getType())
    • + *
+ * + *
    + * Which will check if the following assignment would be legal: + *
  • + * + * 
    +	 * Supplier<Double> list = new NumberSupplier<>()
    • + *
+ * + *
    + * Here, the parameter {@code } can be inferred to be of + * type {@code Double} from the type {@code Supplier} + *
+ *
    + * Consequently the following will return false: + *
  • + * + * 
    +	 * checkGenericAssignability(NumberSupplier.class, new
+	 * Nil<Supplier<String>>() {}.getType())
    • + *
+ *
    + * {@code } can't be inferred, as type {@code String} is not + * within the bounds of {@code M}. + *
+ *
    + * Furthermore, the following will return false for: + * {@code class NumberFunc implements Function}: + *
  • + * + * 
    +	 * checkGenericAssignability(NumberSupplier.class, new
+	 * Nil<Function<Double, Integer>>() {}.getType())
    • + *
+ *
    + * {@code } can't be inferred, as types {@code Double} and + * {@code Integer} are ambiguous for {@code M}. + *
+ * + * @param src the type for which assignment should be checked from + * @param dest the parameterized type for which assignment should be checked + * to + * @param typeVarAssigns the map of {@link TypeVariable}s to {@link Type}s to + * populate with what would occur in this scenario; must be empty or + * null + * @param safeAssignability used to determine if we want to check if the + * src->dest assignment would be safely assignable even though it + * would cause a compiler error if we explicitly tried to do this + * (useful pretty much only for Op matching) + * @return whether and assignment of source to destination would be a legal + * java statement + */ + public static boolean checkGenericAssignability(Type src, + ParameterizedType dest, Map, Type> typeVarAssigns, + boolean safeAssignability) + { + if (typeVarAssigns == null) { + typeVarAssigns = new HashMap<>(); + } + else if (!typeVarAssigns.isEmpty()) { + throw new IllegalArgumentException( + "Expected empty typeVarAssigns but contained " + typeVarAssigns.size() + + " entries"); + } + + // fail fast when raw types are not assignable + if (!Types.isAssignable(Types.raw(src), Types.raw(dest))) return false; + + // when raw types are assignable, check the type variables of src and dest + Type[] srcTypes = typeParamsAgainstClass(src, Types.raw(dest)); + Type[] destTypes = dest.getActualTypeArguments(); + + // if there are no type parameters in src (w.r.t. dest), do a basic + // assignability check. + if (srcTypes.length == 0) return Types.isAssignable(src, dest); + // if there are type parameters, do a more complicated assignability check. + boolean result = checkGenericAssignability(srcTypes, destTypes, src, dest, + typeVarAssigns, safeAssignability); + return result; + } + + /** + * Finds the levels of casting between origin and + * dest. Returns 0 if dest and origin are the same. Returns -1 if + * dest is not assignable from origin. + */ + public static int findCastLevels(final Class dest, final Class origin) { + if (dest.equals(origin)) return 0; + + int level = 1; + Class currType = origin; + // BFS if dest is an interface + if (dest.isInterface()) { + final HashSet seen = new HashSet<>(); + final ArrayList currIfaces = new ArrayList<>(Arrays.asList(currType + .getGenericInterfaces())); + do { + final ArrayList nextIfaces = new ArrayList<>(); + for (final Type iface : currIfaces) { + if (seen.contains(iface.getTypeName())) continue; + + final Class cls = getClass(iface); + if (cls.equals(dest)) return level; + seen.add(iface.getTypeName()); + nextIfaces.addAll(Arrays.asList(cls.getGenericInterfaces())); + } + currIfaces.clear(); + currIfaces.addAll(nextIfaces); + if (currType.getSuperclass() != null) { + currType = currType.getSuperclass(); + currIfaces.addAll(Arrays.asList(currType.getGenericInterfaces())); + } + level++; + } + while (!currIfaces.isEmpty() || currType.getSuperclass() != null); + } + // otherwise dest is a class, so search the list of ancestors + else { + while (currType.getSuperclass() != null) { + currType = currType.getSuperclass(); + if (currType.equals(dest)) return level; + level++; + } + } + return -1; + } + + /** + * Gets the "useful" class information carries on the given object, which + * depends on the actual type of the object. + */ + public static Class getClass(final Object obj) { + if (obj == null) return null; + if (obj instanceof Nil) return getClass(((Nil) obj).getType()); + if (obj instanceof Class) return (Class) obj; + if (obj instanceof ParameterizedType) + return (Class) ((ParameterizedType) obj).getRawType(); + return obj.getClass(); + } + + /** + * Finds the type parameters of the most specific super type of the specified + * subType whose erasure is the specified superErasure. Hence, will return the + * type parameters of superErasure possibly narrowed down by subType. If + * superErasure is not raw or not a super type of subType, an empty array will + * be returned. + * + * @param subType the type to narrow down type parameters + * @param superErasure the erasure of an super type of subType to get the + * parameters from + * @return type parameters of superErasure possibly narrowed down by subType, + * or empty type array if no exists or superErasure is not a super + * type of subtype + */ + public static Type[] getParams(Class subType, Class superErasure) { + Type pt = Types.parameterizeRaw(subType); + Type superType = Types.getExactSuperType(pt, superErasure); + if (superType != null && superType instanceof ParameterizedType) { + return ((ParameterizedType) superType).getActualTypeArguments(); + } + return new Type[0]; + } + + /** + * Tries to infer type vars contained in types from corresponding types from + * inferFrom, putting them into the specified map. When a + * {@link TypeInferenceException} is thrown, the caller should assume that + * some of the mappings within {@code typeMappings} are incorrect. + * + * @param types - the types containing {@link TypeVariable}s + * @param inferFroms - the types used to infer the {@link TypeVariable}s + * within {@code types} + * @param typeVarAssigns - the mapping of {@link TypeVariable}s to + * {@link Type}s + */ + public static void inferTypeVariables(Type[] types, Type[] inferFroms, + Map, Type> typeVarAssigns) + { + Map, TypeMapping> typeMappings = new HashMap<>(); + try { + inferTypeVariables(types, inferFroms, typeMappings, true); + typeVarAssigns.putAll(new TypeVarAssigns(typeMappings)); + } + catch (TypeInferenceException e) { + throw new IllegalArgumentException(e); + } + } + + /** + * We know that the special types for the Op candidate and what we asked for + * are the same (i.e. that we are trying to determine if one Function can be + * assigned to another Function). There are some situations (that are + * particularly common when using ops.run()) where the Function SHOULD NOT + * NORMALLY MATCH UP but WE KNOW IT WILL BE SAFE TO ASSIGN. This method + * attempts to tease those situations out as a last resort. + * + * @param destTypes - the array of Parameterized types of the OpInfo we called + * the matcher on (in the case of ops.run(), it is a Type array of + * the types of the args we passed through.) + * @param typeVarAssigns - a Map of all of the Type Variables already + * determined. + * @param dest - the speical type of the Op that we want to find a match for + * (determined by the user / ops.run()) + * @return boolean - true if we can safely match this Op even though the types + * do not directly match up. False otherwise. + */ + public static boolean isSafeAssignable(Type[] destTypes, + Map, Type> typeVarAssigns, Type src, Type dest) + { + + Method[] destMethods = Arrays.stream(Types.raw(dest).getDeclaredMethods()) + .filter(method -> Modifier.isAbstract(method.getModifiers())).toArray( + Method[]::new); + if (destMethods.length == 0) { + throw new IllegalArgumentException(src + + " does not have an abstract method!"); + } + Type[] params = Types.getExactParameterTypes(destMethods[0], src); + Type returnType = Types.getExactReturnType(destMethods[0], src); + for (int i = 0; i < params.length; i++) { + if (!Types.isAssignable(destTypes[i], params[i], typeVarAssigns)) + return false; + } + + // Computers will have void as their return type, meaning that there is no + // output to check. + if (returnType == void.class) return true; + + return Types.isAssignable(returnType, destTypes[destTypes.length - 1], + typeVarAssigns); + } + + /** + * Map type vars in specified type list to types using the specified map. In + * doing so, type vars mapping to other type vars will not be followed but + * just replaced. + * + * @param typesToMap + * @param typeAssigns + * @return a copy of {@code typesToMap} in which the {@link TypeVariable}s + * (that are present in {@code typeAssigns}) are mapped to the + * associated values within the {@code Map}. + */ + public static Type[] mapVarToTypes(Type[] typesToMap, + Map, Type> typeAssigns) + { + return Arrays.stream(typesToMap).map(type -> Types.unrollVariables( + typeAssigns, type, false)).toArray(Type[]::new); + } + + /** + * Obtains the type parameters of {@link Type} {@code src} with respect + * to the {@link Class} {@code dest}. When {@code src} has no type + * parameters (or is not a subclass of {@code dest}), an empty array is + * returned. + * + * @param src - the {@code Type} whose type parameters will be returned. + * @param superclass - the {@code Class} against which we want the type + * parameters of {@code src} + * @return an array of {@code Type}s denoting the type + */ + public static Type[] typeParamsAgainstClass(Type src, Class superclass) { + // only classes and ParameterizedTypes can have type parameters + if (!(src instanceof Class || src instanceof ParameterizedType)) + return new Type[0]; + Type superSrc = superType(src, superclass); + if (superSrc == null) return new Type[0]; + if (superSrc instanceof ParameterizedType) + return ((ParameterizedType) superSrc).getActualTypeArguments(); + return getParams(Types.raw(src), superclass); + } + + /** + * @param srcTypes the Type arguments for the source Type + * @param destTypes the Type arguments for the destination Type + * @param src the type for which assignment should be checked from + * @param dest the parameterized type for which assignment should be checked + * to + * @param typeVarAssigns the map of {@link TypeVariable}s to + * {@link TypeMapping}s that would occur in this scenario + * @param safeAssignability used to determine if we want to check if the + * src->dest assignment would be safely assignable even though it + * would cause a compiler error if we explicitly tried to do this + * (useful pretty much only for Op matching) + * @return whether and assignment of source to destination would be a legal + * java statement + */ + private static boolean checkGenericAssignability(Type[] srcTypes, + Type[] destTypes, Type src, Type dest, + Map, Type> typeVarAssigns, boolean safeAssignability) + { + // if the number of type arguments does not match, the types can't be + // assignable + if (srcTypes.length != destTypes.length) { + return false; + } + + try { + // Try to infer type variables contained in the type arguments of + // sry + inferTypeVariables(srcTypes, destTypes, typeVarAssigns); + } + catch (IllegalArgumentException e) { + // types can't be inferred + // TODO: Consider the situations in which it is okay that the type + // variables cannot be inferred. For example, if we have a + // Function, Comparable> and we ask for a + // Function, it is okay that we cannot infer the T of + // Comparable from Object since a Comparable is an Object for any T. + // It would be nice if we could just return false any time we catch a + // TypeInferenceException, but until we sort this out, we cannot do so. + return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns, + src, dest); + } + + // Map TypeVariables in src to Types + Class matchingRawType = Types.raw(dest); + Type[] mappedSrcTypes = mapVarToTypes(srcTypes, typeVarAssigns); + Type inferredSrcType = Types.parameterize(matchingRawType, mappedSrcTypes); + + // Check assignability + if (Types.isAssignable(inferredSrcType, dest, typeVarAssigns)) return true; + + return safeAssignability && isSafeAssignable(destTypes, typeVarAssigns, src, + dest); + } + + /** + * Current java language specifications allow either: + *
    + *
  • one {@code Object} upper bound and one lower bound + *
  • one (arbitrary) upper bound and no lower bounds + *
+ * We rely on this fact for the purposes of inferring type variables. + * + * @param type + * @return the singular {@link Type} that bounds this + * {@link TypeVariable}. The returned {@code Type} could be + * either a lower or upper bound (we do not care for the + * sole purpose of type inference). + */ + private static Type getInferrableBound(WildcardType type) { + Type[] lBounds = type.getLowerBounds(); + Type[] uBounds = type.getUpperBounds(); + if (lBounds.length == 1 && uBounds.length == 1 && + uBounds[0] == Object.class) return lBounds[0]; + else if (lBounds.length == 0 && uBounds.length == 1) return uBounds[0]; + else throw new IllegalArgumentException( + "Illegal WildcardType: Current Java Language Specification does not allow " + + type + " to simultaneously have upper bounds " + uBounds + + " and lower bounds " + lBounds); + } + + private static void inferTypeVariables(Class type, Type inferFrom, + Map, TypeMapping> typeMappings) + { + if (inferFrom instanceof TypeVariable) { + TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings); + // If current type var is absent put it to the map. Otherwise, + // we already encountered that var. + // Hence, we require them to be exactly the same. + if (Types.isAssignable(type, inferFrom, typeVarAssigns)) { + Type current = typeVarAssigns.putIfAbsent((TypeVariable) inferFrom, + type); + if (current != null) { + if (current instanceof Any) { + typeVarAssigns.put((TypeVariable) inferFrom, type); + } + else if (!Objects.equal(type, current)) { + throw new TypeInferenceException(); + } + } + } + } + } + + private static void inferTypeVariables(GenericArrayType type, Type inferFrom, + Map, TypeMapping> typeMappings) + { + if (inferFrom instanceof Class && ((Class) inferFrom).isArray()) { + Type componentType = type.getGenericComponentType(); + Type componentInferFrom = ((Class) inferFrom).getComponentType(); + inferTypeVariables(componentType, componentInferFrom, typeMappings); + } + else if (inferFrom instanceof WildcardType) { + Type inferrableBound = getInferrableBound((WildcardType) inferFrom); + inferTypeVariables(type, inferrableBound, typeMappings); + } + else throw new TypeInferenceException(inferFrom + + " cannot be implicitly cast to " + type + + ", thus it is impossible to infer type variables for " + inferFrom); + } + + private static void inferTypeVariables(ParameterizedType type, Type inferFrom, + Map, TypeMapping> typeMappings) + { + if (inferFrom instanceof WildcardType) { + inferFrom = getInferrableBound((WildcardType) inferFrom); + } + if (inferFrom instanceof Any) { + Any any = (Any) inferFrom; + mapTypeVarsToAny(type, any, typeMappings); + return; + } + // Finding the supertype here is really important. Suppose that we are + // inferring from a StrangeThing extends Thing and our + // Op requires a Thing. We need to ensure that T gets + // resolved to a Double and NOT a Long. + Type superInferFrom = Types.getExactSuperType(inferFrom, Types.raw(type)); + if (superInferFrom instanceof ParameterizedType) { + ParameterizedType paramInferFrom = (ParameterizedType) superInferFrom; + inferTypeVariables(type.getActualTypeArguments(), paramInferFrom + .getActualTypeArguments(), typeMappings, false); + } + else if (superInferFrom instanceof Class) { + TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings); + Type mappedType = Types.mapVarToTypes(type, typeVarAssigns); + // Use isAssignable to attempt to infer the type variables present in type + if (!Types.isAssignable(superInferFrom, mappedType, typeVarAssigns)) { + throw new TypeInferenceException(inferFrom + + " cannot be implicitly cast to " + mappedType + + ", thus it is impossible to infer type variables for " + inferFrom); + } + // for all remaining unmapped type vars, map to Any + mapTypeVarsToAny(type, typeMappings); + } + // -- edge cases -> do our best -- // + else if (superInferFrom == null) { + // edge case 1: if inferFrom is an Object, superInferFrom will be null + // when type is some interface. + if (Object.class.equals(inferFrom)) { + mapTypeVarsToAny(type, typeMappings); + return; + } + // edge case 2: if inferFrom is a superType of type, we can get (some of) + // the types of type by finding the exact superType of type w.r.t. + // inferFrom. + Type superTypeOfType = Types.getExactSuperType(type, Types.raw( + inferFrom)); + if (superTypeOfType == null) { + throw new TypeInferenceException(inferFrom + + " cannot be implicitly cast to " + type + + ", thus it is impossible to infer type variables for " + inferFrom); + } + inferTypeVariables(superTypeOfType, inferFrom, typeMappings, false); + mapTypeVarsToAny(type, typeMappings); + } + // TODO: elaborate + else throw new IllegalStateException(superInferFrom + + " is the supertype of " + inferFrom + " with respect to " + type + + ", however this cannot be (since " + type + + " is a ParamterizedType)! (Only a ParameterizedType, Class, or null " + + "can be returned from Types.getExactSuperType when it is called with a ParameterizedType!)"); + } + + private static void inferTypeVariables(Type type, Type inferFrom, + Map, TypeMapping> typeMappings, boolean malleable) + { + if (type instanceof TypeVariable) { + inferTypeVariables((TypeVariable) type, inferFrom, typeMappings, + malleable); + } + else if (type instanceof ParameterizedType) { + inferTypeVariables((ParameterizedType) type, inferFrom, typeMappings); + } + else if (type instanceof WildcardType) { + inferTypeVariables((WildcardType) type, inferFrom, typeMappings); + } + else if (type instanceof GenericArrayType) { + inferTypeVariables((GenericArrayType) type, inferFrom, typeMappings); + } + else if (type instanceof Class) { + inferTypeVariables((Class) type, inferFrom, typeMappings); + } + + } + + private static void inferTypeVariables(Type[] types, Type[] inferFroms, + Map, TypeMapping> typeMappings, boolean malleable) + { + // Ensure that the user has not passed a null map + if (typeMappings == null) throw new IllegalArgumentException( + "Type Variable map is null, cannot store mappings of TypeVariables to Types!"); + + if (types.length != inferFroms.length) throw new TypeInferenceException( + "Could not infer type variables: Type arrays must be of the same size"); + + for (int i = 0; i < types.length; i++) { + inferTypeVariables(types[i], inferFroms[i], typeMappings, malleable); + } + // Check if the inferred types satisfy their bounds + // TODO: can we do this in an efficient manner? + TypeVarAssigns typeVarAssigns = new TypeVarAssigns(typeMappings); + if (!Types.typesSatisfyVariables(typeVarAssigns)) { + throw new TypeInferenceException(); + } + } + + private static void inferTypeVariables(TypeVariable type, Type inferFrom, + Map, TypeMapping> typeMappings, boolean malleable) + { + TypeMapping typeData = typeMappings.get(type); + // If current is not null then we have already encountered that + // variable. If so, we require them to be exactly the same, and throw a + // TypeInferenceException if they are not. + if (typeData != null) { + typeData.refine(inferFrom, malleable); + } + else { + resolveTypeInMap(type, inferFrom, typeMappings, malleable); + // Bounds could also contain type vars, hence possibly go into + // recursion + for (Type bound : type.getBounds()) { + if (bound instanceof TypeVariable && typeMappings.get(bound) != null) { + // If the bound of the current var (let's call it A) to + // infer is also a var (let's call it B): + // If we already encountered B, we check if the current + // type to infer from is assignable to + // the already inferred type for B. In this case we do + // not require equality as one var is + // bounded by another and it is not the same. E.g. + // assume we want to infer the types of vars: + // - - - A extends Number, B extends A + // From types: + // - - - Number, Double + // First A is bound to Number, next B to Double. Then we + // check the bounds for B. We encounter A, + // for which we already inferred Number. Hence, it + // suffices to check whether Double can be assigned + // to Number, it does not have to be equal as it is just + // a transitive bound for B. + Type typeAssignForBound = typeMappings.get(bound).getType(); + if (!Types.isAssignable(inferFrom, typeAssignForBound)) { + throw new TypeInferenceException(); + } + } + else { + // Else go into recursion as we encountered a new var. + inferTypeVariables(bound, inferFrom, typeMappings); + } + } + + } + } + + private static void inferTypeVariables(WildcardType type, Type inferFrom, + Map, TypeMapping> typeMappings) + { + Type inferrableBound = getInferrableBound(type); + if (inferFrom instanceof WildcardType) { + // NB if both type and inferFrom are Wildcards, it doesn't really matter + // (for the purpose of Type inference) whether those Wildcards have a + // defined upper or lower bound. It is only important that we compare + // those defined bounds, even if one is an upper bound and the other is a + // lower bound. If the Wildcards are not assignable (which is (always?) + // the case when one bound is an upper bound and the other is a lower + // bound), it is still possible to infer the type variables; despite doing + // so, checkGenericAssignability will return false. + inferFrom = getInferrableBound((WildcardType) inferFrom); + } + if (inferrableBound instanceof TypeVariable) { + resolveTypeInMap((TypeVariable) inferrableBound, inferFrom, + typeMappings, true); + } + else if (inferrableBound instanceof ParameterizedType) { + ParameterizedType parameterizedUpperBound = + (ParameterizedType) inferrableBound; + inferTypeVariables(parameterizedUpperBound, inferFrom, typeMappings, + true); + } + // TODO: consider checking inferrableBounds instanceof Class + } + + private static void mapTypeVarsToAny(Type type, Any any, + Map, TypeMapping> typeMappings) + { + if (!Types.containsTypeVars(type)) return; + + if (type instanceof TypeVariable) { + if (typeMappings.containsKey(type)) return; + TypeVariable typeVar = (TypeVariable) type; + typeMappings.put(typeVar, suitableTypeMapping(typeVar, any, true)); + } + else if (type instanceof ParameterizedType) { + ParameterizedType pType = (ParameterizedType) type; + Type[] typeParams = pType.getActualTypeArguments(); + for (Type typeParam : typeParams) { + mapTypeVarsToAny(typeParam, typeMappings); + } + } + else if (type instanceof WildcardType) { + WildcardType wildcard = (WildcardType) type; + for (Type lowerBound : wildcard.getLowerBounds()) + mapTypeVarsToAny(lowerBound, typeMappings); + for (Type upperBound : wildcard.getUpperBounds()) + mapTypeVarsToAny(upperBound, typeMappings); + } + else if (type instanceof Class) { + Class clazz = (Class) type; + for (Type typeParam : clazz.getTypeParameters()) + mapTypeVarsToAny(typeParam, typeMappings); + } + } + + private static void mapTypeVarsToAny(Type type, + Map, TypeMapping> typeMappings) + { + mapTypeVarsToAny(type, new Any(), typeMappings); + } + + private static void resolveTypeInMap(TypeVariable typeVar, Type newType, + Map, TypeMapping> typeMappings, boolean malleability) + { + if (typeMappings.containsKey(typeVar)) { + typeMappings.get(typeVar).refine(newType, malleability); + } + else { + typeMappings.put(typeVar, suitableTypeMapping(typeVar, newType, + malleability)); + } + } + + private static TypeMapping suitableTypeMapping(TypeVariable typeVar, + Type newType, boolean malleability) + { + if (newType instanceof WildcardType) { + return new WildcardTypeMapping(typeVar, (WildcardType) newType, + malleability); + } + return new TypeMapping(typeVar, newType, malleability); + } + + /** + * This method is designed to handle edge cases when calling + * {@link Types#getExactSuperType(Type, Class)}. When + * {@code getExactSuperType} returns an error, this usually implies some funny + * business going on with the {@link Type} that was passed to it. We are not + * interested in supporting this business, since it usually results from poor + * practice in Class construction. TODO: determine some way of conveying to + * the user that GenTyRef doesn't like their inputs. + * + * @param src + * @param superClass + * @return - the supertype of {@code src} with rawtype {@code superClass}, or + * {@code null} if no such supertype exists. + */ + private static Type superType(Type src, Class superClass) { + try { + return Types.getExactSuperType(src, superClass); + } + catch (AssertionError e) { + // can be thrown when + return null; + } + } + + /** + * Tries to infer type vars contained in types from corresponding types from + * inferFrom, putting them into the specified map. When a + * {@link TypeInferenceException} is thrown, the caller should assume that + * some of the mappings within {@code typeMappings} are incorrect. + * + * @param type + * @param inferFrom + * @param typeMappings + */ + static void inferTypeVariables(Type type, Type inferFrom, + Map, TypeMapping> typeMappings) + { + inferTypeVariables(type, inferFrom, typeMappings, true); + } + + /** + * Tries to infer type vars contained in types from corresponding types from + * inferFrom, putting them into the specified map. When a + * {@link TypeInferenceException} is thrown, the caller should assume that + * some of the mappings within {@code typeMappings} are incorrect. + * + * @param type + * @param inferFrom + * @param typeMappings + */ + static void inferTypeVariablesWithTypeMappings(Type type[], Type[] inferFrom, + Map, TypeMapping> typeMappings) + { + inferTypeVariables(type, inferFrom, typeMappings, true); + } + +} diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java new file mode 100644 index 000000000..a9c9fe7f9 --- /dev/null +++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeInferenceException.java @@ -0,0 +1,19 @@ +package org.scijava.types.inference; + +/** + * Exception indicating that type vars could not be inferred. + */ +public class TypeInferenceException extends RuntimeException { + /** + * + */ + private static final long serialVersionUID = 7147530827546663700L; + + public TypeInferenceException() { + super(); + } + + public TypeInferenceException(String message) { + super(message); + } +} diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java new file mode 100644 index 000000000..7daf310bc --- /dev/null +++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeMapping.java @@ -0,0 +1,110 @@ +package org.scijava.types.inference; + +import com.google.common.base.Objects; + +import java.lang.reflect.ParameterizedType; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; + +import org.scijava.types.Any; +import org.scijava.types.Types; + +/** + * A data structure retaining information about the mapping of a + * {@link TypeVariable} to a {@link Type} within a type-inferring context. + * + * @author Gabriel Selzer + */ +public class TypeMapping { + + protected final TypeVariable typeVar; + protected Type mappedType; + + /** + * A boolean describing whether {@code mappedType} can be mutated in within + * this set of {@link Type}s. The most common scenario in which a + * {@link Type} cannot be mutated is when it is a type parameter of a + * {@link ParameterizedType}. Once {@code malleable} is set to + * {@code false}, {@code mappedType} cannot change, and + * {@link TypeMapping#refine(Type, boolean)} will throw a + * {@link TypeInferenceException} so long as {@code newType} is not the + * exact same {@code Type} as {@mappedType}. + */ + boolean malleable; + + public TypeMapping(TypeVariable typeVar, Type mappedType, + boolean malleable) + { + this.typeVar = typeVar; + this.mappedType = mappedType; + this.malleable = malleable; + } + + /** + * Attempts to accommodate {@code newType} into the current mapping between + * {@code typeVar} and {@code mappedType} given the existing + * malleability of {@code mappedType} and the malleability imposed by + * {@code newType}. If {@code newType} cannot be accommodated, a + * {@link TypeInferenceException} will be thrown. Note that it is not a + * guarantee that either the existing {@code mappedType} or {@code newType} + * will become the new {@link #mappedType} after the method ends; + * {@link #mappedType} could be a supertype of these two {@link Type}s. + * + * @param otherType - the type that will be refined into {@link #mappedType} + * @param newTypeMalleability - the malleability of {@code otherType}, + * determined by the context from which {@code otherType} came. + */ + public void refine(Type otherType, boolean newTypeMalleability) + { + malleable &= newTypeMalleability; + if (mappedType instanceof Any) { + mappedType = otherType; + return; + } + if (otherType instanceof Any) { + return; + } + if (malleable) { + // TODO: consider the correct value of that boolean + Type superType = Types.greatestCommonSuperType(new Type[] { otherType, + mappedType }, false); + if (Types.isAssignable(superType, typeVar)) { + mappedType = superType; + return; + } + throw new TypeInferenceException(typeVar + + " cannot simultaneoustly be mapped to " + otherType + " and " + + mappedType); + } + if (Objects.equal(mappedType, otherType)) return; + throw new TypeInferenceException(typeVar + + " cannot simultaneoustly be mapped to " + otherType + " and " + + mappedType); + } + + /** + * @return the {@link Type} associated with this {@link TypeVariable} + */ + public Type getType() { + return mappedType; + } + + @Override + public int hashCode() { + return Objects.hashCode(typeVar, mappedType, malleable); + } + + @Override + public boolean equals(Object o) { + if (!(o instanceof TypeMapping)) return false; + final TypeMapping that = (TypeMapping) o; + return Objects.equal(typeVar, that.typeVar) && // + Objects.equal(mappedType, that.mappedType) && // + Objects.equal(malleable, that.malleable); + } + + @Override + public String toString() { + return mappedType.toString(); + } +} diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java new file mode 100644 index 000000000..5ee45ba7e --- /dev/null +++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/TypeVarAssigns.java @@ -0,0 +1,134 @@ + +package org.scijava.types.inference; + +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.Collection; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; + +import org.scijava.types.Types; + +/** + * Adapter class wrapping a {@code Map} into a + * {@code Map} for use with {@link Types} API. + */ +public class TypeVarAssigns implements Map, Type> { + + private static TypeMapping suitableTypeMapping(TypeVariable typeVar, + Type newType, boolean malleability) + { + if (newType instanceof WildcardType) { + return new WildcardTypeMapping(typeVar, (WildcardType) newType, + malleability); + } + return new TypeMapping(typeVar, newType, malleability); + } + + private Map, TypeMapping> map; + + public TypeVarAssigns(Map, TypeMapping> map) { + this.map = map; + } + + @Override + public void clear() { + map.clear(); + } + + @Override + public boolean containsKey(Object key) { + return map.containsKey(key); + } + + @Override + public boolean containsValue(Object value) { + return map.containsValue(value); + } + + @Override + public Set, Type>> entrySet() { + return map.entrySet().stream().map(e -> { + return new Map.Entry, Type>() { + + @Override + public TypeVariable getKey() { + return e.getKey(); + } + + @Override + public Type getValue() { + return get(getKey()); + } + + @Override + public Type setValue(Type value) { + return put(getKey(), value); + } + }; + }).collect(Collectors.toSet()); + } + + @Override + public Type get(Object key) { + TypeMapping value = map.get(key); + return value == null ? null : value.getType(); + } + + @Override + public boolean isEmpty() { + return map.isEmpty(); + } + + @Override + public Set> keySet() { + return map.keySet(); + } + + @Override + public Type put(TypeVariable typeVar, Type type) { + final TypeMapping previousMapping = // + map.put(typeVar, suitableTypeMapping(typeVar, type, isMalleable( + typeVar))); + return previousMapping == null ? null : previousMapping.getType(); + } + + @Override + public void putAll(Map, ? extends Type> m) { + for (Map.Entry, ? extends Type> e : m + .entrySet()) + { + put(e.getKey(), e.getValue()); + } + } + + @Override + public Type putIfAbsent(TypeVariable typeVar, Type type) { + if (!map.containsKey(typeVar)) return put(typeVar, type); + return get(typeVar); + } + + @Override + public Type remove(Object key) { + TypeMapping value = map.remove(key); + return value == null ? null : value.getType(); + } + + @Override + public int size() { + return map.size(); + } + + @Override + public Collection values() { + return map.values().stream().map(v -> v.getType()).collect(Collectors + .toList()); + } + + private boolean isMalleable(TypeVariable typeVar) { + return map.containsKey(typeVar) && map.get(typeVar).malleable; + } + +} diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java new file mode 100644 index 000000000..be01f3869 --- /dev/null +++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/WildcardTypeMapping.java @@ -0,0 +1,123 @@ + +package org.scijava.types.inference; + +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.scijava.types.Types; + +/** + * A data structure retaining information about the mapping of a + * {@link TypeVariable} to a {@link Type} bounded by a {@link WildcardType} + * within a type-inferring context. + * + * @author Gabriel Selzer + */ +public class WildcardTypeMapping extends TypeMapping { + + /** + * Current Java Language Specifications allow only one lower bound on any + * {@link WildcardType}. This method returns that singular bound, or + * {@code null} if this {@code WildcardType} has no lower bound. + * + * @param newType - the {@link WildcardType} for which we will find the lower + * bound + * @return the lower bound of {@code newType} + */ + private static Type getLowerBound(WildcardType newType) { + Type[] lowerBounds = newType.getLowerBounds(); + if (lowerBounds.length == 0) { + return null; + } + else if (lowerBounds.length == 1) { + return lowerBounds[0]; + } + throw new TypeInferenceException(newType + // + " is an impossible WildcardType. " + // + "The Java language specification currently prevents multiple lower bounds " + // + Arrays.toString(lowerBounds)); // + } + + /** + * Current Java Language Specifications allow only one upper bound on any + * {@link WildcardType}. This method returns that singular bound, or + * {@code null} if this {@code WildcardType} has no upper bound. + * + * @param newType - the {@link WildcardType} for which we will find the upper + * bound + * @return the upper bound of {@code newType} + */ + private static Type getUpperBound(WildcardType newType) { + Type[] upperBounds = newType.getUpperBounds(); + if (upperBounds.length == 0) { + return Object.class; + } + else if (upperBounds.length == 1) { + return upperBounds[0]; + } + else { + throw new TypeInferenceException(newType + // + " is an impossible WildcardType. " + // + "The Java language specification currently prevents multiple upper bounds " + // + Arrays.toString(upperBounds)); // + } + } + + private List lowerBoundList; + + public WildcardTypeMapping(TypeVariable typeVar, WildcardType mappedType, + boolean malleable) + { + super(typeVar, getUpperBound(mappedType), malleable); + lowerBoundList = new ArrayList<>(); + Type mappedTypeLowerBound = getLowerBound(mappedType); + if (mappedTypeLowerBound != null) { + lowerBoundList.add(mappedTypeLowerBound); + } + } + + /** + * Attempts to accommodate {@code newType} into the current mapping between + * {@code typeVar} and {@code mappedType} given the existing + * malleability of {@code mappedType} and the malleability imposed by + * {@code newType}. If {@code newType} cannot be accommodated, a + * {@link TypeInferenceException} will be thrown. Note that it is not a + * guarantee that either the existing {@code mappedType} or {@code newType} + * will become the new {@link #mappedType} after the method ends; + * {@link #mappedType} could be a supertype of these two {@link Type}s. + * + * @param otherType - the type that will be refined into {@link #mappedType} + * @param newTypeMalleability - the malleability of {@code otherType}, + * determined by the context from which {@code otherType} came. + */ + @Override + public void refine(Type otherType, boolean newTypeMalleability) { + if (otherType instanceof WildcardType) { + refineWildcard((WildcardType) otherType, newTypeMalleability); + } + else { + super.refine(otherType, newTypeMalleability); + } + for (Type lowerBound : lowerBoundList) { + if (!Types.isAssignable(lowerBound, mappedType)) + throw new TypeInferenceException(typeVar + + " cannot simultaneoustly be mapped to " + otherType + " and " + + mappedType); + } + } + + private void refineWildcard(WildcardType otherType, + boolean newTypeMalleability) + { + Type otherLowerBound = getLowerBound(otherType); + if (otherLowerBound != null) { + lowerBoundList.add(otherLowerBound); + } + Type otherUpperBound = getUpperBound(otherType); + super.refine(otherUpperBound, newTypeMalleability); + } +} diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/InferTypeVariablesTest.java b/scijava/scijava-types/src/test/java/org/scijava/types/inference/InferTypeVariablesTest.java similarity index 64% rename from scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/InferTypeVariablesTest.java rename to scijava/scijava-types/src/test/java/org/scijava/types/inference/InferTypeVariablesTest.java index 5a5d7c0e4..7a2b953e0 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/InferTypeVariablesTest.java +++ b/scijava/scijava-types/src/test/java/org/scijava/types/inference/InferTypeVariablesTest.java @@ -1,5 +1,5 @@ -package org.scijava.ops.matcher; +package org.scijava.types.inference; import static org.junit.Assert.assertEquals; @@ -14,107 +14,39 @@ import java.util.function.Function; import org.junit.Test; -import org.scijava.ops.matcher.MatchingUtils.TypeInferenceException; -import org.scijava.ops.matcher.MatchingUtils.TypeMapping; -import org.scijava.ops.matcher.MatchingUtilsTest.StrangeThing; -import org.scijava.ops.matcher.MatchingUtilsTest.Thing; import org.scijava.types.Any; import org.scijava.types.Nil; public class InferTypeVariablesTest { - @Test - public void testSupertypeTypeInference() - throws TypeInferenceException - { - final Type t = new Nil, List>>() {}.getType(); - final Type[] tArgs = ((ParameterizedType) t).getActualTypeArguments(); - final Type dest = - new Nil, List>>() - {}.getType(); - final Type[] destArgs = ((ParameterizedType) dest).getActualTypeArguments(); - - final Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariablesWithTypeMappings(tArgs, destArgs, typeAssigns); - - // We expect I=String, O=Double - final Map, MatchingUtils.TypeMapping> expected = - new HashMap<>(); - TypeVariable typeVarI = (TypeVariable) ((ParameterizedType) tArgs[0]) - .getActualTypeArguments()[0]; - expected.put(typeVarI, new TypeMapping(typeVarI, String.class, false)); - TypeVariable typeVarO = (TypeVariable) ((ParameterizedType) tArgs[1]) - .getActualTypeArguments()[0]; - expected.put(typeVarO, new TypeMapping(typeVarO, Double.class, false)); + class Bar {} - assertEquals(typeAssigns, expected); - } + static class FooThing extends RecursiveThing {} - @Test - public void testWildcardTypeInference() throws TypeInferenceException { - final Type t = new Nil() {}.getType(); - final Type listWild = new Nil>() {}.getType(); - final Type integer = new Nil() {}.getType(); - final Type listDouble = new Nil>() {}.getType(); - - final Type[] types = { listWild, t }; - final Type[] inferFroms = { listDouble, integer }; + static abstract class RecursiveThing> {} - final Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariablesWithTypeMappings(types, inferFroms, typeAssigns); + class StrangeThing extends Thing {} - // We expect T=Number - final Map, MatchingUtils.TypeMapping> expected = - new HashMap<>(); - TypeVariable typeVar = (TypeVariable) t; - expected.put(typeVar, new TypeMapping(typeVar, Number.class, true)); + class Thing {} - assertEquals(expected, typeAssigns); - - final Type[] types2 = { t, t }; - final Type listWildcardNumber = new Nil>() {} - .getType(); - final Type wildcardNumber = ((ParameterizedType) listWildcardNumber) - .getActualTypeArguments()[0]; - final Type listWildcardDouble = new Nil>() {} - .getType(); - final Type wildcardDouble = ((ParameterizedType) listWildcardDouble) - .getActualTypeArguments()[0]; - - final Type[] inferFroms2 = { wildcardNumber, wildcardDouble }; - - final Map, MatchingUtils.TypeMapping> typeAssigns2 = - new HashMap<>(); - MatchingUtils.inferTypeVariablesWithTypeMappings(types2, inferFroms2, typeAssigns2); - - // We expect T=Number - final Map, MatchingUtils.TypeMapping> expected2 = - new HashMap<>(); - TypeVariable typeVar2 = (TypeVariable) t; - expected2.put(typeVar2, new TypeMapping(typeVar, Number.class, true)); + class TypedBar extends Bar { - assertEquals(expected2, typeAssigns2); + E type; } @Test - public void - testInferFromWildcardExtendingParameterizedType() - throws TypeInferenceException + public > void testInferFromTypeVar() + throws TypeInferenceException { - final Nil>> listT = new Nil<>() {}; - final Nil>> listWildcard = new Nil<>() {}; + final Type compT = new Nil>() {}.getType(); + final Type u = new Nil() {}.getType(); - final Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(listT.getType(), listWildcard.getType(), - typeAssigns); + final Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(compT, u, typeAssigns); // We expect T=Double final Type t = new Nil() {}.getType(); - final Map, MatchingUtils.TypeMapping> expected = - new HashMap<>(); + final Map, TypeMapping> expected = new HashMap<>(); TypeVariable typeVarT = (TypeVariable) t; expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, false)); @@ -128,112 +60,44 @@ public void testInferFromWildcardExtendingClass() final Nil> listT = new Nil<>() {}; final Nil> listWildcard = new Nil<>() {}; - final Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(listT.getType(), listWildcard.getType(), - typeAssigns); + final Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(listT.getType(), listWildcard + .getType(), typeAssigns); // We expect T= (? extends Double) final Type t = new Nil() {}.getType(); - final Map, MatchingUtils.TypeMapping> expected = - new HashMap<>(); + final Map, TypeMapping> expected = new HashMap<>(); TypeVariable typeVarT = (TypeVariable) t; Type mappedType = ((ParameterizedType) listWildcard.getType()) .getActualTypeArguments()[0]; WildcardType mappedWildcard = (WildcardType) mappedType; - expected.put(typeVarT, new MatchingUtils.WildcardTypeMapping(typeVarT, - mappedWildcard, true)); - - assertEquals(expected, typeAssigns); - } - - @Test - public void testInferWildcardAndClass() - throws TypeInferenceException - { - final Nil> listT = new Nil<>() {}; - final Nil t = new Nil<>() {}; - final Nil> listWildcard = new Nil<>() {}; - - Type[] types = new Type[] { listT.getType(), t.getType() }; - Type[] inferFroms = new Type[] { listWildcard.getType(), Double.class }; - - final Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariablesWithTypeMappings(types, inferFroms, typeAssigns); - - // We expect T=Number - final Map, MatchingUtils.TypeMapping> expected = - new HashMap<>(); - TypeVariable typeVarT = (TypeVariable) t.getType(); - expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true)); + expected.put(typeVarT, new WildcardTypeMapping(typeVarT, mappedWildcard, + true)); assertEquals(expected, typeAssigns); } @Test - public void testInferSuperWildcard() - throws TypeInferenceException - { - final Nil> listT = new Nil<>() {}; - final Nil> listWildcard = new Nil<>() {}; - - final Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(listT.getType(), listWildcard.getType(), typeAssigns); - - // We expect T=Number - final Map, MatchingUtils.TypeMapping> expected = - new HashMap<>(); - TypeVariable typeVarT = (TypeVariable) new Nil() {}.getType(); - expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true)); - - assertEquals(expected, typeAssigns); - } - - @Test - public > void testInferFromTypeVar() - throws TypeInferenceException + public void + testInferFromWildcardExtendingParameterizedType() + throws TypeInferenceException { - final Type compT = new Nil>() {}.getType(); - final Type u = new Nil() {}.getType(); + final Nil>> listT = new Nil<>() {}; + final Nil>> listWildcard = new Nil<>() {}; - final Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(compT, u, typeAssigns); + final Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(listT.getType(), listWildcard + .getType(), typeAssigns); // We expect T=Double final Type t = new Nil() {}.getType(); - final Map, MatchingUtils.TypeMapping> expected = - new HashMap<>(); + final Map, TypeMapping> expected = new HashMap<>(); TypeVariable typeVarT = (TypeVariable) t; expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, false)); assertEquals(expected, typeAssigns); } - @Test - public void testInferTypeVarInconsistentMapping() - throws TypeInferenceException - { - - final Type t = new Nil() {}.getType(); - - final Type[] tArr = { t, t }; - final Type[] badInferFrom = { Integer.class, Double.class }; - - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariablesWithTypeMappings(tArr, badInferFrom, typeAssigns); - - // We expect T=Number - TypeVariable typeVarT = (TypeVariable) t; - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); - expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true)); - - assertEquals(expected, typeAssigns); - } - @Test public void testInferGenericArrayTypeFromExtendingWildcardType() @@ -242,13 +106,12 @@ public void testInferTypeVarInconsistentMapping() final Type type = new Nil>() {}.getType(); final Type inferFrom = new Nil>() {}.getType(); - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns); + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns); // We expect T=Double TypeVariable typeVarT = (TypeVariable) new Nil() {}.getType(); - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); + Map, TypeMapping> expected = new HashMap<>(); expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, true)); assertEquals(expected, typeAssigns); @@ -262,13 +125,12 @@ public void testInferTypeVarInconsistentMapping() final Type type = new Nil>() {}.getType(); final Type inferFrom = new Nil>() {}.getType(); - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns); + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns); // We expect T=Double TypeVariable typeVarT = (TypeVariable) new Nil() {}.getType(); - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); + Map, TypeMapping> expected = new HashMap<>(); expected.put(typeVarT, new TypeMapping(typeVarT, Double.class, true)); assertEquals(expected, typeAssigns); @@ -281,56 +143,53 @@ public void testInferOToAny() final Type iterableO = new Nil>() {}.getType(); final Type object = Object.class; - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(iterableO, object, typeAssigns); + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(iterableO, object, typeAssigns); // We expect O = Any TypeVariable typeVarO = (TypeVariable) new Nil() {}.getType(); - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); + Map, TypeMapping> expected = new HashMap<>(); expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true)); assertEquals(expected, typeAssigns); } @Test - public void testInferOToAnyWithInterface() + public void testInferOToAnyWithClass() throws TypeInferenceException { - final Type type = new Nil>() {}.getType(); - final Type inferFrom = Cloneable.class; + final Type type = new Nil>() {}.getType(); + final Type inferFrom = Bar.class; - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns); + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns); // We expect O = Any TypeVariable typeVarO = (TypeVariable) new Nil() {}.getType(); - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); + Map, TypeMapping> expected = new HashMap<>(); expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true)); assertEquals(expected, typeAssigns); } - + @Test - public void testInferOToAnyWithClass() + public void testInferOToAnyWithInterface() throws TypeInferenceException { - final Type type = new Nil>() {}.getType(); - final Type inferFrom = Bar.class; + final Type type = new Nil>() {}.getType(); + final Type inferFrom = Cloneable.class; - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns); + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns); // We expect O = Any TypeVariable typeVarO = (TypeVariable) new Nil() {}.getType(); - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); + Map, TypeMapping> expected = new HashMap<>(); expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true)); assertEquals(expected, typeAssigns); } - + @Test public void testInferOToAnyWithRawType() throws TypeInferenceException @@ -338,29 +197,64 @@ public void testInferOToAnyWithRawType() final Type type = new Nil>() {}.getType(); final Type inferFrom = TypedBar.class; - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns); + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns); // We expect O = Any TypeVariable typeVarO = (TypeVariable) new Nil() {}.getType(); - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); + Map, TypeMapping> expected = new HashMap<>(); expected.put(typeVarO, new TypeMapping(typeVarO, new Any(), true)); assertEquals(expected, typeAssigns); } @Test - public void testInferTypeVarExtendingTypeVar() { + public > void testInferRecursiveTypeVar() { + final Type type = new Nil() {}.getType(); + final Type inferFrom = FooThing.class; + + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns); + + // We expect O = FooThing + TypeVariable typeVarO = (TypeVariable) new Nil() {}.getType(); + Map, TypeMapping> expected = new HashMap<>(); + expected.put(typeVarO, new TypeMapping(typeVarO, FooThing.class, false)); + + assertEquals(expected, typeAssigns); + } + + @Test + public void testInferSuperWildcard() + throws TypeInferenceException + { + final Nil> listT = new Nil<>() {}; + final Nil> listWildcard = new Nil<>() {}; + + final Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(listT.getType(), listWildcard + .getType(), typeAssigns); + + // We expect T=Number + final Map, TypeMapping> expected = new HashMap<>(); + TypeVariable typeVarT = (TypeVariable) new Nil() {}.getType(); + expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true)); + + assertEquals(expected, typeAssigns); + } + + @Test + public void + testInferTypeVarExtendingTypeVar() + { final Type type = new Nil() {}.getType(); final Type inferFrom = Double.class; - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns); + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariables(type, inferFrom, typeAssigns); // We expect I= Double, O = Double - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); + Map, TypeMapping> expected = new HashMap<>(); TypeVariable typeVarI = (TypeVariable) new Nil() {}.getType(); expected.put(typeVarI, new TypeMapping(typeVarI, Double.class, true)); TypeVariable typeVarO = (TypeVariable) new Nil() {}.getType(); @@ -368,38 +262,122 @@ public void testInferTypeVarExtendingTypeVar() { assertEquals(expected, typeAssigns); } - + @Test - public > void testInferRecursiveTypeVar() { - final Type type = new Nil() {}.getType(); - final Type inferFrom = FooThing.class; + public void testInferTypeVarInconsistentMapping() + throws TypeInferenceException + { - Map, MatchingUtils.TypeMapping> typeAssigns = - new HashMap<>(); - MatchingUtils.inferTypeVariables(type, inferFrom, typeAssigns); + final Type t = new Nil() {}.getType(); - // We expect O = FooThing - TypeVariable typeVarO = (TypeVariable) new Nil() {}.getType(); - Map, MatchingUtils.TypeMapping> expected = new HashMap<>(); - expected.put(typeVarO, new TypeMapping(typeVarO, FooThing.class, false)); + final Type[] tArr = { t, t }; + final Type[] badInferFrom = { Integer.class, Double.class }; + + Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariablesWithTypeMappings(tArr, badInferFrom, + typeAssigns); + + // We expect T=Number + TypeVariable typeVarT = (TypeVariable) t; + Map, TypeMapping> expected = new HashMap<>(); + expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true)); assertEquals(expected, typeAssigns); } - class Bar { - - } - - class TypedBar extends Bar { - E type; + @Test + public void testInferWildcardAndClass() + throws TypeInferenceException + { + final Nil> listT = new Nil<>() {}; + final Nil t = new Nil<>() {}; + final Nil> listWildcard = new Nil<>() {}; + + Type[] types = new Type[] { listT.getType(), t.getType() }; + Type[] inferFroms = new Type[] { listWildcard.getType(), Double.class }; + + final Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariablesWithTypeMappings(types, inferFroms, + typeAssigns); + + // We expect T=Number + final Map, TypeMapping> expected = new HashMap<>(); + TypeVariable typeVarT = (TypeVariable) t.getType(); + expected.put(typeVarT, new TypeMapping(typeVarT, Number.class, true)); + + assertEquals(expected, typeAssigns); } - static abstract class RecursiveThing> { - + @Test + public void testSupertypeTypeInference() + throws TypeInferenceException + { + final Type t = new Nil, List>>() {}.getType(); + final Type[] tArgs = ((ParameterizedType) t).getActualTypeArguments(); + final Type dest = + new Nil, List>>() + {}.getType(); + final Type[] destArgs = ((ParameterizedType) dest).getActualTypeArguments(); + + final Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariablesWithTypeMappings(tArgs, destArgs, + typeAssigns); + + // We expect I=String, O=Double + final Map, TypeMapping> expected = new HashMap<>(); + TypeVariable typeVarI = (TypeVariable) ((ParameterizedType) tArgs[0]) + .getActualTypeArguments()[0]; + expected.put(typeVarI, new TypeMapping(typeVarI, String.class, false)); + TypeVariable typeVarO = (TypeVariable) ((ParameterizedType) tArgs[1]) + .getActualTypeArguments()[0]; + expected.put(typeVarO, new TypeMapping(typeVarO, Double.class, false)); + + assertEquals(typeAssigns, expected); } - - static class FooThing extends RecursiveThing { - + + @Test + public void testWildcardTypeInference() throws TypeInferenceException { + final Type t = new Nil() {}.getType(); + final Type listWild = new Nil>() {}.getType(); + final Type integer = new Nil() {}.getType(); + final Type listDouble = new Nil>() {}.getType(); + + final Type[] types = { listWild, t }; + final Type[] inferFroms = { listDouble, integer }; + + final Map, TypeMapping> typeAssigns = new HashMap<>(); + GenericAssignability.inferTypeVariablesWithTypeMappings(types, inferFroms, + typeAssigns); + + // We expect T=Number + final Map, TypeMapping> expected = new HashMap<>(); + TypeVariable typeVar = (TypeVariable) t; + expected.put(typeVar, new TypeMapping(typeVar, Number.class, true)); + + assertEquals(expected, typeAssigns); + + final Type[] types2 = { t, t }; + final Type listWildcardNumber = new Nil>() {} + .getType(); + final Type wildcardNumber = ((ParameterizedType) listWildcardNumber) + .getActualTypeArguments()[0]; + final Type listWildcardDouble = new Nil>() {} + .getType(); + final Type wildcardDouble = ((ParameterizedType) listWildcardDouble) + .getActualTypeArguments()[0]; + + final Type[] inferFroms2 = { wildcardNumber, wildcardDouble }; + + final Map, TypeMapping> typeAssigns2 = new HashMap<>(); + GenericAssignability.inferTypeVariablesWithTypeMappings(types2, inferFroms2, + typeAssigns2); + + // We expect T=Number + final Map, TypeMapping> expected2 = new HashMap<>(); + TypeVariable typeVar2 = (TypeVariable) t; + expected2.put(typeVar2, new TypeMapping(typeVar, Number.class, true)); + + assertEquals(expected2, typeAssigns2); } } From ab8a8920f023fb416352116f9618ff441fe166c9 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Wed, 30 Jun 2021 15:17:32 -0500 Subject: [PATCH 16/31] Remove Parameter annotation This allows us to later remove the org.scijava.param fork --- .../ops2/coloc/maxTKendallTau/MTKT.java | 1 - .../ops2/coloc/pValue/DefaultPValue.java | 1 - .../net/imagej/ops2/convert/ConvertTypes.java | 1 - .../net/imagej/ops2/convert/Converters.java | 1 - .../ops2/convert/clip/ClipRealTypes.java | 1 - .../ops2/convert/copy/CopyRealTypes.java | 1 - .../net/imagej/ops2/copy/CopyArrayImg.java | 1 - .../java/net/imagej/ops2/copy/CopyImg.java | 1 - .../net/imagej/ops2/copy/CopyImgLabeling.java | 1 - .../imagej/ops2/copy/CopyLabelingMapping.java | 1 - .../java/net/imagej/ops2/copy/CopyRAI.java | 1 - .../java/net/imagej/ops2/copy/CopyType.java | 1 - .../net/imagej/ops2/create/CreateTypes.java | 1 - .../deconvolve/NonCirculantFirstGuess.java | 1 - .../NonCirculantNormalizationFactor.java | 1 - .../ops2/deconvolve/RichardsonLucyC.java | 1 - .../deconvolve/RichardsonLucyCorrection.java | 1 - .../ops2/deconvolve/RichardsonLucyF.java | 1 - .../ops2/deconvolve/RichardsonLucyTVF.java | 1 - .../deconvolve/RichardsonLucyTVUpdate.java | 1 - .../ops2/deconvolve/RichardsonLucyUpdate.java | 1 - .../net/imagej/ops2/eval/DefaultEval.java | 1 - .../ops2/features/haralick/DefaultICM1.java | 1 - .../ops2/features/haralick/DefaultICM2.java | 1 - .../features/haralick/DefaultSumVariance.java | 1 - .../hog/HistogramOfOrientedGradients2D.java | 1 - .../ops2/features/lbp2d/DefaultLBP2D.java | 1 - .../tamura2d/DefaultCoarsenessFeature.java | 1 - .../tamura2d/DefaultContrastFeature.java | 1 - .../DefaultDirectionalityFeature.java | 1 - .../zernike/DefaultMagnitudeFeature.java | 1 - .../features/zernike/DefaultPhaseFeature.java | 1 - .../zernike/helper/ZernikeComputer.java | 1 - .../filter/FFTMethodsLinearFFTFilterC.java | 1 - .../ops2/filter/addNoise/NoiseAdders.java | 1 - .../filter/bilateral/DefaultBilateral.java | 1 - .../ops2/filter/convolve/ConvolveFFTC.java | 1 - .../ops2/filter/convolve/ConvolveFFTF.java | 1 - .../ops2/filter/convolve/ConvolveNaiveC.java | 1 - .../ops2/filter/convolve/ConvolveNaiveF.java | 1 - .../ops2/filter/correlate/CorrelateFFTC.java | 1 - .../ops2/filter/correlate/CorrelateFFTF.java | 1 - .../derivative/PartialDerivativeRAI.java | 1 - .../derivative/PartialDerivativesRAI.java | 1 - .../DefaultDerivativeGauss.java | 1 - .../imagej/ops2/filter/dog/DefaultDoG.java | 1 - .../ops2/filter/dog/DoGVaryingSigmas.java | 1 - .../filter/fft/CreateOutputFFTMethods.java | 1 - .../imagej/ops2/filter/fft/FFTMethodsOpC.java | 1 - .../imagej/ops2/filter/fft/FFTMethodsOpF.java | 1 - .../filter/fftSize/ComputeFFTMethodsSize.java | 1 - .../ops2/filter/fftSize/ComputeFFTSize.java | 1 - .../imagej/ops2/filter/gauss/Gaussians.java | 1 - .../ops2/filter/hessian/HessianRAI.java | 1 - .../ops2/filter/ifft/IFFTMethodsOpC.java | 1 - .../ops2/filter/ifft/IFFTMethodsOpI.java | 1 - .../ops2/filter/max/DefaultMaxFilter.java | 1 - .../ops2/filter/mean/DefaultMeanFilter.java | 1 - .../filter/median/DefaultMedianFilter.java | 1 - .../ops2/filter/min/DefaultMinFilter.java | 1 - .../net/imagej/ops2/filter/pad/PadInput.java | 1 - .../ops2/filter/sigma/DefaultSigmaFilter.java | 1 - .../imagej/ops2/filter/sobel/SobelRAI.java | 1 - .../ops2/filter/tubeness/DefaultTubeness.java | 1 - .../variance/DefaultVarianceFilter.java | 1 - .../ops2/filter/vesselness/DefaultFrangi.java | 1 - .../ops2/geom/geom2d/DefaultCircularity.java | 1 - .../ops2/geom/geom2d/DefaultEccentricity.java | 1 - .../ops2/geom/geom2d/DefaultElongation.java | 1 - .../ops2/geom/geom2d/DefaultFeretsAngle.java | 1 - .../geom/geom2d/DefaultFeretsDiameter.java | 1 - .../geom2d/DefaultFeretsDiameterForAngle.java | 1 - .../ops2/geom/geom2d/DefaultMajorAxis.java | 1 - .../geom/geom2d/DefaultMaximumFeretAngle.java | 1 - .../geom2d/DefaultMaximumFeretDiameter.java | 1 - .../geom/geom2d/DefaultMinimumFeretAngle.java | 1 - .../geom2d/DefaultMinimumFeretDiameter.java | 1 - .../ops2/geom/geom2d/DefaultMinorAxis.java | 1 - .../geom/geom2d/DefaultPerimeterLength.java | 1 - .../ops2/geom/geom2d/DefaultRoundness.java | 1 - .../ops2/geom/geom2d/DefaultSizePolygon.java | 1 - ...DefaultVerticesCountConvexHullPolygon.java | 1 - .../geom2d/DefaultVerticesCountPolygon.java | 1 - .../ops2/geom/geom3d/DefaultCompactness.java | 1 - .../geom/geom3d/DefaultMainElongation.java | 1 - .../geom/geom3d/DefaultMarchingCubes.java | 1 - .../geom/geom3d/DefaultMedianElongation.java | 1 - .../geom/geom3d/DefaultSparenessMesh.java | 1 - .../ops2/geom/geom3d/DefaultSphericity.java | 1 - .../ops2/geom/geom3d/DefaultSurfaceArea.java | 1 - .../DefaultVerticesCountConvexHullMesh.java | 1 - .../geom/geom3d/DefaultVerticesCountMesh.java | 1 - .../geom/geom3d/DefaultVoxelization3D.java | 1 - .../imagej/ops2/identity/DefaultIdentity.java | 1 - .../imagej/ops2/image/ascii/DefaultASCII.java | 1 - .../CooccurrenceMatrix.java | 1 - .../CalibratedDistanceTransformer.java | 1 - .../DefaultDistanceTransformCalibration.java | 1 - .../DistanceTransformer.java | 1 - .../equation/DefaultCoordinatesEquation.java | 1 - .../ops2/image/equation/DefaultEquation.java | 1 - .../imagej/ops2/image/fill/DefaultFill.java | 1 - .../net/imagej/ops2/image/fill/FillRAI.java | 1 - .../image/integral/DefaultIntegralImg.java | 1 - .../image/integral/SquareIntegralImg.java | 1 - .../imagej/ops2/image/invert/InvertII.java | 1 - .../ops2/image/invert/InvertIIInteger.java | 1 - .../image/normalize/NormalizeIIComputer.java | 1 - .../image/normalize/NormalizeIIFunction.java | 1 - .../ops2/image/normalize/NormalizeIILazy.java | 1 - .../normalize/NormalizeIILazyFunction.java | 1 - .../ops2/image/watershed/Watershed.java | 1 - .../ops2/image/watershed/WatershedBinary.java | 1 - .../watershed/WatershedBinarySingleSigma.java | 1 - .../ops2/image/watershed/WatershedSeeded.java | 1 - .../DefaultCentralMoment00.java | 1 - .../DefaultCentralMoment02.java | 1 - .../DefaultCentralMoment03.java | 1 - .../DefaultCentralMoment11.java | 1 - .../DefaultCentralMoment12.java | 1 - .../DefaultCentralMoment20.java | 1 - .../DefaultCentralMoment21.java | 1 - .../DefaultCentralMoment30.java | 1 - .../IterableCentralMoment00.java | 1 - .../IterableCentralMoment11.java | 1 - .../imagemoments/hu/DefaultHuMoment1.java | 1 - .../imagemoments/hu/DefaultHuMoment2.java | 1 - .../imagemoments/hu/DefaultHuMoment3.java | 1 - .../imagemoments/hu/DefaultHuMoment4.java | 1 - .../imagemoments/hu/DefaultHuMoment5.java | 1 - .../imagemoments/hu/DefaultHuMoment6.java | 1 - .../imagemoments/hu/DefaultHuMoment7.java | 1 - .../DefaultNormalizedCentralMoment02.java | 1 - .../DefaultNormalizedCentralMoment03.java | 1 - .../DefaultNormalizedCentralMoment11.java | 1 - .../DefaultNormalizedCentralMoment12.java | 1 - .../DefaultNormalizedCentralMoment20.java | 1 - .../DefaultNormalizedCentralMoment21.java | 1 - .../DefaultNormalizedCentralMoment30.java | 1 - .../imagej/ops2/labeling/MergeLabeling.java | 1 - .../imagej/ops2/labeling/cca/DefaultCCA.java | 1 - .../imagej/ops2/linalg/rotate/Rotations.java | 1 - .../imagej/ops2/logic/BooleanTypeLogic.java | 1 - .../java/net/imagej/ops2/logic/Default.java | 1 - .../java/net/imagej/ops2/logic/Ternary.java | 1 - .../neighborhood/DefaultMapNeighborhood.java | 1 - .../MapNeighborhoodWithCenter.java | 1 - .../ops2/math/BinaryNumericTypeMath.java | 1 - .../imagej/ops2/math/BinaryRealTypeMath.java | 1 - .../ops2/math/NullaryNumericTypeMath.java | 1 - .../multiply/ComplexConjugateMultiplyOp.java | 1 - .../ops2/morphology/DistanceTransforms.java | 1 - .../imagej/ops2/morphology/ExtractHoles.java | 1 - .../net/imagej/ops2/morphology/FillHoles.java | 1 - .../imagej/ops2/morphology/FloodFills.java | 1 - .../net/imagej/ops2/morphology/Outline.java | 1 - .../net/imagej/ops2/morphology/Table2Ds.java | 1 - .../ops2/project/DefaultProjectParallel.java | 1 - .../project/ProjectRAIToIterableInterval.java | 1 - .../detectRidges/DefaultDetectRidges.java | 1 - .../net/imagej/ops2/slice/SliceRAI2RAI.java | 1 - .../ops2/stats/DefaultGeometricMean.java | 1 - .../ops2/stats/DefaultHarmonicMean.java | 1 - .../imagej/ops2/stats/DefaultKurtosis.java | 1 - .../net/imagej/ops2/stats/DefaultMax.java | 1 - .../net/imagej/ops2/stats/DefaultMean.java | 1 - .../net/imagej/ops2/stats/DefaultMedian.java | 1 - .../net/imagej/ops2/stats/DefaultMin.java | 1 - .../ops2/stats/DefaultMoment1AboutMean.java | 1 - .../ops2/stats/DefaultMoment2AboutMean.java | 1 - .../ops2/stats/DefaultMoment3AboutMean.java | 1 - .../ops2/stats/DefaultMoment4AboutMean.java | 1 - .../ops2/stats/DefaultMomentNAboutMean.java | 1 - .../imagej/ops2/stats/DefaultPercentile.java | 1 - .../imagej/ops2/stats/DefaultQuantile.java | 1 - .../net/imagej/ops2/stats/DefaultSize.java | 1 - .../imagej/ops2/stats/DefaultSkewness.java | 1 - .../ops2/stats/DefaultStandardDeviation.java | 1 - .../net/imagej/ops2/stats/DefaultSum.java | 1 - .../ops2/stats/DefaultSumOfInverses.java | 1 - .../imagej/ops2/stats/DefaultSumOfLogs.java | 1 - .../ops2/stats/DefaultSumOfSquares.java | 1 - .../imagej/ops2/stats/DefaultVariance.java | 1 - .../net/imagej/ops2/stats/IntegralMean.java | 1 - .../net/imagej/ops2/stats/IntegralSum.java | 1 - .../imagej/ops2/stats/IntegralVariance.java | 1 - .../ops2/stats/IterableGeometricMean.java | 1 - .../ops2/stats/IterableHarmonicMean.java | 1 - .../net/imagej/ops2/stats/IterableMax.java | 1 - .../net/imagej/ops2/stats/IterableMean.java | 1 - .../net/imagej/ops2/stats/IterableMin.java | 1 - .../ops2/stats/IterableMoment3AboutMean.java | 1 - .../ops2/stats/IterableMoment4AboutMean.java | 1 - .../net/imagej/ops2/stats/IterableSize.java | 1 - .../ops2/stats/IterableStandardDeviation.java | 1 - .../net/imagej/ops2/stats/IterableSum.java | 1 - .../ops2/stats/IterableSumOfInverses.java | 1 - .../imagej/ops2/stats/IterableSumOfLogs.java | 1 - .../ops2/stats/IterableSumOfSquares.java | 1 - .../imagej/ops2/stats/IterableVariance.java | 1 - .../thread/chunker/ChunkerInterleaved.java | 1 - .../ops2/thread/chunker/DefaultChunker.java | 1 - .../threshold/ApplyThresholdMethodLocal.java | 1 - .../apply/ApplyThresholdComparable.java | 1 - .../apply/ApplyThresholdComparator.java | 1 - .../ComputeLocalBernsenThreshold.java | 1 - .../localBernsen/LocalBernsenThreshold.java | 1 - .../ComputeLocalContrastThreshold.java | 1 - .../localContrast/LocalContrastThreshold.java | 1 - .../localMean/ComputeLocalMeanThreshold.java | 1 - .../ComputeLocalMeanThresholdIntegral.java | 1 - .../localMean/LocalMeanThreshold.java | 1 - .../ComputeLocalMedianThreshold.java | 1 - .../localMedian/LocalMedianThreshold.java | 1 - .../ComputeLocalMidGreyThreshold.java | 1 - .../localMidGrey/LocalMidGreyThreshold.java | 1 - .../ComputeLocalNiblackThreshold.java | 1 - .../ComputeLocalNiblackThresholdIntegral.java | 1 - .../localNiblack/LocalNiblackThreshold.java | 1 - .../ComputeLocalPhansalkarThreshold.java | 1 - ...mputeLocalPhansalkarThresholdIntegral.java | 1 - .../LocalPhansalkarThreshold.java | 1 - .../ComputeLocalSauvolaThreshold.java | 1 - .../ComputeLocalSauvolaThresholdIntegral.java | 1 - .../localSauvola/LocalSauvolaThreshold.java | 1 - .../net/imagej/ops2/topology/BoxCount.java | 1 - .../EulerCharacteristic26N.java | 1 - .../EulerCharacteristic26NFloating.java | 1 - .../eulerCharacteristic/EulerCorrection.java | 1 - .../ops2/types/adapt/LiftComputersToRAI.java | 1 - .../ops2/types/adapt/LiftFunctionsToRAI.java | 1 - .../src/main/java/module-info.java | 1 + .../ops/adapt/lift/ComputerToIterables.java | 1 - .../org/scijava/ops/core/OneToOneCommand.java | 22 -- .../ops/create/CreateOpCollection.java | 1 - .../java/org/scijava/ops/math/Normalize.java | 1 - .../main/java/org/scijava/ops/math/Zero.java | 1 - .../main/java/org/scijava/ops/util/Adapt.java | 13 - .../org/scijava/ops/util/AnnotationUtils.java | 19 - .../param/AnnotatedParameterMember.java | 140 -------- .../param/DefaultMutableParameterMember.java | 330 ------------------ .../scijava/param/FieldParameterMember.java | 123 ------- .../param/FunctionalParameterMember.java | 39 --- .../scijava/param/JavadocParameterData.java | 122 ++++--- .../scijava/param/MutableParameterMember.java | 55 --- .../java/org/scijava/param/Parameter.java | 185 ---------- .../java/org/scijava/param/ParameterData.java | 4 +- .../org/scijava/param/ParameterStructs.java | 122 +------ .../java/org/scijava/param/Parameters.java | 48 --- .../param/SynthesizedParameterData.java | 62 ++-- .../param/SynthesizedParameterMember.java | 64 ++++ .../scijava/ops/OpBuilderNoOutputTest.java | 7 +- .../test/java/org/scijava/ops/TestOps.java | 1 - .../ops/adapt/OpAdaptationPriorityTest.java | 1 - .../ops/matcher/DefaultMatchingErrorTest.java | 31 +- .../ops/matcher/MatchingWithAnyTest.java | 1 - 256 files changed, 190 insertions(+), 1435 deletions(-) delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java index e0ad20bf4..e1669bc7b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java @@ -51,7 +51,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.util.IntArray; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java index 58f305dde..08afcec5e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/pValue/DefaultPValue.java @@ -50,7 +50,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java index 17d604834..2ffe18766 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/ConvertTypes.java @@ -54,7 +54,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java index d07d9a303..712e2b337 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java @@ -8,7 +8,6 @@ import org.scijava.function.Functions; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java index 34515e1d5..89b59a3d4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/clip/ClipRealTypes.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java index 18b4c638f..8e7e796ed 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/copy/CopyRealTypes.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java index 814923429..63501e636 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyArrayImg.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java index 0cb0dfcef..6effa322d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImg.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java index dddee6cfa..7b93b3365 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyImgLabeling.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java index 39dc59340..b179298c5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyLabelingMapping.java @@ -38,7 +38,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java index d0bebd24d..353ee023b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyRAI.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java index ddcb0417e..49471381a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/copy/CopyType.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java index 8e6305b6a..5980ef8de 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/CreateTypes.java @@ -21,7 +21,6 @@ import org.scijava.function.Producer; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java index ad3eb4d89..5b770504f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java @@ -44,7 +44,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java index 6fbb947a0..fe93429b3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantNormalizationFactor.java @@ -52,7 +52,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java index 15e690fed..a9aba9759 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyC.java @@ -47,7 +47,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java index e207f9a30..5bae9dbd2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyCorrection.java @@ -46,7 +46,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java index 2855491ea..bf39470cc 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java @@ -49,7 +49,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java index 3f4bd0762..08317ddf4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java @@ -50,7 +50,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java index 3958377eb..99a66ee55 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVUpdate.java @@ -47,7 +47,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java index a103f71f7..c9abb7585 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyUpdate.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java index d9c454e1b..58ac47cac 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java @@ -34,7 +34,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpService; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java index 4f6c21052..447b5d8d4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM1.java @@ -39,7 +39,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java index 732e8758e..f334a8556 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultICM2.java @@ -39,7 +39,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java index b13d2f940..53e4c5d95 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/haralick/DefaultSumVariance.java @@ -39,7 +39,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java index 071a48311..f8a16ee73 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/hog/HistogramOfOrientedGradients2D.java @@ -61,7 +61,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java index c51bde4a6..b3491eba6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/lbp2d/DefaultLBP2D.java @@ -45,7 +45,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java index eb3dd031e..5faf234c5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultCoarsenessFeature.java @@ -50,7 +50,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java index 2f9638cf7..aa53bf2e4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultContrastFeature.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java index 64f8c8644..8450fcf27 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/tamura2d/DefaultDirectionalityFeature.java @@ -47,7 +47,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java index 2c79367c4..19f5f964d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java @@ -37,7 +37,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java index d27eb0058..a70e5e242 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java @@ -37,7 +37,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java index 1d7f2f180..d0bd30f60 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java @@ -35,7 +35,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java index b72da5994..2dfb81979 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/FFTMethodsLinearFFTFilterC.java @@ -42,7 +42,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java index 9c18fc0bf..f1e64ac8a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/addNoise/NoiseAdders.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java index 550c5e919..983c6e3f4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/bilateral/DefaultBilateral.java @@ -42,7 +42,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java index 905914e97..eb4b7e003 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTC.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java index 3a859d9b7..3de3ddb41 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveFFTF.java @@ -49,7 +49,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java index a4a3af15a..56473fbbf 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveC.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java index 77a129e06..b7de5c4d7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/convolve/ConvolveNaiveF.java @@ -47,7 +47,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java index 3cb9cccb6..bdb1c3410 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTC.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java index f1359dfb3..4b5841ced 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/correlate/CorrelateFFTF.java @@ -46,7 +46,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java index ace9c701e..aaaf17e62 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativeRAI.java @@ -43,7 +43,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java index 736baae5a..e34c66743 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivative/PartialDerivativesRAI.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java index 7d0635698..a7ff0bc40 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/derivativeGauss/DefaultDerivativeGauss.java @@ -44,7 +44,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java index f4387abb1..f7507eed3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DefaultDoG.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java index c7fb7a2d2..d6af00693 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/dog/DoGVaryingSigmas.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java index 53aa7f38a..f50286375 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/CreateOutputFFTMethods.java @@ -37,7 +37,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java index 1ebc23d5d..0161724ff 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpC.java @@ -39,7 +39,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java index b0a8ed9fb..0e65cdba2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fft/FFTMethodsOpF.java @@ -43,7 +43,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java index 28e2aff17..7cd31aaa6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTMethodsSize.java @@ -34,7 +34,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java index ba97379bf..813762c08 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/fftSize/ComputeFFTSize.java @@ -38,7 +38,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java index 8738143a7..095144dcf 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/gauss/Gaussians.java @@ -49,7 +49,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java index 263686782..04aff4d29 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/hessian/HessianRAI.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java index ab093b056..45a234480 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpC.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java index d0a24033d..6c8dd87a1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/ifft/IFFTMethodsOpI.java @@ -37,7 +37,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java index 0d9d72ed4..aa0bc71dc 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/max/DefaultMaxFilter.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java index 1511007a4..d7acd365d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/mean/DefaultMeanFilter.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java index 2c710475f..4bc3560d3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/median/DefaultMedianFilter.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java index 8a6d313bf..ce0a76af8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/min/DefaultMinFilter.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java index e83a07894..c7cbd0c32 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/pad/PadInput.java @@ -44,7 +44,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java index 05fc0e11e..e380bcd06 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sigma/DefaultSigmaFilter.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java index 109e6162c..7541ef050 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/sobel/SobelRAI.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java index a7961a3b2..0a4f3cf74 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/tubeness/DefaultTubeness.java @@ -52,7 +52,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java index 2b55e6151..00badca46 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/variance/DefaultVarianceFilter.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java index e3337eac2..c2562c205 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/filter/vesselness/DefaultFrangi.java @@ -43,7 +43,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import Jama.EigenvalueDecomposition; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java index 4c0fe94e9..5c6208726 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultCircularity.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java index 0fc7017f7..d7b982403 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultEccentricity.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java index 8ec5f9793..46eff3164 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultElongation.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java index 41b49f1d4..2df120804 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsAngle.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java index db0475f77..df81ac266 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameter.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java index 63e8cc9ec..f062a425c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultFeretsDiameterForAngle.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java index cbf7f39ec..8a3487cfb 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMajorAxis.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java index 7646ea1ed..ccc3cbe1c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretAngle.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "geom.maximumFeretsAngle") diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java index 5595c321a..c4a101b6d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMaximumFeretDiameter.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "geom.maximumFeretsDiameter") diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java index 4f7224cac..733658c41 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretAngle.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "geom.minimumFeretsAngle") diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java index 5adcecd55..6aa4b9612 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinimumFeretDiameter.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "geom.minimumFeretsDiameter") diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java index 8767bb9d9..daaa95e90 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultMinorAxis.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java index b2076f0ea..f343d27c6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultPerimeterLength.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java index 2f1131268..cc6f04ff5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultRoundness.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java index 18fc5b126..1e6eb067d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultSizePolygon.java @@ -38,7 +38,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java index 4f31522c4..bae0427eb 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountConvexHullPolygon.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java index 6179e8c28..85b106167 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom2d/DefaultVerticesCountPolygon.java @@ -35,7 +35,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java index 1a99d7b35..efdaf461b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultCompactness.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java index 027a6d504..0926d73d5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMainElongation.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java index 86f142be0..e09e0e6e6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java @@ -47,7 +47,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java index 57f404196..91eb2748b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMedianElongation.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java index cab0deb43..3a7d1d60c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSparenessMesh.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java index 9843d1443..50b9a0387 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSphericity.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java index 1b7c6f173..3152931a4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultSurfaceArea.java @@ -37,7 +37,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java index 767c6b2ce..a17ae444b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountConvexHullMesh.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java index d763b2432..eee191d52 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVerticesCountMesh.java @@ -35,7 +35,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java index 00705c05f..aaacf1953 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVoxelization3D.java @@ -46,7 +46,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java index 8fe08fe70..85e63dbd5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/identity/DefaultIdentity.java @@ -31,7 +31,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java index c8ee6ac57..f38e31472 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/ascii/DefaultASCII.java @@ -39,7 +39,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java index 5c2845ee6..1b776b40a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/cooccurrenceMatrix/CooccurrenceMatrix.java @@ -9,7 +9,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java index 67c08ac8d..c04707f14 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/CalibratedDistanceTransformer.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java index ab5a15d67..70f5eac6f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DefaultDistanceTransformCalibration.java @@ -43,7 +43,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java index 9a545d57b..a9b832761 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/distancetransform/DistanceTransformer.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java index ee72d1e08..388e2cc06 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultCoordinatesEquation.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java index c17fbbdd9..0f4bc7f00 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/equation/DefaultEquation.java @@ -43,7 +43,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpExecutionException; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.script.ScriptLanguage; import org.scijava.script.ScriptService; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java index f2ead8904..aa6305bf3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/DefaultFill.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java index 8ab99befe..3973c939e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/fill/FillRAI.java @@ -36,7 +36,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java index 0659d7086..61d45b698 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/DefaultIntegralImg.java @@ -37,7 +37,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java index b1608b6ec..02cb1fd81 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/integral/SquareIntegralImg.java @@ -37,7 +37,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java index a12c19ee1..21dfd5767 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertII.java @@ -41,7 +41,6 @@ //import org.scijava.functions.Computers; //import org.scijava.functions.Computers; //import org.scijava.functions.Computers; -//import org.scijava.param.Parameter; //import org.scijava.plugin.Plugin; // ///** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java index cab243163..d2b60fb65 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/invert/InvertIIInteger.java @@ -44,7 +44,6 @@ //import org.scijava.functions.Computers; //import org.scijava.functions.Computers; //import org.scijava.functions.Computers; -//import org.scijava.param.Parameter; //import org.scijava.plugin.Plugin; // ///** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java index d307e6376..a1157fa85 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIComputer.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java index 6b8ecc05c..c9989a669 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIIFunction.java @@ -39,7 +39,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java index 6f200e1ea..6dd30a4b1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazy.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java index 4302115b7..1f6f3d671 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/normalize/NormalizeIILazyFunction.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java index a30d47bbd..c3daf9d52 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/Watershed.java @@ -58,7 +58,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java index 12621f782..638023d38 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinary.java @@ -45,7 +45,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java index 870642eb6..d8860a4a4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedBinarySingleSigma.java @@ -46,7 +46,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java index 1af0a1129..99852cf04 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/image/watershed/WatershedSeeded.java @@ -68,7 +68,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java index 88431dac5..ffb8d92fe 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment00.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java index a8c96c9d7..e6cdaddcb 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment02.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java index 53a9a134c..d104508cf 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment03.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java index 8d56811de..89d4d103d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment11.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java index 8f11371c8..b434b8c3d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment12.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java index d2c1b01f0..864670b03 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment20.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java index 8a3eafdd7..a10239906 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment21.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java index e824cbe6e..52ae6216f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/DefaultCentralMoment30.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java index c912e75a1..42db76fd4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment00.java @@ -36,7 +36,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java index c1be9aed1..74960e095 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/centralmoments/IterableCentralMoment11.java @@ -36,7 +36,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java index d5445f935..5a0d99d20 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment1.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java index ca71ec854..c4ebbf48e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment2.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java index 358da38ae..3403b4e35 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment3.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java index 6ffd15c3a..abe3beee4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment4.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java index 49b3c677a..313f95014 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment5.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java index 5a6abb7a2..cc5218d1a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment6.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java index 411c64566..0c8c91645 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/hu/DefaultHuMoment7.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java index e1bf84cb5..5120d0f5a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment02.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java index 74b4e3d80..47b902f0f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment03.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java index 7b80a7e8d..ced69b790 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment11.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java index 95ea34ab5..e5177f8a4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment12.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java index d9b7200b8..b431863af 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment20.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java index dda6e4d4f..4797e930f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment21.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java index c9fba1ee7..e6c6dc00e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/imagemoments/normalizedcentralmoments/DefaultNormalizedCentralMoment30.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java index 082f4eaf5..df1169551 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/MergeLabeling.java @@ -49,7 +49,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java index 9f3bfda27..f32038bfd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/labeling/cca/DefaultCCA.java @@ -44,7 +44,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java index 9e9564799..aa12815c9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/linalg/rotate/Rotations.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java index ffa853768..0ed24563d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/BooleanTypeLogic.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java index a694d5c97..5469fdf47 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Default.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java index b4a1fda59..39fa17bd7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/logic/Ternary.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java index 949cf16a5..2d066491f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/DefaultMapNeighborhood.java @@ -40,7 +40,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java index b43529227..cfb7a604a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/map/neighborhood/MapNeighborhoodWithCenter.java @@ -42,7 +42,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpEnvironment; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java index 563f02494..f96d15294 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryNumericTypeMath.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java index ccb11bca4..c579cb420 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/BinaryRealTypeMath.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java index 16ab64985..5406f9776 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/NullaryNumericTypeMath.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java index bbf0200d3..6a5549f2d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/math/multiply/ComplexConjugateMultiplyOp.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "math.complexConjugateMultiply", priority = Priority.LOW) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java index c61fec18e..e84c47632 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java @@ -13,7 +13,6 @@ import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; import org.scijava.ops.core.ExceptionUtils; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java index 20863d1d5..965c16670 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/ExtractHoles.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java index d5871e9a7..4287bd727 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FillHoles.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java index b2ca7a942..75322dbb4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/FloodFills.java @@ -16,7 +16,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java index bdd21e7a6..eef638723 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Outline.java @@ -46,7 +46,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java index c3e1e1351..91ab39dda 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/Table2Ds.java @@ -23,7 +23,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java index b0ec412ff..267fd2567 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/DefaultProjectParallel.java @@ -39,7 +39,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "project", diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java index f7e703936..718787a79 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/project/ProjectRAIToIterableInterval.java @@ -39,7 +39,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "project", priority = Priority.LOW) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java index fe67e32f3..2031e8926 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/segment/detectRidges/DefaultDetectRidges.java @@ -50,7 +50,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java index d88766a7a..638b7c8e9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/slice/SliceRAI2RAI.java @@ -35,7 +35,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java index a6c7ccf22..64d98c60d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultGeometricMean.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java index c8d361d05..1b973d6c0 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultHarmonicMean.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java index ef9d8d9b1..5f52f97c5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultKurtosis.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java index 1469d83c2..5b6dd1db9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMax.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java index 17fd594f3..daa04c775 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMean.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java index 098212ca7..752eee08b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMedian.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java index de413137d..f73bcd126 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMin.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java index eb193a150..2b8e3f001 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment1AboutMean.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java index 61991eae3..580437db8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment2AboutMean.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java index d61f4ca19..42659a5b1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment3AboutMean.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java index 97ca54592..912152bbf 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMoment4AboutMean.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java index e00a62792..aad8b6182 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultMomentNAboutMean.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java index 7ddadf4a1..1f25b2258 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultPercentile.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java index 31042e585..70f119b42 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultQuantile.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.util.ArrayUtils; import org.scijava.util.DoubleArray; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java index 1d1861b5f..2a196d950 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSize.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java index bdd0a21b0..078a3964b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSkewness.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java index 76300169b..9df6818b8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultStandardDeviation.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java index 4c6eb739e..055bb38d6 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSum.java @@ -38,7 +38,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java index 84a40ae25..8daaa48bc 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfInverses.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java index ff1acb5cb..8f1637fbc 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfLogs.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java index 29b08c0b3..16723f1de 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultSumOfSquares.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java index 63e4728cb..a2380ebbd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/DefaultVariance.java @@ -42,7 +42,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java index 1b7c8b1cd..5b0f2017f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralMean.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java index f6d2d2ae1..783b94662 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralSum.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java index 314c72b71..682eb7994 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IntegralVariance.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java index c067a3cb4..426becb05 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableGeometricMean.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java index d86d0b8cd..1d49209c3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableHarmonicMean.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java index 833505194..10098cc3a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMax.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java index 8f3dce783..60fb024d9 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMean.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java index b7e71f8d6..8b8c2bb2d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMin.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java index a2d177eef..ec872eee2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment3AboutMean.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java index b6c9d0572..6a6245307 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableMoment4AboutMean.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java index 05884460b..95164e239 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSize.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java index 5cb99df23..688652f1d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableStandardDeviation.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java index f5c1de51f..85217c4ae 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSum.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java index c41b19009..35d62ed81 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfInverses.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java index 26e7f7b96..06734ee3d 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfLogs.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java index 943771bd6..a636b53cd 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableSumOfSquares.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java index 77df9d3f2..571acba40 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/stats/IterableVariance.java @@ -34,7 +34,6 @@ import org.scijava.Priority; import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java index ddb1db5f9..facf43893 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/ChunkerInterleaved.java @@ -36,7 +36,6 @@ import org.scijava.Priority; import org.scijava.function.Inplaces; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java index d93512ccc..4893ce2b8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/thread/chunker/DefaultChunker.java @@ -36,7 +36,6 @@ import org.scijava.function.Inplaces; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java index 8dbcf2298..1e7763ee4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/ApplyThresholdMethodLocal.java @@ -44,7 +44,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java index 4e1fad0f9..f9faea52f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparable.java @@ -33,7 +33,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java index 16dc9cb03..2d52e0955 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/apply/ApplyThresholdComparator.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java index 60264f32a..f9e72d64b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/ComputeLocalBernsenThreshold.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java index a2f9c54d3..c6a01f7c1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localBernsen/LocalBernsenThreshold.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java index d2ea329dd..3d6f52822 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/ComputeLocalContrastThreshold.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java index ad7fbd76d..c6140d2d2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localContrast/LocalContrastThreshold.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java index 60a51653c..208e4198f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThreshold.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java index d6df3ae26..5f157f905 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/ComputeLocalMeanThresholdIntegral.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java index 00aa40d9a..10f170061 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMean/LocalMeanThreshold.java @@ -50,7 +50,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java index 9d366d4bc..1fd103dda 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/ComputeLocalMedianThreshold.java @@ -36,7 +36,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java index 0b5206769..f7681e5b7 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMedian/LocalMedianThreshold.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java index 18a7c6e2a..0e1cbf24b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/ComputeLocalMidGreyThreshold.java @@ -39,7 +39,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java index da588b56c..44ae21f68 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localMidGrey/LocalMidGreyThreshold.java @@ -41,7 +41,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java index aa36c26e4..6463c8247 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThreshold.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java index 4b589d86d..e742f8902 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/ComputeLocalNiblackThresholdIntegral.java @@ -42,7 +42,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java index e5461fd0c..bbda2088e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localNiblack/LocalNiblackThreshold.java @@ -49,7 +49,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "threshold.localNiblack", diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java index e04e15117..b26aec411 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThreshold.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java index f6fec2136..d26e7e4d1 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/ComputeLocalPhansalkarThresholdIntegral.java @@ -42,7 +42,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java index 6a546ecee..a7e4e6413 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localPhansalkar/LocalPhansalkarThreshold.java @@ -49,7 +49,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "threshold.localPhansalkar", diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java index 7976c5cf8..e22a53d47 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThreshold.java @@ -37,7 +37,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java index b99a6897c..d1a10d3e5 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/ComputeLocalSauvolaThresholdIntegral.java @@ -42,7 +42,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java index 32631af2e..a1e389f2f 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/threshold/localSauvola/LocalSauvolaThreshold.java @@ -49,7 +49,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; import org.scijava.ops.OpDependency; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = Op.class, name = "threshold.localSauvola", diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java index 3a00217dc..820e9e0c4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/BoxCount.java @@ -48,7 +48,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java index 86298788e..437ecc440 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26N.java @@ -35,7 +35,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java index 366c34252..8565bfcd3 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCharacteristic26NFloating.java @@ -34,7 +34,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java index 690d7a828..2e8d6bb11 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/topology/eulerCharacteristic/EulerCorrection.java @@ -38,7 +38,6 @@ import org.scijava.function.Computers; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java index 018bb372e..f47a9f3f8 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftComputersToRAI.java @@ -10,7 +10,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java index 3cf61831c..0423dfa33 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/types/adapt/LiftFunctionsToRAI.java @@ -16,7 +16,6 @@ import org.scijava.function.Functions; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java index 5010452e3..1893eca56 100644 --- a/scijava/scijava-ops/src/main/java/module-info.java +++ b/scijava/scijava-ops/src/main/java/module-info.java @@ -7,6 +7,7 @@ //TODO: rearrange packages to export only needed classes exports org.scijava.ops; //contains OpDependency interface + exports org.scijava.ops.core; // contains ExceptionUtils exports org.scijava.ops.matcher; exports org.scijava.ops.math; exports org.scijava.ops.simplify; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java index c70930437..83fb04be3 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.java @@ -40,7 +40,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpField; import org.scijava.ops.OpCollection; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java deleted file mode 100644 index 555a412cf..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OneToOneCommand.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.scijava.ops.core; - -import java.util.function.Supplier; - -import org.scijava.command.Command; -import org.scijava.param.Parameter; -import org.scijava.struct.ItemIO; - -public abstract class OneToOneCommand implements Command, Supplier { - - @Parameter - protected I input; - - @Parameter(itemIO = ItemIO.OUTPUT) - protected O output; - - @Override - public O get() { - return output; - } - -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java index c00f304a4..fe6ee2f33 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/create/CreateOpCollection.java @@ -7,7 +7,6 @@ import org.scijava.function.Producer; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java index 31af65a0e..38dfb1881 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Normalize.java @@ -4,7 +4,6 @@ import org.scijava.function.Functions; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; public class Normalize { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java index 51d251142..ca84cc9e4 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/math/Zero.java @@ -5,7 +5,6 @@ import org.scijava.function.Computers; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java index 1819e5c65..ed9f0c50c 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Adapt.java @@ -15,7 +15,6 @@ import org.scijava.function.Inplaces; import org.scijava.function.Producer; import org.scijava.ops.Op; -import org.scijava.ops.core.OneToOneCommand; /** * Utility providing adaptation between {@link Op} types. @@ -137,18 +136,6 @@ public static Functions.Arity3 asFunction3(Comput }; } - public static OneToOneCommand asCommand(final Computers.Arity1 computer, I input, O output) { - OneToOneCommand command = new OneToOneCommand() { - @Override - public void run() { - computer.compute(input, output); - } - }; - // Populate the input and output member of the computer command - Inject.Commands.all(command, input, output); - return command; - } - public static Computers.Arity1 asComputer(final Computers.Arity2 computer, I2 in2) { return (in1, out) -> { computer.compute(in1, in2, out); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java index b105c4bee..e68905f29 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/AnnotationUtils.java @@ -40,9 +40,6 @@ import java.lang.reflect.AnnotatedType; import java.lang.reflect.Method; -import org.scijava.param.Parameter; -import org.scijava.param.Parameters; - /** * Useful methods for working with annotation instances. * @@ -54,22 +51,6 @@ private AnnotationUtils() { // prevent instantiation of utility class } - /** - * Gets a list of {@link Parameter} from the specified annotated element. - * If the element is not annotated, an empty array is returned. - * - * @param element the annotated element - * @return array of {@link Parameter} annotations - */ - public static Parameter[] parameters(final AnnotatedElement element) { - final Parameters params = element.getAnnotation(Parameters.class); - if (params != null) { - return params.value(); - } - final Parameter p = element.getAnnotation(Parameter.class); - return p == null ? new Parameter[0] : new Parameter[] { p }; - } - /** * Attempt to retrieve the specified annotation from the i'th parameter * of the specified method. This method will only find annotations with: diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java deleted file mode 100644 index 8d01b6a9a..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/AnnotatedParameterMember.java +++ /dev/null @@ -1,140 +0,0 @@ - -package org.scijava.param; - -import java.lang.reflect.Field; -import java.lang.reflect.Type; -import java.util.Arrays; -import java.util.List; - -import org.scijava.struct.ItemIO; -import org.scijava.struct.Member; - -/** - * {@link Member} backed by a {@link Field} annotated by {@link Parameter}. - * - * @author Curtis Rueden - * @param - */ -public abstract class AnnotatedParameterMember implements ParameterMember { - - /** Type, or a subtype thereof, which houses the field. */ - private final Type itemType; - - /** Annotation describing the item. */ - private final Parameter annotation; - - private ItemIO itemIO; - - public AnnotatedParameterMember(final Type itemType, - final Parameter annotation) - { - this.itemType = itemType; - this.annotation = annotation; - } - - // -- AnnotatedParameterMember methods -- - - public Parameter getAnnotation() { - return annotation; - } - - // -- ParameterMember methods -- - - @Override - public ItemVisibility getVisibility() { - return getAnnotation().visibility(); - } - - @Override - public boolean isAutoFill() { - return getAnnotation().autoFill(); - } - - @Override - public boolean isRequired() { - return getAnnotation().required(); - } - - @Override - public boolean isPersisted() { - return getAnnotation().persist(); - } - - @Override - public String getPersistKey() { - return getAnnotation().persistKey(); - } - - @Override - public String getInitializer() { - return getAnnotation().initializer(); - } - - @Override - public String getValidater() { - return getAnnotation().validater(); - } - - @Override - public String getCallback() { - return getAnnotation().callback(); - } - - @Override - public String getWidgetStyle() { - return getAnnotation().style(); - } - - @Override - public Object getMinimumValue() { - return getAnnotation().min(); - } - - @Override - public Object getMaximumValue() { - return getAnnotation().max(); - } - - @Override - public Object getStepSize() { - return getAnnotation().stepSize(); - } - - @Override - public List getChoices() { - final String[] choices = getAnnotation().choices(); - if (choices.length == 0) return ParameterMember.super.getChoices(); - return Arrays.asList((Object[]) choices); - } - - // -- Member methods -- - - @Override - public String getKey() { - return getAnnotation().key(); - } - - @Override - public String getDescription() { - return getAnnotation().description(); - } - - @Override - public Type getType() { - return itemType; - } - - @Override - public ItemIO getIOType() { - if (itemIO == null) { - // CTR START HERE: if AUTO here, compute what it actually is and cache. - itemIO = getAnnotation().itemIO(); - } - return itemIO; - } - - @Override - public boolean isStruct() { - return getAnnotation().struct(); - } -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java deleted file mode 100644 index 311bf6600..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/DefaultMutableParameterMember.java +++ /dev/null @@ -1,330 +0,0 @@ -/* - * #%L - * SciJava Common shared library for SciJava software. - * %% - * Copyright (C) 2009 - 2017 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. - * %% - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * #L% - */ - -package org.scijava.param; - -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.scijava.struct.ItemIO; - - -/** - * Default {@link MutableParameterMember} implementation. - * - * @author Curtis Rueden - */ -public class DefaultMutableParameterMember implements - MutableParameterMember -{ - - private final String key; - private final Type type; - private final ItemIO ioType; - - private ItemVisibility visibility; - private boolean required; - private boolean persisted; - private String persistKey; - private String initializer; - private String validater; - private String callback; - private String widgetStyle; - private Object defaultValue; - private Object minimumValue; - private Object maximumValue; - private Object softMinimum; - private Object softMaximum; - private Object stepSize; - private final List choices = new ArrayList<>(); - private String label; - private String description; - - /** Table of extra key/value pairs. */ - private final Map values = new HashMap<>(); - - public DefaultMutableParameterMember(final String key, final Class type, final ItemIO ioType) { - this(key, "", (Type) type, ioType); - } - public DefaultMutableParameterMember(final String key, final Type type, final ItemIO ioType) { - this(key, "", type, ioType); - } - public DefaultMutableParameterMember(final String key, final String description, final Class type, final ItemIO ioType) { - this(key, description, (Type) type, ioType); - } - public DefaultMutableParameterMember(final String key, final String description, final Type type, final ItemIO ioType) { - this.key = key; - this.description = description; - this.type = type; - this.ioType = ioType; - visibility = MutableParameterMember.super.getVisibility(); - required = MutableParameterMember.super.isRequired(); - persisted = MutableParameterMember.super.isPersisted(); - persistKey = MutableParameterMember.super.getPersistKey(); - initializer = MutableParameterMember.super.getInitializer(); - callback = MutableParameterMember.super.getCallback(); - widgetStyle = MutableParameterMember.super.getWidgetStyle(); - minimumValue = MutableParameterMember.super.getMinimumValue(); - maximumValue = MutableParameterMember.super.getMaximumValue(); - stepSize = MutableParameterMember.super.getStepSize(); - final List superChoices = MutableParameterMember.super.getChoices(); - if (superChoices != null) choices.addAll(superChoices); - label = MutableParameterMember.super.getLabel(); - } - - /** Creates a new parameter with the same values as the given one. */ - public DefaultMutableParameterMember(final ParameterMember member) { - key = member.getKey(); - type = member.getType(); - ioType = member.getIOType(); - visibility = member.getVisibility(); - required = member.isRequired(); - persisted = member.isPersisted(); - persistKey = member.getPersistKey(); - initializer = member.getInitializer(); - callback = member.getCallback(); - widgetStyle = member.getWidgetStyle(); - minimumValue = member.getMinimumValue(); - maximumValue = member.getMaximumValue(); - softMinimum = member.getSoftMinimum(); - softMaximum = member.getSoftMaximum(); - stepSize = member.getStepSize(); - final List memberChoices = member.getChoices(); - if (memberChoices != null) choices.addAll(memberChoices); - label = member.getLabel(); - description = member.getDescription(); - } - - // -- MutableParameterMember methods -- - - @Override - public void setVisibility(final ItemVisibility visibility) { - this.visibility = visibility; - } - - @Override - public void setRequired(final boolean required) { - this.required = required; - } - - @Override - public void setPersisted(final boolean persisted) { - this.persisted = persisted; - } - - @Override - public void setPersistKey(final String persistKey) { - this.persistKey = persistKey; - } - - @Override - public void setInitializer(final String initializer) { - this.initializer = initializer; - } - - @Override - public void setValidater(final String validater) { - this.validater = validater; - } - - @Override - public void setCallback(final String callback) { - this.callback = callback; - } - - @Override - public void setWidgetStyle(final String widgetStyle) { - this.widgetStyle = widgetStyle; - } - - @Override - public void setDefaultValue(final Object defaultValue) { - this.defaultValue = defaultValue; - } - - @Override - public void setMinimumValue(final Object minimumValue) { - this.minimumValue = minimumValue; - } - - @Override - public void setMaximumValue(final Object maximumValue) { - this.maximumValue = maximumValue; - } - - @Override - public void setSoftMinimum(final Object softMinimum) { - this.softMinimum = softMinimum; - } - - @Override - public void setSoftMaximum(final Object softMaximum) { - this.softMaximum = softMaximum; - } - - @Override - public void setStepSize(final Object stepSize) { - this.stepSize = stepSize; - } - - @Override - public void setChoices(final List choices) { - this.choices.clear(); - this.choices.addAll(choices); - } - - @Override - public void set(final String key, final String value) { - values.put(key, value); - } - - // -- MutableBasicDetails methods -- - - @Override - public void setLabel(final String label) { - this.label = label; - } - - @Override - public void setDescription(final String description) { - this.description = description; - } - - // -- ParameterMember methods -- - - @Override - public ItemVisibility getVisibility() { - return visibility; - } - - @Override - public boolean isRequired() { - return required; - } - - @Override - public boolean isPersisted() { - return persisted; - } - - @Override - public String getPersistKey() { - return persistKey; - } - - @Override - public String getInitializer() { - return initializer; - } - - @Override - public String getValidater() { - return validater; - } - - @Override - public String getCallback() { - return callback; - } - - @Override - public String getWidgetStyle() { - return widgetStyle; - } - - @Override - public Object getDefaultValue() { - return defaultValue; - } - - @Override - public Object getMinimumValue() { - return minimumValue; - } - - @Override - public Object getMaximumValue() { - return maximumValue; - } - - @Override - public Object getSoftMinimum() { - return softMinimum; - } - - @Override - public Object getSoftMaximum() { - return softMaximum; - } - - @Override - public Object getStepSize() { - return stepSize; - } - - @Override - public List getChoices() { - return Collections.unmodifiableList(choices); - } - - // -- BasicDetails methods -- - - @Override - public String getLabel() { - return label; - } - - @Override - public String getDescription() { - return description; - } - - // -- Member methods -- - - @Override - public String getKey() { - return key; - } - - @Override - public Type getType() { - return type; - } - - @Override - public ItemIO getIOType() { - return ioType; - } -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java deleted file mode 100644 index 790446819..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/FieldParameterMember.java +++ /dev/null @@ -1,123 +0,0 @@ - -package org.scijava.param; - -import java.lang.reflect.Field; - -import org.scijava.struct.Member; -import org.scijava.struct.MemberInstance; -import org.scijava.struct.Struct; -import org.scijava.struct.ValueAccessible; -import org.scijava.struct.ValueAccessibleMemberInstance; -import org.scijava.types.Types; - -/** - * {@link Member} backed by a {@link Field} annotated by {@link Parameter}. - * - * @author Curtis Rueden - * @param - */ -public class FieldParameterMember extends AnnotatedParameterMember - implements ValueAccessible -{ - - private final Field field; - private final Class structType; - private final Struct struct; - - public FieldParameterMember(final Field field, final Class structType, Parameter parameterAnnotation) - throws ValidityException - { - super(Types.fieldType(field, structType), parameterAnnotation); - this.field = field; - this.structType = structType; - struct = isStruct() ? ParameterStructs.structOf(getRawType()) : null; - } - - // -- FieldParameterItem methods -- - - public Field getField() { - return field; - } - - // -- ValueAccessible methods -- - - @Override - public T get(final Object o) { - try { - @SuppressWarnings("unchecked") - final T value = (T) field(this).get(o); - return value; - } - catch (final IllegalAccessException exc) { - return null; // FIXME - } - } - - @Override - public void set(final T value, final Object o) { - try { - field(this).set(o, value); - } - catch (final IllegalAccessException exc) { - // FIXME - } - } - - // -- ParameterItem methods -- - - @Override - public T getDefaultValue() { - // NB: The default value is the initial field value. - // E.g.: - // - // @Parameter - // private int weekdays = 5; - // - // To obtain this information, we need to instantiate the object, then - // extract the value of the associated field. - // - // Of course, the command might do evil things like: - // - // @Parameter - // private long time = System.currentTimeMillis(); - // - // In which case the default value will vary by instance. But there is - // nothing we can really do about that. This is only a best effort. - - try { - final Object dummy = structType.newInstance(); - @SuppressWarnings("unchecked") - final T value = (T) getField().get(dummy); - return value; - } - catch (final InstantiationException | IllegalAccessException exc) { - throw new IllegalStateException("Missing no-args constructor", exc); - } - } - - // -- Member methods -- - - public static Field field(final Member item) { - if (item instanceof FieldParameterMember) { - final FieldParameterMember fpItem = (FieldParameterMember) item; - return fpItem.getField(); - } - return null; - } - - @Override - public String getKey() { - final String key = getAnnotation().key(); - return key == null || key.isEmpty() ? field.getName() : key; - } - - @Override - public Struct childStruct() { - return struct; - } - - @Override - public MemberInstance createInstance(final Object o) { - return new ValueAccessibleMemberInstance<>(this, o); - } -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java deleted file mode 100644 index f00737275..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalParameterMember.java +++ /dev/null @@ -1,39 +0,0 @@ - -package org.scijava.param; - -import java.lang.reflect.Type; - -import org.scijava.struct.Member; -import org.scijava.struct.Struct; - -/** - * {@link Member} backed by a generic parameter of a - * {@link FunctionalInterface}-annotated interface. - *

- * The generic parameter in question is indicated by annotating a {@link Class} - * with {@link Parameter}. - *

- * - * @author Curtis Rueden - * @param - */ -public class FunctionalParameterMember extends AnnotatedParameterMember { - - private Struct struct; - - public FunctionalParameterMember(final Type itemType, - final Parameter annotation) throws ValidityException - { - super(itemType, annotation); - final String key = getKey(); - if (key == null || key.isEmpty()) { - throw new ValidityException("Functional parameter must specify key"); - } - struct = isStruct() ? ParameterStructs.structOf(getRawType()) : null; - } - - @Override - public Struct childStruct() { - return struct; - } -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java index e9a5c87cb..f95cb5712 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java @@ -8,17 +8,12 @@ import com.github.therapi.runtimejavadoc.ParamJavadoc; import com.github.therapi.runtimejavadoc.RuntimeJavadoc; -import io.leangen.geantyref.AnnotationFormatException; -import io.leangen.geantyref.TypeFactory; - import java.lang.reflect.Field; import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; -import java.util.Map; import java.util.Optional; import java.util.stream.Collectors; @@ -39,8 +34,6 @@ public class JavadocParameterData implements ParameterData { List paramDescriptions; String returnDescription; - - public JavadocParameterData(Method m) { parseMethod(m); } @@ -67,8 +60,8 @@ public JavadocParameterData(Field f) { FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f); long numIns = sam.getParameterCount(); long numOuts = 1; // There is always one output - if (hasCustomJavadoc(doc.getOther(), numIns, numOuts)) populateViaCustomTaglets(doc - .getOther()); + if (hasCustomJavadoc(doc.getOther(), numIns, numOuts)) + populateViaCustomTaglets(doc.getOther()); else throw new IllegalArgumentException("Field " + f + " does not have enough taglets to generate OpInfo documentation!"); } @@ -81,7 +74,7 @@ public JavadocParameterData(OpInfo info, Type newType) { // this method is called when the op is adapted/simplified. In the case of // adaptation, the op's output might shift from a pure output to an input, - // or might shift from a container to a pure output. We + // or might shift from a container to a pure output. We Method sam = ParameterStructs.singularAbstractMethod(Types.raw(newType)); if (sam.getParameterCount() > inputs.size()) { inputs.add(output); @@ -97,7 +90,7 @@ else if (sam.getParameterCount() < inputs.size()) { inputs.remove(ioMember.get()); } - for(Member m : inputs) { + for (Member m : inputs) { paramNames.add(m.getKey()); paramDescriptions.add(m.getDescription()); } @@ -174,7 +167,9 @@ private long getOpParams(Method m) { * @return true iff there are {@code numParams} inputs and {@code numReturns} * outputs */ - private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numReturns) { + private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, + long numReturns) + { // We require a @param tag for each of the method parameters boolean sufficientParams = doc.getParams().size() == numParams; // We require a @return tag for the method return iff not null @@ -197,7 +192,9 @@ private boolean hasVanillaJavadoc(MethodJavadoc doc, long numParams, long numRet * @return true iff there are {@code numIns} inputs and {@code numOuts} * outputs */ - private boolean hasCustomJavadoc(List doc, long numIns, long numOuts) { + private boolean hasCustomJavadoc(List doc, long numIns, + long numOuts) + { int ins = 0, outs = 0; for (OtherJavadoc other : doc) { switch (other.getName()) { @@ -214,7 +211,8 @@ private boolean hasCustomJavadoc(List doc, long numIns, long numOu break; } } - // We require as many input/container/mutable taglets as there are parameters + // We require as many input/container/mutable taglets as there are + // parameters boolean sufficientIns = ins == numIns; // We require one container/mutable/output taglet boolean sufficientOuts = outs == numOuts; @@ -229,9 +227,13 @@ private boolean hasCustomJavadoc(List doc, long numIns, long numOu * @param params the {@code @param} tags on the method of interest * @param returnDoc the string following {@code @return} */ - private void populateViaParamAndReturn(List params, Comment returnDoc) { - paramNames = params.stream().map(param -> param.getName()).collect(Collectors.toList()); - paramDescriptions = params.stream().map(param -> param.getComment().toString()).collect(Collectors.toList()); + private void populateViaParamAndReturn(List params, + Comment returnDoc) + { + paramNames = params.stream().map(param -> param.getName()).collect( + Collectors.toList()); + paramDescriptions = params.stream().map(param -> param.getComment() + .toString()).collect(Collectors.toList()); returnDescription = returnDoc.toString(); } @@ -253,10 +255,17 @@ private void populateViaCustomTaglets(List doc) { // add to params if not a pure output if (!name.equals("output")) { String param = other.getComment().toString(); - paramNames.add(param.substring(0, param.indexOf(" "))); - paramDescriptions.add(param.substring(param.indexOf(" ") + 1)); + int space = param.indexOf(" "); + if (space != -1) { + paramNames.add(param.substring(0, param.indexOf(" "))); + paramDescriptions.add(param.substring(param.indexOf(" ") + 1)); + } + else { + paramNames.add(param); + paramDescriptions.add(""); + } } - // add return description if an I/O + // add return description if an I/O if (!name.equals("input")) { if (returnDescription != null) throw new IllegalArgumentException( "Op cannot have multiple returns!"); @@ -281,61 +290,50 @@ private boolean validParameterTag(String tagType) { } /** - * Synthesizes a set of {@link Parameter}s using the data present in the + * Synthesizes a set of {@link Member}s using the data present in the * javadoc, as well as {@code fmts}. * * @param fmts the list of inputs, outputs, and other types required by the Op */ @Override - public List synthesizeAnnotations(List fmts) { - List params = new ArrayList<>(); + public List> synthesizeMembers(List fmts) { + List> params = new ArrayList<>(); int ins = 0; int outs = 0; - Map paramValues = new HashMap<>(); for (FunctionalMethodType fmt : fmts) { - paramValues.clear(); - paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO()); - String key; String description; switch (fmt.itemIO()) { - case INPUT: - key = paramNames.get(ins); - description = paramDescriptions.get(ins); - ins++; - break; - case OUTPUT: - // NB the @return tag does not provide a name, only a comment - key = "output" + (outs == 0 ? "" : outs); - description = returnDescription; - outs++; - break; - case CONTAINER: - key = paramNames.get(ins); - description = paramDescriptions.get(ins); - ins++; - outs++; - break; - case MUTABLE: - key = paramNames.get(ins); - description = paramDescriptions.get(ins); - ins++; - outs++; - break; - default: - throw new RuntimeException("Unexpected ItemIO type encountered!"); - } - - paramValues.put(Parameter.KEY_FIELD_NAME, key); - paramValues.put(Parameter.DESCRIPTION_FIELD_NAME, description); - - try { - params.add(TypeFactory.annotation(Parameter.class, paramValues)); - } catch (AnnotationFormatException e) { - throw new RuntimeException("Error during Parameter annotation synthetization. This is " - + "most likely an implementation error.", e); + case INPUT: + key = paramNames.get(ins); + description = paramDescriptions.get(ins); + ins++; + break; + case OUTPUT: + // NB the @return tag does not provide a name, only a comment + key = "output" + (outs == 0 ? "" : outs); + description = returnDescription; + outs++; + break; + case CONTAINER: + key = paramNames.get(ins); + description = paramDescriptions.get(ins); + ins++; + outs++; + break; + case MUTABLE: + key = paramNames.get(ins); + description = paramDescriptions.get(ins); + ins++; + outs++; + break; + default: + throw new RuntimeException("Unexpected ItemIO type encountered!"); } + + params.add(new SynthesizedParameterMember<>(fmt.type(), key, description, + fmt.itemIO())); } return params; } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java deleted file mode 100644 index 576adfcfb..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/MutableParameterMember.java +++ /dev/null @@ -1,55 +0,0 @@ -package org.scijava.param; - -import java.util.List; - -/** - * A {@link ParameterMember} whose metadata can be changed. - * - * @author Curtis Rueden - */ -public interface MutableParameterMember extends ParameterMember { - - void setVisibility(ItemVisibility visibility); - - void setRequired(boolean required); - - void setPersisted(boolean persisted); - - void setPersistKey(String persistKey); - - void setInitializer(String initializer); - - void setValidater(String validater); - - void setCallback(String callback); - - void setWidgetStyle(String widgetStyle); - - void setDefaultValue(Object defaultValue); - - void setMinimumValue(Object minimumValue); - - void setMaximumValue(Object maximumValue); - - void setSoftMinimum(Object softMinimum); - - void setSoftMaximum(Object softMaximum); - - void setStepSize(Object stepSize); - - void setChoices(List choices); - - // -- MutableBasicDetails methods -- - - // TODO: Factor out to MutableBasicDetails. - - void setLabel(String label); - - void setDescription(String description); - - default void set(final String key) { - set(key, null); - } - - void set(String key, String value); -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java b/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java deleted file mode 100644 index 093889aec..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameter.java +++ /dev/null @@ -1,185 +0,0 @@ -/* - * #%L - * SciJava Common shared library for SciJava software. - * %% - * Copyright (C) 2009 - 2017 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. - * %% - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * #L% - */ - -package org.scijava.param; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Repeatable; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import org.scijava.plugin.Attr; -import org.scijava.struct.ItemIO; -import org.scijava.struct.MemberInstance; - -/** - * An annotation for indicating a field is an input or output parameter. This - * annotation is a useful way for plugins to declare their inputs and outputs - * simply. - * - * @author Johannes Schindelin - * @author Grant Harris - * @author Curtis Rueden - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD, ElementType.TYPE, ElementType.METHOD }) -@Repeatable(Parameters.class) -public @interface Parameter { - - /** - * IMPORTANT: Parameter annotation instances are mutated using reflections - * in order to resolve {@link ItemIO#AUTO} which accesses this field - * by name. If the name is changed, this has to be changed accordingly. - */ - public static final String ITEMIO_FIELD_NAME = "itemIO"; - - /** - * IMPORTANT: Parameter annotation instances are mutated using reflections - * in order to resolve {@link ItemIO#AUTO} which accesses this field - * by name. If the name is changed, this has to be changed accordingly. - */ - public static final String KEY_FIELD_NAME = "key"; - - /** - * IMPORTANT: Parameter annotation instances are mutated using reflections - * in order to resolve {@link ItemIO#AUTO} which accesses this field - * by name. If the name is changed, this has to be changed accordingly. - */ - public static final String DESCRIPTION_FIELD_NAME = "description"; - - /** Defines a key for the parameter. */ - String key() default ""; - - /** Defines a label for the parameter. */ - String label() default ""; - - /** Defines a description for the parameter. */ - String description() default ""; - - /** - * Defines the input/output type of the parameter. - * - * @see ItemIO - */ - ItemIO itemIO() default ItemIO.AUTO; - - /** - * Defines whether the parameter references an object which itself has - * parameters. This allows for nested structures to be created. - */ - boolean struct() default false; - - /** - * Defines the "visibility" of the parameter. - *

- * Choices are: - *

- *
    - *
  • NORMAL: parameter is included in the history for purposes of data - * provenance, and included as a parameter when recording scripts.
    • - *
  • TRANSIENT: parameter is excluded from the history for the purposes of - * data provenance, but still included as a parameter when recording scripts.
    • - *
  • INVISIBLE: parameter is excluded from the history for the purposes of - * data provenance, and also excluded as a parameter when recording scripts. - * This option should only be used for parameters with no effect on the final - * output, such as a "verbose" flag.
    • - *
  • MESSAGE: parameter value is intended as a message only, not editable by - * the user nor included as an input or output parameter.
    • - *
- */ - ItemVisibility visibility() default ItemVisibility.NORMAL; - - /** - * Defines whether the parameter value should be filled programmatically, if - * possible. - */ - boolean autoFill() default true; - - /** Defines whether the parameter value must be non-null. */ - boolean required() default true; - - /** Defines whether to remember the most recent value of the parameter. */ - boolean persist() default true; - - /** Defines a key to use for saving the value persistently. */ - String persistKey() default ""; - - /** Defines a function that is called to initialize the parameter. */ - String initializer() default ""; - - /** - * Defines a function that is called to validate the parameter value after it - * is marked as resolved. - * - * @see MemberInstance#resolve() - */ - String validater() default ""; - - /** - * Defines a function that is called whenever this parameter changes. - *

- * This mechanism enables interdependent parameters of various types. For - * example, two {@code int} parameters "width" and "height" could update each - * other when another {@code boolean} "Preserve aspect ratio" flag is set. - *

- */ - String callback() default ""; - - /** - * Defines the preferred widget style. - *

- * We do not use an {@code enum} because the styles need to be extensible. And - * we cannot use an interface-driven extensible enum pattern, because - * interfaces cannot be used as attributes within a Java annotation interface. - * So we fall back to strings! - *

- */ - String style() default ""; - - /** Defines the minimum allowed value (numeric parameters only). */ - String min() default ""; - - /** Defines the maximum allowed value (numeric parameters only). */ - String max() default ""; - - /** Defines the step size to use (numeric parameters only). */ - String stepSize() default ""; - - /** Defines the list of possible values (multiple choice text fields only). */ - String[] choices() default {}; - - /** - * A list of additional attributes which can be used to extend this annotation - * beyond its built-in capabilities. - */ - Attr[] attrs() default {}; -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java index 5e0cbfa6e..1a2b3fe9a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java @@ -2,8 +2,10 @@ import java.util.List; +import org.scijava.struct.Member; + public interface ParameterData { - public List synthesizeAnnotations(List fmts); + public List> synthesizeMembers(List fmts); } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java index 77e0a78f2..b90ee54f6 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java @@ -244,7 +244,7 @@ public static List> parse(final Class c, final Method method) parseFunctionalParameters(items, names, problems, functionalType, paramData); // Parse method level @OpDependency annotations. - parseMethodOpDependencies(items, problems, c, method); + parseMethodOpDependencies(items, method); // Fail if there were any problems. if (!problems.isEmpty()) throw new ValidityException(problems); @@ -423,61 +423,6 @@ private static void checkModifiers(String message, final ArrayList
- * 'input{index}' for {@link ItemIO#INPUT}
- * 'output{index}' for {@link ItemIO#OUTPUT}
- * 'container{index}' for {@link ItemIO#CONTAINER}
- * 'mutable{index}' for {@link ItemIO#MUTABLE}

- * with {index} being counted individually. - * - * This is used to infer the annotations for {@link FunctionalParameterMember}s if the {@link Parameter} is not - * explicitly specified by a user and should thus be inferred from the functional method type. - * - * @param fmts - * @return - */ - private static Parameter[] synthesizeParameterAnnotations(final List fmts, JavadocParameterData data) { - List params = new ArrayList<>(); - - int ins, outs, containers, mutables; - ins = outs = containers = mutables = 1; - for (FunctionalMethodType fmt : fmts) { - Map paramValues = new HashMap<>(); - paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO()); - - String key; - switch (fmt.itemIO()) { - case INPUT: - key = "input" + ins++; - break; - case OUTPUT: - key = "output" + outs++; - break; - case CONTAINER: - key = "container" + containers++; - break; - case MUTABLE: - key = "mutable" + mutables++; - break; - default: - throw new RuntimeException("Unexpected ItemIO type encountered!"); - } - - paramValues.put(Parameter.KEY_FIELD_NAME, key); - - try { - params.add(TypeFactory.annotation(Parameter.class, paramValues)); - } catch (AnnotationFormatException e) { - throw new RuntimeException("Error during Parameter annotation synthetization. This is " - + "most likely an implementation error.", e); - } - } - - return params.toArray(new Parameter[params.size()]); - } private static void parseFunctionalParameters(final ArrayList> items, final Set names, final ArrayList problems, Type type, ParameterData data) { @@ -492,30 +437,19 @@ private static void parseFunctionalParameters(final ArrayList> items, return; } - // Get parameter annotations (may not be present) - // TODO: remove Parameter annotations from all ops and remove logic below. - // TODO: grab names from OpClass/OpField annotations. - Parameter[] annotations = data.synthesizeAnnotations(fmts).toArray(Parameter[]::new); + // Synthesize members + List> fmtMembers = data.synthesizeMembers(fmts); - for (int i=0; i m : fmtMembers) { + String key = m.getKey(); + final Type itemType = m.getType(); + + final boolean valid = checkValidity(m, key, Types.raw(itemType), false, + names, problems); if (!valid) continue; - - try { - final ParameterMember item = // - new FunctionalParameterMember<>(itemType, annotations[i]); - names.add(key); - items.add(item); - } - catch (final ValidityException exc) { - problems.addAll(exc.problems()); - } + items.add(m); + names.add(m.getKey()); } - } private static void parseFieldOpDependencies(final List> items, @@ -541,7 +475,6 @@ private static void parseFieldOpDependencies(final List> items, } private static void parseMethodOpDependencies(final List> items, - final List problems, final Class enclosingclass, final Method annotatedMethod) { final java.lang.reflect.Parameter[] methodParams = annotatedMethod @@ -564,25 +497,6 @@ private static boolean isImmutable(final Class type) { Types.isBoolean(type); } - /** - * Finds the class declaring {@code @Parameter} annotations. They might be on - * this type, on a supertype, or an implemented interface. - */ - private static Class findParametersDeclaration(final Class type) { - if (type == null) return null; - final Deque> types = new ArrayDeque<>(); - types.add(type); - while (!types.isEmpty()) { - final Class candidate = types.pop(); - if (candidate.getAnnotation(Parameters.class) != null || - candidate.getAnnotation(Parameter.class) != null) return candidate; - final Class superType = candidate.getSuperclass() ; - if (superType != null) types.add(superType); - types.addAll(Arrays.asList(candidate.getInterfaces())); - } - return null; - } - /** * Searches for a {@code @FunctionalInterface} annotated interface in the * class hierarchy of the specified type. The first one that is found will @@ -601,20 +515,12 @@ public static Class findFunctionalInterface(Class type) { return findFunctionalInterface(type.getSuperclass()); } - private static boolean checkValidity(Parameter param, String name, + private static boolean checkValidity(Member m, String name, Class type, boolean isFinal, Set names, ArrayList problems) { boolean valid = true; - final boolean isMessage = param.visibility() == ItemVisibility.MESSAGE; - if (isFinal && !isMessage) { - // NB: Final parameters are bad because they cannot be modified. - final String error = "Invalid final parameter: " + name; - problems.add(new ValidityProblem(error)); - valid = false; - } - if (names.contains(name)) { // NB: Shadowed parameters are bad because they are ambiguous. final String error = "Invalid duplicate parameter: " + name; @@ -622,11 +528,11 @@ private static boolean checkValidity(Parameter param, String name, valid = false; } - if ((param.itemIO() == ItemIO.MUTABLE || param.itemIO() == ItemIO.CONTAINER) && isImmutable(type)) { + if ((m.getIOType() == ItemIO.MUTABLE || m.getIOType() == ItemIO.CONTAINER) && isImmutable(type)) { // NB: The MUTABLE and CONTAINER types signify that the parameter // will be written to, but immutable parameters cannot be changed in // such a manner, so it makes no sense to label them as such. - final String error = "Immutable " + param.itemIO() + " parameter: " + name + " (" + type.getName() + " is immutable)"; + final String error = "Immutable " + m.getIOType() + " parameter: " + name + " (" + type.getName() + " is immutable)"; problems.add(new ValidityProblem(error)); valid = false; } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java b/scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java deleted file mode 100644 index 826b83874..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/Parameters.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * #%L - * SciJava Common shared library for SciJava software. - * %% - * Copyright (C) 2009 - 2017 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, and Max Planck - * Institute of Molecular Cell Biology and Genetics. - * %% - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * #L% - */ - -package org.scijava.param; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Container annotation type for repeated @{@link Parameter} annotations. - * - * @author Curtis Rueden - */ -@Retention(RetentionPolicy.RUNTIME) -@Target({ ElementType.FIELD, ElementType.TYPE, ElementType.METHOD }) -public @interface Parameters { - Parameter[] value(); -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java index f56ac5a1c..6f2b813f7 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java @@ -1,55 +1,41 @@ -package org.scijava.param; -import io.leangen.geantyref.AnnotationFormatException; -import io.leangen.geantyref.TypeFactory; +package org.scijava.param; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -public class SynthesizedParameterData implements ParameterData{ +import org.scijava.struct.Member; + +public class SynthesizedParameterData implements ParameterData { @Override - public List synthesizeAnnotations( - List fmts) - { - List params = new ArrayList<>(); - + public List> synthesizeMembers(List fmts) { + List> params = new ArrayList<>(); + int ins, outs, containers, mutables; ins = outs = containers = mutables = 1; for (FunctionalMethodType fmt : fmts) { - Map paramValues = new HashMap<>(); - paramValues.put(Parameter.ITEMIO_FIELD_NAME, fmt.itemIO()); - String key; switch (fmt.itemIO()) { - case INPUT: - key = "input" + ins++; - break; - case OUTPUT: - key = "output" + outs++; - break; - case CONTAINER: - key = "container" + containers++; - break; - case MUTABLE: - key = "mutable" + mutables++; - break; - default: - throw new RuntimeException("Unexpected ItemIO type encountered!"); - } - - paramValues.put(Parameter.KEY_FIELD_NAME, key); - - try { - params.add(TypeFactory.annotation(Parameter.class, paramValues)); - } catch (AnnotationFormatException e) { - throw new RuntimeException("Error during Parameter annotation synthetization. This is " - + "most likely an implementation error.", e); + case INPUT: + key = "input" + ins++; + break; + case OUTPUT: + key = "output" + outs++; + break; + case CONTAINER: + key = "container" + containers++; + break; + case MUTABLE: + key = "mutable" + mutables++; + break; + default: + throw new RuntimeException("Unexpected ItemIO type encountered!"); } + params.add(new SynthesizedParameterMember<>(fmt.type(), key, "", fmt + .itemIO())); } - + return params; } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java new file mode 100644 index 000000000..52ab7fda9 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java @@ -0,0 +1,64 @@ + +package org.scijava.param; + +import java.lang.reflect.Type; + +import org.scijava.struct.ItemIO; +import org.scijava.struct.Member; + +/** + * {@link Member} synthesized using constructor arguments + * + * @author Gabriel Selzer + * @param + */ +public class SynthesizedParameterMember implements Member { + + /** Type, or a subtype thereof, which houses the field. */ + private final Type itemType; + + /** Name of the parameter */ + private final String name; + + /** Description of the parameter */ + private final String description; + + /** IO status of the parameter */ + private final ItemIO itemIO; + + public SynthesizedParameterMember(final Type itemType, + final String name, final String description, final ItemIO ioType) + { + this.itemType = itemType; + this.name = name; + this.description = description; + this.itemIO = ioType; + } + + // -- Member methods -- + + @Override + public String getKey() { + return name; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public Type getType() { + return itemType; + } + + @Override + public ItemIO getIOType() { + return itemIO; + } + + @Override + public boolean isStruct() { + return false; + } +} diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java index d642ba3d6..3c163f2b5 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpBuilderNoOutputTest.java @@ -10,7 +10,6 @@ import org.scijava.ops.OpBuilder; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; import org.scijava.types.Nil; @@ -33,9 +32,11 @@ public class OpBuilderNoOutputTest extends // private wrapper class private static class WrappedList extends ArrayList {} + /** + * @input in + * @output out + */ @OpField(names = opName) - @Parameter(key = "in", itemIO = ItemIO.INPUT) - @Parameter(key = "out", itemIO = ItemIO.OUTPUT) public final Function> func = in -> { WrappedList out = new WrappedList<>(); diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java index 4d1c6b7d5..a752e7c39 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/TestOps.java @@ -5,7 +5,6 @@ import java.util.function.Function; import org.scijava.function.Computers; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java index ba17419ce..906836c14 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/adapt/OpAdaptationPriorityTest.java @@ -43,7 +43,6 @@ import org.scijava.ops.OpField; import org.scijava.ops.adapt.functional.ComputersToFunctionsViaFunction; import org.scijava.ops.adapt.functional.ComputersToFunctionsViaSource; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java index 4d6c61c3a..eae5b56d1 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/DefaultMatchingErrorTest.java @@ -11,7 +11,6 @@ import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; import org.scijava.ops.OpField; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.struct.ItemIO; @@ -104,13 +103,15 @@ public void missingDependencyViaAdaptationTest() { } @Plugin(type = Op.class, name = "test.furtherOutsideOp") -@Parameter(key = "in") -@Parameter(key = "out", itemIO = ItemIO.OUTPUT) class FurtherDependentOp implements Function { @OpDependency(name = "test.outsideOp") private Function op; + /** + * @param t the input + * @return the output + */ @Override public Double apply(Double t) { return op.apply(t); @@ -119,13 +120,15 @@ public Double apply(Double t) { } @Plugin(type = Op.class, name = "test.outsideOp") -@Parameter(key = "in") -@Parameter(key = "out", itemIO = ItemIO.OUTPUT) class DependentOp implements Function { @OpDependency(name = "test.missingDependencyOp") private Function op; + /** + * @param t the input + * @return the output + */ @Override public Double apply(Double t) { return op.apply(t); @@ -134,13 +137,15 @@ public Double apply(Double t) { } @Plugin(type = Op.class, name = "test.missingDependencyOp") -@Parameter(key = "in") -@Parameter(key = "out", itemIO = ItemIO.OUTPUT) class MissingDependencyOp implements Function { @OpDependency(name = "test.nonexistingOp") private Function op; + /** + * @param t the input + * @return the output + */ @Override public Double apply(Double t) { return op.apply(t); @@ -149,26 +154,30 @@ public Double apply(Double t) { } @Plugin(type = Op.class, name = "test.adaptMissingDep") -@Parameter(key = "in") -@Parameter(key = "out", itemIO = ItemIO.OUTPUT) class MissingDependencyOpArr1 implements Computers.Arity1 { @OpDependency(name = "test.nonexistingOp") private Function op; + /** + * @param t the input + * @param out the output + */ @Override public void compute(Double[] t, Double[] out) {} } @Plugin(type = Op.class, name = "test.adaptMissingDep") -@Parameter(key = "in") -@Parameter(key = "out", itemIO = ItemIO.OUTPUT) class MissingDependencyOpArr2 implements Function { @OpDependency(name = "test.nonexistingOp") private Function op; + /** + * @param t the input + * @return the output + */ @Override public Double apply(Double t) { return op.apply(t); diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java index d9463fbb0..6df265558 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingWithAnyTest.java @@ -12,7 +12,6 @@ import org.scijava.function.Producer; import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; import org.scijava.types.Any; import org.scijava.types.TypeExtractor; From 1b7514b2392aac14daeb72c1cc18531ee2071332 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Wed, 30 Jun 2021 17:09:43 -0500 Subject: [PATCH 17/31] Switch to MemberParser paradigm --- .../main/java/org/scijava/ops/OpUtils.java | 1 + .../struct/FieldParameterMemberParser.java | 50 +++++ .../FunctionalParameterMemberParser.java | 106 +++++++++ .../struct}/JavadocParameterData.java | 6 +- .../org/scijava/ops/struct/MemberParser.java | 27 +++ .../org/scijava/ops/struct/ParameterData.java | 11 + .../java/org/scijava/ops/struct/Structs.java | 212 ++++++++++++++++++ .../struct}/SynthesizedParameterData.java | 6 +- .../struct}/SynthesizedParameterMember.java | 5 +- .../java/org/scijava/param/ParameterData.java | 11 - .../org/scijava/param/ParameterStructs.java | 3 + 11 files changed, 419 insertions(+), 19 deletions(-) create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/JavadocParameterData.java (95%) create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/SynthesizedParameterData.java (76%) rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/SynthesizedParameterMember.java (87%) delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java index 5c0494f98..00b891d0a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java @@ -37,6 +37,7 @@ import java.util.stream.Collectors; import org.scijava.ops.OpCandidate.StatusCode; +import org.scijava.ops.struct.SynthesizedParameterMember; import org.scijava.param.ParameterMember; import org.scijava.param.ParameterStructs; import org.scijava.param.ValidityException; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java new file mode 100644 index 000000000..a2a5f22ff --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java @@ -0,0 +1,50 @@ + +package org.scijava.ops.struct; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.scijava.param.ValidityException; +import org.scijava.param.ValidityProblem; +import org.scijava.struct.Member; +import org.scijava.types.Types; + +public class FieldParameterMemberParser implements + MemberParser> +{ + + @Override + public List> parse(Field source) { + Class c = source.getDeclaringClass(); + if (c == null || source == null) return null; + // obtain a parameterData (preferably one that scrapes the javadoc) + ParameterData paramData; + try { + paramData = new JavadocParameterData(source); + } + catch (IllegalArgumentException e) { + paramData = new SynthesizedParameterData(); + } + source.setAccessible(true); + + final ArrayList> items = new ArrayList<>(); + final ArrayList problems = new ArrayList<>(); + final Set names = new HashSet<>(); + final Type fieldType = Types.fieldType(source, c); + + Structs.checkModifiers(source.toString() + ": ", problems, source.getModifiers(), + false, Modifier.FINAL); + Structs.parseFunctionalParameters(items, names, problems, fieldType, paramData); + // Fail if there were any problems. + if (!problems.isEmpty()) { + throw new ValidityException(problems); + } + return items; + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java new file mode 100644 index 000000000..70e30b861 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameterMemberParser.java @@ -0,0 +1,106 @@ +// +//package org.scijava.ops.struct; +// +//import java.lang.reflect.AnnotatedElement; +//import java.lang.reflect.Method; +//import java.lang.reflect.Type; +//import java.util.ArrayList; +//import java.util.List; +// +//import org.scijava.function.Container; +//import org.scijava.function.Mutable; +//import org.scijava.ops.util.AnnotationUtils; +//import org.scijava.param.FunctionalMethodType; +//import org.scijava.param.SynthesizedParameterMember; +//import org.scijava.param.ValidityProblem; +//import org.scijava.struct.ItemIO; +//import org.scijava.struct.Member; +//import org.scijava.types.Types; +// +//public class FunctionalParameterMemberParser implements +// MemberParser> +//{ +// +// @Override +// public List> parse(AnnotatedElement source) { +// // Search for the functional method of 'type' and map its signature to +// // ItemIO +// List fmts; +// try { +// fmts = findFunctionalMethodTypes(type); +// } +// catch (IllegalArgumentException e) { +// problems.add(new ValidityProblem("Could not find functional method of " + +// type.getTypeName())); +// return; +// } +// +// // Synthesize members +// List> fmtMembers = data.synthesizeMembers(fmts); +// +// for (Member m : fmtMembers) { +// String key = m.getKey(); +// final Type itemType = m.getType(); +// +// final boolean valid = checkValidity(m, key, Types.raw(itemType), false, +// names, problems); +// if (!valid) continue; +// items.add(m); +// names.add(m.getKey()); +// } +// } +// +// /** +// * Returns a list of {@link FunctionalMethodType}s describing the input and +// * output types of the functional method of the specified functional type. In +// * doing so, the return type of the method will me marked as +// * {@link ItemIO#OUTPUT} and the all method parameters as +// * {@link ItemIO#OUTPUT}, except for parameters annotated with +// * {@link Container} or {@link Mutable} which will be marked as +// * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the +// * specified type does not have a functional method in its hierarchy, +// * {@code null} will be returned.
+// * The order will be the following: method parameters from left to right, then +// * return type. +// * +// * @param functionalType +// * @return +// */ +// public static List findFunctionalMethodTypes( +// Type functionalType) +// { +// Method functionalMethod = findFunctionalMethod(Types.raw(functionalType)); +// if (functionalMethod == null) throw new IllegalArgumentException("Type " + +// functionalType + +// " is not a functional type, thus its functional method types cannot be determined"); +// +// Type paramfunctionalType = functionalType; +// if (functionalType instanceof Class) { +// paramfunctionalType = Types.parameterizeRaw((Class) functionalType); +// } +// +// List out = new ArrayList<>(); +// int i = 0; +// for (Type t : Types.getExactParameterTypes(functionalMethod, +// paramfunctionalType)) +// { +// final ItemIO ioType; +// if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, +// Container.class) != null) ioType = ItemIO.CONTAINER; +// else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, +// Mutable.class) != null) ioType = ItemIO.MUTABLE; +// else ioType = ItemIO.INPUT; +// out.add(new FunctionalMethodType(t, ioType)); +// i++; +// } +// +// Type returnType = Types.getExactReturnType(functionalMethod, +// paramfunctionalType); +// if (!returnType.equals(void.class)) { +// out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT)); +// } +// +// return out; +// } +// +//} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java similarity index 95% rename from scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java index f95cb5712..29c9930dc 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/JavadocParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java @@ -1,5 +1,5 @@ -package org.scijava.param; +package org.scijava.ops.struct; import com.github.therapi.runtimejavadoc.Comment; import com.github.therapi.runtimejavadoc.FieldJavadoc; @@ -296,8 +296,8 @@ private boolean validParameterTag(String tagType) { * @param fmts the list of inputs, outputs, and other types required by the Op */ @Override - public List> synthesizeMembers(List fmts) { - List> params = new ArrayList<>(); + public List> synthesizeMembers(List fmts) { + List> params = new ArrayList<>(); int ins = 0; int outs = 0; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java new file mode 100644 index 000000000..b2091e6a4 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java @@ -0,0 +1,27 @@ + +package org.scijava.ops.struct; + +import java.lang.reflect.Type; +import java.util.List; + +import org.scijava.struct.Member; + +/** + * Parses a set of {@link Member}s from a source {@link Object} + * + * @author Gabriel Selzer + * @param The {@link Type} of {@link Object}s parsable by this parser + * @param The {@link Type} of {@link Member}s returned by this parser + */ +public interface MemberParser> { + + /** + * parses {@code source} for a {@link List} of {@link Member}s, which is then + * returned + * + * @param source the {@link Object} to parse + * @return a {@link List} of {@link Member}s parsed from {@code source} + */ + List parse(S source); + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java new file mode 100644 index 000000000..00f7d243f --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java @@ -0,0 +1,11 @@ +package org.scijava.ops.struct; + +import java.util.List; + +import org.scijava.param.FunctionalMethodType; + +public interface ParameterData { + + public List> synthesizeMembers(List fmts); + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java new file mode 100644 index 000000000..104a1f3e8 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java @@ -0,0 +1,212 @@ + +package org.scijava.ops.struct; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import org.scijava.function.Container; +import org.scijava.function.Mutable; +import org.scijava.ops.util.AnnotationUtils; +import org.scijava.param.FunctionalMethodType; +import org.scijava.param.ValidityProblem; +import org.scijava.struct.ItemIO; +import org.scijava.struct.Member; +import org.scijava.types.Types; + +public class Structs { + + /** + * Helper to check for several modifiers at once. + * + * @param message + * @param problems + * @param actualModifiers + * @param requiredModifiers + */ + public static void checkModifiers(String message, final ArrayList problems, + final int actualModifiers, final boolean negate, final int... requiredModifiers) { + for (int mod : requiredModifiers) { + if (negate) { + if ((actualModifiers & mod) != 0) { + problems.add( + new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod))); + } + } else { + if ((actualModifiers & mod) == 0) { + problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod))); + } + } + } + } + + public static void parseFunctionalParameters( + final ArrayList> items, final Set names, + final ArrayList problems, Type type, ParameterData data) + { + // Search for the functional method of 'type' and map its signature to + // ItemIO + List fmts; + try { + fmts = findFunctionalMethodTypes(type); + } + catch (IllegalArgumentException e) { + problems.add(new ValidityProblem("Could not find functional method of " + + type.getTypeName())); + return; + } + + // Synthesize members + List> fmtMembers = data.synthesizeMembers(fmts); + + for (Member m : fmtMembers) { + String key = m.getKey(); + final Type itemType = m.getType(); + + final boolean valid = checkValidity(m, key, Types.raw(itemType), false, + names, problems); + if (!valid) continue; + items.add(m); + names.add(m.getKey()); + } + } + + /** + * Returns a list of {@link FunctionalMethodType}s describing the input and + * output types of the functional method of the specified functional type. In + * doing so, the return type of the method will me marked as + * {@link ItemIO#OUTPUT} and the all method parameters as + * {@link ItemIO#OUTPUT}, except for parameters annotated with + * {@link Container} or {@link Mutable} which will be marked as + * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the + * specified type does not have a functional method in its hierarchy, + * {@code null} will be returned.
+ * The order will be the following: method parameters from left to right, then + * return type. + * + * @param functionalType + * @return + */ + public static List findFunctionalMethodTypes( + Type functionalType) + { + Method functionalMethod = findFunctionalMethod(Types.raw(functionalType)); + if (functionalMethod == null) throw new IllegalArgumentException("Type " + + functionalType + + " is not a functional type, thus its functional method types cannot be determined"); + + Type paramfunctionalType = functionalType; + if (functionalType instanceof Class) { + paramfunctionalType = Types.parameterizeRaw((Class) functionalType); + } + + List out = new ArrayList<>(); + int i = 0; + for (Type t : Types.getExactParameterTypes(functionalMethod, + paramfunctionalType)) + { + final ItemIO ioType; + if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, + Container.class) != null) ioType = ItemIO.CONTAINER; + else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, + Mutable.class) != null) ioType = ItemIO.MUTABLE; + else ioType = ItemIO.INPUT; + out.add(new FunctionalMethodType(t, ioType)); + i++; + } + + Type returnType = Types.getExactReturnType(functionalMethod, + paramfunctionalType); + if (!returnType.equals(void.class)) { + out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT)); + } + + return out; + } + + /** + * Attempts to find the single functional method of the specified class, by + * scanning the for functional interfaces. If there is no functional + * interface, null will be returned. + * + * @param cls + * @return + */ + private static Method findFunctionalMethod(Class cls) { + Class iFace = findFunctionalInterface(cls); + if (iFace == null) { + return null; + } + + List nonDefaults = Arrays.stream(iFace.getMethods()).filter(m -> !m + .isDefault()).collect(Collectors.toList()); + + // The single non default method must be the functional one + if (nonDefaults.size() != 1) { + for (Class i : iFace.getInterfaces()) { + final Method result = findFunctionalMethod(i); + if (result != null) return result; + } + } + + return nonDefaults.get(0); + } + + /** + * Searches for a {@code @FunctionalInterface} annotated interface in the + * class hierarchy of the specified type. The first one that is found will be + * returned. If no such interface can be found, null will be returned. + * + * @param type + * @return + */ + public static Class findFunctionalInterface(Class type) { + if (type == null) return null; + if (type.getAnnotation(FunctionalInterface.class) != null) return type; + for (Class iface : type.getInterfaces()) { + final Class result = findFunctionalInterface(iface); + if (result != null) return result; + } + return findFunctionalInterface(type.getSuperclass()); + } + + private static boolean checkValidity(Member m, String name, Class type, + boolean isFinal, Set names, ArrayList problems) + { + boolean valid = true; + + if (names.contains(name)) { + // NB: Shadowed parameters are bad because they are ambiguous. + final String error = "Invalid duplicate parameter: " + name; + problems.add(new ValidityProblem(error)); + valid = false; + } + + if ((m.getIOType() == ItemIO.MUTABLE || m + .getIOType() == ItemIO.CONTAINER) && isImmutable(type)) + { + // NB: The MUTABLE and CONTAINER types signify that the parameter + // will be written to, but immutable parameters cannot be changed in + // such a manner, so it makes no sense to label them as such. + final String error = "Immutable " + m.getIOType() + " parameter: " + + name + " (" + type.getName() + " is immutable)"; + problems.add(new ValidityProblem(error)); + valid = false; + } + + return valid; + } + + private static boolean isImmutable(final Class type) { + // NB: All eight primitive types, as well as the boxed primitive + // wrapper classes, as well as strings, are immutable objects. + return Types.isNumber(type) || Types.isText(type) || // + Types.isBoolean(type); + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java similarity index 76% rename from scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java index 6f2b813f7..728de3882 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java @@ -1,5 +1,5 @@ -package org.scijava.param; +package org.scijava.ops.struct; import java.util.ArrayList; import java.util.List; @@ -9,8 +9,8 @@ public class SynthesizedParameterData implements ParameterData { @Override - public List> synthesizeMembers(List fmts) { - List> params = new ArrayList<>(); + public List> synthesizeMembers(List fmts) { + List> params = new ArrayList<>(); int ins, outs, containers, mutables; ins = outs = containers = mutables = 1; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java similarity index 87% rename from scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java index 52ab7fda9..85bdfd0ee 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/SynthesizedParameterMember.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java @@ -1,8 +1,9 @@ -package org.scijava.param; +package org.scijava.ops.struct; import java.lang.reflect.Type; +import org.scijava.param.ParameterMember; import org.scijava.struct.ItemIO; import org.scijava.struct.Member; @@ -12,7 +13,7 @@ * @author Gabriel Selzer * @param */ -public class SynthesizedParameterMember implements Member { +public class SynthesizedParameterMember implements ParameterMember { /** Type, or a subtype thereof, which houses the field. */ private final Type itemType; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java deleted file mode 100644 index 1a2b3fe9a..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterData.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.scijava.param; - -import java.util.List; - -import org.scijava.struct.Member; - -public interface ParameterData { - - public List> synthesizeMembers(List fmts); - -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java index b90ee54f6..02de07217 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java @@ -30,6 +30,9 @@ import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.simplify.Simplifier; +import org.scijava.ops.struct.JavadocParameterData; +import org.scijava.ops.struct.ParameterData; +import org.scijava.ops.struct.SynthesizedParameterData; import org.scijava.ops.util.AnnotationUtils; import org.scijava.struct.ItemIO; import org.scijava.struct.Member; From 870375c4c08e1db3794ad64956c408d7eae227bd Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Thu, 1 Jul 2021 11:13:23 -0500 Subject: [PATCH 18/31] Remove org.scijava.param package --- .../src/main/java/module-info.java | 4 +- .../java/org/scijava/ops/OpCandidate.java | 2 +- .../src/main/java/org/scijava/ops/OpInfo.java | 1 - .../main/java/org/scijava/ops/OpUtils.java | 68 ++- .../{param => ops}/ValidityException.java | 4 +- .../ops/impl/DefaultOpEnvironment.java | 6 +- .../org/scijava/ops/impl/LambdaTypeBaker.java | 9 +- .../scijava/ops/matcher/OpAdaptationInfo.java | 43 +- .../org/scijava/ops/matcher/OpClassInfo.java | 12 +- .../org/scijava/ops/matcher/OpFieldInfo.java | 10 +- .../org/scijava/ops/matcher/OpMethodInfo.java | 21 +- .../ops/simplify/SimplificationUtils.java | 10 +- .../ops/simplify/SimplifiedOpInfo.java | 44 +- .../struct/ClassOpDependencyMemberParser.java | 62 ++ .../struct/ClassParameterMemberParser.java | 46 ++ .../struct}/ConvertedParameterMember.java | 15 +- .../struct/FieldParameterMemberParser.java | 18 +- .../ops/struct/JavadocParameterData.java | 10 +- .../org/scijava/ops/struct/MemberParser.java | 5 +- .../MethodOpDependencyMemberParser.java | 64 ++ .../struct/MethodParameterMemberParser.java | 65 ++ .../ops/struct/OpRetypingMemberParser.java | 66 ++ .../org/scijava/ops/struct/ParameterData.java | 2 +- .../scijava/ops/struct/RetypingRequest.java | 29 + .../java/org/scijava/ops/struct/Structs.java | 43 +- .../ops/struct/SynthesizedParameterData.java | 2 +- .../struct/SynthesizedParameterMember.java | 3 +- .../java/org/scijava/ops/util/Inject.java | 27 +- .../org/scijava/ops/util/OpMethodUtils.java | 66 ++ .../org/scijava/param/ItemVisibility.java | 69 --- .../org/scijava/param/ParameterMember.java | 156 ----- .../org/scijava/param/ParameterStructs.java | 575 ------------------ .../org/scijava/param/ValidityProblem.java | 65 -- .../{param => ops}/JavadocParameterTest.java | 6 +- .../org/scijava/ops/OpCollectionTest.java | 1 - .../templates/main/java/module-info.vm | 1 - .../ops/adapt/lift/ComputerToIterables.vm | 1 - .../scijava/struct}/FunctionalMethodType.java | 4 +- .../types/inference/InterfaceInference.java | 22 + 39 files changed, 667 insertions(+), 990 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops}/ValidityException.java (92%) create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java rename scijava/scijava-ops/src/main/java/org/scijava/{param => ops/struct}/ConvertedParameterMember.java (56%) create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java rename scijava/scijava-ops/src/test/java/org/scijava/{param => ops}/JavadocParameterTest.java (95%) rename scijava/{scijava-ops/src/main/java/org/scijava/param => scijava-struct/src/main/java/org/scijava/struct}/FunctionalMethodType.java (89%) create mode 100644 scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java index 1893eca56..9f0655fc9 100644 --- a/scijava/scijava-ops/src/main/java/module-info.java +++ b/scijava/scijava-ops/src/main/java/module-info.java @@ -7,7 +7,6 @@ //TODO: rearrange packages to export only needed classes exports org.scijava.ops; //contains OpDependency interface - exports org.scijava.ops.core; // contains ExceptionUtils exports org.scijava.ops.matcher; exports org.scijava.ops.math; exports org.scijava.ops.simplify; @@ -15,7 +14,6 @@ exports org.scijava.ops.provenance; // TODO: move OpWrapper to its own package (org.scijava.ops.wrap??) exports org.scijava.ops.util; // contains OpWrapper interface - exports org.scijava.param; opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc; opens org.scijava.ops.log to therapi.runtime.javadoc; @@ -32,11 +30,11 @@ opens org.scijava.ops to therapi.runtime.javadoc, org.scijava; opens org.scijava.ops.util to therapi.runtime.javadoc; opens org.scijava.ops.matcher to therapi.runtime.javadoc; + opens org.scijava.ops.struct to therapi.runtime.javadoc; opens org.scijava.ops.simplify to therapi.runtime.javadoc; opens org.scijava.ops.stats to therapi.runtime.javadoc; opens org.scijava.ops.core to therapi.runtime.javadoc; opens org.scijava.ops.provenance.impl to therapi.runtime.javadoc, org.scijava; - opens org.scijava.param to therapi.runtime.javadoc; // FIXME: This is a file name and is thus unstable requires geantyref; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java index 27833ea99..4c31c8fa1 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpCandidate.java @@ -34,9 +34,9 @@ import java.util.List; import java.util.Map; +import org.scijava.ValidityProblem; import org.scijava.log.Logger; import org.scijava.ops.matcher.OpMatcher; -import org.scijava.param.ValidityProblem; import org.scijava.struct.Member; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java index 8251c0616..8ab8af11c 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java @@ -8,7 +8,6 @@ import java.util.Map; import org.scijava.log.Logger; -import org.scijava.param.ValidityException; import org.scijava.struct.Member; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java index 00b891d0a..0e8e7d9fb 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java @@ -29,6 +29,7 @@ package org.scijava.ops; +import java.lang.reflect.Method; import java.lang.reflect.Type; import java.util.Arrays; import java.util.Collections; @@ -36,12 +37,8 @@ import java.util.Objects; import java.util.stream.Collectors; +import org.scijava.ValidityProblem; import org.scijava.ops.OpCandidate.StatusCode; -import org.scijava.ops.struct.SynthesizedParameterMember; -import org.scijava.param.ParameterMember; -import org.scijava.param.ParameterStructs; -import org.scijava.param.ValidityException; -import org.scijava.param.ValidityProblem; import org.scijava.struct.Member; import org.scijava.struct.MemberInstance; import org.scijava.struct.Struct; @@ -236,9 +233,18 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second return paddedArgs; } + /** + * Determines whether {@link Member} {@code item} is required. + *

+ * TODO: This method is a relic of {@link ParameterMember}, and should be + * reconciled with the work in https://github.com/scijava/incubator/pull/32 + * + * @param item the {@link Member} that may or may not be required + * @return true iff {@code item} is required. + */ + @Deprecated public static boolean isRequired(final Member item) { - return item instanceof ParameterMember && // - ((ParameterMember) item).isRequired(); + return true; } public static List> injectableMembers(Struct struct) { @@ -307,11 +313,57 @@ private static void appendParam(final StringBuilder sb, final Member arg, } public static Class findFirstImplementedFunctionalInterface(final OpRef opRef) { - final Class functionalInterface = ParameterStructs + final Class functionalInterface = OpUtils .findFunctionalInterface(Types.raw(opRef.getType())); if (functionalInterface != null) { return functionalInterface; } return null; } + + /** + * Searches for a {@code @FunctionalInterface} annotated interface in the + * class hierarchy of the specified type. The first one that is found will + * be returned. If no such interface can be found, null will be returned. + * + * @param type + * @return + */ + public static Class findFunctionalInterface(Class type) { + if (type == null) return null; + if (type.getAnnotation(FunctionalInterface.class) != null) return type; + for (Class iface : type.getInterfaces()) { + final Class result = findFunctionalInterface(iface); + if (result != null) return result; + } + return findFunctionalInterface(type.getSuperclass()); + } + + /** + * Attempts to find the single functional method of the specified + * class, by scanning the for functional interfaces. If there + * is no functional interface, null will be returned. + * + * @param cls + * @return + */ + public static Method findFunctionalMethod(Class cls) { + Class iFace = findFunctionalInterface(cls); + if (iFace == null) { + return null; + } + + List nonDefaults = Arrays.stream(iFace.getMethods()) + .filter(m -> !m.isDefault()).collect(Collectors.toList()); + + // The single non default method must be the functional one + if (nonDefaults.size() != 1) { + for (Class i : iFace.getInterfaces()) { + final Method result = findFunctionalMethod(i); + if (result != null) return result; + } + } + + return nonDefaults.get(0); + } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java similarity index 92% rename from scijava/scijava-ops/src/main/java/org/scijava/param/ValidityException.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java index 01e238c8d..35f2079c9 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityException.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java @@ -1,8 +1,10 @@ -package org.scijava.param; +package org.scijava.ops; import java.util.Collections; import java.util.List; +import org.scijava.ValidityProblem; + /** * hasdjf * diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index 316e442e5..995bd3065 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -85,11 +85,11 @@ import org.scijava.ops.matcher.OpMethodInfo; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.ops.simplify.SimplifiedOpInfo; -import org.scijava.param.FunctionalMethodType; -import org.scijava.param.ParameterStructs; +import org.scijava.ops.struct.Structs; import org.scijava.plugin.Parameter; import org.scijava.plugin.PluginInfo; import org.scijava.plugin.PluginService; +import org.scijava.struct.FunctionalMethodType; import org.scijava.struct.ItemIO; import org.scijava.types.Nil; import org.scijava.types.TypeService; @@ -689,7 +689,7 @@ private OpRef inferOpRef(OpDependencyMember dependency, */ private OpRef inferOpRef(Type type, String name, Map, Type> typeVarAssigns) { - List fmts = ParameterStructs.findFunctionalMethodTypes(type); + List fmts = Structs.findFunctionalMethodTypes(type); if (fmts == null) return null; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java index b33f48eae..714ec6d11 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/LambdaTypeBaker.java @@ -5,9 +5,10 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import org.scijava.param.ParameterStructs; +import org.scijava.ops.OpUtils; import org.scijava.types.GenericTyped; import org.scijava.types.Types; +import org.scijava.types.inference.InterfaceInference; import javassist.CannotCompileException; import javassist.ClassPool; @@ -34,8 +35,8 @@ public static T bakeLambdaType(T originalOp, Type reifiedType) { private static void ensureImplementation(T originalOp, Type reifiedType) { Class opClass = originalOp.getClass(); - Class opFIFace = ParameterStructs.findFunctionalInterface(opClass); - Class typeFIFace = ParameterStructs.findFunctionalInterface(Types.raw(reifiedType)); + Class opFIFace = OpUtils.findFunctionalInterface(opClass); + Class typeFIFace = OpUtils.findFunctionalInterface(Types.raw(reifiedType)); if (!opFIFace.equals(typeFIFace)) { throw new IllegalArgumentException(originalOp + " does not implement " + Types.raw(reifiedType)); } @@ -173,7 +174,7 @@ private static String createFunctionalMethod(Type reifiedType) { // determine the name of the functional method Class raw = Types.raw(reifiedType); - Method m = ParameterStructs.singularAbstractMethod(raw); + Method m = InterfaceInference.singularAbstractMethod(raw); //-- signature -- // sb.append(generateSignature(m)); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java index 47e6158b9..4081cd839 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java @@ -1,22 +1,27 @@ + package org.scijava.ops.matcher; +import com.google.common.collect.Streams; + import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.function.Function; -import java.util.stream.Collectors; +import org.scijava.ValidityProblem; +import org.scijava.ops.BaseOpHints.Adaptation; import org.scijava.ops.Hints; import org.scijava.ops.OpDependencyMember; -import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.BaseOpHints.Adaptation; +import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; -import org.scijava.param.ParameterStructs; -import org.scijava.param.ValidityException; +import org.scijava.ops.struct.OpRetypingMemberParser; +import org.scijava.ops.struct.RetypingRequest; +import org.scijava.ops.struct.Structs; +import org.scijava.struct.FunctionalMethodType; +import org.scijava.struct.ItemIO; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; @@ -36,21 +41,32 @@ public class OpAdaptationInfo implements OpInfo { private Struct struct; private ValidityException validityException; - public OpAdaptationInfo(OpInfo srcInfo, Type type, Function adaptor) { + public OpAdaptationInfo(OpInfo srcInfo, Type type, + Function adaptor) + { this.srcInfo = srcInfo; this.type = type; this.adaptor = adaptor; - // NOTE: since the source Op has already been shown to be valid, there is not + // NOTE: since the source Op has already been shown to be valid, there is + // not // much for us to do here. + List problems = new ArrayList<>(); + List fmts = Structs.findFunctionalMethodTypes(type); + + RetypingRequest r = new RetypingRequest(srcInfo.struct(), fmts); + struct = Structs.from(r, problems, new OpRetypingMemberParser()); try { - struct = ParameterStructs.structOf(srcInfo, type); OpUtils.checkHasSingleOutput(struct); - } catch (ValidityException e) { - validityException = e; } + catch (ValidityException exc) { + problems.addAll(exc.problems()); + } + if (!problems.isEmpty()) validityException = new ValidityException( + problems); - List hintList = new ArrayList<>(srcInfo.declaredHints().getHints().values()); + List hintList = new ArrayList<>(srcInfo.declaredHints().getHints() + .values()); hintList.remove(Adaptation.ALLOWED); hintList.add(Adaptation.FORBIDDEN); this.hints = new ImmutableHints(hintList.toArray(String[]::new)); @@ -84,8 +100,7 @@ public double priority() { @Override public String implementationName() { - return srcInfo.implementationName() + " adapted to " + type - .toString(); + return srcInfo.implementationName() + " adapted to " + type.toString(); } /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java index b1cd7c8d2..3265d85c0 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java @@ -33,17 +33,21 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Type; +import java.util.ArrayList; import java.util.List; import org.scijava.Priority; +import org.scijava.ValidityProblem; import org.scijava.ops.Hints; import org.scijava.ops.OpDependencyMember; import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; +import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; -import org.scijava.param.ParameterStructs; -import org.scijava.param.ValidityException; +import org.scijava.ops.struct.ClassOpDependencyMemberParser; +import org.scijava.ops.struct.ClassParameterMemberParser; +import org.scijava.ops.struct.Structs; import org.scijava.plugin.Plugin; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; @@ -69,8 +73,10 @@ public OpClassInfo(final Class opClass) { public OpClassInfo(final Class opClass, final double priority) { this.opClass = opClass; + List problems = new ArrayList<>(); try { - struct = ParameterStructs.structOf(opClass); + struct = Structs.from(opClass, problems, new ClassParameterMemberParser(), new ClassOpDependencyMemberParser()); +// struct = ParameterStructs.structOf(opClass); OpUtils.checkHasSingleOutput(struct); } catch (ValidityException e) { validityException = e; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java index 2e4e0f19d..8ca3eae9a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java @@ -37,15 +37,16 @@ import java.util.List; import org.scijava.Priority; +import org.scijava.ValidityProblem; import org.scijava.ops.Hints; import org.scijava.ops.OpField; import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; +import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; -import org.scijava.param.ParameterStructs; -import org.scijava.param.ValidityException; -import org.scijava.param.ValidityProblem; +import org.scijava.ops.struct.FieldParameterMemberParser; +import org.scijava.ops.struct.Structs; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; @@ -90,7 +91,8 @@ public OpFieldInfo(final Object instance, final Field field) { // NB: Subclassing a collection and inheriting its fields is NOT // ALLOWED! try { - struct = ParameterStructs.structOf(field); + struct = Structs.from(field, problems, new FieldParameterMemberParser()); +// struct = ParameterStructs.structOf(field); OpUtils.checkHasSingleOutput(struct); // NB: Contextual parameters not supported for now. } catch (ValidityException e) { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java index c10b784cc..0cb951941 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java @@ -43,6 +43,7 @@ import java.util.stream.Collectors; import org.scijava.Priority; +import org.scijava.ValidityProblem; import org.scijava.ops.Hints; import org.scijava.ops.OpDependency; import org.scijava.ops.OpDependencyMember; @@ -50,15 +51,18 @@ import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; +import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; +import org.scijava.ops.struct.MethodOpDependencyMemberParser; +import org.scijava.ops.struct.MethodParameterMemberParser; +import org.scijava.ops.struct.Structs; import org.scijava.ops.util.Adapt; -import org.scijava.param.ParameterStructs; -import org.scijava.param.ValidityException; -import org.scijava.param.ValidityProblem; +import org.scijava.ops.util.OpMethodUtils; import org.scijava.struct.Member; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; import org.scijava.types.Types; +import org.scijava.types.inference.InterfaceInference; import javassist.CannotCompileException; import javassist.ClassPool; @@ -101,16 +105,14 @@ public OpMethodInfo(final Method method) { // determine the functional interface this Op should implement final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class); try { - opType = ParameterStructs.getOpMethodType(methodAnnotation.type(), + opType = OpMethodUtils.getOpMethodType(methodAnnotation.type(), method); - struct = ParameterStructs.structOf(method.getDeclaringClass(), method); + struct = Structs.from(method, problems, new MethodParameterMemberParser(), new MethodOpDependencyMemberParser()); +// struct = ParameterStructs.structOf(method.getDeclaringClass(), method); } catch (IllegalArgumentException e) { problems.add(new ValidityProblem(e)); } - catch (final ValidityException e) { - problems.addAll(e.problems()); - } validityException = problems.isEmpty() ? null : new ValidityException( problems); } @@ -278,7 +280,7 @@ private String createFunctionalMethod(Method m) { StringBuilder sb = new StringBuilder(); // determine the name of the functional method - String methodName = ParameterStructs.singularAbstractMethod(Types.raw( + String methodName = InterfaceInference.singularAbstractMethod(Types.raw( opType)).getName(); // method modifiers @@ -366,4 +368,5 @@ private Hints formHints(OpHints h) { if (h == null) return new ImmutableHints(new String[0]); return new ImmutableHints(h.hints()); } + } \ No newline at end of file diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java index b9bd9f7f9..aedc0181c 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java @@ -24,12 +24,12 @@ import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpRef; -import org.scijava.ops.matcher.MatchingUtils; +import org.scijava.ops.OpUtils; import org.scijava.ops.util.AnnotationUtils; -import org.scijava.param.ParameterStructs; import org.scijava.types.Nil; import org.scijava.types.Types; import org.scijava.types.inference.GenericAssignability; +import org.scijava.types.inference.InterfaceInference; import javassist.CannotCompileException; import javassist.ClassPool; @@ -117,9 +117,9 @@ private static Type[] typesFromOpType(Class opType, Method fMethod, Type... t // TODO: extract this method to a more general utility class public static Method findFMethod(Class c) { - Class fIface = ParameterStructs.findFunctionalInterface(c); + Class fIface = OpUtils.findFunctionalInterface(c); if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!"); - return ParameterStructs.singularAbstractMethod(fIface); + return InterfaceInference.singularAbstractMethod(fIface); } /** @@ -478,7 +478,7 @@ private static String createFunctionalMethod(SimplificationMetadata metadata) { StringBuilder sb = new StringBuilder(); // determine the name of the functional method - Method m = ParameterStructs.singularAbstractMethod(metadata.opType()); + Method m = InterfaceInference.singularAbstractMethod(metadata.opType()); // determine the name of the output: String opOutput = ""; int ioIndex = metadata.ioArgIndex(); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java index 0be15c7e8..cf0f992e0 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java @@ -1,23 +1,34 @@ package org.scijava.ops.simplify; +import com.google.common.collect.Streams; + import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import java.util.Objects; +import java.util.function.BiFunction; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.scijava.Priority; +import org.scijava.ValidityProblem; import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.Hints; import org.scijava.ops.Op; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; +import org.scijava.ops.ValidityException; import org.scijava.ops.conversionLoss.LossReporter; import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.matcher.OpMatchingException; -import org.scijava.param.ParameterStructs; -import org.scijava.param.ValidityException; +import org.scijava.ops.struct.OpRetypingMemberParser; +import org.scijava.ops.struct.RetypingRequest; +import org.scijava.ops.struct.Structs; +import org.scijava.struct.FunctionalMethodType; +import org.scijava.struct.ItemIO; import org.scijava.struct.Member; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; @@ -38,23 +49,36 @@ public class SimplifiedOpInfo implements OpInfo { private ValidityException validityException; public SimplifiedOpInfo(OpInfo info, OpEnvironment env, SimplificationMetadata metadata) { + List problems = new ArrayList<>(); this.srcInfo = info; this.metadata = metadata; - Type[] inputs = metadata.originalInputs(); - Type output = metadata.focusedOutput(); - this.opType = SimplificationUtils.retypeOpType(info.opType(), inputs, output); - try { - this.struct = ParameterStructs.structOf(info, opType); - } - catch (ValidityException exc) { - validityException = exc; + // generate new input fmts + Type[] inputTypes = metadata.originalInputs(); + Type outputType = metadata.focusedOutput(); + List> ioMembers = info.struct().members(); + ioMembers.removeIf(m -> m.getIOType() == ItemIO.NONE); + int index = 0; + List fmts = new ArrayList<>(); + for (Member m : ioMembers) { + Type newType = m.isInput() ? inputTypes[index++] : m.isOutput() + ? outputType : null; + fmts.add(new FunctionalMethodType(newType, m.getIOType())); } + // generate new output fmt + this.opType = SimplificationUtils.retypeOpType(info.opType(), inputTypes, + outputType); + RetypingRequest r = new RetypingRequest(info.struct(), fmts); + this.struct = Structs.from(r, problems, new OpRetypingMemberParser()); this.priority = calculatePriority(info, metadata, env); List hintList = new ArrayList<>(srcInfo.declaredHints().getHints().values()); hintList.remove(Simplification.ALLOWED); hintList.add(Simplification.FORBIDDEN); this.hints = new ImmutableHints(hintList.toArray(String[]::new)); + + if(!problems.isEmpty()) { + validityException = new ValidityException(problems); + } } public OpInfo srcInfo() { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java new file mode 100644 index 000000000..7ce8575bc --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java @@ -0,0 +1,62 @@ + +package org.scijava.ops.struct; + +import java.lang.reflect.Field; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; + +import org.scijava.ValidityProblem; +import org.scijava.ops.FieldOpDependencyMember; +import org.scijava.ops.OpDependency; +import org.scijava.ops.ValidityException; +import org.scijava.util.ClassUtils; + +public class ClassOpDependencyMemberParser implements + MemberParser, FieldOpDependencyMember> +{ + + @Override + public List> parse(Class source) + throws ValidityException + { + if (source == null) return null; + + final ArrayList> items = new ArrayList<>(); + final ArrayList problems = new ArrayList<>(); + + // NB: Reject abstract classes. + Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT); + + // Parse field level @OpDependency annotations. + parseFieldOpDependencies(items, problems, source); + + // Fail if there were any problems. + if (!problems.isEmpty()) throw new ValidityException(problems); + + return items; + } + + private static void parseFieldOpDependencies(final List> items, + final List problems, Class annotatedClass) + { + final List fields = ClassUtils.getAnnotatedFields(annotatedClass, + OpDependency.class); + for (final Field f : fields) { + f.setAccessible(true); + final boolean isFinal = Modifier.isFinal(f.getModifiers()); + if (isFinal) { + final String name = f.getName(); + // Final fields are bad because they cannot be modified. + final String error = "Invalid final Op dependency field: " + name; + problems.add(new ValidityProblem(error)); + // Skip invalid Op dependencies. + continue; + } + final FieldOpDependencyMember item = new FieldOpDependencyMember<>(f, + annotatedClass); + items.add(item); + } + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java new file mode 100644 index 000000000..c07433925 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java @@ -0,0 +1,46 @@ + +package org.scijava.ops.struct; + +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.scijava.ValidityProblem; +import org.scijava.ops.ValidityException; + +public class ClassParameterMemberParser implements + MemberParser, SynthesizedParameterMember> +{ + + @Override + public List> parse(Class source) + throws ValidityException + { + if (source == null) return null; + + final ArrayList> items = new ArrayList<>(); + final ArrayList problems = new ArrayList<>(); + final Set names = new HashSet<>(); + + // NB: Reject abstract classes. + Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT); + + // obtain a parameterData (preferably one that scrapes the javadoc) + ParameterData paramData; + try { + paramData = new JavadocParameterData(source); + } catch(NullPointerException | IllegalArgumentException e) { + paramData = new SynthesizedParameterData(); + } + + Structs.parseFunctionalParameters(items, names, problems, source, paramData); + + // Fail if there were any problems. + if (!problems.isEmpty()) throw new ValidityException(problems); + + return items; + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java similarity index 56% rename from scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java index 781839350..150d6e132 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ConvertedParameterMember.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ConvertedParameterMember.java @@ -1,7 +1,8 @@ -package org.scijava.param; +package org.scijava.ops.struct; import java.lang.reflect.Type; +import org.scijava.struct.FunctionalMethodType; import org.scijava.struct.ItemIO; import org.scijava.struct.Member; @@ -16,10 +17,16 @@ public class ConvertedParameterMember implements Member{ final Member original; final Type newType; + final ItemIO ioType; - public ConvertedParameterMember(Member original, Type newType) { + public ConvertedParameterMember(Member original, FunctionalMethodType newType) { this.original = original; - this.newType = newType; + this.newType = newType.type(); + this.ioType = newType.itemIO(); + } + + public static ConvertedParameterMember from(Member original, FunctionalMethodType newType) { + return new ConvertedParameterMember<>(original, newType); } @Override @@ -39,7 +46,7 @@ public Type getType() { @Override public ItemIO getIOType() { - return original.getIOType(); + return ioType; } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java index a2a5f22ff..f4f20ddea 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java @@ -9,9 +9,8 @@ import java.util.List; import java.util.Set; -import org.scijava.param.ValidityException; -import org.scijava.param.ValidityProblem; -import org.scijava.struct.Member; +import org.scijava.ValidityProblem; +import org.scijava.ops.ValidityException; import org.scijava.types.Types; public class FieldParameterMemberParser implements @@ -19,9 +18,11 @@ public class FieldParameterMemberParser implements { @Override - public List> parse(Field source) { + public List> parse(Field source) + throws ValidityException + { + if (source == null) return null; Class c = source.getDeclaringClass(); - if (c == null || source == null) return null; // obtain a parameterData (preferably one that scrapes the javadoc) ParameterData paramData; try { @@ -37,9 +38,10 @@ public List> parse(Field source) { final Set names = new HashSet<>(); final Type fieldType = Types.fieldType(source, c); - Structs.checkModifiers(source.toString() + ": ", problems, source.getModifiers(), - false, Modifier.FINAL); - Structs.parseFunctionalParameters(items, names, problems, fieldType, paramData); + Structs.checkModifiers(source.toString() + ": ", problems, source + .getModifiers(), false, Modifier.FINAL); + Structs.parseFunctionalParameters(items, names, problems, fieldType, + paramData); // Fail if there were any problems. if (!problems.isEmpty()) { throw new ValidityException(problems); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java index 29c9930dc..91653983a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/JavadocParameterData.java @@ -19,9 +19,11 @@ import org.scijava.ops.OpDependency; import org.scijava.ops.OpInfo; -import org.scijava.ops.simplify.SimplificationUtils; +import org.scijava.ops.OpUtils; +import org.scijava.struct.FunctionalMethodType; import org.scijava.struct.Member; import org.scijava.types.Types; +import org.scijava.types.inference.InterfaceInference; /** * Class able to scrape Op parameter metadata off the Op's Javadoc. @@ -56,7 +58,7 @@ public JavadocParameterData(Class c) { * @param f the field */ public JavadocParameterData(Field f) { - Method sam = ParameterStructs.singularAbstractMethod(f.getType()); + Method sam = InterfaceInference.singularAbstractMethod(f.getType()); FieldJavadoc doc = RuntimeJavadoc.getJavadoc(f); long numIns = sam.getParameterCount(); long numOuts = 1; // There is always one output @@ -75,7 +77,7 @@ public JavadocParameterData(OpInfo info, Type newType) { // this method is called when the op is adapted/simplified. In the case of // adaptation, the op's output might shift from a pure output to an input, // or might shift from a container to a pure output. We - Method sam = ParameterStructs.singularAbstractMethod(Types.raw(newType)); + Method sam = InterfaceInference.singularAbstractMethod(Types.raw(newType)); if (sam.getParameterCount() > inputs.size()) { inputs.add(output); } @@ -123,7 +125,7 @@ public String returnDescription() { */ private Method getOpMethod(Class c) throws NoSuchMethodException { // NB this is the functional method w.r.t. the interface, not w.r.t. the Op - Method fMethod = SimplificationUtils.findFMethod(c); + Method fMethod = OpUtils.findFunctionalMethod(c); Type[] paramTypes = Types.getExactParameterTypes(fMethod, c); Class[] rawParamTypes = Arrays.stream(paramTypes).map(t -> Types.raw(t)) .toArray(Class[]::new); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java index b2091e6a4..860c41a16 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java @@ -4,6 +4,7 @@ import java.lang.reflect.Type; import java.util.List; +import org.scijava.ops.ValidityException; import org.scijava.struct.Member; /** @@ -21,7 +22,9 @@ public interface MemberParser> { * * @param source the {@link Object} to parse * @return a {@link List} of {@link Member}s parsed from {@code source} + * @throws {@link ValidityException} when the source of the {@link Member}s is + * improperly declared, formatted */ - List parse(S source); + List parse(S source) throws ValidityException; } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java new file mode 100644 index 000000000..22a524b07 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java @@ -0,0 +1,64 @@ + +package org.scijava.ops.struct; + +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.scijava.ValidityProblem; +import org.scijava.ops.MethodParameterOpDependencyMember; +import org.scijava.ops.OpDependency; +import org.scijava.ops.ValidityException; + +public class MethodOpDependencyMemberParser implements + MemberParser> +{ + + @Override + public List> parse(Method source) + throws ValidityException + { + if (source == null) return null; + + source.setAccessible(true); + + final ArrayList> items = new ArrayList<>(); + final ArrayList problems = new ArrayList<>(); + + // Parse method level @OpDependency annotations. + parseMethodOpDependencies(items, source); + + // Fail if there were any problems. + if (!problems.isEmpty()) throw new ValidityException(problems); + + return items; + } + + private static void parseMethodOpDependencies(final List> items, + final Method annotatedMethod) + { + final java.lang.reflect.Parameter[] methodParams = annotatedMethod + .getParameters(); + final java.lang.reflect.Parameter[] opDependencyParams = getOpDependencies(methodParams); + + for (java.lang.reflect.Parameter param : opDependencyParams) { + final OpDependency dependency = param.getAnnotation(OpDependency.class); + final Type methodParamType = param.getParameterizedType(); + final MethodParameterOpDependencyMember item = new MethodParameterOpDependencyMember<>( + param, methodParamType, dependency); + items.add(item); + } + } + + private static java.lang.reflect.Parameter[] getOpDependencies( + java.lang.reflect.Parameter[] methodParams) + { + return Arrays // + .stream(methodParams) // + .filter(param -> param.getAnnotation(OpDependency.class) != null) // + .toArray(java.lang.reflect.Parameter[]::new); + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java new file mode 100644 index 000000000..ef6ce4f40 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java @@ -0,0 +1,65 @@ + +package org.scijava.ops.struct; + +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.scijava.ValidityProblem; +import org.scijava.ops.OpMethod; +import org.scijava.ops.ValidityException; +import org.scijava.ops.util.OpMethodUtils; +import org.scijava.types.Types; + +public class MethodParameterMemberParser implements + MemberParser> +{ + + @Override + public List> parse(Method source) + throws ValidityException + { + if (source == null) return null; + + source.setAccessible(true); + + // obtain a parameterData (preferably one that scrapes the javadoc) + ParameterData paramData; + try { + paramData = new JavadocParameterData(source); + } + catch (IllegalArgumentException e) { + paramData = new SynthesizedParameterData(); + } + + final ArrayList> items = new ArrayList<>(); + final ArrayList problems = new ArrayList<>(); + final Set names = new HashSet<>(); + final OpMethod methodAnnotation = source.getAnnotation(OpMethod.class); + + // Determine functional type + Type functionalType; + try { + functionalType = OpMethodUtils.getOpMethodType(methodAnnotation.type(), source); + } + catch (IllegalArgumentException e) { + problems.add(new ValidityProblem(e.getMessage())); + functionalType = Types.parameterizeRaw(methodAnnotation.type()); + } + + // Parse method level @Parameter annotations. + Structs.parseFunctionalParameters(items, names, problems, functionalType, + paramData); + + // Fail if there were any problems. + if (!problems.isEmpty()) throw new ValidityException(problems); + + return items; + } + + + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java new file mode 100644 index 000000000..d9abf3635 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java @@ -0,0 +1,66 @@ + +package org.scijava.ops.struct; + +import java.util.ArrayList; +import java.util.List; + +import org.scijava.ops.ValidityException; +import org.scijava.ops.simplify.SimplifiedOpInfo; +import org.scijava.struct.FunctionalMethodType; +import org.scijava.struct.ItemIO; +import org.scijava.struct.Member; +import org.scijava.struct.Struct; + +public class OpRetypingMemberParser implements + MemberParser> +{ + + /** + * Generates a new {@link List} with retyped {@link Member}s. Using + * {@code originalStruct} as a template, this method retypes the inputs of + * {@code originalStruct} using {@code inputs}, and the output using + * {@code output}. + *

+ * This method makes a couple of assumptions: + *

    + *
  1. That {@code srcStruct} is valid + *
  2. That there are {@code inputs.length} input {@link Member}s in + * {@code srcStruct} + *
  3. That there is one output {@link Member} in {@code srcStruct} + *
+ * We should consider adding the evalutation of these assumptions + * + * @param source the {@link RetypingRequest} from which we create the new + * {@link List} of {@link Member}s + * @return a new {@link Struct} reflecting the simplified arguments / focused + * output of this {@link SimplifiedOpInfo} + */ + @Override + public List> parse(RetypingRequest source) + throws ValidityException + { + List newFmts = source.newFmts(); + FunctionalMethodType outputFmt = newFmts.stream().filter(fmt -> fmt + .itemIO() == ItemIO.OUTPUT || fmt.itemIO() == ItemIO.MUTABLE || fmt + .itemIO() == ItemIO.CONTAINER).findFirst().get(); + List> newMembers = new ArrayList<>(); + int inputIndex = 0; + for (Member m : source.struct().members()) { + if (m.isInput()) { + m = ConvertedParameterMember.from(m, newFmts.get(inputIndex++)); + } + else if (m.isOutput()) { + m = ConvertedParameterMember.from(m, outputFmt); + } + newMembers.add(m); + } + return newMembers; + } + + public List> parse(Struct s, List newFmts) + throws ValidityException + { + return parse(new RetypingRequest(s, newFmts)); + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java index 00f7d243f..515452df3 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ParameterData.java @@ -2,7 +2,7 @@ import java.util.List; -import org.scijava.param.FunctionalMethodType; +import org.scijava.struct.FunctionalMethodType; public interface ParameterData { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java new file mode 100644 index 000000000..f141f9987 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/RetypingRequest.java @@ -0,0 +1,29 @@ + +package org.scijava.ops.struct; + +import java.util.List; + +import org.scijava.struct.FunctionalMethodType; +import org.scijava.struct.Struct; + +public class RetypingRequest { + + private final Struct originalStruct; + private final List newFmts; + + public RetypingRequest(Struct originalStruct, + List newFmts) + { + this.originalStruct = originalStruct; + this.newFmts = newFmts; + } + + public Struct struct() { + return originalStruct; + } + + public List newFmts() { + return newFmts; + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java index 104a1f3e8..3171c5cea 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java @@ -10,17 +10,36 @@ import java.util.Set; import java.util.stream.Collectors; +import org.scijava.ValidityProblem; import org.scijava.function.Container; import org.scijava.function.Mutable; +import org.scijava.ops.ValidityException; import org.scijava.ops.util.AnnotationUtils; -import org.scijava.param.FunctionalMethodType; -import org.scijava.param.ValidityProblem; +import org.scijava.struct.FunctionalMethodType; import org.scijava.struct.ItemIO; import org.scijava.struct.Member; +import org.scijava.struct.Struct; +import org.scijava.struct.StructInstance; import org.scijava.types.Types; public class Structs { + @SafeVarargs + public static Struct from(S source, List problems, + MemberParser>... parsers) + { + List> members = new ArrayList<>(); + for (MemberParser> p : parsers) { + try { + members.addAll(p.parse(source)); + } + catch (ValidityException e) { + problems.addAll(e.problems()); + } + } + return () -> members; + } + /** * Helper to check for several modifiers at once. * @@ -64,7 +83,7 @@ public static void parseFunctionalParameters( // Synthesize members List> fmtMembers = data.synthesizeMembers(fmts); - for (Member m : fmtMembers) { + for (SynthesizedParameterMember m : fmtMembers) { String key = m.getKey(); final Type itemType = m.getType(); @@ -209,4 +228,22 @@ private static boolean isImmutable(final Class type) { Types.isBoolean(type); } + /** + * Convenience method to call + * {@link Structs#from(Object, List, MemberParser...)} dot + * {@link Struct#createInstance(Object)} + * + * @param object the {@link Object} from which the {@link StructInstance} is + * created. + * @return an instance of the {@link Struct} created from {@code object} + * @throws ValidityException + */ + public static StructInstance create(final C object) + throws ValidityException + { + Struct s = from(object.getClass(), new ArrayList<>(), + new ClassParameterMemberParser(), new ClassOpDependencyMemberParser()); + return s.createInstance(object); + } + } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java index 728de3882..894e6369c 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterData.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; -import org.scijava.struct.Member; +import org.scijava.struct.FunctionalMethodType; public class SynthesizedParameterData implements ParameterData { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java index 85bdfd0ee..7771a9ba1 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/SynthesizedParameterMember.java @@ -3,7 +3,6 @@ import java.lang.reflect.Type; -import org.scijava.param.ParameterMember; import org.scijava.struct.ItemIO; import org.scijava.struct.Member; @@ -13,7 +12,7 @@ * @author Gabriel Selzer * @param */ -public class SynthesizedParameterMember implements ParameterMember { +public class SynthesizedParameterMember implements Member { /** Type, or a subtype thereof, which houses the field. */ private final Type itemType; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java index e359ca0d2..4a381e13a 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java @@ -7,8 +7,7 @@ import org.scijava.command.Command; import org.scijava.ops.OpDependencyMember; -import org.scijava.param.ParameterStructs; -import org.scijava.param.ValidityException; +import org.scijava.ops.ValidityException; import org.scijava.struct.ItemIO; import org.scijava.struct.StructInstance; import org.scijava.struct.ValueAccessibleMemberInstance; @@ -80,28 +79,4 @@ private static List> filterAccessibles( } } - public static class Commands { - private Commands() { - } - - public static void inputs(Command command, Object... objs) { - Structs.inputs(commandToStructInstance(command), objs); - } - - public static void outputs(Command command, Object... objs) { - Structs.outputs(commandToStructInstance(command), objs); - } - - public static void all(Command command, Object... objs) { - Structs.all(commandToStructInstance(command), objs); - } - - public static StructInstance commandToStructInstance(Command command) { - try { - return ParameterStructs.create(command); - } catch (ValidityException e) { - throw new IllegalArgumentException("Can't inject command", e); - } - } - } } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java new file mode 100644 index 000000000..339f67181 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/OpMethodUtils.java @@ -0,0 +1,66 @@ +package org.scijava.ops.util; + +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.util.Arrays; +import java.util.HashMap; +import java.util.Map; + +import org.scijava.ops.OpDependency; +import org.scijava.types.Types; +import org.scijava.types.inference.GenericAssignability; +import org.scijava.types.inference.InterfaceInference; + +public class OpMethodUtils { + + public static Type getOpMethodType(Class opClass, Method opMethod) { + // since type is a functional interface, it has (exactly) one abstract + // declared method (the method that our OpMethod is emulating). + Method abstractMethod = InterfaceInference.singularAbstractMethod(opClass); + Type[] typeMethodParams = abstractMethod.getGenericParameterTypes(); + java.lang.reflect.Parameter[] opMethodParams = getOpParams(opMethod + .getParameters()); + + if (typeMethodParams.length != opMethodParams.length) { + throw new IllegalArgumentException("Number of parameters in OpMethod" + + opMethod + + " does not match the required number of parameters for functional method of FunctionalInterface " + + opClass); + } + Map, Type> typeVarAssigns = new HashMap<>(); + + // map params of OpMethod to type variables of abstract method of functional + // interface (along with return type if applicable) + // TODO: not sure how this handles when there are type variables. + GenericAssignability.inferTypeVariables(typeMethodParams, getOpParamTypes( + opMethodParams), typeVarAssigns); + if (abstractMethod.getReturnType() != void.class) { + GenericAssignability.inferTypeVariables(new Type[] { abstractMethod + .getGenericReturnType() }, new Type[] { opMethod + .getGenericReturnType() }, typeVarAssigns); + } + + // parameterize opClass + return Types.parameterize(opClass, typeVarAssigns); + } + + public static java.lang.reflect.Parameter[] getOpParams( + java.lang.reflect.Parameter[] methodParams) + { + return Arrays // + .stream(methodParams) // + .filter(param -> param.getAnnotation(OpDependency.class) == null) // + .toArray(java.lang.reflect.Parameter[]::new); + } + + public static Type[] getOpParamTypes( + java.lang.reflect.Parameter[] methodParams) + { + return Arrays // + .stream(methodParams) // + .filter(param -> param.getAnnotation(OpDependency.class) == null) // + .map(param -> param.getParameterizedType()).toArray(Type[]::new); + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java deleted file mode 100644 index fdd6d0f3d..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ItemVisibility.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * #%L - * SciJava Common shared library for SciJava software. - * %% - * Copyright (C) 2009 - 2017 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck - * Institute of Molecular Cell Biology and Genetics, University of - * Konstanz, and KNIME GmbH. - * %% - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * #L% - */ - -package org.scijava.param; - -/** - * Defines the "visibility" of a parameter. - * - * @author Curtis Rueden - */ -public enum ItemVisibility { - - /** - * Item is included in the history for purposes of data provenance, and - * included as a parameter when recording scripts. - */ - NORMAL, - - /** - * Item is excluded from the history for the purposes of data provenance, but - * still included as a parameter when recording scripts. - */ - TRANSIENT, - - /** - * Item is excluded from the history for the purposes of data provenance, and - * also excluded as a parameter when recording scripts. This option should - * only be used for items with no effect on the final output, such as a - * "verbose" flag. - */ - INVISIBLE, - - /** - * As {@link #INVISIBLE}, and further indicating that the item's value is - * intended as a message to the user (e.g., in the input harvester panel) - * rather than an actual parameter to the module execution. - */ - MESSAGE - -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java deleted file mode 100644 index 66a9770f6..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterMember.java +++ /dev/null @@ -1,156 +0,0 @@ -package org.scijava.param; - -import java.util.Arrays; -import java.util.List; - -import org.scijava.struct.Member; - -/** - * A {@link Member} with extra commonly useful metadata. - *

- * This metadata is aligned with—but not explicitly bound to—the - * fields of the {@code @Parameter} annotation type. As such, other code such as - * the {@code org.scijava.script} package can use this interface without being - * bound to the Java-specific {@code @Parameter} annotation type. - *

- * - * @author Curtis Rueden - * @see Parameter - */ -public interface ParameterMember extends Member { - - /** Gets the visibility of the parameter. */ - // TODO: fork ItemVisibility and rename to MemberVisibility - default ItemVisibility getVisibility() { - return ItemVisibility.NORMAL; - } - - /** Gets whether the parameter value is allowed to be auto-filled. */ - default boolean isAutoFill() { - return true; - } - - /** Gets whether the parameter value must be specified (i.e., no default). */ - default boolean isRequired() { - return true; - } - - /** Gets whether to remember the most recent value of the parameter. */ - default boolean isPersisted() { - return getPersistKey() != null; - } - - /** Gets the key to use for saving the value persistently. */ - default String getPersistKey() { - return null; - } - - /** Gets the function that is called to initialize the parameter's value. */ - default String getInitializer() { - return null; - } - - /** Gets the function that is called to validate the parameter's value. */ - default String getValidater() { - return null; - } - - /** - * Gets the function that is called whenever this parameter changes. - *

- * This mechanism enables interdependent parameters of various types. For - * example, two int parameters "width" and "height" could update each other - * when another boolean "Preserve aspect ratio" flag is set. - *

- */ - default String getCallback() { - return null; - } - - /** - * Gets the preferred widget style to use when rendering the parameter in a - * user interface. - */ - default String getWidgetStyle() { - return null; - } - - /** Gets the default value. */ - default Object getDefaultValue() { - return null; - } - - /** Gets the minimum allowed value (if applicable). */ - default Object getMinimumValue() { - return null; - } - - /** Gets the maximum allowed value (if applicable). */ - default Object getMaximumValue() { - return null; - } - - /** - * Gets the "soft" minimum value (if applicable). - *

- * The soft minimum is a hint for use in bounded scenarios, such as rendering - * in a user interface with a slider or scroll bar widget; the parameter value - * will not actually be clamped to the soft bounds, but they may be used in - * certain circumstances where appropriate. - *

- */ - default Object getSoftMinimum() { - // NB: Return hard minimum by default. - return getMinimumValue(); - } - - /** - * Gets the "soft" maximum value (if applicable). - *

- * The soft maximum is a hint for use in bounded scenarios, such as rendering - * in a user interface with a slider or scroll bar widget; the parameter value - * will not actually be clamped to the soft bounds, but they may be used in - * certain circumstances where appropriate. - *

- */ - default Object getSoftMaximum() { - // NB: Return hard maximum by default. - return getMaximumValue(); - } - - /** - * Gets the preferred step size to use when rendering the parameter in a user - * interface (if applicable). - */ - default Object getStepSize() { - return null; - } - - /** Gets the list of possible values. */ - default List getChoices() { - final Class rawType = getRawType(); - final T[] choices = rawType.getEnumConstants(); - return choices == null ? null : Arrays.asList(choices); - } - - // -- BasicDetails methods -- - - // TODO: Reconcile with BasicDetails. - // We need BasicDetails to be read-only, and then have - // MutableBasicDetails(?) which adds the setters. - - /** Gets a human-readable label. */ - default String getLabel() { - return getKey(); - } - - /** Returns true iff the given key is defined. */ - default boolean has(@SuppressWarnings("unused") String key) { - return false; - } - - /** Gets the value of the given key, or null if undefined. */ - default String get(@SuppressWarnings("unused") String key) { - return null; - } -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java deleted file mode 100644 index 02de07217..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ParameterStructs.java +++ /dev/null @@ -1,575 +0,0 @@ - -package org.scijava.param; - -import io.leangen.geantyref.AnnotationFormatException; -import io.leangen.geantyref.TypeFactory; - -import java.lang.reflect.Field; -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; -import java.util.ArrayDeque; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Deque; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.function.Function; -import java.util.stream.Collectors; - -import org.scijava.function.Container; -import org.scijava.function.Mutable; -import org.scijava.ops.FieldOpDependencyMember; -import org.scijava.ops.MethodParameterOpDependencyMember; -import org.scijava.ops.OpDependency; -import org.scijava.ops.OpDependencyMember; -import org.scijava.ops.OpInfo; -import org.scijava.ops.OpMethod; -import org.scijava.ops.simplify.Simplifier; -import org.scijava.ops.struct.JavadocParameterData; -import org.scijava.ops.struct.ParameterData; -import org.scijava.ops.struct.SynthesizedParameterData; -import org.scijava.ops.util.AnnotationUtils; -import org.scijava.struct.ItemIO; -import org.scijava.struct.Member; -import org.scijava.struct.Struct; -import org.scijava.struct.StructInstance; -import org.scijava.types.Types; -import org.scijava.types.inference.GenericAssignability; -import org.scijava.util.ClassUtils; - -/** - * Utility functions for working with {@link org.scijava.param} classes. - * - * @author Curtis Rueden - * @author David Kolb - */ -public final class ParameterStructs { - - /** - * Convenience method to call {@link #structOf(Class)} dot {@link Struct#createInstance(Object)} - * - * @param object - * @return - * @throws ValidityException - */ - public static StructInstance create(final C object) - throws ValidityException - { - return structOf(object.getClass()).createInstance(object); - } - - /** - * Convenience method to () -> parse(type) - * - * @param type - * @return - * @throws ValidityException - */ - public static Struct structOf(final Class type) - throws ValidityException - { - final List> items = parse(type); - return () -> items; - } - - /** - * Convenience method to () -> parse(field) - * - * @param field - * @return - * @throws ValidityException - */ - public static Struct structOf(final Field field) - throws ValidityException - { - final List> items = parse(field); - return () -> items; - } - - //TODO: Javadoc - public static Struct structOf(final OpInfo opInfo, final Type newType) throws ValidityException { - final List> items = parse(opInfo, newType); - return () -> items; - } - - public static Struct structOf(final Class c, final Method m) - throws ValidityException - { - final List> items = parse(c, m); - return () -> items; - } - - /** - * Parses the specified functional class for @{@link Parameter} annotations. This consists of the following steps: - *

- * 1) First annotations on the class level are checked. These annotate the signature (parameters and return type) of - * the specified functional class (or subtype of one). The annotations re expected to be in the following order: - * parameters, return type. - *
- * E.g. a {@link Function} may be annotated with two @{@link Parameter} annotations, where the first annotation will - * annotate the parameter and the second the return type of the functional method {@link Function#apply(Object)} of - * {@link Function}. - *

- * 2) Second, annotations on the fields of the specified class are checked. - * - * @param type the class to parse, is expected to contain some functional interface in its hierarchy - * @return list of identified member instances - * @throws ValidityException if there are problems during parsing - */ - public static List> parse(final Class type) - throws ValidityException - { - if (type == null) return null; - - final ArrayList> items = new ArrayList<>(); - final ArrayList problems = new ArrayList<>(); - final Set names = new HashSet<>(); - - // NB: Reject abstract classes. - checkModifiers(type.getName() + ": ", problems, type.getModifiers(), true, Modifier.ABSTRACT); - - // obtain a parameterData (preferably one that scrapes the javadoc) - ParameterData paramData; - try { - paramData = new JavadocParameterData(type); - } catch(NullPointerException | IllegalArgumentException e) { - paramData = new SynthesizedParameterData(); - } - - parseFunctionalParameters(items, names, problems, type, paramData); - - // Parse field level @OpDependency annotations. - parseFieldOpDependencies(items, problems, type); - - // Fail if there were any problems. - if (!problems.isEmpty()) throw new ValidityException(problems); - - return items; - } - - /** - * Parses the specified field for @{@link Parameter} annotations. Has the same behavior as the first parsing step - * of {@link #parse(Class)}. - * - * @param field the field to parse, is expected to contain some functional interface in the hierarchy of its type - * @return list of identified member instances - * @throws ValidityException if there are problems during parsing - */ - public static List> parse(final Field field) throws ValidityException { - Class c = field.getDeclaringClass(); - if (c == null || field == null) return null; - - // obtain a parameterData (preferably one that scrapes the javadoc) - ParameterData paramData; - try { - paramData = new JavadocParameterData(field); - } catch(IllegalArgumentException e) { - paramData = new SynthesizedParameterData(); - } - field.setAccessible(true); - - final ArrayList> items = new ArrayList<>(); - final ArrayList problems = new ArrayList<>(); - final Set names = new HashSet<>(); - final Type fieldType = Types.fieldType(field, c); - - checkModifiers(field.toString() + ": ", problems, field.getModifiers(), false, Modifier.FINAL); - parseFunctionalParameters(items, names, problems, fieldType, paramData); - // Fail if there were any problems. - if (!problems.isEmpty()) { - throw new ValidityException(problems); - } - - return items; - } - - //TODO: Javadoc - public static List> parse(final OpInfo opInfo, final Type newType) throws ValidityException { - final ArrayList> items = new ArrayList<>(); - final ArrayList problems = new ArrayList<>(); - final Set names = new HashSet<>(); - - // obtain a parameterData (preferably one that scrapes the javadoc) - ParameterData paramData; - try { - paramData = new JavadocParameterData(opInfo, newType); - } catch(IllegalArgumentException e) { - paramData = new SynthesizedParameterData(); - } - - parseFunctionalParameters(items, names, problems, newType, paramData); - - // Fail if there were any problems. - if (!problems.isEmpty()) { - throw new ValidityException(problems); - } - - return items; - } - - public static List> parse(final Class c, final Method method) - throws ValidityException - { - if (c == null || method == null) return null; - - method.setAccessible(true); - - // obtain a parameterData (preferably one that scrapes the javadoc) - ParameterData paramData; - try { - paramData = new JavadocParameterData(method); - } catch(IllegalArgumentException e) { - paramData = new SynthesizedParameterData(); - } - - final ArrayList> items = new ArrayList<>(); - final ArrayList problems = new ArrayList<>(); - final Set names = new HashSet<>(); - final OpMethod methodAnnotation = method.getAnnotation(OpMethod.class); - - // Determine functional type - Type functionalType; - try { - functionalType = getOpMethodType(methodAnnotation.type(), - method); - } - catch (IllegalArgumentException e) { - problems.add(new ValidityProblem(e.getMessage())); - functionalType = Types.parameterizeRaw(methodAnnotation.type()); - } - - // Parse method level @Parameter annotations. - parseFunctionalParameters(items, names, problems, functionalType, paramData); - - // Parse method level @OpDependency annotations. - parseMethodOpDependencies(items, method); - - // Fail if there were any problems. - if (!problems.isEmpty()) throw new ValidityException(problems); - - return items; - } - - private static java.lang.reflect.Parameter[] getOpDependencies( - java.lang.reflect.Parameter[] methodParams) - { - return Arrays // - .stream(methodParams) // - .filter(param -> param.getAnnotation(OpDependency.class) != null) // - .toArray(java.lang.reflect.Parameter[]::new); - } - - private static java.lang.reflect.Parameter[] getOpParams( - java.lang.reflect.Parameter[] methodParams) - { - return Arrays // - .stream(methodParams) // - .filter(param -> param.getAnnotation(OpDependency.class) == null) // - .toArray(java.lang.reflect.Parameter[]::new); - - } - - private static Type[] getOpParamTypes( - java.lang.reflect.Parameter[] methodParams) - { - return Arrays // - .stream(methodParams) // - .filter(param -> param.getAnnotation(OpDependency.class) == null) // - .map(param -> param.getParameterizedType()) - .toArray(Type[]::new); - - } - - public static Type getOpMethodType(Class opClass, Method opMethod) - { - // since type is a functional interface, it has (exactly) one abstract - // declared method (the method that our OpMethod is emulating). - Method abstractMethod = singularAbstractMethod(opClass); - Type[] typeMethodParams = abstractMethod.getGenericParameterTypes(); - java.lang.reflect.Parameter[] opMethodParams = getOpParams(opMethod.getParameters()); - - if (typeMethodParams.length != opMethodParams.length) { - throw new IllegalArgumentException("Number of parameters in OpMethod" + - opMethod + - " does not match the required number of parameters for functional method of FunctionalInterface " + - opClass); - } - Map, Type> typeVarAssigns = new HashMap<>(); - - // map params of OpMethod to type variables of abstract method of functional - // interface (along with return type if applicable) - // TODO: not sure how this handles when there are type variables. - GenericAssignability.inferTypeVariables(typeMethodParams, getOpParamTypes(opMethodParams), typeVarAssigns); - if (abstractMethod.getReturnType() != void.class) { - GenericAssignability.inferTypeVariables(new Type[] {abstractMethod.getGenericReturnType()}, new Type[] {opMethod.getGenericReturnType()}, typeVarAssigns); - } - - // parameterize opClass - return Types.parameterize(opClass, typeVarAssigns); - } - - public static Method singularAbstractMethod(Class functionalInterface) { - Method[] typeMethods = Arrays.stream(functionalInterface - .getMethods()).filter(method -> Modifier.isAbstract(method - .getModifiers())).toArray(Method[]::new); - if (typeMethods.length != 1) { - throw new IllegalArgumentException(functionalInterface + - " should be a FunctionalInterface, however it has " + - typeMethods.length + " abstract declared methods"); - } - - return typeMethods[0]; - } - - //TODO: Javadoc - // TODO: We currently assume that simplifiers only exist for pure inputs - public static List> parse(final OpInfo opInfo, final List> suppliers) throws ValidityException { - final ArrayList> items = new ArrayList<>(); - final ArrayList problems = new ArrayList<>(); - - Struct srcStruct = opInfo.struct(); - for (int i = 0; i < srcStruct.members().size(); i++) { - Member member = srcStruct.members().get(i); - // FIXME: We currently assume that only pure inputs have simplifiers. - if (!member.isInput() || member.isOutput()) { - items.add(member); - continue; - } - Type newType = suppliers.get(i).simpleType(); - items.add(new ConvertedParameterMember<>(member, newType)); - } - - // Fail if there were any problems. - // TODO: can we delete this? - if (!problems.isEmpty()) { - throw new ValidityException(problems); - } - - return items; - } - - /** - * Returns a list of {@link FunctionalMethodType}s describing the input and - * output types of the functional method of the specified functional type. In - * doing so, the return type of the method will me marked as - * {@link ItemIO#OUTPUT} and the all method parameters as {@link ItemIO#OUTPUT}, - * except for parameters annotated with {@link Container} or {@link Mutable} - * which will be marked as {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} - * respectively. If the specified type does not have a functional method in its - * hierarchy, {@code null} will be returned.
- * The order will be the following: method parameters from left to right, then - * return type. - * - * @param functionalType - * @return - */ - public static List findFunctionalMethodTypes(Type functionalType) { - Method functionalMethod = findFunctionalMethod(Types.raw(functionalType)); - if (functionalMethod == null) throw new IllegalArgumentException("Type " + - functionalType + - " is not a functional type, thus its functional method types cannot be determined"); - - Type paramfunctionalType = functionalType; - if (functionalType instanceof Class) { - paramfunctionalType = Types.parameterizeRaw((Class) functionalType); - } - - List out = new ArrayList<>(); - int i = 0; - for (Type t : Types.getExactParameterTypes(functionalMethod, paramfunctionalType)) { - final ItemIO ioType; - if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, Container.class) != null) - ioType = ItemIO.CONTAINER; - else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, Mutable.class) != null) - ioType = ItemIO.MUTABLE; - else - ioType = ItemIO.INPUT; - out.add(new FunctionalMethodType(t, ioType)); - i++; - } - - Type returnType = Types.getExactReturnType(functionalMethod, paramfunctionalType); - if (!returnType.equals(void.class)) { - out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT)); - } - - return out; - } - - // -- Helper methods -- - - /** - * Helper to check for several modifiers at once. - * - * @param message - * @param problems - * @param actualModifiers - * @param requiredModifiers - */ - private static void checkModifiers(String message, final ArrayList problems, - final int actualModifiers, final boolean negate, final int... requiredModifiers) { - for (int mod : requiredModifiers) { - if (negate) { - if ((actualModifiers & mod) != 0) { - problems.add( - new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod))); - } - } else { - if ((actualModifiers & mod) == 0) { - problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod))); - } - } - } - } - - private static void parseFunctionalParameters(final ArrayList> items, final Set names, final ArrayList problems, - Type type, ParameterData data) { - //Search for the functional method of 'type' and map its signature to ItemIO - List fmts; - try { - fmts = findFunctionalMethodTypes(type); - } - catch (IllegalArgumentException e) { - problems.add(new ValidityProblem("Could not find functional method of " + - type.getTypeName())); - return; - } - - // Synthesize members - List> fmtMembers = data.synthesizeMembers(fmts); - - for (Member m : fmtMembers) { - String key = m.getKey(); - final Type itemType = m.getType(); - - final boolean valid = checkValidity(m, key, Types.raw(itemType), false, - names, problems); - if (!valid) continue; - items.add(m); - names.add(m.getKey()); - } - } - - private static void parseFieldOpDependencies(final List> items, - final List problems, Class annotatedClass) - { - final List fields = ClassUtils.getAnnotatedFields(annotatedClass, - OpDependency.class); - for (final Field f : fields) { - f.setAccessible(true); - final boolean isFinal = Modifier.isFinal(f.getModifiers()); - if (isFinal) { - final String name = f.getName(); - // Final fields are bad because they cannot be modified. - final String error = "Invalid final Op dependency field: " + name; - problems.add(new ValidityProblem(error)); - // Skip invalid Op dependencies. - continue; - } - final OpDependencyMember item = new FieldOpDependencyMember<>(f, - annotatedClass); - items.add(item); - } - } - - private static void parseMethodOpDependencies(final List> items, - final Method annotatedMethod) - { - final java.lang.reflect.Parameter[] methodParams = annotatedMethod - .getParameters(); - final java.lang.reflect.Parameter[] opDependencyParams = getOpDependencies(methodParams); - - for (java.lang.reflect.Parameter param : opDependencyParams) { - final OpDependency dependency = param.getAnnotation(OpDependency.class); - final Type methodParamType = param.getParameterizedType(); - final Member item = new MethodParameterOpDependencyMember<>( - param, methodParamType, dependency); - items.add(item); - } - } - - private static boolean isImmutable(final Class type) { - // NB: All eight primitive types, as well as the boxed primitive - // wrapper classes, as well as strings, are immutable objects. - return Types.isNumber(type) || Types.isText(type) || // - Types.isBoolean(type); - } - - /** - * Searches for a {@code @FunctionalInterface} annotated interface in the - * class hierarchy of the specified type. The first one that is found will - * be returned. If no such interface can be found, null will be returned. - * - * @param type - * @return - */ - public static Class findFunctionalInterface(Class type) { - if (type == null) return null; - if (type.getAnnotation(FunctionalInterface.class) != null) return type; - for (Class iface : type.getInterfaces()) { - final Class result = findFunctionalInterface(iface); - if (result != null) return result; - } - return findFunctionalInterface(type.getSuperclass()); - } - - private static boolean checkValidity(Member m, String name, - Class type, boolean isFinal, Set names, - ArrayList problems) - { - boolean valid = true; - - if (names.contains(name)) { - // NB: Shadowed parameters are bad because they are ambiguous. - final String error = "Invalid duplicate parameter: " + name; - problems.add(new ValidityProblem(error)); - valid = false; - } - - if ((m.getIOType() == ItemIO.MUTABLE || m.getIOType() == ItemIO.CONTAINER) && isImmutable(type)) { - // NB: The MUTABLE and CONTAINER types signify that the parameter - // will be written to, but immutable parameters cannot be changed in - // such a manner, so it makes no sense to label them as such. - final String error = "Immutable " + m.getIOType() + " parameter: " + name + " (" + type.getName() + " is immutable)"; - problems.add(new ValidityProblem(error)); - valid = false; - } - - return valid; - } - - /** - * Attempts to find the single functional method of the specified - * class, by scanning the for functional interfaces. If there - * is no functional interface, null will be returned. - * - * @param cls - * @return - */ - private static Method findFunctionalMethod(Class cls) { - Class iFace = findFunctionalInterface(cls); - if (iFace == null) { - return null; - } - - List nonDefaults = Arrays.stream(iFace.getMethods()) - .filter(m -> !m.isDefault()).collect(Collectors.toList()); - - // The single non default method must be the functional one - if (nonDefaults.size() != 1) { - for (Class i : iFace.getInterfaces()) { - final Method result = findFunctionalMethod(i); - if (result != null) return result; - } - } - - return nonDefaults.get(0); - } - - -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java b/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java deleted file mode 100644 index 89cf665b5..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/ValidityProblem.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * #%L - * SciJava Common shared library for SciJava software. - * %% - * Copyright (C) 2009 - 2017 Board of Regents of the University of - * Wisconsin-Madison, Broad Institute of MIT and Harvard, Max Planck - * Institute of Molecular Cell Biology and Genetics, University of - * Konstanz, and KNIME GmbH. - * %% - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * #L% - */ - -package org.scijava.param; - -import org.scijava.Validated; - -/** - * An exception used to record a validity problem with a {@link Validated} - * object. - *

- * Unlike most exceptions, {@code ValidityException} is typically not thrown, - * but rather only recorded for future reference. - *

- * - * @author Curtis Rueden - */ -public class ValidityProblem extends Exception { - - public ValidityProblem() { - super(); - } - - public ValidityProblem(final String s) { - super(s); - } - - public ValidityProblem(final String s, final Throwable cause) { - super(s, cause); - } - - public ValidityProblem(final Throwable cause) { - super(cause); - } - -} diff --git a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java similarity index 95% rename from scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java rename to scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java index 88e98727a..a49276278 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/param/JavadocParameterTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java @@ -1,5 +1,5 @@ -package org.scijava.param; +package org.scijava.ops; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -406,7 +406,7 @@ public void opStringRegressionTest() { // test standard op string String expected = - "public static java.util.List org.scijava.param.JavadocParameterTest." + + "public static java.util.List org.scijava.ops.JavadocParameterTest." + "OpMethodPR(java.util.List,java.util.List)(\n" + " Inputs:\n" + " java.util.List foo -> the first input\n" + @@ -418,7 +418,7 @@ public void opStringRegressionTest() { // test special op string expected = - "public static java.util.List org.scijava.param.JavadocParameterTest." + + "public static java.util.List org.scijava.ops.JavadocParameterTest." + "OpMethodPR(java.util.List,java.util.List)(\n" + " Inputs:\n" + " java.util.List foo -> the first input\n" + diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java index 34226f5ef..a74f3848d 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java @@ -33,7 +33,6 @@ import org.junit.Test; import org.scijava.types.Nil; -import org.scijava.param.ValidityException; public class OpCollectionTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm index 60119399a..e9ad15c28 100644 --- a/scijava/scijava-ops/templates/main/java/module-info.vm +++ b/scijava/scijava-ops/templates/main/java/module-info.vm @@ -20,7 +20,6 @@ module org.scijava.ops { exports org.scijava.ops.provenance; // TODO: move OpWrapper to its own package (org.scijava.ops.wrap??) exports org.scijava.ops.util; // contains OpWrapper interface - exports org.scijava.param; #foreach($package in $packages) opens $package to $opensToString.call($package, $scijavaPackages, $therapiPackages); diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm index 3b02876a8..2b8f4d813 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/adapt/lift/ComputerToIterables.vm @@ -40,7 +40,6 @@ import java.util.function.Function; import org.scijava.function.Computers; import org.scijava.ops.OpField; import org.scijava.ops.OpCollection; -import org.scijava.param.Parameter; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/FunctionalMethodType.java similarity index 89% rename from scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java rename to scijava/scijava-struct/src/main/java/org/scijava/struct/FunctionalMethodType.java index 13926ca64..7b96dcb11 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/param/FunctionalMethodType.java +++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/FunctionalMethodType.java @@ -1,9 +1,7 @@ -package org.scijava.param; +package org.scijava.struct; import java.lang.reflect.Type; -import org.scijava.struct.ItemIO; - /** * Wrapper to pair a type of a method signature with its {@link ItemIO}. diff --git a/scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java b/scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java new file mode 100644 index 000000000..8e038744f --- /dev/null +++ b/scijava/scijava-types/src/main/java/org/scijava/types/inference/InterfaceInference.java @@ -0,0 +1,22 @@ +package org.scijava.types.inference; + +import java.lang.reflect.Method; +import java.lang.reflect.Modifier; +import java.util.Arrays; + +public class InterfaceInference { + + public static Method singularAbstractMethod(Class functionalInterface) { + Method[] typeMethods = Arrays.stream(functionalInterface + .getMethods()).filter(method -> Modifier.isAbstract(method + .getModifiers())).toArray(Method[]::new); + if (typeMethods.length != 1) { + throw new IllegalArgumentException(functionalInterface + + " should be a FunctionalInterface, however it has " + + typeMethods.length + " abstract declared methods"); + } + + return typeMethods[0]; + } + +} From 852886be66f6e01681f7908dbd3d1df66d2de928 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 2 Jul 2021 11:59:40 -0500 Subject: [PATCH 19/31] Move ValidityException to org.scijava.ops This commit also adds an isRequired() field to Member. --- .../main/java/org/scijava/ops/OpUtils.java | 20 +++---------------- .../scijava/ops/matcher/DefaultOpMatcher.java | 2 +- .../org/scijava/ops/JavadocParameterTest.java | 1 - .../main/java/org/scijava/struct/Member.java | 4 ++++ 4 files changed, 8 insertions(+), 19 deletions(-) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java index 0e8e7d9fb..814603849 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java @@ -194,7 +194,7 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second int inputCount = 0, requiredCount = 0; for (final Member item : members) { inputCount++; - if (isRequired(item)) + if (!item.isRequired()) requiredCount++; } if (args.length == inputCount) { @@ -223,7 +223,7 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second final Object[] paddedArgs = new Object[inputCount]; int argIndex = 0, paddedIndex = 0, optionalIndex = 0; for (final Member item : members) { - if (!isRequired(item) && optionalIndex++ >= optionalsToFill) { + if (!item.isRequired() && optionalIndex++ >= optionalsToFill) { // skip this optional parameter (pad with null) paddedIndex++; continue; @@ -232,21 +232,7 @@ public static Object[] padArgs(final OpCandidate candidate, final boolean second } return paddedArgs; } - - /** - * Determines whether {@link Member} {@code item} is required. - *

- * TODO: This method is a relic of {@link ParameterMember}, and should be - * reconciled with the work in https://github.com/scijava/incubator/pull/32 - * - * @param item the {@link Member} that may or may not be required - * @return true iff {@code item} is required. - */ - @Deprecated - public static boolean isRequired(final Member item) { - return true; - } - + public static List> injectableMembers(Struct struct) { return struct.members() .stream() diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java index d668c09b1..c51bdd1a5 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java @@ -268,7 +268,7 @@ private List filterMatches(final List candidates, fina private boolean missArgs(final OpCandidate candidate, final Type[] paddedArgs) { int i = 0; for (final Member member : OpUtils.inputs(candidate)) { - if (paddedArgs[i++] == null && OpUtils.isRequired(member)) { + if (paddedArgs[i++] == null && member.isRequired()) { candidate.setStatus(StatusCode.REQUIRED_ARG_IS_NULL, null, member); return true; } diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java index a49276278..c75e35748 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java @@ -15,7 +15,6 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.function.Inplaces; -import org.scijava.ops.AbstractTestEnvironment; import org.scijava.ops.Op; import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java index ccdc6af85..1c00d547b 100644 --- a/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java +++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/Member.java @@ -54,6 +54,10 @@ default boolean isStruct() { return false; } + default boolean isRequired() { + return true; + } + default Struct childStruct() { return null; } From 75cbd21c320c7b6e1957a153e0746678e202ec31 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 2 Jul 2021 13:19:40 -0500 Subject: [PATCH 20/31] Extract matcher impl details to impl subpackage --- scijava/scijava-ops/src/main/java/module-info.java | 1 + .../org/scijava/ops/impl/DefaultOpEnvironment.java | 14 +++++++------- .../ops/matcher/{ => impl}/DefaultOpMatcher.java | 4 +++- .../ops/matcher/{ => impl}/DefaultOpRef.java | 3 ++- .../ops/matcher/{ => impl}/MatchingUtils.java | 2 +- .../ops/matcher/{ => impl}/OpAdaptationInfo.java | 2 +- .../ops/matcher/{ => impl}/OpClassInfo.java | 2 +- .../ops/matcher/{ => impl}/OpFieldInfo.java | 2 +- .../ops/matcher/{ => impl}/OpMethodInfo.java | 2 +- .../scijava/ops/matcher/{ => impl}/OpWrappers.java | 2 +- .../java/org/scijava/ops/OpEnvironmentTest.java | 2 +- .../org/scijava/ops/matcher/MatchingUtilsTest.java | 1 + .../scijava-ops/templates/main/java/module-info.vm | 2 +- .../scijava/ops/matcher/{ => impl}/OpWrappers.list | 2 +- .../scijava/ops/matcher/{ => impl}/OpWrappers.vm | 2 +- 15 files changed, 24 insertions(+), 19 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/DefaultOpMatcher.java (99%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/DefaultOpRef.java (98%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/MatchingUtils.java (99%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpAdaptationInfo.java (98%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpClassInfo.java (99%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpFieldInfo.java (99%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpMethodInfo.java (96%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/{ => impl}/OpWrappers.java (99%) rename scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/{ => impl}/OpWrappers.list (96%) rename scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/{ => impl}/OpWrappers.vm (99%) diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java index 9f0655fc9..25271150b 100644 --- a/scijava/scijava-ops/src/main/java/module-info.java +++ b/scijava/scijava-ops/src/main/java/module-info.java @@ -17,6 +17,7 @@ opens org.scijava.ops.conversionLoss to therapi.runtime.javadoc; opens org.scijava.ops.log to therapi.runtime.javadoc; + opens org.scijava.ops.matcher.impl to therapi.runtime.javadoc, org.scijava; opens org.scijava.ops.copy to therapi.runtime.javadoc; opens org.scijava.ops.hint to therapi.runtime.javadoc; opens org.scijava.ops.adapt.complexLift to therapi.runtime.javadoc; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index 995bd3065..528dc4645 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -56,10 +56,10 @@ import org.scijava.ops.BaseOpHints.Adaptation; import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.BaseOpHints.Simplification; -import org.scijava.ops.OpCandidate.StatusCode; import org.scijava.ops.Hints; import org.scijava.ops.Op; import org.scijava.ops.OpCandidate; +import org.scijava.ops.OpCandidate.StatusCode; import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; import org.scijava.ops.OpDependencyMember; @@ -74,15 +74,15 @@ import org.scijava.ops.hint.AdaptationHints; import org.scijava.ops.hint.DefaultHints; import org.scijava.ops.hint.SimplificationHints; -import org.scijava.ops.matcher.DefaultOpMatcher; -import org.scijava.ops.matcher.DefaultOpRef; import org.scijava.ops.matcher.DependencyMatchingException; -import org.scijava.ops.matcher.OpAdaptationInfo; -import org.scijava.ops.matcher.OpClassInfo; -import org.scijava.ops.matcher.OpFieldInfo; import org.scijava.ops.matcher.OpMatcher; import org.scijava.ops.matcher.OpMatchingException; -import org.scijava.ops.matcher.OpMethodInfo; +import org.scijava.ops.matcher.impl.DefaultOpMatcher; +import org.scijava.ops.matcher.impl.DefaultOpRef; +import org.scijava.ops.matcher.impl.OpAdaptationInfo; +import org.scijava.ops.matcher.impl.OpClassInfo; +import org.scijava.ops.matcher.impl.OpFieldInfo; +import org.scijava.ops.matcher.impl.OpMethodInfo; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.ops.simplify.SimplifiedOpInfo; import org.scijava.ops.struct.Structs; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java similarity index 99% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java index c51bdd1a5..61dae23bf 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpMatcher.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpMatcher.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -53,6 +53,8 @@ import org.scijava.ops.BaseOpHints.Simplification; import org.scijava.ops.OpCandidate.StatusCode; import org.scijava.ops.hint.DefaultHints; +import org.scijava.ops.matcher.MatchingResult; +import org.scijava.ops.matcher.OpMatcher; import org.scijava.ops.simplify.InfoSimplificationGenerator; import org.scijava.service.AbstractService; import org.scijava.struct.Member; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java similarity index 98% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java index 6f4a2d8f7..ed18444e6 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/DefaultOpRef.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/DefaultOpRef.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -37,6 +37,7 @@ import org.scijava.ops.Op; import org.scijava.ops.OpRef; +import org.scijava.ops.matcher.OpMatcher; import org.scijava.types.Types; import org.scijava.types.inference.GenericAssignability; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java similarity index 99% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java index eee5b7fef..f1655ba5e 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/MatchingUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/MatchingUtils.java @@ -30,7 +30,7 @@ * #L% */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java similarity index 98% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java index 4081cd839..5d553eb3b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpAdaptationInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java @@ -1,5 +1,5 @@ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import com.google.common.collect.Streams; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java similarity index 99% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java index 3265d85c0..7c81bfbc7 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpClassInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Constructor; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java similarity index 99% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java index 8ca3eae9a..6ac0a6915 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpFieldInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java @@ -27,7 +27,7 @@ * #L% */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Field; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java similarity index 96% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java index 0cb951941..55488ebe2 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpMethodInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java @@ -28,7 +28,7 @@ * #L% */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java similarity index 99% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java index d5bd98efa..97936c716 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/OpWrappers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java @@ -3,7 +3,7 @@ * corresponding template in templates/ and rerun bin/generate.groovy. */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.reflect.Type; import java.util.UUID; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java index 13888808f..a3c8051b8 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpEnvironmentTest.java @@ -7,7 +7,7 @@ import org.junit.Test; import org.scijava.Priority; import org.scijava.function.Producer; -import org.scijava.ops.matcher.OpClassInfo; +import org.scijava.ops.matcher.impl.OpClassInfo; import org.scijava.types.GenericTyped; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java index b0dda7a94..019210014 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/matcher/MatchingUtilsTest.java @@ -44,6 +44,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.jupiter.api.Assertions; +import org.scijava.ops.matcher.impl.MatchingUtils; import org.scijava.types.Nil; import org.scijava.types.Types; import org.scijava.types.inference.GenericAssignability; diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm index e9ad15c28..332cb1a86 100644 --- a/scijava/scijava-ops/templates/main/java/module-info.vm +++ b/scijava/scijava-ops/templates/main/java/module-info.vm @@ -8,7 +8,7 @@ module org.scijava.ops { ## Determines all packages in the module #set($packages = $modulePackages.call("src/main/java/org/scijava")) ## Defines the packages that should be exported to org.scijava -#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.provenance.impl"]) +#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.matcher.impl", "org.scijava.ops.provenance.impl"]) ## Defines the packages that should be exported to therapi.runtime.javadoc #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava")) //TODO: rearrange packages to export only needed classes diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.list b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list similarity index 96% rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.list rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list index 3f884301e..1f84a9cc9 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.list +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.list @@ -1,4 +1,4 @@ -.include ../util/Globals.list +.include templates/main/java/org/scijava/ops/util/Globals.list arities = (0..maxArity).collect() [OpWrappers.java] diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm similarity index 99% rename from scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm rename to scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm index ccdba9740..e2b95552a 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/OpWrappers.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm @@ -3,7 +3,7 @@ * corresponding template in templates/ and rerun bin/generate.groovy. */ -package org.scijava.ops.matcher; +package org.scijava.ops.matcher.impl; import java.lang.reflect.Type; import java.util.UUID; From 1ac0b491dd32225d7b92ec85571d181fee9c2f1b Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 2 Jul 2021 13:26:45 -0500 Subject: [PATCH 21/31] Prevent cycle: org.scijava.ops.simplify/struct --- .../ops/simplify/SimplificationUtils.java | 13 ++------- .../java/org/scijava/ops/struct/Structs.java | 29 +++++++------------ 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java index aedc0181c..5d521b418 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java @@ -24,7 +24,7 @@ import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpRef; -import org.scijava.ops.OpUtils; +import org.scijava.ops.struct.Structs; import org.scijava.ops.util.AnnotationUtils; import org.scijava.types.Nil; import org.scijava.types.Types; @@ -67,7 +67,7 @@ public static ParameterizedType retypeOpType(Type originalOpType, Type[] newArgs if (!(originalOpType instanceof ParameterizedType)) throw new IllegalStateException("We hadn't thought about this yet."); Class opType = Types.raw(originalOpType); - Method fMethod = findFMethod(opType); + Method fMethod = Structs.findFMethod(opType); Map, Type> typeVarAssigns = new HashMap<>(); @@ -115,13 +115,6 @@ private static Type[] typesFromOpType(Class opType, Method fMethod, Type... t return Types.mapVarToTypes(types, map); } - // TODO: extract this method to a more general utility class - public static Method findFMethod(Class c) { - Class fIface = OpUtils.findFunctionalInterface(c); - if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!"); - return InterfaceInference.singularAbstractMethod(fIface); - } - /** * Finds the {@link Mutable} or {@link Container} argument of a * {@link FunctionalInterface}'s singular abstract method. If there is no @@ -134,7 +127,7 @@ public static Method findFMethod(Class c) { * @return the index of the mutable argument (or -1 iff the output is returned). */ public static int findMutableArgIndex(Class c) { - Method fMethod = findFMethod(c); + Method fMethod = Structs.findFMethod(c); for (int i = 0; i < fMethod.getParameterCount(); i++) { if (AnnotationUtils.getMethodParameterAnnotation(fMethod, i, Mutable.class) != null) return i; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java index 3171c5cea..4bd574bfe 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java @@ -13,6 +13,7 @@ import org.scijava.ValidityProblem; import org.scijava.function.Container; import org.scijava.function.Mutable; +import org.scijava.ops.OpUtils; import org.scijava.ops.ValidityException; import org.scijava.ops.util.AnnotationUtils; import org.scijava.struct.FunctionalMethodType; @@ -21,6 +22,7 @@ import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; import org.scijava.types.Types; +import org.scijava.types.inference.InterfaceInference; public class Structs { @@ -157,7 +159,7 @@ else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, * @return */ private static Method findFunctionalMethod(Class cls) { - Class iFace = findFunctionalInterface(cls); + Class iFace = OpUtils.findFunctionalInterface(cls); if (iFace == null) { return null; } @@ -176,24 +178,6 @@ private static Method findFunctionalMethod(Class cls) { return nonDefaults.get(0); } - /** - * Searches for a {@code @FunctionalInterface} annotated interface in the - * class hierarchy of the specified type. The first one that is found will be - * returned. If no such interface can be found, null will be returned. - * - * @param type - * @return - */ - public static Class findFunctionalInterface(Class type) { - if (type == null) return null; - if (type.getAnnotation(FunctionalInterface.class) != null) return type; - for (Class iface : type.getInterfaces()) { - final Class result = findFunctionalInterface(iface); - if (result != null) return result; - } - return findFunctionalInterface(type.getSuperclass()); - } - private static boolean checkValidity(Member m, String name, Class type, boolean isFinal, Set names, ArrayList problems) { @@ -246,4 +230,11 @@ public static StructInstance create(final C object) return s.createInstance(object); } + // TODO: extract this method to a more general utility class + public static Method findFMethod(Class c) { + Class fIface = OpUtils.findFunctionalInterface(c); + if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!"); + return InterfaceInference.singularAbstractMethod(fIface); + } + } From 049506eab666f0258a5266d2fe2c3ad93fd7e36a Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 2 Jul 2021 15:16:32 -0500 Subject: [PATCH 22/31] Prevent cycle: org.scijava.ops.util/org.scijava.ops.struct --- .../ops/{core => }/ExceptionUtils.java | 0 .../org/scijava/ops/OpExecutionException.java | 70 +---- .../src/main/java/org/scijava/ops/OpInfo.java | 1 + .../main/java/org/scijava/ops/OpUtils.java | 1 + .../ops/core/OpExecutionException.java | 9 - .../ops/impl/DefaultOpEnvironment.java | 4 +- .../ops/matcher/impl/OpAdaptationInfo.java | 7 +- .../scijava/ops/matcher/impl/OpClassInfo.java | 5 +- .../scijava/ops/matcher/impl/OpFieldInfo.java | 4 +- .../ops/matcher/impl/OpMethodInfo.java | 4 +- .../ops/simplify/SimplificationUtils.java | 6 +- .../ops/simplify/SimplifiedOpInfo.java | 10 +- .../struct/ClassOpDependencyMemberParser.java | 5 +- .../struct/ClassParameterMemberParser.java | 7 +- .../struct/FieldParameterMemberParser.java | 7 +- .../ops/struct/FunctionalParameters.java | 104 ++++++++ .../MethodOpDependencyMemberParser.java | 3 +- .../struct/MethodParameterMemberParser.java | 5 +- .../ops/struct/OpRetypingMemberParser.java | 3 +- .../java/org/scijava/ops/struct/Structs.java | 240 ------------------ .../java/org/scijava/ops/util/Inject.java | 28 +- .../org/scijava/ops/JavadocParameterTest.java | 7 - .../org/scijava/ops/OpCollectionTest.java | 1 + .../src/main/java/module-info.java | 1 + .../org/scijava}/struct/MemberParser.java | 5 +- .../main/java/org/scijava/struct/Structs.java | 83 ++++++ .../scijava/struct}/ValidityException.java | 6 +- 27 files changed, 261 insertions(+), 365 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{core => }/ExceptionUtils.java (100%) delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java create mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java delete mode 100644 scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-struct/src/main/java/org/scijava}/struct/MemberParser.java (84%) rename scijava/{scijava-ops/src/main/java/org/scijava/ops => scijava-struct/src/main/java/org/scijava/struct}/ValidityException.java (78%) diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/ExceptionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java similarity index 100% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/core/ExceptionUtils.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java index 7d9b07185..4bf163832 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java @@ -1,73 +1,9 @@ -/* - * #%L - * SciJava Operations: a framework for reusable algorithms. - * %% - * Copyright (C) 2018 SciJava developers. - * %% - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. - * #L% - */ -package org.scijava.ops; +package org.scijava.ops.core; -/** - * Thrown to indicate that an Op failed in its execution - * - * @author Gabriel Selzer - * - */ -public class OpExecutionException extends RuntimeException { +public class OpExecutionException extends RuntimeException{ - /** - * Constructs a OpExecutionException with the specified reason for - * failure. - * - * @param s - * the reason for the failure - */ - public OpExecutionException(String s) { - super(s); - } - - /** - * Constructs a OpExecutionException with the specified cause. - * - * @param cause - * the cause of the failure - */ - public OpExecutionException(Throwable cause) { + public OpExecutionException(Exception cause) { super(cause); } - /** - * Constructs a OpExecutionException with the specified reason for - * failure and cause. - * - * @param message - * the reason for the failure - * @param cause - * the cause of the failure - */ - public OpExecutionException(String message, Throwable cause) { - super(message, cause); - } - } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java index 8ab8af11c..2d98589b4 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpInfo.java @@ -11,6 +11,7 @@ import org.scijava.struct.Member; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; +import org.scijava.struct.ValidityException; import org.scijava.util.MiscUtils; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java index 814603849..0eac98950 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpUtils.java @@ -43,6 +43,7 @@ import org.scijava.struct.MemberInstance; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; +import org.scijava.struct.ValidityException; import org.scijava.struct.ValueAccessible; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java deleted file mode 100644 index 4bf163832..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/core/OpExecutionException.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.scijava.ops.core; - -public class OpExecutionException extends RuntimeException{ - - public OpExecutionException(Exception cause) { - super(cause); - } - -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index 528dc4645..5f0fc48b1 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -85,7 +85,7 @@ import org.scijava.ops.matcher.impl.OpMethodInfo; import org.scijava.ops.provenance.OpHistoryService; import org.scijava.ops.simplify.SimplifiedOpInfo; -import org.scijava.ops.struct.Structs; +import org.scijava.ops.struct.FunctionalParameters; import org.scijava.plugin.Parameter; import org.scijava.plugin.PluginInfo; import org.scijava.plugin.PluginService; @@ -689,7 +689,7 @@ private OpRef inferOpRef(OpDependencyMember dependency, */ private OpRef inferOpRef(Type type, String name, Map, Type> typeVarAssigns) { - List fmts = Structs.findFunctionalMethodTypes(type); + List fmts = FunctionalParameters.findFunctionalMethodTypes(type); if (fmts == null) return null; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java index 5d553eb3b..9fd622b1c 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpAdaptationInfo.java @@ -15,15 +15,16 @@ import org.scijava.ops.OpDependencyMember; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.struct.OpRetypingMemberParser; +import org.scijava.ops.struct.FunctionalParameters; import org.scijava.ops.struct.RetypingRequest; -import org.scijava.ops.struct.Structs; import org.scijava.struct.FunctionalMethodType; import org.scijava.struct.ItemIO; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; +import org.scijava.struct.Structs; +import org.scijava.struct.ValidityException; /** * {@link OpInfo} for ops that have been adapted to some other Op type. @@ -52,7 +53,7 @@ public OpAdaptationInfo(OpInfo srcInfo, Type type, // not // much for us to do here. List problems = new ArrayList<>(); - List fmts = Structs.findFunctionalMethodTypes(type); + List fmts = FunctionalParameters.findFunctionalMethodTypes(type); RetypingRequest r = new RetypingRequest(srcInfo.struct(), fmts); struct = Structs.from(r, problems, new OpRetypingMemberParser()); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java index 7c81bfbc7..2fe4ada0f 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpClassInfo.java @@ -43,14 +43,14 @@ import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.struct.ClassOpDependencyMemberParser; import org.scijava.ops.struct.ClassParameterMemberParser; -import org.scijava.ops.struct.Structs; import org.scijava.plugin.Plugin; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; +import org.scijava.struct.Structs; +import org.scijava.struct.ValidityException; import org.scijava.types.Types; /** @@ -76,7 +76,6 @@ public OpClassInfo(final Class opClass, final double priority) { List problems = new ArrayList<>(); try { struct = Structs.from(opClass, problems, new ClassParameterMemberParser(), new ClassOpDependencyMemberParser()); -// struct = ParameterStructs.structOf(opClass); OpUtils.checkHasSingleOutput(struct); } catch (ValidityException e) { validityException = e; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java index 6ac0a6915..7f172e28e 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpFieldInfo.java @@ -43,12 +43,12 @@ import org.scijava.ops.OpHints; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.struct.FieldParameterMemberParser; -import org.scijava.ops.struct.Structs; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; +import org.scijava.struct.Structs; +import org.scijava.struct.ValidityException; /** * Metadata about an op implementation defined as a field. diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java index 55488ebe2..fa0a30b75 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpMethodInfo.java @@ -51,16 +51,16 @@ import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.OpUtils; -import org.scijava.ops.ValidityException; import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.struct.MethodOpDependencyMemberParser; import org.scijava.ops.struct.MethodParameterMemberParser; -import org.scijava.ops.struct.Structs; import org.scijava.ops.util.Adapt; import org.scijava.ops.util.OpMethodUtils; import org.scijava.struct.Member; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; +import org.scijava.struct.Structs; +import org.scijava.struct.ValidityException; import org.scijava.types.Types; import org.scijava.types.inference.InterfaceInference; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java index 5d521b418..0f641263b 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplificationUtils.java @@ -24,7 +24,7 @@ import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpRef; -import org.scijava.ops.struct.Structs; +import org.scijava.ops.OpUtils; import org.scijava.ops.util.AnnotationUtils; import org.scijava.types.Nil; import org.scijava.types.Types; @@ -67,7 +67,7 @@ public static ParameterizedType retypeOpType(Type originalOpType, Type[] newArgs if (!(originalOpType instanceof ParameterizedType)) throw new IllegalStateException("We hadn't thought about this yet."); Class opType = Types.raw(originalOpType); - Method fMethod = Structs.findFMethod(opType); + Method fMethod = OpUtils.findFunctionalMethod(opType); Map, Type> typeVarAssigns = new HashMap<>(); @@ -127,7 +127,7 @@ private static Type[] typesFromOpType(Class opType, Method fMethod, Type... t * @return the index of the mutable argument (or -1 iff the output is returned). */ public static int findMutableArgIndex(Class c) { - Method fMethod = Structs.findFMethod(c); + Method fMethod = OpUtils.findFunctionalMethod(c); for (int i = 0; i < fMethod.getParameterCount(); i++) { if (AnnotationUtils.getMethodParameterAnnotation(fMethod, i, Mutable.class) != null) return i; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java index cf0f992e0..551522753 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/simplify/SimplifiedOpInfo.java @@ -1,16 +1,10 @@ package org.scijava.ops.simplify; -import com.google.common.collect.Streams; - import java.lang.reflect.AnnotatedElement; import java.lang.reflect.Type; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Objects; -import java.util.function.BiFunction; -import java.util.stream.Collectors; -import java.util.stream.Stream; import org.scijava.Priority; import org.scijava.ValidityProblem; @@ -20,18 +14,18 @@ import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpInfo; import org.scijava.ops.OpUtils; -import org.scijava.ops.ValidityException; import org.scijava.ops.conversionLoss.LossReporter; import org.scijava.ops.hint.ImmutableHints; import org.scijava.ops.matcher.OpMatchingException; import org.scijava.ops.struct.OpRetypingMemberParser; import org.scijava.ops.struct.RetypingRequest; -import org.scijava.ops.struct.Structs; import org.scijava.struct.FunctionalMethodType; import org.scijava.struct.ItemIO; import org.scijava.struct.Member; import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; +import org.scijava.struct.Structs; +import org.scijava.struct.ValidityException; import org.scijava.types.Nil; import org.scijava.types.Types; import org.scijava.util.MiscUtils; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java index 7ce8575bc..5301c8f29 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassOpDependencyMemberParser.java @@ -9,7 +9,8 @@ import org.scijava.ValidityProblem; import org.scijava.ops.FieldOpDependencyMember; import org.scijava.ops.OpDependency; -import org.scijava.ops.ValidityException; +import org.scijava.struct.MemberParser; +import org.scijava.struct.ValidityException; import org.scijava.util.ClassUtils; public class ClassOpDependencyMemberParser implements @@ -26,7 +27,7 @@ public List> parse(Class source) final ArrayList problems = new ArrayList<>(); // NB: Reject abstract classes. - Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT); + org.scijava.struct.Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT); // Parse field level @OpDependency annotations. parseFieldOpDependencies(items, problems, source); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java index c07433925..17316e50c 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/ClassParameterMemberParser.java @@ -8,7 +8,8 @@ import java.util.Set; import org.scijava.ValidityProblem; -import org.scijava.ops.ValidityException; +import org.scijava.struct.MemberParser; +import org.scijava.struct.ValidityException; public class ClassParameterMemberParser implements MemberParser, SynthesizedParameterMember> @@ -25,7 +26,7 @@ public List> parse(Class source) final Set names = new HashSet<>(); // NB: Reject abstract classes. - Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT); + org.scijava.struct.Structs.checkModifiers(source.getName() + ": ", problems, source.getModifiers(), true, Modifier.ABSTRACT); // obtain a parameterData (preferably one that scrapes the javadoc) ParameterData paramData; @@ -35,7 +36,7 @@ public List> parse(Class source) paramData = new SynthesizedParameterData(); } - Structs.parseFunctionalParameters(items, names, problems, source, paramData); + FunctionalParameters.parseFunctionalParameters(items, names, problems, source, paramData); // Fail if there were any problems. if (!problems.isEmpty()) throw new ValidityException(problems); diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java index f4f20ddea..34e5b9285 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FieldParameterMemberParser.java @@ -10,7 +10,8 @@ import java.util.Set; import org.scijava.ValidityProblem; -import org.scijava.ops.ValidityException; +import org.scijava.struct.MemberParser; +import org.scijava.struct.ValidityException; import org.scijava.types.Types; public class FieldParameterMemberParser implements @@ -38,9 +39,9 @@ public List> parse(Field source) final Set names = new HashSet<>(); final Type fieldType = Types.fieldType(source, c); - Structs.checkModifiers(source.toString() + ": ", problems, source + org.scijava.struct.Structs.checkModifiers(source.toString() + ": ", problems, source .getModifiers(), false, Modifier.FINAL); - Structs.parseFunctionalParameters(items, names, problems, fieldType, + FunctionalParameters.parseFunctionalParameters(items, names, problems, fieldType, paramData); // Fail if there were any problems. if (!problems.isEmpty()) { diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java new file mode 100644 index 000000000..fe935a4e3 --- /dev/null +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/FunctionalParameters.java @@ -0,0 +1,104 @@ +package org.scijava.ops.struct; + +import java.lang.reflect.Method; +import java.lang.reflect.Type; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.scijava.ValidityProblem; +import org.scijava.function.Container; +import org.scijava.function.Mutable; +import org.scijava.ops.OpUtils; +import org.scijava.ops.util.AnnotationUtils; +import org.scijava.struct.FunctionalMethodType; +import org.scijava.struct.ItemIO; +import org.scijava.types.Types; + +public class FunctionalParameters { + + public static void parseFunctionalParameters( + final ArrayList> items, final Set names, + final ArrayList problems, Type type, ParameterData data) + { + // Search for the functional method of 'type' and map its signature to + // ItemIO + List fmts; + try { + fmts = FunctionalParameters.findFunctionalMethodTypes(type); + } + catch (IllegalArgumentException e) { + problems.add(new ValidityProblem("Could not find functional method of " + + type.getTypeName())); + return; + } + + // Synthesize members + List> fmtMembers = data.synthesizeMembers(fmts); + + for (SynthesizedParameterMember m : fmtMembers) { + String key = m.getKey(); + final Type itemType = m.getType(); + + final boolean valid = org.scijava.struct.Structs.checkValidity(m, key, Types.raw(itemType), false, + names, problems); + if (!valid) continue; + items.add(m); + names.add(m.getKey()); + } + } + + /** + * Returns a list of {@link FunctionalMethodType}s describing the input and + * output types of the functional method of the specified functional type. In + * doing so, the return type of the method will me marked as + * {@link ItemIO#OUTPUT} and the all method parameters as + * {@link ItemIO#OUTPUT}, except for parameters annotated with + * {@link Container} or {@link Mutable} which will be marked as + * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the + * specified type does not have a functional method in its hierarchy, + * {@code null} will be returned.
+ * The order will be the following: method parameters from left to right, then + * return type. + * + * @param functionalType + * @return + */ + public static List findFunctionalMethodTypes( + Type functionalType) + { + Method functionalMethod = OpUtils.findFunctionalMethod(Types.raw(functionalType)); + if (functionalMethod == null) throw new IllegalArgumentException("Type " + + functionalType + + " is not a functional type, thus its functional method types cannot be determined"); + + Type paramfunctionalType = functionalType; + if (functionalType instanceof Class) { + paramfunctionalType = Types.parameterizeRaw((Class) functionalType); + } + + List out = new ArrayList<>(); + int i = 0; + for (Type t : Types.getExactParameterTypes(functionalMethod, + paramfunctionalType)) + { + final ItemIO ioType; + if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, + Container.class) != null) ioType = ItemIO.CONTAINER; + else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, + Mutable.class) != null) ioType = ItemIO.MUTABLE; + else ioType = ItemIO.INPUT; + out.add(new FunctionalMethodType(t, ioType)); + i++; + } + + Type returnType = Types.getExactReturnType(functionalMethod, + paramfunctionalType); + if (!returnType.equals(void.class)) { + out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT)); + } + + return out; + } + +} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java index 22a524b07..d1bf90435 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodOpDependencyMemberParser.java @@ -10,7 +10,8 @@ import org.scijava.ValidityProblem; import org.scijava.ops.MethodParameterOpDependencyMember; import org.scijava.ops.OpDependency; -import org.scijava.ops.ValidityException; +import org.scijava.struct.MemberParser; +import org.scijava.struct.ValidityException; public class MethodOpDependencyMemberParser implements MemberParser> diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java index ef6ce4f40..d35468537 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MethodParameterMemberParser.java @@ -10,8 +10,9 @@ import org.scijava.ValidityProblem; import org.scijava.ops.OpMethod; -import org.scijava.ops.ValidityException; import org.scijava.ops.util.OpMethodUtils; +import org.scijava.struct.MemberParser; +import org.scijava.struct.ValidityException; import org.scijava.types.Types; public class MethodParameterMemberParser implements @@ -51,7 +52,7 @@ public List> parse(Method source) } // Parse method level @Parameter annotations. - Structs.parseFunctionalParameters(items, names, problems, functionalType, + FunctionalParameters.parseFunctionalParameters(items, names, problems, functionalType, paramData); // Fail if there were any problems. diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java index d9abf3635..2e31765eb 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/OpRetypingMemberParser.java @@ -4,12 +4,13 @@ import java.util.ArrayList; import java.util.List; -import org.scijava.ops.ValidityException; import org.scijava.ops.simplify.SimplifiedOpInfo; import org.scijava.struct.FunctionalMethodType; import org.scijava.struct.ItemIO; import org.scijava.struct.Member; +import org.scijava.struct.MemberParser; import org.scijava.struct.Struct; +import org.scijava.struct.ValidityException; public class OpRetypingMemberParser implements MemberParser> diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java deleted file mode 100644 index 4bd574bfe..000000000 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/Structs.java +++ /dev/null @@ -1,240 +0,0 @@ - -package org.scijava.ops.struct; - -import java.lang.reflect.Method; -import java.lang.reflect.Modifier; -import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import org.scijava.ValidityProblem; -import org.scijava.function.Container; -import org.scijava.function.Mutable; -import org.scijava.ops.OpUtils; -import org.scijava.ops.ValidityException; -import org.scijava.ops.util.AnnotationUtils; -import org.scijava.struct.FunctionalMethodType; -import org.scijava.struct.ItemIO; -import org.scijava.struct.Member; -import org.scijava.struct.Struct; -import org.scijava.struct.StructInstance; -import org.scijava.types.Types; -import org.scijava.types.inference.InterfaceInference; - -public class Structs { - - @SafeVarargs - public static Struct from(S source, List problems, - MemberParser>... parsers) - { - List> members = new ArrayList<>(); - for (MemberParser> p : parsers) { - try { - members.addAll(p.parse(source)); - } - catch (ValidityException e) { - problems.addAll(e.problems()); - } - } - return () -> members; - } - - /** - * Helper to check for several modifiers at once. - * - * @param message - * @param problems - * @param actualModifiers - * @param requiredModifiers - */ - public static void checkModifiers(String message, final ArrayList problems, - final int actualModifiers, final boolean negate, final int... requiredModifiers) { - for (int mod : requiredModifiers) { - if (negate) { - if ((actualModifiers & mod) != 0) { - problems.add( - new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod))); - } - } else { - if ((actualModifiers & mod) == 0) { - problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod))); - } - } - } - } - - public static void parseFunctionalParameters( - final ArrayList> items, final Set names, - final ArrayList problems, Type type, ParameterData data) - { - // Search for the functional method of 'type' and map its signature to - // ItemIO - List fmts; - try { - fmts = findFunctionalMethodTypes(type); - } - catch (IllegalArgumentException e) { - problems.add(new ValidityProblem("Could not find functional method of " + - type.getTypeName())); - return; - } - - // Synthesize members - List> fmtMembers = data.synthesizeMembers(fmts); - - for (SynthesizedParameterMember m : fmtMembers) { - String key = m.getKey(); - final Type itemType = m.getType(); - - final boolean valid = checkValidity(m, key, Types.raw(itemType), false, - names, problems); - if (!valid) continue; - items.add(m); - names.add(m.getKey()); - } - } - - /** - * Returns a list of {@link FunctionalMethodType}s describing the input and - * output types of the functional method of the specified functional type. In - * doing so, the return type of the method will me marked as - * {@link ItemIO#OUTPUT} and the all method parameters as - * {@link ItemIO#OUTPUT}, except for parameters annotated with - * {@link Container} or {@link Mutable} which will be marked as - * {@link ItemIO#CONTAINER} or {@link ItemIO#MUTABLE} respectively. If the - * specified type does not have a functional method in its hierarchy, - * {@code null} will be returned.
- * The order will be the following: method parameters from left to right, then - * return type. - * - * @param functionalType - * @return - */ - public static List findFunctionalMethodTypes( - Type functionalType) - { - Method functionalMethod = findFunctionalMethod(Types.raw(functionalType)); - if (functionalMethod == null) throw new IllegalArgumentException("Type " + - functionalType + - " is not a functional type, thus its functional method types cannot be determined"); - - Type paramfunctionalType = functionalType; - if (functionalType instanceof Class) { - paramfunctionalType = Types.parameterizeRaw((Class) functionalType); - } - - List out = new ArrayList<>(); - int i = 0; - for (Type t : Types.getExactParameterTypes(functionalMethod, - paramfunctionalType)) - { - final ItemIO ioType; - if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, - Container.class) != null) ioType = ItemIO.CONTAINER; - else if (AnnotationUtils.getMethodParameterAnnotation(functionalMethod, i, - Mutable.class) != null) ioType = ItemIO.MUTABLE; - else ioType = ItemIO.INPUT; - out.add(new FunctionalMethodType(t, ioType)); - i++; - } - - Type returnType = Types.getExactReturnType(functionalMethod, - paramfunctionalType); - if (!returnType.equals(void.class)) { - out.add(new FunctionalMethodType(returnType, ItemIO.OUTPUT)); - } - - return out; - } - - /** - * Attempts to find the single functional method of the specified class, by - * scanning the for functional interfaces. If there is no functional - * interface, null will be returned. - * - * @param cls - * @return - */ - private static Method findFunctionalMethod(Class cls) { - Class iFace = OpUtils.findFunctionalInterface(cls); - if (iFace == null) { - return null; - } - - List nonDefaults = Arrays.stream(iFace.getMethods()).filter(m -> !m - .isDefault()).collect(Collectors.toList()); - - // The single non default method must be the functional one - if (nonDefaults.size() != 1) { - for (Class i : iFace.getInterfaces()) { - final Method result = findFunctionalMethod(i); - if (result != null) return result; - } - } - - return nonDefaults.get(0); - } - - private static boolean checkValidity(Member m, String name, Class type, - boolean isFinal, Set names, ArrayList problems) - { - boolean valid = true; - - if (names.contains(name)) { - // NB: Shadowed parameters are bad because they are ambiguous. - final String error = "Invalid duplicate parameter: " + name; - problems.add(new ValidityProblem(error)); - valid = false; - } - - if ((m.getIOType() == ItemIO.MUTABLE || m - .getIOType() == ItemIO.CONTAINER) && isImmutable(type)) - { - // NB: The MUTABLE and CONTAINER types signify that the parameter - // will be written to, but immutable parameters cannot be changed in - // such a manner, so it makes no sense to label them as such. - final String error = "Immutable " + m.getIOType() + " parameter: " + - name + " (" + type.getName() + " is immutable)"; - problems.add(new ValidityProblem(error)); - valid = false; - } - - return valid; - } - - private static boolean isImmutable(final Class type) { - // NB: All eight primitive types, as well as the boxed primitive - // wrapper classes, as well as strings, are immutable objects. - return Types.isNumber(type) || Types.isText(type) || // - Types.isBoolean(type); - } - - /** - * Convenience method to call - * {@link Structs#from(Object, List, MemberParser...)} dot - * {@link Struct#createInstance(Object)} - * - * @param object the {@link Object} from which the {@link StructInstance} is - * created. - * @return an instance of the {@link Struct} created from {@code object} - * @throws ValidityException - */ - public static StructInstance create(final C object) - throws ValidityException - { - Struct s = from(object.getClass(), new ArrayList<>(), - new ClassParameterMemberParser(), new ClassOpDependencyMemberParser()); - return s.createInstance(object); - } - - // TODO: extract this method to a more general utility class - public static Method findFMethod(Class c) { - Class fIface = OpUtils.findFunctionalInterface(c); - if(fIface == null) throw new IllegalArgumentException("Class " + c +" does not implement a functional interface!"); - return InterfaceInference.singularAbstractMethod(fIface); - } - -} diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java index 4a381e13a..cb26fdaf4 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java @@ -1,5 +1,6 @@ package org.scijava.ops.util; +import java.util.ArrayList; import java.util.EnumSet; import java.util.List; import java.util.function.Predicate; @@ -7,8 +8,10 @@ import org.scijava.command.Command; import org.scijava.ops.OpDependencyMember; -import org.scijava.ops.ValidityException; +import org.scijava.ops.struct.ClassOpDependencyMemberParser; +import org.scijava.ops.struct.ClassParameterMemberParser; import org.scijava.struct.ItemIO; +import org.scijava.struct.Struct; import org.scijava.struct.StructInstance; import org.scijava.struct.ValueAccessibleMemberInstance; @@ -79,4 +82,27 @@ private static List> filterAccessibles( } } + public static class Commands { + private Commands() { + } + + public static void inputs(Command command, Object... objs) { + Structs.inputs(commandToStructInstance(command), objs); + } + + public static void outputs(Command command, Object... objs) { + Structs.outputs(commandToStructInstance(command), objs); + } + + public static void all(Command command, Object... objs) { + Structs.all(commandToStructInstance(command), objs); + } + + public static StructInstance commandToStructInstance(Command command) { + Struct s = org.scijava.struct.Structs.from(command.getClass(), + new ArrayList<>(), new ClassParameterMemberParser(), + new ClassOpDependencyMemberParser()); + return s.createInstance(command); + } + } } diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java index c75e35748..8069d0489 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/JavadocParameterTest.java @@ -15,13 +15,6 @@ import org.junit.Test; import org.scijava.function.Computers; import org.scijava.function.Inplaces; -import org.scijava.ops.Op; -import org.scijava.ops.OpCollection; -import org.scijava.ops.OpDependency; -import org.scijava.ops.OpField; -import org.scijava.ops.OpInfo; -import org.scijava.ops.OpMethod; -import org.scijava.ops.OpUtils; import org.scijava.plugin.Plugin; /** diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java index a74f3848d..78ba809d6 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/OpCollectionTest.java @@ -32,6 +32,7 @@ import java.util.function.BiFunction; import org.junit.Test; +import org.scijava.struct.ValidityException; import org.scijava.types.Nil; public class OpCollectionTest extends AbstractTestEnvironment { diff --git a/scijava/scijava-struct/src/main/java/module-info.java b/scijava/scijava-struct/src/main/java/module-info.java index 6eec255f9..aee8a31c1 100644 --- a/scijava/scijava-struct/src/main/java/module-info.java +++ b/scijava/scijava-struct/src/main/java/module-info.java @@ -3,4 +3,5 @@ exports org.scijava.struct; requires org.scijava.types; + requires org.scijava; } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/MemberParser.java similarity index 84% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java rename to scijava/scijava-struct/src/main/java/org/scijava/struct/MemberParser.java index 860c41a16..0afbb6ecc 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/struct/MemberParser.java +++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/MemberParser.java @@ -1,12 +1,9 @@ -package org.scijava.ops.struct; +package org.scijava.struct; import java.lang.reflect.Type; import java.util.List; -import org.scijava.ops.ValidityException; -import org.scijava.struct.Member; - /** * Parses a set of {@link Member}s from a source {@link Object} * diff --git a/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java index ce65d4171..87797093a 100644 --- a/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java +++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/Structs.java @@ -1,6 +1,14 @@ package org.scijava.struct; +import java.lang.reflect.Modifier; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; + +import org.scijava.ValidityProblem; +import org.scijava.types.Types; + public final class Structs { private Structs() { @@ -20,4 +28,79 @@ public static StructInstance expand( return memberInstance.member().childStruct().createInstance(// memberInstance.get()); } + + @SafeVarargs + public static Struct from(S source, List problems, + MemberParser>... parsers) + { + List> members = new ArrayList<>(); + for (MemberParser> p : parsers) { + try { + members.addAll(p.parse(source)); + } + catch (ValidityException e) { + problems.addAll(e.problems()); + } + } + return () -> members; + } + + /** + * Helper to check for several modifiers at once. + * + * @param message + * @param problems + * @param actualModifiers + * @param requiredModifiers + */ + public static void checkModifiers(String message, final ArrayList problems, + final int actualModifiers, final boolean negate, final int... requiredModifiers) { + for (int mod : requiredModifiers) { + if (negate) { + if ((actualModifiers & mod) != 0) { + problems.add( + new ValidityProblem(message + "Illegal modifier. Must not be " + Modifier.toString(mod))); + } + } else { + if ((actualModifiers & mod) == 0) { + problems.add(new ValidityProblem(message + "Illegal modifier. Must be " + Modifier.toString(mod))); + } + } + } + } + + public static boolean checkValidity(Member m, String name, Class type, + boolean isFinal, Set names, ArrayList problems) + { + boolean valid = true; + + if (names.contains(name)) { + // NB: Shadowed parameters are bad because they are ambiguous. + final String error = "Invalid duplicate parameter: " + name; + problems.add(new ValidityProblem(error)); + valid = false; + } + + if ((m.getIOType() == ItemIO.MUTABLE || m + .getIOType() == ItemIO.CONTAINER) && Structs.isImmutable(type)) + { + // NB: The MUTABLE and CONTAINER types signify that the parameter + // will be written to, but immutable parameters cannot be changed in + // such a manner, so it makes no sense to label them as such. + final String error = "Immutable " + m.getIOType() + " parameter: " + + name + " (" + type.getName() + " is immutable)"; + problems.add(new ValidityProblem(error)); + valid = false; + } + + return valid; + } + + public static boolean isImmutable(final Class type) { + // NB: All eight primitive types, as well as the boxed primitive + // wrapper classes, as well as strings, are immutable objects. + return Types.isNumber(type) || Types.isText(type) || // + Types.isBoolean(type); + } + } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValidityException.java similarity index 78% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java rename to scijava/scijava-struct/src/main/java/org/scijava/struct/ValidityException.java index 35f2079c9..e19f8e9d5 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/ValidityException.java +++ b/scijava/scijava-struct/src/main/java/org/scijava/struct/ValidityException.java @@ -1,4 +1,4 @@ -package org.scijava.ops; +package org.scijava.struct; import java.util.Collections; import java.util.List; @@ -8,6 +8,7 @@ /** * hasdjf * + * TODO: move upstream with {@link ValidityProblem} * @author Curtis Rueden */ public final class ValidityException extends Exception { @@ -18,10 +19,11 @@ public ValidityException(final String message) { this(Collections.singletonList(new ValidityProblem(message))); } - public ValidityException(final List problems) { + public ValidityException(@SuppressWarnings("exports") final List problems) { this.problems = problems; } + @SuppressWarnings("exports") public List problems() { return problems; } From ddfe94446df5af51c8c4813e4f25339ce0fd0c59 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 2 Jul 2021 15:16:56 -0500 Subject: [PATCH 23/31] Fix ExceptionUtils --- .../ops2/morphology/DistanceTransforms.java | 2 +- .../src/main/java/module-info.java | 1 - .../java/org/scijava/ops/ExceptionUtils.java | 2 +- .../org/scijava/ops/OpExecutionException.java | 66 ++++++++++++++++++- .../java/org/scijava/ops/util/Inject.java | 23 ------- 5 files changed, 65 insertions(+), 29 deletions(-) diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java index e84c47632..551eb3eb4 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/morphology/DistanceTransforms.java @@ -10,9 +10,9 @@ import org.scijava.function.Computers; import org.scijava.function.Inplaces; +import org.scijava.ops.ExceptionUtils; import org.scijava.ops.OpCollection; import org.scijava.ops.OpField; -import org.scijava.ops.core.ExceptionUtils; import org.scijava.plugin.Plugin; @Plugin(type = OpCollection.class) diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java index 25271150b..21ced234b 100644 --- a/scijava/scijava-ops/src/main/java/module-info.java +++ b/scijava/scijava-ops/src/main/java/module-info.java @@ -34,7 +34,6 @@ opens org.scijava.ops.struct to therapi.runtime.javadoc; opens org.scijava.ops.simplify to therapi.runtime.javadoc; opens org.scijava.ops.stats to therapi.runtime.javadoc; - opens org.scijava.ops.core to therapi.runtime.javadoc; opens org.scijava.ops.provenance.impl to therapi.runtime.javadoc, org.scijava; // FIXME: This is a file name and is thus unstable diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java index f19da7477..6c9aa34af 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/ExceptionUtils.java @@ -1,4 +1,4 @@ -package org.scijava.ops.core; +package org.scijava.ops; public class ExceptionUtils { // For void methods diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java index 4bf163832..509bb0dbc 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionException.java @@ -1,9 +1,69 @@ -package org.scijava.ops.core; +/* + * #%L + * SciJava Operations: a framework for reusable algorithms. + * %% + * Copyright (C) 2018 SciJava developers. + * %% + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * #L% + */ -public class OpExecutionException extends RuntimeException{ +package org.scijava.ops; - public OpExecutionException(Exception cause) { +/** + * Thrown to indicate that an Op failed in its execution + * + * @author Gabriel Selzer + */ +public class OpExecutionException extends RuntimeException { + + /** + * Constructs a OpExecutionException with the specified reason + * for failure. + * + * @param s the reason for the failure + */ + public OpExecutionException(String s) { + super(s); + } + + /** + * Constructs a OpExecutionException with the specified cause. + * + * @param cause the cause of the failure + */ + public OpExecutionException(Throwable cause) { super(cause); } + /** + * Constructs a OpExecutionException with the specified reason + * for failure and cause. + * + * @param message the reason for the failure + * @param cause the cause of the failure + */ + public OpExecutionException(String message, Throwable cause) { + super(message, cause); + } + } diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java index cb26fdaf4..5fa1f2504 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/util/Inject.java @@ -82,27 +82,4 @@ private static List> filterAccessibles( } } - public static class Commands { - private Commands() { - } - - public static void inputs(Command command, Object... objs) { - Structs.inputs(commandToStructInstance(command), objs); - } - - public static void outputs(Command command, Object... objs) { - Structs.outputs(commandToStructInstance(command), objs); - } - - public static void all(Command command, Object... objs) { - Structs.all(commandToStructInstance(command), objs); - } - - public static StructInstance commandToStructInstance(Command command) { - Struct s = org.scijava.struct.Structs.from(command.getClass(), - new ArrayList<>(), new ClassParameterMemberParser(), - new ClassOpDependencyMemberParser()); - return s.createInstance(command); - } - } } From f0f487f92e02d150701a7448bf1c09fb3e9e7323 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 2 Jul 2021 15:46:40 -0500 Subject: [PATCH 24/31] Resolve package cycle: geom tests --- .../net/imagej/ops2/geom/{ => geom2d}/PolygonFeatureTests.java | 3 ++- .../net/imagej/ops2/geom/{ => geom3d}/MeshFeatureTests.java | 2 +- .../net/imagej/ops2/geom/{ => geom3d}/QuickHull3DTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/{ => geom2d}/PolygonFeatureTests.java (99%) rename imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/{ => geom3d}/MeshFeatureTests.java (99%) rename imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/{ => geom3d}/QuickHull3DTest.java (99%) diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/PolygonFeatureTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom2d/PolygonFeatureTests.java similarity index 99% rename from imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/PolygonFeatureTests.java rename to imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom2d/PolygonFeatureTests.java index e888c9a4e..6831ec645 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/PolygonFeatureTests.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom2d/PolygonFeatureTests.java @@ -26,13 +26,14 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom; +package net.imagej.ops2.geom.geom2d; import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.List; import net.imagej.ops2.features.AbstractFeatureTest; +import net.imagej.ops2.geom.GeomUtils; import net.imagej.ops2.geom.geom2d.LabelRegionToPolygonConverter; import net.imglib2.RealLocalizable; import net.imglib2.RealPoint; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/MeshFeatureTests.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/MeshFeatureTests.java similarity index 99% rename from imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/MeshFeatureTests.java rename to imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/MeshFeatureTests.java index 9b9123fab..90a0ea93f 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/MeshFeatureTests.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/MeshFeatureTests.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom; +package net.imagej.ops2.geom.geom3d; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java similarity index 99% rename from imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java rename to imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java index 566f23c79..1b2367345 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/QuickHull3DTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/geom/geom3d/QuickHull3DTest.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.geom; +package net.imagej.ops2.geom.geom3d; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; From 34a38ed38eb13930c33f4e93062c69a6487e321b Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Fri, 2 Jul 2021 15:51:32 -0500 Subject: [PATCH 25/31] Fix package cycle: Persist tests --- .../java/org/scijava/persist/{testobjects => }/Circle.java | 2 +- .../scijava/persist/{testobjects => }/CircleAdapter.java | 2 +- .../test/java/org/scijava/persist/SerializationTests.java | 7 ++----- .../src/test/java/org/scijava/persist/Shape.java | 4 ++++ .../java/org/scijava/persist/{testobjects => }/Shapes.java | 2 +- .../test/java/org/scijava/persist/testobjects/Shape.java | 4 ---- 6 files changed, 9 insertions(+), 12 deletions(-) rename scijava/scijava-persist/src/test/java/org/scijava/persist/{testobjects => }/Circle.java (58%) rename scijava/scijava-persist/src/test/java/org/scijava/persist/{testobjects => }/CircleAdapter.java (90%) create mode 100644 scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java rename scijava/scijava-persist/src/test/java/org/scijava/persist/{testobjects => }/Shapes.java (96%) delete mode 100644 scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Circle.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java similarity index 58% rename from scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Circle.java rename to scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java index 862fc599d..b7e9735ba 100644 --- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Circle.java +++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/Circle.java @@ -1,5 +1,5 @@ -package org.scijava.persist.testobjects; +package org.scijava.persist; public class Circle implements Shape { diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/CircleAdapter.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java similarity index 90% rename from scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/CircleAdapter.java rename to scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java index 8eebecb2e..cb31e4722 100644 --- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/CircleAdapter.java +++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/CircleAdapter.java @@ -1,5 +1,5 @@ -package org.scijava.persist.testobjects; +package org.scijava.persist; import org.scijava.persist.IClassRuntimeAdapter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java index ce9e95137..db89d6aa2 100644 --- a/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java +++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/SerializationTests.java @@ -7,9 +7,6 @@ import org.junit.Before; import org.junit.Test; import org.scijava.Context; -import org.scijava.persist.testobjects.Circle; -import org.scijava.persist.testobjects.Shape; -import org.scijava.persist.testobjects.Shapes; public class SerializationTests { @@ -43,7 +40,7 @@ public void closeFiji() throws Exception { } /** - * Test {@link org.scijava.persist.testobjects.CircleAdapter} + * Test {@link org.scijava.persist.CircleAdapter} */ @Test public void testCircleObject() { @@ -52,7 +49,7 @@ public void testCircleObject() { } /** - * Test adapters located in {@link org.scijava.persist.testobjects.Shapes} + * Test adapters located in {@link org.scijava.persist.Shapes} */ @Test public void testDrawingObject() { diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java new file mode 100644 index 000000000..d65f73755 --- /dev/null +++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shape.java @@ -0,0 +1,4 @@ + +package org.scijava.persist; + +public interface Shape {} diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shapes.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java similarity index 96% rename from scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shapes.java rename to scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java index 3e45b8eed..d222cc4ed 100644 --- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shapes.java +++ b/scijava/scijava-persist/src/test/java/org/scijava/persist/Shapes.java @@ -1,5 +1,5 @@ -package org.scijava.persist.testobjects; +package org.scijava.persist; import org.scijava.persist.IClassRuntimeAdapter; import org.scijava.plugin.Plugin; diff --git a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java b/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java deleted file mode 100644 index fda4e4d18..000000000 --- a/scijava/scijava-persist/src/test/java/org/scijava/persist/testobjects/Shape.java +++ /dev/null @@ -1,4 +0,0 @@ - -package org.scijava.persist.testobjects; - -public interface Shape {} From d59cb3444ea66a1823814cb0ae60fb32bfcf8e8f Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Mon, 12 Jul 2021 16:00:07 -0500 Subject: [PATCH 26/31] Use new scijava-maven-plugin NoPackageCycles rule Forked from de.andrena.tools.nopackagecycles:no-package-cycles-enforcer-rule. --- pom.xml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 86e1fbcd9..23f4891b9 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,8 @@ https://javadoc.scijava.org/Java11/ https://javadoc.scijava.org/JavaFX11/ + 2.2.0 + none @@ -123,13 +125,6 @@ maven-enforcer-plugin - - - de.andrena.tools.nopackagecycles - no-package-cycles-enforcer-rule - 1.0.9 - - enforce-no-package-cycles @@ -140,7 +135,7 @@ + implementation="org.scijava.maven.plugin.enforcer.NoPackageCyclesRule" /> From b2930683a1bbf71d51e8b39872a95d6a59ee5ab4 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 13 Jul 2021 14:05:57 -0500 Subject: [PATCH 27/31] Consolidate create packages The current situation is untenable since Creators depends on the net.imagej.ops2.create.kernel and net.imagej.ops2.create.img packages. Ideally, we'd split out the image- and kernel create Ops into their own packages like we had, but the kernel and image creator Op fields rely on the (non-static) Op fields in the main package. Therefore if we moved these Ops to the subpackages, we would have to duplicate code. To prevent this duplication, we shall just consolidate to one package. --- imagej/imagej-ops2/src/main/java/module-info.java | 2 -- .../src/main/java/net/imagej/ops2/create/Creators.java | 8 -------- .../{kernel => }/DefaultCreateKernel2ndDerivBiGauss.java | 2 +- .../create/{kernel => }/DefaultCreateKernelBiGauss.java | 2 +- .../create/{kernel => }/DefaultCreateKernelGabor.java | 2 +- .../create/{kernel => }/DefaultCreateKernelGauss.java | 2 +- .../{kernel => }/DefaultCreateKernelGibsonLanni.java | 2 +- .../ops2/create/{kernel => }/DefaultCreateKernelLog.java | 2 +- .../create/{kernel => }/DefaultCreateKernelSobel.java | 2 +- .../main/java/net/imagej/ops2/create/{img => }/Imgs.java | 2 +- .../net/imagej/ops2/create/CreateKernelGaborTest.java | 1 - 11 files changed, 8 insertions(+), 19 deletions(-) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernel2ndDerivBiGauss.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelBiGauss.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelGabor.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelGauss.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelGibsonLanni.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelLog.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{kernel => }/DefaultCreateKernelSobel.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/{img => }/Imgs.java (99%) diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java index be89169af..81080025d 100644 --- a/imagej/imagej-ops2/src/main/java/module-info.java +++ b/imagej/imagej-ops2/src/main/java/module-info.java @@ -13,8 +13,6 @@ opens net.imagej.ops2.convert.copy to org.scijava, org.scijava.ops; opens net.imagej.ops2.copy to org.scijava, org.scijava.ops; opens net.imagej.ops2.create to org.scijava, org.scijava.ops; - opens net.imagej.ops2.create.img to org.scijava, org.scijava.ops; - opens net.imagej.ops2.create.kernel to org.scijava, org.scijava.ops; opens net.imagej.ops2.deconvolve to org.scijava, org.scijava.ops; opens net.imagej.ops2.deconvolve.accelerate to org.scijava, org.scijava.ops; opens net.imagej.ops2.eval to org.scijava, org.scijava.ops; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java index 127a95d60..726d634a2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java @@ -6,14 +6,6 @@ import net.imagej.ImgPlus; import net.imagej.ImgPlusMetadata; -import net.imagej.ops2.create.img.Imgs; -import net.imagej.ops2.create.kernel.DefaultCreateKernel2ndDerivBiGauss; -import net.imagej.ops2.create.kernel.DefaultCreateKernelBiGauss; -import net.imagej.ops2.create.kernel.DefaultCreateKernelGabor; -import net.imagej.ops2.create.kernel.DefaultCreateKernelGauss; -import net.imagej.ops2.create.kernel.DefaultCreateKernelGibsonLanni; -import net.imagej.ops2.create.kernel.DefaultCreateKernelLog; -import net.imagej.ops2.create.kernel.DefaultCreateKernelSobel; import net.imglib2.Cursor; import net.imglib2.Dimensions; import net.imglib2.FinalDimensions; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernel2ndDerivBiGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernel2ndDerivBiGauss.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernel2ndDerivBiGauss.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernel2ndDerivBiGauss.java index e34a382e5..64333421a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernel2ndDerivBiGauss.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernel2ndDerivBiGauss.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.create.kernel; +package net.imagej.ops2.create; import java.util.function.BiFunction; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelBiGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelBiGauss.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelBiGauss.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelBiGauss.java index f78a025b5..671cfdc39 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelBiGauss.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelBiGauss.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.create.kernel; +package net.imagej.ops2.create; import java.util.function.BiFunction; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGabor.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGabor.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGabor.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGabor.java index 532eedcdb..88ccc1e1c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGabor.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGabor.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.create.kernel; +package net.imagej.ops2.create; import java.util.function.BiFunction; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGauss.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGauss.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGauss.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGauss.java index 29dd6b65d..4f0eaff9e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGauss.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGauss.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.create.kernel; +package net.imagej.ops2.create; import java.util.function.BiFunction; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGibsonLanni.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGibsonLanni.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGibsonLanni.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGibsonLanni.java index 9d3106593..c13b66a9b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelGibsonLanni.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelGibsonLanni.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.create.kernel; +package net.imagej.ops2.create; import java.util.function.BiFunction; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelLog.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelLog.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelLog.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelLog.java index 016da987e..0c1298498 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelLog.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelLog.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.create.kernel; +package net.imagej.ops2.create; import java.util.function.BiFunction; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelSobel.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelSobel.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelSobel.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelSobel.java index e3993b740..ececfd61c 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/kernel/DefaultCreateKernelSobel.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/DefaultCreateKernelSobel.java @@ -26,7 +26,7 @@ * #L% */ -package net.imagej.ops2.create.kernel; +package net.imagej.ops2.create; import java.util.function.BiFunction; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/img/Imgs.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Imgs.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/img/Imgs.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Imgs.java index fb2b9fc88..6e3c0190a 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/img/Imgs.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Imgs.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.create.img; +package net.imagej.ops2.create; import net.imglib2.Dimensions; import net.imglib2.Interval; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java index b8e37b84e..a2a34e4f4 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/create/CreateKernelGaborTest.java @@ -34,7 +34,6 @@ import java.util.function.BiFunction; import net.imagej.ops2.AbstractOpTest; -import net.imagej.ops2.create.kernel.DefaultCreateKernelGabor; import net.imglib2.RandomAccess; import net.imglib2.RandomAccessibleInterval; import net.imglib2.type.numeric.ComplexType; From 4c3dbe4110b3e5dbbb4ccb4beaefb4a42a19daaf Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 13 Jul 2021 15:07:11 -0500 Subject: [PATCH 28/31] Absorb zernike helper into zernike package --- imagej/imagej-ops2/src/main/java/module-info.java | 1 - .../imagej/ops2/features/zernike/DefaultMagnitudeFeature.java | 1 - .../net/imagej/ops2/features/zernike/DefaultPhaseFeature.java | 1 - .../net/imagej/ops2/features/zernike/{helper => }/Polynom.java | 2 +- .../ops2/features/zernike/{helper => }/ZernikeComputer.java | 2 +- .../ops2/features/zernike/{helper => }/ZernikeMoment.java | 2 +- 6 files changed, 3 insertions(+), 6 deletions(-) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/{helper => }/Polynom.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/{helper => }/ZernikeComputer.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/{helper => }/ZernikeMoment.java (98%) diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java index 81080025d..31a313873 100644 --- a/imagej/imagej-ops2/src/main/java/module-info.java +++ b/imagej/imagej-ops2/src/main/java/module-info.java @@ -22,7 +22,6 @@ opens net.imagej.ops2.features.lbp2d to org.scijava, org.scijava.ops; opens net.imagej.ops2.features.tamura2d to org.scijava, org.scijava.ops; opens net.imagej.ops2.features.zernike to org.scijava, org.scijava.ops; - opens net.imagej.ops2.features.zernike.helper to org.scijava, org.scijava.ops; opens net.imagej.ops2.filter to org.scijava, org.scijava.ops; opens net.imagej.ops2.filter.addNoise to org.scijava, org.scijava.ops; opens net.imagej.ops2.filter.bilateral to org.scijava, org.scijava.ops; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java index 19f5f964d..78496aaab 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultMagnitudeFeature.java @@ -28,7 +28,6 @@ */ package net.imagej.ops2.features.zernike; -import net.imagej.ops2.features.zernike.helper.ZernikeMoment; import net.imglib2.IterableInterval; import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java index a70e5e242..ded51a433 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/DefaultPhaseFeature.java @@ -28,7 +28,6 @@ */ package net.imagej.ops2.features.zernike; -import net.imagej.ops2.features.zernike.helper.ZernikeMoment; import net.imglib2.IterableInterval; import net.imglib2.type.numeric.RealType; import net.imglib2.type.numeric.real.DoubleType; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/Polynom.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/Polynom.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/Polynom.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/Polynom.java index 6041c4f6d..9600ee424 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/Polynom.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/Polynom.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.features.zernike.helper; +package net.imagej.ops2.features.zernike; /** * class used to represent a zernike moment polynomial. diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java index d0bd30f60..498a1bd02 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeComputer.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeComputer.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.features.zernike.helper; +package net.imagej.ops2.features.zernike; import net.imagej.types.BigComplex; import net.imglib2.Cursor; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeMoment.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeMoment.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeMoment.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeMoment.java index f70c33a8b..faac05240 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/helper/ZernikeMoment.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/features/zernike/ZernikeMoment.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.features.zernike.helper; +package net.imagej.ops2.features.zernike; import net.imagej.types.BigComplex; From 2180d19c78d7b40ce6d8e4d1d94b4a65ea0a2379 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 13 Jul 2021 15:21:28 -0500 Subject: [PATCH 29/31] Absorb net.imagej.ops2.geom.geom3d.mesh There seemed to be no reason for this package. The contents did not really deal with Meshes, and many Ops in the net.imagej.ops2.geom.geom3d package (that actually imported Mesh) depended on this subpackage (which is bad). For these reasons, let's just absorb the mesh subpackage into the geom3d package --- imagej/imagej-ops2/src/main/java/module-info.java | 1 - .../geom/geom3d/{mesh => }/AbstractVertexInterpolator.java | 2 +- .../geom/geom3d/{mesh => }/BitTypeVertexInterpolator.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java | 3 --- .../net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java | 2 -- .../geom/geom3d/{mesh => }/DefaultVertexInterpolator.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/{mesh => }/Facet.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/{mesh => }/Horizon.java | 2 +- .../ops2/geom/geom3d/{mesh => }/RAIToMeshConverter.java | 2 +- .../imagej/ops2/geom/geom3d/{mesh => }/TriangularFacet.java | 4 +--- .../ops2/geom/geom3d/{mesh => }/UpdateablePointSet.java | 2 +- .../java/net/imagej/ops2/geom/geom3d/{mesh => }/Vertex.java | 2 +- .../ops2/geom/geom3d/{mesh => }/VertexInterpolator.java | 2 +- 13 files changed, 10 insertions(+), 18 deletions(-) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/AbstractVertexInterpolator.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/BitTypeVertexInterpolator.java (97%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/DefaultVertexInterpolator.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/Facet.java (97%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/Horizon.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/RAIToMeshConverter.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/TriangularFacet.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/UpdateablePointSet.java (99%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/Vertex.java (98%) rename imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/{mesh => }/VertexInterpolator.java (97%) diff --git a/imagej/imagej-ops2/src/main/java/module-info.java b/imagej/imagej-ops2/src/main/java/module-info.java index 31a313873..f2d48467b 100644 --- a/imagej/imagej-ops2/src/main/java/module-info.java +++ b/imagej/imagej-ops2/src/main/java/module-info.java @@ -48,7 +48,6 @@ opens net.imagej.ops2.geom to org.scijava, org.scijava.ops; opens net.imagej.ops2.geom.geom2d to org.scijava, org.scijava.ops; opens net.imagej.ops2.geom.geom3d to org.scijava, org.scijava.ops; - opens net.imagej.ops2.geom.geom3d.mesh to org.scijava, org.scijava.ops; opens net.imagej.ops2.identity to org.scijava, org.scijava.ops; opens net.imagej.ops2.image.ascii to org.scijava, org.scijava.ops; opens net.imagej.ops2.image.cooccurrenceMatrix to org.scijava, org.scijava.ops; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/AbstractVertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/AbstractVertexInterpolator.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/AbstractVertexInterpolator.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/AbstractVertexInterpolator.java index 301788527..59d62d152 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/AbstractVertexInterpolator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/AbstractVertexInterpolator.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; /** * This is the {@link AbstractVertexInterpolator}. A vertex interpolator diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/BitTypeVertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/BitTypeVertexInterpolator.java similarity index 97% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/BitTypeVertexInterpolator.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/BitTypeVertexInterpolator.java index bfe3f5166..45ff6f860 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/BitTypeVertexInterpolator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/BitTypeVertexInterpolator.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; /** * The {@link BitTypeVertexInterpolator} returns the point which is in the diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java index 179e29ac2..87b18885b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultConvexHull3D.java @@ -40,9 +40,6 @@ import net.imagej.mesh.Mesh; import net.imagej.mesh.naive.NaiveDoubleMesh; -import net.imagej.ops2.geom.geom3d.mesh.Horizon; -import net.imagej.ops2.geom.geom3d.mesh.TriangularFacet; -import net.imagej.ops2.geom.geom3d.mesh.Vertex; import net.imglib2.util.Pair; import net.imglib2.util.ValuePair; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java index e09e0e6e6..fa4add7b2 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultMarchingCubes.java @@ -33,8 +33,6 @@ import net.imagej.mesh.Mesh; import net.imagej.mesh.naive.NaiveDoubleMesh; -import net.imagej.ops2.geom.geom3d.mesh.DefaultVertexInterpolator; -import net.imagej.ops2.geom.geom3d.mesh.VertexInterpolator; import net.imglib2.Cursor; import net.imglib2.FinalInterval; import net.imglib2.RandomAccessibleInterval; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/DefaultVertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVertexInterpolator.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/DefaultVertexInterpolator.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVertexInterpolator.java index e93b479a3..995e5355e 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/DefaultVertexInterpolator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/DefaultVertexInterpolator.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; /** * Linearly interpolate the position where an isosurface cuts an edge between diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Facet.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Facet.java similarity index 97% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Facet.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Facet.java index 19175bffd..606904a18 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Facet.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Facet.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; public interface Facet { // NB: Marker Interface diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Horizon.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Horizon.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Horizon.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Horizon.java index 1bf644f1c..67716e8ed 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Horizon.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Horizon.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; /** * A Horizon is the result of n neighboring {@link TriangularFacet} which are merged. diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java index fdcae963a..94695afda 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/RAIToMeshConverter.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/RAIToMeshConverter.java @@ -27,7 +27,7 @@ * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; import java.lang.reflect.Type; import java.util.function.Function; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/TriangularFacet.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/TriangularFacet.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/TriangularFacet.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/TriangularFacet.java index a52fad74a..2d45fd534 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/TriangularFacet.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/TriangularFacet.java @@ -26,14 +26,12 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import net.imagej.ops2.geom.geom3d.DefaultConvexHull3D; - import org.apache.commons.math3.geometry.euclidean.threed.Vector3D; /** diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/UpdateablePointSet.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/UpdateablePointSet.java similarity index 99% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/UpdateablePointSet.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/UpdateablePointSet.java index 99f9d9faf..72cca5aba 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/UpdateablePointSet.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/UpdateablePointSet.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; import java.util.List; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Vertex.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Vertex.java similarity index 98% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Vertex.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Vertex.java index 004337f34..c6a99568b 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/Vertex.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/Vertex.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; import java.util.ArrayList; import java.util.Iterator; diff --git a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/VertexInterpolator.java b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/VertexInterpolator.java similarity index 97% rename from imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/VertexInterpolator.java rename to imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/VertexInterpolator.java index e94d64824..d07512b55 100644 --- a/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/mesh/VertexInterpolator.java +++ b/imagej/imagej-ops2/src/main/java/net/imagej/ops2/geom/geom3d/VertexInterpolator.java @@ -26,7 +26,7 @@ * POSSIBILITY OF SUCH DAMAGE. * #L% */ -package net.imagej.ops2.geom.geom3d.mesh; +package net.imagej.ops2.geom.geom3d; public interface VertexInterpolator { From 620dcf8c865b3cfa56b285b13971d7ec09053d6c Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Tue, 13 Jul 2021 13:48:26 -0500 Subject: [PATCH 30/31] Add subpackage dependency prevention rule --- pom.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pom.xml b/pom.xml index 23f4891b9..dd14fefb9 100644 --- a/pom.xml +++ b/pom.xml @@ -139,6 +139,19 @@ + + enforce-no-subpackage-dependence + + enforce + + test + + + + + + From 90b38f0fbfd2fe9433b3b61b2eecc14992a477e3 Mon Sep 17 00:00:00 2001 From: Gabriel Selzer Date: Thu, 5 Aug 2021 12:57:15 -0500 Subject: [PATCH 31/31] Resolve provenance package cycle This was a tough decision, as I'd like to keep the provenance stuff separate from the matcher, but we have to take the OpHistory in the OpWrappers, so we have to make this change. It is probably worth considering making a scijava-ops-provenance module that can stand alone from scijava-ops(-engine) --- .../src/test/java/net/imagej/ops2/AbstractOpTest.java | 2 +- .../test/java/net/imagej/ops2/coloc/ColocalisationTest.java | 2 +- .../imagej/ops2/filter/vesselness/FrangiVesselnessTest.java | 4 ++-- scijava/scijava-ops/src/main/java/module-info.java | 3 --- .../scijava-ops/src/main/java/org/scijava/ops/Hints.java | 1 - .../scijava/ops/{provenance => }/OpExecutionSummary.java | 3 +-- .../java/org/scijava/ops/{provenance => }/OpHistory.java | 3 +-- .../org/scijava/ops/{provenance => }/OpHistoryService.java | 2 +- .../src/main/java/org/scijava/ops/OpWrapper.java | 1 - .../org/scijava/ops/conversionLoss/LossReporterWrapper.java | 4 ++-- .../java/org/scijava/ops/impl/DefaultOpEnvironment.java | 2 +- .../scijava/ops/{provenance => }/impl/DefaultOpHistory.java | 6 +++--- .../{provenance => }/impl/SingletonOpHistoryService.java | 6 +++--- .../main/java/org/scijava/ops/matcher/impl/OpWrappers.java | 4 ++-- .../test/java/org/scijava/ops/AbstractTestEnvironment.java | 1 - .../src/test/java/org/scijava/ops/impl/OpCachingTest.java | 2 +- .../java/org/scijava/ops/provenance/ProvenanceTest.java | 2 ++ scijava/scijava-ops/templates/main/java/module-info.vm | 3 +-- .../main/java/org/scijava/ops/matcher/impl/OpWrappers.vm | 4 ++-- 19 files changed, 24 insertions(+), 31 deletions(-) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/OpExecutionSummary.java (93%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/OpHistory.java (95%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/OpHistoryService.java (74%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/impl/DefaultOpHistory.java (95%) rename scijava/scijava-ops/src/main/java/org/scijava/ops/{provenance => }/impl/SingletonOpHistoryService.java (73%) diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java index 4c7df5f41..784c211b1 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/AbstractOpTest.java @@ -51,8 +51,8 @@ import org.scijava.Context; import org.scijava.cache.CacheService; import org.scijava.ops.Op; +import org.scijava.ops.OpHistoryService; import org.scijava.ops.OpService; -import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.PluginService; import org.scijava.thread.ThreadService; import org.scijava.types.TypeService; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java index a768395f3..40079996e 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/coloc/ColocalisationTest.java @@ -60,8 +60,8 @@ import org.scijava.cache.CacheService; import org.scijava.io.location.FileLocation; import org.scijava.ops.OpBuilder; +import org.scijava.ops.OpHistoryService; import org.scijava.ops.OpService; -import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.PluginService; import org.scijava.thread.ThreadService; import org.scijava.types.TypeService; diff --git a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java index e087a908d..3d851e00b 100644 --- a/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java +++ b/imagej/imagej-ops2/src/test/java/net/imagej/ops2/filter/vesselness/FrangiVesselnessTest.java @@ -49,9 +49,9 @@ import org.scijava.Context; import org.scijava.cache.CacheService; import org.scijava.ops.OpBuilder; +import org.scijava.ops.OpHistory; +import org.scijava.ops.OpHistoryService; import org.scijava.ops.OpService; -import org.scijava.ops.provenance.OpHistory; -import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.PluginService; import org.scijava.script.ScriptService; import org.scijava.thread.ThreadService; diff --git a/scijava/scijava-ops/src/main/java/module-info.java b/scijava/scijava-ops/src/main/java/module-info.java index 21ced234b..213ec3e5c 100644 --- a/scijava/scijava-ops/src/main/java/module-info.java +++ b/scijava/scijava-ops/src/main/java/module-info.java @@ -11,7 +11,6 @@ exports org.scijava.ops.math; exports org.scijava.ops.simplify; exports org.scijava.ops.conversionLoss; - exports org.scijava.ops.provenance; // TODO: move OpWrapper to its own package (org.scijava.ops.wrap??) exports org.scijava.ops.util; // contains OpWrapper interface @@ -26,7 +25,6 @@ opens org.scijava.ops.create to therapi.runtime.javadoc; opens org.scijava.ops.impl to therapi.runtime.javadoc, org.scijava; opens org.scijava.ops.monitor to therapi.runtime.javadoc; - opens org.scijava.ops.provenance to therapi.runtime.javadoc; opens org.scijava.ops.adapt.functional to therapi.runtime.javadoc; opens org.scijava.ops to therapi.runtime.javadoc, org.scijava; opens org.scijava.ops.util to therapi.runtime.javadoc; @@ -34,7 +32,6 @@ opens org.scijava.ops.struct to therapi.runtime.javadoc; opens org.scijava.ops.simplify to therapi.runtime.javadoc; opens org.scijava.ops.stats to therapi.runtime.javadoc; - opens org.scijava.ops.provenance.impl to therapi.runtime.javadoc, org.scijava; // FIXME: This is a file name and is thus unstable requires geantyref; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java index 4b7fb1f42..a449457ec 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/Hints.java @@ -6,7 +6,6 @@ import java.util.UUID; import org.scijava.ops.BaseOpHints.Simplification; -import org.scijava.ops.provenance.OpHistory; /** * A basic interface for storing and accessing Hints. The general structure for a Hint is diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpExecutionSummary.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java similarity index 93% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpExecutionSummary.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java index ba8f970f5..e84b4f83e 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpExecutionSummary.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpExecutionSummary.java @@ -1,9 +1,8 @@ -package org.scijava.ops.provenance; +package org.scijava.ops; import java.util.UUID; -import org.scijava.ops.OpInfo; import org.scijava.ops.impl.DefaultOpEnvironment; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistory.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java similarity index 95% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistory.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java index 1ea8c3a0a..285de5306 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistory.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistory.java @@ -1,12 +1,11 @@ -package org.scijava.ops.provenance; +package org.scijava.ops; import com.google.common.graph.Graph; import java.util.List; import java.util.UUID; -import org.scijava.ops.OpInfo; import org.scijava.service.SciJavaService; /** diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistoryService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java similarity index 74% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistoryService.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java index 8318d434d..1b5600da4 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/OpHistoryService.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpHistoryService.java @@ -1,4 +1,4 @@ -package org.scijava.ops.provenance; +package org.scijava.ops; import org.scijava.service.SciJavaService; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java index 56dad4885..d2d631281 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/OpWrapper.java @@ -6,7 +6,6 @@ import org.scijava.ops.Hints; import org.scijava.ops.OpInfo; -import org.scijava.ops.provenance.OpHistory; import org.scijava.plugin.SciJavaPlugin; import org.scijava.types.Types; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java index abb9071de..a0af5d463 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/conversionLoss/LossReporterWrapper.java @@ -5,10 +5,10 @@ import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.Hints; +import org.scijava.ops.OpExecutionSummary; +import org.scijava.ops.OpHistory; import org.scijava.ops.OpInfo; import org.scijava.ops.OpWrapper; -import org.scijava.ops.provenance.OpExecutionSummary; -import org.scijava.ops.provenance.OpHistory; import org.scijava.plugin.Plugin; import org.scijava.types.GenericTyped; import org.scijava.types.Nil; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java index 5f0fc48b1..159f69fdc 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpEnvironment.java @@ -65,6 +65,7 @@ import org.scijava.ops.OpDependencyMember; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpField; +import org.scijava.ops.OpHistoryService; import org.scijava.ops.OpInfo; import org.scijava.ops.OpInstance; import org.scijava.ops.OpMethod; @@ -83,7 +84,6 @@ import org.scijava.ops.matcher.impl.OpClassInfo; import org.scijava.ops.matcher.impl.OpFieldInfo; import org.scijava.ops.matcher.impl.OpMethodInfo; -import org.scijava.ops.provenance.OpHistoryService; import org.scijava.ops.simplify.SimplifiedOpInfo; import org.scijava.ops.struct.FunctionalParameters; import org.scijava.plugin.Parameter; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/DefaultOpHistory.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java similarity index 95% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/DefaultOpHistory.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java index b46516dfe..f624e61bf 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/DefaultOpHistory.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/DefaultOpHistory.java @@ -1,5 +1,5 @@ -package org.scijava.ops.provenance.impl; +package org.scijava.ops.impl; import com.google.common.graph.Graph; import com.google.common.graph.GraphBuilder; @@ -14,9 +14,9 @@ import java.util.stream.Collectors; import org.scijava.ops.OpDependency; +import org.scijava.ops.OpExecutionSummary; +import org.scijava.ops.OpHistory; import org.scijava.ops.OpInfo; -import org.scijava.ops.provenance.OpExecutionSummary; -import org.scijava.ops.provenance.OpHistory; import org.scijava.plugin.Plugin; import org.scijava.service.AbstractService; import org.scijava.service.Service; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/SingletonOpHistoryService.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java similarity index 73% rename from scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/SingletonOpHistoryService.java rename to scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java index a773beca9..951116aa9 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/provenance/impl/SingletonOpHistoryService.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/impl/SingletonOpHistoryService.java @@ -1,7 +1,7 @@ -package org.scijava.ops.provenance.impl; +package org.scijava.ops.impl; -import org.scijava.ops.provenance.OpHistory; -import org.scijava.ops.provenance.OpHistoryService; +import org.scijava.ops.OpHistory; +import org.scijava.ops.OpHistoryService; import org.scijava.plugin.Plugin; import org.scijava.service.AbstractService; diff --git a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java index 97936c716..8c7e59ceb 100644 --- a/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java +++ b/scijava/scijava-ops/src/main/java/org/scijava/ops/matcher/impl/OpWrappers.java @@ -17,10 +17,10 @@ import org.scijava.function.Producer; import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.Hints; +import org.scijava.ops.OpExecutionSummary; +import org.scijava.ops.OpHistory; import org.scijava.ops.OpInfo; import org.scijava.ops.OpWrapper; -import org.scijava.ops.provenance.OpExecutionSummary; -import org.scijava.ops.provenance.OpHistory; import org.scijava.plugin.Plugin; import org.scijava.types.GenericTyped; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java index 346df1e01..e2bce62c2 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/AbstractTestEnvironment.java @@ -11,7 +11,6 @@ import org.junit.BeforeClass; import org.scijava.Context; import org.scijava.cache.CacheService; -import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.PluginService; import org.scijava.thread.ThreadService; import org.scijava.types.TypeService; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java index 0eaf3ed88..cd98aea31 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/impl/OpCachingTest.java @@ -46,9 +46,9 @@ import org.scijava.ops.OpDependency; import org.scijava.ops.OpEnvironment; import org.scijava.ops.OpField; +import org.scijava.ops.OpHistoryService; import org.scijava.ops.OpInstance; import org.scijava.ops.OpService; -import org.scijava.ops.provenance.OpHistoryService; import org.scijava.plugin.Plugin; import org.scijava.plugin.PluginService; import org.scijava.types.TypeService; diff --git a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java index 6fb17de2f..a9e50d1f5 100644 --- a/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java +++ b/scijava/scijava-ops/src/test/java/org/scijava/ops/provenance/ProvenanceTest.java @@ -16,7 +16,9 @@ import org.scijava.ops.Hints; import org.scijava.ops.OpCollection; import org.scijava.ops.OpDependency; +import org.scijava.ops.OpExecutionSummary; import org.scijava.ops.OpField; +import org.scijava.ops.OpHistoryService; import org.scijava.ops.OpInfo; import org.scijava.ops.OpMethod; import org.scijava.ops.hint.DefaultHints; diff --git a/scijava/scijava-ops/templates/main/java/module-info.vm b/scijava/scijava-ops/templates/main/java/module-info.vm index 332cb1a86..f667db44b 100644 --- a/scijava/scijava-ops/templates/main/java/module-info.vm +++ b/scijava/scijava-ops/templates/main/java/module-info.vm @@ -8,7 +8,7 @@ module org.scijava.ops { ## Determines all packages in the module #set($packages = $modulePackages.call("src/main/java/org/scijava")) ## Defines the packages that should be exported to org.scijava -#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.matcher.impl", "org.scijava.ops.provenance.impl"]) +#set($scijavaPackages = ["org.scijava.ops", "org.scijava.ops.impl", "org.scijava.ops.matcher.impl"]) ## Defines the packages that should be exported to therapi.runtime.javadoc #set($therapiPackages = $modulePackages.call("src/main/java/org/scijava")) //TODO: rearrange packages to export only needed classes @@ -17,7 +17,6 @@ module org.scijava.ops { exports org.scijava.ops.math; exports org.scijava.ops.simplify; exports org.scijava.ops.conversionLoss; - exports org.scijava.ops.provenance; // TODO: move OpWrapper to its own package (org.scijava.ops.wrap??) exports org.scijava.ops.util; // contains OpWrapper interface diff --git a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm index e2b95552a..cf7559aad 100644 --- a/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm +++ b/scijava/scijava-ops/templates/main/java/org/scijava/ops/matcher/impl/OpWrappers.vm @@ -17,10 +17,10 @@ import org.scijava.function.Inplaces; import org.scijava.function.Producer; import org.scijava.ops.BaseOpHints.DependencyMatching; import org.scijava.ops.Hints; +import org.scijava.ops.OpExecutionSummary; +import org.scijava.ops.OpHistory; import org.scijava.ops.OpInfo; import org.scijava.ops.OpWrapper; -import org.scijava.ops.provenance.OpExecutionSummary; -import org.scijava.ops.provenance.OpHistory; import org.scijava.plugin.Plugin; import org.scijava.types.GenericTyped;