Changeset 15870 for branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4

Timestamp:

03/28/18 17:17:31 (6 years ago)

Author:

pfleck

Message:

#2906

• Implemented for classification, clustering, etc.
• Simplified Transformation interfaces (read-only, ...).
• Started moving transformation logic out of ProblemData.

Location:

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4

Files:

• DataAnalysisTransformationModelView.Designer.cs (moved) (moved from branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/TransformedRegressionModelView.Designer.cs) (4 diffs)
• DataAnalysisTransformationModelView.cs (moved) (moved from branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/TransformedRegressionModelView.cs) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)
• Solution Views/DataAnalysisSolutionView.Designer.cs (modified) (6 diffs)
• Solution Views/DataAnalysisSolutionView.cs (modified) (7 diffs)
• Solution Views/RegressionSolutionView.Designer.cs (modified) (3 diffs)
• Solution Views/RegressionSolutionView.cs (modified) (4 diffs)
• Solution Views/TransformedRegressionSolutionView.Designer.cs (deleted)
• Solution Views/TransformedRegressionSolutionView.cs (deleted)

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisTransformationModelView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  partial class TransformedRegressionModelView {
+  partial class DataAnalysisTransformationModelView {
     /// <summary> 
     /// Required designer variable.
@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
+      this.originalModelTabPage = new System.Windows.Forms.TabPage();
+      this.modelViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.tabControl = new System.Windows.Forms.TabControl();
-      this.tabPageModel = new System.Windows.Forms.TabPage();
-      this.tabPageTransformations = new System.Windows.Forms.TabPage();
-      this.modelViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.transformationsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.inputTransformationsTabPage = new System.Windows.Forms.TabPage();
+      this.inputTransformationsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.targetTransformationsTabPage = new System.Windows.Forms.TabPage();
+      this.targetTransformationsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
+      this.originalModelTabPage.SuspendLayout();
       this.tabControl.SuspendLayout();
-      this.tabPageModel.SuspendLayout();
-      this.tabPageTransformations.SuspendLayout();
+      this.inputTransformationsTabPage.SuspendLayout();
+      this.targetTransformationsTabPage.SuspendLayout();
       this.SuspendLayout();
+      // 
+      // originalModelTabPage
+      // 
+      this.originalModelTabPage.Controls.Add(this.modelViewHost);
+      this.originalModelTabPage.Location = new System.Drawing.Point(4, 22);
+      this.originalModelTabPage.Name = "originalModelTabPage";
+      this.originalModelTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.originalModelTabPage.Size = new System.Drawing.Size(486, 392);
+      this.originalModelTabPage.TabIndex = 0;
+      this.originalModelTabPage.Text = "Original Model";
+      this.originalModelTabPage.UseVisualStyleBackColor = true;
+      // 
+      // modelViewHost
+      // 
+      this.modelViewHost.Caption = "View";
+      this.modelViewHost.Content = null;
+      this.modelViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.modelViewHost.Enabled = false;
+      this.modelViewHost.Location = new System.Drawing.Point(3, 3);
+      this.modelViewHost.Name = "modelViewHost";
+      this.modelViewHost.ReadOnly = false;
+      this.modelViewHost.Size = new System.Drawing.Size(480, 386);
+      this.modelViewHost.TabIndex = 0;
+      this.modelViewHost.ViewsLabelVisible = true;
+      this.modelViewHost.ViewType = null;
       // 
       // tabControl
       // 
-      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
-            | System.Windows.Forms.AnchorStyles.Left)
+      this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.tabPageModel);
-      this.tabControl.Controls.Add(this.tabPageTransformations);
+      this.tabControl.Controls.Add(this.originalModelTabPage);
+      this.tabControl.Controls.Add(this.inputTransformationsTabPage);
+      this.tabControl.Controls.Add(this.targetTransformationsTabPage);
       this.tabControl.Location = new System.Drawing.Point(3, 3);
       this.tabControl.Name = "tabControl";
@@ -68 +97 @@
       this.tabControl.TabIndex = 0;
       // 
-      // tabPageModel
+      // inputTransformationsTabPage
       // 
