Changeset 16308 for branches/2845_EnhancedProgress/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.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/Data/FilteredPreprocessingData.cs (modified) (9 diffs)

branches/2845_EnhancedProgress/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.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.
@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
 using HeuristicLab.Data;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing {
-  [Item("FilteredPreprocessingData", "Represents filtered data used for preprocessing.")]
-  [StorableClass]
-  public sealed class FilteredPreprocessingData : NamedItem, IFilteredPreprocessingData {
-
-    [Storable]
-    private readonly IPreprocessingData originalData;
-    [Storable]
-    private IPreprocessingData filteredData;
-
-    public IPreprocessingData ActiveData {
+  public class FilteredPreprocessingData : NamedItem, IFilteredPreprocessingData {
+    private readonly ITransactionalPreprocessingData originalData;
+    private ITransactionalPreprocessingData filteredData;
+
+    public IntRange TrainingPartition {
+      get { return originalData.TrainingPartition; }
+    }
+
+    public IntRange TestPartition {
+      get { return originalData.TestPartition; }
+    }
+
+    public IList<ITransformation> Transformations {
+      get { return originalData.Transformations; }
+    }
+
+    public IEnumerable<string> VariableNames {
+      get { return ActiveData.VariableNames; }
+    }
+
+    public IList<string> InputVariables { get { return ActiveData.InputVariables; } }
+    public string TargetVariable { get { return ActiveData.TargetVariable; } } // optional
+
+    public IDictionary<int, IList<int>> Selection {
+      get { return originalData.Selection; }
+      set { originalData.Selection = value; }
+    }
+
+    public int Columns {
+      get { return ActiveData.Columns; }
+    }
+
+    public int Rows {
+      get { return ActiveData.Rows; }
+    }
+
+    public ITransactionalPreprocessingData ActiveData {
       get { return IsFiltered ? filteredData : originalData; }
     }
 
-    #region Constructor, Cloning & Persistence
-    public FilteredPreprocessingData(IPreprocessingData preprocessingData)
+    public bool IsUndoAvailable {
+      get { return IsFiltered ? false : originalData.IsUndoAvailable; }
+    }
+
+    public bool IsFiltered {
+      get { return filteredData != null; }
+    }
+
+
+    public FilteredPreprocessingData(ITransactionalPreprocessingData preporcessingData)
       : base() {
-      originalData = preprocessingData;
+      originalData = preporcessingData;
       filteredData = null;
     }
 
-    private FilteredPreprocessingData(FilteredPreprocessingData original, Cloner cloner)
+    protected FilteredPreprocessingData(FilteredPreprocessingData original, Cloner cloner)
       : base(original, cloner) {
       originalData = original.originalData;
@@ -59 +92 @@
     }
 
-    [StorableConstructor]
-    private FilteredPreprocessingData(bool deserializing)
-      : base(deserializing) { }
-    #endregion
-
-    #region Cells
-    public bool IsCellEmpty(int columnIndex, int rowIndex) {
-      return ActiveData.IsCellEmpty(columnIndex, rowIndex);
-    }
-
     public T GetCell<T>(int columnIndex, int rowIndex) {
       return ActiveData.GetCell<T>(columnIndex, rowIndex);
@@ -94 +117 @@
     }
 
-    public bool SetValue(string value, int columnIndex, int rowIndex) {
-      if (IsFiltered)
-        throw new InvalidOperationException("SetValue not possible while data is filtered");
-      return originalData.SetValue(value, columnIndex, rowIndex);
-    }
-
-    public int Columns {
-      get { return ActiveData.Columns; }
-    }
-
-    public int Rows {
-      get { return ActiveData.Rows; }
-    }
-    #endregion
-
-    #region Rows
     public void InsertRow(int rowIndex) {
       if (IsFiltered)
@@ -122 +129 @@
 
       originalData.DeleteRow(rowIndex);
-    }
-
-    public void DeleteRowsWithIndices(IEnumerable<int> rows) {
-      if (IsFiltered)
-        throw new InvalidOperationException("DeleteRowsWithIndices not possible while data is filtered");
-
-      originalData.DeleteRowsWithIndices(rows);
     }
 
@@ -156 +156 @@
     }
 
-    public bool AreAllStringColumns(IEnumerable<int> columnIndices) {
-      return originalData.AreAllStringColumns(columnIndices);
-    }
-    #endregion
-
-    #region Variables
-    public IEnumerable<string> VariableNames {
-      get { return ActiveData.VariableNames; }
-    }
-    public IEnumerable<string> GetDoubleVariableNames() {
-      return originalData.GetDoubleVariableNames();
-    }
     public string GetVariableName(int columnIndex) {
       return ActiveData.GetVariableName(columnIndex);
@@ -180 +168 @@
     }
 
-    public Type GetVariableType(int columnIndex) {
-      return ActiveData.GetVariableType(columnIndex);
-    }
-
-    public IList<string> InputVariables {
-      get { return ActiveData.InputVariables; }
-    }
-
-    public string TargetVariable {
-      get { return ActiveData.TargetVariable; }
-    } // optional
-    #endregion
-
-    #region Partitions
-    public IntRange TrainingPartition {
-      get { return originalData.TrainingPartition; }
-    }
-
-    public IntRange TestPartition {
-      get { return originalData.TestPartition; }
-    }
-    #endregion
-
-    #region Transformations
-    public IList<ITransformation> Transformations {
-      get { return originalData.Transformations; }
-    }
-    #endregion
-
-    #region Validation
-    public bool Validate(string value, out string errorMessage, int columnIndex) {
-      return originalData.Validate(value, out errorMessage, columnIndex);
-    }
-    #endregion
-
-    #region Import & Export
-    public void Import(IDataAnalysisProblemData problemData) {
-      if (IsFiltered)
-        throw new InvalidOperationException("Import not possible while data is filtered");
-      originalData.Import(problemData);
-    }
-
     public Dataset ExportToDataset() {
       return originalData.ExportToDataset();
     }
-    #endregion
-
-    #region Selection
-    public IDictionary<int, IList<int>> Selection {
-      get { return originalData.Selection; }
-      set { originalData.Selection = value; }
-    }
-
-    public void ClearSelection() {
-      originalData.ClearSelection();
-    }
-
-    public event EventHandler SelectionChanged {
-      add { originalData.SelectionChanged += value; }
-      remove { originalData.SelectionChanged -= value; }
-    }
-    #endregion
-
-    #region Transactions
-    public event DataPreprocessingChangedEventHandler Changed {
-      add { originalData.Changed += value; }
-      remove { originalData.Changed -= value; }
-    }
-
-    public bool IsUndoAvailable {
-      get { return IsFiltered ? false : originalData.IsUndoAvailable; }
-    }
-
-    public void Undo() {
-      if (IsFiltered)
-        throw new InvalidOperationException("Undo not possible while data is filtered");
-
-      originalData.Undo();
-    }
-
-    public void InTransaction(Action action, DataPreprocessingChangedEventType type = DataPreprocessingChangedEventType.Any) {
-      if (IsFiltered)
-        throw new InvalidOperationException("Transaction not possible while data is filtered");
-      originalData.InTransaction(action, type);
-    }
-
-    public void BeginTransaction(DataPreprocessingChangedEventType type) {
-      if (IsFiltered)
-        throw new InvalidOperationException("Transaction not possible while data is filtered");
-      originalData.BeginTransaction(type);
-    }
-
-    public void EndTransaction() {
-      originalData.EndTransaction();
-    }
-    #endregion
-
-    #region Statistics
-    public T GetMin<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetMin<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMax<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetMax<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMean<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetMean<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMedian<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) where T : IComparable<T> {
-      return ActiveData.GetMedian<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetMode<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) where T : IEquatable<T> {
-      return ActiveData.GetMode<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetStandardDeviation<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetStandardDeviation<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetVariance<T>(int columnIndex, bool considerSelection = false, T emptyValue = default(T)) {
-      return ActiveData.GetVariance<T>(columnIndex, considerSelection, emptyValue);
-    }
-    public T GetQuantile<T>(double alpha, int columnIndex, bool considerSelection = false, T emptyValue = default(T)) where T : IComparable<T> {
-      return ActiveData.GetQuantile<T>(alpha, columnIndex, considerSelection, emptyValue);
-    }
-    public int GetDistinctValues<T>(int columnIndex, bool considerSelection = false) {
-      return ActiveData.GetDistinctValues<T>(columnIndex, considerSelection);
-    }
-
-    public int GetMissingValueCount() {
-      return ActiveData.GetMissingValueCount();
-    }
-    public int GetMissingValueCount(int columnIndex) {
-      return ActiveData.GetMissingValueCount(columnIndex);
-    }
-    public int GetRowMissingValueCount(int rowIndex) {
-      return ActiveData.GetRowMissingValueCount(rowIndex);
-    }
-    #endregion
-
-    #region Filters
-    public void SetFilter(bool[] remainingRows) {
-      filteredData = (IPreprocessingData)originalData.Clone();
+
+    public void SetFilter(bool[] rowFilters) {
+      filteredData = (ITransactionalPreprocessingData)originalData.Clone();
       filteredData.InTransaction(() => {
-        var remainingIndices = Enumerable.Range(0, remainingRows.Length).Where(x => remainingRows[x]);
-
-        foreach (var v in filteredData.VariableNames) {
-          var ci = filteredData.GetColumnIndex(v);
-          if (filteredData.VariableHasType<double>(ci)) {
-            var values = filteredData.GetValues<double>(ci);
-            var filteredValues = remainingIndices.Select(x => values[x]).ToList();
-            filteredData.SetValues(ci, filteredValues);
-          } else if (filteredData.VariableHasType<DateTime>(ci)) {
-            var values = filteredData.GetValues<DateTime>(ci);
-            var filteredValues = remainingIndices.Select(x => values[x]).ToList();
-            filteredData.SetValues(ci, filteredValues);
-          } else if (filteredData.VariableHasType<string>(ci)) {
-            var values = filteredData.GetValues<string>(ci);
-            var filteredValues = remainingIndices.Select(x => values[x]).ToList();
-            filteredData.SetValues(ci, filteredValues);
+        for (int row = (rowFilters.Length - 1); row >= 0; --row) {
+          if (rowFilters[row]) {
+            filteredData.DeleteRow(row);
           }
         }
@@ -365 +206 @@
     }
 
-    public bool IsFiltered {
-      get { return filteredData != null; }
-    }
-
-    public event EventHandler FilterChanged;
-
     private void OnFilterChanged() {
       if (FilterChanged != null) {
@@ -376 +211 @@
       }
     }
+
+    public event DataPreprocessingChangedEventHandler Changed {
+      add { originalData.Changed += value; }
+      remove { originalData.Changed -= value; }
+    }
+
+    public bool SetValue(string value, int columnIndex, int rowIndex) {
+      if (IsFiltered)
+        throw new InvalidOperationException("SetValue not possible while data is filtered");
+      return originalData.SetValue(value, columnIndex, rowIndex);
+    }
+
+    public bool AreAllStringColumns(IEnumerable<int> columnIndices) {
+      return originalData.AreAllStringColumns(columnIndices);
+    }
+
+    public void DeleteRowsWithIndices(IEnumerable<int> rows) {
+      if (IsFiltered)
+        throw new InvalidOperationException("DeleteRowsWithIndices not possible while data is filtered");
+
+      originalData.DeleteRowsWithIndices(rows);
+    }
+
+    public void Undo() {
+      if (IsFiltered)
+        throw new InvalidOperationException("Undo not possible while data is filtered");
+
+      originalData.Undo();
+    }
+
+    public void InTransaction(Action action, DataPreprocessingChangedEventType type = DataPreprocessingChangedEventType.Any) {
+      if (IsFiltered)
+        throw new InvalidOperationException("Transaction not possible while data is filtered");
+      originalData.InTransaction(action, type);
+    }
+
+    public void BeginTransaction(DataPreprocessingChangedEventType type) {
+      if (IsFiltered)
+        throw new InvalidOperationException("Transaction not possible while data is filtered");
+      originalData.BeginTransaction(type);
+    }
+
+    public void EndTransaction() {
+      originalData.EndTransaction();
+    }
+
+    public IEnumerable<string> GetDoubleVariableNames() {
+      return originalData.GetDoubleVariableNames();
+    }
+
+    public void ClearSelection() {
+      originalData.ClearSelection();
+    }
+
+    public event EventHandler SelectionChanged {
+      add { originalData.SelectionChanged += value; }
+      remove { originalData.SelectionChanged -= value; }
+    }
+
+    #region IPreprocessingData Members
+    public bool Validate(string value, out string errorMessage, int columnIndex) {
+      return originalData.Validate(value, out errorMessage, columnIndex);
+    }
+
+    public event EventHandler FilterChanged;
     #endregion
   }