Changeset 15864

Timestamp:

03/26/18 17:09:19 (7 years ago)

Author:

pfleck

Message:

#2906 Removed obsolete transformation related code for SymReg. Small UI changes for transformed solutions.

Location:

branches/2906_Transformations

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs (modified) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Transformations (deleted)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.Designer.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/RegressionSolutionView.cs (modified) (3 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/Solution Views/TransformedRegressionSolutionView.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/TransformedRegressionModel.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/ITransformationMapper.cs (deleted)

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.Designer.cs

@@ -48 +48 @@
       this.exportFileDialog = new System.Windows.Forms.SaveFileDialog();
       this.btnSimplify = new System.Windows.Forms.Button();
-      this.transformModelButton = new System.Windows.Forms.Button();
       ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit();
       this.splitContainer.Panel1.SuspendLayout();
@@ -61 +60 @@
       this.flowLayoutPanel.Controls.Add(this.btnSimplify);
       this.flowLayoutPanel.Controls.Add(this.exportButton);
-      this.flowLayoutPanel.Controls.Add(this.transformModelButton);
       // 
       // btnSimplify
@@ -91 +89 @@
       this.toolTip.SetToolTip(this.exportButton, "Exports the symbolic regression solution to Excel.");
       // 
-      // transformModelButton
-      // 
-      this.transformModelButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)));
-      this.transformModelButton.Image = HeuristicLab.Common.Resources.VSImageLibrary.Event;
-      this.transformModelButton.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-      this.transformModelButton.Name = "transformModelButton";
-      this.transformModelButton.Size = new System.Drawing.Size(135, 24);
-      this.transformModelButton.TabIndex = 9;
-      this.transformModelButton.Text = "Backtransform Model";
-      this.transformModelButton.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-      this.transformModelButton.UseVisualStyleBackColor = true;
-      this.transformModelButton.Click += new System.EventHandler(this.transformModelButton_Click);
-      this.toolTip.SetToolTip(this.transformModelButton, "Backtransform model based on the stored transformations.");
-      // 
       // SymbolicRegressionSolutionView
       // 
@@ -123 +107 @@
     protected System.Windows.Forms.Button exportButton;
     protected System.Windows.Forms.Button btnSimplify;
-    protected System.Windows.Forms.Button transformModelButton;
   }
 }

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

@@ -45 +45 @@
       btnSimplify.Enabled = Content != null && !Locked && Content.ProblemData.TrainingIndices.Any(); // simplification is only possible if there are trainings samples
       exportButton.Enabled = Content != null && !Locked;
-      transformModelButton.Visible = Content != null && Content.ProblemData.Transformations.Any();
-      transformModelButton.Enabled = Content != null && !Locked;
     }
 
@@ -68 +66 @@
       }
     }
-
-    private void transformModelButton_Click(object sender, EventArgs e) {
-      var mapper = new TransformationToSymbolicTreeMapper();
-      var transformator = new SymbolicExpressionTreeBacktransformator(mapper);
-
-      var transformations = Content.ProblemData.Transformations;
-      var targetVar = Content.ProblemData.TargetVariable;
-
-      var transformedModel = (ISymbolicRegressionModel)transformator.Backtransform(Content.Model, transformations, targetVar);
-      var transformedSolution = new SymbolicRegressionSolution(transformedModel, (IRegressionProblemData)Content.ProblemData.Clone());
-
-      MainFormManager.MainForm.ShowContent(transformedSolution);
-    }
   }
 }

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

@@ -310 +310 @@
     <Compile Include="Symbols\VariableConditionTreeNode.cs" />
     <Compile Include="Symbols\VariableTreeNode.cs" />
-    <Compile Include="Transformations\SymbolicExpressionTreeBacktransformator.cs" />
-    <Compile Include="Transformations\TransformationToSymbolicTreeMapper.cs" />
     <Compile Include="TreeMatching\SymbolicExpressionTreeBottomUpSimilarityCalculator.cs" />
     <Compile Include="TreeMatching\SymbolicExpressionTreeCanonicalSorter.cs" />

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

@@ -19 +19 @@
  */
 #endregion
+
 
 
@@ -46 +47 @@
     /// </summary>
     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();
@@ -72 +74 @@
       // 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(75, 23);
+      this.TransformButton.Size = new System.Drawing.Size(108, 23);
       this.TransformButton.TabIndex = 1;
-      this.TransformButton.Text = "Reverse Transformations";
+      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);

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

@@ -22 +22 @@
 using System.Linq;
 using System.Windows.Forms;
+using HeuristicLab.Common.Resources;
 using HeuristicLab.Core;
 using HeuristicLab.MainForm;
@@ -31 +32 @@
     public RegressionSolutionView() {
       InitializeComponent();
+      TransformButton.Image = VSImageLibrary.Event;
       flowLayoutPanel.Controls.Add(TransformButton);
     }
@@ -41 +43 @@
     protected override void SetEnabledStateOfControls() {
       base.SetEnabledStateOfControls();
+      TransformButton.Enabled = Content != null;
       TransformButton.Visible = Content != null && Content.ProblemData.Transformations.Any();
     }

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

@@ -25 +25 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Transformation Solution View")]
-  [Content(typeof(TransformedRegressionSolution), true)]
+  [Content(typeof(TransformedRegressionSolution), false)]
   public partial class TransformedRegressionSolutionView : RegressionSolutionView {
 

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

@@ -242 +242 @@
     <Compile Include="Interfaces\IDependencyCalculator.cs" />
     <Compile Include="Interfaces\ITransformation.cs" />
-    <Compile Include="Interfaces\ITransformationMapper.cs" />
     <Compile Include="Interfaces\Regression\ITransformedRegressionModel.cs" />
     <Compile Include="Interfaces\Regression\ITransformedRegressionSolution.cs" />

branches/2906_Transformations/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/TransformedRegressionModel.cs

@@ -75 +75 @@
     // problemData in original data range
     public override IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
+      // TODO: specialized views for the original solution type are lost (RandomForestSolutionView, ...)
       return new TransformedRegressionSolution(this, new RegressionProblemData(problemData));
     }