Cleaned up code

jpmml · Mar 31, 2024 · e89c0db · e89c0db
1 parent 037b665
commit e89c0db
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/CountEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/CountEncoder.java
@@ -176,7 +176,7 @@ public Boolean getNormalize(){
 
 	@SuppressWarnings("unchecked")
 	public Map<Object, Map<Object, String>> getMinGroupCategories(){
-		Map<Object, String> minGroupCategories = get("_min_group_categories", Map.class);
+		Map<Object, String> minGroupCategories = (Map)getDict("_min_group_categories");
 
 		return CategoryEncoderUtil.toTransformedMap(minGroupCategories, key -> ScalarUtil.decode(key), value -> (Map<Object, String>)value);
 	}

diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/MapEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/MapEncoder.java
@@ -34,7 +34,7 @@ public MapEncoder(String module, String name){
 	public String functionName();
 
 	public Map<Object, Series> getMapping(){
-		Map<?, ?> mapping = get("mapping", Map.class);
+		Map<?, ?> mapping = getDict("mapping");
 
 		return CategoryEncoderUtil.toTransformedMap(mapping, key -> ScalarUtil.decode(key), value -> (Series)value);
 	}

diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/MeanEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/MeanEncoder.java
@@ -129,7 +129,7 @@ public String getDerivedName(){
 
 	@Override
 	public Map<Object, Series> getMapping(){
-		Map<?, ?> mapping = get("mapping", Map.class);
+		Map<?, ?> mapping = getDict("mapping");
 
 		return CategoryEncoderUtil.toTransformedMap(mapping, key -> ScalarUtil.decode(key), value -> toMeanSeries((DataFrame)value, createFunction()));
 	}

diff --git a/pmml-sklearn-extension/src/main/java/category_encoders/OrdinalEncoder.java b/pmml-sklearn-extension/src/main/java/category_encoders/OrdinalEncoder.java
@@ -134,7 +134,7 @@ public Map<?, Integer> getCategoryMapping(){
 
 				return SeriesUtil.toMap(mapping, Functions.identity(), ValueUtil::asInteger);
 			} catch(IllegalArgumentException iae){
-				return get("mapping", Map.class);
+				return (Map)getDict("mapping");
 			}
 		}
 	}

diff --git a/pmml-sklearn/src/main/java/sklearn/feature_extraction/DictVectorizer.java b/pmml-sklearn/src/main/java/sklearn/feature_extraction/DictVectorizer.java
@@ -105,6 +105,6 @@ public String getSeparator(){
 	}
 
 	public Map<String, Integer> getVocabulary(){
-		return get("vocabulary_", Map.class);
+		return (Map)getDict("vocabulary_");
 	}
 }
diff --git a/pmml-sklearn/src/main/java/sklearn2pmml/preprocessing/LookupTransformer.java b/pmml-sklearn/src/main/java/sklearn2pmml/preprocessing/LookupTransformer.java
@@ -137,7 +137,7 @@ protected Map<String, List<Object>> parseMapping(List<String> inputColumns, Stri
 	}
 
 	public Map<?, ?> getMapping(){
-		return get("mapping", Map.class);
+		return getDict("mapping");
 	}
 
 	public Object getDefaultValue(){