Changeset 16308 for branches/2845_EnhancedProgress/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs

Timestamp:

11/20/18 13:52:40 (5 years ago)

Author:

pfleck

Message:

#2845 reverted the last merge (r16307) because some revisions were missing

Location:

branches/2845_EnhancedProgress

Files:

• . (modified) (1 prop)
• HeuristicLab.DataPreprocessing (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4 (modified) (1 prop)
• HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs (modified) (2 diffs)

branches/2845_EnhancedProgress/HeuristicLab.DataPreprocessing/3.4/Content/ManipulationContent.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2016 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.DataPreprocessing {
+
   [Item("Manipulation", "Represents the available manipulations on a data set.")]
-  [StorableClass]
-  public class ManipulationContent : PreprocessingContent, IViewShortcut {
+  public class ManipulationContent : Item, IViewShortcut {
     public static new Image StaticItemImage {
       get { return HeuristicLab.Common.Resources.VSImageLibrary.Method; }
     }
 
-    #region Constructor, Cloning & Persistence
-    public ManipulationContent(IFilteredPreprocessingData preprocessingData)
-      : base(preprocessingData) {
+    public ManipulationLogic ManipulationLogic { get; private set; }
+    public SearchLogic SearchLogic { get; private set; }
+    public FilterLogic FilterLogic { get; private set; }
+
+    public ManipulationContent(ManipulationLogic manipulationLogic, SearchLogic searchLogic, FilterLogic filterLogic) {
+      ManipulationLogic = manipulationLogic;
+      SearchLogic = searchLogic;
+      FilterLogic = filterLogic;
     }
 
-    public ManipulationContent(ManipulationContent original, Cloner cloner) :
-      base(original, cloner) {
-    }
+    public ManipulationContent(ManipulationContent content, Cloner cloner) : base(content, cloner) { }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       return new ManipulationContent(this, cloner);
     }
-
-    [StorableConstructor]
-    protected ManipulationContent(bool deserializing)
-      : base(deserializing) { }
-    #endregion
-
-    public List<int> RowsWithMissingValuesGreater(double percent) {
-      List<int> rows = new List<int>();
-
-      for (int i = 0; i < PreprocessingData.Rows; ++i) {
-        int missingCount = PreprocessingData.GetRowMissingValueCount(i);
-        if (100f / PreprocessingData.Columns * missingCount > percent) {
-          rows.Add(i);
-        }
-      }
-
-      return rows;
-    }
-
-    public List<int> ColumnsWithMissingValuesGreater(double percent) {
-      List<int> columns = new List<int>();
-      for (int i = 0; i < PreprocessingData.Columns; ++i) {
-        int missingCount = PreprocessingData.GetMissingValueCount(i);
-        if (100f / PreprocessingData.Rows * missingCount > percent) {
-          columns.Add(i);
-        }
-      }
-
-      return columns;
-    }
-
-    public List<int> ColumnsWithVarianceSmaller(double variance) {
-      List<int> columns = new List<int>();
-      for (int i = 0; i < PreprocessingData.Columns; ++i) {
-        if (PreprocessingData.VariableHasType<double>(i)) {
-          double columnVariance = PreprocessingData.GetVariance<double>(i);
-          if (columnVariance < variance) {
-            columns.Add(i);
-          }
-        } else if (PreprocessingData.VariableHasType<DateTime>(i)) {
-          double columnVariance = (double)PreprocessingData.GetVariance<DateTime>(i).Ticks / TimeSpan.TicksPerSecond;
-          if (columnVariance < variance) {
-            columns.Add(i);
-          }
-        }
-      }
-      return columns;
-    }
-
-    public void DeleteRowsWithMissingValuesGreater(double percent) {
-      DeleteRows(RowsWithMissingValuesGreater(percent));
-    }
-
-    public void DeleteColumnsWithMissingValuesGreater(double percent) {
-      DeleteColumns(ColumnsWithMissingValuesGreater(percent));
-    }
-
-    public void DeleteColumnsWithVarianceSmaller(double variance) {
-      DeleteColumns(ColumnsWithVarianceSmaller(variance));
-    }
-
-    private void DeleteRows(List<int> rows) {
-      PreprocessingData.InTransaction(() => {
-        foreach (int row in rows.OrderByDescending(x => x)) {
-          PreprocessingData.DeleteRow(row);
-        }
-      });
-    }
-
-    private void DeleteColumns(List<int> columns) {
-      PreprocessingData.InTransaction(() => {
-        foreach (int column in columns.OrderByDescending(x => x)) {
-          PreprocessingData.DeleteColumn(column);
-        }
-      });
-    }
   }
 }