Changeset 10802 for branches

Timestamp:

05/07/14 10:27:44 (11 years ago)

Author:

mleitner

Message:

Refactoring

File:

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

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

@@ -43 +43 @@
        }
 
-       bool[] result = Enumerable.Repeat<bool>(true, preprocessingData.Rows).ToArray();
+       bool[] result = TrueBoolArray(preprocessingData.Rows);
+
          foreach (IFilter filter in activeFilters)
          {
@@ -49 +50 @@
            for (int row = 0; row < result.Length; ++row)
            {
-             result[row] = isAndCombination ?  result[row] && filterResult[row] : result[row] || filterResult[row];
+             result[row] = Result(result[row], filterResult[row], isAndCombination);
            }
          }
-
 
         preprocessingData.SetFilter(result);
         
         return result;
+    }
+
+    public bool[] TrueBoolArray(int rows) {
+      return Enumerable.Repeat<bool>(true, rows).ToArray();
+    }
+
+    public bool Result(bool current, bool addition, bool isAndCombination) { 
+      return isAndCombination ? current && addition : current || addition;
     }