Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
06/01/10 17:58:03 (14 years ago)
Author:
gkronber
Message:

Worked on support vector regression operators and views. #1009

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisProblemDataView.cs

    r3758 r3884  
    3939    public new DataAnalysisProblemData Content {
    4040      get { return (DataAnalysisProblemData)base.Content; }
    41       set {
    42         base.Content = value;
    43       }
     41      set { base.Content = value; }
    4442    }
    4543

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/HeuristicLab.Problems.DataAnalysis.Views-3.3.csproj

    r3853 r3884  
    8686    <None Include="HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame" />
    8787    <None Include="Properties\AssemblyInfo.frame" />
     88    <Compile Include="DataAnalysisSolutionView.cs">
     89      <SubType>UserControl</SubType>
     90    </Compile>
     91    <Compile Include="DataAnalysisSolutionView.Designer.cs">
     92      <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
     93    </Compile>
    8894    <Compile Include="SupportVectorRegressionSolutionView.cs">
    8995      <SubType>UserControl</SubType>

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/SupportVectorRegressionSolutionView.Designer.cs

    r3858 r3884  
    4444    /// </summary>
    4545    private void InitializeComponent() {
    46       this.modelTabControl = new System.Windows.Forms.TabControl();
    47       this.modelTabPage = new System.Windows.Forms.TabPage();
    48       this.modelPanel = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    49       this.dataTabPage = new System.Windows.Forms.TabPage();
    50       this.dataPanel = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    5146      this.supportVectorTabControl = new System.Windows.Forms.TabPage();
    5247      this.supportVectorViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost();
    53       this.modelTabControl.SuspendLayout();
    54       this.modelTabPage.SuspendLayout();
    55       this.dataTabPage.SuspendLayout();
    5648      this.supportVectorTabControl.SuspendLayout();
    5749      this.SuspendLayout();
    58       //
    59       // modelTabControl
    60       //
    61       this.modelTabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    62                   | System.Windows.Forms.AnchorStyles.Left)
    63                   | System.Windows.Forms.AnchorStyles.Right)));
    64       this.modelTabControl.Controls.Add(this.modelTabPage);
    65       this.modelTabControl.Controls.Add(this.dataTabPage);
    66       this.modelTabControl.Controls.Add(this.supportVectorTabControl);
    67       this.modelTabControl.Location = new System.Drawing.Point(3, 3);
    68       this.modelTabControl.Name = "modelTabControl";
    69       this.modelTabControl.SelectedIndex = 0;
    70       this.modelTabControl.Size = new System.Drawing.Size(247, 245);
    71       this.modelTabControl.TabIndex = 0;
    72       //
    73       // modelTabPage
    74       //
    75       this.modelTabPage.Controls.Add(this.modelPanel);
    76       this.modelTabPage.Location = new System.Drawing.Point(4, 22);
    77       this.modelTabPage.Name = "modelTabPage";
    78       this.modelTabPage.Padding = new System.Windows.Forms.Padding(3);
    79       this.modelTabPage.Size = new System.Drawing.Size(239, 219);
    80       this.modelTabPage.TabIndex = 0;
    81       this.modelTabPage.Text = "Model";
    82       this.modelTabPage.UseVisualStyleBackColor = true;
    83       //
    84       // modelPanel
    85       //
    86       this.modelPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    87                   | System.Windows.Forms.AnchorStyles.Left)
    88                   | System.Windows.Forms.AnchorStyles.Right)));
    89       this.modelPanel.Caption = "View";
    90       this.modelPanel.Content = null;
    91       this.modelPanel.Location = new System.Drawing.Point(6, 6);
    92       this.modelPanel.Name = "modelPanel";
    93       this.modelPanel.ReadOnly = false;
    94       this.modelPanel.Size = new System.Drawing.Size(227, 207);
    95       this.modelPanel.TabIndex = 0;
    96       this.modelPanel.ViewType = null;
    97       //
    98       // dataTabPage
    99       //
    100       this.dataTabPage.Controls.Add(this.dataPanel);
    101       this.dataTabPage.Location = new System.Drawing.Point(4, 22);
    102       this.dataTabPage.Name = "dataTabPage";
    103       this.dataTabPage.Padding = new System.Windows.Forms.Padding(3);
    104       this.dataTabPage.Size = new System.Drawing.Size(239, 219);
    105       this.dataTabPage.TabIndex = 1;
    106       this.dataTabPage.Text = "Data";
    107       this.dataTabPage.UseVisualStyleBackColor = true;
    108       //
    109       // dataPanel
    110       //
    111       this.dataPanel.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
    112                   | System.Windows.Forms.AnchorStyles.Left)
    113                   | System.Windows.Forms.AnchorStyles.Right)));
    114       this.dataPanel.Caption = "View";
    115       this.dataPanel.Content = null;
    116       this.dataPanel.Location = new System.Drawing.Point(6, 6);
    117       this.dataPanel.Name = "dataPanel";
    118       this.dataPanel.ReadOnly = false;
    119       this.dataPanel.Size = new System.Drawing.Size(227, 207);
    120       this.dataPanel.TabIndex = 0;
    121       this.dataPanel.ViewType = null;
    12250      //
    12351      // supportVectorTabControl
    … …  
    15179      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    15280      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    153       this.Controls.Add(this.modelTabControl);
    15481      this.Name = "SupportVectorRegressionSolutionView";
    155       this.Size = new System.Drawing.Size(253, 251);
    156       this.modelTabControl.ResumeLayout(false);
    157       this.modelTabPage.ResumeLayout(false);
    158       this.dataTabPage.ResumeLayout(false);
     82      this.tabControl.TabPages.Add(supportVectorTabControl);
    15983      this.supportVectorTabControl.ResumeLayout(false);
    16084      this.ResumeLayout(false);
    … …  
    16488    #endregion
    16589
    166     private System.Windows.Forms.TabControl modelTabControl;
    167     private System.Windows.Forms.TabPage modelTabPage;
    168     private HeuristicLab.MainForm.WindowsForms.ViewHost modelPanel;
    169     private System.Windows.Forms.TabPage dataTabPage;
    170     private HeuristicLab.MainForm.WindowsForms.ViewHost dataPanel;
    17190    private System.Windows.Forms.TabPage supportVectorTabControl;
    17291    private HeuristicLab.MainForm.WindowsForms.ViewHost supportVectorViewHost;
    173 
    174 
    17592  }
    17693}

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/SupportVectorRegressionSolutionView.cs

    r3858 r3884  
    4040  [View("Support Vector Regression Solution View")]
    4141  [Content(typeof(SupportVectorRegressionSolution))]
    42   public partial class SupportVectorRegressionSolutionView : AsynchronousContentView {
     42  public partial class SupportVectorRegressionSolutionView : DataAnalysisSolutionView {
    4343
    4444    public new SupportVectorRegressionSolution Content {
    4545      get { return (SupportVectorRegressionSolution)base.Content; }
    46       set {
    47         base.Content = value;
    48       }
     46      set { base.Content = value; }
    4947    }
    5048
    … …  
    5755      base.OnContentChanged();
    5856      if (Content != null) {
    59         dataPanel.Content = Content.ProblemData;
    60         modelPanel.Content = Content.Model;
    6157        supportVectorViewHost.Content = Content.SupportVectors;
    6258      } else {
    63         dataPanel.Content = null;
    64         modelPanel.Content = null;
    6559        supportVectorViewHost.Content = null;
    6660      }
    6761    }
    68     protected override void RegisterContentEvents() {
    69       base.RegisterContentEvents();
    70       Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged);
    71     }
    72 
    73     protected override void DeregisterContentEvents() {
    74       base.DeregisterContentEvents();
    75     }
    76 
    77     private void Content_ProblemDataChanged(object sender, EventArgs e) {
    78       dataPanel.Content = Content.ProblemData;
    79     }
    8062  }
    8163}

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SimplifiedSymbolicExpressionModelView.cs

    r3797 r3884  
    3939namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic {
    4040  [View("Simplified Symbolic Expression Model View")]
    41   [Content(typeof(SymbolicRegressionSolution))]
     41  [Content(typeof(SymbolicRegressionModel))]
    4242  public partial class SimplifiedSymbolicExpressionModelView : AsynchronousContentView {
    43     public new SymbolicRegressionSolution Content {
    44       get { return (SymbolicRegressionSolution)base.Content; }
    45       set { base.Content = value; }
    46     }
    47 
    48 
    4943    public SimplifiedSymbolicExpressionModelView()
    5044      : base() {
    … …  
    5246    }
    5347
    54     protected override void RegisterContentEvents() {
    55       base.RegisterContentEvents();
    56       Content.ModelChanged += new EventHandler(Content_ModelChanged);
    57     }
    58 
    59     protected override void DeregisterContentEvents() {
    60       base.DeregisterContentEvents();
    61       Content.ModelChanged -= new EventHandler(Content_ModelChanged);
    62     }
    63 
    64     void Content_ModelChanged(object sender, EventArgs e) {
    65       UpdateTreeChart();
     48    public new SymbolicRegressionModel Content {
     49      get { return (SymbolicRegressionModel)base.Content; }
     50      set { base.Content = value; }
    6651    }
    6752
    6853    protected override void OnContentChanged() {
    6954      base.OnContentChanged();
    70       UpdateTreeChart();
     55      if (Content != null)
     56        UpdateTreeChart();
     57      else
     58        viewHost.Content = null;
    7159    }
    7260
    7361    private void UpdateTreeChart() {
    7462      var simplifier = new SymbolicSimplifier();
    75       var simplifiedTree = simplifier.Simplify(Content.Model.SymbolicExpressionTree);
     63      var simplifiedTree = simplifier.Simplify(Content.SymbolicExpressionTree);
    7664      viewHost.Content = simplifiedTree;
    7765    }

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SymbolicExpressionModelView.cs

    r3797 r3884  
    3939namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic {
    4040  [View("Symbolic Expression Model View")]
    41   [Content(typeof(SymbolicRegressionSolution))]
     41  [Content(typeof(SymbolicRegressionModel),true)]
    4242  public partial class SymbolicExpressionModelView : AsynchronousContentView {
    43     public new SymbolicRegressionSolution Content {
    44       get { return (SymbolicRegressionSolution)base.Content; }
    45       set { base.Content = value; }
    46     }
    47 
    4843    public SymbolicExpressionModelView()
    4944      : base() {
    … …  
    5146    }
    5247
    53     protected override void RegisterContentEvents() {
    54       base.RegisterContentEvents();
    55       Content.ModelChanged += new EventHandler(Content_ModelChanged);
    56     }
    57 
    58     protected override void DeregisterContentEvents() {
    59       base.DeregisterContentEvents();
    60       Content.ModelChanged -= new EventHandler(Content_ModelChanged);
    61     }
    62 
    63     void Content_ModelChanged(object sender, EventArgs e) {
    64       UpdateTreeChart();
     48    public new SymbolicRegressionModel Content {
     49      get { return (SymbolicRegressionModel)base.Content; }
     50      set { base.Content = value; }
    6551    }
    6652
    6753    protected override void OnContentChanged() {
    6854      base.OnContentChanged();
    69       UpdateTreeChart();
     55      if (Content != null)
     56        UpdateTreeChart();
     57      else
     58        viewHost.Content = null;
    7059    }
    7160
    7261    private void UpdateTreeChart() {
    73       viewHost.Content = Content.Model.SymbolicExpressionTree;
     62      viewHost.Content = Content.SymbolicExpressionTree;
    7463    }
    7564  }
Note: See TracChangeset for help on using the changeset viewer.