From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 31 Mar 2014 11:54:34 +0000 (+0000)
Subject: Getting closer
X-Git-Tag: 1.8.1~90
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=3a68321250ab1939884797f065de6df181bd17fe;p=simantics%2Fsysdyn.git

Getting closer
refs #4765

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@29225 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 ca56e4bb..1a4aed8c 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
@@ -266,10 +266,8 @@ public class Solver {
 
 		// Next solve algebraic equations
 		for(int i=0;i<assignments.length;i++) {
-			newValues[i] = assignments[i].expression.evaluate(env);
-		}
-		for(int i=0;i<model.assignments.size();i++) {
-			assignments[i].target.assign(env, assignments[i].subscripts, newValues[i]);
+			Object value = assignments[i].expression.evaluate(env);
+			assignments[i].target.assign(env, assignments[i].subscripts, value);
 		}
 
 	}
diff --git a/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_GlobalCarbonCycle.sts b/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_GlobalCarbonCycle.sts
index a2c38563..d731bc91 100644
--- a/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_GlobalCarbonCycle.sts
+++ b/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_GlobalCarbonCycle.sts
@@ -6,5 +6,5 @@
 >exp = fromJust $ possibleResourceChild m "Experiment"
 >id = activateExperiment exp
 >run id
->withinEpsilon (lastValue exp id "/Carbon In Biosphere") 2710.705 0.001
+>withinEpsilon (lastValue exp id "/Carbon In Biosphere") 2710.604 0.001
 True
\ No newline at end of file
diff --git a/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_PredatorAndLimitedPrey.sts b/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_PredatorAndLimitedPrey.sts
index 2aed19ba..3d04aaae 100644
--- a/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_PredatorAndLimitedPrey.sts
+++ b/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_PredatorAndLimitedPrey.sts
@@ -6,5 +6,5 @@
 >exp = fromJust $ possibleResourceChild m "Experiment"
 >id = activateExperiment exp
 >run id
->withinEpsilon (lastValue exp id "/prey") 0.998 0.001
+>withinEpsilon (lastValue exp id "/prey") 0.996 0.001
 True
\ No newline at end of file
diff --git a/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_TouristsEnvironmentsAndHotelFacilities.sts b/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_TouristsEnvironmentsAndHotelFacilities.sts
index 8bfd516f..2db9bd4a 100644
--- a/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_TouristsEnvironmentsAndHotelFacilities.sts
+++ b/org.simantics.sysdyn.tests/src/org/simantics/sysdyn/tests/scripts/ImportModel_TouristsEnvironmentsAndHotelFacilities.sts
@@ -6,5 +6,5 @@
 >exp = fromJust $ possibleResourceChild m "Experiment"
 >id = activateExperiment exp
 >run id
->withinEpsilon (lastValue exp id "/Tourists") 2674.532 0.001
+>withinEpsilon (lastValue exp id "/Tourists") 2642.086 0.001
 True
\ No newline at end of file