Refactored attribute accesses

jpmml · Apr 23, 2024 · cc11856 · cc11856
1 parent 79c3ac1
commit cc11856
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 27 deletions.
diff --git a/pmml-sklearn-xgboost/src/main/java/xgboost/sklearn/Booster.java b/pmml-sklearn-xgboost/src/main/java/xgboost/sklearn/Booster.java
@@ -56,12 +56,7 @@ private Learner loadLearner(ByteOrder byteOrder, String charset){
 	}
 
 	public Integer getBestNTreeLimit(){
-
-		if(!hasattr("best_ntree_limit")){
-			return null;
-		}
-
-		return getInteger("best_ntree_limit");
+		return getOptionalInteger("best_ntree_limit");
 	}
 
 	public byte[] getHandle(){

diff --git a/pmml-sklearn/src/main/java/sklearn/neighbors/HasMetric.java b/pmml-sklearn/src/main/java/sklearn/neighbors/HasMetric.java
@@ -22,5 +22,5 @@ public interface HasMetric {
 
 	String getMetric();
 
-	int getP();
+	Integer getP();
 }
diff --git a/pmml-sklearn/src/main/java/sklearn/neighbors/KNeighborsClassifier.java b/pmml-sklearn/src/main/java/sklearn/neighbors/KNeighborsClassifier.java
@@ -77,7 +77,7 @@ public String getMetric(){
 	}
 
 	@Override
-	public int getP(){
+	public Integer getP(){
 		return getInteger("p");
 	}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/neighbors/KNeighborsRegressor.java b/pmml-sklearn/src/main/java/sklearn/neighbors/KNeighborsRegressor.java
@@ -72,7 +72,7 @@ public String getMetric(){
 	}
 
 	@Override
-	public int getP(){
+	public Integer getP(){
 		return getInteger("p");
 	}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/neighbors/KNeighborsUtil.java b/pmml-sklearn/src/main/java/sklearn/neighbors/KNeighborsUtil.java
@@ -233,21 +233,24 @@ private <E extends Estimator & HasMetric> ComparisonMeasure encodeComparisonMeas
 	static
 	private <E extends Estimator & HasMetric> Measure encodeMeasure(E estimator){
 		String metric = estimator.getMetric();
-		int p = estimator.getP();
 
 		switch(metric){
 			case KNeighborsConstants.METRIC_EUCLIDEAN:
 				return new Euclidean();
 			case KNeighborsConstants.METRIC_MANHATTAN:
 				return new CityBlock();
 			case KNeighborsConstants.METRIC_MINKOWSKI:
-				switch(p){
-					case 1:
-						return new CityBlock();
-					case 2:
-						return new Euclidean();
-					default:
-						return new Minkowski(p);
+				{
+					Integer p = estimator.getP();
+
+					switch(p){
+						case 1:
+							return new CityBlock();
+						case 2:
+							return new Euclidean();
+						default:
+							return new Minkowski(p);
+					}
 				}
 			default:
 				throw new IllegalArgumentException(metric);

diff --git a/pmml-sklearn/src/main/java/sklearn/neighbors/NearestCentroid.java b/pmml-sklearn/src/main/java/sklearn/neighbors/NearestCentroid.java
@@ -83,13 +83,7 @@ public String getMetric(){
 	}
 
 	@Override
-	public int getP(){
-
-		// XXX
-		if(!hasattr("p")){
-			return -1;
-		}
-
+	public Integer getP(){
 		return getInteger("p");
 	}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/neighbors/NearestNeighbors.java b/pmml-sklearn/src/main/java/sklearn/neighbors/NearestNeighbors.java
@@ -66,7 +66,7 @@ public String getMetric(){
 	}
 
 	@Override
-	public int getP(){
+	public Integer getP(){
 		return getInteger("p");
 	}
 

diff --git a/pmml-sklearn/src/main/java/sklearn/preprocessing/PolynomialFeatures.java b/pmml-sklearn/src/main/java/sklearn/preprocessing/PolynomialFeatures.java
@@ -154,7 +154,7 @@ public Feature[] apply(Feature feature){
 		return result;
 	}
 
-	public int getDegree(){
+	public Integer getDegree(){
 		return getInteger("degree");
 	}
 

diff --git a/pmml-sklearn/src/main/java/sklearn2pmml/neural_network/MLPTransformer.java b/pmml-sklearn/src/main/java/sklearn2pmml/neural_network/MLPTransformer.java
@@ -137,7 +137,7 @@ public MLPRegressor getMLP(){
 		return get("mlp_", MLPRegressor.class);
 	}
 
-	public int getTransformerOutputLayer(){
+	public Integer getTransformerOutputLayer(){
 		return getInteger("transformer_output_layer");
 	}
 }