Changeset 10580 for branches

Timestamp:

03/12/14 15:30:38 (11 years ago)

Author:

tsteinre

Message:

• Added transaction support for DataPreprocessing (Undo Feature)

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• Implementations/DataPreprocessingChangedEvent.cs (modified) (1 diff)
• Implementations/ManipulationLogic.cs (modified) (4 diffs)
• Implementations/PreprocessingData.cs (modified) (9 diffs)
• Interfaces/IPreprocessingData.cs (modified) (1 diff)

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

@@ -29 +29 @@
     DeleteRow,
     AddRow,
-    ChangeItem
+    ChangeItem,
+    Any
   }
 

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

@@ -126 +126 @@
       Random random = new Random();
 
+      preprocessingData.BeginTransaction();
       // process all given ranges - e.g. TrainingPartition, Trainingpartition
       foreach (IntRange range in ranges) {
@@ -138 +139 @@
         ReOrderToIndices(shuffledIndices);
       }
+      preprocessingData.EndTransaction();
     }
 
@@ -151 +153 @@
 
     public void ReOrderToIndices(IList<System.Tuple<int, int>> indices) {
+      preprocessingData.BeginTransaction();
       for (int i = 0; i < preprocessingData.Columns; ++i) {
         if (preprocessingData.IsType<double>(i)) {
@@ -160 +163 @@
         }
       }
+      preprocessingData.EndTransaction();
     }
 

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

@@ -57 +57 @@
 
     private IList<PDSnapshot> undoHistory;
+
+    //TODO: refactor extract Transaction logic in a own class
+    private int transactionDepth = 0;
 
     private PreprocessingData(PreprocessingData original, Cloner cloner)
@@ -109 +112 @@
 
     private void SaveSnapshot(DataPreprocessingChangedEventType changedType, int column, int row) {
+      if (transactionDepth > 0) return;
+
       PDSnapshot currentSnapshot = new PDSnapshot();
       currentSnapshot.VariableValues = CopyVariableValues(variableValues);
@@ -141 +146 @@
       SaveSnapshot(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
       variableValues[columnIndex][rowIndex] = value;
-      OnChanged(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
+      if (transactionDepth <= 0)
+        OnChanged(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
     }
 
@@ -166 +172 @@
         throw new ArgumentException("The datatype of column " + columnIndex + " must be of type " + variableValues[columnIndex].GetType().Name + " but was " + typeof(T).Name);
       }
-      OnChanged(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
+      if (transactionDepth <= 0)
+        OnChanged(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
     }
 
@@ -175 +182 @@
         column.Insert(rowIndex, type.IsValueType ? Activator.CreateInstance(type) : null);
       }
-      OnChanged(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
+      if (transactionDepth <= 0)
+        OnChanged(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
     }
 
@@ -183 +191 @@
         column.RemoveAt(rowIndex);
       }
-      OnChanged(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
+      if (transactionDepth <= 0)
+        OnChanged(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
     }
 
@@ -190 +199 @@
       variableValues.Add(columnIndex, new List<T>(Rows));
       variableNames.Insert(columnIndex, variableName);
-      OnChanged(DataPreprocessingChangedEventType.AddColumn, columnIndex, -1);
+      if (transactionDepth <= 0)
+        OnChanged(DataPreprocessingChangedEventType.AddColumn, columnIndex, -1);
     }
 
@@ -197 +207 @@
       variableValues.Remove(columnIndex);
       variableNames.RemoveAt(columnIndex);
-      OnChanged(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
-    }
-
+      if (transactionDepth <= 0)
+        OnChanged(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
+    }
 
     public IntRange TrainingPartition {
@@ -267 +277 @@
     }
 
+    public void BeginTransaction() {
+      SaveSnapshot(DataPreprocessingChangedEventType.Any, 0, 0); //TODO: fix event handling, so that the ints can be -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, 0, 0); //TODO: fix event handling, so that the ints can be -1, -1
+    }
+
     #endregion
   }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Interfaces/IPreprocessingData.cs

@@ -66 +66 @@
     bool IsUndoAvailable { get; }
     void Undo();
+    void BeginTransaction();
+    void EndTransaction();
   }
 }