Changeset 10844

Timestamp:

05/14/14 11:44:17 (10 years ago)

Author:

rstoll

Message:

• FilterResult was inversed at some point (true meaning it is filtered, not displayed respectively and thus not found and false means found)
• Fixed that search applies a preview (data shall not be filtered, it only uses the FilterLogic)

Location:

branches/DataPreprocessing

Files:

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

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

@@ -223 +223 @@
       for (int i = 0; i < Content.FilterLogic.PreprocessingData.Columns; i++) {
         comparisonFilter.ConstraintColumn = i;
-        bool[] filteredRows = Content.FilterLogic.Preview(filters, true);
-        foundCells[i] = filteredRows.Select((value, index) => new { Index = index, Value = value })
-          .Where(pair => pair.Value)
-          .Select(pair => pair.Index)
-          .ToList();
+        bool[] filteredRows = Content.FilterLogic.GetFilterResult(filters, true);
+        var foundIndices = new List<int>();
+        for (int idx = 0; idx < filteredRows.Length; ++idx) {
+          var notFilteredThusFound = !filteredRows[idx];
+          if (notFilteredThusFound) {
+            foundIndices.Add(idx);
+          }
+        }
+        foundCells[i] = foundIndices;
         IList<int> selectedList;
         if (searchInSelection && HightlightedCellsBackground.TryGetValue(i, out selectedList)) {

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

@@ -33 +33 @@
     }
 
-
-
-    public bool[] Preview(IList<IFilter> filters, bool isAndCombination) {
+    public bool[] GetFilterResult(IList<IFilter> filters, bool isAndCombination) {
       IList<IFilter> activeFilters = filters.Where(f => f.Active && f.ConstraintData != null).ToList<IFilter>();
 
@@ -50 +48 @@
         }
       }
+      return result;
+    }
 
+    public bool[] Preview(IList<IFilter> filters, bool isAndCombination) {
+      var result = GetFilterResult(filters, isAndCombination);
       preprocessingData.SetFilter(result);
-
       return result;
     }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IFilterLogic.cs

@@ -20 +20 @@
 #endregion
 
+using System.Collections.Generic;
 using HeuristicLab.DataPreprocessing.Filter;
-using System.Collections.Generic;
 namespace HeuristicLab.DataPreprocessing {
   public interface IFilterLogic {
+    bool[] GetFilterResult(IList<IFilter> filters, bool isAndCombination);
     bool[] Preview(IList<IFilter> filters, bool isAndCombination);
     void Apply(IList<IFilter> filters, bool isAndCombination);
-    IPreprocessingData PreprocessingData{get;}
+    IPreprocessingData PreprocessingData { get; }
     void Reset();
   }