Skip to content

Commit 0b0b4e1

Browse files
hinermhinerm
authored
Merge pull request #59 from scijava/scijava/scijava-ops-engine/restore-package-rules
Restore Package Rules
2 parents e5c60b5 + e7bbccf commit 0b0b4e1

97 files changed

Lines changed: 629 additions & 847 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-tutorial/notebooks/gateways.py‎

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

1414
from scyjava import jimport
1515
from types import MethodType
16-
env=jimport('org.scijava.ops.engine.DefaultOpEnvironment')()
16+
env=jimport('org.scijava.ops.engine.impl.DefaultOpEnvironment')()
1717

1818
op_names={str(name) for info in env.infos() for name in info.names()}
1919

‎imagej/imagej-ops2-tutorial/scripts/gateways.py‎

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

1414
from scyjava import jimport
1515
from types import MethodType
16-
env=jimport('org.scijava.ops.engine.DefaultOpEnvironment')()
16+
env=jimport('org.scijava.ops.engine.impl.DefaultOpEnvironment')()
1717

1818
op_names={str(name) for info in env.infos() for name in info.names()}
1919

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/OpAdaptation.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.function.BiFunction;
66

77
import org.scijava.ops.api.OpEnvironment;
8-
import org.scijava.ops.engine.DefaultOpEnvironment;
98
import org.scijava.ops.spi.OpCollection;
109
import org.scijava.ops.spi.OpField;
1110

