Changeset 12736

Timestamp:

07/11/15 19:36:04 (9 years ago)

Author:

abeham

Message:

#2274: merged 12614,12670,12679 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Analysis.Views (modified) (1 prop)
• HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs (modified) (13 diffs)
• HeuristicLab.Problems.DataAnalysis.Views (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionVisualizationView.cs (modified) (2 diffs)

stable/HeuristicLab.Analysis.Views/3.3/ScatterPlotView.cs

@@ -37 +37 @@
     protected List<Series> invisibleSeries;
     protected Dictionary<IObservableList<Point2D<double>>, ScatterPlotDataRow> pointsRowsTable;
+    private double xMin, xMax, yMin, yMax;
 
     public new ScatterPlot Content {
@@ -102 +103 @@
         AddScatterPlotDataRows(Content.Rows);
         ConfigureChartArea(chart.ChartAreas[0]);
+        RecalculateMinMaxPointValues();
         RecalculateAxesScale(chart.ChartAreas[0]);
       }
@@ -130 +132 @@
       }
       ConfigureChartArea(chart.ChartAreas[0]);
+      RecalculateMinMaxPointValues();
       RecalculateAxesScale(chart.ChartAreas[0]);
       UpdateYCursorInterval();
@@ -142 +145 @@
           invisibleSeries.Remove(series);
       }
+      RecalculateMinMaxPointValues();
       RecalculateAxesScale(chart.ChartAreas[0]);
     }
@@ -192 +196 @@
 
     private void RecalculateAxesScale(ChartArea area) {
-      // Reset the axes bounds so that RecalculateAxesScale() will assign new bounds
-      foreach (Axis a in area.Axes) {
-        a.Minimum = double.NaN;
-        a.Maximum = double.NaN;
-      }
-      area.RecalculateAxesScale();
+      area.AxisX.Minimum = CalculateMinBound(xMin);
+      area.AxisX.Maximum = CalculateMaxBound(xMax);
+      if (area.AxisX.Minimum == area.AxisX.Maximum) {
+        area.AxisX.Minimum = xMin - 0.5;
+        area.AxisX.Maximum = xMax + 0.5;
+      }
+      area.AxisY.Minimum = CalculateMinBound(yMin);
+      area.AxisY.Maximum = CalculateMaxBound(yMax);
+      if (area.AxisY.Minimum == area.AxisY.Maximum) {
+        area.AxisY.Minimum = yMin - 0.5;
+        area.AxisY.Maximum = yMax + 0.5;
+      }
+      if (xMax - xMin > 0) area.CursorX.Interval = Math.Pow(10, Math.Floor(Math.Log10(area.AxisX.Maximum - area.AxisX.Minimum) - 3));
+      else area.CursorX.Interval = 1;
       area.AxisX.IsMarginVisible = false;
 
@@ -204 +216 @@
       if (!Content.VisualProperties.YAxisMinimumAuto && !double.IsNaN(Content.VisualProperties.YAxisMinimumFixedValue)) area.AxisY.Minimum = Content.VisualProperties.YAxisMinimumFixedValue;
       if (!Content.VisualProperties.YAxisMaximumAuto && !double.IsNaN(Content.VisualProperties.YAxisMaximumFixedValue)) area.AxisY.Maximum = Content.VisualProperties.YAxisMaximumFixedValue;
-      if (area.AxisX.Minimum >= area.AxisX.Maximum) area.AxisX.Maximum = area.AxisX.Minimum + 1;
-      if (area.AxisY.Minimum >= area.AxisY.Maximum) area.AxisY.Maximum = area.AxisY.Minimum + 1;
+    }
+
+    private static double CalculateMinBound(double min) {
+      if (min == 0) return 0;
+      var scale = Math.Pow(10, Math.Floor(Math.Log10(Math.Abs(min))));
+      return scale * (Math.Floor(min / scale));
+    }
+
+    private static double CalculateMaxBound(double max) {
+      if (max == 0) return 0;
+      var scale = Math.Pow(10, Math.Floor(Math.Log10(Math.Abs(max))));
+      return scale * (Math.Ceiling(max / scale));
     }
 
@@ -286 +308 @@
         ConfigureSeries(series, row);
         FillSeriesWithRowValues(series, row);
+        RecalculateMinMaxPointValues();
         RecalculateAxesScale(chart.ChartAreas[0]);
       }
@@ -310 +333 @@
             rowSeries.Points.Clear();
             FillSeriesWithRowValues(rowSeries, row);
+            RecalculateMinMaxPointValues();
             RecalculateAxesScale(chart.ChartAreas[0]);
             UpdateYCursorInterval();
@@ -327 +351 @@
             rowSeries.Points.Clear();
             FillSeriesWithRowValues(rowSeries, row);
+            RecalculateMinMaxPointValues();
             RecalculateAxesScale(chart.ChartAreas[0]);
             UpdateYCursorInterval();
@@ -344 +369 @@
             rowSeries.Points.Clear();
             FillSeriesWithRowValues(rowSeries, row);
+            RecalculateMinMaxPointValues();
             RecalculateAxesScale(chart.ChartAreas[0]);
             UpdateYCursorInterval();
@@ -361 +387 @@
             rowSeries.Points.Clear();
             FillSeriesWithRowValues(rowSeries, row);
+            RecalculateMinMaxPointValues();
             RecalculateAxesScale(chart.ChartAreas[0]);
             UpdateYCursorInterval();
@@ -401 +428 @@
         series.Points.Clear();
         invisibleSeries.Add(series);
+        RecalculateMinMaxPointValues();
       } else {
         invisibleSeries.Remove(series);
@@ -409 +437 @@
                      select r).Single();
           FillSeriesWithRowValues(series, row);
+          RecalculateMinMaxPointValues();
           this.chart.Legends[series.Legend].ForeColor = Color.Black;
           RecalculateAxesScale(chart.ChartAreas[0]);
           UpdateYCursorInterval();
+        }
+      }
+    }
+
+    private void RecalculateMinMaxPointValues() {
+      yMin = xMin = double.MaxValue;
+      yMax = xMax = double.MinValue;
+      foreach (var s in chart.Series.Where(x => x.Enabled)) {
+        foreach (var p in s.Points) {
+          double x = p.XValue, y = p.YValues[0];
+          if (xMin > x) xMin = x;
+          if (xMax < x) xMax = x;
+          if (yMin > y) yMin = y;
+          if (yMax < y) yMax = y;
         }
       }

stable/HeuristicLab.Problems.DataAnalysis.Views/3.4/Clustering/ClusteringSolutionVisualizationView.cs

@@ -81 +81 @@
 
       int idx = 0;
+      var oneDim = reduced.GetLength(1) == 1;
       foreach (var r in range) {
-        rows[classes[r].Item2].Points.Add(new Point2D<double>(reduced[idx, 0], reduced[idx, 1]));
+        Point2D<double> point;
+        point = oneDim ? new Point2D<double>(reduced[idx, 0], 0.0) : new Point2D<double>(reduced[idx, 0], reduced[idx, 1]);
+        rows[classes[r].Item2].Points.Add(point);
         idx++;
       }
@@ -106 +109 @@
       alglib.pcabuildbasis(data, instances.Length, attributes.Length, out info, out variances, out matrix);
 
-      var result = new double[instances.Length, 2];
+      var result = new double[instances.Length, matrix.GetLength(1)];
       int r = 0;
       foreach (var inst in instances) {