Changeset 10785 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Timestamp:

04/23/14 15:51:41 (10 years ago)

Author:

psteiner

Message:

filter or combination
filter control: checkedlistview

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/Filter/ComparisonFilter.cs (modified) (1 diff)
• Implementations/FilterLogic.cs (modified) (3 diffs)
• Interfaces/IFilterLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/Filter/ComparisonFilter.cs

@@ -128 +128 @@
                 }
 
-                result[row] = base.Check(item);
+                result[row] = !base.Check(item);
             }
 

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

@@ -35 +35 @@
     }
 
-    public bool[] Preview(IList<IFilter> filters)
+    public bool[] Preview(IList<IFilter> filters, bool isAndCombination)
     {
        IList<IFilter> activeFilters = filters.Where(f => f.Active && f.ConstraintData != null).ToList<IFilter>();
@@ -44 +44 @@
 
        bool[] result = Enumerable.Repeat<bool>(true, preprocessingData.Rows).ToArray();
+         foreach (IFilter filter in activeFilters)
+         {
+           bool[] filterResult = filter.Check();
+           for (int row = 0; row < result.Length; ++row)
+           {
+             result[row] = isAndCombination ?  result[row] && filterResult[row] : result[row] || filterResult[row];
+           }
+         }
 
-       foreach (IFilter filter in activeFilters)
-       {
-            bool[] filterResult = filter.Check();
-
-            for(int row = 0; row < result.Length; ++row) {
-                result[row] = result[row] && filterResult[row];
-            }
-        }
 
         preprocessingData.SetFilter(result);
@@ -59 +59 @@
     }
 
-    public void Apply(IList<IFilter> filters)
+    public void Apply(IList<IFilter> filters, bool isAndCombination)
     {
-        preprocessingData.SetFilter(Preview(filters));
+        preprocessingData.SetFilter(Preview(filters, isAndCombination));
         preprocessingData.PersistFilter();
     }

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

@@ -24 +24 @@
 namespace HeuristicLab.DataPreprocessing {
   public interface IFilterLogic {
-    bool[] Preview(IList<IFilter> filters);
-    void Apply(IList<IFilter> filters);
+    bool[] Preview(IList<IFilter> filters, bool isAndCombination);
+    void Apply(IList<IFilter> filters, bool isAndCombination);
     IPreprocessingData PreprocessingData{get;}
+    void Reset();
   }
 }