Changeset 10638 for branches

Timestamp:

03/19/14 16:10:48 (11 years ago)

Author:

psteiner

Message:

adaption of FilterLogic

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/Filter/IFilter.cs (modified) (1 diff)
• Implementations/FilterLogic.cs (modified) (3 diffs)
• Interfaces/IFilterLogic.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -22 +22 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">

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

@@ -7 +7 @@
 namespace HeuristicLab.DataPreprocessing.Filter
 {
-  public interface IFilter : IItem
+  public interface IFilter : IConstraint
   {
+    bool[] Check();
+    bool[] Check(out string errorMessage);
   }
 }

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

@@ -32 +32 @@
 
 
-    public bool[] Preview(IList<ComparisonFilter> filters)
+    public bool[] Preview(IList<IFilter> filters)
     {
        bool[] result = new bool[preprocessingData.Rows];
 
-        foreach (ComparisonFilter filter in filters) {
+       foreach (IFilter filter in filters)
+       {
             bool[] filterResult = filter.Check();
 
@@ -47 +48 @@
     }
 
-    public void Apply(IList<ComparisonFilter> filters)
+    public void Apply(IList<IFilter> filters)
     {
         bool[] results = Preview(filters);
@@ -58 +59 @@
         }
      }
+
+
+    public IPreprocessingData PreprocessingData
+    {
+      get { return preprocessingData; }
+    }
   }
 }

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

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