-      this.tabPageModel.Controls.Add(this.modelViewHost);
-      this.tabPageModel.Location = new System.Drawing.Point(4, 22);
-      this.tabPageModel.Name = "tabPageModel";
-      this.tabPageModel.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPageModel.Size = new System.Drawing.Size(486, 392);
-      this.tabPageModel.TabIndex = 0;
-      this.tabPageModel.Text = "Original Model";
-      this.tabPageModel.UseVisualStyleBackColor = true;
+      this.inputTransformationsTabPage.Controls.Add(this.inputTransformationsViewHost);
+      this.inputTransformationsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.inputTransformationsTabPage.Name = "inputTransformationsTabPage";
+      this.inputTransformationsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.inputTransformationsTabPage.Size = new System.Drawing.Size(486, 392);
+      this.inputTransformationsTabPage.TabIndex = 1;
+      this.inputTransformationsTabPage.Text = "Input Transformations";
+      this.inputTransformationsTabPage.UseVisualStyleBackColor = true;
       // 
-      // tabPageTransformations
+      // inputTransformationsViewHost
       // 
-      this.tabPageTransformations.Controls.Add(this.transformationsViewHost);
-      this.tabPageTransformations.Location = new System.Drawing.Point(4, 22);
-      this.tabPageTransformations.Name = "tabPageTransformations";
-      this.tabPageTransformations.Padding = new System.Windows.Forms.Padding(3);
-      this.tabPageTransformations.Size = new System.Drawing.Size(486, 392);
-      this.tabPageTransformations.TabIndex = 1;
-      this.tabPageTransformations.Text = "Transformations";
-      this.tabPageTransformations.UseVisualStyleBackColor = true;
+      this.inputTransformationsViewHost.Caption = "View";
+      this.inputTransformationsViewHost.Content = null;
+      this.inputTransformationsViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.inputTransformationsViewHost.Enabled = false;
+      this.inputTransformationsViewHost.Location = new System.Drawing.Point(3, 3);
+      this.inputTransformationsViewHost.Name = "inputTransformationsViewHost";
+      this.inputTransformationsViewHost.ReadOnly = false;
+      this.inputTransformationsViewHost.Size = new System.Drawing.Size(480, 386);
+      this.inputTransformationsViewHost.TabIndex = 1;
+      this.inputTransformationsViewHost.ViewsLabelVisible = false;
+      this.inputTransformationsViewHost.ViewType = null;
       // 
-      // modelViewHost
+      // targetTransformationsTabPage
       // 
-      this.modelViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.modelViewHost.Location = new System.Drawing.Point(3, 3);
-      this.modelViewHost.Name = "modelViewHost";
-      this.modelViewHost.Size = new System.Drawing.Size(480, 386);
-      this.modelViewHost.TabIndex = 0;
+      this.targetTransformationsTabPage.Controls.Add(this.targetTransformationsViewHost);
+      this.targetTransformationsTabPage.Location = new System.Drawing.Point(4, 22);
+      this.targetTransformationsTabPage.Name = "targetTransformationsTabPage";
+      this.targetTransformationsTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.targetTransformationsTabPage.Size = new System.Drawing.Size(486, 392);
+      this.targetTransformationsTabPage.TabIndex = 2;
+      this.targetTransformationsTabPage.Text = "Target Transformations";
+      this.targetTransformationsTabPage.UseVisualStyleBackColor = true;
       // 
-      // transformationsViewHost
+      // targetTransformationsViewHost
       // 
-      this.transformationsViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
-      this.transformationsViewHost.Location = new System.Drawing.Point(3, 3);
-      this.transformationsViewHost.Name = "transformationsViewHost";
-      this.transformationsViewHost.Size = new System.Drawing.Size(480, 386);
-      this.transformationsViewHost.TabIndex = 0;
+      this.targetTransformationsViewHost.Caption = "View";
+      this.targetTransformationsViewHost.Content = null;
+      this.targetTransformationsViewHost.Dock = System.Windows.Forms.DockStyle.Fill;
+      this.targetTransformationsViewHost.Enabled = false;
+      this.targetTransformationsViewHost.Location = new System.Drawing.Point(3, 3);
+      this.targetTransformationsViewHost.Name = "targetTransformationsViewHost";
+      this.targetTransformationsViewHost.ReadOnly = false;
+      this.targetTransformationsViewHost.Size = new System.Drawing.Size(480, 386);
+      this.targetTransformationsViewHost.TabIndex = 1;
+      this.targetTransformationsViewHost.ViewsLabelVisible = false;
+      this.targetTransformationsViewHost.ViewType = null;
       // 
-      // TransformedRegressionModelView
+      // DataAnalysisTransformationModelView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
       this.Controls.Add(this.tabControl);
-      this.Name = "TransformedRegressionModelView";
+      this.Name = "DataAnalysisTransformationModelView";
       this.Size = new System.Drawing.Size(500, 424);
