Skip to content

Commit 53596d8

Browse files
gselzergselzer
committed
Migrate Functions to scijava/function
1 parent 3ca31e9 commit 53596d8

144 files changed

Lines changed: 1232 additions & 515 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/icq/LiICQ.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
import org.scijava.ops.OpDependency;
4040
import org.scijava.ops.core.Op;
4141
import org.scijava.functions.Computers;
42-
import org.scijava.ops.function.Functions;
42+
import org.scijava.functions.Functions;
4343
import org.scijava.param.Parameter;
4444
import org.scijava.plugin.Plugin;
4545
import org.scijava.struct.ItemIO;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/coloc/maxTKendallTau/MTKT.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
import org.scijava.ops.OpDependency;
5151
import org.scijava.ops.core.Op;
5252
import org.scijava.functions.Computers;
53-
import org.scijava.ops.function.Functions;
53+
import org.scijava.functions.Functions;
5454
import org.scijava.param.Parameter;
5555
import org.scijava.plugin.Plugin;
5656
import org.scijava.struct.ItemIO;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/convert/Converters.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
import org.scijava.ops.OpField;
99
import org.scijava.ops.core.OpCollection;
10-
import org.scijava.ops.function.Functions;
10+
import org.scijava.functions.Functions;
1111
import org.scijava.param.Parameter;
1212
import org.scijava.plugin.Plugin;
1313
import org.scijava.struct.ItemIO;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/create/Creators.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@
5050
import org.scijava.Priority;
5151
import org.scijava.ops.OpField;
5252
import org.scijava.ops.core.OpCollection;
53-
import org.scijava.ops.function.Functions;
54-
import org.scijava.ops.function.Functions;
53+
import org.scijava.functions.Functions;
54+
import org.scijava.functions.Functions;
5555
import org.scijava.ops.function.Producer;
5656
import org.scijava.plugin.Plugin;
5757

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/NonCirculantFirstGuess.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import org.scijava.ops.OpDependency;
4444
import org.scijava.ops.core.Op;
4545
import org.scijava.functions.Computers;
46-
import org.scijava.ops.function.Functions;
46+
import org.scijava.functions.Functions;
4747
import org.scijava.param.Parameter;
4848
import org.scijava.plugin.Plugin;
4949
import org.scijava.struct.ItemIO;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyF.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
import org.scijava.ops.OpDependency;
4848
import org.scijava.ops.core.Op;
4949
import org.scijava.functions.Computers;
50-
import org.scijava.ops.function.Functions;
50+
import org.scijava.functions.Functions;
5151
import org.scijava.ops.function.Inplaces;
5252
import org.scijava.param.Parameter;
5353
import org.scijava.plugin.Plugin;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/RichardsonLucyTVF.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,9 @@
5151
import org.scijava.functions.Computers;
5252
import org.scijava.functions.Computers;
5353
import org.scijava.functions.Computers;
54-
import org.scijava.ops.function.Functions;
55-
import org.scijava.ops.function.Functions;
56-
import org.scijava.ops.function.Functions;
54+
import org.scijava.functions.Functions;
55+
import org.scijava.functions.Functions;
56+
import org.scijava.functions.Functions;
5757
import org.scijava.ops.function.Inplaces;
5858
import org.scijava.ops.function.Inplaces;
5959
import org.scijava.param.Parameter;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/deconvolve/accelerate/VectorAccelerator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import org.scijava.Priority;
4747
import org.scijava.ops.OpDependency;
4848
import org.scijava.ops.core.Op;
49-
import org.scijava.ops.function.Functions;
49+
import org.scijava.functions.Functions;
5050
import org.scijava.ops.function.Inplaces;
5151
import org.scijava.ops.util.Adapt;
5252
import org.scijava.param.Parameter;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/DefaultEval.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
import org.scijava.ops.OpService;
3535
import org.scijava.ops.core.Op;
36-
import org.scijava.ops.function.Functions;
36+
import org.scijava.functions.Functions;
3737
import org.scijava.param.Parameter;
3838
import org.scijava.plugin.Plugin;
3939
import org.scijava.struct.ItemIO;

‎imagej/imagej-ops2/src/main/java/net/imagej/ops2/eval/OpEvaluator.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
import java.util.Map;
3838

3939
import org.scijava.ops.OpService;
40-
import org.scijava.ops.function.Functions;
40+
import org.scijava.ops.function.FunctionUtils;
41+
import org.scijava.functions.Functions;
4142
import org.scijava.types.Nil;
4243
import org.scijava.types.TypeService;
4344
import org.scijava.parsington.Operator;
@@ -148,7 +149,7 @@ public Object execute(final String opName, final Object... args) {
148149
Nil<Object> outType = new Nil<>() {};
149150

150151
// Try executing the op.
151-
Functions.ArityN<Object> func = Functions.matchN(ops.env(), opName, outType, inTypes);
152+
FunctionUtils.ArityN<Object> func = FunctionUtils.matchN(ops.env(), opName, outType, inTypes);
152153
return func.apply(argValues);
153154
}
154155

0 commit comments

Comments
 (0)