Changeset 10814

Timestamp:

05/07/14 14:22:08 (10 years ago)

Author:

pfleck

Message:

• Considered Transformations in Undo.
• Renamed PDSnapshot in Snapshot.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.DataPreprocessing.Views/3.3/TransformationView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/TransactionalPreprocessingData.cs (modified) (7 diffs)
• HeuristicLab.DataPreprocessing/3.3/Implementations/TransformationContent.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.3/PreprocessingTransformator.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 
 using System;
+using System.Windows.Forms;
+using HeuristicLab.Data;
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
@@ -54 +56 @@
       bool success = transformator.ApplyTransformations(transformations);
       if (success) {
+        //foreach (var transformation in transformations)
+        //  Content.CheckedTransformationCollection.SetItemCheckedState(transformation, false);
         Content.CheckedTransformationCollection.Clear();
+        MessageBox.Show(this, "Transformations applied.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
       }
     }

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Problems.DataAnalysis;
+using HeuristicLab.Problems.DataAnalysis.Transformations;
 
 namespace HeuristicLab.DataPreprocessing {
 
-  internal class PDSnapshot {
+  internal class Snapshot {
     public IList<IList> VariableValues { get; set; }
 
@@ -35 +36 @@
 
     public double TrainingToTestRatio { get; set; }
+
+    public IList<ITransformation> Transformations { get; set; }
 
     public DataPreprocessingChangedEventType ChangedType { get; set; }
@@ -48 +51 @@
     private const int MAX_UNDO_DEPTH = 5;
 
-    private IList<PDSnapshot> undoHistory;
+    private IList<Snapshot> undoHistory;
 
     private Stack<DataPreprocessingChangedEventType> eventStack = new Stack<DataPreprocessingChangedEventType>();
@@ -58 +61 @@
     public TransactionalPreprocessingData(IDataAnalysisProblemData problemData)
       : base(problemData) {
-      undoHistory = new List<PDSnapshot>();
+      undoHistory = new List<Snapshot>();
     }
 
     private TransactionalPreprocessingData(TransactionalPreprocessingData original, Cloner cloner)
       : base(original, cloner) {
-      undoHistory = new List<PDSnapshot>();
+      undoHistory = new List<Snapshot>();
     }
 
@@ -69 +72 @@
       if (eventStack.Count > 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;
+      var currentSnapshot = new Snapshot {
+        VariableValues = CopyVariableValues(variableValues),
+        VariableNames = new List<string>(variableNames),
+        TrainingToTestRatio = trainingToTestRatio,
+        Transformations = new List<ITransformation>(transformations),
+        ChangedType = changedType,
+        ChangedColumn = column,
+        ChangedRow = row
+      };
 
       if (undoHistory.Count >= MAX_UNDO_DEPTH)
@@ -151 +156 @@
     public void Undo() {
       if (IsUndoAvailable) {
-        PDSnapshot previousSnapshot = undoHistory[undoHistory.Count - 1];
+        Snapshot previousSnapshot = undoHistory[undoHistory.Count - 1];
         variableValues = previousSnapshot.VariableValues;
         variableNames = previousSnapshot.VariableNames;
         trainingToTestRatio = previousSnapshot.TrainingToTestRatio;
+        transformations = previousSnapshot.Transformations;
         undoHistory.Remove(previousSnapshot);
         OnChanged(previousSnapshot.ChangedType,
@@ -176 +182 @@
       if (eventStack.Count == 0)
         throw new InvalidOperationException("There is no open transaction that can be ended.");
-      
+
       var @event = eventStack.Pop();
       OnChanged(@event, -1, -1);

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

@@ -23 +23 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Problems.DataAnalysis.Transformations;
 

branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/PreprocessingTransformator.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using HeuristicLab.Problems.DataAnalysis.Symbolic;
 using HeuristicLab.Problems.DataAnalysis.Transformations;
 
@@ -43 +42 @@
 
       if (!success) {
-        // TODO: check undo remove transformations
         preprocessingData.Undo();
       }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblemData.cs

@@ -121 +121 @@
       if (!Parameters.ContainsKey(TransformationsParameterName)) {
         Parameters.Add(new FixedValueParameter<ReadOnlyItemCollection<ITransformation>>(TransformationsParameterName, "", new ItemCollection<ITransformation>().AsReadOnly()));
+        TransformationsParameter.Hidden = true;
       }
       RegisterEventHandlers();
@@ -151 +152 @@
       Parameters.Add(new FixedValueParameter<ReadOnlyItemCollection<ITransformation>>(TransformationsParameterName, "", transformationsCollection.AsReadOnly()));
 
+      TransformationsParameter.Hidden = true;
+
       ((ValueParameter<Dataset>)DatasetParameter).ReactOnValueToStringChangedAndValueItemImageChanged = false;
       RegisterEventHandlers();