Changeset 15105


Ignore:
Timestamp:
07/01/17 10:41:20 (7 weeks 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:
2 deleted
3 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelEvaluationView.Designer.cs

    r15104 r15105  
    2121
    2222namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    23   partial class GradientBoostedTreesModelView {
     23  partial class GradientBoostedTreesModelEvaluationView {
    2424    /// <summary>
    2525    /// Required designer variable.
     
    7676      this.listBox.DoubleClick += new System.EventHandler(this.listBox_DoubleClick);
    7777      //
    78       // GradientBoostedTreesModelView
     78      // GradientBoostedTreesModelEvaluationView
    7979      //
    8080      this.AllowDrop = true;
     
    8282      this.Controls.Add(this.viewHost);
    8383      this.Controls.Add(this.listBox);
    84       this.Name = "GradientBoostedTreesModelView";
     84      this.Name = "GradientBoostedTreesModelEvaluationView";
    8585      this.Size = new System.Drawing.Size(349, 289);
    8686      this.ResumeLayout(false);
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/GradientBoostedTreesModelEvaluationView.cs

    r15104 r15105  
    2828
    2929namespace HeuristicLab.Algorithms.DataAnalysis.Views {
    30   [View("Gradient boosted tree model")]
     30  [View("GBT Model Evaluation")]
    3131  [Content(typeof(GradientBoostedTreesSolution), false)]
    32   public partial class GradientBoostedTreesModelView : DataAnalysisSolutionEvaluationView {
    33     public override Image ViewImage {
    34       get { return HeuristicLab.Common.Resources.VSImageLibrary.Function; }
    35     }
    36 
     32  public partial class GradientBoostedTreesModelEvaluationView : DataAnalysisSolutionEvaluationView {
    3733    public new GradientBoostedTreesSolution Content {
    3834      get { return (GradientBoostedTreesSolution)base.Content; }
     
    4642    }
    4743
    48     public GradientBoostedTreesModelView()
     44    public GradientBoostedTreesModelEvaluationView()
    4945      : base() {
    5046      InitializeComponent();
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

    r14826 r15105  
    125125  </ItemGroup>
    126126  <ItemGroup>
     127    <Compile Include="GradientBoostedTreesModelEvaluationView.cs">
     128      <SubType>UserControl</SubType>
     129    </Compile>
     130    <Compile Include="GradientBoostedTreesModelEvaluationView.Designer.cs">
     131      <DependentUpon>GradientBoostedTreesModelEvaluationView.cs</DependentUpon>
     132    </Compile>
     133    <Compile Include="GradientBoostedTreesModelView.cs">
     134      <SubType>UserControl</SubType>
     135    </Compile>
     136    <Compile Include="GradientBoostedTreesModelView.Designer.cs">
     137      <DependentUpon>GradientBoostedTreesModelView.cs</DependentUpon>
     138    </Compile>
    127139    <Compile Include="OneFactorClassificationModelView.cs">
    128140      <SubType>UserControl</SubType>
     
    149161      <DependentUpon>RandomForestRegressionSolutionView.cs</DependentUpon>
    150162    </Compile>
    151     <Compile Include="GradientBoostedTreesModelView.cs">
    152       <SubType>UserControl</SubType>
    153     </Compile>
    154     <Compile Include="GradientBoostedTreesModelView.Designer.cs">
    155       <DependentUpon>GradientBoostedTreesModelView.cs</DependentUpon>
    156     </Compile>
    157163    <Compile Include="MeanProdView.cs">
    158164      <SubType>UserControl</SubType>
     
    222228    <Compile Include="SupportVectorMachineModelView.Designer.cs">
    223229      <DependentUpon>SupportVectorMachineModelView.cs</DependentUpon>
    224     </Compile>
    225     <Compile Include="GradientBoostedTreesSolutionView.cs">
    226       <SubType>UserControl</SubType>
    227     </Compile>
    228     <Compile Include="GradientBoostedTreesSolutionView.Designer.cs">
    229       <DependentUpon>GradientBoostedTreesSolutionView.cs</DependentUpon>
    230230    </Compile>
    231231  </ItemGroup>
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/GradientBoostedTreesModel.cs

    r14185 r15105  
    3131namespace HeuristicLab.Algorithms.DataAnalysis {
    3232  [StorableClass]
    33   [Item("Gradient boosted tree model", "")]
     33  [Item("Gradient boosted trees model", "")]
    3434  // this is essentially a collection of weighted regression models
    3535  public sealed class GradientBoostedTreesModel : RegressionModel, IGradientBoostedTreesModel {
  • trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/GradientBoostedTrees/RegressionTreeModel.cs

    r14345 r15105  
    219219    /// <returns>A new symbolic regression solution which matches the tree model</returns>
    220220    public ISymbolicRegressionSolution CreateSymbolicRegressionSolution(IRegressionProblemData problemData) {
     221      return CreateSymbolicRegressionModel().CreateRegressionSolution(problemData);
     222    }
     223
     224    /// <summary>
     225    /// Transforms the tree model to a symbolic regression model
     226    /// </summary>
     227    /// <returns>A new symbolic regression model which matches the tree model</returns>
     228    public SymbolicRegressionModel CreateSymbolicRegressionModel() {
    221229      var rootSy = new ProgramRootSymbol();
    222230      var startSy = new StartSymbol();
     
    228236      var rootNode = rootSy.CreateTreeNode();
    229237      rootNode.AddSubtree(startNode);
    230       var model = new SymbolicRegressionModel(TargetVariable, new SymbolicExpressionTree(rootNode), new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
    231       return model.CreateRegressionSolution(problemData);
     238      return new SymbolicRegressionModel(TargetVariable, new SymbolicExpressionTree(rootNode), new SymbolicDataAnalysisExpressionTreeLinearInterpreter());
    232239    }
    233240
Note: See TracChangeset for help on using the changeset viewer.