Changeset 12689 for branches/HiveStatistics/sources/HeuristicLab.Problems.DataAnalysis.Views

Timestamp:

07/08/15 15:32:12 (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/Clustering/ClusteringSolutionVisualizationView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionErrorCharacteristicsCurveView.cs (modified) (1 diff)

branches/HiveStatistics/sources/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) {

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

@@ -102 +102 @@
       chart.Series.Clear();
       chart.Annotations.Clear();
+      chart.ChartAreas[0].AxisX.Maximum = 0.0;
+      chart.ChartAreas[0].CursorX.Interval = 0.01;
 
       if (Content == null) return;