Changeset 15466 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

Timestamp:

11/09/17 11:51:37 (6 years ago)

Author:

pfleck

Message:

#2809: Simplified the overall filtering logic as suggested by bburlacu

• changed parameter names to actively reflect that filter means "remaining"
• moved filter combination logic to FilterContent
• simplified/restructured code

File:

• branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs (modified) (3 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Collections;
@@ -44 +43 @@
     }
 
-    private void InitData() {
-      checkedFilterView.Content = Content.Filters;
-      checkedFilterView.Content.ItemsAdded += Content_ItemsAdded;
-      checkedFilterView.Content.ItemsRemoved += Content_ItemsRemoved;
-      checkedFilterView.Content.CheckedItemsChanged += Content_CheckedItemsChanged;
-    }
-
     protected override void OnContentChanged() {
       base.OnContentChanged();
       if (Content != null) {
-        InitData();
-        UpdateFilterInfo();
+        checkedFilterView.Content = Content.Filters;
+        rBtnAnd.Checked = Content.IsAndCombination;
+        rBtnOr.Checked = !Content.IsAndCombination;
+        UpdateFilter();
+      } else {
+        checkedFilterView.Content = null;
       }
     }
-
-    private void Content_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
-      if (Content != null) {
-        foreach (IFilter filter in e.Items) {
-          filter.Active = checkedFilterView.Content.ItemChecked(filter);
-        }
-        UpdateFilterInfo();
-      }
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+      Content.Filters.ItemsAdded += Content_ItemsAdded;
+      Content.Filters.ItemsRemoved += Content_ItemsRemoved;
+      Content.Filters.CheckedItemsChanged += Content_CheckedItemsChanged;
+    }
+    protected override void DeregisterContentEvents() {
+      Content.Filters.ItemsAdded -= Content_ItemsAdded;
+      Content.Filters.ItemsRemoved -= Content_ItemsRemoved;
+      Content.Filters.CheckedItemsChanged -= Content_CheckedItemsChanged;
+      base.DeregisterContentEvents();
     }
 
-    private void UpdateFilterInfo() {
-      List<IFilter> filters = Content.Filters.ToList();
-      int activeFilters = filters.Count(c => c.Active);
-      applyFilterButton.Enabled = (activeFilters > 0);
-      rBtnAnd.Enabled = (activeFilters > 0);
-      rBtnOr.Enabled = (activeFilters > 0);
+    private void UpdateFilter() {
+      bool activeFilters = Content.ActiveFilters.Any();
+      applyFilterButton.Enabled = activeFilters;
+
+      int numTotal = Content.PreprocessingData.Rows;
+      int numRemaining = numTotal;
+
       Content.PreprocessingData.ResetFilter();
-      bool isAndCombination = rBtnAnd.Checked;
-      bool[] ret;
-      IList<IFilter> activeFilters1 = filters.Where(f => f.Active && f.ConstraintData != null).ToList();
-      if (activeFilters1.Count > 0) {
-        var result1 = Enumerable.Repeat(!isAndCombination, Content.PreprocessingData.Rows).ToArray();
+      if (activeFilters) {
+        var remainingRows = Content.GetRemainingRows();
+        Content.PreprocessingData.SetFilter(remainingRows);
+        numRemaining = remainingRows.Count(x => x);
+      }
 
-        foreach (IFilter filter in activeFilters1) {
-          bool[] filterResult = filter.Check();
-          for (int row = 0; row < result1.Length; ++row) {
-            result1[row] = isAndCombination ? result1[row] || filterResult[row] : result1[row] && filterResult[row];
-          }
-        }
-        Content.PreprocessingData.SetFilter(result1);
-        ret = result1;
-      } else {
-        ret = Enumerable.Repeat(false, Content.PreprocessingData.Rows).ToArray();
-      }
-      bool[] result = ret;
-
-      int filteredCnt = result.Count(c => !c);
-
-      tbRemaining.Text = filteredCnt.ToString();
-      double percentage = result.Length == 0 ? 0.0 : filteredCnt * 100 / (double)result.Length;
-      tbPercentage.Text = String.Format("{0:0.0000}%", percentage);
-      tbTotal.Text = result.Length.ToString();
+      tbRemaining.Text = numRemaining.ToString();
+      double ratio = numTotal > 0 ? numRemaining / (double)numTotal : 0.0;
+      tbPercentage.Text = ratio.ToString("P4");
+      tbTotal.Text = numTotal.ToString();
     }
 
-    private void applyFilterButton_Click(object sender, EventArgs e) {
-      if (Content != null) {
-        List<IFilter> filters = Content.Filters.ToList();
-        //apply filters
-        bool isAndCombination = rBtnAnd.Checked;
-        Content.PreprocessingData.PersistFilter();
-        Content.PreprocessingData.ResetFilter();
-        //deactivate checked filters
-        filters = checkedFilterView.Content.CheckedItems.ToList();
-        foreach (IFilter filter in filters) {
-          checkedFilterView.Content.SetItemCheckedState(filter, false);
-          filter.Active = false;
-        }
-        UpdateFilterInfo();
-      }
-    }
 
+    #region Content Events
     //whenever a new filter is added the preprocessing data is set to the filter
     private void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
@@ -127 +97 @@
       }
     }
-
     private void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IFilter> e) {
       if (Content != null) {
-        UpdateFilterInfo();
+        UpdateFilter();
       }
     }
+    private void Content_CheckedItemsChanged(object sender, Collections.CollectionItemsChangedEventArgs<IFilter> e) {
+      if (Content != null) {
+        foreach (IFilter filter in e.Items) {
+          filter.Active = checkedFilterView.Content.ItemChecked(filter);
+        }
+        UpdateFilter();
+      }
+    }
+    #endregion
 
+    #region Controls Events
     private void rBtnAnd_CheckedChanged(object sender, EventArgs e) {
       if (Content != null) {
-        UpdateFilterInfo();
         Content.IsAndCombination = rBtnAnd.Checked;
+        UpdateFilter();
       }
     }
+    private void applyFilterButton_Click(object sender, EventArgs e) {
+      if (Content != null) {
+        //apply filters
+        Content.PreprocessingData.PersistFilter();
+        Content.PreprocessingData.ResetFilter();
+        //deactivate checked filters
+        foreach (var filter in Content.Filters.CheckedItems) {
+          checkedFilterView.Content.SetItemCheckedState(filter, false);
+          filter.Active = false;
+        }
+        UpdateFilter();
+      }
+    }
+    #endregion
   }
 }