Skip to content

Commit 5f2fdb3

Browse files
hinermhinerm
committed
Merge branch 'size-priorities' into main
Adds priorities to disambiguate the different stats.size ops
2 parents 656f7dc + 879fcd4 commit 5f2fdb3

3 files changed

Lines changed: 86 additions & 2 deletions

File tree

  • scijava-ops-engine/src
  • scijava-ops-image/src/main/java/org/scijava/ops/image/stats

‎scijava-ops-engine/src/main/java/org/scijava/ops/engine/stats/Size.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class Size implements OpCollection {
4343
* @param iterable the data to operate over
4444
* @return the size of the dataset, as as {@link Long}
4545
*/
46-
@OpMethod(names = "stats.size", type = Function.class)
46+
@OpMethod(names = "stats.size", type = Function.class, priority = 50.0)
4747
public static <T> Long sizeAsLong(Iterable<T> iterable) {
4848
return StreamSupport.stream(iterable.spliterator(), false).count();
4949
}

‎scijava-ops-engine/src/test/java/org/scijava/ops/engine/stats/SizeTest.java‎

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
/*-
2+
* #%L
3+
* Java implementation of the SciJava Ops matching engine.
4+
* %%
5+
* Copyright (C) 2016 - 2024 SciJava developers.
6+
* %%
7+
* Redistribution and use in source and binary forms, with or without
8+
* modification, are permitted provided that the following conditions are met:
9+
*
10+
* 1. Redistributions of source code must retain the above copyright notice,
11+
* this list of conditions and the following disclaimer.
12+
* 2. Redistributions in binary form must reproduce the above copyright notice,
13+
* this list of conditions and the following disclaimer in the documentation
14+
* and/or other materials provided with the distribution.
15+
*
16+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
17+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
18+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
19+
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE
20+
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
21+
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
22+
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
23+
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
24+
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
25+
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
26+
* POSSIBILITY OF SUCH DAMAGE.
27+
* #L%
28+
*/
29+
30+
package org.scijava.ops.engine.stats;
31+
32+
import org.junit.jupiter.api.BeforeAll;
33+
import org.junit.jupiter.api.Test;
34+
import org.scijava.ops.api.OpBuilder;
35+
import org.scijava.ops.engine.AbstractTestEnvironment;
36+
import org.scijava.ops.engine.matcher.convert.IdentityCollection;
37+
import org.scijava.ops.engine.matcher.convert.PrimitiveConverters;
38+
import org.scijava.ops.engine.math.Add;
39+
import org.scijava.ops.engine.math.MathOpCollection;
40+
import org.scijava.types.Nil;
41+
42+
import java.util.Arrays;
43+
import java.util.List;
44+
import java.util.function.Function;
45+
46+
import static org.junit.jupiter.api.Assertions.assertEquals;
47+
48+
/**
49+
* Tests for {@link Size}
50+
*/
51+
public class SizeTest<N extends Number> extends AbstractTestEnvironment {
52+
53+
private static List<Integer> nums;
54+
55+
@BeforeAll
56+
public static void AddNeededOps() {
57+
ops.register(new Size());
58+
nums = Arrays.asList(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
59+
}
60+
61+
@Test
62+
public void testSizeUntyped() {
63+
// Make sure we can call stats without specifying output type
64+
Long size = (Long) ops.op("stats.size").input(nums).apply();
65+
66+
assertEquals(10, size);
67+
}
68+
69+
@Test
70+
public void testSizeLong() {
71+
// Make sure we can call stats with Long output type
72+
Long size = ops.op("stats.size").input(nums).outType(Long.class).apply();
73+
74+
assertEquals(10, size);
75+
}
76+
77+
@Test
78+
public void testSizeDouble() {
79+
// Make sure we can call stats with Double output type
80+
Double size = ops.op("stats.size").input(nums).outType(Double.class).apply();
81+
82+
assertEquals(10, size);
83+
}
84+
}

‎scijava-ops-image/src/main/java/org/scijava/ops/image/stats/DefaultSize.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
* @author Gabriel Selzer
4242
* @param <I> input type
4343
* @param <O> output type
44-
* @implNote op names='stats.size'
44+
* @implNote op names='stats.size', priority='100.'
4545
*/
4646
public class DefaultSize<I extends RealType<I>, O extends RealType<O>>
4747
implements Computers.Arity1<Interval, O>

0 commit comments

Comments
 (0)