Changeset 8689 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation

Timestamp:

09/24/12 18:48:16 (12 years ago)

Author:

sforsten

Message:

#1292:

• NaN values are used, if the calculation is invalid (e.g. missing values, infinity etc.)
• Variables can now be filtered. Initially allowed input variables and target variable are shown, but with a right click a dialog can be opened to select variables, which shall be shown

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation

Files:

• AbstractFeatureCorrelationView.Designer.cs (modified) (7 diffs)
• AbstractFeatureCorrelationView.cs (modified) (8 diffs)
• AbstractFeatureCorrelationView.resx (modified) (1 diff)
• FeatureCorrelationView.cs (modified) (1 diff)
• TimeframeFeatureCorrelationView.cs (modified) (1 diff)
• VariableVisibilityDialog.Designer.cs (added)
• VariableVisibilityDialog.cs (added)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.Designer.cs

@@ -46 +46 @@
     /// </summary>
     private void InitializeComponent() {
+      this.components = new System.ComponentModel.Container();
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AbstractFeatureCorrelationView));
       this.DataGridView = new System.Windows.Forms.DataGridView();
@@ -59 +60 @@
       this.CalculatingPanel = new System.Windows.Forms.Panel();
       this.CalculatingLabel = new System.Windows.Forms.Label();
+      this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
+      this.ShowHideColumns = new System.Windows.Forms.ToolStripMenuItem();
       ((System.ComponentModel.ISupportInitialize)(this.DataGridView)).BeginInit();
       ((System.ComponentModel.ISupportInitialize)(this.PictureBox)).BeginInit();
@@ -66 +69 @@
       this.SplitContainer.SuspendLayout();
       this.CalculatingPanel.SuspendLayout();
+      this.contextMenu.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -84 +88 @@
       this.DataGridView.ColumnHeaderMouseClick += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.DataGridView_ColumnHeaderMouseClick);
       this.DataGridView.KeyDown += new System.Windows.Forms.KeyEventHandler(this.DataGridView_KeyDown);
+      this.DataGridView.MouseClick += new System.Windows.Forms.MouseEventHandler(this.DataGridView_MouseClick);
       // 
       // HeatMapProgressBar
@@ -211 +216 @@
       this.CalculatingLabel.TabIndex = 10;
       this.CalculatingLabel.Text = "Calculating correlation...";
+      // 
+      // contextMenu
+      // 
+      this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.ShowHideColumns});
+      this.contextMenu.Name = "contextMenu";
+      this.contextMenu.Size = new System.Drawing.Size(191, 26);
+      // 
+      // ShowHideColumns
+      // 
+      this.ShowHideColumns.Name = "ShowHideColumns";
+      this.ShowHideColumns.Size = new System.Drawing.Size(190, 22);
+      this.ShowHideColumns.Text = "Show / Hide Columns";
+      this.ShowHideColumns.Click += new System.EventHandler(this.ShowHideColumns_Click);
       // 
       // AbstractFeatureCorrelationView
@@ -231 +250 @@
       this.CalculatingPanel.ResumeLayout(false);
       this.CalculatingPanel.PerformLayout();
+      this.contextMenu.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -249 +269 @@
     protected System.Windows.Forms.Panel CalculatingPanel;
     protected System.Windows.Forms.Label CalculatingLabel;
+    protected System.Windows.Forms.ContextMenuStrip contextMenu;
+    protected System.Windows.Forms.ToolStripMenuItem ShowHideColumns;
 
   }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.cs

@@ -30 +30 @@
 using HeuristicLab.Common;
 using HeuristicLab.Data.Views;
+using HeuristicLab.DataAnalysis.Views;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -40 +41 @@
 
     private int[] virtualRowIndices;
+    private VariableVisibilityDialog variableVisibility;
     private List<KeyValuePair<int, SortOrder>> sortedColumnIndices;
     private StringConvertibleMatrixView.RowComparer rowComparer;
