Changeset 15466 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4

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/HeuristicLab.DataPreprocessing/3.4

Files:

• Content/FilterContent.cs (modified) (2 diffs)
• Data/FilteredPreprocessingData.cs (modified) (2 diffs)
• Data/IFilteredPreprocessingData.cs (modified) (1 diff)
• Filter/ComparisonFilter.cs (modified) (2 diffs)

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