Updated JPMML-Converter dependency

jpmml · Jan 18, 2019 · bc4c993 · bc4c993
1 parent 1b93f8e
commit bc4c993
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -52,7 +52,7 @@
 		<dependency>
 			<groupId>org.jpmml</groupId>
 			<artifactId>jpmml-converter</artifactId>
-			<version>1.3.4</version>
+			<version>1.3.5</version>
 		</dependency>
 
 		<dependency>
@@ -65,13 +65,13 @@
 		<dependency>
 			<groupId>org.jpmml</groupId>
 			<artifactId>pmml-evaluator</artifactId>
-			<version>1.4.5</version>
+			<version>1.4.6</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.jpmml</groupId>
 			<artifactId>pmml-evaluator-test</artifactId>
-			<version>1.4.5</version>
+			<version>1.4.6</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

diff --git a/src/main/java/org/jpmml/xgboost/RegTree.java b/src/main/java/org/jpmml/xgboost/RegTree.java
@@ -89,7 +89,7 @@ public void load(XGBoostDataInput input) throws IOException {
 	}
 
 	public TreeModel encodeTreeModel(PredicateManager predicateManager, Schema schema){
-		org.dmg.pmml.tree.Node root = new org.dmg.pmml.tree.Node()
+		org.dmg.pmml.tree.Node root = new org.dmg.pmml.tree.ComplexNode()
 			.setPredicate(new True());
 
 		encodeNode(root, predicateManager, 0, schema);
@@ -152,12 +152,12 @@ private void encodeNode(org.dmg.pmml.tree.Node parent, PredicateManager predicat
 				defaultLeft = node.default_left();
 			}
 
-			org.dmg.pmml.tree.Node leftChild = new org.dmg.pmml.tree.Node()
+			org.dmg.pmml.tree.Node leftChild = new org.dmg.pmml.tree.ComplexNode()
 				.setPredicate(leftPredicate);
 
 			encodeNode(leftChild, predicateManager, node.cleft(), schema);
 
-			org.dmg.pmml.tree.Node rightChild = new org.dmg.pmml.tree.Node()
+			org.dmg.pmml.tree.Node rightChild = new org.dmg.pmml.tree.ComplexNode()
 				.setPredicate(rightPredicate);
 
 			encodeNode(rightChild, predicateManager, node.cright(), schema);

diff --git a/src/main/java/org/jpmml/xgboost/visitors/TreeModelCompactor.java b/src/main/java/org/jpmml/xgboost/visitors/TreeModelCompactor.java
@@ -30,9 +30,9 @@ public class TreeModelCompactor extends AbstractTreeModelTransformer {
 
 	@Override
 	public void enterNode(Node node){
-		String defaultChild = node.getDefaultChild();
 		String id = node.getId();
-		String score = node.getScore();
+		Object score = node.getScore();
+		String defaultChild = node.getDefaultChild();
 
 		if(id == null){
 			throw new IllegalArgumentException();
@@ -41,7 +41,7 @@ public void enterNode(Node node){
 		if(node.hasNodes()){
 			List<Node> children = node.getNodes();
 
-			if(children.size() != 2 || defaultChild == null || score != null){
+			if(children.size() != 2 || score != null || defaultChild == null){
 				throw new IllegalArgumentException();
 			}
 
@@ -69,7 +69,7 @@ public void enterNode(Node node){
 		} else
 
 		{
-			if(defaultChild != null || score == null){
+			if(score == null || defaultChild != null){
 				throw new IllegalArgumentException();
 			}
 		}