Changeset 10849

Timestamp:

05/14/14 14:26:05 (11 years ago)

Author:

psteiner

Message:

Filter Logic And/Or Conjunction

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

@@ -62 +62 @@
       rBtnOr.Enabled = (activeFilters > 0);
       btnReset.Enabled = (activeFilters > 0);
-
+      Content.FilterLogic.Reset();
       bool[] result = Content.FilterLogic.Preview(filters, rBtnAnd.Checked);
       

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

@@ -40 +40 @@
       }
 
-      bool[] result = CreateBoolArray(preprocessingData.Rows, isAndCombination);
+      bool[] result = CreateBoolArray(preprocessingData.Rows, !isAndCombination);
 
       foreach (IFilter filter in activeFilters) {
@@ -62 +62 @@
 
     public bool Result(bool current, bool addition, bool isAndCombination) {
-      return isAndCombination ? current && addition : current || addition;
+      return isAndCombination ? current || addition : current && addition;
     }