@@ -38,7 +37,7 @@ public class OpAdaptation implements OpCollection {
3837

3938
public static void main(String... args) {
4039
// Create the OpEnvironment
41-
OpEnvironment ops = new DefaultOpEnvironment();
40+
OpEnvironment ops = OpEnvironment.getEnvironment();
4241
// Call the Op on some inputs
4342
Double[] firstArray = new Double[] { 1., 2., 3. };
4443
Double[] secondArray = new Double[] { 1., 2., 3. };

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/OpBuilder.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import java.util.function.BiFunction;
55

66
import org.scijava.ops.api.OpEnvironment;
7-
import org.scijava.ops.engine.DefaultOpEnvironment;
87

98
/**
109
* The OpBuilder syntax leads to concise, script-like Op execution.
@@ -16,7 +15,7 @@ public class OpBuilder {
1615

1716
public static void main(String... args) {
1817
// All Ops calls start from an OpEnvironment. This environment determines the available Ops.
19-
OpEnvironment ops = new DefaultOpEnvironment();
18+
OpEnvironment ops = OpEnvironment.getEnvironment();
2019

2120
/*
2221
To run an Op we have to match it. Ops themselves have a name, some number of inputs, and potentially an output

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/OpParallelization.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
import org.scijava.function.Computers;
55
import org.scijava.ops.api.OpEnvironment;
6-
import org.scijava.ops.engine.DefaultOpEnvironment;
76
import org.scijava.ops.spi.OpCollection;
87
import org.scijava.ops.spi.OpMethod;
98

@@ -60,7 +59,7 @@ public static void averageNeighborhood(Neighborhood<UnsignedByteType> input,
6059
}
6160

6261
public static void main(String... args) {
63-
OpEnvironment ops = new DefaultOpEnvironment();
62+
OpEnvironment ops = OpEnvironment.getEnvironment();
6463

6564
// First, we show parallelization at work for our per-pixel Op.
6665
// SciJava Ops understands how to apply that Op to each pixel of the input

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/OpReduction.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import org.scijava.function.Functions;
77
import org.scijava.ops.api.OpEnvironment;
8-
import org.scijava.ops.engine.DefaultOpEnvironment;
98
import org.scijava.ops.spi.OpCollection;
109
import org.scijava.ops.spi.OpMethod;
1110
import org.scijava.ops.spi.Optional;
@@ -65,7 +64,7 @@ else if (in3 == null) {
6564

6665
public static void main(String... args) {
6766
// Create the OpEnvironment
68-
OpEnvironment ops = new DefaultOpEnvironment();
67+
OpEnvironment ops = OpEnvironment.getEnvironment();
6968

7069
// Define some data
7170
Double first = 1.;

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/OpSimplification.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.function.BiFunction;
66

77
import org.scijava.ops.api.OpEnvironment;
8-
import org.scijava.ops.engine.DefaultOpEnvironment;
98
import org.scijava.ops.spi.OpCollection;
109
import org.scijava.ops.spi.OpField;
1110

@@ -43,7 +42,7 @@ public class OpSimplification implements OpCollection {
4342

4443
public static void main(String... args) {
4544
// Create the OpEnvironment
46-
OpEnvironment ops = new DefaultOpEnvironment();
45+
OpEnvironment ops = OpEnvironment.getEnvironment();
4746
// Call the Op on some inputs
4847
Integer first = 1;
4948
Integer second = 2;

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/OpTypes.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33

44
import java.util.function.BiFunction;
55

6-
import net.imglib2.Interval;
7-
import net.imglib2.RandomAccessibleInterval;
8-
import net.imglib2.algorithm.neighborhood.Shape;
9-
import net.imglib2.type.logic.BitType;
106
import org.scijava.function.Computers;
117
import org.scijava.function.Inplaces;
128
import org.scijava.ops.api.OpEnvironment;
13-
import org.scijava.ops.engine.DefaultOpEnvironment;
149
import org.scijava.ops.spi.Op;
1510
import org.scijava.ops.spi.OpClass;
1611
import org.scijava.types.Nil;
1712

13+
import net.imglib2.Interval;
14+
import net.imglib2.RandomAccessibleInterval;
15+
import net.imglib2.algorithm.neighborhood.Shape;
16+
import net.imglib2.type.logic.BitType;
17+
1818
/**
1919
* A tutorial describing the major flavors of Ops
2020
*
@@ -29,7 +29,7 @@ public static void main(String... args) {
2929
3030
We will showcase each of the types below.
3131
*/
32-
OpEnvironment ops = new DefaultOpEnvironment();
32+
OpEnvironment ops = OpEnvironment.getEnvironment();
3333

3434
/**
3535
* The most basic category of Ops are Functions.

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/OpsIntro.java‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,15 @@
11
package net.imagej.ops2.tutorial;
22

3+
import org.scijava.Context;
4+
import org.scijava.ops.api.OpEnvironment;
5+
import org.scijava.types.Nil;
6+
37
import io.scif.img.ImgOpener;
4-
import io.scif.img.SCIFIOImgPlus;
5-
import net.imglib2.IterableInterval;
6-
import net.imglib2.RandomAccessibleInterval;
7-
import net.imglib2.algorithm.neighborhood.RectangleNeighborhoodFactory;
88
import net.imglib2.algorithm.neighborhood.RectangleShape;
9-
import net.imglib2.algorithm.neighborhood.Shape;
109
import net.imglib2.img.Img;
11-
import net.imglib2.img.array.ArrayImg;
1210
import net.imglib2.outofbounds.OutOfBoundsBorderFactory;
13-
import net.imglib2.outofbounds.OutOfBoundsFactory;
14-
import net.imglib2.type.numeric.integer.ByteType;
1511
import net.imglib2.type.numeric.integer.IntType;
1612
import net.imglib2.type.numeric.integer.UnsignedByteType;
17-
import org.scijava.Context;
18-
import org.scijava.ops.api.OpEnvironment;
19-
import org.scijava.ops.engine.DefaultOpEnvironment;
20-
import org.scijava.types.Nil;
21-
22-
import java.util.Random;
2313

2414
public class OpsIntro {
2515

@@ -48,11 +38,11 @@ public static void main(String... args) {
4838
/*
4939
The OpEnvironment is the core of ImageJ Ops2. It is a collection of Ops,
5040
along with API for accessing Ops, adding new Ops, and other utilities.
51-
52-
The DefaultOpEnvironment is the recommended OpEnvironment for beginners,
53-
and can be created using the line below:
41+
42+
The easiest way to obtain an OpEnvironment is to use the following static
43+
method.
5444
*/
55-
OpEnvironment ops = new DefaultOpEnvironment();
45+
OpEnvironment ops = OpEnvironment.getEnvironment();
5646

5747
/*
5848
OpEnvironments contain Ops, and there are a lot of them.

‎imagej/imagej-ops2-tutorial/src/main/java/net/imagej/ops2/tutorial/ParallelComputation.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import java.util.function.Function;
77

88
import org.scijava.ops.api.OpEnvironment;
9-
import org.scijava.ops.engine.DefaultOpEnvironment;
109
import org.scijava.types.Nil;
1110

1211
import net.imglib2.img.Img;
@@ -25,7 +24,7 @@
2524
public class ParallelComputation {
2625

2726
public static void main(String... args) {
28-
OpEnvironment ops = new DefaultOpEnvironment();
27+
OpEnvironment ops = OpEnvironment.getEnvironment();
2928
// To compute tasks using Parallelization, we must first gather a list of
3029
// parameters.
3130
List<Double> fillValues = Arrays.asList(1.0, 2.0, 3.0, 4.0);

0 commit comments

Comments
 (0)