Cleaned up code

jpmml · Jul 7, 2024 · 6ceb43d · 6ceb43d
1 parent e76b574
commit 6ceb43d
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/pmml-evaluator/src/test/java/org/jpmml/evaluator/FieldValueTest.java b/pmml-evaluator/src/test/java/org/jpmml/evaluator/FieldValueTest.java
@@ -37,8 +37,8 @@ public class FieldValueTest {
 	public void emptyList(){
 		FieldValue list = FieldValueUtil.create(TypeInfos.CATEGORICAL_STRING, Arrays.asList());
 
-		assertEquals(list.getDataType(), DataType.STRING);
-		assertEquals(list.getOpType(), OpType.CATEGORICAL);
+		assertEquals(DataType.STRING, list.getDataType());
+		assertEquals(OpType.CATEGORICAL, list.getOpType());
 	}
 
 	@Test

diff --git a/pmml-evaluator/src/test/java/org/jpmml/evaluator/FunctionTest.java b/pmml-evaluator/src/test/java/org/jpmml/evaluator/FunctionTest.java
@@ -247,35 +247,35 @@ public void evaluateMathFunctions(){
 
 	@Test
 	public void evaluateValueFunctions(){
-		ScalarValue value = (ScalarValue)FieldValues.MISSING_VALUE;
+		FieldValue value = FieldValues.MISSING_VALUE;
 
 		assertEquals(true, evaluate(Functions.IS_MISSING, value));
 		assertEquals(false, evaluate(Functions.IS_NOT_MISSING, value));
 		assertEquals(false, evaluate(Functions.IS_VALID, value));
 		assertEquals(false, evaluate(Functions.IS_NOT_VALID, value));
 
-		value = (ScalarValue)FieldValue.create(TypeInfos.CATEGORICAL_STRING, "value");
+		value = FieldValue.create(TypeInfos.CATEGORICAL_STRING, "value");
 
-		value.setValid(true);
+		((ScalarValue)value).setValid(true);
 
 		assertEquals(false, evaluate(Functions.IS_MISSING, value));
 		assertEquals(true, evaluate(Functions.IS_NOT_MISSING, value));
 		assertEquals(true, evaluate(Functions.IS_VALID, value));
 		assertEquals(false, evaluate(Functions.IS_NOT_VALID, value));
 
-		value.setValid(false);
+		((ScalarValue)value).setValid(false);
 
 		assertEquals(false, evaluate(Functions.IS_MISSING, value));
 		assertEquals(true, evaluate(Functions.IS_NOT_MISSING, value));
 		assertEquals(false, evaluate(Functions.IS_VALID, value));
 		assertEquals(true, evaluate(Functions.IS_NOT_VALID, value));
 
-		value = (ScalarValue)FieldValue.create(TypeInfos.CONTINUOUS_FLOAT, PMMLConstants.NOT_A_NUMBER);
+		value = FieldValue.create(TypeInfos.CONTINUOUS_FLOAT, PMMLConstants.NOT_A_NUMBER);
 
 		assertEquals(false, evaluate(Functions.IS_VALID, value));
 		assertEquals(true, evaluate(Functions.IS_NOT_VALID, value));
 
-		value = (ScalarValue)FieldValue.create(TypeInfos.CONTINUOUS_DOUBLE, PMMLConstants.NOT_A_NUMBER);
+		value = FieldValue.create(TypeInfos.CONTINUOUS_DOUBLE, PMMLConstants.NOT_A_NUMBER);
 
 		assertEquals(false, evaluate(Functions.IS_VALID, value));
 		assertEquals(true, evaluate(Functions.IS_NOT_VALID, value));
@@ -477,7 +477,7 @@ private Object evaluate(Function function, List<?> arguments){
 	}
 
 	static
-	private Object evaluate(Function function, ScalarValue... arguments){
+	private Object evaluate(Function function, FieldValue... arguments){
 		FieldValue value = function.evaluate(Arrays.asList(arguments));
 
 		return FieldValueUtil.getValue(value);

diff --git a/pmml-evaluator/src/test/java/org/jpmml/evaluator/VoteAggregatorTest.java b/pmml-evaluator/src/test/java/org/jpmml/evaluator/VoteAggregatorTest.java
@@ -20,8 +20,8 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.LinkedHashSet;
 
+import com.google.common.collect.ImmutableSet;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -38,8 +38,8 @@ public void sum(){
 		aggregator.add("B");
 		aggregator.add("C");
 
-		assertEquals(new LinkedHashSet<>(Arrays.asList("A", "B", "C")), aggregator.getWinners());
-		assertEquals(new LinkedHashSet<>(Arrays.asList("A", "B", "C")), (aggregator.sumMap()).keySet());
+		assertEquals(ImmutableSet.of("A", "B", "C"), aggregator.getWinners());
+		assertEquals(ImmutableSet.of("A", "B", "C"), (aggregator.sumMap()).keySet());
 
 		aggregator.add("C");
 
@@ -51,8 +51,8 @@ public void sum(){
 		aggregator.add("B");
 		aggregator.add("C");
 
-		assertEquals(new LinkedHashSet<>(Arrays.asList("B", "A", "C")), aggregator.getWinners());
-		assertEquals(new LinkedHashSet<>(Arrays.asList("B", "A", "C")), (aggregator.sumMap()).keySet());
+		assertEquals(ImmutableSet.of("B", "A", "C"), aggregator.getWinners());
+		assertEquals(ImmutableSet.of("B", "A", "C"), (aggregator.sumMap()).keySet());
 
 		aggregator.add("A", 0.5d);
 
@@ -64,7 +64,7 @@ public void sum(){
 
 		checkValues(1d + 0.5d, 1d + 0.5d, 1d, aggregator.sumMap());
 
-		assertEquals(new LinkedHashSet<>(Arrays.asList("B", "A")), aggregator.getWinners());
+		assertEquals(ImmutableSet.of("B", "A"), aggregator.getWinners());
 	}
 
 	static