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

Timestamp:

12/07/16 13:50:21 (7 years ago)

Author:

pfleck

Message:

#2709

• Removed the PreprocessingDataTable and PreprocessingDataTableView and use dhe HL DatatTableControl instead.
• Moved and refactored some code of PreprocessingChart and moved unnecessary code from base classes to actual derivative classes.

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs (modified) (5 diffs)

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

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.MainForm;
@@ -29 +31 @@
   [Content(typeof(HistogramContent), true)]
   public partial class HistogramView : PreprocessingChartView {
-    private const string HISTOGRAM_CHART_TITLE = "Histogram";
+
+    public List<double> Classification { get; set; }
+    public bool IsDetailedChartViewEnabled { get; set; }
 
     public HistogramView() {
       InitializeComponent();
-      chartType = DataRowVisualProperties.DataRowChartType.Histogram;
-      chartTitle = HISTOGRAM_CHART_TITLE;
     }
 
@@ -53 +55 @@
     }
 
+    protected override DataTable CreateDataTable(string variableName) {
+      var dt = new DataTable();
+      var row = Content.CreateDataRow(variableName, DataRowVisualProperties.DataRowChartType.Histogram);
+      if (Classification == null) {
+        dt.Rows.Add(row);
+      } 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());
+        foreach (var entry in valuesPerClass) {
+          var classRow = new DataRow(entry.Key.ToString());
+          classRow.VisualProperties.ChartType = DataRowVisualProperties.DataRowChartType.Histogram;
+          classRow.Values.AddRange(entry.Value);
+          dt.Rows.Add(classRow);
+        }
+      }
+      return dt;
+    }
+
     public new HistogramContent Content {
       get { return (HistogramContent)base.Content; }
@@ -64 +90 @@
       if (classifierComboBox.SelectedIndex != 0) {
         int columndIndex = Content.PreprocessingData.GetColumnIndex(classifierComboBox.SelectedItem.ToString());
-        Classification = Content.PreprocessingData.GetValues<double>(columndIndex);
+        Classification = Content.PreprocessingData.GetValues<double>(columndIndex).ToList();
       } else {
         Classification = null;
@@ -70 +96 @@
 
       Content.ClassifierVariableIndex = classifierComboBox.SelectedIndex;
-      if (Content.IsDetailedChartViewEnabled != IsDetailedChartViewEnabled) {
-        displayDetailsCheckBox.Checked = Content.IsDetailedChartViewEnabled;
-      } else {
-        GenerateChart();
-      }
-    }
-    private void displayDetailsCheckBox_CheckedChanged(object sender, EventArgs e) {
-      bool isChecked = displayDetailsCheckBox.Checked;
-      if (IsDetailedChartViewEnabled != isChecked) {
-        IsDetailedChartViewEnabled = isChecked;
-        Content.IsDetailedChartViewEnabled = isChecked;
-        GenerateChart();
-      }
+
+      // rebuild datatables
+      InitData();
+      GenerateLayout();
     }
   }