+      this.originalModelTabPage.ResumeLayout(false);
       this.tabControl.ResumeLayout(false);
-      this.tabPageModel.ResumeLayout(false);
-      this.tabPageTransformations.ResumeLayout(false);
+      this.inputTransformationsTabPage.ResumeLayout(false);
+      this.targetTransformationsTabPage.ResumeLayout(false);
       this.ResumeLayout(false);
 
@@ -122 +164 @@
     #endregion
 
+    private System.Windows.Forms.TabPage originalModelTabPage;
+    private MainForm.WindowsForms.ViewHost modelViewHost;
     private System.Windows.Forms.TabControl tabControl;
-    private System.Windows.Forms.TabPage tabPageModel;
-    private System.Windows.Forms.TabPage tabPageTransformations;
-    private HeuristicLab.MainForm.WindowsForms.ViewHost modelViewHost;
-    private HeuristicLab.MainForm.WindowsForms.ViewHost transformationsViewHost;
+    private System.Windows.Forms.TabPage inputTransformationsTabPage;
+    private System.Windows.Forms.TabPage targetTransformationsTabPage;
+    private MainForm.WindowsForms.ViewHost inputTransformationsViewHost;
+    private MainForm.WindowsForms.ViewHost targetTransformationsViewHost;
   }
 }

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisTransformationModelView.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Transformed regression model")]
-  [Content(typeof(ITransformedRegressionModel), true)]
-  public partial class TransformedRegressionModelView : ItemView {
+  [View("Transformation Model View")]
+  [Content(typeof(IDataAnalysisTransformationModel), true)]
+  public partial class DataAnalysisTransformationModelView : ItemView {
 
-    public new ITransformedRegressionModel Content {
-      get { return (ITransformedRegressionModel)base.Content; }
+    public new IDataAnalysisTransformationModel Content {
+      get { return (IDataAnalysisTransformationModel)base.Content; }
       set { base.Content = value; }
     }
 
-    public TransformedRegressionModelView() {
+    public DataAnalysisTransformationModelView() {
       InitializeComponent();
     }
@@ -40 +40 @@
       base.OnContentChanged();
       modelViewHost.Content = Content?.OriginalModel;
-      transformationsViewHost.Content = Content?.Transformations;
+      inputTransformationsViewHost.Content = Content?.InputTransformations;
+      targetTransformationsTabPage.Visible = Content is IRegressionTransformationModel;
+      targetTransformationsViewHost.Content = Content?.TargetTransformations;
     }
 
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      tabControl.Enabled = Content != null;
+      tabControl.Enabled = Content != null && !Locked;
     }
   }

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -432 +432 @@
       <DependentUpon>RegressionSolutionScatterPlotView.cs</DependentUpon>
     </Compile>
-    <Compile Include="Regression\TransformedRegressionModelView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Regression\TransformedRegressionModelView.Designer.cs">
-      <DependentUpon>TransformedRegressionModelView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Solution Views\TransformedRegressionSolutionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Solution Views\TransformedRegressionSolutionView.Designer.cs">
-      <DependentUpon>TransformedRegressionSolutionView.cs</DependentUpon>
+    <Compile Include="DataAnalysisTransformationModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DataAnalysisTransformationModelView.Designer.cs">
+      <DependentUpon>DataAnalysisTransformationModelView.cs</DependentUpon>
     </Compile>
     <Compile Include="Solution Views\ClassificationSolutionView.cs">

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.Designer.cs

@@ -47 +47 @@
       this.flowLayoutPanel = new System.Windows.Forms.FlowLayoutPanel();
       this.loadProblemDataButton = new System.Windows.Forms.Button();
+      this.transformButton = new System.Windows.Forms.Button();
       this.loadProblemDataFileDialog = new System.Windows.Forms.OpenFileDialog();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
@@ -54 +55 @@
       this.itemsGroupBox.SuspendLayout();
       this.detailsGroupBox.SuspendLayout();
+      this.flowLayoutPanel.SuspendLayout();
       this.SuspendLayout();
       //
@@ -77 +79 @@
       //
       // flowLayoutPanel
-      //
-      this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-      this.flowLayoutPanel.FlowDirection = System.Windows.Forms.FlowDirection.LeftToRight;
+      // 
+      this.flowLayoutPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+      this.flowLayoutPanel.Controls.Add(this.loadProblemDataButton);
+      this.flowLayoutPanel.Controls.Add(this.transformButton);
       this.flowLayoutPanel.Location = new System.Drawing.Point(0, 0);
+      this.flowLayoutPanel.Name = "flowLayoutPanel";
       this.flowLayoutPanel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
       this.flowLayoutPanel.Size = new System.Drawing.Size(266, 30);
-      this.flowLayoutPanel.Controls.Add(this.loadProblemDataButton);
-      //
+      this.flowLayoutPanel.TabIndex = 1;
+      // 
       // loadProblemDataButton
-      //
+      // 
       this.loadProblemDataButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
       this.loadProblemDataButton.AutoSize = true;
@@ -98 +103 @@
       this.loadProblemDataButton.UseVisualStyleBackColor = true;
       this.loadProblemDataButton.Click += new System.EventHandler(this.loadProblemDataButton_Click);
-      this.toolTip.SetToolTip(this.loadProblemDataButton, "Creates a new data analysis solution with the same model and the loaded problem data.");
       // 
-      // openFileDialog
+      // transformButton
+      // 
+      this.transformButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
+      this.transformButton.Location = new System.Drawing.Point(6, 33);
+      this.transformButton.Name = "transformButton";
+      this.transformButton.Size = new System.Drawing.Size(152, 23);
+      this.transformButton.TabIndex = 7;
+      this.transformButton.Text = "Integrate Transformations";
+      this.transformButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+      this.transformButton.UseVisualStyleBackColor = true;
+      this.transformButton.Click += new System.EventHandler(this.transformButton_Click);
+      // 
+      // loadProblemDataFileDialog
       // 
       this.loadProblemDataFileDialog.Filter = "HL files|*.hl";
@@ -115 +131 @@
       this.itemsGroupBox.ResumeLayout(false);
       this.detailsGroupBox.ResumeLayout(false);
+      this.flowLayoutPanel.ResumeLayout(false);
+      this.flowLayoutPanel.PerformLayout();
       this.ResumeLayout(false);
 
@@ -124 +142 @@
     protected System.Windows.Forms.OpenFileDialog loadProblemDataFileDialog;
     protected System.Windows.Forms.FlowLayoutPanel flowLayoutPanel;
-
+    protected System.Windows.Forms.Button transformButton;
   }
 }

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/DataAnalysisSolutionView.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
@@ -37 +38 @@
   [Content(typeof(DataAnalysisSolution), false)]
   public partial class DataAnalysisSolutionView : NamedItemCollectionView<IResult> {
+
+    private const string BacktransformButtonText = "Integrate Transformations";
+    private const string ReapplyTransformationsButtonText = "Restore Original Model";
+
     public DataAnalysisSolutionView() {
       InitializeComponent();
       viewHost.ViewsLabelVisible = false;
+      transformButton.Image = VSImageLibrary.Event;
     }
 
@@ -52 +58 @@
       removeButton.Enabled = false;
       loadProblemDataButton.Enabled = Content != null && !Locked;
+      transformButton.Enabled = Content != null && !Locked;
+      transformButton.Visible = Content != null && Content.ProblemData.Transformations.Any();
     }
 
