From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 19 May 2014 06:29:30 +0000 (+0000)
Subject: refs #4856
X-Git-Tag: 1.8.1~57
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=e69555d965b78bf8bd38344600b19a99aad6b5ae;p=simantics%2Fsysdyn.git

refs #4856

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

diff --git a/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF b/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
index 3256e513..b1284b63 100644
--- a/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
+++ b/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF
@@ -8,7 +8,8 @@ Bundle-Vendor: Semantum Oy
 Require-Bundle: org.eclipse.core.runtime,
  org.simantics.utils;bundle-version="1.1.0",
  org.simantics.databoard;bundle-version="0.6.5",
- org.simantics.utils.datastructures;bundle-version="1.1.0"
+ org.simantics.utils.datastructures;bundle-version="1.1.0",
+ gnu.trove3;bundle-version="3.0.3"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
 Export-Package: fi.semantum.sysdyn.solver
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 849a8c99..ec454891 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
@@ -11,11 +11,16 @@
  *******************************************************************************/
 package fi.semantum.sysdyn.solver;
 
+import gnu.trove.list.array.TIntArrayList;
+import gnu.trove.map.hash.TObjectIntHashMap;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
+import java.util.Set;
 import java.util.TreeMap;
 
 interface Fn {
@@ -67,6 +72,8 @@ final public class Environment implements IEnvironment, ISystem {
 	public int size;
 	
 	public Object[] valueTable;
+	
+	public TObjectIntHashMap<String> keyIndexMap = new TObjectIntHashMap<String>(); 
 
 	HashMap<String,TreeMap<Double,Double>> history = new HashMap<String,TreeMap<Double,Double>>();
 
@@ -384,53 +391,77 @@ final public class Environment implements IEnvironment, ISystem {
 			return;
 		}
 
+		String prefix2 = prefix;
+		if(d== 0) prefix2 += "[";
+		if(d>0) prefix2 += ",";
+
 		for(int i=0;i<dimensions[d];i++) {
-			String prefix2 = prefix + "[" + i + "]";
-			addIndexed(dimensions, keys, prefix2, d+1);
+			String prefix3 = prefix2 + (i+1);
+			if(d+1 == dimensions.length) prefix3 += "]";
+			addIndexed(dimensions, keys, prefix3, d+1);
 		}
 		
 	}
 	
-	public void addVariable(String name, int[] dimensions, ArrayList<String> keys) {
+	public int length(int[] dimension) {
+		int result = 1;
+		for(int d : dimension) result *=d;
+		return result;
+	}
+	
+	public void addVariable(String name, int index, int[] dimensions, ArrayList<String> keys, TIntArrayList indices, Set<String> used) {
 
-//		int dimensions[] = base.dimensions;
+		if(!used.add(name)) return;
+		
 		if(dimensions == null) {
 			keys.add(name);
+			indices.add(index);
 		} else {
 			addIndexed(dimensions, keys, name, 0);
+			for(int i=0;i<length(dimensions);i++)
+				indices.add(index+i);
 		}
 
 	}
 	
-	public void addVariable(Variable var, ArrayList<String> keys) {
-		addVariable(var.base.name, var.base.dimensions, keys);
+	public void addVariable(Variable var, ArrayList<String> keys, TIntArrayList indices, Set<String> used) {
+		addVariable(var.base.name, var.base.index, var.base.dimensions, keys, indices, used);
 	}
 
 	public String[] getValueKeyArray() {
 		
 		ArrayList<String> keys = new ArrayList<String>();
+		TIntArrayList indices = new TIntArrayList();
+		Set<String> used = new HashSet<String>();
 		
 		for (int i = 0; i < model.assignmentArray.length; i++) {
-			addVariable(model.assignmentArray[i].target, keys);
+			addVariable(model.assignmentArray[i].target, keys, indices, used);
 		}
 		
 		for (int i = 0; i < model.derivativeArray.length; i++) {
-			addVariable(model.derivativeArray[i].target, keys);
+			addVariable(model.derivativeArray[i].target, keys, indices, used);
 		}
 		
 		// NOTE: there is room for optimization as parameter values that do not
 		// change should only be obtained once (and parameter values that do
 		// change are (possibly) included in assignments or derivatives)
 		for(int i = 0; i < model.parameterArray.length; i++) {
-			addVariable(model.parameterArray[i].variable, keys);
+			addVariable(model.parameterArray[i].variable, keys, indices, used);
 		}
 		
 		for(Map.Entry<String,VariableBase> entry : model.copies.entrySet()) {
-			addVariable(entry.getKey(), entry.getValue().dimensions, keys);
+			addVariable(entry.getKey(), entry.getValue().index, entry.getValue().dimensions, keys, indices, used);
 		}
-
+		
 		valueArray = new double[keys.size()];
 		
+		keyIndexMap.clear();
+		for(int i=0;i<keys.size();i++) {
+			String key = keys.get(i);
+			int index = indices.get(i);
+			keyIndexMap.put(key, index);
+		}
+		
 		return keys.toArray(new String[keys.size()]);
 		
 	}
@@ -439,15 +470,19 @@ final public class Environment implements IEnvironment, ISystem {
 	public double[] getValueArray() {
 		
 		int offset = 0;
-		
+
+		Set<String> used = new HashSet<String>();
+
 		for (int i = 0; i < model.assignmentArray.length; i++) {
 			Variable v = model.assignmentArray[i].target;
+			if(!used.add(v.base.name)) continue;
 			for(int index=0;index<v.base.dimension();index++)
 				valueArray[offset++] = (Double)getValue(v.base.index(this, null)+index);
 		}
 		
 		for (int i = 0; i < model.derivativeArray.length; i++) {
 			Variable v = model.derivativeArray[i].target;
+			if(!used.add(v.base.name)) continue;
 			for(int index=0;index<v.base.dimension();index++)
 				valueArray[offset++] = (Double)getValue(v.base.index(this, null)+index);
 		}
@@ -457,12 +492,14 @@ final public class Environment implements IEnvironment, ISystem {
 		// change are (possibly) included in assignments or derivatives)
 		for(int i = 0; i < model.parameterArray.length; i++) {
 			Variable v = model.parameterArray[i].variable;
+			if(!used.add(v.base.name)) continue;
 			for(int index=0;index<v.base.dimension();index++)
 				valueArray[offset++] = (Double)getValue(v.base.index(this, null)+index);
 		}
 
 		for(Map.Entry<String,VariableBase> entry : model.copies.entrySet()) {
 			VariableBase base = entry.getValue();
+			if(!used.add(base.name)) continue;
 			for(int index=0;index<base.dimension();index++)
 				valueArray[offset++] = (Double)getValue(base.index(this, null)+index);
 		}
@@ -476,4 +513,9 @@ final public class Environment implements IEnvironment, ISystem {
 		return named.get(key);
 	}
 
+	public void setValue(String key, double value) {
+		int index = keyIndexMap.get(key);
+		put(index, value);
+	}
+	
 }
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 93ac4fff..a4b78aa6 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
@@ -28,7 +28,7 @@ import fi.semantum.sysdyn.solver.parser.SimpleNode;
 
 public class Solver {
 
-	private static final boolean PRINT_EXCEPTIONS = false;	
+	private static final boolean PRINT_EXCEPTIONS = true;	
 	private static final int STACK_SIZE = 1000;
 
 	private Model model;
@@ -51,11 +51,17 @@ public class Solver {
 	}
 	
 	public void setStep(double step) {
+		
+		new Exception().printStackTrace();
+		
 		this.step = step;
-		ready = false;
+		
 	}
 	
 	public void setStart(double start) {
+		
+		new Exception().printStackTrace();
+
 		this.start = start;
 		ready = false;
 	}
@@ -231,6 +237,8 @@ public class Solver {
 		
 		ready = true;
 		
+		System.err.println("prepared " + this);
+		
 		long endNanos = System.nanoTime();
 		
 		System.err.println("Prepared model in " + 1e-6*(endNanos-startNanos) + "ms.");
@@ -245,9 +253,12 @@ public class Solver {
 		return env.getValueArray();
 	}
 	
-	
-	
 	public void step() {
+		
+		printEnvironment();
+		
+		new Exception().printStackTrace();
+
 		// TODO: do something more sensible if the solver is not ready
 		if (!ready) return;
 		
@@ -265,7 +276,12 @@ public class Solver {
 		// Increment time
 		// should probably be wrapped inside a method or something
 		env.time += env.step;
-
+		
+		VariableBase base = model.names.get("time");
+		if(base != null) {
+			env.put(base.index, env.time);
+		}
+		
 		// Next solve algebraic equations
 		for(int i=0;i<assignments.length;i++) {
 			Object value = assignments[i].expression.evaluate(env);
@@ -285,4 +301,12 @@ public class Solver {
 		}
 	}
 	
+	public double getTime() {
+		return env.time;
+	}
+	
+	public void setValue(String key, double value) {
+		env.setValue(key, value);
+	}
+	
 }