Changeset 10843 for branches

Timestamp:

05/14/14 11:36:10 (11 years ago)

Author:

rstoll

Message:

• Fixed or combination filter, default value was set to true and thus all rows where filtered (regardless of the actual filter)

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs (modified) (3 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
+using System.Linq;
 using HeuristicLab.DataPreprocessing.Filter;
-using System.Collections.Generic;
-using System;
-using System.Linq;
 using HeuristicLab.DataPreprocessing.Interfaces;
 namespace HeuristicLab.DataPreprocessing {
@@ -30 +29 @@
     private IFilteredPreprocessingData preprocessingData;
 
-    public FilterLogic(IFilteredPreprocessingData preprocessingData)
-    {
+    public FilterLogic(IFilteredPreprocessingData preprocessingData) {
       this.preprocessingData = preprocessingData;
     }
 
-    public bool[] Preview(IList<IFilter> filters, bool isAndCombination)
-    {
-       IList<IFilter> activeFilters = filters.Where(f => f.Active && f.ConstraintData != null).ToList<IFilter>();
 
-       if (activeFilters.Count == 0) { 
+
+    public bool[] Preview(IList<IFilter> filters, bool isAndCombination) {
+      IList<IFilter> activeFilters = filters.Where(f => f.Active && f.ConstraintData != null).ToList<IFilter>();
+
+      if (activeFilters.Count == 0) {
         return new bool[preprocessingData.Rows];
-       }
+      }
 
-       bool[] result = TrueBoolArray(preprocessingData.Rows);
+      bool[] result = CreateBoolArray(preprocessingData.Rows, isAndCombination);
 
-         foreach (IFilter filter in activeFilters)
-         {
-           bool[] filterResult = filter.Check();
-           for (int row = 0; row < result.Length; ++row)
-           {
-             result[row] = Result(result[row], filterResult[row], isAndCombination);
-           }
-         }
+      foreach (IFilter filter in activeFilters) {
+        bool[] filterResult = filter.Check();
+        for (int row = 0; row < result.Length; ++row) {
+          result[row] = Result(result[row], filterResult[row], isAndCombination);
+        }
+      }
 
-        preprocessingData.SetFilter(result);
-        
-        return result;
+      preprocessingData.SetFilter(result);
+
+      return result;
     }
 
-    public bool[] TrueBoolArray(int rows) {
-      return Enumerable.Repeat<bool>(true, rows).ToArray();
+    public bool[] CreateBoolArray(int rows, bool value) {
+      return Enumerable.Repeat<bool>(value, rows).ToArray();
     }
 
-    public bool Result(bool current, bool addition, bool isAndCombination) { 
+    public bool Result(bool current, bool addition, bool isAndCombination) {
       return isAndCombination ? current && addition : current || addition;
     }
 
-    public void Apply(IList<IFilter> filters, bool isAndCombination)
-    {
-        preprocessingData.SetFilter(Preview(filters, isAndCombination));
-        preprocessingData.PersistFilter();
+    public void Apply(IList<IFilter> filters, bool isAndCombination) {
+      preprocessingData.SetFilter(Preview(filters, isAndCombination));
+      preprocessingData.PersistFilter();
     }
 
@@ -77 +73 @@
     }
 
-    public IPreprocessingData PreprocessingData
-    {
+    public IPreprocessingData PreprocessingData {
       get { return preprocessingData; }
     }