bugfixes for cache handling

Author: ChristophBodenstein

TimeNETOptimizationEnvironment/src/toe/simulation/SimulationCache.java

@@ -574,7 +574,7 @@ public void addListOfSimulationsToCache(ArrayList<SimulationType> SimulationList
      */
     public void addSimulationToCache(SimulationType SimulationToAdd) {
         SimulationToAdd.updateHashString();
-        //this.getSimulationList().add(SimulationToAdd);
+        this.getSimulationList().add(SimulationToAdd);
         simulationHashmap.put(SimulationToAdd.getHashValue(), SimulationToAdd);
     }
 
@@ -608,6 +608,6 @@ public ArrayList<SimulationType> getSimulationList() {
      * @return Size of SimulationList
      */
     public int getCacheSize() {
-        return simulationList.size();
+        return simulationHashmap.size();
     }
 }

TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorCachedLocal.java

@@ -62,7 +62,7 @@ public void initSimulator(ArrayList< ArrayList<parameter>> listOfParameterSetsTM
      */
     @Override
     public void run() {
-        if (mySimulationCache != null) {
+        if ((mySimulationCache != null) && (mySimulationCache.getCacheSize() >= 1)) {
             support.log("Will load available results from simulation cache.", typeOfLogLevel.INFO);
             this.myListOfCompletedSimulations = mySimulationCache.getListOfCompletedSimulations(listOfParameterSetsTMP, support.getGlobalSimulationCounter(), remainingParametersets);
         } else {
@@ -73,6 +73,7 @@ public void run() {
         if (this.myListOfCompletedSimulations == null) {
             support.log("No Simulation found in local Cache. Starting simulation.", typeOfLogLevel.INFO);
             this.myListOfCompletedSimulations = new ArrayList<>();
+            remainingParametersets = listOfParameterSetsTMP;
         }
 
         status = myListOfCompletedSimulations.size() * 100 / listOfParameterSetsTMP.size();