Bugfix/#404 progress negative (#405)

* checks if result is NaN --> returns zero Fixes #402 * Adding () for non-negative values Fixes #404
jotoh98 · Apr 16, 2020 · 0fe4d35 · 0fe4d35
1 parent 52ebf08
commit 0fe4d35
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/main/java/com/treasure/hunt/analysis/Statistic.java b/src/main/java/com/treasure/hunt/analysis/Statistic.java
@@ -77,7 +77,11 @@ public double getGlobalOptimalSolution() {
      * @return solution quotient
      */
     public double getSolutionQuotient() {
-        return getLocalOptimalSolution() / getGlobalOptimalSolution();
+        double value = getLocalOptimalSolution() / getGlobalOptimalSolution();
+        if (Double.isNaN(value)) {
+            return 0;
+        }
+        return value;
     }
 
     /**

diff --git a/src/main/java/com/treasure/hunt/view/plot/PlotController.java b/src/main/java/com/treasure/hunt/view/plot/PlotController.java
@@ -49,7 +49,7 @@ public List<Pair<Double, Double>> computeMultipleSeries(PlotSettingsController.S
             List<Number> statisticValues = Statistic.filterBy(currentStatistics.getStatisticsWithIds(), settings.getStatisticInfo());
             computedValues.add(new Pair<>(currentStatisticValue, settings.getType().getAggregation().apply(statisticValues).doubleValue()));
             int finalStep = step;
-            Platform.runLater(() -> coinProgress.setProgress(finalStep / settings.getUpperBoundValue() - settings.getLowerBoundValue()));
+            Platform.runLater(() -> coinProgress.setProgress(finalStep / (settings.getUpperBoundValue() - settings.getLowerBoundValue())));
         }
         Platform.runLater(() -> coinProgress.setVisible(false));