Cleaned up code

jpmml · Apr 20, 2024 · b9c2734 · b9c2734
1 parent f90041c
commit b9c2734
Show file tree

Hide file tree

Showing 16 changed files with 42 additions and 27 deletions.
diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/BaseNEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/BaseNEncoder.java
@@ -24,6 +24,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import com.google.common.base.Strings;
 import com.google.common.collect.LinkedHashMultimap;
@@ -64,13 +65,13 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 
 		Object missingCategory = null;
 
-		if((BaseNEncoder.HANDLEMISSING_VALUE).equals(handleMissing)){
+		if(Objects.equals(BaseNEncoder.HANDLEMISSING_VALUE, handleMissing)){
 			missingCategory = BaseEncoder.CATEGORY_NAN;
 		}
 
 		Integer defaultValue = null;
 
-		if((BaseNEncoder.HANDLEUNKNOWN_VALUE).equals(handleUnknown)){
+		if(Objects.equals(BaseNEncoder.HANDLEUNKNOWN_VALUE, handleUnknown)){
 			defaultValue = 0;
 		}
 

diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/CountEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/CountEncoder.java
@@ -23,6 +23,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import com.google.common.base.Functions;
@@ -63,13 +64,13 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 
 		Object missingCategory = null;
 
-		if((CountEncoder.HANDLEMISSING_COUNT).equals(handleMissing) || (CountEncoder.HANDLEMISSING_VALUE).equals(handleMissing)){
+		if(Objects.equals(CountEncoder.HANDLEMISSING_COUNT, handleMissing) || Objects.equals(CountEncoder.HANDLEMISSING_VALUE, handleMissing)){
 			missingCategory = BaseEncoder.CATEGORY_NAN;
 		}
 
 		Integer defaultValue = null;
 
-		if((CountEncoder.HANDLEUNKNOWN_VALUE).equals(handleUnknown)){
+		if(Objects.equals(CountEncoder.HANDLEUNKNOWN_VALUE, handleUnknown)){
 			defaultValue = getDefaultValue();
 		}
 

diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/MeanEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/MeanEncoder.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.function.BiFunction;
 
 import com.google.common.base.Functions;
@@ -63,13 +64,13 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 
 		Object missingCategory = null;
 
-		if((MeanEncoder.HANDLEMISSING_VALUE).equals(handleMissing)){
+		if(Objects.equals(MeanEncoder.HANDLEMISSING_VALUE, handleMissing)){
 			missingCategory = BaseEncoder.CATEGORY_NAN;
 		}
 
 		Number defaultValue = null;
 
-		if((MeanEncoder.HANDLEUNKNOWN_VALUE).equals(handleUnknown)){
+		if(Objects.equals(MeanEncoder.HANDLEUNKNOWN_VALUE, handleUnknown)){
 			defaultValue = getMean();
 		}
 

diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/OrdinalEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/OrdinalEncoder.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;
@@ -52,13 +53,13 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 
 		Integer mapMissingTo = null;
 
-		if((OrdinalEncoder.HANDLEMISSING_VALUE).equals(handleMissing)){
+		if(Objects.equals(OrdinalEncoder.HANDLEMISSING_VALUE, handleMissing)){
 			mapMissingTo = -1;
 		}
 
 		Integer defaultValue = null;
 
-		if((OrdinalEncoder.HANDLEUNKNOWN_VALUE).equals(handleUnknown)){
+		if(Objects.equals(OrdinalEncoder.HANDLEUNKNOWN_VALUE, handleUnknown)){
 			defaultValue = -2;
 		}
 

diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/OrdinalMapEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/OrdinalMapEncoder.java
@@ -23,6 +23,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import numpy.core.ScalarUtil;
 import org.dmg.pmml.Field;
@@ -55,13 +56,13 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 
 		Object missingCategory = null;
 
-		if((OrdinalMapEncoder.HANDLEMISSING_VALUE).equals(handleMissing)){
+		if(Objects.equals(OrdinalMapEncoder.HANDLEMISSING_VALUE, handleMissing)){
 			missingCategory = BaseEncoder.CATEGORY_NAN;
 		}
 
 		Object unknownCategory = null;
 
-		if((OrdinalMapEncoder.HANDLEUNKNOWN_VALUE).equals(handleUnknown)){
+		if(Objects.equals(OrdinalMapEncoder.HANDLEUNKNOWN_VALUE, handleUnknown)){
 			unknownCategory = OrdinalEncoder.CATEGORY_UNKNOWN;
 		}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/compose/ColumnTransformer.java b/pmml-sklearn/src/main/java/sklearn/compose/ColumnTransformer.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.dmg.pmml.PMML;
 import org.jpmml.converter.Feature;
@@ -106,11 +107,11 @@ protected Transformer getTransformer(Object[] fittedTransformer){
 			@Override
 			public Transformer apply(Object object){
 
-				if((SkLearnSteps.DROP).equals(object)){
+				if(Objects.equals(SkLearnSteps.DROP, object)){
 					return Drop.INSTANCE;
 				} else
 
-				if((SkLearnSteps.PASSTHROUGH).equals(object)){
+				if(Objects.equals(SkLearnSteps.PASSTHROUGH, object)){
 					return PassThrough.INSTANCE;
 				}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/feature_selection/SelectKBest.java b/pmml-sklearn/src/main/java/sklearn/feature_selection/SelectKBest.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import com.google.common.primitives.Booleans;
 import org.jpmml.converter.ValueUtil;
@@ -43,7 +44,7 @@ public List<Boolean> getSupportMask(){
 		Object k = getK();
 		List<Number> scores = getScores();
 
-		if(("all").equals(k)){
+		if(Objects.equals("all", k)){
 			return null;
 		}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/linear_model/logistic/LogisticRegression.java b/pmml-sklearn/src/main/java/sklearn/linear_model/logistic/LogisticRegression.java
@@ -22,6 +22,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.MiningFunction;
@@ -59,7 +60,7 @@ public Model encodeModel(Schema schema){
 		String sklearnVersion = getSkLearnVersion();
 		String multiClass = getMultiClass();
 
-		if((LogisticRegression.MULTICLASS_AUTO).equals(multiClass)){
+		if(Objects.equals(LogisticRegression.MULTICLASS_AUTO, multiClass)){
 			int[] shape = getCoefShape();
 			String solver = getSolver();
 
@@ -166,7 +167,7 @@ public String getMultiClass(){
 		String multiClass = getEnum("multi_class", this::getString, Arrays.asList(LogisticRegression.MULTICLASS_AUTO, LogisticRegression.MULTICLASS_MULTINOMIAL, LogisticRegression.MULTICLASS_OVR, LogisticRegression.MULTICLASS_WARN));
 
 		// SkLearn 0.20
-		if((LogisticRegression.MULTICLASS_WARN).equals(multiClass)){
+		if(Objects.equals(LogisticRegression.MULTICLASS_WARN, multiClass)){
 			multiClass = LogisticRegression.MULTICLASS_OVR;
 		}
 
@@ -182,7 +183,7 @@ private String getAutoMultiClass(String solver, int[] shape){
 		int numberOfClasses = shape[0];
 		int numberOfFeatures = shape[1];
 
-		if((LogisticRegression.SOLVER_LIBLINEAR).equals(solver)){
+		if(Objects.equals(LogisticRegression.SOLVER_LIBLINEAR, solver)){
 			return LogisticRegression.MULTICLASS_OVR;
 		} // End if
 

diff --git a/pmml-sklearn/src/main/java/sklearn/pipeline/SkLearnPipeline.java b/pmml-sklearn/src/main/java/sklearn/pipeline/SkLearnPipeline.java
@@ -19,6 +19,7 @@
 package sklearn.pipeline;
 
 import java.util.List;
+import java.util.Objects;
 
 import com.google.common.collect.Lists;
 import net.razorvine.pickle.objects.ClassDict;
@@ -80,7 +81,7 @@ public boolean hasFinalEstimator(){
 
 		Object step = TupleUtil.extractElement(finalStep, 1);
 
-		if((step == null) || (SkLearnSteps.PASSTHROUGH).equals(step)){
+		if((step == null) || Objects.equals(SkLearnSteps.PASSTHROUGH, step)){
 			return false;
 		} // End if
 
@@ -130,7 +131,7 @@ public List<? extends Transformer> getTransformers(){
 			@Override
 			public Transformer apply(Object object){
 
-				if((object == null) || (SkLearnSteps.PASSTHROUGH).equals(object)){
+				if((object == null) || Objects.equals(SkLearnSteps.PASSTHROUGH, object)){
 					return PassThrough.INSTANCE;
 				}
 
@@ -163,7 +164,7 @@ public <E extends Estimator> E getFinalEstimator(Class<? extends E> clazz){
 
 		Object step = TupleUtil.extractElement(finalStep, 1);
 
-		if((step == null) || (SkLearnSteps.PASSTHROUGH).equals(step)){
+		if((step == null) || Objects.equals(SkLearnSteps.PASSTHROUGH, step)){
 			throw new SkLearnException("The pipeline ends with a transformer-like object");
 		}
 
@@ -195,7 +196,7 @@ public Step getHead(){
 			@Override
 			public Step apply(Object object){
 
-				if((object == null) || (SkLearnSteps.PASSTHROUGH).equals(object)){
+				if((object == null) || Objects.equals(SkLearnSteps.PASSTHROUGH, object)){
 					return null;
 				}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/preprocessing/Imputer.java b/pmml-sklearn/src/main/java/sklearn/preprocessing/Imputer.java
@@ -19,6 +19,7 @@
 package sklearn.preprocessing;
 
 import java.util.List;
+import java.util.Objects;
 
 import sklearn.impute.SimpleImputer;
 
@@ -32,7 +33,7 @@ public Imputer(String module, String name){
 	public Object getMissingValues(){
 		Object missingValues = super.getMissingValues();
 
-		if(("NaN").equals(missingValues)){
+		if(Objects.equals("NaN", missingValues)){
 			missingValues = null;
 		}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/preprocessing/OneHotEncoder.java b/pmml-sklearn/src/main/java/sklearn/preprocessing/OneHotEncoder.java
@@ -20,6 +20,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 import com.google.common.collect.ContiguousSet;
 import com.google.common.collect.DiscreteDomain;
@@ -107,7 +108,7 @@ public List<Number> getValues(){
 
 		Object numberOfValues = getOptionalScalar("n_values");
 
-		if(("auto").equals(numberOfValues)){
+		if(Objects.equals("auto", numberOfValues)){
 			return getActiveFeatures();
 		}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/preprocessing/OrdinalEncoder.java b/pmml-sklearn/src/main/java/sklearn/preprocessing/OrdinalEncoder.java
@@ -21,6 +21,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 
 import org.dmg.pmml.DataType;
 import org.dmg.pmml.InvalidValueTreatmentMethod;
@@ -48,7 +49,7 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 
 		if(handleUnknown != null){
 
-			if((OrdinalEncoder.HANDLEUNKNOWN_USE_ENCODED_VALUE).equals(handleUnknown)){
+			if(Objects.equals(OrdinalEncoder.HANDLEUNKNOWN_USE_ENCODED_VALUE, handleUnknown)){
 				unknownValue = getUnknownValue();
 
 				if(ValueUtil.isNaN(unknownValue)){

diff --git a/pmml-sklearn/src/main/java/sklearn2pmml/CustomizationUtil.java b/pmml-sklearn/src/main/java/sklearn2pmml/CustomizationUtil.java
@@ -390,7 +390,7 @@ private DocumentNamespaceContext(Document document){
 		public String getNamespaceURI(String prefix){
 			Document document = getDocument();
 
-			if((XMLConstants.DEFAULT_NS_PREFIX).equals(prefix)){
+			if(Objects.equals(XMLConstants.DEFAULT_NS_PREFIX, prefix)){
 				return document.lookupNamespaceURI(null);
 			}
 

diff --git a/pmml-sklearn/src/main/java/sklearn2pmml/preprocessing/ConcatTransformer.java b/pmml-sklearn/src/main/java/sklearn2pmml/preprocessing/ConcatTransformer.java
@@ -20,6 +20,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.dmg.pmml.Apply;
 import org.dmg.pmml.DataType;
@@ -50,7 +51,7 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 		for(int i = 0; i < features.size(); i++){
 			Feature feature = features.get(i);
 
-			if((i > 0) && !("").equals(separator)){
+			if((i > 0) && !Objects.equals("", separator)){
 				expressions.add(ExpressionUtil.createConstant(DataType.STRING, separator));
 			}
 

diff --git a/pmml-sklearn/src/main/java/sklearn2pmml/preprocessing/SeriesConstructor.java b/pmml-sklearn/src/main/java/sklearn2pmml/preprocessing/SeriesConstructor.java
@@ -20,6 +20,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.dmg.pmml.DataType;
 import org.jpmml.converter.Feature;
@@ -57,7 +58,7 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 			feature = CategoricalDtypeUtil.refineFeature(feature, categoricalDtype, encoder);
 		} // End if
 
-		if(name != null && !(feature.getName()).equals(name)){
+		if(name != null && !Objects.equals(feature.getName(), name)){
 			encoder.renameFeature(feature, name);
 		}
 

diff --git a/pmml-sklearn/src/main/java/sklearn_pandas/CategoricalImputer.java b/pmml-sklearn/src/main/java/sklearn_pandas/CategoricalImputer.java
@@ -20,6 +20,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import org.dmg.pmml.MissingValueTreatmentMethod;
 import org.jpmml.converter.Feature;
@@ -41,7 +42,7 @@ public List<Feature> encodeFeatures(List<Feature> features, SkLearnEncoder encod
 
 		ClassDictUtil.checkSize(1, features);
 
-		if(("NaN").equals(missingValues)){
+		if(Objects.equals("NaN", missingValues)){
 			missingValues = null;
 		}