Changeset 14525 for branches/DataPreprocessing Enhancements

Timestamp:

12/22/16 16:36:59 (8 years ago)

Author:

pfleck

Message:

#2709

• Added suggestion feature for singlescatterplotview.
• Shows NaN groups in scatterplot (black if gradient is selected).
• Only enables input variables in DataGridContentView per default.
• Added missing resx file (gradient image).

Location:

branches/DataPreprocessing Enhancements

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/DataGridContentView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.Designer.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.cs (modified) (5 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.resx (added)
• HeuristicLab.DataPreprocessing/3.4/Content/ScatterPlotContent.cs (modified) (1 diff)

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

@@ -70 +70 @@
       List<KeyValuePair<int, SortOrder>> order = new List<KeyValuePair<int, SortOrder>>(base.sortedColumnIndices);
       base.OnContentChanged();
+
+      foreach (DataGridViewColumn column in DataGridView.Columns) {
+        var variable = column.HeaderText;
+        bool isInputTarget = Content.PreProcessingData.InputVariables.Contains(variable)
+          || Content.PreProcessingData.TargetVariable == variable;
+        column.Visible = isInputTarget;
+      }
 
       DataGridView.RowHeadersWidth = 70;

branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ScatterPlotSingleView.Designer.cs

@@ -62 +62 @@
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.gradientPanel = new System.Windows.Forms.Panel();
+      this.gradientPictureBox = new System.Windows.Forms.PictureBox();
       this.gradientMinimumLabel = new System.Windows.Forms.Label();
       this.gradientMaximumLabel = new System.Windows.Forms.Label();
-      this.gradientPictureBox = new System.Windows.Forms.PictureBox();
       this.groupBox1.SuspendLayout();
       this.regressionGroupBox.SuspendLayout();
@@ -146 +146 @@
       this.comboBoxGroup.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.comboBoxGroup.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.comboBoxGroup.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+      this.comboBoxGroup.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
       this.comboBoxGroup.FormattingEnabled = true;
       this.comboBoxGroup.Location = new System.Drawing.Point(51, 94);
@@ -159 +160 @@
       this.comboBoxYVariable.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.comboBoxYVariable.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.comboBoxYVariable.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+      this.comboBoxYVariable.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
       this.comboBoxYVariable.FormattingEnabled = true;
       this.comboBoxYVariable.Location = new System.Drawing.Point(51, 60);
@@ -172 +174 @@
       this.comboBoxXVariable.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.comboBoxXVariable.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+      this.comboBoxXVariable.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.Suggest;
+      this.comboBoxXVariable.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.ListItems;
       this.comboBoxXVariable.FormattingEnabled = true;
       this.comboBoxXVariable.Location = new System.Drawing.Point(51, 26);
@@ -282 +285 @@
       this.gradientPanel.TabIndex = 1;
       // 
+      // gradientPictureBox
+      // 
+      this.gradientPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)));
+      this.gradientPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+      this.gradientPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("gradientPictureBox.Image")));
+      this.gradientPictureBox.Location = new System.Drawing.Point(17, 29);
+      this.gradientPictureBox.Name = "gradientPictureBox";
+      this.gradientPictureBox.Size = new System.Drawing.Size(35, 460);
+      this.gradientPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+      this.gradientPictureBox.TabIndex = 19;
+      this.gradientPictureBox.TabStop = false;
+      // 
       // gradientMinimumLabel
       // 
@@ -303 +319 @@
       this.gradientMaximumLabel.Text = "1.0";
       this.gradientMaximumLabel.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-      // 
-      // gradientPictureBox
-      // 
-      this.gradientPictureBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)));
-      this.gradientPictureBox.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-      this.gradientPictureBox.Image = ((System.Drawing.Image)(resources.GetObject("GradientPictureBox.Image")));
-      this.gradientPictureBox.Location = new System.Drawing.Point(17, 29);
-      this.gradientPictureBox.Name = "gradientPictureBox";
-      this.gradientPictureBox.Size = new System.Drawing.Size(35, 460);
-      this.gradientPictureBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-      this.gradientPictureBox.TabIndex = 19;
-      this.gradientPictureBox.TabStop = false;
       // 
       // ScatterPlotSingleView

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

@@ -103 +103 @@
         var groupVariable = (string)comboBoxGroup.SelectedItem;
 
-        bool groupingActive = useGradientCheckBox.Checked && groupVariable != NoGroupItem;
+        bool isGroupingActive = groupVariable != NoGroupItem;
         double min = 0, max = 1;
-        if (groupingActive) {
+        if (isGroupingActive) {
           var groupValues = Content.PreprocessingData.GetValues<double>(Content.PreprocessingData.GetColumnIndex(groupVariable))
             .Distinct().OrderBy(x => x).ToList();
-          min = groupValues.First();
-          max = groupValues.Last();
+          min = groupValues.FirstOrDefault(x => !double.IsNaN(x));
+          max = groupValues.LastOrDefault(x => !double.IsNaN(x));
         }
         ScatterPlot scatterPlot = Content.CreateScatterPlot(xVariable, yVariable, groupVariable);
@@ -122 +122 @@
           row.VisualProperties.PolynomialRegressionOrder = order;
           row.VisualProperties.IsVisibleInLegend = !useGradientCheckBox.Checked;
-          if (groupingActive)
+          if (isGroupingActive && useGradientCheckBox.Checked)
             row.VisualProperties.Color = GetColor(double.Parse(row.Name), min, max);
         }
@@ -133 +133 @@
         scatterPlotControl.Content = scatterPlot;
 
-        if (groupingActive) {
+        if (isGroupingActive) {
           gradientMinimumLabel.Text = min.ToString("G5");
           gradientMaximumLabel.Text = max.ToString("G5");
@@ -228 +228 @@
         var groupValues = Content.PreprocessingData.GetValues<double>(Content.PreprocessingData.GetColumnIndex(groupVariable))
           .Distinct().OrderBy(x => x).ToList();
-        double min = groupValues.First(), max = groupValues.Last();
+        double min = groupValues.FirstOrDefault(x => !double.IsNaN(x)), max = groupValues.LastOrDefault(x => !double.IsNaN(x));
         foreach (var group in groupValues) {
           ScatterPlotDataRow row;
@@ -249 +249 @@
     private static Color GetColor(double value, double min, double max) {
       if (double.IsNaN(value)) {
-        return Color.DarkGray;
+        return Color.Black;
       }
       var colors = ColorGradient.Colors;

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

@@ -73 +73 @@
         var groupValues = PreprocessingData.GetValues<double>(PreprocessingData.GetColumnIndex(variableNameGroup));
         var data = points.Zip(groupValues, (p, g) => new { p, g })
-          .Where(x => !double.IsNaN(x.p.X) && !double.IsNaN(x.p.Y) && !double.IsNaN(x.g) && !double.IsInfinity(x.p.X) && !double.IsInfinity(x.p.Y) && !double.IsInfinity(x.g))
+          .Where(x => !double.IsNaN(x.p.X) && !double.IsNaN(x.p.Y) && !double.IsInfinity(x.p.X) && !double.IsInfinity(x.p.Y))
           .ToList();
 
         foreach (var groupValue in groupValues.Distinct().OrderBy(g => g)) {
-          var values = data.Where(x => x.g == groupValue).Select(v => v.p);
+          var values = data.Where(x => x.g == groupValue || (double.IsNaN(x.g) && double.IsNaN(groupValue))).Select(v => v.p);
           var row = new ScatterPlotDataRow(string.Format("{0} ({1})", variableNameGroup, groupValue), "", values) {
             Name = groupValue.ToString("R"),