bugfx in distance calculation

Author: Christoph Bodenstein

TimeNetExperimentGenerator/src/toe/helper/StatisticAggregator.java

@@ -243,6 +243,9 @@ public static void printOptiStatistics() {
                 support.log(tmpOutValue);
                 support.log(tmpOutDSValue);
             }
+            //Latex-Friendly output
+            support.log("Sim#, Distance, DistancsDS, CPU-Time");
+            support.log("&"+averageNumberOfSimulations+"    &"+averageDistanceToOptimumInValueRange+"\\%  &"+averageDistanceToOptimumInDefinitionRange+"\\% &"+averageCPUTimeTotal);
             support.log("++++ End of Optimization Statistics ++++");
         }
         support.setLogToWindow(logToWindow);//Set Window-logging to original value

TimeNetExperimentGenerator/src/toe/optimization/OptimizerHill.java

@@ -20,7 +20,7 @@
 import toe.simulation.Simulator;
 import toe.support;
 import toe.simulation.SimulationCache;
-import toe.typedef.*;
+import toe.typedef;
 
 /**
  *
@@ -383,7 +383,7 @@ protected ArrayList<parameter> getNextParameterset(ArrayList<parameter> actualPa
                     wrongSolutionPerDirectionCounter = myPreferences.getPref_WrongSimulationsPerDirection();
 
                     support.log(myPreferences.getPref_WrongSimulationsPerDirection() + " wrong solutions in one direction.");
-                    if (this.directionOfOptimization && myPreferences.getPref_NeighborhoodType() == typeOfNeighborhoodEnum.StepForwardBackward) {
+                    if (this.directionOfOptimization && myPreferences.getPref_NeighborhoodType() == typedef.typeOfNeighborhoodEnum.StepForwardBackRandom) {
                         //Switch direction of Optimization but change the same old parameter
                         //This only applies if StepForwardBackward
 
@@ -560,13 +560,13 @@ protected double getActualDistance(SimulationType p) {
             MeasureType activeMeasure = p.getMeasureByName(listOfMeasures.get(measureCount).getMeasureName());
             MeasureType activeMeasureFromInterface = listOfMeasures.get(measureCount);//Contains Optimization targets
             activeMeasure.setTargetValue(activeMeasureFromInterface.getTargetValue(), activeMeasureFromInterface.getTargetTypeOf());
-            if (activeMeasure.getTargetTypeOf().equals("value")) {
+            if (activeMeasure.getTargetTypeOf().equals(typedef.typeOfTarget.value)) {
                 distance = activeMeasure.getDistanceFromTarget();
             } else {
-                if (activeMeasure.getTargetTypeOf().equals("min")) {
+                if (activeMeasure.getTargetTypeOf().equals(typedef.typeOfTarget.min)) {
                     distance = activeMeasure.getMeanValue();
                 } else {
-                    if (activeMeasure.getTargetTypeOf().equals("max")) {
+                    if (activeMeasure.getTargetTypeOf().equals(typedef.typeOfTarget.max)) {
                         distance = 0 - activeMeasure.getMeanValue();
                     }
                 }

TimeNetExperimentGenerator/src/toe/support.java

@@ -1202,13 +1202,13 @@ public static void printOptimizedMeasures(SimulationType p, ArrayList<MeasureTyp
             MeasureType activeMeasure = p.getMeasureByName(measureList.get(measureCount).getMeasureName());
             MeasureType activeMeasureFromInterface = measureList.get(measureCount);//Contains Optimization targets
             activeMeasure.setTargetValue(activeMeasureFromInterface.getTargetValue(), activeMeasureFromInterface.getTargetTypeOf());
-            if (activeMeasure.getTargetTypeOf().equals("value")) {
+            if (activeMeasure.getTargetTypeOf().equals(typedef.typeOfTarget.value)) {
                 distance = activeMeasure.getDistanceFromTarget();
             } else {
-                if (activeMeasure.getTargetTypeOf().equals("min")) {
+                if (activeMeasure.getTargetTypeOf().equals(typedef.typeOfTarget.min)) {
                     distance = activeMeasure.getMeanValue();
                 } else {
-                    if (activeMeasure.getTargetTypeOf().equals("max")) {
+                    if (activeMeasure.getTargetTypeOf().equals(typedef.typeOfTarget.max)) {
                         distance = 0 - activeMeasure.getMeanValue();
                     }
                 }