Changeset 11011 for branches

Timestamp:

06/12/14 14:14:33 (10 years ago)

Author:

pfleck

Message:

• Cloned Model before backtransformation.
• Set new Model instead of whole Solution after backtransformation.

Location:

branches/DataPreprocessing

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IModelBacktransformator.cs (modified) (1 diff)

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs

@@ -48 +48 @@
 
     private void btn_SimplifyModel_Click(object sender, EventArgs e) {
-      InteractiveSymbolicRegressionSolutionSimplifierView view = new InteractiveSymbolicRegressionSolutionSimplifierView();
+      var view = new InteractiveSymbolicRegressionSolutionSimplifierView();
       view.Content = (SymbolicRegressionSolution)this.Content.Clone();
       view.Show();
@@ -70 +70 @@
       var mapper = new TransformationToSymbolicTreeMapper();
       var transformator = new SymbolicExpressionTreeBacktransformator(mapper);
+
       var transformations = Content.ProblemData.Transformations;
       var targetVar = Content.ProblemData.TargetVariable;
-      transformator.Backtransform(Content.Model, transformations, targetVar);
-      // TODO: cloning is needed for refreshing the view, find a better approach for this.
-      Content = (SymbolicRegressionSolution)Content.Clone();
+      var newModel = transformator.Backtransform(Content.Model, transformations, targetVar);
+      Content.Model = (ISymbolicRegressionModel)newModel;
+
       MessageBox.Show(this, "Backtransformation successful.");
     }

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicExpressionTreeBacktransformator.cs

@@ -34 +34 @@
     }
 
-    public void Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations, string targetVariable) {
-      var symbolicModel = (ISymbolicDataAnalysisModel)model;
+    public IDataAnalysisModel Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations, string targetVariable) {
+      var symbolicModel = (ISymbolicDataAnalysisModel)model.Clone();
 
       foreach (var transformation in transformations.Reverse()) {
         ApplyBacktransformation(transformation, symbolicModel.SymbolicExpressionTree, targetVariable);
       }
+
+      return symbolicModel;
     }
 

branches/DataPreprocessing/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IModelBacktransformator.cs

@@ -25 +25 @@
 namespace HeuristicLab.Problems.DataAnalysis {
   public interface IModelBacktransformator {
-    void Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations, string targetVariable);
+    IDataAnalysisModel Backtransform(IDataAnalysisModel model, IEnumerable<ITransformation> transformations, string targetVariable);
   }
 }