Changeset 12378 for branches/GBT/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

05/04/15 13:08:49 (9 years ago)

Author:

gkronber

Message:

Merged revision(s) 12333-12365 from trunk/sources:
#2373: Corrected typo in RandomBinaryVectorCreator by implementing an after-deserialization-hook.

........
#2359: Refactored pruning operators and analyzers.

........
#2359: Removed commented code from pruning analyzer.

........
#2378: Vertex.cs: Fixed bug in Label setter.
........
#2359: The changes in r12358 look fine to me. Added total number of pruned nodes in the analyzer's data table. Removed unused parameter names in the SymbolicDataAnalysisSingleObjectivePruningAnalyzer.
........
#2345: Fixed x-axis maximum in error characteristics curve.

........

Location:

branches/GBT

Files:

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

branches/GBT/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs

@@ -48 +48 @@
       chart.ChartAreas[0].AxisX.Title = "Absolute Error";
       chart.ChartAreas[0].AxisX.Minimum = 0.0;
-      chart.ChartAreas[0].AxisX.Maximum = 1.0;
+      chart.ChartAreas[0].AxisX.Maximum = 0.0;
       chart.ChartAreas[0].AxisX.IntervalAutoMode = IntervalAutoMode.VariableCount;
       chart.ChartAreas[0].CursorX.Interval = 0.01;
@@ -118 +118 @@
       solutionSeries.ChartType = SeriesChartType.FastLine;
       var residuals = GetResiduals(GetOriginalValues(), GetEstimatedValues(solution));
-      
-      chart.ChartAreas[0].AxisX.Maximum = Math.Ceiling(residuals.Max());
+
+
+      var maxValue = residuals.Max();
+      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;