Changeset 10619 for branches/DataPreprocessing

Timestamp:

03/19/14 13:00:11 (10 years ago)

Author:

mleitner

Message:

Setup filter logic

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

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

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

@@ -27 +27 @@
 using HeuristicLab.Common;
 using HeuristicLab.Data;
+using System.Collections.Generic;
 
 namespace HeuristicLab.DataPreprocessing.Filter
@@ -104 +105 @@
 
 
-        protected override bool Check(object constrainedMember)
+        public bool[] Check(object constrainedMember)
         {
+            bool[] result = new bool[ConstrainedValue.Rows];
+
             if (!Active)
-                return false;
+                return result;
 
             for (int row = 0; row < ConstrainedValue.Rows; ++row)
             {
-
                 object item = null;
                 if (ConstrainedValue.IsType<double>(constraintColumn))
@@ -126 +128 @@
                 }
 
-                if (base.Check(item))
-                    return true;
-
+                result[row] = base.Check(item);
             }
 
-            return false;
+            return result;
         }
 
-        protected override bool Check(object constrainedMember, out string errorMessage)
+        public bool[] Check(object constrainedMember, out string errorMessage)
         {
             errorMessage = string.Empty;

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.DataPreprocessing.Filter;
+using System.Collections.Generic;
 namespace HeuristicLab.DataPreprocessing {
   public class FilterLogic : IFilterLogic {
+
+    private ITransactionalPreprocessingData preprocessingData;
+
+    public FilterLogic(ITransactionalPreprocessingData preprocessingData) {
+      this.preprocessingData = preprocessingData;
+    }
+
+
+    public bool[] Preview(IList<ComparisonFilter> filters)
+    {
+       bool[] result = new bool[preprocessingData.Rows];
+
+        foreach (ComparisonFilter filter in filters) {
+            bool[] filterResult = filter.Check();
+
+            for(int row = 0; row < result.Length; ++row) {
+                result[row] = result[row] & filterResult[row];
+            }
+        }
+
+        return result;
+    }
+
+    public void Apply(IList<ComparisonFilter> filters)
+    {
+        bool[] results = Preview(filters);
+
+        for(int row = 0; row < results.Length; ++row)
+            if(!results[row]){
+                preprocessingData.DeleteRow(row);
+            }
+        }
+     }
   }
 }

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

@@ -20 +20 @@
 #endregion
 
+using HeuristicLab.DataPreprocessing.Filter;
+using System.Collections.Generic;
 namespace HeuristicLab.DataPreprocessing {
   public interface IFilterLogic {
+      List<bool> Preview(IList<IFilter> filters);
+      void Apply(IList<IFilter> filters);
   }
 }