Refined exception messages. Fixes jpmml/sklearn2pmml#123, fixes jpmml…

…/sklearn2pmml#125
jpmml · Jan 20, 2019 · 90b9e57 · 90b9e57
1 parent 78c8104
commit 90b9e57
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/main/java/sklearn2pmml/pipeline/PMMLPipeline.java b/src/main/java/sklearn2pmml/pipeline/PMMLPipeline.java
@@ -523,12 +523,28 @@ public Estimator getEstimator(){
 		List<Object[]> steps = getSteps();
 
 		if(steps.size() < 1){
-			throw new IllegalArgumentException("Expected one or more elements, got zero elements");
+			throw new IllegalArgumentException("Expected one or more steps, got zero steps");
 		}
 
 		Object[] lastStep = steps.get(steps.size() - 1);
 
-		return TupleUtil.extractElement(lastStep, 1, Estimator.class);
+		try {
+			return TupleUtil.extractElement(lastStep, 1, Estimator.class);
+		} catch(IllegalArgumentException iaeEstimator){
+			Transformer transformer = null;
+
+			try {
+				transformer = TupleUtil.extractElement(lastStep, 1, Transformer.class);
+			} catch(IllegalArgumentException iaeTransformer){
+				// Ignored
+			}
+
+			if(transformer != null){
+				throw new IllegalArgumentException("Expected an estimator object as the last step, got a transformer object (" + ClassDictUtil.formatClass(transformer) + ")");
+			}
+
+			throw iaeEstimator;
+		}
 	}
 
 	@Override

diff --git a/src/main/java/sklearn_pandas/DataFrameMapper.java b/src/main/java/sklearn_pandas/DataFrameMapper.java
@@ -48,7 +48,7 @@ public List<Feature> initializeFeatures(SkLearnEncoder encoder){
 		List<Object[]> rows = getFeatures();
 
 		if(!(Boolean.FALSE).equals(_default)){
-			throw new IllegalArgumentException();
+			throw new IllegalArgumentException("Attribute \'" + ClassDictUtil.formatMember(this, "default") + "\' must be set to the 'False' value");
 		}
 
 		List<Feature> result = new ArrayList<>();