Improved the conversion of 'randomForest' objects

jpmml · May 8, 2022 · f3c8b1c · f3c8b1c
1 parent 4452fb1
commit f3c8b1c
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/pmml-rexp/src/main/java/org/jpmml/rexp/visitors/RandomForestCompactor.java b/pmml-rexp/src/main/java/org/jpmml/rexp/visitors/RandomForestCompactor.java
@@ -57,28 +57,23 @@ public void enterNode(Node node){
 
 			checkFieldReference(firstPredicate, secondPredicate);
 
-			boolean update = isDefinedField((HasFieldReference<?>)firstPredicate);
+			if(hasOperator(firstPredicate, SimplePredicate.Operator.LESS_OR_EQUAL) && hasOperator(secondPredicate, SimplePredicate.Operator.GREATER_THAN)){
+				checkValue(firstPredicate, secondPredicate);
+			} else
 
 			if(hasOperator(firstPredicate, SimplePredicate.Operator.EQUAL) && hasOperator(secondPredicate, SimplePredicate.Operator.EQUAL)){
 				// Ignored
 			} else
 
-			if(hasOperator(firstPredicate, SimplePredicate.Operator.LESS_OR_EQUAL) && hasOperator(secondPredicate, SimplePredicate.Operator.GREATER_THAN)){
-				update = true;
-			} else
-
 			if(hasOperator(firstPredicate, SimplePredicate.Operator.EQUAL) && hasBooleanOperator(secondPredicate, SimpleSetPredicate.BooleanOperator.IS_IN)){
 				// Ignored
 			} else
 
 			if(hasBooleanOperator(firstPredicate, SimpleSetPredicate.BooleanOperator.IS_IN) && hasOperator(secondPredicate, SimplePredicate.Operator.EQUAL)){
+				children = swapChildren(node);
 
-				if(update){
-					children = swapChildren(node);
-
-					firstChild = children.get(0);
-					secondChild = children.get(1);
-				}
+				firstChild = children.get(0);
+				secondChild = children.get(1);
 			} else
 
 			if(hasBooleanOperator(firstPredicate, SimpleSetPredicate.BooleanOperator.IS_IN) && hasBooleanOperator(secondPredicate, SimpleSetPredicate.BooleanOperator.IS_IN)){
@@ -87,6 +82,16 @@ public void enterNode(Node node){
 
 			{
 				throw new UnsupportedElementException(node);
+			}
+
+			boolean update;
+
+			if(hasOperator(firstPredicate, SimplePredicate.Operator.LESS_OR_EQUAL) && hasOperator(secondPredicate, SimplePredicate.Operator.GREATER_THAN)){
+				update = true;
+			} else
+
+			{
+				update = isDefinedField((HasFieldReference<?>)firstPredicate);
 			} // End if
 
 			if(update){