Changeset 15105 for trunk

Timestamp:

07/01/17 10:41:20 (7 years ago)

Author:

gkronber

Message:

#2690 added a model view for GBT models and renamed the existing evaluation view accordingly. Deleted GBT solution view because it is not necessary anymore.

Location:

trunk/sources

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelEvaluationView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelView.Designer.cs) (3 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelEvaluationView.cs (moved) (moved from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelView.cs) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesSolutionView.Designer.cs (deleted)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesSolutionView.cs (deleted)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (3 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesModel.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs (modified) (2 diffs)

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

@@ -21 +21 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  partial class GradientBoostedTreesModelView {
+  partial class GradientBoostedTreesModelEvaluationView {
     /// <summary> 
     /// Required designer variable.
@@ -76 +76 @@
       this.listBox.DoubleClick += new System.EventHandler(this.listBox_DoubleClick);
       // 
-      // GradientBoostedTreesModelView
+      // GradientBoostedTreesModelEvaluationView
       // 
       this.AllowDrop = true;
@@ -82 +82 @@
       this.Controls.Add(this.viewHost);
       this.Controls.Add(this.listBox);
-      this.Name = "GradientBoostedTreesModelView";
+      this.Name = "GradientBoostedTreesModelEvaluationView";
       this.Size = new System.Drawing.Size(349, 289);
       this.ResumeLayout(false);

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

@@ -28 +28 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  [View("Gradient boosted tree model")]
+  [View("GBT Model Evaluation")]
   [Content(typeof(GradientBoostedTreesSolution), false)]
-  public partial class GradientBoostedTreesModelView : DataAnalysisSolutionEvaluationView {
-    public override Image ViewImage {
-      get { return HeuristicLab.Common.Resources.VSImageLibrary.Function; }
-    }
-
+  public partial class GradientBoostedTreesModelEvaluationView : DataAnalysisSolutionEvaluationView {
     public new GradientBoostedTreesSolution Content {
       get { return (GradientBoostedTreesSolution)base.Content; }
@@ -46 +42 @@
     }
 
-    public GradientBoostedTreesModelView()
+    public GradientBoostedTreesModelEvaluationView()
       : base() {
       InitializeComponent();

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

@@ -125 +125 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="GradientBoostedTreesModelEvaluationView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GradientBoostedTreesModelEvaluationView.Designer.cs">
+      <DependentUpon>GradientBoostedTreesModelEvaluationView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="GradientBoostedTreesModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="GradientBoostedTreesModelView.Designer.cs">
+      <DependentUpon>GradientBoostedTreesModelView.cs</DependentUpon>
+    </Compile>
     <Compile Include="OneFactorClassificationModelView.cs">
       <SubType>UserControl</SubType>
@@ -149 +161 @@
       <DependentUpon>RandomForestRegressionSolutionView.cs</DependentUpon>
     </Compile>
-    <Compile Include="GradientBoostedTreesModelView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GradientBoostedTreesModelView.Designer.cs">
-      <DependentUpon>GradientBoostedTreesModelView.cs</DependentUpon>
-    </Compile>
     <Compile Include="MeanProdView.cs">
       <SubType>UserControl</SubType>
@@ -222 +228 @@
     <Compile Include="SupportVectorMachineModelView.Designer.cs">
       <DependentUpon>SupportVectorMachineModelView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="GradientBoostedTreesSolutionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="GradientBoostedTreesSolutionView.Designer.cs">
-      <DependentUpon>GradientBoostedTreesSolutionView.cs</DependentUpon>
     </Compile>
   </ItemGroup>

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesModel.cs

@@ -31 +31 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [StorableClass]
-  [Item("Gradient boosted tree model", "")]
+  [Item("Gradient boosted trees model", "")]
   // this is essentially a collection of weighted regression models
   public sealed class GradientBoostedTreesModel : RegressionModel, IGradientBoostedTreesModel {

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

@@ -219 +219 @@
     /// <returns>A new symbolic regression solution which matches the tree model</returns>
     public ISymbolicRegressionSolution CreateSymbolicRegressionSolution(IRegressionProblemData problemData) {
+      return CreateSymbolicRegressionModel().CreateRegressionSolution(problemData);
+    }
+
+    /// <summary>
+    /// Transforms the tree model to a symbolic regression model
+    /// </summary>
+    /// <returns>A new symbolic regression model which matches the tree model</returns>
+    public SymbolicRegressionModel CreateSymbolicRegressionModel() {
       var rootSy = new ProgramRootSymbol();
       var startSy = new StartSymbol();
@@ -228 +236 @@
       var rootNode = rootSy.CreateTreeNode();
       rootNode.AddSubtree(startNode);
-      var model = new SymbolicRegressionModel(TargetVariable, new SymbolicExpressionTree(rootNode), new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
-      return model.CreateRegressionSolution(problemData);
+      return new SymbolicRegressionModel(TargetVariable, new SymbolicExpressionTree(rootNode), new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
     }