Changeset 1073


Ignore:
Timestamp:
12/31/08 19:46:44 (12 years ago)
Author:
gkronber
Message:

worked on CEDMA analysis frontend. #419 (Refactor CEDMA plugins)

Location:
branches/CEDMA-Refactoring-Ticket419
Files:
3 deleted
5 edited
5 moved

Legend:

Unmodified
Added
Removed
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSet.cs

    r1043 r1073  
    8484      return new DataSetView(this);
    8585    }
     86
     87    internal Results GetResults() {
     88      Results results = new Results(Store);
     89      results.FilterDataSet(new Entity(Ontology.CedmaNameSpace + Guid));
     90    }
    8691  }
    8792}
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSetView.Designer.cs

    r988 r1073  
    4747      this.editorGroupBox = new System.Windows.Forms.GroupBox();
    4848      this.activateButton = new System.Windows.Forms.Button();
     49      this.resultsButton = new System.Windows.Forms.Button();
    4950      this.SuspendLayout();
    5051      //
     
    7273      this.activateButton.Click += new System.EventHandler(this.activateButton_Click);
    7374      //
     75      // resultsButton
     76      //
     77      this.resultsButton.Location = new System.Drawing.Point(84, 128);
     78      this.resultsButton.Name = "resultsButton";
     79      this.resultsButton.Size = new System.Drawing.Size(75, 23);
     80      this.resultsButton.TabIndex = 3;
     81      this.resultsButton.Text = "Show results";
     82      this.resultsButton.UseVisualStyleBackColor = true;
     83      this.resultsButton.Click += new System.EventHandler(this.resultsButton_Click);
     84      //
    7485      // DataSetView
    7586      //
    7687      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    7788      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
     89      this.Controls.Add(this.resultsButton);
    7890      this.Controls.Add(this.activateButton);
    7991      this.Controls.Add(this.editorGroupBox);
     
    88100    private System.Windows.Forms.GroupBox editorGroupBox;
    89101    private System.Windows.Forms.Button activateButton;
     102    private System.Windows.Forms.Button resultsButton;
    90103  }
    91104}
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/DataSetView.cs

    r1003 r1073  
    2929using HeuristicLab.Core;
    3030using HeuristicLab.CEDMA.DB.Interfaces;
     31using HeuristicLab.PluginInfrastructure;
    3132
    3233namespace HeuristicLab.CEDMA.Core {
     
    6061      activateButton.Enabled = false;
    6162    }
     63
     64    private void resultsButton_Click(object sender, EventArgs e) {
     65      Results results = dataSet.GetResults();
     66      Control resultsControl = (Control)results.CreateView();
     67      PluginManager.ControlManager.ShowControl(resultsControl);
     68    }
    6269  }
    6370}
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/HeuristicLab.CEDMA.Core.csproj

    r1053 r1073  
    7676      <SubType>UserControl</SubType>
    7777    </Compile>
     78    <Compile Include="Interfaces\ICedmaAlgorithm.cs" />
     79    <Compile Include="Interfaces\ITimeSeriesAlgorithm.cs" />
     80    <Compile Include="Interfaces\IClassificationAlgorithm.cs" />
     81    <Compile Include="Interfaces\IRegressionAlgorithm.cs" />
    7882    <Compile Include="Problem.cs" />
    7983    <Compile Include="DataSet.cs" />
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultList.cs

    r1072 r1073  
    3131using System.IO;
    3232using HeuristicLab.PluginInfrastructure;
    33 using HeuristicLab.Logging;
    3433using HeuristicLab.Data;
    3534using HeuristicLab.DataAnalysis;
    36 using HeuristicLab.Charting.Data;
    3735using System.Drawing;
    38 using HeuristicLab.GP;
    3936
    40 namespace HeuristicLab.CEDMA.Charting {
    41 
    42   public class RecordAddedEventArgs : EventArgs {
    43     private Record record;
    44     public Record Record { get { return record; } }
    45     public RecordAddedEventArgs(Record r)
    46       : base() {
    47       this.record = r;
    48     }
    49   }
    50 
    51   public class ResultList : ItemBase {
     37namespace HeuristicLab.CEDMA.Core {
     38  public class ResultList : IViewable {
    5239    private Dictionary<Record, Dataset> datasets;
    5340
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultListView.Designer.cs

    r1072 r1073  
    1 namespace HeuristicLab.CEDMA.Charting {
     1namespace HeuristicLab.CEDMA.Core {
    22  partial class ResultListView {
    33    /// <summary>
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.CEDMA.Core/ResultListView.cs

    r1072 r1073  
    88using System.Windows.Forms;
    99using HeuristicLab.Core;
    10 using HeuristicLab.Charting;
    1110
    12 namespace HeuristicLab.CEDMA.Charting {
     11namespace HeuristicLab.CEDMA.Core {
    1312  public partial class ResultListView : ViewBase {
    1413    private ResultList results;
  • branches/CEDMA-Refactoring-Ticket419/HeuristicLab.sln

    r1072 r1073  
    515515    {E66D1EAA-525C-4F6D-BD25-DBCAE3750E25}.Visualization Debug|x86.Build.0 = Debug|x86
    516516    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
    517     {545CE756-98D8-423B-AC2E-6E7D70926E5C}.CEDMA Debug|Any CPU.Build.0 = Debug|x86
    518517    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.CEDMA Debug|x86.ActiveCfg = Debug|x86
    519518    {545CE756-98D8-423B-AC2E-6E7D70926E5C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    737736    {23117533-8A91-474E-BBF6-C39485D0810A}.Visualization Debug|x86.ActiveCfg = Debug|x86
    738737    {23117533-8A91-474E-BBF6-C39485D0810A}.Visualization Debug|x86.Build.0 = Debug|x86
    739     {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.CEDMA Debug|Any CPU.ActiveCfg = Release|x86
    740     {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.CEDMA Debug|Any CPU.Build.0 = Release|x86
     738    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
    741739    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.CEDMA Debug|x86.ActiveCfg = Debug|x86
    742740    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    751749    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.Visualization Debug|x86.ActiveCfg = Debug|x86
    752750    {1F5FA590-1D2D-406C-BDBD-03BAECEA3C80}.Visualization Debug|x86.Build.0 = Debug|x86
    753     {1F1CF3ED-374C-4288-995B-93F6B872F571}.CEDMA Debug|Any CPU.ActiveCfg = Release|x86
    754     {1F1CF3ED-374C-4288-995B-93F6B872F571}.CEDMA Debug|Any CPU.Build.0 = Release|x86
     751    {1F1CF3ED-374C-4288-995B-93F6B872F571}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
     752    {1F1CF3ED-374C-4288-995B-93F6B872F571}.CEDMA Debug|Any CPU.Build.0 = Debug|x86
    755753    {1F1CF3ED-374C-4288-995B-93F6B872F571}.CEDMA Debug|x86.ActiveCfg = Debug|x86
    756754    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    765763    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Visualization Debug|x86.ActiveCfg = Debug|x86
    766764    {1F1CF3ED-374C-4288-995B-93F6B872F571}.Visualization Debug|x86.Build.0 = Debug|x86
    767     {74223A32-C726-4978-BE78-37113A18373C}.CEDMA Debug|Any CPU.ActiveCfg = Release|x86
    768     {74223A32-C726-4978-BE78-37113A18373C}.CEDMA Debug|Any CPU.Build.0 = Release|x86
     765    {74223A32-C726-4978-BE78-37113A18373C}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
     766    {74223A32-C726-4978-BE78-37113A18373C}.CEDMA Debug|Any CPU.Build.0 = Debug|x86
    769767    {74223A32-C726-4978-BE78-37113A18373C}.CEDMA Debug|x86.ActiveCfg = Debug|x86
    770768    {74223A32-C726-4978-BE78-37113A18373C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    779777    {74223A32-C726-4978-BE78-37113A18373C}.Visualization Debug|x86.ActiveCfg = Debug|x86
    780778    {74223A32-C726-4978-BE78-37113A18373C}.Visualization Debug|x86.Build.0 = Debug|x86
    781     {7C20D100-8BEB-433A-9499-F075E2CB9297}.CEDMA Debug|Any CPU.ActiveCfg = Release|x86
    782     {7C20D100-8BEB-433A-9499-F075E2CB9297}.CEDMA Debug|Any CPU.Build.0 = Release|x86
     779    {7C20D100-8BEB-433A-9499-F075E2CB9297}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
     780    {7C20D100-8BEB-433A-9499-F075E2CB9297}.CEDMA Debug|Any CPU.Build.0 = Debug|x86
    783781    {7C20D100-8BEB-433A-9499-F075E2CB9297}.CEDMA Debug|x86.ActiveCfg = Debug|x86
    784782    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    793791    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Visualization Debug|x86.ActiveCfg = Debug|x86
    794792    {7C20D100-8BEB-433A-9499-F075E2CB9297}.Visualization Debug|x86.Build.0 = Debug|x86
    795     {6084CFB5-733F-449D-9F92-2E40D13F0514}.CEDMA Debug|Any CPU.ActiveCfg = Release|x86
    796     {6084CFB5-733F-449D-9F92-2E40D13F0514}.CEDMA Debug|Any CPU.Build.0 = Release|x86
     793    {6084CFB5-733F-449D-9F92-2E40D13F0514}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
     794    {6084CFB5-733F-449D-9F92-2E40D13F0514}.CEDMA Debug|Any CPU.Build.0 = Debug|x86
    797795    {6084CFB5-733F-449D-9F92-2E40D13F0514}.CEDMA Debug|x86.ActiveCfg = Debug|x86
    798796    {6084CFB5-733F-449D-9F92-2E40D13F0514}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     
    904902    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Visualization Debug|x86.ActiveCfg = Debug|x86
    905903    {8B14A35E-DBDF-43EB-B019-23E9FBC5A35E}.Visualization Debug|x86.Build.0 = Debug|x86
    906     {A0821479-801F-43DF-B788-AE92FB410DA9}.CEDMA Debug|Any CPU.ActiveCfg = Release|x86
    907     {A0821479-801F-43DF-B788-AE92FB410DA9}.CEDMA Debug|Any CPU.Build.0 = Release|x86
     904    {A0821479-801F-43DF-B788-AE92FB410DA9}.CEDMA Debug|Any CPU.ActiveCfg = Debug|x86
    908905    {A0821479-801F-43DF-B788-AE92FB410DA9}.CEDMA Debug|x86.ActiveCfg = Debug|x86
    909906    {A0821479-801F-43DF-B788-AE92FB410DA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Note: See TracChangeset for help on using the changeset viewer.