Density

Author: andreasb242

Editor/src/ch/zhaw/simulation/gui/codeditor/FormulaEditorDialog.java

@@ -15,6 +15,7 @@
 import ch.zhaw.simulation.model.flow.element.SimulationContainerData;
 import ch.zhaw.simulation.model.flow.element.SimulationParameterData;
 import ch.zhaw.simulation.model.xy.DensityData;
+import ch.zhaw.simulation.model.xy.MesoData;
 import ch.zhaw.simulation.sysintegration.Sysintegration;
 
 public class FormulaEditorDialog extends BDialog {
@@ -53,6 +54,8 @@ public void setData(NamedFormulaData data, Vector<DensityData> density) {
 			title += " - Formel";
 		} else if (data instanceof FlowValveData) {
 			title += " - Fluss";
+		} else if (data instanceof MesoData.MesoDataFormula) {
+			title += " - Bewegung";
 		} else {
 			System.err.println("Unknonwn Type in FormularEditorDialog:  " + data.getClass());
 		}

Editor/src/ch/zhaw/simulation/gui/codeditor/FormulaEditorPanel.java

@@ -56,7 +56,7 @@ public class FormulaEditorPanel extends JPanel {
 
 	private String value;
 
-	private Parser parser = new Parser();
+	private Parser parser;
 
 	private NamedFormulaData data;
 
@@ -80,7 +80,7 @@ public FormulaEditorPanel(Sysintegration sys, AbstractSimulationModel<?> model,
 		this.model = model;
 		this.additionalVars = addiditonalVars;
 		this.autosaveFormula = autosaveFormula;
-		this.library = new FormulaLibraryPanel(parser);
+		this.library = new FormulaLibraryPanel();
 		this.library.addActionListener(new ActionListener() {
 
 			@Override
@@ -250,7 +250,8 @@ public void setData(NamedFormulaData data, Vector<DensityData> density) {
 		value = data.getFormula();
 		this.data = data;
 
-		this.parser.enableGradient(density);
+		this.parser = new Parser(density);
+		this.library.setParser(this.parser);
 
 		text.setText(data.getFormula());
 
@@ -304,10 +305,6 @@ private Constant[] getConst() {
 		return parser.getConst();
 	}
 
-	public Parser getParser() {
-		return parser;
-	}
-
 	public void dispose() {
 		if (checkTimer != null) {
 			checkTimer.cancel();

Editor/src/ch/zhaw/simulation/gui/codeditor/library/FormulaLibraryPanel.java

@@ -12,6 +12,7 @@
 import javax.swing.JTree;
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
+import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreePath;
 
 import butti.javalibs.listener.ListenerList;
@@ -28,13 +29,13 @@ public class FormulaLibraryPanel extends JPanel {
 
 	private ListenerList listener = new ListenerList();
 
-	public FormulaLibraryPanel(Parser parser) {
+	public FormulaLibraryPanel() {
 		setLayout(new BorderLayout());
-		tree = new JTree(new LibraryRootNode(parser));
+		tree = new JTree();
 
 		tree.setRootVisible(false);
 		tree.setShowsRootHandles(true);
-		
+
 		tree.addTreeSelectionListener(new TreeSelectionListener() {
 
 			@Override
@@ -97,4 +98,7 @@ public void removeActionListener(ActionListener l) {
 		listener.removeListener(l);
 	}
 
+	public void setParser(Parser parser) {
+		tree.setModel(new DefaultTreeModel(new LibraryRootNode(parser)));
+	}
 }

ExternLibraries/lib/B-Lib.jar

@@ -16,9 +16,9 @@ public MathOverview(Window parent) {
 		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 		setTitle("Matheüberblick");
 
-		Parser parser = new Parser();
-		parser.enableGradient(new Vector<DensityData>());
-		FormulaLibraryPanel library = new FormulaLibraryPanel(parser);
+		Parser parser = new Parser(new Vector<DensityData>());
+		FormulaLibraryPanel library = new FormulaLibraryPanel();
+		library.setParser(parser);
 
 		add(library);
 

Simulation/src/ch/zhaw/simulation/dialog/mathoverview/MathOverview.java

@@ -11,6 +11,8 @@
 public class SimulationTableModel extends AbstractTableModel {
 	private static final long serialVersionUID = 1L;
 	private SimulationSerie[] data;
+	private SimulationSerie timeSerie;
+
 	private int rowCount = 0;
 
 	public SimulationTableModel(SimulationCollection series) {
@@ -48,11 +50,25 @@ public boolean isCellEditable(int rowIndex, int columnIndex) {
 	@Override
 	public Object getValueAt(int rowIndex, int columnIndex) {
 		if (columnIndex == 0) {
-			return data[0].getData().get(rowIndex).time;
+			if (timeSerie.getData().size() > rowIndex) {
+				return timeSerie.getData().get(rowIndex).time;
+			} else {
+				return "";
+			}
+		}
+
+		if (data.length <= columnIndex - 1) {
+			return "";
 		}
 
-		Vector<SimulationEntry> row = data[columnIndex - 1].getData();
+		SimulationSerie serie = data[columnIndex - 1];
+		
+		if(serie.isConstValue()) {
+			return serie.getConstValue();
+		}
 
+		Vector<SimulationEntry> row = serie.getData();
+		
 		if (rowIndex >= row.size()) {
 			return ""; // No simulation Data
 		}
@@ -63,9 +79,15 @@ public Object getValueAt(int rowIndex, int columnIndex) {
 	public void setSeries(SimulationCollection series) {
 		data = series.getSeries();
 		rowCount = 0;
-		if (data.length > 0) {
-			rowCount = data[0].getData().size();
+		
+		for (SimulationSerie d : data) {
+			int s = d.getData().size();
+			if (rowCount < s) {
+				rowCount = s;
+				timeSerie = d;
+			}
 		}
+		
 		fireTableStructureChanged();
 	}
 }

SimulationDiagram/src/ch/zhaw/simulation/diagram/tableview/SimulationTableModel.java

@@ -26,12 +26,23 @@ public class Parser {
 
 	private Function[] functionlist;
 	private Constant[] constlist;
+	private Vector<DensityData> density;
 
 	public Parser() {
+		this(null);
+	}
+
+	public Parser(Vector<DensityData> density) {
+		this.density = density;
 		newParser();
 	}
 
 	public void enableGradient(Vector<DensityData> density) {
+		this.density = density;
+		applyDensity();
+	}
+
+	private void applyDensity() {
 		jep.removeFunction("grad");
 
 		if (density != null) {
@@ -51,6 +62,8 @@ private void newParser() {
 		// jep.addComplex();
 		jep.getSymbolTable().remove("x");
 
+		applyDensity();
+
 		// Add all functions from JEP to functionlist[]
 		Vector<Function> functionlist = new Vector<Function>();
 		for (Entry<String, PostfixMathCommandI> e : jep.getFunctionTable().entrySet()) {

SimulationParser/src/ch/zhaw/simulation/math/Parser.java

@@ -54,13 +54,26 @@ protected SimulationCollection simulate() throws CompilerError, ParseException,
 			for (SimulationContainerData c : model.getSimulationContainer()) {
 				((SimulationAttachment) c.attachment).tmp = new TmpContainerValues();
 			}
+
+			this.time = 0;
+			
+			// time=0, initialvalue for containers
+			for (SimulationContainerData c : model.getSimulationContainer()) {
+				Object v = ((SimulationContainerAttachment) c.attachment).calc(this.time, this.dt);
+				((SimulationAttachment) c.attachment).serie.add(time, v);
+			}
+			
+			calcParameters();
 
-			for (time = dt; time < endTime && !isCancelled(); time += dt) {
+			while (time < endTime && !isCancelled()) {
 				setProgress((int) (time / endTime * 100));
 				calcFlowValues1();
 				calcFlowValues2();
 				calcFlowValues3();
 				calcFlowValues4();
+				
+				time += dt;
+				
 				calcContainers();
 				calcParameters();