Changeset 15466

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

Location:

branches/DataPreprocessing Cleanup

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/FilterView.Designer.cs (modified) (6 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/FilterView.cs (modified) (3 diffs)
• HeuristicLab.DataPreprocessing/3.4/Content/FilterContent.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Data/IFilteredPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Filter/ComparisonFilter.cs (modified) (2 diffs)

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

@@ -46 +46 @@
     private void InitializeComponent() {
       this.groupBoxFilter = new System.Windows.Forms.GroupBox();
-      this.checkedFilterView = new HeuristicLab.DataPreprocessing.Views.CheckedFilterCollectionView();
       this.groupBoxFilterInfo = new System.Windows.Forms.GroupBox();
       this.lblPercentage = new System.Windows.Forms.Label();
@@ -63 +62 @@
       this.label3 = new System.Windows.Forms.Label();
       this.bottomPanel = new System.Windows.Forms.Panel();
+      this.checkedFilterView = new HeuristicLab.DataPreprocessing.Views.CheckedFilterCollectionView();
       this.groupBoxFilter.SuspendLayout();
       this.groupBoxFilterInfo.SuspendLayout();
@@ -80 +80 @@
       this.groupBoxFilter.TabStop = false;
       this.groupBoxFilter.Text = "Filter";
-      // 
-      // checkedFilterView
-      // 
-      this.checkedFilterView.Caption = "filterView";
-      this.checkedFilterView.Content = null;
-      this.checkedFilterView.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.checkedFilterView.Location = new System.Drawing.Point(3, 16);
-      this.checkedFilterView.Name = "checkedFilterView";
-      this.checkedFilterView.ReadOnly = false;
-      this.checkedFilterView.ShowDetails = true;
-      this.checkedFilterView.Size = new System.Drawing.Size(652, 308);
-      this.checkedFilterView.TabIndex = 0;
       // 
       // groupBoxFilterInfo
@@ -185 +173 @@
       this.rBtnOr.AutoSize = true;
       this.rBtnOr.Cursor = System.Windows.Forms.Cursors.Default;
-      this.rBtnOr.Enabled = false;
       this.rBtnOr.Location = new System.Drawing.Point(53, 6);
       this.rBtnOr.Name = "rBtnOr";
@@ -199 +186 @@
       this.rBtnAnd.Checked = true;
       this.rBtnAnd.Cursor = System.Windows.Forms.Cursors.Default;
-      this.rBtnAnd.Enabled = false;
       this.rBtnAnd.Location = new System.Drawing.Point(3, 6);
       this.rBtnAnd.Name = "rBtnAnd";
@@ -273 +259 @@
       this.bottomPanel.Size = new System.Drawing.Size(670, 30);
       this.bottomPanel.TabIndex = 13;
+      // 
+      // checkedFilterView
+      // 
+      this.checkedFilterView.Caption = "filterView";
+      this.checkedFilterView.Content = null;
+      this.checkedFilterView.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.checkedFilterView.Location = new System.Drawing.Point(3, 16);
+      this.checkedFilterView.Name = "checkedFilterView";
+      this.checkedFilterView.ReadOnly = false;
+      this.checkedFilterView.ShowDetails = true;
+      this.checkedFilterView.Size = new System.Drawing.Size(652, 308);
+      this.checkedFilterView.TabIndex = 0;
       // 
       // FilterView

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
   }
 }

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Content/FilterContent.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using System.Drawing;
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -38 +40 @@
     [Storable]
     public bool IsAndCombination { get; set; }
+
+    public IEnumerable<IFilter> ActiveFilters {
+      get { return Filters.Where(f => f.Active && f.ConstraintData != null); }
+    }
+
+    public bool[] GetRemainingRows() {
+      var remainingRows = new bool[PreprocessingData.Rows];
+      if (ActiveFilters.Any()) {
+        var filterResults = ActiveFilters.Select(f => f.Check()).ToList();
+        var rowFilterResults = new bool[filterResults.Count];
+        for (int row = 0; row < remainingRows.Length; row++) {
+          for (int i = 0; i < filterResults.Count; i++)
+            rowFilterResults[i] = filterResults[i][row];
+
+          remainingRows[row] = IsAndCombination
+            ? rowFilterResults.All(x => x)
+            : rowFilterResults.Any(x => x);
+        }
+      } else {
+        // if not filters active => all rows are remaining
+        for (int i = 0; i < remainingRows.Length; i++)
+          remainingRows[i] = true;
+      }
+      return remainingRows;
+    }
 
     #region Constructor, Cloning & Persistence

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs

@@ -43 +43 @@
 
     #region Constructor, Cloning & Persistence
-    public FilteredPreprocessingData(IPreprocessingData preporcessingData)
+    public FilteredPreprocessingData(IPreprocessingData preprocessingData)
       : base() {
-      originalData = preporcessingData;
+      originalData = preprocessingData;
       filteredData = null;
     }
@@ -317 +317 @@
 
     #region Filters
-    public void SetFilter(bool[] rowFilters) {
+    public void SetFilter(bool[] remainingRows) {
       filteredData = (IPreprocessingData)originalData.Clone();
       filteredData.InTransaction(() => {
-        for (int row = (rowFilters.Length - 1); row >= 0; --row) {
-          if (rowFilters[row]) {
+        for (int row = (remainingRows.Length - 1); row >= 0; --row) {
+          if (!remainingRows[row]) {
             filteredData.DeleteRow(row);
           }

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Data/IFilteredPreprocessingData.cs

@@ -25 +25 @@
   public interface IFilteredPreprocessingData : IPreprocessingData {
     #region Filters
-    void SetFilter(bool[] rowFilters);
+    void SetFilter(bool[] remainingRows);
     void PersistFilter();
     void ResetFilter();

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Filter/ComparisonFilter.cs

@@ -86 +86 @@
     }
 
+    // return remaining rows
     public new bool[] Check() {
       bool[] result = new bool[ConstrainedValue.Rows];
@@ -102 +103 @@
         }
 
-        result[row] = !base.Check(item);
+        result[row] = base.Check(item);
       }