Changeset 10812 for branches/DataPreprocessing

Timestamp:

05/07/14 13:20:12 (10 years ago)

Author:

rstoll

Message:

• Disabled menu such as average in selection and co. if selected cells are only of string columns
• GetVariance -> using GetValuesWithoutNaN as well

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.Designer.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsLogic.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.Designer.cs

@@ -54 +54 @@
       this.mostCommonToolStripMenuItem_Column = new System.Windows.Forms.ToolStripMenuItem();
       this.interpolationToolStripMenuItem_Column = new System.Windows.Forms.ToolStripMenuItem();
-      this.smoothingToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.smoothingToolStripMenuItem_Column = new System.Windows.Forms.ToolStripMenuItem();
       this.replaceValueOverSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.averageToolStripMenuItem_Selection = new System.Windows.Forms.ToolStripMenuItem();
@@ -114 +114 @@
             this.mostCommonToolStripMenuItem_Column,
             this.interpolationToolStripMenuItem_Column,
-            this.smoothingToolStripMenuItem});
+            this.smoothingToolStripMenuItem_Column});
       this.replaceValueOverColumnToolStripMenuItem.Name = "replaceValueOverColumnToolStripMenuItem";
       this.replaceValueOverColumnToolStripMenuItem.Size = new System.Drawing.Size(224, 22);
@@ -156 +156 @@
       // smoothingToolStripMenuItem
       // 
-      this.smoothingToolStripMenuItem.Name = "smoothingToolStripMenuItem";
-      this.smoothingToolStripMenuItem.Size = new System.Drawing.Size(155, 22);
-      this.smoothingToolStripMenuItem.Text = "Smoothing";
-      this.smoothingToolStripMenuItem.Click += new System.EventHandler(this.ReplaceWithSmoothing_Selection_Click);
+      this.smoothingToolStripMenuItem_Column.Name = "smoothingToolStripMenuItem";
+      this.smoothingToolStripMenuItem_Column.Size = new System.Drawing.Size(155, 22);
+      this.smoothingToolStripMenuItem_Column.Text = "Smoothing";
+      this.smoothingToolStripMenuItem_Column.Click += new System.EventHandler(this.ReplaceWithSmoothing_Selection_Click);
       // 
       // replaceValueOverSelectionToolStripMenuItem
@@ -264 +264 @@
     private System.Windows.Forms.Button btnReplace;
     private System.Windows.Forms.ToolTip toolTip;
-    private System.Windows.Forms.ToolStripMenuItem smoothingToolStripMenuItem;
+    private System.Windows.Forms.ToolStripMenuItem smoothingToolStripMenuItem_Column;
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/DataGridContentView.cs

@@ -294 +294 @@
             dataGridView[e.ColumnIndex, e.RowIndex].Selected = true;
           }
-          interpolationToolStripMenuItem_Column.Enabled = !(e.RowIndex == 0 || e.RowIndex == Content.Rows);
+
           var columnIndices = new HashSet<int>();
           for (int i = 0; i < dataGridView.SelectedCells.Count; i++) {
             columnIndices.Add(dataGridView.SelectedCells[i].ColumnIndex);
           }
-          averageToolStripMenuItem_Column.Enabled = medianToolStripMenuItem_Column.Enabled = randomToolStripMenuItem_Column.Enabled = !Content.DataGridLogic.AreAllStringColumns(columnIndices);
-          interpolationToolStripMenuItem_Column.Enabled = interpolationToolStripMenuItem_Column.Enabled && !Content.DataGridLogic.AreAllStringColumns(columnIndices);
+          averageToolStripMenuItem_Column.Enabled =
+            averageToolStripMenuItem_Selection.Enabled =
+            medianToolStripMenuItem_Column.Enabled =
+            medianToolStripMenuItem_Selection.Enabled =
+            randomToolStripMenuItem_Column.Enabled =
+            randomToolStripMenuItem_Selection.Enabled = !Content.DataGridLogic.AreAllStringColumns(columnIndices);
+
+          smoothingToolStripMenuItem_Column.Enabled =
+            interpolationToolStripMenuItem_Column.Enabled = !(e.RowIndex == 0 || e.RowIndex == Content.Rows)
+            && !Content.DataGridLogic.AreAllStringColumns(columnIndices);
+
           replaceValueOverColumnToolStripMenuItem.Visible = true;
           contextMenuCell.Show(MousePosition);
@@ -388 +397 @@
 
     private void ReplaceWithAverage_Column_Click(object sender, EventArgs e) {
-      Content.ManipulationLogic.ReplaceIndicesByAverageValue(GetSelectedCells(),false);
+      Content.ManipulationLogic.ReplaceIndicesByAverageValue(GetSelectedCells(), false);
     }
     private void ReplaceWithAverage_Selection_Click(object sender, EventArgs e) {

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/StatisticsLogic.cs

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Common;
-using System.Collections;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -139 +138 @@
       double variance = double.NaN;
       if (preprocessingData.IsType<double>(columnIndex)) {
-        variance = preprocessingData.GetValues<double>(columnIndex).Variance();
+        variance = GetValuesWithoutNaN<double>(columnIndex).Variance();
       } else if (preprocessingData.IsType<DateTime>(columnIndex)) {
         variance = GetDateTimeAsSeconds(columnIndex).Variance();