From 941023870ce6ae1a13b53dbc182e0116dced1cef Mon Sep 17 00:00:00 2001
From: jsimomaa <jsimomaa@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Mon, 30 Jun 2014 10:54:47 +0000
Subject: [PATCH] refs #5042 refs #5019 refs #5009

Merging changes from r29718, r29733, r29763  trunk to branches/1.8  sysdyn 1.8.1

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/branches/1.8@29767 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 .../src/fi/semantum/sysdyn/solver/Array.java  |  11 +-
 .../sysdyn/solver/ElementwiseProduct.java     |  25 +-
 .../fi/semantum/sysdyn/solver/NodeClass.java  |   2 +
 .../src/fi/semantum/sysdyn/solver/Parser.java |  45 ++-
 .../src/fi/semantum/sysdyn/solver/Solver.java |  80 +++++-
 .../sysdyn/solver/parser/ModelParser.java     | 266 +++++++++---------
 .../sysdyn/solver/parser/ModelicaParser.jj    |   2 +-
 .../sysdyn/solver/parser/ModelicaParser.jjt   |   2 +-
 org.simantics.sysdyn/scl/Sysdyn.scl           |   1 +
 .../sysdyn/manager/OldSysdynExperiment.java   |  14 +-
 .../sysdyn/manager/SysdynExperiments.java     |  16 ++
 .../sysdyn/solver/InternalSolver.java         |   1 +
 12 files changed, 303 insertions(+), 162 deletions(-)

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/NodeClass.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
index 81b86df7..8d2e49a0 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/NodeClass.java
@@ -33,9 +33,11 @@ public enum NodeClass {
 	subscript_2,
 	component_clause,
 	component_declaration,
+	component_list,
 	array_subscripts,
 	declaration,
 	class_definition,
+	class_specifier,
 	array,
 	primary,
 	component_reference,
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 bd6fc87d..e2c722d7 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
@@ -40,6 +40,17 @@ public class Parser {
 	
 	static Map<String, NodeClass> nodeNameMap = new HashMap<String, NodeClass>();
 	
+	public String getPackagePath(SimpleNode n) {
+		SimpleNode parent = (SimpleNode)n.jjtGetParent();
+		if(parent == null) return "";
+		NodeClass nc = NodeClass.of(parent.toString());
+		if (nc == NodeClass.class_specifier) {
+			return getPackagePath(parent) + parent.op + "."; 
+		} else {
+			return getPackagePath(parent); 
+		}
+	}
+	
 	public Object walk_(SimpleNode n, int indent, IFrame frame) {
 
 		Model model = frame instanceof Model ? (Model)frame : null;
@@ -246,9 +257,20 @@ public class Parser {
 			IExpression[] subscripts = (third instanceof IExpression[])? (IExpression[])third : null;
 			int declarationStart = (third instanceof IExpression[]) ? 3 : 2;
 			ArrayList<Object> clauses = new ArrayList<Object>();
-			for(int i=declarationStart;i<n.jjtGetNumChildren();i++) {
+			
+			ArrayList<Declaration> declarations2 = new ArrayList<Declaration>();
+			if(third instanceof ArrayList) {
+				ArrayList<Declaration> decls = (ArrayList<Declaration>)third;
+				declarations2.addAll(decls);
+			} else {
+				for(int i=declarationStart;i<n.jjtGetNumChildren();i++) {
+					Declaration decl = (Declaration)walk((SimpleNode)n.jjtGetChild(i), indent+2, frame);
+					declarations2.add(decl);
+				}
+			}
+			
+			for(Declaration decl : declarations2) {
 				
-				Declaration decl = (Declaration)walk((SimpleNode)n.jjtGetChild(i), indent+2, frame);
 				if(subscripts != null)
 					decl.variable.subscripts = subscripts;
 				
@@ -288,6 +310,16 @@ public class Parser {
 				}
 			}
 			return clauses;
+		case component_list:
+			if(n.jjtGetNumChildren() == 1)
+				return walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
+			else {
+				ArrayList<Declaration> result = new ArrayList<Declaration>();
+				for(int i=0;i<n.jjtGetNumChildren();i++) {
+					result.add((Declaration)walk((SimpleNode)n.jjtGetChild(i),indent+2, frame));
+				}
+				return result;
+			}
 		case component_declaration:
 			return (Declaration)walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
 		case array_subscripts:
@@ -318,10 +350,13 @@ public class Parser {
 				}
 				return b.toString();
 			}
+		case class_specifier:
+			return walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
 		case class_definition:
 			if("function".equals(n.op)) {
 				SimpleNode child = (SimpleNode)n.jjtGetChild(0);
-				String functionName = child.op;
+				String packagePath = getPackagePath(child);
+				String functionName = packagePath + child.op;
 				ArrayList<IStatement> stms2 = new ArrayList<IStatement>();
 				Function function = new Function(functionName, new StatementList(stms2));
 				ArrayList<Object> composition = (ArrayList<Object>)walk(child, indent+2, function);
@@ -392,6 +427,10 @@ public class Parser {
 				
 				return null;
 				
+			} else if("package".equals(n.op)) {
+
+				return walk((SimpleNode)n.jjtGetChild(0), indent+2, frame);
+
 			} else {
 				System.err.println("class_definition " + n.op);
 			}
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/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
index de6a2b25..c50c6058 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelParser.java
@@ -218,10 +218,11 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
         break;
       case 37:
         jj_consume_token(37);
+                jjtn000.op = "package";
         break;
       case 26:
         jj_consume_token(26);
-                             jjtn000.op = "function";
+                                                         jjtn000.op = "function";
         break;
       case 17:
         jj_consume_token(17);
@@ -4658,31 +4659,31 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     if (jj_scan_token(62)) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_166()) jj_scanpos = xsp;
+    if (jj_3R_167()) jj_scanpos = xsp;
     if (jj_scan_token(63)) return true;
     return false;
   }
 
-  private boolean jj_3R_129() {
+  private boolean jj_3R_130() {
     if (jj_scan_token(49)) return true;
     return false;
   }
 
-  private boolean jj_3R_124() {
+  private boolean jj_3R_125() {
     if (jj_scan_token(75)) return true;
     return false;
   }
 
-  private boolean jj_3R_153() {
+  private boolean jj_3R_154() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(68)) jj_scanpos = xsp;
     if (jj_scan_token(IDENT)) return true;
     xsp = jj_scanpos;
-    if (jj_3R_161()) jj_scanpos = xsp;
+    if (jj_3R_162()) jj_scanpos = xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_162()) { jj_scanpos = xsp; break; }
+      if (jj_3R_163()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
@@ -4693,7 +4694,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_159() {
+  private boolean jj_3R_160() {
     if (jj_scan_token(58)) return true;
     return false;
   }
@@ -4703,7 +4704,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_150() {
+  private boolean jj_3R_151() {
     if (jj_scan_token(84)) return true;
     return false;
   }
@@ -4739,55 +4740,53 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_123() {
+  private boolean jj_3R_124() {
     if (jj_scan_token(74)) return true;
     return false;
   }
 
-  private boolean jj_3R_146() {
-    if (jj_3R_155()) return true;
+  private boolean jj_3R_147() {
+    if (jj_3R_156()) return true;
     return false;
   }
 
-  private boolean jj_3R_164() {
+  private boolean jj_3R_165() {
     if (jj_scan_token(70)) return true;
     return false;
   }
 
-  private boolean jj_3R_145() {
+  private boolean jj_3R_146() {
     if (jj_scan_token(66)) return true;
-    if (jj_3R_154()) return true;
+    if (jj_3R_155()) return true;
     if (jj_scan_token(67)) return true;
     return false;
   }
 
-  private boolean jj_3R_144() {
+  private boolean jj_3R_145() {
     if (jj_scan_token(62)) return true;
     if (jj_3R_47()) return true;
     if (jj_scan_token(63)) return true;
     return false;
   }
 
-  private boolean jj_3R_142() {
-    if (jj_3R_152()) return true;
+  private boolean jj_3R_143() {
+    if (jj_3R_153()) return true;
     return false;
   }
 
-  private boolean jj_3R_157() {
+  private boolean jj_3R_158() {
     if (jj_scan_token(87)) return true;
     return false;
   }
 
-  private boolean jj_3R_143() {
-    if (jj_3R_153()) return true;
+  private boolean jj_3R_144() {
+    if (jj_3R_154()) return true;
     return false;
   }
 
-  private boolean jj_3R_134() {
+  private boolean jj_3R_135() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_137()) {
-    jj_scanpos = xsp;
     if (jj_3R_138()) {
     jj_scanpos = xsp;
     if (jj_3R_139()) {
@@ -4806,6 +4805,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;
     if (jj_3R_146()) {
     jj_scanpos = xsp;
+    if (jj_3R_147()) {
+    jj_scanpos = xsp;
     if (jj_scan_token(35)) return true;
     }
     }
@@ -4820,182 +4821,182 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_137() {
+  private boolean jj_3R_138() {
     if (jj_scan_token(UNSIGNED_NUMBER)) return true;
     return false;
   }
 
-  private boolean jj_3R_141() {
+  private boolean jj_3R_142() {
     if (jj_scan_token(33)) return true;
     return false;
   }
 
-  private boolean jj_3R_140() {
+  private boolean jj_3R_141() {
     if (jj_scan_token(6)) return true;
     return false;
   }
 
-  private boolean jj_3R_139() {
+  private boolean jj_3R_140() {
     if (jj_scan_token(STRING)) return true;
     return false;
   }
 
-  private boolean jj_3R_138() {
+  private boolean jj_3R_139() {
     if (jj_scan_token(UNSIGNED_INTEGER)) return true;
     return false;
   }
 
-  private boolean jj_3R_149() {
+  private boolean jj_3R_150() {
     if (jj_scan_token(83)) return true;
     return false;
   }
 
-  private boolean jj_3R_128() {
+  private boolean jj_3R_129() {
     if (jj_scan_token(42)) return true;
     return false;
   }
 
-  private boolean jj_3R_155() {
+  private boolean jj_3R_156() {
     if (jj_scan_token(64)) return true;
-    if (jj_3R_165()) return true;
+    if (jj_3R_166()) return true;
     if (jj_scan_token(65)) return true;
     return false;
   }
 
-  private boolean jj_3R_135() {
-    if (jj_3R_147()) return true;
-    if (jj_3R_134()) return true;
+  private boolean jj_3R_136() {
+    if (jj_3R_148()) return true;
+    if (jj_3R_135()) return true;
     return false;
   }
 
-  private boolean jj_3R_154() {
-    if (jj_3R_163()) return true;
+  private boolean jj_3R_155() {
+    if (jj_3R_164()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_164()) { jj_scanpos = xsp; break; }
+      if (jj_3R_165()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_158() {
+  private boolean jj_3R_159() {
     if (jj_3R_60()) return true;
     return false;
   }
 
-  private boolean jj_3R_133() {
+  private boolean jj_3R_134() {
     if (jj_scan_token(79)) return true;
     return false;
   }
 
-  private boolean jj_3R_152() {
+  private boolean jj_3R_153() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_158()) {
-    jj_scanpos = xsp;
     if (jj_3R_159()) {
     jj_scanpos = xsp;
-    if (jj_3R_160()) return true;
+    if (jj_3R_160()) {
+    jj_scanpos = xsp;
+    if (jj_3R_161()) return true;
     }
     }
     if (jj_3R_74()) return true;
     return false;
   }
 
-  private boolean jj_3R_122() {
+  private boolean jj_3R_123() {
     if (jj_scan_token(73)) return true;
     return false;
   }
 
-  private boolean jj_3R_147() {
+  private boolean jj_3R_148() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_156()) {
+    if (jj_3R_157()) {
     jj_scanpos = xsp;
-    if (jj_3R_157()) return true;
+    if (jj_3R_158()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_156() {
+  private boolean jj_3R_157() {
     if (jj_scan_token(86)) return true;
     return false;
   }
 
-  private boolean jj_3R_119() {
-    if (jj_3R_134()) return true;
+  private boolean jj_3R_120() {
+    if (jj_3R_135()) return true;
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_135()) jj_scanpos = xsp;
+    if (jj_3R_136()) jj_scanpos = xsp;
     return false;
   }
 
-  private boolean jj_3R_120() {
-    if (jj_3R_136()) return true;
-    if (jj_3R_119()) return true;
+  private boolean jj_3R_121() {
+    if (jj_3R_137()) return true;
+    if (jj_3R_120()) return true;
     return false;
   }
 
   private boolean jj_3R_104() {
-    if (jj_3R_114()) return true;
+    if (jj_3R_115()) return true;
     if (jj_3R_103()) return true;
     return false;
   }
 
-  private boolean jj_3R_113() {
-    if (jj_3R_118()) return true;
-    if (jj_3R_112()) return true;
+  private boolean jj_3R_114() {
+    if (jj_3R_119()) return true;
+    if (jj_3R_113()) return true;
     return false;
   }
 
-  private boolean jj_3R_136() {
+  private boolean jj_3R_137() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_148()) {
-    jj_scanpos = xsp;
     if (jj_3R_149()) {
     jj_scanpos = xsp;
     if (jj_3R_150()) {
     jj_scanpos = xsp;
-    if (jj_3R_151()) return true;
+    if (jj_3R_151()) {
+    jj_scanpos = xsp;
+    if (jj_3R_152()) return true;
     }
     }
     }
     return false;
   }
 
-  private boolean jj_3R_148() {
+  private boolean jj_3R_149() {
     if (jj_scan_token(82)) return true;
     return false;
   }
 
-  private boolean jj_3R_110() {
+  private boolean jj_3R_111() {
     if (jj_3R_60()) return true;
     return false;
   }
 
-  private boolean jj_3R_112() {
-    if (jj_3R_119()) return true;
+  private boolean jj_3R_113() {
+    if (jj_3R_120()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_120()) { jj_scanpos = xsp; break; }
+      if (jj_3R_121()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_131() {
+  private boolean jj_3R_132() {
     if (jj_scan_token(56)) return true;
     return false;
   }
 
-  private boolean jj_3R_118() {
+  private boolean jj_3R_119() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_132()) {
-    jj_scanpos = xsp;
     if (jj_3R_133()) {
     jj_scanpos = xsp;
+    if (jj_3R_134()) {
+    jj_scanpos = xsp;
     if (jj_scan_token(80)) {
     jj_scanpos = xsp;
     if (jj_scan_token(81)) return true;
@@ -5005,7 +5006,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_132() {
+  private boolean jj_3R_133() {
     if (jj_scan_token(78)) return true;
     return false;
   }
@@ -5016,40 +5017,40 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_117() {
+  private boolean jj_3R_118() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_130()) {
+    if (jj_3R_131()) {
     jj_scanpos = xsp;
-    if (jj_3R_131()) return true;
+    if (jj_3R_132()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_130() {
+  private boolean jj_3R_131() {
     if (jj_scan_token(32)) return true;
     return false;
   }
 
-  private boolean jj_3R_111() {
-    if (jj_3R_118()) return true;
+  private boolean jj_3R_112() {
+    if (jj_3R_119()) return true;
     return false;
   }
 
-  private boolean jj_3R_116() {
+  private boolean jj_3R_117() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_127()) {
-    jj_scanpos = xsp;
     if (jj_3R_128()) {
     jj_scanpos = xsp;
-    if (jj_3R_129()) return true;
+    if (jj_3R_129()) {
+    jj_scanpos = xsp;
+    if (jj_3R_130()) return true;
     }
     }
     return false;
   }
 
-  private boolean jj_3R_127() {
+  private boolean jj_3R_128() {
     if (jj_scan_token(5)) return true;
     return false;
   }
@@ -5057,16 +5058,16 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
   private boolean jj_3R_103() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_111()) jj_scanpos = xsp;
-    if (jj_3R_112()) return true;
+    if (jj_3R_112()) jj_scanpos = xsp;
+    if (jj_3R_113()) return true;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_113()) { jj_scanpos = xsp; break; }
+      if (jj_3R_114()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_115() {
+  private boolean jj_3R_116() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_scan_token(16)) {
@@ -5076,11 +5077,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_114() {
+  private boolean jj_3R_115() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_121()) {
-    jj_scanpos = xsp;
     if (jj_3R_122()) {
     jj_scanpos = xsp;
     if (jj_3R_123()) {
@@ -5089,7 +5088,9 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;
     if (jj_3R_125()) {
     jj_scanpos = xsp;
-    if (jj_3R_126()) return true;
+    if (jj_3R_126()) {
+    jj_scanpos = xsp;
+    if (jj_3R_127()) return true;
     }
     }
     }
@@ -5098,7 +5099,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_121() {
+  private boolean jj_3R_122() {
     if (jj_scan_token(72)) return true;
     return false;
   }
@@ -5115,14 +5116,14 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_109() {
+  private boolean jj_3R_110() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_115()) jj_scanpos = xsp;
-    xsp = jj_scanpos;
     if (jj_3R_116()) jj_scanpos = xsp;
     xsp = jj_scanpos;
     if (jj_3R_117()) jj_scanpos = xsp;
+    xsp = jj_scanpos;
+    if (jj_3R_118()) jj_scanpos = xsp;
     return false;
   }
 
@@ -5191,8 +5192,8 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
   }
 
   private boolean jj_3R_102() {
-    if (jj_3R_109()) return true;
     if (jj_3R_110()) return true;
+    if (jj_3R_111()) return true;
     return false;
   }
 
@@ -5399,6 +5400,11 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
+  private boolean jj_3R_109() {
+    if (jj_scan_token(26)) return true;
+    return false;
+  }
+
   private boolean jj_3R_106() {
     if (jj_scan_token(7)) return true;
     return false;
@@ -5438,13 +5444,13 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_108() {
-    if (jj_scan_token(26)) return true;
+  private boolean jj_3R_105() {
+    if (jj_scan_token(34)) return true;
     return false;
   }
 
-  private boolean jj_3R_105() {
-    if (jj_scan_token(34)) return true;
+  private boolean jj_3R_108() {
+    if (jj_scan_token(37)) return true;
     return false;
   }
 
@@ -5467,10 +5473,10 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     jj_scanpos = xsp;
     if (jj_scan_token(38)) {
     jj_scanpos = xsp;
-    if (jj_scan_token(37)) {
-    jj_scanpos = xsp;
     if (jj_3R_108()) {
     jj_scanpos = xsp;
+    if (jj_3R_109()) {
+    jj_scanpos = xsp;
     if (jj_scan_token(17)) {
     jj_scanpos = xsp;
     if (jj_scan_token(95)) {
@@ -5531,7 +5537,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_173() {
+  private boolean jj_3R_174() {
     if (jj_3R_47()) return true;
     return false;
   }
@@ -5563,7 +5569,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_162() {
+  private boolean jj_3R_163() {
     if (jj_scan_token(68)) return true;
     if (jj_scan_token(IDENT)) return true;
     return false;
@@ -5601,7 +5607,7 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_126() {
+  private boolean jj_3R_127() {
     if (jj_scan_token(77)) return true;
     return false;
   }
@@ -5619,28 +5625,28 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_172() {
+  private boolean jj_3R_173() {
     if (jj_scan_token(69)) return true;
     return false;
   }
 
-  private boolean jj_3R_168() {
+  private boolean jj_3R_169() {
     if (jj_scan_token(71)) return true;
     return false;
   }
 
-  private boolean jj_3R_170() {
+  private boolean jj_3R_171() {
     Token xsp;
     xsp = jj_scanpos;
-    if (jj_3R_172()) {
+    if (jj_3R_173()) {
     jj_scanpos = xsp;
-    if (jj_3R_173()) return true;
+    if (jj_3R_174()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_161() {
-    if (jj_3R_167()) return true;
+  private boolean jj_3R_162() {
+    if (jj_3R_168()) return true;
     return false;
   }
 
@@ -5659,50 +5665,50 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_167() {
+  private boolean jj_3R_168() {
     if (jj_scan_token(66)) return true;
-    if (jj_3R_170()) return true;
+    if (jj_3R_171()) return true;
     return false;
   }
 
-  private boolean jj_3R_125() {
+  private boolean jj_3R_126() {
     if (jj_scan_token(76)) return true;
     return false;
   }
 
-  private boolean jj_3R_163() {
+  private boolean jj_3R_164() {
     if (jj_3R_47()) return true;
     Token xsp;
     while (true) {
       xsp = jj_scanpos;
-      if (jj_3R_168()) { jj_scanpos = xsp; break; }
+      if (jj_3R_169()) { jj_scanpos = xsp; break; }
     }
     return false;
   }
 
-  private boolean jj_3R_174() {
+  private boolean jj_3R_175() {
     if (jj_scan_token(IDENT)) return true;
     if (jj_scan_token(88)) return true;
     return false;
   }
 
-  private boolean jj_3R_160() {
+  private boolean jj_3R_161() {
     if (jj_scan_token(46)) return true;
     return false;
   }
 
-  private boolean jj_3R_171() {
-    if (jj_3R_174()) return true;
+  private boolean jj_3R_172() {
+    if (jj_3R_175()) return true;
     return false;
   }
 
-  private boolean jj_3R_151() {
+  private boolean jj_3R_152() {
     if (jj_scan_token(85)) return true;
     return false;
   }
 
-  private boolean jj_3R_169() {
-    if (jj_3R_171()) return true;
+  private boolean jj_3R_170() {
+    if (jj_3R_172()) return true;
     return false;
   }
 
@@ -5714,18 +5720,18 @@ public class ModelParser/*@bgen(jjtree)*/implements ModelParserTreeConstants, Mo
     return false;
   }
 
-  private boolean jj_3R_165() {
+  private boolean jj_3R_166() {
     Token xsp;
     xsp = jj_scanpos;
     if (jj_3_10()) {
     jj_scanpos = xsp;
-    if (jj_3R_169()) return true;
+    if (jj_3R_170()) return true;
     }
     return false;
   }
 
-  private boolean jj_3R_166() {
-    if (jj_3R_165()) return true;
+  private boolean jj_3R_167() {
+    if (jj_3R_166()) return true;
     return false;
   }
 
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
index 839340c8..6c8fb791 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jj
@@ -193,7 +193,7 @@ void class_definition() : {/*@bgen(jjtree) class_definition */
     ( "encapsulated" )?
     ( "partial" )?
     ( "class" { jjtn000.op = "class"; } | "model" { jjtn000.op = "model"; } | "record" | "block" | ( "expandable" )? "connector" | "type" |
-    "package" | "function" { jjtn000.op = "function"; } | "operator" | "operator function" | "operator record" )
+    "package" { jjtn000.op = "package"; } | "function" { jjtn000.op = "function"; } | "operator" | "operator function" | "operator record" )
     class_specifier()/*@bgen(jjtree)*/
     } catch (Throwable jjte000) {
       if (jjtc000) {
diff --git a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
index c65900fd..977d83d7 100644
--- a/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
+++ b/fi.semantum.sysdyn.solver/src/fi/semantum/sysdyn/solver/parser/ModelicaParser.jjt
@@ -121,7 +121,7 @@ void class_definition() : {
     ( "encapsulated" )?
     ( "partial" )?
     ( "class" { jjtThis.op = "class"; } | "model" { jjtThis.op = "model"; } | "record" | "block" | ( "expandable" )? "connector" | "type" |
-    "package" | "function" { jjtThis.op = "function"; } | "operator" | "operator function" | "operator record" )
+    "package" { jjtThis.op = "package"; } | "function" { jjtThis.op = "function"; } | "operator" | "operator function" | "operator record" )
     class_specifier()
 }
 
diff --git a/org.simantics.sysdyn/scl/Sysdyn.scl b/org.simantics.sysdyn/scl/Sysdyn.scl
index 12e7ef77..b75a31c8 100644
--- a/org.simantics.sysdyn/scl/Sysdyn.scl
+++ b/org.simantics.sysdyn/scl/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..123bede4 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);
@@ -157,8 +159,10 @@ public class OldSysdynExperiment extends SysdynExperiment {
             @Override
             public void run() {
                 if(!canceled) {
-                    // Get and store results
                    result.saveToFile(file, progressMonitor);
-                }
            }
+                    // Get and store results
+                    result.saveToFile(file, progressMonitor);
+                }
+            }
         };
     }
     
@@ -822,6 +826,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 +850,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
-- 
2.47.1