From 024172faaea6640250e7da82520bf2f56006e6a4 Mon Sep 17 00:00:00 2001 From: Villu Ruusmann Date: Sun, 30 Aug 2020 11:04:13 +0300 Subject: [PATCH] Added method ModelEvaluatorBuilder#setExtraResultFeatures(Set) --- .../evaluator/ModelEvaluatorBuilder.java | 19 +++- .../tree/TreeModelEvaluatorTest.java | 98 +++++++++++++++++++ 2 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 pmml-evaluator/src/test/java/org/jpmml/evaluator/tree/TreeModelEvaluatorTest.java diff --git a/pmml-evaluator/src/main/java/org/jpmml/evaluator/ModelEvaluatorBuilder.java b/pmml-evaluator/src/main/java/org/jpmml/evaluator/ModelEvaluatorBuilder.java index f251fd24..8306cd73 100644 --- a/pmml-evaluator/src/main/java/org/jpmml/evaluator/ModelEvaluatorBuilder.java +++ b/pmml-evaluator/src/main/java/org/jpmml/evaluator/ModelEvaluatorBuilder.java @@ -20,13 +20,16 @@ import java.io.Serializable; import java.util.Collections; +import java.util.EnumSet; import java.util.List; import java.util.Objects; +import java.util.Set; import org.dmg.pmml.FieldName; import org.dmg.pmml.MiningSchema; import org.dmg.pmml.Model; import org.dmg.pmml.PMML; +import org.dmg.pmml.ResultFeature; public class ModelEvaluatorBuilder implements EvaluatorBuilder, Serializable { @@ -36,6 +39,8 @@ public class ModelEvaluatorBuilder implements EvaluatorBuilder, Serializable { private ConfigurationBuilder configurationBuilder = new ConfigurationBuilder(); + private Set extraResultFeatures = EnumSet.noneOf(ResultFeature.class); + private InputMapper inputMapper = null; private ResultMapper resultMapper = null; @@ -104,7 +109,9 @@ public ModelEvaluator build(){ ModelEvaluatorFactory modelEvaluatorFactory = configuration.getModelEvaluatorFactory(); - ModelEvaluator modelEvaluator = modelEvaluatorFactory.newModelEvaluator(pmml, model); + Set extraResultFeatures = getExtraResultFeatures(); + + ModelEvaluator modelEvaluator = modelEvaluatorFactory.newModelEvaluator(pmml, model, extraResultFeatures); modelEvaluator.configure(configuration); InputMapper inputMapper = getInputMapper(); @@ -238,6 +245,16 @@ public ModelEvaluatorBuilder setFunctionGuard(SymbolTable functionGuard) return this; } + public Set getExtraResultFeatures(){ + return this.extraResultFeatures; + } + + public ModelEvaluatorBuilder setExtraResultFeatures(Set extraResultFeatures){ + this.extraResultFeatures = extraResultFeatures; + + return this; + } + public InputMapper getInputMapper(){ return this.inputMapper; } diff --git a/pmml-evaluator/src/test/java/org/jpmml/evaluator/tree/TreeModelEvaluatorTest.java b/pmml-evaluator/src/test/java/org/jpmml/evaluator/tree/TreeModelEvaluatorTest.java new file mode 100644 index 00000000..7bb2ea22 --- /dev/null +++ b/pmml-evaluator/src/test/java/org/jpmml/evaluator/tree/TreeModelEvaluatorTest.java @@ -0,0 +1,98 @@ +/* + * Copyright (c) 2020 Villu Ruusmann + * + * This file is part of JPMML-Evaluator + * + * JPMML-Evaluator is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * JPMML-Evaluator is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with JPMML-Evaluator. If not, see . + */ +package org.jpmml.evaluator.tree; + +import java.util.EnumSet; +import java.util.Set; + +import org.dmg.pmml.DataDictionary; +import org.dmg.pmml.DataType; +import org.dmg.pmml.FieldName; +import org.dmg.pmml.Header; +import org.dmg.pmml.MiningFunction; +import org.dmg.pmml.MiningSchema; +import org.dmg.pmml.OpType; +import org.dmg.pmml.Output; +import org.dmg.pmml.OutputField; +import org.dmg.pmml.PMML; +import org.dmg.pmml.ResultFeature; +import org.dmg.pmml.True; +import org.dmg.pmml.Version; +import org.dmg.pmml.tree.ComplexNode; +import org.dmg.pmml.tree.Node; +import org.dmg.pmml.tree.TreeModel; +import org.jpmml.evaluator.ModelEvaluatorBuilder; +import org.junit.Test; + +import static org.junit.Assert.assertTrue; + +public class TreeModelEvaluatorTest { + + @Test + public void build(){ + Node root = new ComplexNode(True.INSTANCE) + .setScore(1d); + + TreeModel treeModel = new TreeModel(MiningFunction.REGRESSION, new MiningSchema(), root); + + PMML pmml = new PMML(Version.PMML_4_4.getVersion(), new Header(), new DataDictionary()) + .addModels(treeModel); + + TreeModelEvaluator treeModelEvaluator = build(pmml, EnumSet.noneOf(ResultFeature.class)); + + assertTrue(treeModelEvaluator instanceof SimpleTreeModelEvaluator); + + treeModelEvaluator = build(pmml, EnumSet.of(ResultFeature.ENTITY_ID)); + + assertTrue(treeModelEvaluator instanceof ComplexTreeModelEvaluator); + + OutputField predictedValueField = new OutputField(FieldName.create("prediction"), OpType.CONTINUOUS, DataType.DOUBLE) + .setResultFeature(ResultFeature.PREDICTED_VALUE); + + Output output = new Output() + .addOutputFields(predictedValueField); + + treeModel.setOutput(output); + + treeModelEvaluator = build(pmml, EnumSet.noneOf(ResultFeature.class)); + + assertTrue(treeModelEvaluator instanceof SimpleTreeModelEvaluator); + + OutputField entityIdField = new OutputField(FieldName.create("nodeId"), OpType.CATEGORICAL, DataType.STRING) + .setResultFeature(ResultFeature.ENTITY_ID); + + // XXX: Bypass element-based caching + output = new Output() + .addOutputFields(predictedValueField, entityIdField); + + treeModel.setOutput(output); + + treeModelEvaluator = build(pmml, EnumSet.noneOf(ResultFeature.class)); + + assertTrue(treeModelEvaluator instanceof ComplexTreeModelEvaluator); + } + + static + private TreeModelEvaluator build(PMML pmml, Set extraResultFeatures){ + ModelEvaluatorBuilder modelEvaluatorBuilder = new ModelEvaluatorBuilder(pmml) + .setExtraResultFeatures(extraResultFeatures); + + return (TreeModelEvaluator)modelEvaluatorBuilder.build(); + } +} \ No newline at end of file