@@ -81 +89 @@
         }
       }
+
+      if (Content == null) return;
+
+      transformButton.Text = Content.Model is IDataAnalysisTransformationModel
+        ? ReapplyTransformationsButtonText : BacktransformButtonText;
     }
 
@@ -147 +160 @@
           solution.Name += " with loaded problemData";
         MainFormManager.MainForm.ShowContent(solution);
-      }
-      catch (InvalidOperationException invalidOperationException) {
+      } catch (InvalidOperationException invalidOperationException) {
         ErrorHandling.ShowErrorDialog(this, invalidOperationException);
-      }
-      catch (ArgumentException argumentException) {
+      } catch (ArgumentException argumentException) {
         ErrorHandling.ShowErrorDialog(this, argumentException);
       }
@@ -238 +249 @@
         Content.Filename = string.Empty;
         MainFormManager.GetMainForm<HeuristicLab.MainForm.WindowsForms.MainForm>().UpdateTitle();
-      }
-      catch (InvalidOperationException invalidOperationException) {
+      } catch (InvalidOperationException invalidOperationException) {
         ErrorHandling.ShowErrorDialog(this, invalidOperationException);
-      }
-      catch (ArgumentException argumentException) {
+      } catch (ArgumentException argumentException) {
         ErrorHandling.ShowErrorDialog(this, argumentException);
       }
@@ -248 +257 @@
     #endregion
 
