Changeset 15103 for trunk/sources

Timestamp:

07/01/17 08:23:22 (7 years ago)

Author:

gkronber

Message:

#2690 added event-handler for double click events to open the clicked model in a new view

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4

Files:

• GradientBoostedTreesModelView.Designer.cs (modified) (1 diff)
• GradientBoostedTreesModelView.cs (modified) (2 diffs)
• RandomForestModelView.Designer.cs (modified) (1 diff)
• RandomForestModelView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelView.Designer.cs

@@ -74 +74 @@
       this.listBox.TabIndex = 1;
       this.listBox.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
+      this.listBox.DoubleClick += new System.EventHandler(this.listBox_DoubleClick);
       // 
       // GradientBoostedTreesModelView

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelView.cs

@@ -21 +21 @@
 
 using System.Drawing;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis;
@@ -67 +69 @@
       if (model == null) viewHost.Content = null;
       else {
-        var treeModel = model as RegressionTreeModel;
-        if (treeModel != null)
-          viewHost.Content = treeModel.CreateSymbolicRegressionSolution(Content.ProblemData);
-        else {
-          var regModel = model as IRegressionModel;
-          viewHost.Content = regModel;
-        }
+        viewHost.Content = ConvertModel(model);
+      }
+    }
+
+    private void listBox_DoubleClick(object sender, System.EventArgs e) {
+      var selectedItem = listBox.SelectedItem;
+      if (selectedItem == null) return;
+      MainFormManager.MainForm.ShowContent(ConvertModel(selectedItem));
+    }
+
+    private IContent ConvertModel(object model) {
+      var treeModel = model as RegressionTreeModel;
+      if (treeModel != null)
+        return treeModel.CreateSymbolicRegressionSolution(Content.ProblemData);
+      else {
+        var regModel = model as IRegressionModel;
+        return regModel;
       }
     }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/RandomForestModelView.Designer.cs

@@ -79 +79 @@
       this.listBox.TabIndex = 1;
       this.listBox.SelectedIndexChanged += new System.EventHandler(this.listBox_SelectedIndexChanged);
+      this.listBox.DoubleClick += new System.EventHandler(this.listBox_DoubleClick);
       // 
       // RandomForestModelView

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/RandomForestModelView.cs

@@ -19 +19 @@
  */
 #endregion
-
+using System;
 using System.Drawing;
+using HeuristicLab.Common;
 using HeuristicLab.MainForm;
 using HeuristicLab.Problems.DataAnalysis;
@@ -69 +70 @@
       else {
         var idx = (int)listBox.SelectedItem;
-        idx -= 1;
-        var rfModel = Content.Model as RandomForestModel;
-        var regProblemData = Content.ProblemData as IRegressionProblemData;
-        var classProblemData = Content.ProblemData as IClassificationProblemData;
-        if (rfModel != null) {
-          if (idx < 0 || idx >= rfModel.NumberOfTrees) return;
-          if (regProblemData != null) {
-            var syModel = new SymbolicRegressionModel(regProblemData.TargetVariable, rfModel.ExtractTree(idx),
-              new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
-            viewHost.Content = syModel.CreateRegressionSolution(regProblemData);
-          } else if (classProblemData != null) {
-            var syModel = new SymbolicDiscriminantFunctionClassificationModel(classProblemData.TargetVariable, rfModel.ExtractTree(idx),
-              new SymbolicDataAnalysisExpressionTreeLinearInterpreter(), new NormalDistributionCutPointsThresholdCalculator());
-            syModel.RecalculateModelParameters(classProblemData, classProblemData.TrainingIndices);
-            viewHost.Content = syModel.CreateClassificationSolution(classProblemData);
-          }
-        }
+        viewHost.Content = CreateModel(idx);
       }
+    }
+
+    private void listBox_DoubleClick(object sender, System.EventArgs e) {
+      var selectedItem = listBox.SelectedItem;
+      if (selectedItem == null) return;
+      var idx = (int)listBox.SelectedItem;
+      MainFormManager.MainForm.ShowContent(CreateModel(idx));
+    }
+
+    private IContent CreateModel(int idx) {
+      idx -= 1;
+      var rfModel = Content.Model as RandomForestModel;
+      if (rfModel == null) return null;
+      var regProblemData = Content.ProblemData as IRegressionProblemData;
+      var classProblemData = Content.ProblemData as IClassificationProblemData;
+      if (idx < 0 || idx >= rfModel.NumberOfTrees)
+        return null;
+      if (regProblemData != null) {
+        var syModel = new SymbolicRegressionModel(regProblemData.TargetVariable, rfModel.ExtractTree(idx),
+          new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
+        return syModel.CreateRegressionSolution(regProblemData);
+      } else if (classProblemData != null) {
+        var syModel = new SymbolicDiscriminantFunctionClassificationModel(classProblemData.TargetVariable, rfModel.ExtractTree(idx),
+          new SymbolicDataAnalysisExpressionTreeLinearInterpreter(), new NormalDistributionCutPointsThresholdCalculator());
+        syModel.RecalculateModelParameters(classProblemData, classProblemData.TrainingIndices);
+        return syModel.CreateClassificationSolution(classProblemData);
+      } else throw new InvalidProgramException();
     }
   }