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

Timestamp:

07/19/17 14:32:57 (7 years ago)

Author:

pfleck

Message:

#2809:

• Removed FilterLogic.
• Made Contents storable and implemented proper cloning.

File:

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

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

@@ -74 +74 @@
       rBtnAnd.Enabled = (activeFilters > 0);
       rBtnOr.Enabled = (activeFilters > 0);
-      Content.FilterLogic.Reset();
-      bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
+      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();
+
+        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);
@@ -89 +106 @@
         List<IFilter> filters = Content.Filters.ToList();
         //apply filters
-        Content.FilterLogic.Apply(filters, rBtnAnd.Checked);
+        bool isAndCombination = rBtnAnd.Checked;
+        Content.PreprocessingData.PersistFilter();
+        Content.PreprocessingData.ResetFilter();
         //deactivate checked filters
         filters = checkedFilterView.Content.CheckedItems.ToList();
@@ -104 +123 @@
       if (Content != null) {
         foreach (IFilter filter in e.Items) {
-          filter.ConstrainedValue = Content.FilterLogic.PreprocessingData;
+          filter.ConstrainedValue = Content.PreprocessingData;
         }
       }