Ensured compatibility with CHAID 5.4.1

jpmml · Mar 20, 2024 · def0c18 · def0c18
1 parent b1149f3
commit def0c18
Show file tree

Hide file tree

Showing 9 changed files with 1,928 additions and 1,910 deletions.
diff --git a/pmml-sklearn/src/main/java/sklearn2pmml/tree/CHAIDUtil.java b/pmml-sklearn/src/main/java/sklearn2pmml/tree/CHAIDUtil.java
@@ -130,7 +130,7 @@ public int compare(Node left, Node right){
 					Integer splitIndex = splitIndices.get(j);
 					Object splitValue = splitValues.get(j);
 
-					if(splitIndex == -1){
+					if(isMissing(splitIndex, splitValue)){
 						// Ignored
 					} else
 
@@ -168,7 +168,7 @@ public int compare(Node left, Node right){
 					Integer splitIndex = splitIndices.get(j);
 					Object splitValue = splitValues.get(j);
 
-					if(splitIndex == -1){
+					if(isMissing(splitIndex, splitValue)){
 						withMissing = true;
 					} else
 
@@ -264,6 +264,22 @@ public int compare(Node left, Node right){
 		return result;
 	}
 
+	static
+	private boolean isMissing(Integer splitIndex, Object splitValue){
+
+		// Floating-point data type columns
+		if(splitIndex == -1){
+			return true;
+		} else
+
+		// Object data type columns
+		if(splitValue == null){
+			return true;
+		}
+
+		return false;
+	}
+
 	static
 	private void removeCategory(Collection<?> values, Object splitValue){