added support for cached benchmark simulation

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/SimulatorCachedBenchmark.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
+ * distributed
+ *
+ * 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/SimulatorCachedDistributed.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/SimulatorCachedLocal.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/SimulatorDistributed.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/typedef.java

@@ -205,7 +205,12 @@ public enum typeOfSimulator {
         /**
          * Use chosen benchmark function to "simulate" parameter set
          */
-        Benchmark
+        Benchmark,
+        /**
+         * To test caching effects with benchmar functions
+         */
+        Cached_Benchmark
+
     };
 
     /**
@@ -420,70 +425,64 @@ public enum typeOfPossiblePlot {
          * No Plot is possible, may no Axes are configured
          */
         NoPlot,
-
         /**
          * 2D-Plot is possble and colorchooser is active
          */
         Plot2D,
-
         /**
          * 3D-Plot is possible, also the interactive plot
          */
         Plot3D
     };
-    
+
     /**
      * Type of 3D-Plot to export Script
      */
-    public enum typeOf3DPlot{
+    public enum typeOf3DPlot {
 
         /**
-         *Standard Scatterplot3D with lib plot3D
+         * Standard Scatterplot3D with lib plot3D
          */
         ScatterPlot,
-
         /**
          * interactive opengl with lib rgl
          */
         Perspective,
-        
         /**
          * Draws a 2D-Heatmap
          */
         Heatmap
     }
-    
+
     /**
      * Type of distance calculation in definition space for found optima
      */
-    public enum typeOfRelativeDistanceCalculation{ 
+    public enum typeOfRelativeDistanceCalculation {
 
         /**
          * Use standard relative distance
          */
-        STANDARD, 
-
+        STANDARD,
         /**
          * use EULID Distance and calc relative value
          */
-        EUKLID}
-    
+        EUKLID
+    }
+
     /**
-     * Skills of Client to be mentioned for distributed simulation
-     * TimeNET, MLDesigner, Matlab ???
+     * Skills of Client to be mentioned for distributed simulation TimeNET,
+     * MLDesigner, Matlab ???
      */
-    public enum typeOfClientSkills{
-    
+    public enum typeOfClientSkills {
+
         /**
          * client can simulate SCPNs (with TimeNET)
          */
         TIMENET,
-
         /**
          * client can simulate MLD-Models
          */
         MLDESIGNER,
-
         /**
          * client can simulate Matlab models
          */