@@ -82 +84 @@
       if (Content != null) {
         fcc.ProblemData = Content;
+        bool[] initialVisibility = SetInitialVisibilityOfColumns();
+
+        variableVisibility = new VariableVisibilityDialog(Content.Dataset.DoubleVariables, initialVisibility);
+        variableVisibility.VariableVisibilityChanged += new ItemCheckEventHandler(variableVisibility_VariableVisibilityChanged);
         CalculateCorrelation();
       } else {
@@ -88 +94 @@
       }
     }
+
+    protected virtual bool[] SetInitialVisibilityOfColumns() {
+      bool[] initialVisibility = new bool[Content.Dataset.DoubleVariables.Count()];
+      int i = 0;
+      foreach (var variable in Content.Dataset.DoubleVariables) {
+        initialVisibility[i] = Content.AllowedInputVariables.Contains(variable);
+        i++;
+      }
+      return initialVisibility;
+    }
+
+    protected abstract void variableVisibility_VariableVisibilityChanged(object sender, ItemCheckEventArgs e);
 
     protected void CorrelationMeasureComboBox_SelectedChangeCommitted(object sender, System.EventArgs e) {
@@ -127 +145 @@
       for (int i = 0; i < DataGridView.ColumnCount; i++) {
         DataGridView.Columns[i].HeaderText = currentCorrelation.ColumnNames.ElementAt(i);
+        DataGridView.Columns[i].Visible = variableVisibility.Visibility[i];
       }
     }
@@ -132 +151 @@
       for (int i = 0; i < DataGridView.RowCount; i++) {
         DataGridView.Rows[i].HeaderCell.Value = currentCorrelation.RowNames.ElementAt(virtualRowIndices[i]);
+        DataGridView.Rows[i].Visible = variableVisibility.Visibility[virtualRowIndices[i]];
       }
     }
@@ -169 +189 @@
 
     protected virtual Color GetDataPointColor(double value, double min, double max) {
+      if (double.IsNaN(value)) {
+        return Color.DarkGray;
+      }
       IList<Color> colors = ColorGradient.Colors;
       int index = (int)((colors.Count - 1) * (value - min) / (max - min));
@@ -301 +324 @@
     }
     #endregion
+
+    protected void ShowHideColumns_Click(object sender, EventArgs e) {
+      variableVisibility.ShowDialog();
+    }
+
+    protected void DataGridView_MouseClick(object sender, MouseEventArgs e) {
+      if (Content == null) return;
+      if (e.Button == MouseButtons.Right && DataGridView.Columns.Count != 0)
+        contextMenu.Show(MousePosition);
+    }
+
+    protected int GetRowIndexOfVirtualindex(int virtualIndex) {
+      if (virtualIndex < 0 || virtualIndex >= virtualRowIndices.Length) {
+        throw new ArgumentException("Virtual index is out of bounds");
+      }
+
+      for (int i = 0; i < virtualRowIndices.Length; i++) {
+        if (virtualRowIndices[i] == virtualIndex) {
+          return i;
+        }
+      }
+      throw new ArgumentException("Virtual index was not found!");
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/AbstractFeatureCorrelationView.resx

@@ -1020 +1020 @@
 </value>
   </data>
+  <metadata name="contextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/FeatureCorrelationView.cs

@@ -78 +78 @@
       }
     }
+
+    protected override void variableVisibility_VariableVisibilityChanged(object sender, ItemCheckEventArgs e) {
+      DataGridView.Columns[e.Index].Visible = e.NewValue == CheckState.Checked;
+      DataGridView.Rows[GetRowIndexOfVirtualindex(e.Index)].Visible = e.NewValue == CheckState.Checked;
+    }
   }
 }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/FeatureCorrelation/TimeframeFeatureCorrelationView.cs

@@ -107 +107 @@
       }
     }
+
+    protected override void variableVisibility_VariableVisibilityChanged(object sender, ItemCheckEventArgs e) {
+      DataGridView.Rows[GetRowIndexOfVirtualindex(e.Index)].Visible = e.NewValue == CheckState.Checked;
+    }
   }
 }