Added method SharedTreeMojoModelConverter#encodeTreeModels(Schema)

jpmml · Oct 6, 2019 · 826cce7 · 826cce7
1 parent db89a47
commit 826cce7
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 48 deletions.
diff --git a/src/main/java/org/jpmml/h2o/DrfMojoModelConverter.java b/src/main/java/org/jpmml/h2o/DrfMojoModelConverter.java
@@ -21,8 +21,6 @@
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import hex.genmodel.algos.drf.DrfMojoModel;
 import org.dmg.pmml.DataType;
@@ -40,7 +38,6 @@
 import org.jpmml.converter.ContinuousLabel;
 import org.jpmml.converter.Label;
 import org.jpmml.converter.ModelUtil;
-import org.jpmml.converter.PredicateManager;
 import org.jpmml.converter.Schema;
 import org.jpmml.converter.mining.MiningModelUtil;
 
@@ -55,21 +52,12 @@ public MiningModel encodeModel(Schema schema){
 		DrfMojoModel model = getModel();
 
 		boolean binomialDoubleTrees = getBinomialDoubleTrees(model);
-		byte[][] compressedTrees = getCompressedTrees(model);
 		int ntreeGroups = getNTreeGroups(model);
 		int ntreesPerGroup = getNTreesPerGroup(model);
 
-		if(model._mojo_version < 1.2d){
-			throw new IllegalArgumentException("Version " + model._mojo_version + " is not supported");
-		}
-
 		Label label = schema.getLabel();
 
-		PredicateManager predicateManager = new PredicateManager();
-
-		List<TreeModel> treeModels = Stream.of(compressedTrees)
-			.map(compressedTree -> encodeTreeModel(compressedTree, predicateManager, schema))
-			.collect(Collectors.toList());
+		List<TreeModel> treeModels = encodeTreeModels(schema);
 
 		if(model._nclasses == 1){
 			ContinuousLabel continuousLabel = (ContinuousLabel)label;

diff --git a/src/main/java/org/jpmml/h2o/GbmMojoModelConverter.java b/src/main/java/org/jpmml/h2o/GbmMojoModelConverter.java
@@ -20,8 +20,6 @@
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import hex.genmodel.algos.gbm.GbmMojoModel;
 import hex.genmodel.utils.DistributionFamily;
@@ -40,7 +38,6 @@
 import org.jpmml.converter.ContinuousLabel;
 import org.jpmml.converter.Label;
 import org.jpmml.converter.ModelUtil;
-import org.jpmml.converter.PredicateManager;
 import org.jpmml.converter.Schema;
 import org.jpmml.converter.mining.MiningModelUtil;
 
@@ -54,21 +51,12 @@ public GbmMojoModelConverter(GbmMojoModel model){
 	public MiningModel encodeModel(Schema schema){
 		GbmMojoModel model = getModel();
 
-		byte[][] compressedTrees = getCompressedTrees(model);
 		int ntreeGroups = getNTreeGroups(model);
 		int ntreesPerGroup = getNTreesPerGroup(model);
 
-		if(model._mojo_version < 1.2d){
-			throw new IllegalArgumentException("Version " + model._mojo_version + " is not supported");
-		}
-
 		Label label = schema.getLabel();
 
-		PredicateManager predicateManager = new PredicateManager();
-
-		List<TreeModel> treeModels = Stream.of(compressedTrees)
-			.map(compressedTree -> encodeTreeModel(compressedTree, predicateManager, schema))
-			.collect(Collectors.toList());
+		List<TreeModel> treeModels = encodeTreeModels(schema);
 
 		if((DistributionFamily.gaussian).equals(model._family)){
 			ContinuousLabel continuousLabel = (ContinuousLabel)label;

diff --git a/src/main/java/org/jpmml/h2o/IsolationForestMojoModelConverter.java b/src/main/java/org/jpmml/h2o/IsolationForestMojoModelConverter.java
@@ -20,8 +20,6 @@
 
 import java.lang.reflect.Field;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import hex.genmodel.algos.isofor.IsolationForestMojoModel;
 import org.dmg.pmml.DataType;
@@ -37,7 +35,6 @@
 import org.jpmml.converter.AbstractTransformation;
 import org.jpmml.converter.ModelUtil;
 import org.jpmml.converter.PMMLUtil;
-import org.jpmml.converter.PredicateManager;
 import org.jpmml.converter.Schema;
 import org.jpmml.converter.Transformation;
 import org.jpmml.converter.mining.MiningModelUtil;
@@ -52,30 +49,17 @@ public IsolationForestMojoModelConverter(IsolationForestMojoModel model){
 	public MiningModel encodeModel(Schema schema){
 		IsolationForestMojoModel model = getModel();
 
-		byte[][] compressedTrees = getCompressedTrees(model);
+		int minPathLength = getMinPathLength(model);
+		int maxPathLength = getMaxPathLength(model);
 
-		if(model._mojo_version < 1.2d){
-			throw new IllegalArgumentException("Version " + model._mojo_version + " is not supported");
+		if(minPathLength >= maxPathLength){
+			throw new IllegalArgumentException();
 		}
 
-		PredicateManager predicateManager = new PredicateManager();
-
-		List<TreeModel> treeModels = Stream.of(compressedTrees)
-			.map(compressedTree -> encodeTreeModel(compressedTree, predicateManager, schema))
-			.collect(Collectors.toList());
+		List<TreeModel> treeModels = encodeTreeModels(schema);
 
 		Transformation anomalyScore = new AbstractTransformation(){
 
-			private int minPathLength = getMinPathLength(model);
-			private int maxPathLength = getMaxPathLength(model);
-
-
-			{
-				if(this.minPathLength >= this.maxPathLength){
-					throw new IllegalArgumentException();
-				}
-			}
-
 			@Override
 			public FieldName getName(FieldName name){
 				return FieldName.create("anomalyScore");
@@ -88,7 +72,7 @@ public boolean isFinalResult(){
 
 			@Override
 			public Expression createExpression(FieldRef fieldRef){
-				return PMMLUtil.createApply(PMMLFunctions.DIVIDE, PMMLUtil.createApply(PMMLFunctions.SUBTRACT, PMMLUtil.createConstant(this.maxPathLength / (double)treeModels.size()), fieldRef), PMMLUtil.createConstant((this.maxPathLength - this.minPathLength) / (double)treeModels.size()));
+				return PMMLUtil.createApply(PMMLFunctions.DIVIDE, PMMLUtil.createApply(PMMLFunctions.SUBTRACT, PMMLUtil.createConstant(maxPathLength / (double)treeModels.size()), fieldRef), PMMLUtil.createConstant((maxPathLength - minPathLength) / (double)treeModels.size()));
 			}
 		};
 

diff --git a/src/main/java/org/jpmml/h2o/SharedTreeMojoModelConverter.java b/src/main/java/org/jpmml/h2o/SharedTreeMojoModelConverter.java
@@ -22,6 +22,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import hex.genmodel.algos.tree.NaSplitDir;
 import hex.genmodel.algos.tree.SharedTreeMojoModel;
@@ -54,6 +56,24 @@ public SharedTreeMojoModelConverter(M model){
 		super(model);
 	}
 
+	public List<TreeModel> encodeTreeModels(Schema schema){
+		SharedTreeMojoModel model = getModel();
+
+		if(model._mojo_version < 1.2d){
+			throw new IllegalArgumentException("Version " + model._mojo_version + " is not supported");
+		}
+
+		byte[][] compressedTrees = getCompressedTrees(model);
+
+		PredicateManager predicateManager = new PredicateManager();
+
+		List<TreeModel> result = Stream.of(compressedTrees)
+			.map(compressedTree -> encodeTreeModel(compressedTree, predicateManager, schema))
+			.collect(Collectors.toList());
+
+		return result;
+	}
+
 	static
 	public TreeModel encodeTreeModel(byte[] compressedTree, PredicateManager predicateManager, Schema schema){
 		Label label = new ContinuousLabel(null, DataType.DOUBLE);