improved simulation-search in cache

Author: ChristophBodenstein

TimeNETOptimizationEnvironment/src/toe/datamodel/SimulationType.java

@@ -7,6 +7,7 @@
  */
 package toe.datamodel;
 
+import java.math.BigInteger;
 import toe.support;
 import java.util.ArrayList;
 import toe.typedef.typeOfLogLevel;
@@ -27,7 +28,7 @@ public class SimulationType {
     private String xmlFileName = "";
     private boolean isFromCache = false;//is true, if from cache and false if logfile is parsed
     private boolean isFromDistributedSimulation = false;//Is False, if local simulated, true if simulated via Web
-    private String hashString="";//Hash String to identify this Simulation based on the parameterset
+    private BigInteger hashValue = BigInteger.ONE;//Hash Value to identify this Simulation based on the parameterset
 
     /**
      * the default constructor for parser-objects
@@ -343,15 +344,15 @@ public void setIsFromDistributedSimulation(boolean isFromDistributedSimulation)
     /**
      * @return the hashString
      */
-    public String getHashString() {
-        return hashString;
+    public BigInteger getHashValue() {
+        return hashValue;
     }
 
     /**
      * Update the HashString of current parameterlist
      */
     public void updateHashString() {
-        this.hashString = support.getHashStringForParameterList(parameterList);
+        this.hashValue = support.getHashStringForParameterList(parameterList);
         //support.log(this.hashString+" = HashString", typeOfLogLevel.VERBOSE);
     }
 }

TimeNETOptimizationEnvironment/src/toe/simulation/SimulationCache.java

@@ -17,7 +17,7 @@
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
-import java.io.IOException;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -37,7 +37,10 @@ public class SimulationCache {
 //ArrayList<MeasureType> MeasureList;
     private ArrayList<SimulationType> simulationList;
     private int localSimulationCounter = 0;
-    private String tmpHash = "";
+    //Variables for search in simulationCache
+    private BigInteger tmpHash = BigInteger.ZERO;
+    private SimulationType tmpSimulation;
+    private ArrayList<MeasureType> myTmpList = new ArrayList();
 
     public SimulationCache() {
         //this.MeasureList = new ArrayList<MeasureType>();
@@ -299,21 +302,17 @@ public boolean checkIfAllParameterMatchTable(parameterTableModel myTableModel) {
      * It will just compare the hash values of the sorted parameterLists!
      *
      * @param parameterList given Set of Parameters to by virtually simulated
-     * @return ArrayList of MeasureTypes
+     * @return ArrayList of MeasureTypes, null if not found
      */
     public ArrayList<MeasureType> getAllMeasuresWithParameterList(ArrayList<parameter> parameterList) {
-        SimulationType tmpSimulation;
-        ArrayList<MeasureType> myTmpList = new ArrayList();
+        myTmpList = null;
         tmpHash = support.getHashStringForParameterList(parameterList);
-        //support.log(tmpHash + " = Needle.", typeOfLogLevel.VERBOSE);
 
-        //support.log("Size of All Measures from File: "+MeasureList.size());
-        //Go through all Measures, find the one with the same parameterlist
+        //Go through all Simulations, find the one with the same parameterlist
         for (int i = 0; i < this.getSimulationList().size(); i++) {
             tmpSimulation = this.getSimulationList().get(i);
-            //if (compareParameterList(parameterList, tmpSimulation.getListOfParameters())) {
-            if (tmpHash.equals(tmpSimulation.getHashString())) {
-                myTmpList = tmpSimulation.getMeasures(); //assuming cache-file did not have experiments with same Parameterset
+            if (tmpHash.equals(tmpSimulation.getHashValue())) {
+                myTmpList = tmpSimulation.getMeasures();
             }
         }
         return myTmpList;
@@ -352,10 +351,12 @@ public int compare(Double[] a, Double[] b) {
         //}
         //indexOfZeroDistance should contain the index of the Distance >=0
         ArrayList<MeasureType> listOfMeasureWithGivenParameters = this.getAllMeasuresWithParameterList(this.getSimulationList().get(distArrayList.get(indexOfZeroDistance)[1].intValue()).getListOfParameters());
-        if (listOfMeasureWithGivenParameters.size() > 0) {
+        if (listOfMeasureWithGivenParameters != null) {
+            if (listOfMeasureWithGivenParameters.size() > 0) {
 
-            this.setLocalSimulationCounter(this.getLocalSimulationCounter() + 1);
-            return (this.getParserFromListOfMeasures(listOfMeasureWithGivenParameters));
+                this.setLocalSimulationCounter(this.getLocalSimulationCounter() + 1);
+                return (this.getSimulationFromListOfMeasures(listOfMeasureWithGivenParameters));
+            }
         }
         return null;
     }
@@ -483,7 +484,9 @@ private parameter findParameterInListByName(String name, ArrayList<parameter> li
      */
     public ArrayList<SimulationType> getListOfCompletedSimulationParsers(ArrayList<ArrayList<parameter>> parameterSetList, int simulationCounter) {
         setLocalSimulationCounter(simulationCounter);
-        ArrayList<SimulationType> myParserList = new ArrayList<SimulationType>();
+        ArrayList<SimulationType> myParserList = new ArrayList<>();
+        ArrayList<MeasureType> listOfMeasureWithGivenParameters;
+        ArrayList<parameter> parameterSet;
 
         support.log("Updating all simulation hash values.", typeOfLogLevel.INFO);
         for (int i = 0; i < this.getSimulationList().size(); i++) {
@@ -497,30 +500,28 @@ public ArrayList<SimulationType> getListOfCompletedSimulationParsers(ArrayList<A
 
         //for (ArrayList<parameter> parameterSet : parameterSetList) {
         for (int i = 0; i < parameterSetList.size(); i++) {
-            ArrayList<parameter> parameterSet = parameterSetList.get(i);
+            parameterSet = parameterSetList.get(i);
 
-            //Create Arraylist from array of parameters
-            /*ArrayList<parameter> tmpParameterList = new ArrayList<parameter>();
-            for (parameter myParameter : parameterSet) {
-                tmpParameterList.add(myParameter);
-            }*/
             support.spinInLabel();
 
             support.setStatusText("Searching in cache: " + i * 100 / parameterSetList.size() + " %");
             //Get local simulation results
-            ArrayList<MeasureType> listOfMeasureWithGivenParameters = this.getAllMeasuresWithParameterList(parameterSet);
-            support.log("Size of ParameterList: " + parameterSet.size() + " results in " + listOfMeasureWithGivenParameters.size() + " Measurements.", typeOfLogLevel.VERBOSE);
+            listOfMeasureWithGivenParameters = this.getAllMeasuresWithParameterList(parameterSet);
+
             //append if listSize is > 0
-            if (listOfMeasureWithGivenParameters.size() > 0) {
-                /*SimulationType tmpParser=new SimulationType();
-                 tmpParser.setMeasures(listOfMeasureWithGivenParameters);
-                 tmpParser.setSimulationTime(listOfMeasureWithGivenParameters.get(i).getSimulationTime());
-                 tmpParser.setCPUTime(support.getInt(listOfMeasureWithGivenParameters.get(i).getCPUTime()));
-                 */
-                SimulationType tmpParser = this.getParserFromListOfMeasures(listOfMeasureWithGivenParameters);
-                tmpParser.setListOfParameters(parameterSet);
-                myParserList.add(tmpParser);
-                simulationCounter++;
+            if (listOfMeasureWithGivenParameters != null) {
+                if (listOfMeasureWithGivenParameters.size() > 0) {
+                    /*
+                        SimulationType tmpParser=new SimulationType();
+                        tmpParser.setMeasures(listOfMeasureWithGivenParameters);
+                        tmpParser.setSimulationTime(listOfMeasureWithGivenParameters.get(i).getSimulationTime());
+                        tmpParser.setCPUTime(support.getInt(listOfMeasureWithGivenParameters.get(i).getCPUTime()));
+                     */
+                    SimulationType tmpParser = this.getSimulationFromListOfMeasures(listOfMeasureWithGivenParameters);
+                    tmpParser.setListOfParameters(parameterSet);
+                    myParserList.add(tmpParser);
+                    simulationCounter++;
+                }
             }
             if (support.isCancelEverything()) {
                 return myParserList;
@@ -539,16 +540,16 @@ public ArrayList<SimulationType> getListOfCompletedSimulationParsers(ArrayList<A
      * SimulationType
      * @return one SimulationType-object
      */
-    private SimulationType getParserFromListOfMeasures(ArrayList<MeasureType> mList) {
+    private SimulationType getSimulationFromListOfMeasures(ArrayList<MeasureType> mList) {
         if (mList.size() > 0) {
-            SimulationType tmpParser = new SimulationType();
+            SimulationType tmpSimulation = new SimulationType();
             for (int i = 0; i < mList.size(); i++) {
-                tmpParser.setMeasures(mList);
-                //tmpParser.setSimulationTime(mList.get(i).getSimulationTime());
-                //tmpParser.setCPUTime(support.getInt(mList.get(i).getCPUTime()));
+                tmpSimulation.setMeasures(mList);
+                //tmpSimulation.setSimulationTime(mList.get(i).getSimulationTime());
+                //tmpSimulation.setCPUTime(support.getInt(mList.get(i).getCPUTime()));
             }
-            tmpParser.setIsFromCache(true);
-            return tmpParser;
+            tmpSimulation.setIsFromCache(true);
+            return tmpSimulation;
         }
         return null;
     }

TimeNETOptimizationEnvironment/src/toe/support.java

@@ -183,6 +183,8 @@ public class support {
 
     private static ArrayList<MeasureType> Measures;
 
+    private static String tmpHashString = "";
+
     /**
      * @return the myOptimizerPreferences a Reference to the Preferences-Frame
      */
@@ -1981,8 +1983,8 @@ public static String getDefaultPathToR() {
      * @return hopefully unique string to be used as primary key
      * @see https://dzone.com/articles/get-md5-hash-few-lines-java
      */
-    public static String getHashStringForParameterList(ArrayList<parameter> parameterList) {
-        String returnValue = "";
+    public static BigInteger getHashStringForParameterList(ArrayList<parameter> parameterList) {
+        tmpHashString = "";
         try {
 
             Collections.sort(parameterList, new Comparator<parameter>() {
@@ -1993,18 +1995,16 @@ public int compare(parameter o1, parameter o2) {
             });
 
             for (int i = 0; i < parameterList.size(); i++) {
-                returnValue += parameterList.get(i).getStringValue();
+                tmpHashString += parameterList.get(i).getStringValue();
             }
 
-            byte[] bytesOfMessage = returnValue.getBytes("UTF-8");
-
             MessageDigest md = MessageDigest.getInstance("MD5");
-            md.update(returnValue.getBytes(), 0, returnValue.length());
-            return (new BigInteger(1, md.digest()).toString(16));
+            md.update(tmpHashString.getBytes(), 0, tmpHashString.length());
+            return (new BigInteger(1, md.digest()));
 
         } catch (Exception ex) {
-            support.log("Could not create MD5-hash for " + returnValue, typeOfLogLevel.ERROR);
+            support.log("Could not create MD5-hash for " + tmpHashString, typeOfLogLevel.ERROR);
         }
-        return returnValue;
+        return (BigInteger.ZERO);
     }
 }