From: jussi.koskela <jussi.koskela@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 9 Sep 2014 11:13:14 +0000 (+0000)
Subject: refs #5382
X-Git-Tag: v1.29.0~183
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=2cc492dc28f6e86d5ed6a95d226fcefdf3ef3d0c;p=simantics%2Fsysdyn.git

refs #5382
Initial state incorrect after parameter update

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@30237 ac1ea38d-2e2b-0410-8846-a27921b304fc
---

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 7c988f90..4d083f77 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
@@ -305,47 +305,51 @@ public class Solver {
 
 		if(!started && dirty) {
 			
-			// Solve all algebraic equations
-			Assignment[] assignments = model.assignmentArray;
-			for(int i=0;i<assignments.length;i++) {
-				if(assignments[i].isConstant) continue;
-				Object value = assignments[i].expression.evaluate(env);
-				assignments[i].target.assign(env, assignments[i].subscripts, value);
-			}
-			for(Assignment ass : model.initials) {
-				if(ass.isConstant) continue;
-				Object value = ass.expression.evaluate(env);
-				ass.target.assign(env, ass.subscripts, value);
-			}
-
-			for(VariableDeclaration vd : model.variables) {
-				try {
-					for(Argument arg : vd.modification.args) {
-						if(arg.name.endsWith("start")) {
-							Object value = arg.modification.evaluate(env);
-							if(vd.variable.base.dimension() == 1) {
-								validate(vd.variable, value);
-								vd.variable.assign(env, null, value);
-							} else {
-								validate(vd.variable, value);
-								if(value instanceof Double) {
-									Array array = new Array();
-									for(int i=0;i<vd.variable.base.dimension();i++) array.addElement(value);
-									vd.variable.assign(env, null, array);
-								} else if (value instanceof Array) {
+			for(int loop=0;loop<3;loop++) {
+			
+				// Solve all algebraic equations
+				Assignment[] assignments = model.assignmentArray;
+				for(int i=0;i<assignments.length;i++) {
+					if(assignments[i].isConstant) continue;
+					Object value = assignments[i].expression.evaluate(env);
+					assignments[i].target.assign(env, assignments[i].subscripts, value);
+				}
+				for(Assignment ass : model.initials) {
+					if(ass.isConstant) continue;
+					Object value = ass.expression.evaluate(env);
+					ass.target.assign(env, ass.subscripts, value);
+				}
+	
+				for(VariableDeclaration vd : model.variables) {
+					try {
+						for(Argument arg : vd.modification.args) {
+							if(arg.name.endsWith("start")) {
+								Object value = arg.modification.evaluate(env);
+								if(vd.variable.base.dimension() == 1) {
+									validate(vd.variable, value);
 									vd.variable.assign(env, null, value);
 								} else {
-									throw new IllegalStateException();
+									validate(vd.variable, value);
+									if(value instanceof Double) {
+										Array array = new Array();
+										for(int i=0;i<vd.variable.base.dimension();i++) array.addElement(value);
+										vd.variable.assign(env, null, array);
+									} else if (value instanceof Array) {
+										vd.variable.assign(env, null, value);
+									} else {
+										throw new IllegalStateException();
+									}
 								}
 							}
 						}
-					}
-				} catch (Exception e) {
-					if(PRINT_EXCEPTIONS) {
-						e.printStackTrace();
-						System.err.println("failed to assign " + vd.variable.toString());
+					} catch (Exception e) {
+						if(PRINT_EXCEPTIONS) {
+							e.printStackTrace();
+							System.err.println("failed to assign " + vd.variable.toString());
+						}
 					}
 				}
+				
 			}
 			
 			dirty = false;
@@ -406,7 +410,11 @@ public class Solver {
 	}
 	
 	public double getTime() {
-		return env.time;
+		if (env != null) {
+			return env.time;
+		} else {
+			return 0.0;
+		}
 	}
 	
 	public void setValue(String key, double value) {