Changeset 10805 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing

Timestamp:

05/07/14 11:04:44 (11 years ago)

Author:

tsteinre

Message:

• refactored PowerTransformation
• repaired Transformations / refactored TransactionalPreprocessingData

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/TransactionalPreprocessingData.cs (modified) (9 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Implementations/TransactionalPreprocessingData.cs ¶

@@ -50 +50 @@
     private IList<PDSnapshot> undoHistory;
 
-    private int transactionDepth = 0;
+    private Stack<DataPreprocessingChangedEventType> eventStack = new Stack<DataPreprocessingChangedEventType>();
+
+    private DataPreprocessingChangedEventType lastOccuredChangedType = DataPreprocessingChangedEventType.Any;
+
+    public bool IsInTransaction { get { return eventStack.Count > 0; } }
 
     public TransactionalPreprocessingData(IDataAnalysisProblemData problemData)
@@ -63 +67 @@
 
     private void SaveSnapshot(DataPreprocessingChangedEventType changedType, int column, int row) {
-      if (transactionDepth > 0) return;
+      if (eventStack.Count > 0) return;
 
       PDSnapshot currentSnapshot = new PDSnapshot();
@@ -92 +96 @@
       SaveSnapshot(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
       base.SetCell<T>(columnIndex, rowIndex, value);
-      if (transactionDepth <= 0)
+      if (!IsInTransaction)
         OnChanged(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
     }
@@ -99 +103 @@
       SaveSnapshot(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
       base.SetValues<T>(columnIndex, values);
-      if (transactionDepth <= 0)
+      if (!IsInTransaction)
         OnChanged(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
     }
@@ -106 +110 @@
       SaveSnapshot(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
       base.InsertRow(rowIndex);
-      if (transactionDepth <= 0)
+      if (!IsInTransaction)
         OnChanged(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
     }
@@ -113 +117 @@
       SaveSnapshot(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
       base.DeleteRow(rowIndex);
-      if (transactionDepth <= 0)
+      if (!IsInTransaction)
         OnChanged(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
     }
@@ -120 +124 @@
       SaveSnapshot(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
       base.InsertColumn<T>(variableName, columnIndex);
-      if (transactionDepth <= 0)
+      if (!IsInTransaction)
         OnChanged(DataPreprocessingChangedEventType.AddColumn, columnIndex, -1);
     }
@@ -127 +131 @@
       SaveSnapshot(DataPreprocessingChangedEventType.AddColumn, columnIndex, -1);
       base.DeleteColumn(columnIndex);
-      if (transactionDepth <= 0)
+      if (!IsInTransaction)
         OnChanged(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
     }
@@ -166 +170 @@
     public void BeginTransaction(DataPreprocessingChangedEventType type) {
       SaveSnapshot(type, -1, -1);
-      transactionDepth++;
+      eventStack.Push(type);
     }
 
     public void EndTransaction() {
-      transactionDepth--;
-      if (transactionDepth < 0)
+      if (eventStack.Count == 0)
         throw new InvalidOperationException("There is no open transaction that can be ended.");
-      if (transactionDepth == 0)
-        OnChanged(DataPreprocessingChangedEventType.Any, -1, -1);
+      
+      var @event = eventStack.Pop();
+      OnChanged(@event, -1, -1);
     }