Changeset 10783

Timestamp:

04/23/14 15:27:20 (11 years ago)

Author:

mleitner

Message:

Add FilteredPreprocessing data for applying and caching filter status

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/FilterLogic.cs (modified) (3 diffs)
• Implementations/FilteredPreprocessingData.cs (added)
• Implementations/PreprocessingContext.cs (modified) (3 diffs)
• Implementations/PreprocessingData.cs (modified) (1 diff)
• Interfaces/IFilteredPreprocessingData.cs (added)
• Interfaces/IPreprocessingContext.cs (modified) (2 diffs)

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

@@ -72 +72 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Implementations\FilteredPreprocessingData.cs" />
     <Compile Include="Implementations\ManipulationContent.cs" />
     <Compile Include="Implementations\PreprocessingChartContent.cs" />
     <Compile Include="Implementations\PreprocessingData.cs" />
     <Compile Include="Implementations\DataGridLogic.cs" />
+    <Compile Include="Interfaces\IFilteredPreprocessingData.cs" />
     <Compile Include="Utils\DataPreprocessingChangedEvent.cs" />
     <Compile Include="Implementations\Filter\ComparisonFilter.cs" />

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

@@ -24 +24 @@
 using System;
 using System.Linq;
+using HeuristicLab.DataPreprocessing.Interfaces;
 namespace HeuristicLab.DataPreprocessing {
   public class FilterLogic : IFilterLogic {
 
-    private ITransactionalPreprocessingData preprocessingData;
+    private IFilteredPreprocessingData preprocessingData;
 
-    public FilterLogic(ITransactionalPreprocessingData preprocessingData) {
+    public FilterLogic(IFilteredPreprocessingData preprocessingData)
+    {
       this.preprocessingData = preprocessingData;
     }
@@ -52 +54 @@
         }
 
+        preprocessingData.SetFilter(result);
+        
         return result;
     }
@@ -57 +61 @@
     public void Apply(IList<IFilter> filters)
     {
-        bool[] results = Preview(filters);
+        preprocessingData.SetFilter(Preview(filters));
+        preprocessingData.PersistFilter();
+    }
 
-        preprocessingData.InTransaction(() =>
-        {
-          for (int row = (results.Length - 1); row >= 0; --row)
-          {
-            if (results[row])
-            {
-              preprocessingData.DeleteRow(row);
-            }
-          }
-        });
-     }
-
+    public void Reset() {
+      preprocessingData.ResetFilter();
+    }
 
     public IPreprocessingData PreprocessingData

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

@@ -28 +28 @@
 using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using Variable = HeuristicLab.Problems.DataAnalysis.Symbolic.Variable;
+using HeuristicLab.DataPreprocessing.Implementations;
+using HeuristicLab.DataPreprocessing.Interfaces;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -34 +36 @@
     : Item, IPreprocessingContext {
 
-    public ITransactionalPreprocessingData Data { get; private set; }
+    public IFilteredPreprocessingData Data { get; private set; }
 
     public IDataAnalysisProblemData DataAnalysisProblemData { get; private set; }
@@ -43 +45 @@
 
     public PreprocessingContext(IDataAnalysisProblemData dataAnalysisProblemData, IAlgorithm algorithm, IDataAnalysisProblem problem) {
-      Data = new TransactionalPreprocessingData(dataAnalysisProblemData);
+
+      TransactionalPreprocessingData transactionalPreprocessingData = new TransactionalPreprocessingData(dataAnalysisProblemData);
+
+      Data = new FilteredPreprocessingData(transactionalPreprocessingData);
       DataAnalysisProblemData = dataAnalysisProblemData;
       Algorithm = algorithm;

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

@@ -84 +84 @@
 
     protected IList<IList> CopyVariableValues(IList<IList> original) {
-      var copy = new List<IList>(variableValues);
+      var copy = new List<IList>(original);
       for (int i = 0; i < original.Count; ++i) {
-        variableValues[i] = (IList)Activator.CreateInstance(original[i].GetType(), original[i]);
+        copy[i] = (IList)Activator.CreateInstance(original[i].GetType(), original[i]);
       }
       return copy;

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

@@ -24 +24 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.DataPreprocessing.Interfaces;
 
 namespace HeuristicLab.DataPreprocessing {
@@ -29 +30 @@
     : IItem {
 
-    ITransactionalPreprocessingData Data { get; }
+    IFilteredPreprocessingData Data { get; }
 
     [Obsolete]