Added ScalarValue class

README.md

@@ -121,10 +121,11 @@ Core types:
     * Class `org.jpmml.evaluator.OutputField` - Describes a secondary model result field
 * Abstract class `org.jpmml.evaluator.FieldValue`
   * Class `org.jpmml.evaluator.CollectionValue`
-  * Class `org.jpmml.evaluator.ContinuousValue`
-  * Abstract class `org.jpmml.evaluator.DiscreteValue`
-    * Class `org.jpmml.evaluator.CategoricalValue`
-    * Class `org.jpmml.evaluator.OrdinalValue`
+  * Abstract class `org.jpmml.evaluator.ScalarValue`
+    * Class `org.jpmml.evaluator.ContinuousValue`
+    * Abstract class `org.jpmml.evaluator.DiscreteValue`
+      * Class `org.jpmml.evaluator.CategoricalValue`
+      * Class `org.jpmml.evaluator.OrdinalValue`
 * Utility class `org.jpmml.evaluator.EvaluatorUtil`
 * Utility class `org.jpmml.evaluator.FieldValueUtil`
 

pmml-evaluator-extension/src/main/java/org/jpmml/evaluator/JavaComparisonPredicate.java

@@ -48,7 +48,7 @@ public Boolean evaluate(EvaluationContext context){
 			return null;
 		}
 
