Skip to content

Broaden ObjectArray -> Primitve Array converters #254

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gselzer merged 1 commit into from
Aug 5, 2024
Merged

Broaden ObjectArray -> Primitve Array converters #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 25 additions & 30 deletions ...engine/src/main/java/org/scijava/ops/engine/matcher/convert/PrimitiveArrayConverters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@

package org.scijava.ops.engine.matcher.convert;

import java.util.Collection;
import java.util.function.Function;

import org.scijava.collections.ObjectArray;
Expand Down Expand Up @@ -128,95 +129,89 @@ public class PrimitiveArrayConverters<N extends Number> implements

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, Byte[]> toByte = o -> o.stream()
public final Function<Collection<Number>, Byte[]> toByte = o -> o.stream()
.map(b -> b == null ? null : b.byteValue()).toArray(Byte[]::new);

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, Integer[]> toInteger = o -> o
public final Function<Collection<Number>, Integer[]> toInteger = o -> o
.stream().map(i -> i == null ? null : i.intValue()).toArray(Integer[]::new);

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, Short[]> toShort = o -> o.stream()
public final Function<Collection<Number>, Short[]> toShort = o -> o.stream()
.map(s -> s == null ? null : s.shortValue()).toArray(Short[]::new);

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, Long[]> toLong = o -> o.stream()
public final Function<Collection<Number>, Long[]> toLong = o -> o.stream()
.map(l -> l == null ? null : l.longValue()).toArray(Long[]::new);

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, Float[]> toFloat = o -> o.stream()
public final Function<Collection<Number>, Float[]> toFloat = o -> o.stream()
.map(f -> f == null ? null : f.floatValue()).toArray(Float[]::new);

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, Double[]> toDouble = o -> o
public final Function<Collection<Number>, Double[]> toDouble = o -> o
.stream().map(d -> d == null ? null : d.doubleValue()).toArray(
Double[]::new);

// -- Primitive Converters -- //

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, byte[]> toPrimitiveByte = o -> {
public final Function<Collection<Number>, byte[]> toPrimitiveByte = o -> {
var arr = new byte[o.size()];
for (var i = 0; i < o.size(); i++) {
arr[i] = o.get(i).byteValue();
}
int i = 0;
for (var num : o) arr[i++] = num.byteValue();
return arr;
};

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, short[]> toPrimitiveShort = o -> {
public final Function<Collection<Number>, short[]> toPrimitiveShort = o -> {
var arr = new short[o.size()];
for (var i = 0; i < o.size(); i++) {
arr[i] = o.get(i).shortValue();
}
int i = 0;
for (var num : o) arr[i++] = num.shortValue();
return arr;
};

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, int[]> toPrimitiveInt = o -> {
public final Function<Collection<Number>, int[]> toPrimitiveInt = o -> {
var arr = new int[o.size()];
for (var i = 0; i < o.size(); i++) {
arr[i] = o.get(i).intValue();
}
int i = 0;
for (var num : o) arr[i++] = num.intValue();
return arr;
};

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, long[]> toPrimitiveLong = o -> {
public final Function<Collection<Number>, long[]> toPrimitiveLong = o -> {
var arr = new long[o.size()];
for (var i = 0; i < o.size(); i++) {
arr[i] = o.get(i).longValue();
}
int i = 0;
for (var num : o) arr[i++] = num.longValue();
return arr;
};

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, float[]> toPrimitiveFloat = o -> {
public final Function<Collection<Number>, float[]> toPrimitiveFloat = o -> {
var arr = new float[o.size()];
for (var i = 0; i < o.size(); i++) {
arr[i] = o.get(i).floatValue();
}
int i = 0;
for (var num : o) arr[i++] = num.floatValue();
return arr;
};

@OpHints(hints = { Conversion.FORBIDDEN })
@OpField(names = "engine.convert")
public final Function<ObjectArray<Number>, double[]> toPrimitiveDouble =
public final Function<Collection<Number>, double[]> toPrimitiveDouble =
o -> {
var arr = new double[o.size()];
for (var i = 0; i < o.size(); i++) {
arr[i] = o.get(i).doubleValue();
}
int i = 0;
for (var num : o) arr[i++] = num.doubleValue();
return arr;
};

Expand Down
8 changes: 4 additions & 4 deletions scijava-ops-engine/src/test/java/org/scijava/ops/engine/impl/ProvenanceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ public void testReducedOpRecovery() {
* This method returns {@code true} iff:
* <ol>
* <li><b>Both</b> {@code op1} and {@code op2} are {@link RichOp}s</li>
* <li>The backing Op {@link Class}es are equal</li>
* <li>The backing Op {@link InfoTree}s are equal</li>
* </ol>
*
* @param op1 an Op
Expand All @@ -569,9 +569,9 @@ private boolean wrappedOpEquality(Object op1, Object op2) {
boolean isRichOp1 = op1 instanceof RichOp;
boolean isRichOp2 = op2 instanceof RichOp;
if (isRichOp1 && isRichOp2) {
var backingCls1 = ((RichOp<?>) op1).op().getClass();
var backingCls2 = ((RichOp<?>) op2).op().getClass();
return backingCls1 == backingCls2;
var backingCls1 = ((RichOp<?>) op1).infoTree();
var backingCls2 = ((RichOp<?>) op2).infoTree();
return backingCls1.equals(backingCls2);
}
return false;
}
Expand Down