Changeset 14581

Timestamp:

01/18/17 11:25:43 (7 years ago)

Author:

mkommend

Message:

#2709: Refactored get variables for grouping (extracted method to another class).

Location:

branches/DataPreprocessing Enhancements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/HistogramView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/PreprocessingChartView.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs (modified) (4 diffs)

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

@@ -44 +44 @@
 
       if (Content != null) {
-        foreach (string var in Content.GetVariableNamesForGrouping()) {
+        foreach (string var in GetVariableNamesForGrouping(Content.PreprocessingData)) {
           classifierComboBox.Items.Add(var);
         }

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

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -35 +36 @@
   [Content(typeof(PreprocessingChartContent), false)]
   public partial class PreprocessingChartView : PreprocessingCheckedVariablesView {
-
+    private const int MAX_DISTINCT_VALUES_FOR_GROUPING = 20;
     protected Dictionary<string, DataTable> dataTables;
     protected Dictionary<string, DataTableControl> dataTableControls;
@@ -54 +55 @@
       InitializeComponent();
       dataTables = new Dictionary<string, DataTable>();
-      dataTableControls= new Dictionary<string, DataTableControl>();
+      dataTableControls = new Dictionary<string, DataTableControl>();
     }
 
@@ -63 +64 @@
         GenerateLayout();
       }
+    }
+
+    protected static IEnumerable<string> GetVariableNamesForGrouping(IPreprocessingData preprocessingData) {
+      var variableNames = new List<string>();
+
+      for (int i = 0; i < preprocessingData.Columns; ++i) {
+        int distinctValues = Int32.MaxValue;
+        if (preprocessingData.VariableHasType<double>(i))
+          distinctValues = preprocessingData.GetValues<double>(i).GroupBy(x => x).Count();
+        else if (preprocessingData.VariableHasType<string>(i))
+          distinctValues = preprocessingData.GetValues<string>(i).GroupBy(x => x).Count();
+        else if (preprocessingData.VariableHasType<DateTime>(i))
+          distinctValues = preprocessingData.GetValues<DateTime>(i).GroupBy(x => x).Count();
+
+        if (distinctValues <= MAX_DISTINCT_VALUES_FOR_GROUPING)
+          variableNames.Add(preprocessingData.GetVariableName(i));
+      }
+      return variableNames;
     }
 

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/HistogramContent.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -30 +27 @@
   [Item("Histogram", "Represents the histogram grid.")]
   public class HistogramContent : PreprocessingChartContent {
-
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Statistics; }
     }
-
-    private const int MAX_DISTINCT_VALUES_FOR_GROUPING = 20;
 
     public string GroupingVariableName { get; set; }
@@ -55 +49 @@
     }
 
-    public IEnumerable<string> GetVariableNamesForGrouping() {
-      var variableNames = new List<string>();
 
-      for (int i = 0; i < PreprocessingData.Columns; ++i) {
-        int distinctValues = int.MaxValue;
-        if (PreprocessingData.VariableHasType<double>(i))
-          distinctValues = PreprocessingData.GetValues<double>(i).GroupBy(x => x).Count();
-        else if (PreprocessingData.VariableHasType<string>(i))
-          distinctValues = PreprocessingData.GetValues<string>(i).GroupBy(x => x).Count();
-        else if (PreprocessingData.VariableHasType<DateTime>(i))
-          distinctValues = PreprocessingData.GetValues<DateTime>(i).GroupBy(x => x).Count();
-
-        if (distinctValues <= MAX_DISTINCT_VALUES_FOR_GROUPING)
-          variableNames.Add(PreprocessingData.GetVariableName(i));
-      }
-      return variableNames;
-    }
   }
 }

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing/3.4/Content/PreprocessingChartContent.cs

@@ -20 +20 @@
 #endregion
 
+using System;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
@@ -31 +34 @@
   public class PreprocessingChartContent : Item, IViewShortcut {
     public static new Image StaticItemImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.PieChart; }
+      get { return VSImageLibrary.PieChart; }
     }
 
@@ -38 +41 @@
       get {
         if (variableItemList == null)
-          variableItemList = CreateVariableItemList();
+          variableItemList = CreateVariableItemList(PreprocessingData);
         return this.variableItemList;
       }
-      //set { this.variableItemList = value; }
     }
 
     public IFilteredPreprocessingData PreprocessingData { get; private set; }
+    public event DataPreprocessingChangedEventHandler Changed {
+      add { PreprocessingData.Changed += value; }
+      remove { PreprocessingData.Changed -= value; }
+    }
 
     public PreprocessingChartContent(IFilteredPreprocessingData preprocessingData) {
@@ -66 +72 @@
     }
 
-
-
-
-    public ICheckedItemList<StringValue> CreateVariableItemList() {
+    private static ICheckedItemList<StringValue> CreateVariableItemList(IPreprocessingData preprocessingData) {
       ICheckedItemList<StringValue> itemList = new CheckedItemList<StringValue>();
-      foreach (string name in PreprocessingData.GetDoubleVariableNames()) {
+      foreach (string name in preprocessingData.GetDoubleVariableNames()) {
         var n = new StringValue(name);
-        bool isInputTarget = PreprocessingData.InputVariables.Contains(name) || PreprocessingData.TargetVariable == name;
+        bool isInputTarget = preprocessingData.InputVariables.Contains(name) || preprocessingData.TargetVariable == name;
         itemList.Add(n, isInputTarget);
       }
       return new ReadOnlyCheckedItemList<StringValue>(itemList);
     }
-
-    public event DataPreprocessingChangedEventHandler Changed {
-      add { PreprocessingData.Changed += value; }
-      remove { PreprocessingData.Changed -= value; }
-    }
-
   }
 }