bugfixes

ChristophBodenstein · Sep 13, 2017 · aa0aadb · aa0aadb
1 parent 4aa666e
commit aa0aadb
Showing 1 changed file with 22 additions and 13 deletions.
diff --git a/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorBenchmark.java b/TimeNETOptimizationEnvironment/src/toe/simulation/SimulatorBenchmark.java
@@ -8,6 +8,7 @@
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Calendar;
+import toe.MeasurementForm;
 import toe.datamodel.parameter;
 import toe.datamodel.SimulationType;
 import toe.datamodel.MeasureType;
@@ -247,6 +248,8 @@ public void operationFeedback(String message, typedef.typeOfProcessFeedback feed
                     ArrayList<SimulationType> foundOptima = new ArrayList<>();
                     foundOptima.add(simulationResults.get(0));
 
+                    MeasureType targetMeasure = support.getOptimizationMeasure();
+
                     for (int i = 1; i < simulationResults.size(); i++) {
                         support.spinInLabel();
                         support.log(String.valueOf(simulationResults.get(i).getDistanceToTargetValue()), typeOfLogLevel.VERBOSE);
@@ -259,6 +262,21 @@ public void operationFeedback(String message, typedef.typeOfProcessFeedback feed
                         }
                     }
 
+                    support.log("Target value(s) found at: ", typeOfLogLevel.RESULT);
+                    for (int i = 0; i < foundOptima.size(); i++) {
+                        support.log("Parameterset: " + i, typeOfLogLevel.RESULT);
+                        for (int c = 0; c < foundOptima.get(i).getListOfParameters().size(); c++) {
+                            if (foundOptima.get(i).getListOfParameters().get(c).isIteratable()) {
+                                foundOptima.get(i).getListOfParameters().get(c).printInfo(typeOfLogLevel.INFO);
+                            }
+                        }
+                    }
+                    support.log("Targetvalue #0 will be used for optimization and statistics.", typeOfLogLevel.RESULT);
+                    calculatedOptimum = foundOptima.get(0);
+                    support.log("Will set targetvalue to: " + calculatedOptimum.getMeasureValueByMeasureName(targetMeasure.getMeasureName()), typeOfLogLevel.RESULT);
+                    MeasurementForm tmpMeasurementForm = (MeasurementForm) support.getMeasureFormPane().getComponent(0);
+                    tmpMeasurementForm.setTargetValue(calculatedOptimum.getMeasureValueByMeasureName(targetMeasure.getMeasureName()));
+
                     if (foundOptima.size() < 1) {
                         //Error checking the target
                         listener.operationFeedback("Opticheck failed.", typedef.typeOfProcessFeedback.TargetCheckFailed);
@@ -268,25 +286,16 @@ public void operationFeedback(String message, typedef.typeOfProcessFeedback feed
                         support.log("The distance to target is: " + oldDistance, typeOfLogLevel.INFO);
                     } else if (foundOptima.size() == 1) {
                         //Exactly one optimum with selected target value was found
-                        if (oldDistance > 0.0) {
+                        if (Math.abs(oldDistance - simulationResults.get(0).getDistanceToTargetValue()) < support.DEFAULT_TARGET_STEPPING) {
                             //distance not zero --> will adapt selected optimum!
-                            listener.operationFeedback("Target is unique, will change target value to match distance of 0.0.", typedef.typeOfProcessFeedback.TargetCheckSuccessful);
-                            support.log("Old distance to target is: " + oldDistance, typeOfLogLevel.INFO);
+                            listener.operationFeedback("Target will be adapted.", typedef.typeOfProcessFeedback.TargetCheckSuccessful);
+                            support.log("Old distance to target was: " + oldDistance, typeOfLogLevel.INFO);
 
                         } else {
                             listener.operationFeedback("Target is unique and distance is 0.0!", typedef.typeOfProcessFeedback.TargetCheckSuccessful);
                         }
                     }
-                    support.log("Target value(s) found at: ", typeOfLogLevel.RESULT);
-                    for (int i = 0; i < foundOptima.size(); i++) {
-                        support.log("Parameterset: " + i, typeOfLogLevel.RESULT);
-                        for (int c = 0; c < foundOptima.get(i).getListOfParameters().size(); c++) {
-                            if (foundOptima.get(i).getListOfParameters().get(c).isIteratable()) {
-                                foundOptima.get(i).getListOfParameters().get(c).printInfo(typeOfLogLevel.INFO);
-                            }
-                        }
-                    }
-                    support.log("Targetvalue #0 will be used for optimization and statistics.", typeOfLogLevel.RESULT);
+
                     calculatedOptimum = foundOptima.get(0);
                     break;
                 case SimulationCanceled: