Skip to content

Commit 11fe299

Browse files
author
tibuch
committed
Some code cleanup.
1 parent 5a0145e commit 11fe299

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

src/main/java/net/imagej/ops/features/sets/DefaultZernikeComputerSet.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@
5555
public class DefaultZernikeComputerSet extends AbstractConfigurableComputerSet<Iterable, DoubleType>
5656
implements ZernikeComputerSet<Iterable, DoubleType> {
5757

58-
public DefaultZernikeComputerSet() {
59-
super(new DoubleType(), Iterable.class);
60-
}
61-
6258
@Parameter(type = ItemIO.INPUT, label = "Minimum Order of Zernike Moment", description = "The minimum order of the zernike moment to be calculated.", min = "1", max = "2147483647", stepSize = "1")
6359
private int orderMin = 2;
6460

6561
@Parameter(type = ItemIO.INPUT, label = "Maximum Order of Zernike Moment", description = "The maximum order of the zernike moment to be calculated.", min = "1", max = "2147483647", stepSize = "1")
6662
private int orderMax = 4;
63+
64+
public DefaultZernikeComputerSet() {
65+
super(new DoubleType(), Iterable.class);
66+
}
6767

6868
@SuppressWarnings("unchecked")
6969
@Override

src/test/java/net/imagej/ops/features/sets/processors/IterableComputerSetProcessorTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public class IterableComputerSetProcessorTest extends AbstractComputerSetProcess
5454

5555
@SuppressWarnings({ "rawtypes", "unchecked" })
5656
@Test
57-
public void IterableComputerSetProcessorAllComputersAreActiveTest() {
57+
public void allComputersAreActiveTest() {
5858
FirstOrderStatsComputerSet<Iterable, DoubleType> stats = ops.op(FirstOrderStatsComputerSet.class,
5959
Iterable.class);
6060

@@ -70,7 +70,7 @@ public void IterableComputerSetProcessorAllComputersAreActiveTest() {
7070

7171
@SuppressWarnings({ "rawtypes", "unchecked" })
7272
@Test
73-
public void IterableComputerSetProcessorSomeComputersAreActiveTest() {
73+
public void someComputersAreActiveTest() {
7474
FirstOrderStatsComputerSet<Iterable, DoubleType> stats = ops.op(FirstOrderStatsComputerSet.class,
7575
Iterable.class, Arrays.asList(new Class[] { Mean.class, Max.class }));
7676

@@ -86,18 +86,18 @@ public void IterableComputerSetProcessorSomeComputersAreActiveTest() {
8686

8787
@SuppressWarnings({ "rawtypes", "unchecked" })
8888
@Test
89-
public void IterableComputerSetProcessorWithTwoComputerSetsTest() {
89+
public void multiComputerSetProcessingTest() {
9090
FirstOrderStatsComputerSet<Iterable, DoubleType> stats = ops.op(FirstOrderStatsComputerSet.class,
91-
Iterable.class);
91+
Iterable.class);
9292
FirstOrderStatsComputerSet<Iterable, DoubleType> stats1 = ops.op(FirstOrderStatsComputerSet.class,
9393
Iterable.class, Arrays.asList(new Class[] { Mean.class, Max.class }));
9494

9595
IterableComputerSetProcessor<FloatType, DoubleType> processor = ops.op(IterableComputerSetProcessor.class,
9696
Iterable.class, new ComputerSet[] { stats, stats1 }, new DefaultComputerSetTableService<>());
9797

98-
GenericTable result = processor.compute1(getTestImage2D());
98+
final GenericTable result = processor.compute1(getTestImage2D());
9999

100-
List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
100+
final List<ComputerSet<?, DoubleType>> computerSets = new ArrayList<>();
101101
computerSets.add(stats);
102102
computerSets.add(stats1);
103103
checkResultTableForManyComputerSets(result, computerSets, 0);

src/test/java/net/imagej/ops/features/sets/processors/LabelRegionsComputerSetProcessorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void createROI() throws IOException {
6464

6565
@SuppressWarnings("unchecked")
6666
@Test
67-
public void LabelRegionsComputerSetProcessorAllComputersAreActiveTest() {
67+
public void allComputersAreActiveTest() {
6868
Geometric2DComputerSet<Polygon, DoubleType> geom = ops.op(Geometric2DComputerSet.class, Polygon.class);
6969

7070
LabelRegionsComputerSetProcessor<String, DoubleType, DoubleType> processor = ops.op(
@@ -80,7 +80,7 @@ public void LabelRegionsComputerSetProcessorAllComputersAreActiveTest() {
8080

8181
@SuppressWarnings({ "unchecked" })
8282
@Test
83-
public void LabelRegionsComputerSetProcessorSomeComputersAreActiveTest() {
83+
public void somecomputersAreActiveTest() {
8484
Geometric2DComputerSet<Polygon, DoubleType> geom = ops.op(Geometric2DComputerSet.class, Polygon.class,
8585
Arrays.asList(new Class[] { Circularity.class, Size.class }));
8686

@@ -97,7 +97,7 @@ public void LabelRegionsComputerSetProcessorSomeComputersAreActiveTest() {
9797

9898
@SuppressWarnings({ "unchecked" })
9999
@Test
100-
public void LabelRegionsComputerSetProcessorWithTwoComputerSetsTest() {
100+
public void mutliComputerSetProcessingTest() {
101101
Geometric2DComputerSet<Polygon, DoubleType> geom = ops.op(Geometric2DComputerSet.class, Polygon.class);
102102
Geometric2DComputerSet<Polygon, DoubleType> geom1 = ops.op(Geometric2DComputerSet.class, Polygon.class,
103103
Arrays.asList(new Class[] { Circularity.class, Size.class }));

src/test/java/net/imagej/ops/features/sets/processors/ROIComputerSetProcessorTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public class ROIComputerSetProcessorTest extends AbstractComputerSetProcessorTes
5757

5858
@SuppressWarnings({ "rawtypes", "unchecked" })
5959
@Test
60-
public void ROIComputerSetProcessorAllComputersAreActiveTest() throws IOException {
60+
public void allComputersAreActiveTest() throws IOException {
6161
FirstOrderStatsComputerSet<Iterable, DoubleType> stats = ops.op(FirstOrderStatsComputerSet.class,
6262
Iterable.class);
6363

@@ -74,7 +74,7 @@ public void ROIComputerSetProcessorAllComputersAreActiveTest() throws IOExceptio
7474

7575
@SuppressWarnings({ "rawtypes", "unchecked" })
7676
@Test
77-
public void ROIComputerSetProcessorSomeComputersAreActiveTest() throws IOException {
77+
public void someComputersAreActiveTest() throws IOException {
7878
FirstOrderStatsComputerSet<Iterable, DoubleType> stats = ops.op(FirstOrderStatsComputerSet.class,
7979
Iterable.class, Arrays.asList(new Class[] { Mean.class, Max.class }));
8080

@@ -91,7 +91,7 @@ public void ROIComputerSetProcessorSomeComputersAreActiveTest() throws IOExcepti
9191

9292
@SuppressWarnings({ "rawtypes", "unchecked" })
9393
@Test
94-
public void ROIComputerSetProcessorWithTwoComputerSetsTest() throws IOException {
94+
public void multiComputerSetProcessingTest() throws IOException {
9595
FirstOrderStatsComputerSet<Iterable, DoubleType> stats = ops.op(FirstOrderStatsComputerSet.class,
9696
Iterable.class);
9797
FirstOrderStatsComputerSet<Iterable, DoubleType> stats1 = ops.op(FirstOrderStatsComputerSet.class,

0 commit comments

Comments
 (0)