added faster search in cache (only hash-comparision) and some status label outputs.

Author: ChristophBodenstein

TimeNETOptimizationEnvironment/src/toe/datamodel/SimulationType.java

@@ -27,6 +27,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
 
     /**
      * the default constructor for parser-objects
@@ -338,4 +339,19 @@ public boolean isIsFromDistributedSimulation() {
     public void setIsFromDistributedSimulation(boolean isFromDistributedSimulation) {
         this.isFromDistributedSimulation = isFromDistributedSimulation;
     }
+
+    /**
+     * @return the hashString
+     */
+    public String getHashString() {
+        return hashString;
+    }
+
+    /**
+     * Update the HashString of current parameterlist
+     */
+    public void updateHashString() {
+        this.hashString = support.getHashStringForParameterList(parameterList);
+        //support.log(this.hashString+" = HashString", typeOfLogLevel.VERBOSE);
+    }
 }

TimeNETOptimizationEnvironment/src/toe/simulation/SimulationCache.java

@@ -37,6 +37,7 @@ public class SimulationCache {
 //ArrayList<MeasureType> MeasureList;
     private ArrayList<SimulationType> simulationList;
     private int localSimulationCounter = 0;
+    private String tmpHash = "";
 
     public SimulationCache() {
         //this.MeasureList = new ArrayList<MeasureType>();
@@ -293,21 +294,26 @@ public boolean checkIfAllParameterMatchTable(parameterTableModel myTableModel) {
     }
 
     /**
-     * Returns all Measures, selected by one parameterset(ParameterList)
+     * Returns all Measures, selected by one parameterset(ParameterList).
+     *
+     * 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
      */
     public ArrayList<MeasureType> getAllMeasuresWithParameterList(ArrayList<parameter> parameterList) {
         SimulationType tmpSimulation;
         ArrayList<MeasureType> myTmpList = new ArrayList();
+        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
         for (int i = 0; i < this.getSimulationList().size(); i++) {
             tmpSimulation = this.getSimulationList().get(i);
-            if (compareParameterList(parameterList, tmpSimulation.getListOfParameters())) {
-                myTmpList = tmpSimulation.getMeasures(); //assumming cache-file did not have experiments with same Parameterset
+            //if (compareParameterList(parameterList, tmpSimulation.getListOfParameters())) {
+            if (tmpHash.equals(tmpSimulation.getHashString())) {
+                myTmpList = tmpSimulation.getMeasures(); //assuming cache-file did not have experiments with same Parameterset
             }
         }
         return myTmpList;
@@ -479,16 +485,31 @@ public ArrayList<SimulationType> getListOfCompletedSimulationParsers(ArrayList<A
         setLocalSimulationCounter(simulationCounter);
         ArrayList<SimulationType> myParserList = new ArrayList<SimulationType>();
 
-        for (ArrayList<parameter> parameterSet : parameterSetList) {
+        support.log("Updating all simulation hash values.", typeOfLogLevel.INFO);
+        for (int i = 0; i < this.getSimulationList().size(); i++) {
+            this.getSimulationList().get(i).updateHashString();
+            support.setStatusText("Updating Hashs: " + i * 100 / this.getSimulationList().size() + " %");
+            if (support.isCancelEverything()) {
+                return null;
+            }
+        }
+        support.log("All hash values in cache up to date.", typeOfLogLevel.VERBOSE);
+
+        //for (ArrayList<parameter> parameterSet : parameterSetList) {
+        for (int i = 0; i < parameterSetList.size(); i++) {
+            ArrayList<parameter> 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: "+ tmpParameterList.size() + " results in " +listOfMeasureWithGivenParameters.size()+ " Measurements.");
+            support.log("Size of ParameterList: " + parameterSet.size() + " results in " + listOfMeasureWithGivenParameters.size() + " Measurements.", typeOfLogLevel.VERBOSE);
             //append if listSize is > 0
             if (listOfMeasureWithGivenParameters.size() > 0) {
                 /*SimulationType tmpParser=new SimulationType();

TimeNETOptimizationEnvironment/src/toe/support.java

@@ -11,15 +11,23 @@
 import toe.datamodel.parameter;
 import toe.datamodel.MeasureType;
 import java.io.*;
+import java.math.BigInteger;
 import java.net.HttpURLConnection;
 import java.net.URL;
+import java.nio.charset.Charset;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.Properties;
 import java.util.Scanner;
 import java.util.Timer;
 import java.util.TimerTask;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import javax.swing.JFileChooser;
 import javax.swing.JLabel;
 import javax.swing.JOptionPane;
@@ -692,14 +700,16 @@ public static void addLinesToLogFileFromListOfParser(ArrayList<SimulationType> p
             fw.close();
         } catch (Exception e) {
             support.log("Exception while writing things to summary log-file.", typeOfLogLevel.ERROR);
-            support.log("Name of logfile: "+logFileName, typeOfLogLevel.ERROR);
-            support.log("Trace: "+e.getMessage(), typeOfLogLevel.ERROR);
+            support.log("Name of logfile: " + logFileName, typeOfLogLevel.ERROR);
+            support.log("Trace: " + e.getMessage(), typeOfLogLevel.ERROR);
         }
     }
 
     /**
-     * Add lines to logfile from parserlist, same like addLinesToLogFileFromListOfParser
-     * but with number of runs. Only used in old version of OptimizerABC
+     * Add lines to logfile from parserlist, same like
+     * addLinesToLogFileFromListOfParser but with number of runs. Only used in
+     * old version of OptimizerABC
+     *
      * @param pList
      * @param numRunList
      * @param numCachedSimulations
@@ -1962,4 +1972,39 @@ public static String getDefaultPathToR() {
             return "/usr";
         }
     }
+
+    /**
+     * Creates an identifierString to use as primary key when searching for
+     * simulations in cache
+     *
+     * @param parameterList List of parameters to be converted into String
+     * @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 = "";
+        try {
+
+            Collections.sort(parameterList, new Comparator<parameter>() {
+                @Override
+                public int compare(parameter o1, parameter o2) {
+                    return o1.getName().compareTo(o2.getName());
+                }
+            });
+
+            for (int i = 0; i < parameterList.size(); i++) {
+                returnValue += 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));
+
+        } catch (Exception ex) {
+            support.log("Could not create MD5-hash for " + returnValue, typeOfLogLevel.ERROR);
+        }
+        return returnValue;
+    }
 }