Merge branch 'master' of https://github.com/ChristophBodenstein/TimeNETOptimizationEnvironment

Author: Christoph Bodenstein

TimeNETOptimizationEnvironment/src/toe/MainFrame.java

@@ -284,7 +284,7 @@ public void updateComboBoxSimulationType() {
         DefaultListSelectionModel model = new DefaultListSelectionModel();
         model.addSelectionInterval(0, 0);
         model.addSelectionInterval(2, 2);
-        model.addSelectionInterval(5, 5);
+        model.addSelectionInterval(5, 6);
         if (support.isCachedSimulationAvailable()) {
             model.addSelectionInterval(1, 1);
         }

TimeNETOptimizationEnvironment/src/toe/SimOptiFactory.java

@@ -22,6 +22,7 @@
 import toe.optimization.OptimizerSimAnnealing;
 import toe.optimization.OptimizerHill;
 import java.util.ArrayList;
+import toe.simulation.SimulatorCachedBenchmark;
 
 /**
  *
@@ -68,6 +69,9 @@ public static Simulator getSimulator() {
             case Benchmark:
                 //Return Simulator for Benchmark-Functions
                 return new SimulatorBenchmark();
+            case Cached_Benchmark:
+                //Return the Benchmark-Simulator with cache-support
+                return new SimulatorCachedBenchmark();
             default:
                 return new SimulatorLocal();
         }

TimeNETOptimizationEnvironment/src/toe/helper/SimulationTypeComboBoxModel.java

@@ -63,6 +63,10 @@ public void setSelectedItem(Object anObject) {
                 super.setSelectedItem(anObject);
                 support.setChosenSimulatorType((typeOfSimulator) anObject);
             }
+            if ((anObject).equals(typeOfSimulator.Cached_Benchmark)) {
+                super.setSelectedItem(anObject);
+                support.setChosenSimulatorType((typeOfSimulator) anObject);
+            }
 
         } else {
 

TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorBenchmark.java

@@ -23,7 +23,7 @@ public class SimulatorCached implements Simulator {
 
     private SimulationCache mySimulationCache = null;
     private ArrayList<SimulationType> myListOfSimulations = null;
-    private String logFileName;
+    private final String logFileName;
 
     /**
      * Constructor
@@ -40,6 +40,7 @@ public SimulatorCached() {
      * @param simulationCounterTMP actual Number of simulation, will be
      * increased with every simulation-run
      */
+    @Override
     public void initSimulator(ArrayList<ArrayList<parameter>> listOfParameterSetsTMP, int simulationCounterTMP, boolean log) {
         if (mySimulationCache != null) {
             this.myListOfSimulations = mySimulationCache.getListOfCompletedSimulationParsers(listOfParameterSetsTMP, support.getGlobalSimulationCounter());
@@ -83,6 +84,7 @@ public void initSimulator(ArrayList<ArrayList<parameter>> listOfParameterSetsTMP
      *
      * @return % of simulatiions that are finished
      */
+    @Override
     public int getStatus() {
         if (this.myListOfSimulations != null) {
             return 100;
@@ -96,6 +98,7 @@ public int getStatus() {
      *
      * @return actual simulation counter
      */
+    @Override
     public int getSimulationCounter() {
         return support.getGlobalSimulationCounter();
     }
@@ -107,6 +110,7 @@ public int getSimulationCounter() {
      * @return list of completed simulations (parsers) which contain all data
      * from the log-files
      */
+    @Override
     public ArrayList<SimulationType> getListOfCompletedSimulationParsers() {
         return this.myListOfSimulations;
     }
@@ -136,6 +140,7 @@ public void setMySimulationCache(SimulationCache mySimulationCache) {
      *
      * @return
      */
+    @Override
     public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {
         //iterate through all cached sims and look for best solution 
         support.log("SimulatorCached: Getting absolute optimum simulation from Cache.");

TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCached.java

@@ -0,0 +1,41 @@
+/**
+ * Simulator which uses log data from already done simulations and returns them.
+ * If not all parametersets can be found in cache, the rest is simulated
+ * via Benchmark-function
+ *
+ * Christoph Bodenstein TU-Ilmenau, FG SSE
+ */
+package toe.simulation;
+
+import toe.datamodel.MeasureType;
+import toe.datamodel.SimulationType;
+
+/**
+ *
+ * @author Christoph Bodenstein
+ */
+public class SimulatorCachedBenchmark extends SimulatorCachedLocal {
+
+    /**
+     * Returns new Simulator-object to be used, if parametersets are not in
+     * cache
+     *
+     * @return Simulator object (benchmark)
+     */
+    @Override
+    public Simulator getNoCacheSimulator() {
+        return new SimulatorBenchmark();
+    }
+    
+    /**
+     * Returns the calculated optimimum For Benchmark-Functions this can be
+     * calculated. For other simulators, this must be given by user.
+     *
+     * @param targetMeasure Measure to be optimized.
+     * @return caluclated optimum. Not possible in Web-Simulator so returns null
+     */
+    @Override
+    public SimulationType getCalculatedOptimum(MeasureType targetMeasure){
+    return new SimulatorBenchmark().getCalculatedOptimum(targetMeasure);
+    }
+}

TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCachedBenchmark.java

@@ -7,9 +7,12 @@
  */
 package toe.simulation;
 
+import toe.datamodel.MeasureType;
+import toe.datamodel.SimulationType;
+
 /**
  *
- * @author chbo1in
+ * @author Christoph Bodenstein
  */
 public class SimulatorCachedDistributed extends SimulatorCachedLocal {
 
@@ -23,4 +26,16 @@ public class SimulatorCachedDistributed extends SimulatorCachedLocal {
     public Simulator getNoCacheSimulator() {
         return new SimulatorDistributed();
     }
+    
+    /**
+     * Returns the calculated optimimum For Benchmark-Functions this can be
+     * calculated. For other simulators, this must be given by user.
+     *
+     * @param targetMeasure Measure to be optimized.
+     * @return caluclated optimum. Not possible in Web-Simulator so returns null
+     */
+    @Override
+    public SimulationType getCalculatedOptimum(MeasureType targetMeasure){
+    return new SimulatorDistributed().getCalculatedOptimum(targetMeasure);
+    }
 }

TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCachedDistributed.java

@@ -24,9 +24,9 @@ public class SimulatorCachedLocal extends SimulatorCached {
 
     private SimulationCache mySimulationCache = null;
     private ArrayList<SimulationType> myListOfSimulationParsers = null;
-    private String logFileName;
+    private final String logFileName;
     private int status;
-    private Simulator myLocalSimulator = getNoCacheSimulator();
+    private final Simulator myLocalSimulator = getNoCacheSimulator();
 
     /**
      * Constructor
@@ -48,7 +48,7 @@ public SimulatorCachedLocal() {
     public void initSimulator(ArrayList< ArrayList<parameter>> listOfParameterSetsTMP, int simulationCounterTMP, boolean log) {
 
         this.myListOfSimulationParsers = null;
-        ArrayList< ArrayList<parameter>> remainingParametersets = new ArrayList< ArrayList<parameter>>();
+        ArrayList< ArrayList<parameter>> remainingParametersets = new ArrayList< >();
         status = 0;
         //this.simulationCounter=simulationCounterTMP;
 
@@ -61,7 +61,7 @@ public void initSimulator(ArrayList< ArrayList<parameter>> listOfParameterSetsTM
 
         if (this.myListOfSimulationParsers == null) {
             support.log("No Simulation found in local Cache. Starting simulation.");
-            this.myListOfSimulationParsers = new ArrayList<SimulationType>();
+            this.myListOfSimulationParsers = new ArrayList<>();
         }
 
         status = myListOfSimulationParsers.size() * 100 / listOfParameterSetsTMP.size();

TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCachedLocal.java

@@ -550,6 +550,7 @@ public void uploadSimulationFile(String urlString, File file, String fileName, S
      * @param targetMeasure Measure to be optimized.
      * @return caluclated optimum. Not possible in Web-Simulator so returns null
      */
+    @Override
     public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {
         //support.log("SimulatorDistributed: Getting absolute optimum simulation from Cache. Will return null.");
         return null;

TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorDistributed.java

@@ -58,6 +58,7 @@ public SimulatorLocal() {
      * @param listOfParameterSetsTMP List of Parameter-sets to be simulated
      * @param simulationCounterTMP start value of simulation counter
      */
+    @Override
     public void initSimulator(ArrayList< ArrayList<parameter>> listOfParameterSetsTMP, int simulationCounterTMP, boolean log) {
         this.status = 0;
         this.listOfParameterSets = listOfParameterSetsTMP;
@@ -78,9 +79,10 @@ public void initSimulator(ArrayList< ArrayList<parameter>> listOfParameterSetsTM
      * Run Method to start simulations and collect the data simulats the SCPNs,
      * main routine
      */
+    @Override
     public void run() {
         this.status = 0;
-        this.listOfCompletedSimulationParsers = new ArrayList<SimulationType>();
+        this.listOfCompletedSimulationParsers = new ArrayList<>();
         int numberOfSimulations = 0;
         if (support.checkTimeNetPath()) {
             try {
@@ -293,6 +295,7 @@ private void startLocalSimulation(String exportFileName) {
      *
      * @return List of completed simulation parsers
      */
+    @Override
     public ArrayList<SimulationType> getListOfCompletedSimulationParsers() {
         return this.listOfCompletedSimulationParsers;
     }
@@ -313,6 +316,7 @@ public void deleteTmpFiles() {
      *
      * @return number of actual simulation
      */
+    @Override
     public int getSimulationCounter() {
         return this.simulationCounter;
     }
@@ -331,14 +335,17 @@ public void setSimulationCounter(int i) {
      *
      * @return % of simulations that are finished
      */
+    @Override
     public int getStatus() {
         return this.status;
     }
 
+    @Override
     public void processEnded() {
         support.log("Local Simulation ended.");
     }
 
+    @Override
     public void errorOccured(String message) {
         support.log("Error while local simulation.");
     }
@@ -347,6 +354,7 @@ public void errorOccured(String message) {
      * Returns the calulated optimimum For Benchmark-Functions this can be
      * caluclated. For other simulators, this must be given by user.
      */
+    @Override
     public SimulationType getCalculatedOptimum(MeasureType targetMeasure) {
         support.log("SimulatorLocal: Getting absolute optimum simulation from Cache. Will return null.");
         return null;