Changeset 10667 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Timestamp:

03/26/14 15:13:26 (10 years ago)

Author:

mleitner

Message:

Dont calculate filter preview when no constraintdata

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations

Files:

• Filter/ComparisonFilter.cs (modified) (2 diffs)
• Filter/IFilter.cs (modified) (1 diff)
• FilterLogic.cs (modified) (1 diff)

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

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

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

@@ -9 +9 @@
   public interface IFilter : IConstraint
   {
-    bool[] Check();
-    bool[] Check(out string errorMessage);
+    new bool[] Check();
+    new bool[] Check(out string errorMessage);
   }
 }

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

@@ -40 +40 @@
        foreach (IFilter filter in filters)
        {
+            if (filter.ConstraintData == null) {
+              continue;
+            }
+
             bool[] filterResult = filter.Check();