From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 3 May 2011 06:43:16 +0000 (+0000)
Subject: Changed the Modelica simulation result format from .plt to .csv. With a complex and... 
X-Git-Tag: simantics-1.4RC1~25
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=e5d0d391a98909d32501798d5c8f39479a360dd0;p=simantics%2Fsysdyn.git

Changed the Modelica simulation result format from .plt to .csv. With a complex and multidimensional model, the result file size was reduced from 5 MB to 1.8 MB and reading of the results (SysdynModel:246-256) was 6 seconds faster (from 8.9 s to 2.9 s)

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

diff --git a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
index f8e4b18e..ee9e4738 100644
--- a/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
+++ b/org.simantics.modelica/src/org/simantics/modelica/ModelicaManager.java
@@ -243,7 +243,7 @@ public class ModelicaManager {
 		modelName = modelName.replace(" ", "");
 		File modelFile = new File(simulationDir, modelName + ".mo");
 		File scriptFile = new File(simulationDir, modelName + ".mos");
-
+		String outputFormat = inits.containsKey("outputFormat") ? inits.get("outputFormat") : "\"plt\"";
 		{
 			PrintStream s = new PrintStream(modelFile);
 			s.print(modelText);
@@ -259,7 +259,7 @@ public class ModelicaManager {
 					",startTime="+inits.get("start value")+
 					",stopTime="+inits.get("stop value")+
 					",method="+inits.get("method")+
-					",outputFormat=\"plt\""
+					",outputFormat="+ outputFormat
 			);
 			if(inits.containsKey("tolerance")) {
 				s.print(",tolerance="+inits.get("tolerance"));
@@ -275,7 +275,7 @@ public class ModelicaManager {
 		return new SimulationLocation(
 				simulationDir,
 				new File(simulationDir, modelName + ".mos"),
-				new File(simulationDir, modelName + "_res.plt"),
+				new File(simulationDir, modelName + "_res." + outputFormat.substring(1, outputFormat.length()-1)),
 				new File(simulationDir, modelName + "_init.txt"),
 				new File(simulationDir, modelName + suffix)
 		);
diff --git a/org.simantics.modelica/src/org/simantics/modelica/data/CSVSimulationResult.java b/org.simantics.modelica/src/org/simantics/modelica/data/CSVSimulationResult.java
new file mode 100644
index 00000000..49abb2b5
--- /dev/null
+++ b/org.simantics.modelica/src/org/simantics/modelica/data/CSVSimulationResult.java
@@ -0,0 +1,55 @@
+package org.simantics.modelica.data;
+
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+
+public class CSVSimulationResult extends SimulationResult {
+
+	HashMap<String, List<Double>> valueMap = new HashMap<String, List<Double>>();
+	
+	@Override
+    public void read(InputStream stream) {
+		
+		// First line contains the variable names in format "name" (including quotes);
+		String line = getLine(stream);
+		if(line == null)
+			return;
+		
+		// FIXME: yks elementti liikaa alusta.
+		line = line.substring(1, line.lastIndexOf("\""));
+		String[] names = line.split("\",\"");
+		
+		// Create lists for receiving values for each variable. Names still with quotes.
+		for(String name : names) {
+			if(!name.isEmpty())
+				valueMap.put(name, new ArrayList<Double>());
+		}
+
+        // Data sets
+		while((line = getLine(stream)) != null) {      
+            if(line.isEmpty())
+                break;
+			String[] values = line.split(",");
+			for(int i = 0; i<values.length; i++) {
+				if(values[i] != null && !values[i].isEmpty() && i < names.length) {
+					try {
+						valueMap.get(names[i]).add(Double.parseDouble(values[i]));
+					} catch (NumberFormatException e) {
+						e.printStackTrace();
+						break;
+					}
+				}
+			}
+		}
+        
+        // Create datasets for variables. Substring quotes from variable names.
+        for(String key : valueMap.keySet()) {
+        	DataSet ds = new DataSet(key, valueMap.get("time"), valueMap.get(key));
+        	variables.add(ds);
+        }
+    }
+    
+}
diff --git a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynModel.java b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynModel.java
index 094d29a5..ed8941b4 100644
--- a/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynModel.java
+++ b/org.simantics.sysdyn/src/org/simantics/sysdyn/manager/SysdynModel.java
@@ -37,6 +37,7 @@ import org.simantics.modelica.IModelicaMonitor;
 import org.simantics.modelica.ModelicaException;
 import org.simantics.modelica.ModelicaManager;
 import org.simantics.modelica.SimulationLocation;
+import org.simantics.modelica.data.CSVSimulationResult;
 import org.simantics.modelica.data.SimulationResult;
 import org.simantics.objmap.IMapping;
 import org.simantics.objmap.IMappingListener;
@@ -172,6 +173,8 @@ public class SysdynModel implements IMappingListener, IModel {
 		Double numberOfIntervals = model.getOutputInterval();
 		inits.put("start value", startTime.toString());
 		inits.put("stop value", stopTime.toString());
+		String outputFormat = "\"csv\"";
+		inits.put("outputFormat", outputFormat);
 		if(numberOfIntervals != null) {
 			inits.put("step value", numberOfIntervals.toString());
 		} else {
@@ -213,6 +216,7 @@ public class SysdynModel implements IMappingListener, IModel {
 				previousImportantInits.put("start value", startTime.toString());
 				previousImportantInits.put("stop value", stopTime.toString());
 				previousImportantInits.put("method", method);
+				previousImportantInits.put("outputFormat", outputFormat);
 			} catch (ModelicaException e) {
 				if(e.getMessage() != null)
 					monitor.message(e.getMessage());
@@ -242,13 +246,12 @@ public class SysdynModel implements IMappingListener, IModel {
 						if(!canceled) {
 							progressMonitor.worked(1);
 							progressMonitor.subTask("Read results");
-							result = new SimulationResult();
+							result = new CSVSimulationResult();
 							result.read(simulationLocation.outputFile);
 							result.readInits(simulationLocation.initFile);
 							result.filter();
 							sysdynResult.setResult(result);
 							progressMonitor.worked(1);
-							
 							resultChanged();
 							
 							setExperimentStopped(experiment);