+    private void transformButton_Click(object sender, EventArgs e) {
+      var transformedSolution = CreateTransformedSolution(Content);
+      MainFormManager.MainForm.ShowContent(transformedSolution);
+    }
+
+    private static IDataAnalysisSolution CreateTransformedSolution(IDataAnalysisSolution solution) {
+      if (solution.Model is IRegressionTransformationModel regressionTransformationModel && !(solution.Model is ITimeSeriesPrognosisTransformationModel)) {
+        var originalData = (IRegressionProblemData)((IRegressionSolution)solution).ProblemData.Transform();
+        return regressionTransformationModel.OriginalModel.CreateRegressionSolution(originalData);
+      } else if (solution.Model is IClassificationTransformationModel classificationTransformationModel) {
+        var originalData = (IClassificationProblemData)((IClassificationSolution)solution).ProblemData.Transform();
+        return classificationTransformationModel.OriginalModel.CreateClassificationSolution(originalData);
+      } else if (solution.Model is IRegressionModel regressionModel && !(solution.Model is ITimeSeriesPrognosisModel)) {
+        var transformationModel = new RegressionTransformationModel(regressionModel, solution.ProblemData.Transformations);
+        var transformedData = (IRegressionProblemData)((IRegressionSolution)solution).ProblemData.InverseTransform();
+        return transformationModel.CreateRegressionSolution(transformedData);
+      } else if (solution.Model is IClassificationModel classificationModel) {
+        var transformationModel = new ClassificationTransformationModel(classificationModel, solution.ProblemData.Transformations);
+        var transformedData = (IClassificationProblemData)((IClassificationSolution)solution).ProblemData.InverseTransform();
+        return transformationModel.CreateClassificationSolution(transformedData);
+      } else throw new NotSupportedException();
+    }
+
+    /*if (Content.Model is IDataAnalysisTransformationModel transformationModel) {
+      var originalModel = transformationModel.InverseTransform();
+      originalModel.CreateSolution();
+    } else {
+      var originalModel = Content.Model;
+      var transformationModel = originalModel.Transform();
+      transformationModel.CreateSolution();
+    }*/
+
+    ////Content.Model.Transform()
+
+    //var transformedModel = new DataAnalysisTransformationModel(Content.Model, Content.ProblemData.Transformations);
+    //var originalProblemData = (IRegressionProblemData)Content.ProblemData.InverseTransform();
+    //var transformedSolution = new TransformedRegressionSolution(transformedModel, originalProblemData);
+    //MainFormManager.MainForm.ShowContent(transformedSolution);
   }
 }

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.Designer.cs

@@ -48 +48 @@
     private void InitializeComponent() {
       System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RegressionSolutionView));
-      this.TransformButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -72 +71 @@
       this.toolTip.SetToolTip(this.removeButton, "Remove");
       // 
-      // TransformButton
-      // 
-      this.TransformButton.AutoSize = true;
-      this.TransformButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-      this.TransformButton.Location = new System.Drawing.Point(117, 3);
-      this.TransformButton.Name = "TransformButton";
-      this.TransformButton.Size = new System.Drawing.Size(108, 23);
-      this.TransformButton.TabIndex = 1;
-      this.TransformButton.Text = "Transform Back";
-      this.TransformButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-      this.toolTip.SetToolTip(this.TransformButton, "TODO: Backtransform model based on the stored transformations.");
-      this.TransformButton.UseVisualStyleBackColor = true;
-      this.TransformButton.Click += new System.EventHandler(this.transformButton_Click);
-      // 
       // RegressionSolutionView
       // 
@@ -101 +86 @@
 
     #endregion
-
-    protected System.Windows.Forms.Button TransformButton;
   }
 }

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using System.Windows.Forms;
-using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
@@ -32 +30 @@
     public RegressionSolutionView() {
       InitializeComponent();
-      TransformButton.Image = VSImageLibrary.Event;
-      flowLayoutPanel.Controls.Add(TransformButton);
     }
 
@@ -43 +39 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
-      TransformButton.Enabled = Content != null;
-      TransformButton.Visible = Content != null && Content.ProblemData.Transformations.Any();
     }
 
@@ -61 +55 @@
     }
     #endregion
-
-    protected virtual void transformButton_Click(object sender, System.EventArgs e) {
-      var transformedModel = new TransformedRegressionModel(Content.Model, Content.ProblemData.Transformations);
-      var originalProblemData = (IRegressionProblemData)Content.ProblemData.InverseTransform();
-      var transformedSolution = new TransformedRegressionSolution(transformedModel, originalProblemData);
-      MainFormManager.MainForm.ShowContent(transformedSolution);
-    }
   }
 }