Changeset 15274 for branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Logic/ManipulationLogic.cs

Timestamp:

07/19/17 14:32:57 (7 years ago)

Author:

pfleck

Message:

#2809:

• Removed FilterLogic.
• Made Contents storable and implemented proper cloning.

File:

• branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Logic/ManipulationLogic.cs (modified) (6 diffs)

branches/DataPreprocessing Cleanup/HeuristicLab.DataPreprocessing/3.4/Logic/ManipulationLogic.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Random;
 
 namespace HeuristicLab.DataPreprocessing {
-  public class ManipulationLogic {
-    private readonly IPreprocessingData preprocessingData;
+  [Item("ManipulationLogic", "")]
+  [StorableClass]
+  public class ManipulationLogic : Item {
+
+    [Storable]
+    private readonly IFilteredPreprocessingData preprocessingData;
+
+    [Storable]
     private readonly StatisticsLogic statisticsLogic;
 
@@ -35 +44 @@
     }
 
-    public IPreprocessingData PreProcessingData {
+    public IFilteredPreprocessingData PreProcessingData {
       get { return preprocessingData; }
     }
 
-    public ManipulationLogic(IPreprocessingData preprocessingData, StatisticsLogic theStatisticsLogic) {
+    #region Constructor, Cloning & Persistence
+    public ManipulationLogic(IFilteredPreprocessingData preprocessingData, StatisticsLogic theStatisticsLogic) {
       this.preprocessingData = preprocessingData;
       statisticsLogic = theStatisticsLogic;
     }
+    public ManipulationLogic(ManipulationLogic original, Cloner cloner)
+      : base(original, cloner) {
+      preprocessingData = cloner.Clone(original.preprocessingData);
+      statisticsLogic = cloner.Clone(original.statisticsLogic);
+    }
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new ManipulationLogic(this, cloner);
+    }
+
+    [StorableConstructor]
+    protected ManipulationLogic(bool deserializing)
+      : base(deserializing) { }
+    #endregion
 
     public void ReplaceIndicesByValue<T>(int columnIndex, IEnumerable<int> rowIndices, T value) {
@@ -123 +146 @@
       for (int i = 0; i < count; ++i) {
         if (start == int.MinValue) {
-          start = indexOfPrevPresentValue(column.Key, rowIndices[i]);
+          start = IndexOfPrevPresentValue(column.Key, rowIndices[i]);
         }
         if (i + 1 == count || (i + 1 < count && rowIndices[i + 1] - rowIndices[i] > 1)) {
-          int next = indexOfNextPresentValue(column.Key, rowIndices[i]);
+          int next = IndexOfNextPresentValue(column.Key, rowIndices[i]);
           if (start > 0 && next < preprocessingData.Rows) {
             startEndings.Add(new Tuple<int, int>(start, next));
@@ -144 +167 @@
             // dont replace first or last values
             if (index > 0 && index < countValues) {
-              int prevIndex = indexOfPrevPresentValue(column.Key, index);
-              int nextIndex = indexOfNextPresentValue(column.Key, index);
+              int prevIndex = IndexOfPrevPresentValue(column.Key, index);
+              int nextIndex = IndexOfNextPresentValue(column.Key, index);
 
               // no neighbours found
@@ -183 +206 @@
     }
 
-    private int indexOfPrevPresentValue(int columnIndex, int start) {
+    private int IndexOfPrevPresentValue(int columnIndex, int start) {
       int offset = start - 1;
       while (offset >= 0 && preprocessingData.IsCellEmpty(columnIndex, offset)) {
@@ -192 +215 @@
     }
 
-    private int indexOfNextPresentValue(int columnIndex, int start) {
+    private int IndexOfNextPresentValue(int columnIndex, int start) {
       int offset = start + 1;
       while (offset < preprocessingData.Rows && preprocessingData.IsCellEmpty(columnIndex, offset)) {