diff --git a/common/core/src/main/java/zingg/common/core/similarity/function/SimFunction.java b/common/core/src/main/java/zingg/common/core/similarity/function/SimFunction.java index d14e3bf8a..768da3d40 100644 --- a/common/core/src/main/java/zingg/common/core/similarity/function/SimFunction.java +++ b/common/core/src/main/java/zingg/common/core/similarity/function/SimFunction.java @@ -10,7 +10,6 @@ public abstract class SimFunction implements Serializable{ //extends UDF2> featurers, M for (SimFunction sf : sfList) { String outputCol = columnHelper.getColumnName(fd.fieldName, sf.getName(), count); columnHelper.getColumnsAdded().add(outputCol); - transformers.add(new SparkTransformer(fd.fieldName, new SparkSimFunction(sf), outputCol)); + transformers.add(createTransformer(sf, fd.fieldName, outputCol)); count++; } } } + protected SparkTransformer createTransformer(SimFunction sf, String fieldName, String outputCol) { + return new SparkTransformer(fieldName, new SparkSimFunction(sf), outputCol); + } + public void register(SparkSession session) { for (SparkTransformer t : transformers) { t.register(session); diff --git a/spark/core/src/main/java/zingg/spark/core/model/SparkMLPipeline.java b/spark/core/src/main/java/zingg/spark/core/model/SparkMLPipeline.java index c9c2f0dbd..3524e6bbb 100644 --- a/spark/core/src/main/java/zingg/spark/core/model/SparkMLPipeline.java +++ b/spark/core/src/main/java/zingg/spark/core/model/SparkMLPipeline.java @@ -32,7 +32,6 @@ import zingg.common.core.model.ModelColumnHelper; import zingg.common.core.model.ModelGrid; import zingg.spark.client.SparkFrame; -import zingg.spark.core.similarity.SparkTransformer; public class SparkMLPipeline implements Serializable { @@ -44,7 +43,7 @@ public class SparkMLPipeline implements Serializable { private LogisticRegression lr; private Transformer transformer; private VectorValueExtractor vve; - protected ModelColumnHelper columnHelper; + private ModelColumnHelper columnHelper; public SparkMLPipeline() { }