Changeset 14474 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

Timestamp:

12/12/16 11:17:07 (7 years ago)

Author:

pfleck

Message:

#2709

• Improved legend description for grouped histogram and scatterplots.
• Fixed initial size of points for scatterplots.
• Added correlation calculation for scatterplots (not used yet).

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs (modified) (1 diff)

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs

@@ -62 +62 @@
       } else {
         dt.VisualProperties.Title = variableName;
-        //var valuesPerClass = row.Values.Zip(Classification, (value, @class) => new { value, @class })
-        //                        .GroupBy(x => x.@class)
-        //                        .ToDictionary(x => x.Key, x => x.Select(v => v.value));
-        var valuesPerClass = row.Values.Select((i, index) => new { i, j = Classification.ToList()[index] })
-                                       .GroupBy((x) => x.j)
-                                       .ToDictionary(x => x.Key, x => x.Select(v => v.i)
-                                       .ToList());
+        var valuesPerClass = row.Values.Zip(Classification, (value, @class) => new { value, @class })
+                                .GroupBy(x => x.@class)
+                                .ToDictionary(x => x.Key, x => x.Select(v => v.value));
         foreach (var entry in valuesPerClass) {
-          var classRow = new DataRow(entry.Key.ToString());
+          var classRow = new DataRow(string.Format("{0} ({1})", classifierComboBox.SelectedItem, entry.Key));
           classRow.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram;
           classRow.Values.AddRange(entry.Value);