Changeset 10703 for branches

Timestamp:

04/02/14 13:14:28 (11 years ago)

Author:

mleitner

Message:

Inverse search logic - keep rows which fulfill filter criteria

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/Implementations/FilterLogic.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/FilterView.cs

@@ -71 +71 @@
       bool[] result = Content.FilterLogic.Preview(filters);
       
-      int filteredCnt = result.Count(c => c);
+      int filteredCnt = result.Count(c => !c);
   
       tbFiltered.Text = filteredCnt.ToString();

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

@@ -43 +43 @@
        bool[] result = Enumerable.Repeat<bool>(true, preprocessingData.Rows).ToArray();
 
-       foreach (IFilter filter in filters)
+       foreach (IFilter filter in activeFilters)
        {
             bool[] filterResult = filter.Check();
@@ -63 +63 @@
           for (int row = (results.Length - 1); row >= 0; --row)
           {
-            if (!results[row])
+            if (results[row])
             {
               preprocessingData.DeleteRow(row);