Changeset 14996 for branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs

Timestamp:

05/18/17 12:29:59 (7 years ago)

Author:

pfleck

Message:

#2709

• Fixed initial selection of the grouping text box (empty string instead of null to select the first entry).
• General code fixes (removed unnessecary bank lines and code, class member order, ...)

File:

• branches/DataPreprocessing Enhancements/HeuristicLab.DataPreprocessing.Views/3.4/ManipulationView.cs (modified) (12 diffs)

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

@@ -31 +31 @@
 
 namespace HeuristicLab.DataPreprocessing.Views {
-
   [View("Manipulation Chart View")]
   [Content(typeof(ManipulationContent), true)]
   public partial class ManipulationView : ItemView {
-
     private Action[] validators;
     private Action[] manipulations;
+
+    public new ManipulationContent Content {
+      get { return (ManipulationContent)base.Content; }
+      set { base.Content = value; }
+    }
 
     public ManipulationView() {
@@ -49 +52 @@
       tabsPreview.SizeMode = TabSizeMode.Fixed;
 
-      validators = new Action[] { 
-        ()=>validateDeleteColumnsInfo(),
-        ()=>validateDeleteColumnsVariance(),
-        ()=>validateDeleteRowsInfo(),
-        ()=>validateReplaceWith(),
-        ()=>validateShuffle()
+      validators = new Action[] {
+        () => ValidateDeleteColumnsInfo(),
+        () => ValidateDeleteColumnsVariance(),
+        () => ValidateDeleteRowsInfo(),
+        () => ValidateReplaceWith(),
+        () => ValidateShuffle()
       };
 
-      manipulations = new Action[] { 
-        ()=>Content.ManipulationLogic.DeleteColumnsWithMissingValuesGreater(getDeleteColumnsInfo()),
-        ()=>Content.ManipulationLogic.DeleteColumnsWithVarianceSmaller(getDeleteColumnsVariance()),
-        ()=>Content.ManipulationLogic.DeleteRowsWithMissingValuesGreater(getRowsColumnsInfo()),
-        ()=>replaceMissingValues(),
-        ()=>Content.ManipulationLogic.Shuffle(shuffleSeparatelyCheckbox.Checked)
+      manipulations = new Action[] {
+        () => Content.ManipulationLogic.DeleteColumnsWithMissingValuesGreater(GetDeleteColumnsInfo()),
+        () => Content.ManipulationLogic.DeleteColumnsWithVarianceSmaller(GetDeleteColumnsVariance()),
+        () => Content.ManipulationLogic.DeleteRowsWithMissingValuesGreater(GetRowsColumnsInfo()),
+        () => ReplaceMissingValues(),
+        () => Content.ManipulationLogic.Shuffle(shuffleSeparatelyCheckbox.Checked)
       };
     }
@@ -111 +114 @@
     }
 
-    private double getDeleteColumnsInfo() {
+    private double GetDeleteColumnsInfo() {
       return double.Parse(txtDeleteColumnsInfo.Text);
     }
 
-    private double getDeleteColumnsVariance() {
+    private double GetDeleteColumnsVariance() {
       return double.Parse(txtDeleteColumnsVariance.Text);
     }
 
-    private double getRowsColumnsInfo() {
+    private double GetRowsColumnsInfo() {
       return double.Parse(txtDeleteRowsInfo.Text);
     }
 
-    private void replaceMissingValues() {
+    private void ReplaceMissingValues() {
       var allIndices = Content.SearchLogic.GetMissingValueIndices();
       var columnIndex = cmbVariableNames.SelectedIndex;
@@ -149 +152 @@
     }
 
-    private void validateDeleteColumnsInfo() {
-      validateDoubleTextBox(txtDeleteColumnsInfo.Text);
+    private void ValidateDeleteColumnsInfo() {
+      ValidateDoubleTextBox(txtDeleteColumnsInfo.Text);
       if (btnApply.Enabled) {
-        var filteredColumns = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(getDeleteColumnsInfo());
+        var filteredColumns = Content.ManipulationLogic.ColumnsWithMissingValuesGreater(GetDeleteColumnsInfo());
         int count = filteredColumns.Count;
         int columnCount = Content.FilterLogic.PreprocessingData.Columns;
@@ -180 +183 @@
     }
 
-    private void validateDeleteColumnsVariance() {
-      validateDoubleTextBox(txtDeleteColumnsVariance.Text);
+    private void ValidateDeleteColumnsVariance() {
+      ValidateDoubleTextBox(txtDeleteColumnsVariance.Text);
       if (btnApply.Enabled) {
-        var filteredColumns = Content.ManipulationLogic.ColumnsWithVarianceSmaller(getDeleteColumnsVariance());
+        var filteredColumns = Content.ManipulationLogic.ColumnsWithVarianceSmaller(GetDeleteColumnsVariance());
         int count = filteredColumns.Count;
         int columnCount = Content.FilterLogic.PreprocessingData.Columns;
@@ -211 +214 @@
     }
 
-    private void validateDeleteRowsInfo() {
-      validateDoubleTextBox(txtDeleteRowsInfo.Text);
+    private void ValidateDeleteRowsInfo() {
+      ValidateDoubleTextBox(txtDeleteRowsInfo.Text);
       if (btnApply.Enabled) {
-        int count = Content.ManipulationLogic.RowsWithMissingValuesGreater(getRowsColumnsInfo()).Count;
+        int count = Content.ManipulationLogic.RowsWithMissingValuesGreater(GetRowsColumnsInfo()).Count;
         int rowCount = Content.FilterLogic.PreprocessingData.Rows;
         lblPreviewRowsInfo.Text = count + " row" + (count > 1 || count == 0 ? "s" : "") + " of " + rowCount + " (" + string.Format("{0:F2}%", 100d / rowCount * count) + ") were detected with more than " + txtDeleteRowsInfo.Text + "% missing values.";
@@ -227 +230 @@
     }
 
-    private void validateReplaceWith() {
+    private void ValidateReplaceWith() {
       btnApply.Enabled = false;
       string replaceWith = (string)cmbReplaceWith.SelectedItem;
@@ -260 +263 @@
     }
 
-    private void validateShuffle() {
+    private void ValidateShuffle() {
       btnApply.Enabled = true;
       lblShuffleProperties.Enabled = false;
@@ -268 +271 @@
     }
 
-    public new ManipulationContent Content {
-      get { return (ManipulationContent)base.Content; }
-      set { base.Content = value; }
-    }
-
     private void lstMethods_SelectedIndexChanged(object sender, System.EventArgs e) {
       int index = lstMethods.SelectedIndex;
@@ -308 +306 @@
     }
 
-    private void validateDoubleTextBox(String text) {
+    private void ValidateDoubleTextBox(String text) {
       btnApply.Enabled = false;
       if (!string.IsNullOrEmpty(text)) {
@@ -319 +317 @@
 
     private void txtDeleteColumnsInfo_TextChanged(object sender, EventArgs e) {
-      validateDeleteColumnsInfo();
+      ValidateDeleteColumnsInfo();
     }
 
     private void txtDeleteColumnsVariance_TextChanged(object sender, EventArgs e) {
-      validateDeleteColumnsVariance();
+      ValidateDeleteColumnsVariance();
     }
 
     private void txtDeleteRowsInfo_TextChanged(object sender, EventArgs e) {
-      validateDeleteRowsInfo();
+      ValidateDeleteRowsInfo();
     }
 
@@ -334 +332 @@
       lblValueColon.Visible = isReplaceWithValueSelected;
       txtReplaceValue.Visible = isReplaceWithValueSelected;
-      validateReplaceWith();
+      ValidateReplaceWith();
     }
 
     private void txtReplaceValue_TextChanged(object sender, EventArgs e) {
-      validateReplaceWith();
+      ValidateReplaceWith();
     }
   }