Merge pull request #123 from LEMS/experimental

Propagate content error for dimensional check failures
LEMS · Jun 18, 2024 · a6c1661 · a6c1661
2 parents 40d8ff1 + 41c0276
commit a6c1661
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/build.xml b/build.xml
@@ -42,8 +42,8 @@
         <javac srcdir="src"
                destdir="build"
                debug="true"
-               source="1.6"
-               target="1.6"
+               source="1.8"
+               target="1.8"
                includeantruntime="false"
                classpathref="junit.classpath">
             <include name="**/*.java"/>

diff --git a/src/main/java/org/lemsml/jlems/core/type/dynamics/AbstractStateChange.java b/src/main/java/org/lemsml/jlems/core/type/dynamics/AbstractStateChange.java
@@ -90,9 +90,12 @@ public void checkDimensions(HashMap<String, Dimensional> dimHM) throws ContentEr
                 if (dres.isDimensionless()) {
                     // OK
                 } else {
-                    E.oneLineError("Dimension mismatch in equation: " + variable + " = " + value + ". Residual dimension: " + dres);
-                    E.info("Dimension of " + variable + ": " + dsv + ", multiplier=" + dlf + ", left=" + dl + ", rhs=" + drhs);
-                    E.info("All:" + dimHM);
+
+					String errmsg = ("Dimension mismatch in the equation: " + variable + " = " + value + ". Residual dimension: " + dres + 
+                        "\nDimension of " + variable + ": " + dsv + ", multiplier=" + dlf + ", left=" + dl + ", rhs=" + drhs +
+                        "\nAll:" + dimHM);
+					E.info(errmsg);
+                	throw new ContentError(errmsg);
                 }
             }
 

diff --git a/src/main/java/org/lemsml/jlems/core/type/dynamics/Dynamics.java b/src/main/java/org/lemsml/jlems/core/type/dynamics/Dynamics.java
@@ -525,7 +525,7 @@ public Valued getValued(String select) throws ContentError {
 
 
 
-	public void checkEquations(HashMap<String, Dimensional> cdimHM) throws ContentError {
+	public void checkEquations(HashMap<String, Dimensional> cdimHM) throws ContentError{
 
 		HashMap<String, Dimensional> dimHM = new HashMap<String, Dimensional>();
 
@@ -559,15 +559,18 @@ public void checkEquations(HashMap<String, Dimensional> cdimHM) throws ContentEr
 			try {
 				dimHM.put(dv.getName(), dv.getDimensionality(dimHM));
 			} catch (ContentError ce) {
-				E.error("Checking " + dv + " in " + r_type + " " + ce.getMessage());
+				String errmsg = ("Checking " + dv + " in " + r_type + " " + ce.getMessage());
+                throw new ContentError(errmsg);
+
 			}
 		}
 
 		for (ConditionalDerivedVariable cdv : conditionalDerivedVariables) {
 			try {
 				dimHM.put(cdv.getName(), cdv.getDimensionality(dimHM));
 			} catch (ContentError ce) {
-				E.error("Checking " + cdv + " in " + r_type + " " + ce.getMessage());
+				String errmsg = "Checking " + cdv + " in " + r_type + " " + ce.getMessage();
+                throw new ContentError(errmsg);
 			}
 		}