From fd38e2e7291abcb959024fc36f4ec18525b46435 Mon Sep 17 00:00:00 2001
From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 28 Apr 2014 08:19:53 +0000
Subject: [PATCH] Fixed some bugs encountered in Strada-model refs #4765

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29369 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../fi/semantum/sysdyn/solver/Addition.java   |  1 +
 .../src/fi/semantum/sysdyn/solver/Array.java  | 65 ++++++++++++++++---
 .../fi/semantum/sysdyn/solver/Constant.java   |  7 +-
 .../fi/semantum/sysdyn/solver/Division.java   |  1 +
 .../semantum/sysdyn/solver/Environment.java   |  9 +++
 .../src/fi/semantum/sysdyn/solver/Model.java  |  1 -
 .../sysdyn/solver/Multiplication.java         |  1 +
 .../fi/semantum/sysdyn/solver/Negation.java   |  4 +-
 .../src/fi/semantum/sysdyn/solver/Parser.java |  2 +-
 .../src/fi/semantum/sysdyn/solver/Solver.java |  8 ++-
 .../semantum/sysdyn/solver/SolverUtils.java   | 24 ++++---
 .../semantum/sysdyn/solver/Subtraction.java   |  5 +-
 .../fi/semantum/sysdyn/solver/Variable.java   | 11 +++-
 .../semantum/sysdyn/solver/VariableBase.java  |  2 +-
 14 files changed, 113 insertions(+), 28 deletions(-)

diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java
index a407ca4e..b2ec695c 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Addition.java
@@ -33,6 +33,7 @@ public class Addition implements IExpression {
 	public Object evaluate(IEnvironment environment) {
 		Object o1 = exp1.evaluate(environment);
 		Object o2 = exp2.evaluate(environment);
+		if(o1 == null || o2 == null) return null; 
 		if(o1 instanceof Double && o2 instanceof Double) {
 			return (Double)o1 + (Double)o2;
 		}
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
index a14e5ace..233838d9 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Array.java
@@ -20,6 +20,8 @@ import fi.semantum.sysdyn.solver.SolverUtils.Slice;
 
 public class Array implements IExpression {
 
+	public static final Array FULL = new Array();
+	
 	private ArrayList<Object> elements = new ArrayList<Object>();
 
 	public Array() {
@@ -171,29 +173,57 @@ public class Array implements IExpression {
 		return true;
 	}
 
-	public Array slice(Slice[] indices) {
+	public Array slice(Array[] indices) {
 		
 		if(indices.length == 1) {
 			Array result = new Array();
-			for(int i=indices[0].start;i<=indices[0].end;i++) {
-				result.addElement(element(i));
+			for(Object r : indices[0].elements) {
+				Double d = (Double)r;
+				int index = d.intValue();
+				result.addElement(element(index));
 			}
 			return result;
 		}
 		
-		if(indices.length != 2) throw new IllegalStateException();
+		if(indices.length == 2) {
+			if(indices[1] == Array.FULL) {
+				Double d = (Double)indices[0].element(0);
+				int index = d.intValue();
+				return (Array)elements.get(index);
+			} else {
+				Array result = new Array();
+				for(Object o : elements) {
+					Array a = (Array)o;
+					Double d = (Double)indices[1].element(0);
+					int index = d.intValue();
+					result.addElement(a.element(index));
+				}
+				return result;
+			}
+		}
 		
-		if(indices[1] == Slice.FULL) {
-			return (Array)elements.get(indices[0].start);
-		} else {
+		if(indices.length == 3) {
 			Array result = new Array();
-			for(Object o : elements) {
-				Array a = (Array)o;
-				result.addElement(a.element(indices[1].start));
+			for(int i=0;i<indices[0].dimension();i++) {
+				Double d0 = (Double)indices[0].element(i);
+				int index0 = d0.intValue();
+				Array a0 = (Array)element(index0);
+				for(int j=0;j<indices[1].dimension();j++) {
+					Double d1 = (Double)indices[1].element(j);
+					int index1 = d1.intValue();
+					Array a1 = (Array)a0.element(index1);
+					for(int k=0;k<indices[2].dimension();k++) {
+						Double d2 = (Double)indices[2].element(k);
+						int index2 = d2.intValue();
+						result.addElement(a1.element(index2));
+					}
+				}
 			}
 			return result;
 		}
 		
+		throw new IllegalStateException();
+		
 	}
 	
 	public Array add(Array other) {
@@ -276,4 +306,19 @@ public class Array implements IExpression {
 		}
 	}
 	
+	public static Array singleton(double value) {
+		Array result = new Array();
+		result.addElement(value);
+		return result;
+	}
+
+	public static Array slice(int start, int end) {
+		Array result = new Array();
+		for(int i=start;i<=end;i++) {
+			double d = i;
+			result.addElement(d);
+		}
+		return result;
+	}
+
 }
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java
index 9fd58ddd..b93dc989 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Constant.java
@@ -22,7 +22,12 @@ public class Constant implements IExpression {
 		try {
 			value = Double.parseDouble(name);
 		} catch (NumberFormatException e) {
-			value = name;
+			if("true".equals(name))
+				value = Boolean.TRUE;
+			else if("false".equals(name))
+				value = Boolean.FALSE;
+			else
+				value = name;
 		}
 	}
 	
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java
index 6b7658f2..80fbaee4 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Division.java
@@ -45,6 +45,7 @@ public class Division implements IExpression {
 	public Object evaluate(IEnvironment environment) {
 		Object left = exp1.evaluate(environment);
 		Object right = exp2.evaluate(environment);
+		if(left == null || right == null) return null;
 		if(left instanceof Double && right instanceof Double) return ((Double)left)/((Double)right);
 		else if (left instanceof Array && right instanceof Double) return arrayDiv((Array)left, (Double)right);
 		else if (left instanceof Double && right instanceof Array) return arrayDiv((Array)right, (Double)left);
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java
index 1e147408..849a8c99 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Environment.java
@@ -84,6 +84,15 @@ final public class Environment implements IEnvironment, ISystem {
 				return Double.valueOf(array.size(col.intValue()));
 			}
 			
+		});
+		model.functions.put("exp", new Fn1(2) {
+
+			@Override
+			public Object evaluate(IEnvironment environment, int argc) {
+				Double x = (Double)environment.getValue(0);
+				return Math.exp(x);
+			}
+			
 		});
 		model.functions.put("zidz", new Fn1(2) {
 
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java
index 4aa58463..8e084e98 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Model.java
@@ -135,7 +135,6 @@ class Model implements IFrame {
 			}
 			
 			fn.setLocals(frame);
-
 			return fn.evaluate(frame, args.args.length);
 			
 		}
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java
index cc4724ab..fa37e77a 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Multiplication.java
@@ -33,6 +33,7 @@ public class Multiplication implements IExpression {
 	public Object evaluate(IEnvironment environment) {
 		Object left = exp1.evaluate(environment);
 		Object right = exp2.evaluate(environment);
+		if(left == null || right == null) return null;
 		if(left instanceof Double && right instanceof Double) {
 			return ((Double)left)*((Double)right);
 		} 
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java
index 15e9e2df..c60bf13e 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Negation.java
@@ -29,7 +29,9 @@ public class Negation implements IExpression {
     
 	@Override
 	public Object evaluate(IEnvironment environment) {
-		return -((Double)exp.evaluate(environment));
+		Double d = (Double)exp.evaluate(environment);
+		if(d == null) return null;
+		return -d;
 	}
     
 	@Override
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
index 175ea53c..bd6fc87d 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Parser.java
@@ -27,7 +27,7 @@ public class Parser {
 	
 //	public IFrame currentFrame;
 
-	private int PRINT = 1;
+	private int PRINT = 0;
 	
 	public Object walk(SimpleNode n, int indent, IFrame model) {
 		Object result = walk_(n, indent, model);
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
index 1a4aed8c..93ac4fff 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Solver.java
@@ -212,8 +212,10 @@ public class Solver {
 				try {
 					if(!ass.assigned) {
 						Object value = ass.expression.evaluate(env);
-						ass.target.assign(env, ass.subscripts, value);
-						ass.assigned = true;
+						if(value != null) {
+							ass.target.assign(env, ass.subscripts, value);
+							ass.assigned = true;
+						}
 					}
 				} catch (Exception e) {
 					condition++;
@@ -257,7 +259,7 @@ public class Solver {
 			newValues[i] = derivatives[i].expression.evaluate(env);
 		}
 		for(int i=0;i<model.derivatives.size();i++) {
-			derivatives[i].target.assign(env, assignments[i].subscripts, newValues[i]);
+			derivatives[i].target.assign(env, derivatives[i].subscripts, newValues[i]);
 		}
 
 		// Increment time
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/SolverUtils.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/SolverUtils.java
index 731de2dc..05534e47 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/SolverUtils.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/SolverUtils.java
@@ -31,28 +31,36 @@ public class SolverUtils {
 		return dimensions != null && dimensions != VariableBase.UNINIT;
 	}
 	
-	public static Slice[] parseSubscripts(IEnvironment env, IExpression[] subscripts) {
-		Slice[] result = new Slice[subscripts.length];
+	public static Array[] parseSubscripts(IEnvironment env, IExpression[] subscripts) {
+		Array[] result = new Array[subscripts.length];
 		for(int i=0;i<subscripts.length;i++) {
 			IExpression e = subscripts[i];
 			if(e instanceof ArraySliceExpression) {
 				ArraySliceExpression ase = (ArraySliceExpression)e;
 				Double start = (Double)ase.start.evaluate(env);
 				Double end = (Double)ase.end.evaluate(env);
-				result[i] = new Slice(start.intValue(), end.intValue());
+				result[i] = Array.slice(start.intValue()-1, end.intValue()-1);
+			} else if (e instanceof Array) {
+				Array array = (Array)e;
+				Array r = new Array();
+				for(Object o : array.elements()) {
+					Double d = (Double)o;
+					r.addElement(d-1);
+				}
+				result[i] = r;
 			} else {
 				Double v = (Double)e.evaluate(env);
 				int index = v.intValue()-1;
-				if(index == -2) result[i] = Slice.FULL;
-				else result[i] = new Slice(index,index);
+				if(index == -2) result[i] = Array.FULL;
+				else result[i] = Array.singleton(index);
 			}
 		}
 		return result;
 	}
 	
-	public static boolean isSlice(Slice[] subs) {
-		for(Slice s : subs) {
-			if(s.start != s.end) return true;
+	public static boolean isSlice(Array[] subs) {
+		for(Array s : subs) {
+			if(s.dimension() != 1) return true;
 		}
 		return false;
 	}
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java
index 79d1404c..60a43063 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Subtraction.java
@@ -32,7 +32,10 @@ public class Subtraction implements IExpression {
     
 	@Override
 	public Object evaluate(IEnvironment environment) {
-		return ((Double)exp1.evaluate(environment)) - ((Double)exp2.evaluate(environment));
+		Double d1 = (Double)exp1.evaluate(environment);
+		Double d2 = (Double)exp2.evaluate(environment);
+		if(d1 == null || d2 == null) return null;
+		return d1-d2;
 	}
 	
 	@Override
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
index 8144fba0..a461894e 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/Variable.java
@@ -123,6 +123,8 @@ public class Variable implements IExpression {
 	
 	private void validateSize(IEnvironment env, IExpression[] subscripts, Object value) {
 		
+		if(value == null) return;
+		
 		if(base.isStoredAsArray()) return;
 		
 		int fullDimension = base.dimension();
@@ -134,6 +136,8 @@ public class Variable implements IExpression {
 			}
 		} else {
 			if(subscripts == null) {
+				if(base.dimensions.length == this.subscripts.length && value instanceof Double) 
+					return;
 				if(!(value instanceof Array))
 					throw new IllegalStateException();
 				Array arr = (Array)value;
@@ -146,6 +150,9 @@ public class Variable implements IExpression {
 					if(!arr.validateDimensions(base.dimensions, 0))
 						throw new IllegalStateException();
 				} else {
+					if(base.dimensions.length == subscripts.length) {
+						if(value instanceof Double) return;
+					}
 					throw new IllegalStateException();
 				}
 			}
@@ -181,7 +188,9 @@ public class Variable implements IExpression {
 	
 	@Override
 	public Object evaluate(IEnvironment environment) {
-		return base.evaluate(environment, subscripts);
+		Object result = base.evaluate(environment, subscripts);
+		if(result == null) System.err.println("returned null for " + base.name);
+		return result;
 	}
 
 	
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
index b00a48cf..183f9e25 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/VariableBase.java
@@ -179,7 +179,7 @@ public class VariableBase {
 			if(dimension() > 1) {
 				if(subscripts != null) {
 					
-					Slice[] sub = SolverUtils.parseSubscripts(environment, subscripts);
+					Array[] sub = SolverUtils.parseSubscripts(environment, subscripts);
 					if(SolverUtils.isSlice(sub)) {
 						Array arr = new Array();
 						intoArray(environment, index, 0, arr);
-- 
2.47.1