-		return evaluate(value.compareTo(getValue()));
+		return evaluate(value.compareToValue(getValue()));
 	}
 
 	public FieldValue getValue(){

pmml-evaluator/src/main/java/org/jpmml/evaluator/CategoricalValue.java

@@ -62,7 +62,7 @@ public FieldValue create(DataType dataType, Object value){
 	}
 
 	static
-	private class CategoricalString extends CategoricalValue implements Scalar {
+	private class CategoricalString extends CategoricalValue {
 
 		CategoricalString(Object value){
 			super(DataType.STRING, value);
@@ -75,7 +75,7 @@ public String asString(){
 	}
 
 	static
-	private class CategoricalBoolean extends CategoricalValue implements Scalar {
+	private class CategoricalBoolean extends CategoricalValue {
 
 		CategoricalBoolean(Object value){
 			super(DataType.BOOLEAN, value);

pmml-evaluator/src/main/java/org/jpmml/evaluator/CollectionValue.java

@@ -38,11 +38,9 @@ public class CollectionValue extends FieldValue {
 	}
 
 	CollectionValue(DataType dataType, OpType opType, List<?> ordering, Collection<?> value){
-		super(dataType, Objects.requireNonNull(value));
+		super(dataType, value);
 
-		opType = Objects.requireNonNull(opType);
-
-		setOpType(opType);
+		setOpType(Objects.requireNonNull(opType));
 
 		switch(opType){
 			case CONTINUOUS:
@@ -59,6 +57,16 @@ public class CollectionValue extends FieldValue {
 		}
 	}
 
+	@Override
+	public int compareToString(String string){
+		throw new EvaluationException("Collection value cannot be used in comparison operations");
+	}
+
+	@Override
+	public int compareToValue(FieldValue value){
+		throw new EvaluationException("Collection value cannot be used in comparison operations");
+	}
+
 	@Override
 	public int hashCode(){
 		List<?> ordering = getOrdering();

pmml-evaluator/src/main/java/org/jpmml/evaluator/ContinuousValue.java

@@ -23,7 +23,7 @@
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.OpType;
 
-public class ContinuousValue extends FieldValue {
+public class ContinuousValue extends ScalarValue {
 
 	ContinuousValue(DataType dataType, Object value){
 		super(dataType, value);
@@ -77,7 +77,7 @@ public FieldValue create(DataType dataType, Object value){
 	}
 
 	static
-	private class ContinuousInteger extends ContinuousValue implements Scalar {
+	private class ContinuousInteger extends ContinuousValue {
 
 		ContinuousInteger(Object value){
 			super(DataType.INTEGER, value);
@@ -95,7 +95,7 @@ public Integer asInteger(){
 	}
 
 	static
-	private class ContinuousFloat extends ContinuousValue implements Scalar {
+	private class ContinuousFloat extends ContinuousValue {
 
 		ContinuousFloat(Object value){
 			super(DataType.FLOAT, value);
@@ -113,7 +113,7 @@ public Float asFloat(){
 	}
 
 	static
-	private class ContinuousDouble extends ContinuousValue implements Scalar {
+	private class ContinuousDouble extends ContinuousValue {
 
 		ContinuousDouble(Object value){
 			super(DataType.DOUBLE, value);

pmml-evaluator/src/main/java/org/jpmml/evaluator/DiscreteValue.java

@@ -21,7 +21,7 @@
 import org.dmg.pmml.DataType;
 
 abstract
-public class DiscreteValue extends FieldValue {
+public class DiscreteValue extends ScalarValue {
 
 	DiscreteValue(DataType dataType, Object value){
 		super(dataType, value);

pmml-evaluator/src/main/java/org/jpmml/evaluator/EvaluationContext.java

@@ -210,7 +210,7 @@ public List<String> getWarnings(){
 		return this.warnings;
 	}
 
-	private static final FieldValue UNDECLARED_VALUE = new FieldValue(DataType.DOUBLE, Double.NaN){
+	private static final FieldValue UNDECLARED_VALUE = new ScalarValue(DataType.DOUBLE, Double.NaN){
 
 		@Override
 		public OpType getOpType(){

pmml-evaluator/src/main/java/org/jpmml/evaluator/ExpressionUtil.java

@@ -455,9 +455,9 @@ public FieldValue evaluateAggregate(Aggregate aggregate, EvaluationContext conte
 			case AVERAGE:
 				return Functions.AVG.evaluate((List<FieldValue>)values);
 			case MIN:
-				return Collections.min((List<FieldValue>)values);
+				return Collections.min((List<ScalarValue>)values);
 			case MAX:
-				return Collections.max((List<FieldValue>)values);
+				return Collections.max((List<ScalarValue>)values);
 			default:
 				throw new UnsupportedAttributeException(aggregate, function);
 		}

pmml-evaluator/src/main/java/org/jpmml/evaluator/FieldValue.java

@@ -60,27 +60,23 @@
  * @see FieldValueUtil
  */
 abstract
-public class FieldValue implements TypeInfo, Comparable<FieldValue>, Serializable {
+public class FieldValue implements TypeInfo, Serializable {
 
 	private DataType dataType = null;
 
 	private Object value = null;
 
 
 	FieldValue(DataType dataType, Object value){
-		dataType = Objects.requireNonNull(dataType);
+		setDataType(Objects.requireNonNull(dataType));
+		setValue(Objects.requireNonNull(value));
+	}
 
-		if(value instanceof Collection){
-			// Ignored
-		} else
+	abstract
+	public int compareToString(String string);
 
-		{
-			value = filterValue(TypeUtil.parseOrCast(dataType, Objects.requireNonNull(value)));
-		}
-
-		setDataType(dataType);
-		setValue(value);
-	}
+	abstract
+	public int compareToValue(FieldValue value);
 
 	public FieldValue cast(DataType dataType, OpType opType){
 		boolean compatible = true;
@@ -138,7 +134,7 @@ public boolean equals(HasValue<?> hasValue){
 	public boolean equals(HasParsedValue<?> hasParsedValue){
 		FieldValue value = hasParsedValue.getValue(this);
 
-		return this.equals(value);
+		return equalsValue(value);
 	}
 
 	/**
@@ -168,6 +164,7 @@ public boolean isIn(HasValueSet<?> hasValueSet){
 	public boolean isIn(HasParsedValueSet<?> hasParsedValueSet){
 		Set<FieldValue> values = hasParsedValueSet.getValueSet(this);
 
+		// XXX
 		return values.contains(this);
 	}
 
@@ -190,7 +187,7 @@ public int compareTo(HasValue<?> hasValue){
 	public int compareTo(HasParsedValue<?> hasParsedValue){
 		FieldValue value = hasParsedValue.getValue(this);
 
-		return this.compareTo(value);
+		return compareToValue(value);
 	}
 
 	public boolean equalsString(String string){
@@ -199,17 +196,7 @@ public boolean equalsString(String string){
 		return (getValue()).equals(value);
 	}
 
-	/**
-	 * <p>
-	 * A value-safe replacement for {@link #equals(Object)}.
-	 * </p>
-	 */
 	public boolean equalsValue(FieldValue value){
-
-		if(sameScalarType(value)){
-			return (getValue()).equals(value.getValue());
-		}
-
 		return equalsValue(value.getValue());
 	}
 
@@ -237,51 +224,12 @@ public boolean test(FieldValue value){
 			.anyMatch(predicate);
 	}
 
-	public int compareToString(String string){
-		Object value = TypeUtil.parse(getDataType(), string);
-
-		return ((Comparable)getValue()).compareTo(value);
-	}
-
-	/**
-	 * <p>
-	 * A value-safe replacement for {@link #compareTo(FieldValue)}
-	 * </p>
-	 */
-	public int compareToValue(FieldValue value){
-
-		if(sameScalarType(value)){
-			return ((Comparable)getValue()).compareTo(value.getValue());
-		}
-
-		return compareToValue(value.getValue());
-	}
-
-	private int compareToValue(Object value){
-		value = TypeUtil.parseOrCast(getDataType(), value);
-
-		return ((Comparable)getValue()).compareTo(value);
-	}
-
 	public <V> V getMapping(HasParsedValueMapping<V> hasParsedValueMapping){
 		Map<FieldValue, V> values = hasParsedValueMapping.getValueMapping(this);
 
 		return values.get(this);
 	}
 
-	private boolean isScalar(){
-		return (this instanceof Scalar);
-	}
-
-	private boolean sameScalarType(FieldValue value){
-
-		if(isScalar()){
-			return (getClass()).equals(value.getClass());
-		}
-
-		return false;
-	}
-
 	public String asString(){
 		return (String)getValue(DataType.STRING);
 	}
@@ -293,7 +241,7 @@ public Number asNumber(){
 			return (Number)value;
 		}
 
-		return (Double)getValue(DataType.DOUBLE);
+		return (Number)getValue(DataType.DOUBLE);
 	}
 
 	public Integer asInteger(){
@@ -394,16 +342,6 @@ private Object getValue(DataType dataType){
 		}
 	}
 
-	@Override
-	public int compareTo(FieldValue that){
-
-		if((this.getOpType() != that.getOpType()) || (this.getDataType() != that.getDataType())){
-			throw new ClassCastException();
-		}
-
-		return compareToValue(that);
-	}
-
 	@Override
 	public int hashCode(){
 		return (31 * (getOpType().hashCode() ^ getDataType().hashCode())) + getValue().hashCode();
@@ -415,7 +353,7 @@ public boolean equals(Object object){
 		if(object instanceof FieldValue){
 			FieldValue that = (FieldValue)object;
 
-			return (this.getOpType() == that.getOpType()) && (this.getDataType() == that.getDataType()) && (this.getValue()).equals(that.getValue());
+			return (this.getOpType()).equals(that.getOpType()) && (this.getDataType()).equals(that.getDataType()) && (this.getValue()).equals(that.getValue());
 		}
 
 		return false;
@@ -506,42 +444,4 @@ private String ensureValue(HasValue<?> hasValue){
 
 		return value;
 	}
-
-	static
-	private Object filterValue(Object value){
-
-		if(value instanceof Float){
-			return filterValue((Float)value);
-		} else
-
-		if(value instanceof Double){
-			return filterValue((Double)value);
-		}
-
-		return value;
-	}
-
-	static
-	private Float filterValue(Float value){
-
-		if(value.doubleValue() == 0f){
-			return Numbers.FLOAT_ZERO;
-		}
-
-		return value;
-	}
-
-	static
-	private Double filterValue(Double value){
-
-		if(value.doubleValue() == 0d){
-			return Numbers.DOUBLE_ZERO;
-		}
-
-		return value;
-	}
-
-	static
-	interface Scalar {
-	}
 }

pmml-evaluator/src/main/java/org/jpmml/evaluator/ModelEvaluator.java

@@ -504,7 +504,11 @@ private void verify(Object expected, Object actual, double precision, double zer
 			return;
 		} // End if
 
-		if(!(actual instanceof Collection)){
+		if(actual instanceof Collection){
+			// Ignored
+		} else
+
+		{
 			DataType dataType = TypeUtil.getDataType(actual);
 
 			expected = TypeUtil.parseOrCast(dataType, expected);

pmml-evaluator/src/main/java/org/jpmml/evaluator/OrdinalValue.java

@@ -133,7 +133,7 @@ private int compare(List<?> ordering, Object left, Object right){
 	}
 
 	static
-	private class OrdinalString extends OrdinalValue implements Scalar {
+	private class OrdinalString extends OrdinalValue {
 
 		OrdinalString(List<?> ordering, Object value){
 			super(DataType.STRING, ordering, value);