Merged version 1.6.35

jpmml · Jan 22, 2022 · 89d5733 · 89d5733
2 parents b8eac08 + d24da96
commit 89d5733
Show file tree

Hide file tree

Showing 22 changed files with 2,321 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -200,6 +200,7 @@ Java library and command-line application for converting [Scikit-Learn](https://
   * [`h2o.estimators.isolation_forest.H2OIsolationForestEstimator`](https://docs.h2o.ai/h2o/latest-stable/h2o-py/docs/modeling.html#h2oisolationforestestimator)
   * [`h2o.estimators.random_forest.H2ORandomForestEstimator`](https://docs.h2o.ai/h2o/latest-stable/h2o-py/docs/modeling.html#h2orandomforestestimator)
   * [`h2o.estimators.stackedensemble.H2OStackedEnsembleEstimator`](https://docs.h2o.ai/h2o/latest-stable/h2o-py/docs/modeling.html#h2ostackedensembleestimator)
+  * [`h2o.estimators.xgboost.H2OXGBoostEstimator`](https://docs.h2o.ai/h2o/latest-stable/h2o-py/docs/modeling.html#h2oxgboostestimator)
 </details>
 
 <details>

diff --git a/src/main/resources/META-INF/sklearn2pmml.properties b/src/main/resources/META-INF/sklearn2pmml.properties
@@ -9,7 +9,10 @@ category_encoders.target_encoder.TargetEncoder = category_encoders.TargetEncoder
 category_encoders.woe.WOEEncoder = category_encoders.WOEEncoder
 h2o.estimators.gbm.H2OGradientBoostingEstimator = h2o.estimators.BaseEstimator
 h2o.estimators.glm.H2OGeneralizedLinearEstimator = h2o.estimators.BaseEstimator
+h2o.estimators.isolation_forest.H2OIsolationForestEstimator = h2o.estimators.BaseEstimator
 h2o.estimators.random_forest.H2ORandomForestEstimator = h2o.estimators.BaseEstimator
+h2o.estimators.stackedensemble.H2OStackedEnsembleEstimator = h2o.estimators.BaseEstimator
+h2o.estimators.xgboost.H2OXGBoostEstimator = h2o.estimators.BaseEstimator
 imblearn.combine._smote_enn.SMOTEENN = imblearn.Sampler
 imblearn.combine._smote_tomek.SMOTETomek = imblearn.Sampler
 imblearn.ensemble._bagging.BalancedBaggingClassifier = sklearn.ensemble.bagging.BaggingClassifier

diff --git a/src/test/java/org/jpmml/sklearn/testing/H2OTest.java b/src/test/java/org/jpmml/sklearn/testing/H2OTest.java
@@ -20,6 +20,7 @@
 
 import org.jpmml.converter.FieldNameUtil;
 import org.jpmml.converter.testing.Fields;
+import org.jpmml.evaluator.testing.FloatEquivalence;
 import org.junit.Test;
 
 public class H2OTest extends SkLearnEncoderBatchTest implements SkLearnAlgorithms, SkLearnDatasets, Fields {
@@ -60,6 +61,18 @@ public void evaluateRandomForestAuto() throws Exception {
 		evaluate("H2O" + RANDOM_FOREST, AUTO);
 	}
 
+	@Test
+	public void evaluateXGBoostAudit() throws Exception {
+		String[] targetFields = createTargetFields(AUDIT_ADJUSTED);
+
+		evaluate("H2O" + "XGBoost", AUDIT, excludeFields(targetFields), new FloatEquivalence(16));
+	}
+
+	@Test
+	public void evaluateXGBoostAuto() throws Exception {
+		evaluate("H2O" + "XGBoost", AUTO, new FloatEquivalence(4));
+	}
+
 	static
 	private String[] createTargetFields(String name){
 		return new String[]{name, FieldNameUtil.create("h2o", name)};