Updated JPMML-Converter dependency

jpmml · Feb 10, 2024 · fbb1fdb · fbb1fdb
1 parent 7dccc2b
commit fbb1fdb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/pmml-h2o/src/main/java/org/jpmml/h2o/GlmOrdinalMojoModelConverter.java b/pmml-h2o/src/main/java/org/jpmml/h2o/GlmOrdinalMojoModelConverter.java
@@ -25,7 +25,6 @@
 
 import com.google.common.primitives.Doubles;
 import hex.genmodel.algos.glm.GlmOrdinalMojoModel;
-import org.dmg.pmml.DataField;
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.DerivedField;
 import org.dmg.pmml.OpType;
@@ -35,7 +34,6 @@
 import org.dmg.pmml.regression.RegressionModel;
 import org.jpmml.converter.CategoricalLabel;
 import org.jpmml.converter.ContinuousFeature;
-import org.jpmml.converter.ContinuousLabel;
 import org.jpmml.converter.Feature;
 import org.jpmml.converter.ModelEncoder;
 import org.jpmml.converter.ModelUtil;
@@ -56,12 +54,10 @@ public Schema encodeSchema(H2OEncoder encoder){
 		Schema schema = super.encodeSchema(encoder);
 
 		CategoricalLabel categoricalLabel = (CategoricalLabel)schema.getLabel();
-		List<? extends Feature> features = schema.getFeatures();
 
-		DataField dataField = encoder.getDataField(categoricalLabel.getName());
-		dataField.setOpType(OpType.ORDINAL);
+		encoder.toOrdinal(categoricalLabel.getName(), categoricalLabel.getValues());
 
-		return new Schema(encoder, new OrdinalLabel(dataField), features);
+		return schema.toRelabeledSchema(categoricalLabel.toOrdinalLabel());
 	}
 
 	@Override
@@ -126,8 +122,7 @@ public MiningModel encodeModel(Schema schema){
 
 		Schema segmentSchema = schema.toAnonymousRegressorSchema(DataType.DOUBLE);
 
-		RegressionModel firstRegressionModel = RegressionModelUtil.createRegression(features, sharedCoefficients, 0d, RegressionModel.NormalizationMethod.NONE, segmentSchema)
-			.setTargets(ModelUtil.createRescaleTargets(-1d, null, (ContinuousLabel)segmentSchema.getLabel()));
+		RegressionModel firstRegressionModel = RegressionModelUtil.createRegression(features, sharedCoefficients, 0d, RegressionModel.NormalizationMethod.NONE, segmentSchema);
 
 		OutputField linpredOutputField = ModelUtil.createPredictedField("linpred", OpType.CONTINUOUS, DataType.DOUBLE);
 

diff --git a/pmml-h2o/src/main/java/org/jpmml/h2o/IsolationForestMojoModelConverter.java b/pmml-h2o/src/main/java/org/jpmml/h2o/IsolationForestMojoModelConverter.java
@@ -32,8 +32,8 @@
 import org.dmg.pmml.mining.Segmentation;
 import org.dmg.pmml.tree.Node;
 import org.dmg.pmml.tree.TreeModel;
+import org.jpmml.converter.ExpressionUtil;
 import org.jpmml.converter.ModelUtil;
-import org.jpmml.converter.PMMLUtil;
 import org.jpmml.converter.Schema;
 import org.jpmml.converter.Transformation;
 import org.jpmml.converter.mining.MiningModelUtil;
@@ -72,7 +72,7 @@ public boolean isFinalResult(){
 
 			@Override
 			public Expression createExpression(FieldRef fieldRef){
-				return PMMLUtil.createApply(PMMLFunctions.DIVIDE, PMMLUtil.createApply(PMMLFunctions.SUBTRACT, PMMLUtil.createConstant(maxPathLength / (double)treeModels.size()), fieldRef), PMMLUtil.createConstant((maxPathLength - minPathLength) / (double)treeModels.size()));
+				return ExpressionUtil.createApply(PMMLFunctions.DIVIDE, ExpressionUtil.createApply(PMMLFunctions.SUBTRACT, ExpressionUtil.createConstant(maxPathLength / (double)treeModels.size()), fieldRef), ExpressionUtil.createConstant((maxPathLength - minPathLength) / (double)treeModels.size()));
 			}
 		};
 

diff --git a/pom.xml b/pom.xml
@@ -68,12 +68,12 @@
 			<dependency>
 				<groupId>org.jpmml</groupId>
 				<artifactId>pmml-converter</artifactId>
-				<version>1.5.5</version>
+				<version>1.5.6</version>
 			</dependency>
 			<dependency>
 				<groupId>org.jpmml</groupId>
 				<artifactId>pmml-converter-testing</artifactId>
-				<version>1.5.5</version>
+				<version>1.5.6</version>
 			</dependency>
 
 			<dependency>
@@ -85,7 +85,7 @@
 			<dependency>
 				<groupId>org.jpmml</groupId>
 				<artifactId>pmml-xgboost</artifactId>
-				<version>1.8.0</version>
+				<version>1.8.3</version>
 			</dependency>
 
 			<dependency>