Changeset 15865 for branches/2906_Transformations

Timestamp:

03/27/18 15:46:12 (7 years ago)

Author:

pfleck

Message:

#2906 Added PreprocessingTransformation as a custom view-model for transformations in preprocessing.

Location:

branches/2906_Transformations

Files:

• HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj (modified) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/TransformationListView.Designer.cs (moved) (moved from branches/2906_Transformations/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.Designer.cs) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/TransformationListView.cs (moved) (moved from branches/2906_Transformations/HeuristicLab.DataPreprocessing.Views/3.4/CheckedTransformationListView.cs) (1 diff)
• HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.Designer.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.cs (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/Content/TransformationContent.cs (modified) (4 diffs)
• HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Data/IPreprocessingData.cs (modified) (1 diff)
• HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs (modified) (8 diffs)
• HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingTransformation.cs (added)
• HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj (modified) (2 diffs)
• HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs (modified) (7 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisTransformation.cs (modified) (6 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ExponentialTransformation.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LogarithmTransformation.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ZNormalizationTransformation.cs (modified) (4 diffs)

branches/2906_Transformations/HeuristicLab.DataPreprocessing.Views/3.4/HeuristicLab.DataPreprocessing.Views-3.4.csproj

@@ -202 +202 @@
       <DependentUpon>CheckedFilterCollectionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="CheckedTransformationListView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="CheckedTransformationListView.Designer.cs">
-      <DependentUpon>CheckedTransformationListView.cs</DependentUpon>
+    <Compile Include="TransformationListView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TransformationListView.Designer.cs">
+      <DependentUpon>TransformationListView.cs</DependentUpon>
     </Compile>
     <Compile Include="ComparisonFilterView.cs">

branches/2906_Transformations/HeuristicLab.DataPreprocessing.Views/3.4/TransformationListView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.DataPreprocessing.Views {
-  partial class CheckedTransformationListView {
+  partial class TransformationListView {
     /// <summary> 
     /// Required designer variable.

branches/2906_Transformations/HeuristicLab.DataPreprocessing.Views/3.4/TransformationListView.cs

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Collections;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Data;
 using HeuristicLab.MainForm;
-using HeuristicLab.Problems.DataAnalysis;
 
 namespace HeuristicLab.DataPreprocessing.Views {
-  [View("CheckedTransformationList View")]
-  [Content(typeof(ICheckedItemList<IDataAnalysisTransformation>), false)]
-  public partial class CheckedTransformationListView : CheckedItemListView<IDataAnalysisTransformation> {
+  [View("TransformationList View")]
+  [Content(typeof(IItemList<PreprocessingTransformation>), false)]
+  public partial class TransformationListView : ItemListView<PreprocessingTransformation> {
 
     internal IFilteredPreprocessingData PreprocessingData { get; set; }
 
-    public CheckedTransformationListView() {
+    public TransformationListView() {
       InitializeComponent();
       itemsGroupBox.Text = "Transformations";
     }
 
-    protected override IDataAnalysisTransformation CreateItem() {
-      var newTransformation = new DataAnalysisTransformation(PreprocessingData.VariableNames.Select(x => new StringValue(x)));
+    protected override PreprocessingTransformation CreateItem() {
+      var variableNames = PreprocessingData.VariableNames.Select(x => new StringValue(x))
+        .Concat(Content.Select(x => new StringValue(x.TransformedVariable))).Distinct();
+
+      var newTransformation = new PreprocessingTransformation(variableNames);
       newTransformation.TransformedVariableParameter.ValidValues.Add(new StringValue("<New Variable>"));
       return newTransformation;
-      //if (typeSelectorDialog == null) {
-      //  typeSelectorDialog = new TypeSelectorDialog();
-      //  typeSelectorDialog.Caption = "Select Transformation";
-      //  typeSelectorDialog.TypeSelector.Caption = "Available Transformations";
-      //  typeSelectorDialog.TypeSelector.Configure(typeof(IDataAnalysisTransformation), showNotInstantiableTypes: true, showGenericTypes: false, typeCondition: CanInstanciateTransformation);
-      //}
-
-      //if (typeSelectorDialog.ShowDialog(this) == DialogResult.OK) {
-      //  try {
-      //    // TODO: Avoid accessing parent view
-      //    var transformationView = (TransformationView)Parent;
-      //    var columnNames = transformationView.Content.PreprocessingData.VariableNames;
-
-      //    return (IDataAnalysisTransformation)typeSelectorDialog.TypeSelector.CreateInstanceOfSelectedType(new[] { columnNames });
-      //  } catch (Exception ex) {
-      //    ErrorHandling.ShowErrorDialog(this, ex);
-      //  }
-      //}
-      //return null;
     }
 
-    //private bool CanInstanciateTransformation(Type type) {
-    //  foreach (ConstructorInfo ctor in type.GetConstructors(BindingFlags.Public | BindingFlags.Instance)) {
-    //    ParameterInfo[] parameters = ctor.GetParameters();
-    //    if (parameters.Length == 1 && parameters[0].ParameterType == typeof(IEnumerable<string>)) return true;
-    //  }
-    //  return false;
-    //}
+    protected override void OnContentChanged() {
+      base.OnContentChanged();
+
+      if (Content == null) return;
+
+      int i = 0;
+      foreach (ListViewItem item in ItemsListView.Items) {
+        var transformation = PreprocessingData.Transformations[i];
+
+        item.ForeColor = transformation.IsApplied ? Color.Black : Color.Gray;
+        i++;
+      }
+      UpdateButtonsState();
+    }
+
+    protected override void Content_ItemsAdded(object sender, CollectionItemsChangedEventArgs<IndexedItem<PreprocessingTransformation>> e) {
+      base.Content_ItemsAdded(sender, e);
+
+      foreach (var transformation in e.Items) {
+        UpdateListViewItemsColor(transformation.Value);
+      }
+    }
+
+    protected override void RegisterItemEvents(PreprocessingTransformation item) {
+      base.RegisterItemEvents(item);
+      item.PropertyChanged += Item_PropertyChanged;
+    }
+    protected override void DeregisterItemEvents(PreprocessingTransformation item) {
+      item.PropertyChanged -= Item_PropertyChanged;
+      base.DeregisterItemEvents(item);
+    }
+
+    private void Item_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e) {
+      if (sender is PreprocessingTransformation transformation)
+        UpdateListViewItemsColor(transformation);
+    }
+
+    protected override void itemsListView_SelectedIndexChanged(object sender, EventArgs e) {
+      base.itemsListView_SelectedIndexChanged(sender, e);
+
+      UpdateButtonsState();
+    }
+
+    private void UpdateListViewItemsColor(PreprocessingTransformation transformation) {
+      foreach (ListViewItem item in itemListViewItemMapping[transformation]) {
+        item.ForeColor = transformation.IsApplied ? Color.Black : Color.Gray;
+      }
+    }
+
+    private void UpdateButtonsState() {
+      if (itemsListView.SelectedItems.Count != 1) return;
+      int selectedIndex = itemsListView.SelectedIndices[0];
+
+      // TODO: do not move/remove already applied transformations
+      // TODO: general disalow of movement?
+      if (Content[selectedIndex].IsApplied) {
+        moveUpButton.Enabled = selectedIndex > 0 && Content[selectedIndex - 1].IsApplied;
+        moveDownButton.Enabled = false;
+        removeButton.Enabled = false;
+      }
+    }
   }
 }

branches/2906_Transformations/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.Designer.cs

@@ -47 +47 @@
       this.applyButton = new System.Windows.Forms.Button();
       this.lblFilterNotice = new System.Windows.Forms.Label();
-      this.transformationListView = new HeuristicLab.DataPreprocessing.Views.CheckedTransformationListView();
+      this.transformationListView = new HeuristicLab.DataPreprocessing.Views.TransformationListView();
       this.SuspendLayout();
       // 
@@ -100 +100 @@
 
     #endregion
-    private CheckedTransformationListView transformationListView;
+    private TransformationListView transformationListView;
     private System.Windows.Forms.Button applyButton;
     private System.Windows.Forms.Label lblFilterNotice;

branches/2906_Transformations/HeuristicLab.DataPreprocessing.Views/3.4/TransformationView.cs

@@ -43 +43 @@
       if (Content == null) {
         transformationListView.Content = null;
+        transformationListView.PreprocessingData = null;
       } else {
-        transformationListView.Content = Content.CheckedTransformationList;
+        transformationListView.Content = Content.TransformationList;
         transformationListView.PreprocessingData = Content.PreprocessingData;
         CheckFilters();
@@ -78 +79 @@
 
       if (success) {
-        //Content.CheckedTransformationList.Clear();
+        //Content.TransformationList.Clear();
         MessageBox.Show(this, "Transformations applied.", "Success", MessageBoxButtons.OK, MessageBoxIcon.Information);
       } else {

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/Content/TransformationContent.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.DataPreprocessing {
+
   [Item("Transformation", "Represents the transformation grid.")]
   [StorableClass]
@@ -37 +38 @@
 
     [Storable]
-    public ICheckedItemList<IDataAnalysisTransformation> CheckedTransformationList { get; private set; }
+    public IItemList<PreprocessingTransformation> TransformationList { get; private set; }
 
     #region Constructor, Cloning & Persistence
     public TransformationContent(IFilteredPreprocessingData preprocessingData)
       : base(preprocessingData) {
-      CheckedTransformationList = new CheckedItemList<IDataAnalysisTransformation>();
+      TransformationList = new ItemList<PreprocessingTransformation>();
     }
 
     public TransformationContent(TransformationContent original, Cloner cloner)
       : base(original, cloner) {
-      CheckedTransformationList = cloner.Clone(original.CheckedTransformationList);
+      TransformationList = cloner.Clone(original.TransformationList);
     }
     public override IDeepCloneable Clone(Cloner cloner) {
@@ -59 +60 @@
 
     public bool ApplyTransformations(out IEnumerable<string> errorMessages) {
-      var transformations = CheckedTransformationList.CheckedItems.Select(x => x.Value);
-
       bool success = true;
       var errors = new List<string>();
       errorMessages = errors;
 
-      foreach (var transformation in transformations) {
+      foreach (var transformation in TransformationList.Where(x => !x.IsApplied)) {
         var sourceVariable = transformation.OriginalVariable;
         var targetVariable = transformation.TransformedVariable ?? sourceVariable + " Transformed";
@@ -86 +85 @@
 
           PreprocessingData.Transformations.Add(transformation);
-          CheckedTransformationList.SetItemCheckedState(transformation, false);
+          transformation.IsApplied = true;
+          // TODO: remove unused valid values in constrainedParameters
         } else {
           success = false;

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/Data/FilteredPreprocessingData.cs

@@ -204 +204 @@
 
     #region Transformations
-    public IList<IDataAnalysisTransformation> Transformations {
+    public IList<PreprocessingTransformation> Transformations {
       get { return originalData.Transformations; }
     }

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/Data/IPreprocessingData.cs

@@ -78 +78 @@
 
     #region Transformations
-    IList<IDataAnalysisTransformation> Transformations { get; }
+    IList<PreprocessingTransformation> Transformations { get; }
     #endregion
 

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/Data/PreprocessingData.cs

@@ -47 +47 @@
       Name = "Preprocessing Data";
 
-      Transformations = new List<IDataAnalysisTransformation>();
+      Transformations = new List<PreprocessingTransformation>();
       selection = new Dictionary<int, IList<int>>();
 
@@ -61 +61 @@
       TrainingPartition = (IntRange)original.TrainingPartition.Clone(cloner);
       TestPartition = (IntRange)original.TestPartition.Clone(cloner);
-      Transformations = new List<IDataAnalysisTransformation>(original.Transformations.Select(cloner.Clone));
+      Transformations = new List<PreprocessingTransformation>(original.Transformations.Select(cloner.Clone));
 
       InputVariables = new List<string>(original.InputVariables);
@@ -350 +350 @@
     #region Transformations
     [Storable]
-    public IList<IDataAnalysisTransformation> Transformations { get; protected set; }
+    public IList<PreprocessingTransformation> Transformations { get; protected set; }
     #endregion
 
@@ -414 +414 @@
       }
 
+      // TODO: set fixed constrained (allowed) values
+      foreach (var trans in problemData.Transformations) {
+        var newTrans = new PreprocessingTransformation(variableNames.Select(x => new StringValue(x))) {
+          OriginalVariable = trans.OriginalVariable,
+          TransformedVariable = trans.TransformedVariable,
+          IsApplied = true
+        };
+        var cloned = (ITransformation)trans.Transformation.Clone();
+        newTrans.TransformationParameter.ValidValues.Add(cloned);
+        newTrans.Transformation = cloned;
+        Transformations.Add(newTrans);
+      }
+
       TrainingPartition = new IntRange(problemData.TrainingPartition.Start, problemData.TrainingPartition.End);
       TestPartition = new IntRange(problemData.TestPartition.Start, problemData.TestPartition.End);
@@ -459 +472 @@
       public IntRange TrainingPartition { get; set; }
       public IntRange TestPartition { get; set; }
-      public IList<IDataAnalysisTransformation> Transformations { get; set; }
+      public IList<PreprocessingTransformation> Transformations { get; set; }
       public DataPreprocessingChangedEventType ChangedType { get; set; }
 
@@ -487 +500 @@
         TrainingPartition = new IntRange(TrainingPartition.Start, TrainingPartition.End),
         TestPartition = new IntRange(TestPartition.Start, TestPartition.End),
-        Transformations = new List<IDataAnalysisTransformation>(Transformations),
+        Transformations = new List<PreprocessingTransformation>(Transformations),
         ChangedType = changedType,
         ChangedColumn = column,
@@ -682 +695 @@
       l = 0;
       ir = n - 1;
-      for (;;) {
+      for (; ; ) {
         if (ir <= l + 1) {
           // Active partition contains 1 or 2 elements.
@@ -707 +720 @@
           j = ir;
           a = arr[l + 1]; // Partitioning element.
-          for (;;) { // Beginning of innermost loop.
+          for (; ; ) { // Beginning of innermost loop.
             do i++; while (arr[i].CompareTo(a) < 0); // Scan up to find element > a.
             do j--; while (arr[j].CompareTo(a) > 0); // Scan down to find element < a.

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/HeuristicLab.DataPreprocessing-3.4.csproj

@@ -107 +107 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Parameters-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\bin\HeuristicLab.Parameters-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.Persistence-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -134 +138 @@
     <Compile Include="Content\MultiScatterPlotContent.cs" />
     <Compile Include="Content\PreprocessingContent.cs" />
+    <Compile Include="Data\PreprocessingTransformation.cs" />
     <Compile Include="Content\SingleScatterPlotContent.cs" />
     <Compile Include="Content\ScatterPlotContent.cs" />

branches/2906_Transformations/HeuristicLab.DataPreprocessing/3.4/ProblemDataCreator.cs

@@ -34 +34 @@
     }
 
-    private IList<IDataAnalysisTransformation> Transformations {
+    private IList<PreprocessingTransformation> Transformations {
       get { return context.Data.Transformations; }
     }
@@ -76 +76 @@
         targetVariable = context.Data.VariableNames.First();
       var inputVariables = GetDoubleInputVariables(targetVariable);
-      var newProblemData = new TimeSeriesPrognosisProblemData(ExportedDataset, inputVariables, targetVariable, Transformations) {
+      var newProblemData = new TimeSeriesPrognosisProblemData(ExportedDataset, inputVariables, targetVariable, CreateDataAnalysisTransformation()) {
         TrainingHorizon = oldProblemData.TrainingHorizon,
         TestHorizon = oldProblemData.TestHorizon
@@ -85 +85 @@
     private IDataAnalysisProblemData CreateRegressionData(RegressionProblemData oldProblemData) {
       // TODO: transformations (additional inputs, target changed)
-      var targetVariable = RegressionProblemData.GetTransformedTragetVariable(oldProblemData.TargetVariable, Transformations);
+      var targetVariable = RegressionProblemData.GetTransformedTragetVariable(oldProblemData.TargetVariable, CreateDataAnalysisTransformation());
       if (!context.Data.VariableNames.Contains(targetVariable))
         targetVariable = context.Data.VariableNames.First();
       var inputVariables = GetDoubleInputVariables(targetVariable);
-      var newProblemData = new RegressionProblemData(ExportedDataset, inputVariables, targetVariable, Transformations);
+      var newProblemData = new RegressionProblemData(ExportedDataset, inputVariables, targetVariable, CreateDataAnalysisTransformation());
       return newProblemData;
     }
@@ -98 +98 @@
         targetVariable = context.Data.VariableNames.First();
       var inputVariables = GetDoubleInputVariables(targetVariable);
-      var newProblemData = new ClassificationProblemData(ExportedDataset, inputVariables, targetVariable, Transformations) {
+      var newProblemData = new ClassificationProblemData(ExportedDataset, inputVariables, targetVariable, CreateDataAnalysisTransformation()) {
         PositiveClass = oldProblemData.PositiveClass
       };
@@ -105 +105 @@
 
     private IDataAnalysisProblemData CreateClusteringData(ClusteringProblemData oldProblemData) {
-      return new ClusteringProblemData(ExportedDataset, GetDoubleInputVariables(String.Empty), Transformations);
+      return new ClusteringProblemData(ExportedDataset, GetDoubleInputVariables(String.Empty), CreateDataAnalysisTransformation());
     }
 
@@ -117 +117 @@
     }
 
-     void SetAllowedInputVariables(IDataAnalysisProblemData problemData, IEnumerable<string> oldInputVariables) {
-       var inputs = DataAnalysisProblemData.ExtendInputVariables(oldInputVariables, Transformations);
+    void SetAllowedInputVariables(IDataAnalysisProblemData problemData, IEnumerable<string> oldInputVariables) {
+      var inputs = DataAnalysisProblemData.ExtendInputVariables(oldInputVariables, problemData.Transformations);
 
       foreach (var input in problemData.InputVariables) {
@@ -142 +142 @@
       return context.Data.TrainingPartition.End - context.Data.TrainingPartition.Start > 1 || list.Range() > 0;
     }
+
+    private IEnumerable<IDataAnalysisTransformation> CreateDataAnalysisTransformation() {
+      return Transformations.Select(x => new DataAnalysisTransformation(x.OriginalVariable, x.TransformedVariable, (ITransformation)x.Transformation.Clone()));
+    }
   }
 }

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisTransformation.cs

@@ -21 +21 @@
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Runtime.CompilerServices;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +31 @@
   [StorableClass]
   public class DataAnalysisTransformation : ParameterizedNamedItem, IDataAnalysisTransformation {
-    #region Parameters
-    public IConstrainedValueParameter<StringValue> OriginalVariableParameter {
-      get { return (IConstrainedValueParameter<StringValue>)Parameters["Original Variable"]; }
+    #region Parameter Properties
+    private IFixedValueParameter<StringValue> OriginalVariableParameter {
+      get { return (IFixedValueParameter<StringValue>)Parameters["Original Variable"]; }
     }
 
-    public IConstrainedValueParameter<StringValue> TransformedVariableParameter {
-      get { return (IConstrainedValueParameter<StringValue>)Parameters["Transformed Variable"]; }
+    private IFixedValueParameter<StringValue> TransformedVariableParameter {
+      get { return (IFixedValueParameter<StringValue>)Parameters["Transformed Variable"]; }
     }
 
-    public IValueParameter<ITransformation> TransformationParameter {
+    private IValueParameter<ITransformation> TransformationParameter {
       get { return (IValueParameter<ITransformation>)Parameters["Transformation"]; }
     }
@@ -51 +48 @@
     public string OriginalVariable {
       get { return OriginalVariableParameter.Value.Value; }
-      set { SetConstrainedValue(OriginalVariableParameter, value); }
+      set { OriginalVariableParameter.Value.Value = value; }
     }
 
     public string TransformedVariable {
       get { return TransformedVariableParameter.Value.Value; }
-      set { SetConstrainedValue(TransformedVariableParameter, value); }
+      set { TransformedVariableParameter.Value.Value = value; }
     }
 
@@ -63 +60 @@
       set { TransformationParameter.Value = value; }
     }
-
-    private static void SetConstrainedValue(IConstrainedValueParameter<StringValue> parameter, string value, [CallerMemberName] string caller = null) {
-      if (value == null) throw new ArgumentNullException(caller);
-      if (value == parameter.Value.Value) return;
-
-      var matchingValue = parameter.ValidValues.SingleOrDefault(v => v.Value == value);
-      if (matchingValue == null) throw new ArgumentException("The provided value is not valid.", caller);
-      parameter.Value = matchingValue;
-    }
     #endregion
 
     #region Constructor, Cloning & Persistence
-    public DataAnalysisTransformation(IEnumerable<StringValue> variableNames)
+    public DataAnalysisTransformation()
+      : this("", "", new IdentityTransformation()) {
+    }
+    public DataAnalysisTransformation(string originalVariable, string transformedVariable, ITransformation transformation)
       : base() {
-      var originalVariables = new ItemSet<StringValue>(variableNames.Select(x => x.AsReadOnly()));
-      var transformedVariables = new ItemSet<StringValue>(variableNames.Select(x => x.AsReadOnly()));
-      Parameters.Add(new ConstrainedValueParameter<StringValue>("Original Variable", new ItemSet<StringValue>(originalVariables), originalVariables.FirstOrDefault()));
-      Parameters.Add(new ConstrainedValueParameter<StringValue>("Transformed Variable", new ItemSet<StringValue>(transformedVariables), transformedVariables.FirstOrDefault()));
-
-      //var transformations = new ItemSet<ITransformation>(ApplicationManager.Manager.GetInstances<ITransformation>());
-      Parameters.Add(new ValueParameter<ITransformation>("Transformation", new IdentityTransformation()));
+      Parameters.Add(new FixedValueParameter<StringValue>("Original Variable", new StringValue(originalVariable)));
+      Parameters.Add(new FixedValueParameter<StringValue>("Transformed Variable", new StringValue(transformedVariable)));
+      Parameters.Add(new ValueParameter<ITransformation>("Transformation", transformation));
 
       RegisterEventHandlers();
@@ -109 +96 @@
     #region Event-Handling
     private void RegisterEventHandlers() {
-      OriginalVariableParameter.ValueChanged += OriginalVariableParameter_ValueChanged;
-      TransformedVariableParameter.ValueChanged += TransformedVariableParameter_ValueChanged;
+      OriginalVariableParameter.Value.ValueChanged += OriginalVariableParameterValue_ValueChanged;
+      TransformedVariableParameter.Value.ValueChanged += TransformedVariableParameterValue_ValueChanged;
       TransformationParameter.ValueChanged += TransformationParameter_ValueChanged;
     }
 
-    private void OriginalVariableParameter_ValueChanged(object sender, EventArgs e) {
-      OriginalVariableParameter.Value.ValueChanged += OriginalVariableParameterValue_ValueChanged;
-      OnToStringChanged();
-    }
     private void OriginalVariableParameterValue_ValueChanged(object sender, EventArgs e) {
-      OnToStringChanged();
-    }
-
-    private void TransformedVariableParameter_ValueChanged(object sender, EventArgs e) {
-      TransformedVariableParameter.Value.ValueChanged += TransformedVariableParameterValue_ValueChanged;
       OnToStringChanged();
     }
@@ -129 +107 @@
       OnToStringChanged();
     }
-
     private void TransformationParameter_ValueChanged(object sender, EventArgs e) {
       OnToStringChanged();
     }
     #endregion
-
 
     public override string ToString() {

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ExponentialTransformation.cs

@@ -49 +49 @@
     public ExponentialTransformation()
       : base() {
-      Parameters.Add(new FixedValueParameter<DoubleValue>("Base", "Base the logarithm", new DoubleValue(Math.E)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("Base", "", new DoubleValue(Math.E)));
     }
 
@@ -65 +65 @@
     #endregion
 
-    public override bool Check(IEnumerable<double> data, out string errorMessage) {
-      if (data.Any(x => x <= 0)) {
-        errorMessage = "Log is not available for zero or negative values";
-        return false;
-      }
-      return base.Check(data, out errorMessage);
-    }
-
     public override IEnumerable<double> Apply(IEnumerable<double> data) {
       return Apply(data, Base);
@@ -80 +72 @@
       return InverseApply(data, Base);
     }
+
 
     public static IEnumerable<double> Apply(IEnumerable<double> data, double @base = Math.E) {

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LinearTransformation.cs

@@ -46 +46 @@
     public double Slope {
       get { return SlopeParameter.Value.Value; }
-      set { SlopeParameter.Value.Value = value; }
+      set { SlopeParameter.Value.Value = value; } //TODO: check for != 0?
     }
 

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/LogarithmTransformation.cs

@@ -81 +81 @@
     }
 
+
     public static IEnumerable<double> Apply(IEnumerable<double> data, double @base = Math.E) {
       return data.Select(x => Math.Log(x, @base));

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Transformations/ZNormalizationTransformation.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.DataAnalysis {
-  [Item("Z-Score Normalization", "Z-Score normalization transformation to standardize (target_mu = 0, target_sigma = 1) the values")]
+  [Item("Z-Score Normalization", "Z-Score normalization transformation to standardize the values to a Target Mean and Target Standard Deviation.")]
   [StorableClass]
   public class ZNormalizationTransformation : Transformation<double> {
@@ -58 +58 @@
     public double OriginalMean {
       get { return OriginalMeanParameter.Value.Value; }
-      set { OriginalMeanParameter.Value.Value = value; }
+      private set { OriginalMeanParameter.Value.Value = value; }
     }
     public double OriginalStandardDeviation {
       get { return OriginalStandardDeviationParameter.Value.Value; }
-      set { OriginalStandardDeviationParameter.Value.Value = value; }
+      private set { OriginalStandardDeviationParameter.Value.Value = value; }
     }
     #endregion
@@ -103 +103 @@
 
     public override IEnumerable<double> Apply(IEnumerable<double> data) {
-      if (double.IsNaN(OriginalMean) || double.IsNaN(OriginalStandardDeviation))
+      if (double.IsNaN(OriginalMean) || double.IsNaN(OriginalStandardDeviation)) //TODO isConfigured field?
         Configure(data);
 
@@ -112 +112 @@
       return InverseApply(data, TargetMean, TargetStandardDeviation, OriginalMean, OriginalStandardDeviation);
     }
+
 
     public static IEnumerable<double> Apply(IEnumerable<double> data, double targetMean, double targetStandardDeviation, double originalMean = double.NaN, double originalStandardDeviation = double.NaN) {