Changeset 10586 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs

Timestamp:

03/12/14 17:03:45 (10 years ago)

Author:

tsteinre

Message:

• divided/refactored PreprocessingData into TransactionalPreprocessingData and preprocessingData

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs (copied) (copied from branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/PreprocessingData.cs) (7 diffs)

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

@@ -31 +31 @@
 namespace HeuristicLab.DataPreprocessing {
 
-  internal class PDSnapshot {
-    public IDictionary<int, IList> VariableValues { get; set; }
-
-    public IList<string> VariableNames { get; set; }
-
-    public double TrainingToTestRatio { get; set; }
-
-    public DataPreprocessingChangedEventType ChangedType { get; set; }
-
-    public int ChangedColumn { get; set; }
-
-    public int ChangedRow { get; set; }
-  }
-
   [Item("PreprocessingData", "Represents data used for preprocessing.")]
   public class PreprocessingData : NamedItem, IPreprocessingData {
 
-    private const int MAX_UNDO_DEPTH = 5;
-
-    private IDictionary<int, IList> variableValues;
-
-    private IList<string> variableNames;
-
-    private double trainingToTestRatio;
-
-    private IList<PDSnapshot> undoHistory;
-
-    //TODO: refactor extract Transaction logic in a own class
-    private int transactionDepth = 0;
-
-    private PreprocessingData(PreprocessingData original, Cloner cloner)
+    protected IDictionary<int, IList> variableValues;
+
+    protected IList<string> variableNames;
+
+    protected double trainingToTestRatio;
+
+    protected PreprocessingData(PreprocessingData original, Cloner cloner)
       : base(original, cloner) {
       variableValues = CopyVariableValues(original.variableValues);
       variableNames = new List<string>(original.variableNames);
       trainingToTestRatio = original.trainingToTestRatio;
-      undoHistory = new List<PDSnapshot>();
     }
 
@@ -92 +70 @@
 
       trainingToTestRatio = (double)problemData.TrainingPartition.Size / Math.Max(problemData.Dataset.Rows, double.Epsilon);
-      undoHistory = new List<PDSnapshot>();
     }
 
@@ -103 +80 @@
     }
 
-    private IDictionary<int, IList> CopyVariableValues(IDictionary<int, IList> original) {
+    protected IDictionary<int, IList> CopyVariableValues(IDictionary<int, IList> original) {
       var copy = new Dictionary<int, IList>(variableValues);
       for (int i = 0; i < original.Count; i++) {
@@ -111 +88 @@
     }
 
-    private void SaveSnapshot(DataPreprocessingChangedEventType changedType, int column, int row) {
-      if (transactionDepth > 0) return;
-
-      PDSnapshot currentSnapshot = new PDSnapshot();
-      currentSnapshot.VariableValues = CopyVariableValues(variableValues);
-      currentSnapshot.VariableNames = new List<string>(variableNames);
-      currentSnapshot.TrainingToTestRatio = trainingToTestRatio;
-      currentSnapshot.ChangedType = changedType;
-      currentSnapshot.ChangedColumn = column;
-      currentSnapshot.ChangedRow = row;
-
-      if (undoHistory.Count >= MAX_UNDO_DEPTH)
-        undoHistory.RemoveAt(0);
-
-      undoHistory.Add(currentSnapshot);
-    }
-
     #region NamedItem abstract Member Implementations
 
@@ -143 +103 @@
 
 
-    public void SetCell<T>(int columnIndex, int rowIndex, T value) {
-      SaveSnapshot(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
+    public virtual void SetCell<T>(int columnIndex, int rowIndex, T value) {
       variableValues[columnIndex][rowIndex] = value;
-      if (transactionDepth <= 0)
-        OnChanged(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
     }
 
@@ -165 +122 @@
     }
 
-    public void SetValues<T>(int columnIndex, IList<T> values) {
+    public virtual void SetValues<T>(int columnIndex, IList<T> values) {
       if (IsType<T>(columnIndex)) {
-        SaveSnapshot(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
         variableValues[columnIndex] = (IList)values;
       } else {
         throw new ArgumentException("The datatype of column " + columnIndex + " must be of type " + variableValues[columnIndex].GetType().Name + " but was " + typeof(T).Name);
       }
-      if (transactionDepth <= 0)
-        OnChanged(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
-    }
-
-    public void InsertRow(int rowIndex) {
-      SaveSnapshot(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
+    }
+
+    public virtual void InsertRow(int rowIndex) {
       foreach (IList column in variableValues.Values) {
         Type type = column.GetType().GetGenericArguments()[0];
         column.Insert(rowIndex, type.IsValueType ? Activator.CreateInstance(type) : null);
       }
-      if (transactionDepth <= 0)
-        OnChanged(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
-    }
-
-    public void DeleteRow(int rowIndex) {
-      SaveSnapshot(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
+    }
+
+    public virtual void DeleteRow(int rowIndex) {
       foreach (IList column in variableValues.Values) {
         column.RemoveAt(rowIndex);
       }
-      if (transactionDepth <= 0)
-        OnChanged(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
-    }
-
-    public void InsertColumn<T>(string variableName, int columnIndex) {
-      SaveSnapshot(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
+    }
+
+    public virtual void InsertColumn<T>(string variableName, int columnIndex) {
       variableValues.Add(columnIndex, new List<T>(Rows));
       variableNames.Insert(columnIndex, variableName);
-      if (transactionDepth <= 0)
-        OnChanged(DataPreprocessingChangedEventType.AddColumn, columnIndex, -1);
-    }
-
-    public void DeleteColumn(int columnIndex) {
-      SaveSnapshot(DataPreprocessingChangedEventType.AddColumn, columnIndex, -1);
+    }
+
+    public virtual void DeleteColumn(int columnIndex) {
       variableValues.Remove(columnIndex);
       variableNames.RemoveAt(columnIndex);
-      if (transactionDepth <= 0)
-        OnChanged(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
     }
 
@@ -252 +194 @@
       var dataset = new Dataset(variableNames, values);
       return dataset;
-    }
-
-    public event DataPreprocessingChangedEventHandler Changed;
-    protected virtual void OnChanged(DataPreprocessingChangedEventType type, int column, int row) {
-      var listeners = Changed;
-      if (listeners != null) listeners(this, new DataPreprocessingChangedEventArgs(type, column, row));
-    }
-
-    public bool IsUndoAvailable {
-      get { return undoHistory.Count > 0; }
-    }
-
-    public void Undo() {
-      if (IsUndoAvailable) {
-        PDSnapshot previousSnapshot = undoHistory[undoHistory.Count - 1];
-        variableValues = previousSnapshot.VariableValues;
-        variableNames = previousSnapshot.VariableNames;
-        trainingToTestRatio = previousSnapshot.TrainingToTestRatio;
-        undoHistory.Remove(previousSnapshot);
-        OnChanged(previousSnapshot.ChangedType,
-          previousSnapshot.ChangedColumn,
-          previousSnapshot.ChangedRow);
-      }
-    }
-
-    public void BeginTransaction() {
-      SaveSnapshot(DataPreprocessingChangedEventType.Any, -1, -1);
-      transactionDepth++;
-    }
-
-    public void EndTransaction() {
-      transactionDepth--;
-      if (transactionDepth < 0)
-        throw new InvalidOperationException("There is no open transaction that can be ended.");
-      if (transactionDepth == 0)
-        OnChanged(DataPreprocessingChangedEventType.Any, -1, -1);
     }