From: villberg <villberg@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 30 Jun 2014 06:41:30 +0000 (+0000)
Subject: refs #5042
X-Git-Tag: v1.29.0~254
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=0a42341d212ee1b27d06e6fc1b6f4b71592bce62;p=simantics%2Fsysdyn.git

refs #5042

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

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 db001506..68a0504b 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
@@ -13,18 +13,23 @@ package fi.semantum.sysdyn.solver;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 public class Array implements IExpression {
 
 	public static final Array FULL = new Array();
 	
-	private ArrayList<Object> elements = new ArrayList<Object>();
+	final private ArrayList<Object> elements;
 
 	public Array() {
-		
+		elements = new ArrayList<Object>();
 	}
 	
+	public Array(int size) {
+		elements = new ArrayList<Object>(size);
+	}
+
 	public Array addElement(Object element) {
 		if(element instanceof Constant) addElement(((Constant)element).value);
 		else elements.add(element);
@@ -70,7 +75,7 @@ public class Array implements IExpression {
 		return elements.get(index);
 	}
 	
-	public Collection<Object> elements() {
+	public List<Object> elements() {
 		return elements;
 	}
 	
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java
index e3198cfe..f87529c5 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/ElementwiseProduct.java
@@ -12,6 +12,7 @@ package fi.semantum.sysdyn.solver;
 
 import java.util.Collection;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
 public class ElementwiseProduct implements IExpression {
@@ -36,26 +37,24 @@ public class ElementwiseProduct implements IExpression {
 		if(left instanceof Array && right instanceof Array) {
 			Array la = (Array)left;
 			Array ra = (Array)right;
-			Collection<Object> lae = la.elements();
-			Collection<Object> rae = ra.elements();
+			List<Object> lae = la.elements();
+			List<Object> rae = ra.elements();
 			if(lae.size() != rae.size()) throw new UnsupportedOperationException();
-			Iterator<Object> li = lae.iterator();
-			Iterator<Object> ri = rae.iterator();
-			Array result = new Array();
-			for(int i=0;i<lae.size();i++) {
-				double ld = (Double)li.next();
-				double rd = (Double)ri.next();
+			Array result = new Array(lae.size());
+			int index = 0;
+			for(Object o : lae) {
+				Double ld = (Double)o;
+				Double rd = (Double)rae.get(index++);
 				result.addElement(ld*rd);
 			}
 			return result;
 		} else if (left instanceof Array && right instanceof Double) {
 			Array la = (Array)left;
 			Double rd = (Double)right;
-			Collection<Object> lae = la.elements();
-			Iterator<Object> li = lae.iterator();
-			Array result = new Array();
-			for(int i=0;i<lae.size();i++) {
-				double ld = (Double)li.next();
+			List<Object> lae = la.elements();
+			Array result = new Array(lae.size());
+			for(Object o : lae) {
+				Double ld = (Double)o;
 				result.addElement(ld*rd);
 			}
 			return result;
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 b65afaff..e03b297d 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
@@ -42,6 +42,9 @@ public class Solver {
 	private NodeCache cache;
 	private boolean ready;
 	
+	private boolean dirty;
+	private boolean started;
+	
 	public Solver() {
 		defaultStep = 0.1;
 		start = 0;
@@ -105,23 +108,27 @@ public class Solver {
 		});
 		
 	}
+
+	private SimpleNode n;
+	private String codeCache = null;
 	
 	public void prepare(String input) throws Exception {
 		
 		long startNanos = System.nanoTime();
 		
-//		LineReader reader = new LineReader(input, cache);
-//		reader.parse();
-//		
-//		model = reader.model;
+		if(!input.equals(codeCache)) {
 		
-		StringReader reader = new StringReader(input);
-		ModelParser modelParser = new ModelParser(reader);
-		SimpleNode n = (SimpleNode)modelParser.stored_definition();
+			StringReader reader = new StringReader(input);
+			ModelParser modelParser = new ModelParser(reader);
+			n = (SimpleNode)modelParser.stored_definition();
+		
+		}
+
 	    Parser parser = new Parser();
 	    model = new Model(new Globals(), "", false);
 		parser.walk(n, 0, model);
-		
+		codeCache = input;
+
 		env = new Environment(model, defaultStep, start);
 		
 		int size = model.prepare();
@@ -237,6 +244,8 @@ public class Solver {
 		env.initial = false;
 		
 		ready = true;
+		started = false;
+		dirty = false;
 		
 		long endNanos = System.nanoTime();
 		
@@ -252,15 +261,67 @@ public class Solver {
 		return env.getValueArray();
 	}
 	
+	public void aboutToRun() {
+
+		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);
+			}
+
+			// Solve initial values
+			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) {
+								vd.variable.assign(env, null, value);
+							} else {
+								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 {
+									throw new IllegalStateException();
+								}
+							}
+						}
+					}
+				} catch (Exception e) {
+					if(PRINT_EXCEPTIONS) {
+						e.printStackTrace();
+						System.err.println("failed to assign " + vd.variable.toString());
+					}
+				}
+			}
+			
+			dirty = false;
+			
+		}
+		
+	}
+	
 	public void step() {
 		
 //		printEnvironment();
 //		
 //		new Exception().printStackTrace();
-
+		
 		// TODO: do something more sensible if the solver is not ready
 		if (!ready) return;
 		
+		started = true;
+
 		Assignment[] assignments = model.assignmentArray;
 		Assignment[] derivatives = model.derivativeArray;
 		
@@ -307,6 +368,7 @@ public class Solver {
 	
 	public void setValue(String key, double value) {
 		env.setValue(key, value);
+		dirty = true;
 	}
 	
 }
diff --git a/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl
index 12e7ef77..b75a31c8 100644
--- a/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl
+++ b/org.simantics.sysdyn/scl/Simantics/Sysdyn.scl
@@ -105,4 +105,5 @@ importJava "org.simantics.sysdyn.manager.SysdynExperiments" where
     applyIC :: Variable -> String -> <WriteGraph> ()
     deleteIC :: Variable -> String -> <WriteGraph> ()
 
+    setPublishResults :: Variable -> Boolean -> <ReadGraph> ()
     
\ No newline at end of file
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/OldSysdynExperiment.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/OldSysdynExperiment.java
index 326e8cbe..d9218f28 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/OldSysdynExperiment.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/OldSysdynExperiment.java
@@ -86,6 +86,8 @@ public class OldSysdynExperiment extends SysdynExperiment {
     protected static String                         omcHome = null;
 
     public static OldSysdynExperiment 					INSTANCE;
+	
+	boolean publishResults = true;
 
     public OldSysdynExperiment(Resource experiment, Resource model) {
         super(experiment, model);
@@ -822,6 +824,11 @@ public class OldSysdynExperiment extends SysdynExperiment {
     public void resultsChanged() {
     	resultsChanged(false);
     }
+    
+    public void setPublishResults(boolean value) {
+    	publishResults = value;
+    	if(publishResults) resultsChanged(true);
+    }
 
     public void resultsChanged(boolean force) {
         long time = System.nanoTime();
@@ -841,6 +848,7 @@ public class OldSysdynExperiment extends SysdynExperiment {
      */
     @Override
     public void updateSubscriptions() {
+    	if(!publishResults) return;
         for(VariableValueSubscription subscription : getListenerSnapshot())
             subscription.update();
         skippedVariableUpdate = false;
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
index 78d7902c..aaa959a5 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynExperiments.java
@@ -35,6 +35,22 @@ import org.simantics.utils.DataContainer;
 
 public class SysdynExperiments {
 
+	public static void setPublishResults(ReadGraph graph, Variable variable, boolean value) throws DatabaseException {
+
+        final IProject project = Simantics.getProject();
+        if (project == null) return;
+
+        final IExperimentManager experimentManager = project.getHint(IExperimentManager.KEY_EXPERIMENT_MANAGER);
+        if(experimentManager == null) return;
+        
+        IExperiment exp = experimentManager.getExperiment(variable.getName(graph));
+        if(exp instanceof OldSysdynExperiment) {
+        	OldSysdynExperiment experiment = (OldSysdynExperiment)exp;
+        	experiment.setPublishResults(value);
+        }
+
+	}
+	
     public static String activateExperiment(IProgressMonitor monitor, final IProject project, final IExperimentManager manager, final Resource experimentResource) {
     	
     	if(monitor == null) monitor = new NullProgressMonitor();
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/InternalSolver.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/InternalSolver.java
index 6835e191..e7cd7bf1 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/InternalSolver.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/solver/InternalSolver.java
@@ -197,6 +197,7 @@ public class InternalSolver implements ISolver {
 	
 	@Override
 	public void prepareToStep() throws Exception {
+		solver.aboutToRun();
 	}
 	
 	@Override