Changeset 10620

Timestamp:

03/19/14 13:05:33 (11 years ago)

Author:

mleitner

Message:

Fix filterlogic

Location:

branches/DataPreprocessing

Files:

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

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

@@ -51 +51 @@
         var lineChartLogic = new LineChartLogic(data);
         var histogramLogic = new HistogramLogic(data);
-        var filterLogic = new FilterLogic();
+        var filterLogic = new FilterLogic(data);
 
         viewShortcutCollectionView.Content = new ViewShortcutCollection {

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

@@ -105 +105 @@
 
 
-        public bool[] Check(object constrainedMember)
+        public bool[] Check()
         {
             bool[] result = new bool[ConstrainedValue.Rows];
@@ -134 +134 @@
         }
 
-        public bool[] Check(object constrainedMember, out string errorMessage)
+        public bool[] Check(out string errorMessage)
         {
             errorMessage = string.Empty;
-            return this.Check(constrainedMember);
+            return this.Check();
         }
 

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

@@ -52 +52 @@
 
         for(int row = 0; row < results.Length; ++row)
+        {
             if(!results[row]){
                 preprocessingData.DeleteRow(row);

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

@@ -24 +24 @@
 namespace HeuristicLab.DataPreprocessing {
   public interface IFilterLogic {
-      List<bool> Preview(IList<IFilter> filters);
-      void Apply(IList<IFilter> filters);
+      bool[] Preview(IList<ComparisonFilter> filters);
+      void Apply(IList<ComparisonFilter> filters);
   }
 }