Changeset 10819 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3

Timestamp:

05/07/14 15:18:41 (10 years ago)

Author:

pfleck

Message:

• Implemented handling of transformation error messages.

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing/3.3/PreprocessingTransformator.cs (modified) (2 diffs)

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

@@ -33 +33 @@
     }
 
-    public bool ApplyTransformations(IEnumerable<ITransformation> transformations) {
-      bool success = true;
+    public bool ApplyTransformations(IEnumerable<ITransformation> transformations, out string errorMsg) {
+      bool success;
 
-      preprocessingData.InTransaction(() => {
+      preprocessingData.BeginTransaction(DataPreprocessingChangedEventType.Transformation);
+      try {
         var doubleTransformations = transformations.OfType<Transformation<double>>().ToList();
-        ApplyDoubleTranformations(doubleTransformations, out success);
-      }, DataPreprocessingChangedEventType.Transformation);
-
-      if (!success) {
-        preprocessingData.Undo();
+        ApplyDoubleTranformations(doubleTransformations, out success, out errorMsg);
+      } finally {
+        preprocessingData.EndTransaction();
+        //if (!success)
+        //preprocessingData.Undo();
       }
 
@@ -48 +49 @@
     }
 
-    private void ApplyDoubleTranformations(IEnumerable<Transformation<double>> transformations, out bool success) {
+    private void ApplyDoubleTranformations(IEnumerable<Transformation<double>> transformations, out bool success, out string errorMsg) {
+      errorMsg = string.Empty;
+      success = true;
       foreach (var transformation in transformations) {
         int colIndex = preprocessingData.GetColumnIndex(transformation.Column);
 
         var originalData = preprocessingData.GetValues<double>(colIndex);
-        var transformedData = ApplyDoubleTransformation(transformation, originalData, out success);
-        if (!success) return;
-
+        string errorMsgPart;
+        bool successPart;
+        var transformedData = ApplyDoubleTransformation(transformation, originalData, out successPart, out errorMsgPart);
+        errorMsg += errorMsgPart + Environment.NewLine;
+        //if (!success) return;
+        if (!successPart) success = false;
         preprocessingData.SetValues(colIndex, transformedData.ToList());
         preprocessingData.Transformations.Add(transformation);
       }
-      success = true;
+
     }
 
-    private IEnumerable<double> ApplyDoubleTransformation(Transformation<double> transformation, IEnumerable<double> data, out bool success) {
-      string errorMsg;
-      if (transformation.Check(data, out errorMsg)) {
-        success = true;
-        return transformation.Apply(data);
-      }
-      throw new NotImplementedException("Display Check Result");
+    private IEnumerable<double> ApplyDoubleTransformation(Transformation<double> transformation, IEnumerable<double> data, out bool success, out string errorMsg) {
+      success = transformation.Check(data, out errorMsg);
+      return transformation.Apply(data);
     }
   }