Refined exception messages

jpmml · Mar 22, 2019 · 2931027 · 2931027
1 parent 22ab727
commit 2931027
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/src/main/java/org/jpmml/h2o/DrfMojoModelConverter.java b/src/main/java/org/jpmml/h2o/DrfMojoModelConverter.java
@@ -60,7 +60,7 @@ public MiningModel encodeModel(Schema schema){
 		int ntreesPerGroup = getNTreesPerGroup(model);
 
 		if(model._mojo_version < 1.2d){
-			throw new IllegalArgumentException();
+			throw new IllegalArgumentException("Version " + model._mojo_version + " is not supported");
 		}
 
 		Label label = schema.getLabel();

diff --git a/src/main/java/org/jpmml/h2o/GbmMojoModelConverter.java b/src/main/java/org/jpmml/h2o/GbmMojoModelConverter.java
@@ -59,7 +59,7 @@ public MiningModel encodeModel(Schema schema){
 		int ntreesPerGroup = getNTreesPerGroup(model);
 
 		if(model._mojo_version < 1.2d){
-			throw new IllegalArgumentException();
+			throw new IllegalArgumentException("Version " + model._mojo_version + " is not supported");
 		}
 
 		Label label = schema.getLabel();
@@ -119,7 +119,7 @@ public MiningModel encodeModel(Schema schema){
 		} else
 
 		{
-			throw new IllegalArgumentException();
+			throw new IllegalArgumentException("Distribution family " + model._family + " is not supported");
 		}
 	}
 }
diff --git a/src/main/java/org/jpmml/h2o/GlmMojoModelBaseConverter.java b/src/main/java/org/jpmml/h2o/GlmMojoModelBaseConverter.java
@@ -86,8 +86,12 @@ public Schema toMojoModelSchema(Schema schema){
 			int[] catModes = getCatModes(model);
 			double[] numMeans = getNumMeans(model);
 
-			if(cats != catModes.length || nums != numMeans.length){
-				throw new IllegalArgumentException();
+			if(catModes.length != cats){
+				throw new IllegalArgumentException("Expected " + cats + " mode values, got " + catModes.length + " mode values");
+			} // End if
+
+			if(numMeans.length != nums){
+				throw new IllegalArgumentException("Expected " + nums + " mean values, got " + numMeans.length + " mean values");
 			}
 
 			for(int i = 0; i < cats; i++){

diff --git a/src/main/java/org/jpmml/h2o/H2OEncoder.java b/src/main/java/org/jpmml/h2o/H2OEncoder.java
@@ -68,7 +68,7 @@ public void setLabel(DataField dataField){
 				setLabel(new CategoricalLabel(dataField));
 				break;
 			default:
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Expected categorical or continuous operational type, got " + opType.value() + " operational type");
 		}
 	}
 
@@ -83,7 +83,7 @@ public void addFeature(DataField dataField){
 				addFeature(new CategoricalFeature(this, dataField));
 				break;
 			default:
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Expected categorical or continuous operational type, got " + opType.value() + " operational type");
 		}
 	}
 

diff --git a/src/main/java/org/jpmml/h2o/SharedTreeMojoModelConverter.java b/src/main/java/org/jpmml/h2o/SharedTreeMojoModelConverter.java
@@ -83,7 +83,7 @@ public Node encodeNode(Predicate predicate, AtomicInteger idSequence, byte[] com
 
 		int colId = byteBuffer.get2();
 		if(colId == 65535){
-			throw new IllegalArgumentException();
+			throw new IllegalArgumentException("Feature index 65535 is not supported");
 		}
 
 		int naSplitDir = byteBuffer.get1U();
@@ -119,7 +119,7 @@ public Node encodeNode(Predicate predicate, AtomicInteger idSequence, byte[] com
 				} else
 
 				{
-					throw new IllegalArgumentException();
+					throw new IllegalArgumentException("Node type " + equal + " is not supported");
 				}
 
 				FieldName name = categoricalFeature.getName();
@@ -207,7 +207,7 @@ public Node encodeNode(Predicate predicate, AtomicInteger idSequence, byte[] com
 				rightByteBuffer.skip(4);
 				break;
 			default:
-				throw new IllegalArgumentException();
+				throw new IllegalArgumentException("Node type " + lmask + " is not supported");
 		}
 
 		if((lmask2 & 16) != 0){

diff --git a/src/main/java/org/jpmml/h2o/StackedEnsembleMojoModelConverter.java b/src/main/java/org/jpmml/h2o/StackedEnsembleMojoModelConverter.java
@@ -69,9 +69,12 @@ public Model encodeModel(Schema schema){
 			MojoModel mojoModel = getMojoModel(baseModel);
 			double[] mapping = getMapping(baseModel);
 
-			// XXX
-			if(!(mojoModel instanceof SharedTreeMojoModel) || (mapping != null)){
-				throw new IllegalArgumentException();
+			if(!(mojoModel instanceof SharedTreeMojoModel)){
+				throw new IllegalArgumentException("Stacking of models other than decision tree models is not supported");
+			} // End if
+
+			if(mapping != null){
+				throw new IllegalArgumentException("Feature re-indexing is not supported");
 			}
 
 			Converter<?> converter = converterFactory.newConverter(mojoModel);