Changeset 12586 for branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression

Timestamp:

07/03/15 16:40:34 (9 years ago)

Author:

dglaser

Message:

#2388: Merged trunk into HiveStatistics branch

Location:

branches/HiveStatistics/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs (modified) (2 diffs)

branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

@@ -125 +125 @@
 
       var maxValue = residuals.Max();
-      double scale = Math.Pow(10, Math.Floor(Math.Log10(maxValue)));
-      var maximum = scale * (1 + (int)(maxValue / scale));
-      chart.ChartAreas[0].AxisX.Maximum = maximum;
-      chart.ChartAreas[0].CursorX.Interval = residuals.Min() / 100;
+      if (maxValue >= chart.ChartAreas[0].AxisX.Maximum) {
+        double scale = Math.Pow(10, Math.Floor(Math.Log10(maxValue)));
+        var maximum = scale * (1 + (int)(maxValue / scale));
+        chart.ChartAreas[0].AxisX.Maximum = maximum;
+        chart.ChartAreas[0].CursorX.Interval = residuals.Min() / 100;
+      }
 
       UpdateSeries(residuals, solutionSeries);
@@ -211 +213 @@
           .Where(x => x > 0) // remove entries where the original value is 0
           .ToList();
-      }
-      // should never happen
-      return new List<double>();
+        default: throw new NotSupportedException();
+      }
     }