Changeset 11156 for trunk/sources/HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.cs

Timestamp:

07/09/14 10:37:01 (9 years ago)

Author:

gkronber

Message:

#2206: made several changes / improvements to the data-preprocessing code while reviewing the code

File:

• trunk/sources/HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.DataPreprocessing/3.4/PreprocessingTransformator.cs

@@ -42 +42 @@
 
     public bool ApplyTransformations(IEnumerable<ITransformation> transformations, bool preserveColumns, out string errorMsg) {
-      bool success;
-
+      bool success = false;
+      errorMsg = string.Empty;
       preprocessingData.BeginTransaction(DataPreprocessingChangedEventType.Transformation);
 
@@ -64 +64 @@
           renamedColumns.Clear();
         }
+        // only accept changes if everything was successful
+        if (!success) {
+          preprocessingData.Undo();
+        }
+      }
+      catch (Exception e) {
+        preprocessingData.Undo();
+        if (string.IsNullOrEmpty(errorMsg)) errorMsg = e.Message;
       }
       finally {
@@ -103 +111 @@
     private IEnumerable<double> ApplyDoubleTransformation(Transformation<double> transformation, IList<double> data, out bool success, out string errorMsg) {
       success = transformation.Check(data, out errorMsg);
-      return transformation.Apply(data);
+      // don't apply when the check fails
+      if (success)
+        return transformation.Apply(data);
+      else
+        return data;
     }