addd getLogfilename to all simulators.

ChristophBodenstein · ChristophBodenstein · commit 2db1da3171fa · 2016-10-23T14:39:14.000+02:00
Save single simulation logs if delTempFiles is disabled
diff --git a/TimeNETOptimizationEnvironment/src/toe/MainFrame.java b/TimeNETOptimizationEnvironment/src/toe/MainFrame.java
@@ -1079,7 +1079,7 @@ private void jButtonStartBatchSimulationActionPerformed(java.awt.event.ActionEve
             }
 
             Simulator mySimulator = SimOptiFactory.getSimulator();
-            mySimulator.initSimulator(ListOfParameterSetsToBeWritten, true);
+            mySimulator.initSimulator(ListOfParameterSetsToBeWritten, support.isCreateseparateLogFilesForEverySimulation());
             support.waitForSimulatorAsynchronous(mySimulator, this);
         } else {
             this.popUIState();
diff --git a/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerABC.java b/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerABC.java
@@ -174,7 +174,7 @@ public void run() {
         //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
         synchronized (mySimulator) {
             try {
-                mySimulator.initSimulator(getNextParameterSetAsArrayList(), false);
+                mySimulator.initSimulator(getNextParameterSetAsArrayList(), support.isCreateseparateLogFilesForEverySimulation());
                 mySimulator.wait();
             } catch (InterruptedException ex) {
                 support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
@@ -200,7 +200,7 @@ public void run() {
                 //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
                 synchronized (mySimulator) {
                     try {
-                        mySimulator.initSimulator(getNextParameterSetAsArrayList(source), false);
+                        mySimulator.initSimulator(getNextParameterSetAsArrayList(source), support.isCreateseparateLogFilesForEverySimulation());
                         mySimulator.wait();
                     } catch (InterruptedException ex) {
                         support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
diff --git a/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerChargedSystemSearch.java b/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerChargedSystemSearch.java
@@ -108,7 +108,7 @@ public void run() {
         //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
         synchronized (mySimulator) {
             try {
-                mySimulator.initSimulator(getNextParameterSetAsArrayList(), false);
+                mySimulator.initSimulator(getNextParameterSetAsArrayList(), support.isCreateseparateLogFilesForEverySimulation());
                 mySimulator.wait();
             } catch (InterruptedException ex) {
                 support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
@@ -137,7 +137,7 @@ public void run() {
             //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
             synchronized (mySimulator) {
                 try {
-                    mySimulator.initSimulator(parameterList, false);
+                    mySimulator.initSimulator(parameterList, support.isCreateseparateLogFilesForEverySimulation());
                     mySimulator.wait();
                 } catch (InterruptedException ex) {
                     support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
diff --git a/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerGenetic.java b/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerGenetic.java
@@ -109,7 +109,7 @@ public void run() {
         //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
         synchronized (mySimulator) {
             try {
-                mySimulator.initSimulator(getNextParameterSetAsArrayList(), false);
+                mySimulator.initSimulator(getNextParameterSetAsArrayList(), support.isCreateseparateLogFilesForEverySimulation());
                 mySimulator.wait();
             } catch (InterruptedException ex) {
                 support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
@@ -147,7 +147,7 @@ public void run() {
             //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
             synchronized (mySimulator) {
                 try {
-                    mySimulator.initSimulator(parameterList, false);
+                    mySimulator.initSimulator(parameterList, support.isCreateseparateLogFilesForEverySimulation());
                     mySimulator.wait();
                 } catch (InterruptedException ex) {
                     support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
diff --git a/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerHill.java b/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerHill.java
@@ -104,7 +104,7 @@ public void run() {
         //support.log("Performed % of simulations: "+mySimulator.getStatus(), typeOfLogLevel.INFO);
         synchronized (mySimulator) {
             try {
-                mySimulator.initSimulator(getParametersetAsArrayList(getFirstParameterset()), false);
+                mySimulator.initSimulator(getParametersetAsArrayList(getFirstParameterset()), support.isCreateseparateLogFilesForEverySimulation());
                 mySimulator.wait();
             } catch (InterruptedException ex) {
                 support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
@@ -131,7 +131,7 @@ public void run() {
             //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
             synchronized (mySimulator) {
                 try {
-                    mySimulator.initSimulator(newParameterset, false);
+                    mySimulator.initSimulator(newParameterset, support.isCreateseparateLogFilesForEverySimulation());
                     mySimulator.wait();
                 } catch (InterruptedException ex) {
                     support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
diff --git a/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerMVMO.java b/TimeNETOptimizationEnvironment/src/toe/optimization/OptimizerMVMO.java
@@ -98,7 +98,7 @@ public void run() {
         //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
         synchronized (mySimulator) {
             try {
-                mySimulator.initSimulator(getNextParameterSetAsArrayList(), false);
+                mySimulator.initSimulator(getNextParameterSetAsArrayList(), support.isCreateseparateLogFilesForEverySimulation());
                 mySimulator.wait();
             } catch (InterruptedException ex) {
                 support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
@@ -139,7 +139,7 @@ public void run() {
             //support.waitForEndOfSimulator(mySimulator, support.DEFAULT_TIMEOUT);
             synchronized (mySimulator) {
                 try {
-                    mySimulator.initSimulator(parameterList, false);
+                    mySimulator.initSimulator(parameterList, support.isCreateseparateLogFilesForEverySimulation());
                     mySimulator.wait();
                 } catch (InterruptedException ex) {
                     support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.INFO);
diff --git a/TimeNETOptimizationEnvironment/src/toe/simulation/Simulator.java b/TimeNETOptimizationEnvironment/src/toe/simulation/Simulator.java
@@ -57,4 +57,10 @@ public interface Simulator {
      * @return info-value about success of cancelation
      */
     public int cancelAllSimulations();
+    
+    /**
+     * Returns name of local logfile, used by this simulator. The logfilename is chosen at init of simulator
+     * @return 
+     */
+    public String getLogfileName();
 }
diff --git a/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorBenchmark.java b/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorBenchmark.java
@@ -178,4 +178,9 @@ public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {
     public int cancelAllSimulations() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+
+    @Override
+    public String getLogfileName() {
+        return this.logFileName;
+    }
 }
diff --git a/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCached.java b/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCached.java
@@ -194,4 +194,8 @@ public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {
     public int cancelAllSimulations() {
         return 0;
     }
+    @Override
+    public String getLogfileName() {
+        return this.logFileName;
+    }
 }
diff --git a/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCachedLocal.java b/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCachedLocal.java
@@ -92,7 +92,8 @@ public void run() {
 
             synchronized (myLocalSimulator) {
                 try {
-                    myLocalSimulator.initSimulator(remainingParametersets, false);
+                    support.addLinesToLogFileFromListOfParser(myLocalSimulator.getListOfCompletedSimulationParsers(), myLocalSimulator.getLogfileName());
+                    myLocalSimulator.initSimulator(remainingParametersets, support.isCreateseparateLogFilesForEverySimulation());
                     myLocalSimulator.wait();
                 } catch (InterruptedException ex) {
                     support.log("Problem waiting for end of non-cache-simulator.", typeOfLogLevel.ERROR);
@@ -179,4 +180,8 @@ public int cancelAllSimulations() {
         return 0;
     }
 
+    @Override
+    public String getLogfileName() {
+        return this.logFileName;
+    }
 }
diff --git a/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorDistributed.java b/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorDistributed.java
@@ -576,4 +576,8 @@ public int cancelAllSimulations() {
         return 0;
     }
 
+    @Override
+    public String getLogfileName() {
+        return this.logFileName;
+    }
 }
diff --git a/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorLocal.java b/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorLocal.java
@@ -348,4 +348,9 @@ public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {
     public int cancelAllSimulations() {
         throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools | Templates.
     }
+    
+    @Override
+    public String getLogfileName() {
+        return this.logFileName;
+    }
 }
diff --git a/TimeNETOptimizationEnvironment/src/toe/support.java b/TimeNETOptimizationEnvironment/src/toe/support.java
@@ -2007,4 +2007,14 @@ public int compare(parameter o1, parameter o2) {
         }
         return (BigInteger.ZERO);
     }
+
+    /**
+     * Returns true if every single simulation shall be written as log file
+     * Useful if system is not stable or distributed simulation is used for batch simulation
+     *
+     * @return true if single simulation logs shall be created
+     */
+    public static boolean isCreateseparateLogFilesForEverySimulation() {
+        return (!support.isDeleteTmpSimulationFiles());
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1079,7 +1079,7 @@ private void jButtonStartBatchSimulationActionPerformed(java.awt.event.ActionEve`
`1079`	`1079`	`}`
`1080`	`1080`
`1081`	`1081`	`Simulator mySimulator = SimOptiFactory.getSimulator();`
`1082`		`- mySimulator.initSimulator(ListOfParameterSetsToBeWritten, true);`
	`1082`	`+ mySimulator.initSimulator(ListOfParameterSetsToBeWritten, support.isCreateseparateLogFilesForEverySimulation());`
`1083`	`1083`	`support.waitForSimulatorAsynchronous(mySimulator, this);`
`1084`	`1084`	`} else {`
`1085`	`1085`	`this.popUIState();`
Original file line number	Diff line number	Diff line change
`@@ -178,4 +178,9 @@ public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {`
`178`	`178`	`public int cancelAllSimulations() {`
`179`	`179`	`throw new UnsupportedOperationException("Not supported yet."); //To change body of generated methods, choose Tools \| Templates.`
`180`	`180`	`}`
	`181`	`+`
	`182`	`+ @Override`
	`183`	`+ public String getLogfileName() {`
	`184`	`+ return this.logFileName;`
	`185`	`+ }`
`181`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -194,4 +194,8 @@ public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {`
`194`	`194`	`public int cancelAllSimulations() {`
`195`	`195`	`return 0;`
`196`	`196`	`}`
	`197`	`+ @Override`
	`198`	`+ public String getLogfileName() {`
	`199`	`+ return this.logFileName;`
	`200`	`+ }`
`197`	`201`	`}`