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

Timestamp:

04/04/18 17:18:02 (6 years ago)

Author:

pfleck

Message:

#2906 Refactoring

• Moved transformation-specific parts out of existing interfaces.
• Moved all Transformation logic to DataAnalysisTransformation.
• Simplified (Inverse)Transformation of Dataset/ProblemData/Model/Solution.

Location:

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

Files:

• DataAnalysisTransformationModelView.Designer.cs (modified) (6 diffs)
• DataAnalysisTransformationModelView.cs (modified) (2 diffs)
• Solution Views/DataAnalysisSolutionView.cs (modified) (4 diffs)

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

@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.originalModelTabPage = new System.Windows.Forms.TabPage();
+      this.trainedModelTabPage = new System.Windows.Forms.TabPage();
       this.modelViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
       this.tabControl = new System.Windows.Forms.TabControl();
@@ -52 +52 @@
       this.targetTransformationsTabPage = new System.Windows.Forms.TabPage();
       this.targetTransformationsViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
-      this.originalModelTabPage.SuspendLayout();
+      this.trainedModelTabPage.SuspendLayout();
       this.tabControl.SuspendLayout();
       this.inputTransformationsTabPage.SuspendLayout();
@@ -58 +58 @@
       this.SuspendLayout();
       // 
-      // originalModelTabPage
+      // trainedModelTabPage
       // 
-      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;
+      this.trainedModelTabPage.Controls.Add(this.modelViewHost);
+      this.trainedModelTabPage.Location = new System.Drawing.Point(4, 22);
+      this.trainedModelTabPage.Name = "trainedModelTabPage";
+      this.trainedModelTabPage.Padding = new System.Windows.Forms.Padding(3);
+      this.trainedModelTabPage.Size = new System.Drawing.Size(486, 392);
+      this.trainedModelTabPage.TabIndex = 0;
+      this.trainedModelTabPage.Text = "Trained Model";
+      this.trainedModelTabPage.UseVisualStyleBackColor = true;
       // 
       // modelViewHost
@@ -88 +88 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.tabControl.Controls.Add(this.originalModelTabPage);
+      this.tabControl.Controls.Add(this.trainedModelTabPage);
       this.tabControl.Controls.Add(this.inputTransformationsTabPage);
       this.tabControl.Controls.Add(this.targetTransformationsTabPage);
@@ -154 +154 @@
       this.Name = "DataAnalysisTransformationModelView";
       this.Size = new System.Drawing.Size(500, 424);
-      this.originalModelTabPage.ResumeLayout(false);
+      this.trainedModelTabPage.ResumeLayout(false);
       this.tabControl.ResumeLayout(false);
       this.inputTransformationsTabPage.ResumeLayout(false);
@@ -164 +164 @@
     #endregion
 
-    private System.Windows.Forms.TabPage originalModelTabPage;
+    private System.Windows.Forms.TabPage trainedModelTabPage;
     private MainForm.WindowsForms.ViewHost modelViewHost;
     private System.Windows.Forms.TabControl tabControl;

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

@@ -18 +18 @@
  * along with HeuristicLab. If not, see <http://www.gnu.org/licenses/>.
  */
-#endregion            
+#endregion
 
 using HeuristicLab.Core.Views;
@@ -25 +25 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views {
   [View("Transformation Model View")]
-  [Content(typeof(IDataAnalysisTransformationModel), true)]
+  [Content(typeof(DataAnalysisTransformationModel), true)]
   public partial class DataAnalysisTransformationModelView : ItemView {
 
-    public new IDataAnalysisTransformationModel Content {
-      get { return (IDataAnalysisTransformationModel)base.Content; }
+    public new DataAnalysisTransformationModel Content {
+      get { return (DataAnalysisTransformationModel)base.Content; }
       set { base.Content = value; }
     }

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

@@ -40 +40 @@
 
     private const string BacktransformButtonText = "Integrate Transformations";
-    private const string ReapplyTransformationsButtonText = "Restore Original Model";
+    private const string ReapplyTransformationsButtonText = "Restore Trained Model";
 
     public DataAnalysisSolutionView() {
@@ -93 +93 @@
 
       transformButton.Text = Content.Model is IDataAnalysisTransformationModel
-        ? ReapplyTransformationsButtonText : BacktransformButtonText;
+        ? ReapplyTransformationsButtonText
+        : BacktransformButtonText;
     }
 
@@ -237 +238 @@
         problemData = param.Value as DataAnalysisProblemData;
       }
+
       if (problemData == null) return;
 
@@ -258 +260 @@
 
     private void transformButton_Click(object sender, EventArgs e) {
-      var transformedSolution = CreateTransformedSolution(Content);
+      var transformedSolution = DataAnalysisTransformation.TransformSolution(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);
   }
 }