Changeset 10550

Timestamp:

03/05/14 17:14:26 (10 years ago)

Author:

tsteinre

Message:

implemented Undo-feature of PreprocessingData

Location:

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Files:

• HeuristicLab.DataPreprocessing-3.3.csproj (modified) (1 diff)
• Implementations/PreprocessingData.cs (modified) (11 diffs)
• Views/DataPreprocessingView.cs (modified) (1 diff)
• Views/DataPreprocessingView.designer.cs (modified) (6 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/HeuristicLab.DataPreprocessing-3.3.csproj

@@ -247 +247 @@
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Views\DataPreprocessingView.resx">
+      <DependentUpon>DataPreprocessingView.cs</DependentUpon>
+    </EmbeddedResource>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>

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

@@ -30 +30 @@
 
 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;
 
@@ -38 +55 @@
 
     private double trainingToTestRatio;
+
+    private IList<PDSnapshot> undoHistory;
 
     private PreprocessingData(PreprocessingData original, Cloner cloner)
       : base(original, cloner) {
-      variableValues = new Dictionary<int, IList>(original.variableValues);
-      for (int i = 0; i < variableValues.Count; i++)
-        variableValues[i] = new ArrayList(original.variableValues[i]);
+      variableValues = CopyVariableValues(original.variableValues);
       variableNames = new List<string>(original.variableNames);
       trainingToTestRatio = original.trainingToTestRatio;
+      undoHistory = new List<PDSnapshot>();
     }
 
@@ -71 +89 @@
 
       trainingToTestRatio = (double)problemData.TrainingPartition.Size / Math.Max(problemData.Dataset.Rows, double.Epsilon);
+      undoHistory = new List<PDSnapshot>();
     }
 
@@ -81 +100 @@
     }
 
+    private IDictionary<int, IList> CopyVariableValues(IDictionary<int, IList> original) {
+      var copy = new Dictionary<int, IList>(variableValues);
+      for (int i = 0; i < original.Count; i++) {
+        if (variableValues[i] is IList<double>) {
+          copy[i] = new List<double>((IList<double>)variableValues[i]);
+        } else if (variableValues[i] is IList<DateTime>) {
+          copy[i] = new List<DateTime>((IList<DateTime>)variableValues[i]);
+        } else if (variableValues[i] is IList<string>) {
+          copy[i] = new List<string>((IList<string>)variableValues[i]);
+        } else {
+          throw new NotImplementedException("The Type is not Supported");
+        }
+      }
+      return copy;
+    }
+
+    private void SaveSnapshot(DataPreprocessingChangedEventType changedType, int column, int row) {
+      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
 
@@ -96 +146 @@
 
 
-    public void SetCell<T>(int columnIndex, int rowIndex, T value) {    // Undo-sensitive
+    public void SetCell<T>(int columnIndex, int rowIndex, T value) {
+      SaveSnapshot(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
       variableValues[columnIndex][rowIndex] = value;
       OnChanged(DataPreprocessingChangedEventType.ChangeItem, columnIndex, rowIndex);
@@ -116 +167 @@
     }
 
-    public void SetValues<T>(int columnIndex, IList<T> values) {    // Undo-sensitive
+    public void SetValues<T>(int columnIndex, IList<T> values) {
       if (IsType<T>(columnIndex)) {
+        SaveSnapshot(DataPreprocessingChangedEventType.ChangeColumn, columnIndex, -1);
         variableValues[columnIndex] = (IList)values;
       } else {
@@ -125 +177 @@
     }
 
-    public void InsertRow(int rowIndex) {    // Undo-sensitive
+    public void InsertRow(int rowIndex) {
+      SaveSnapshot(DataPreprocessingChangedEventType.DeleteRow, -1, rowIndex);
       foreach (IList column in variableValues.Values) {
         Type type = column.GetType().GetGenericArguments()[0];
@@ -133 +186 @@
     }
 
-    public void DeleteRow(int rowIndex) {    // Undo-sensitive
+    public void DeleteRow(int rowIndex) {
+      SaveSnapshot(DataPreprocessingChangedEventType.AddRow, -1, rowIndex);
       foreach (IList column in variableValues.Values) {
         column.RemoveAt(rowIndex);
@@ -140 +194 @@
     }
 
-    public void InsertColumn<T>(string variableName, int columnIndex) {    // Undo-sensitive
+    public void InsertColumn<T>(string variableName, int columnIndex) {
+      SaveSnapshot(DataPreprocessingChangedEventType.DeleteColumn, columnIndex, -1);
       variableValues.Add(columnIndex, new List<T>(Rows));
       variableNames.Insert(columnIndex, variableName);
@@ -146 +201 @@
     }
 
-    public void DeleteColumn(int columnIndex) {    // Undo-sensitive
+    public void DeleteColumn(int columnIndex) {
+      SaveSnapshot(DataPreprocessingChangedEventType.AddColumn, columnIndex, -1);
       variableValues.Remove(columnIndex);
       variableNames.RemoveAt(columnIndex);
@@ -203 +259 @@
 
     public bool IsUndoAvailable {
-      get { throw new NotImplementedException(); }
+      get { return undoHistory.Count > 0; }
     }
 
     public void Undo() {
-      throw new NotImplementedException();
+      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);
+      }
     }
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.cs

@@ -140 +140 @@
       MainFormManager.MainForm.ShowContent(item);
     }
+
+    private void undoButton_Click(object sender, EventArgs e) {
+      Content.Data.Undo();
+    }
   }
 }

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/Views/DataPreprocessingView.designer.cs

@@ -45 +45 @@
     private void InitializeComponent() {
       this.components = new System.ComponentModel.Container();
+      System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DataPreprocessingView));
       this.splitContainer1 = new System.Windows.Forms.SplitContainer();
       this.undoButton = new System.Windows.Forms.Button();
@@ -81 +82 @@
       // undoButton
       // 
-      this.undoButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Undo;
+      this.undoButton.Image = ((System.Drawing.Image)(resources.GetObject("undoButton.Image")));
       this.undoButton.Location = new System.Drawing.Point(72, 14);
       this.undoButton.Name = "undoButton";
@@ -88 +89 @@
       this.toolTip.SetToolTip(this.undoButton, "Undo");
       this.undoButton.UseVisualStyleBackColor = true;
+      this.undoButton.Click += new System.EventHandler(this.undoButton_Click);
       // 
       // applyInNewTabButton
       // 
-      this.applyInNewTabButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Play;
+      this.applyInNewTabButton.Image = ((System.Drawing.Image)(resources.GetObject("applyInNewTabButton.Image")));
       this.applyInNewTabButton.Location = new System.Drawing.Point(42, 14);
       this.applyInNewTabButton.Name = "applyInNewTabButton";
@@ -102 +104 @@
       // exportProblemButton
       // 
-      this.exportProblemButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Save;
+      this.exportProblemButton.Image = ((System.Drawing.Image)(resources.GetObject("exportProblemButton.Image")));
       this.exportProblemButton.Location = new System.Drawing.Point(12, 14);
       this.exportProblemButton.Name = "exportProblemButton";
@@ -113 +115 @@
       // contentListView
       // 
-      this.contentListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.contentListView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.contentListView.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@@ -128 +130 @@
       // viewHost
       // 
-      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
       this.viewHost.Caption = "View";