Changeset 6968


Ignore:
Timestamp:
11/08/11 13:18:49 (8 years ago)
Author:
sforsten
Message:

#1669: First version which can automatically generate data for some problems from http://www.vanillamodeling.com/

Location:
branches/RegressionBenchmarks
Files:
26 added
17 edited

Legend:

Unmodified
Added
Removed
  • branches/RegressionBenchmarks/HeuristicLab 3.3.sln

    r6884 r6968  
    7676    {E10F395F-C8A6-48AD-B470-9AA7A1F43809} = {E10F395F-C8A6-48AD-B470-9AA7A1F43809}
    7777    {B7A64A60-B538-479F-9C47-A3180C458F6C} = {B7A64A60-B538-479F-9C47-A3180C458F6C}
     78    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C} = {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}
    7879    {07486E68-1517-4B9D-A58D-A38E99AE71AB} = {07486E68-1517-4B9D-A58D-A38E99AE71AB}
    7980    {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5} = {4AE3FC69-C575-42D2-BC46-0FAD5850EFC5}
     
    299300EndProject
    300301Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Tests", "HeuristicLab.Tests\HeuristicLab.Tests.csproj", "{B62872C1-6752-4758-9823-751A2D28C388}"
     302EndProject
     303Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4", "HeuristicLab.Problems.DataAnalysis.Benchmarks\3.4\HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj", "{4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}"
    301304EndProject
    302305Global
     
    14531456    {B62872C1-6752-4758-9823-751A2D28C388}.Release|x86.ActiveCfg = Release|x86
    14541457    {B62872C1-6752-4758-9823-751A2D28C388}.Release|x86.Build.0 = Release|x86
     1458    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     1459    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Debug|Any CPU.Build.0 = Debug|Any CPU
     1460    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Debug|x64.ActiveCfg = Debug|Any CPU
     1461    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Debug|x86.ActiveCfg = Debug|Any CPU
     1462    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Release|Any CPU.ActiveCfg = Release|Any CPU
     1463    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Release|Any CPU.Build.0 = Release|Any CPU
     1464    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Release|x64.ActiveCfg = Release|Any CPU
     1465    {4232E766-B8E4-4FC9-A665-C2D2FC5CD73C}.Release|x86.ActiveCfg = Release|Any CPU
    14551466  EndGlobalSection
    14561467  GlobalSection(SolutionProperties) = preSolution
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs

    r6803 r6968  
    112112      ProblemData = problemData;
    113113    }
     114
     115    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     116      throw new System.NotImplementedException();
     117    }
     118
     119    public override System.Collections.Generic.IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     120      throw new System.NotImplementedException();
     121    }
    114122  }
    115123}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

    r6803 r6968  
    111111      ProblemData = problemData;
    112112    }
     113
     114    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     115      throw new System.NotImplementedException();
     116    }
     117
     118    public override System.Collections.Generic.IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     119      throw new System.NotImplementedException();
     120    }
    113121  }
    114122}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

    r6803 r6968  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
    2224using System.Linq;
    2325using HeuristicLab.Common;
     
    2628using HeuristicLab.Parameters;
    2729using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     30using HeuristicLab.PluginInfrastructure;
    2831
    2932namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
     
    116119      ProblemData = problemData;
    117120    }
     121
     122    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     123      return ApplicationManager.Manager.GetInstances<IRegressionBenchmarkProblemDataGenerator>();
     124    }
     125
     126    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     127      if (!(benchmarkGenerator is IRegressionBenchmarkProblemDataGenerator)) {
     128        throw new ArgumentException("BenchmarkGenerator is not an IRegressionBenchmarkProblemDataGenerator.");
     129      }
     130
     131      IDataAnalysisProblemData problemData = benchmarkGenerator.GenerateProblemData();
     132
     133      if (problemData is IRegressionProblemData)
     134        ProblemData = (IRegressionProblemData)problemData;
     135      else
     136        throw new InvalidCastException("ProblemDataGenerator didn't return an IRegressionProblemData.");
     137    }
    118138  }
    119139}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

    r6803 r6968  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
    2224using System.Linq;
    2325using HeuristicLab.Common;
     
    2527using HeuristicLab.Parameters;
    2628using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     29using HeuristicLab.PluginInfrastructure;
    2730
    2831namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
     
    113116      ProblemData = problemData;
    114117    }
     118
     119    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     120      return ApplicationManager.Manager.GetInstances<IRegressionBenchmarkProblemDataGenerator>();
     121    }
     122
     123    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     124      if (!(benchmarkGenerator is IRegressionBenchmarkProblemDataGenerator)) {
     125        throw new ArgumentException("BenchmarkGenerator is not an IRegressionBenchmarkProblemDataGenerator.");
     126      }
     127
     128      IDataAnalysisProblemData problemData = benchmarkGenerator.GenerateProblemData();
     129
     130      if (problemData is IRegressionProblemData)
     131        ProblemData = (IRegressionProblemData)problemData;
     132      else
     133        throw new InvalidCastException("ProblemDataGenerator didn't return an IRegressionProblemData.");
     134    }
    115135  }
    116136}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectiveProblem.cs

    r6811 r6968  
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using System.Linq;
    2324using HeuristicLab.Common;
     
    6970      UpdateEstimationLimits();
    7071    }
    71    
     72
    7273    private void ConfigureGrammarSymbols() {
    7374      var grammar = SymbolicExpressionTreeGrammar as TypeCoherentExpressionGrammar;
     
    114115      ProblemData = problemData;
    115116    }
     117
     118    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     119      throw new System.NotImplementedException();
     120    }
     121
     122    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     123      throw new System.NotImplementedException();
     124    }
    116125  }
    117126}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r6803 r6968  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using System.Drawing;
    2425using System.Linq;
     
    310311
    311312    public abstract void ImportProblemDataFromFile(string fileName);
     313
     314    public abstract void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator);
     315
     316    public abstract IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators();
    312317  }
    313318}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.Designer.cs

    r5832 r6968  
    4545    /// </summary>
    4646    private void InitializeComponent() {
    47       this.ImportButton = new System.Windows.Forms.Button();
     47      this.importButton = new System.Windows.Forms.Button();
    4848      this.openFileDialog = new System.Windows.Forms.OpenFileDialog();
     49      this.benchmarkComboBox = new System.Windows.Forms.ComboBox();
     50      this.loadButton = new System.Windows.Forms.Button();
    4951      ((System.ComponentModel.ISupportInitialize)(this.errorProvider)).BeginInit();
    5052      this.SuspendLayout();
     
    6668      this.infoLabel.Location = new System.Drawing.Point(474, 3);
    6769      //
    68       // ImportButton
     70      // importButton
    6971      //
    70       this.ImportButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
    71                   | System.Windows.Forms.AnchorStyles.Right)));
    72       this.ImportButton.Location = new System.Drawing.Point(0, 26);
    73       this.ImportButton.Name = "ImportButton";
    74       this.ImportButton.Size = new System.Drawing.Size(493, 23);
    75       this.ImportButton.TabIndex = 3;
    76       this.ImportButton.Text = "Import from CSV file";
    77       this.ImportButton.UseVisualStyleBackColor = true;
    78       this.ImportButton.Click += new System.EventHandler(this.ImportButton_Click);
     72      this.importButton.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
     73            | System.Windows.Forms.AnchorStyles.Right)));
     74      this.importButton.Location = new System.Drawing.Point(3, 24);
     75      this.importButton.Name = "importButton";
     76      this.importButton.Size = new System.Drawing.Size(243, 23);
     77      this.importButton.TabIndex = 3;
     78      this.importButton.Text = "Import from CSV file";
     79      this.importButton.UseVisualStyleBackColor = true;
     80      this.importButton.Click += new System.EventHandler(this.ImportButton_Click);
    7981      //
    8082      // openFileDialog
     
    8284      this.openFileDialog.FileName = "openFileDialog";
    8385      //
     86      // benchmarkComboBox
     87      //
     88      this.benchmarkComboBox.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     89      this.benchmarkComboBox.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
     90      this.benchmarkComboBox.FormattingEnabled = true;
     91      this.benchmarkComboBox.Location = new System.Drawing.Point(252, 25);
     92      this.benchmarkComboBox.Name = "benchmarkComboBox";
     93      this.benchmarkComboBox.Size = new System.Drawing.Size(183, 21);
     94      this.benchmarkComboBox.TabIndex = 5;
     95      //
     96      // loadButton
     97      //
     98      this.loadButton.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
     99      this.loadButton.Location = new System.Drawing.Point(439, 24);
     100      this.loadButton.Name = "loadButton";
     101      this.loadButton.Size = new System.Drawing.Size(50, 23);
     102      this.loadButton.TabIndex = 6;
     103      this.loadButton.Text = "Load";
     104      this.loadButton.UseVisualStyleBackColor = true;
     105      this.loadButton.Click += new System.EventHandler(this.loadButton_Click);
     106      //
    84107      // DataAnalysisProblemView
    85108      //
    86109      this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
    87110      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
    88       this.Controls.Add(this.ImportButton);
     111      this.Controls.Add(this.loadButton);
     112      this.Controls.Add(this.importButton);
     113      this.Controls.Add(this.benchmarkComboBox);
    89114      this.Name = "DataAnalysisProblemView";
    90115      this.Size = new System.Drawing.Size(493, 334);
    91       this.Controls.SetChildIndex(this.ImportButton, 0);
     116      this.Controls.SetChildIndex(this.benchmarkComboBox, 0);
     117      this.Controls.SetChildIndex(this.importButton, 0);
     118      this.Controls.SetChildIndex(this.loadButton, 0);
    92119      this.Controls.SetChildIndex(this.infoLabel, 0);
    93120      this.Controls.SetChildIndex(this.nameTextBox, 0);
     
    102129    #endregion
    103130
    104     private System.Windows.Forms.Button ImportButton;
     131    private System.Windows.Forms.Button importButton;
    105132    private System.Windows.Forms.OpenFileDialog openFileDialog;
     133    private System.Windows.Forms.ComboBox benchmarkComboBox;
     134    private System.Windows.Forms.Button loadButton;
    106135  }
    107136}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs

    r5834 r6968  
    2121
    2222using System;
     23using System.Linq;
    2324using System.Windows.Forms;
    2425using HeuristicLab.MainForm;
     
    4142    protected override void SetEnabledStateOfControls() {
    4243      base.SetEnabledStateOfControls();
    43       ImportButton.Enabled = !Locked && !ReadOnly && Content != null;
     44      importButton.Enabled = !Locked && !ReadOnly && Content != null;
    4445    }
    4546
     
    5455      }
    5556    }
     57
     58    private void loadButton_Click(object sender, EventArgs e) {
     59      if (benchmarkComboBox.SelectedItem != null)
     60        Content.CreateProblemDataFromBenchmark((IDataAnalysisBenchmarkProblemDataGenerator)benchmarkComboBox.SelectedItem);
     61    }
     62
     63    protected override void OnContentChanged() {
     64      base.OnContentChanged();
     65      benchmarkComboBox.Items.Clear();
     66      benchmarkComboBox.Items.AddRange(Content.GetBenchmarkProblemDataGenerators().OrderBy(b => b.ItemName).ToArray());
     67      if (benchmarkComboBox.Items.Count > 0)
     68        benchmarkComboBox.SelectedIndex = 0;
     69    }
    5670  }
    5771}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

    r6866 r6968  
    9393  </PropertyGroup>
    9494  <ItemGroup>
     95    <Reference Include="HeuristicLab.Operators-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
    9596    <Reference Include="System" />
    9697    <Reference Include="System.Core">
     
    328329      <Private>False</Private>
    329330    </ProjectReference>
     331    <ProjectReference Include="..\..\HeuristicLab.DebugEngine\3.3\HeuristicLab.DebugEngine-3.3.csproj">
     332      <Project>{49F28045-7B5F-411B-8D59-16C846FA26E0}</Project>
     333      <Name>HeuristicLab.DebugEngine-3.3</Name>
     334    </ProjectReference>
    330335    <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
    331336      <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
     
    396401    </BootstrapperPackage>
    397402  </ItemGroup>
     403  <ItemGroup>
     404    <EmbeddedResource Include="DataAnalysisProblemView.resx">
     405      <DependentUpon>DataAnalysisProblemView.cs</DependentUpon>
     406    </EmbeddedResource>
     407  </ItemGroup>
    398408  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    399409  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/HeuristicLab.Problems.DataAnalysis-3.4.csproj

    r6913 r6968  
    138138    </Compile>
    139139    <Compile Include="Interfaces\Classification\IDiscriminantFunctionThresholdCalculator.cs" />
     140    <Compile Include="Interfaces\Classification\IClassificationBenchmarkProblemDataGenerator.cs" />
     141    <Compile Include="Interfaces\Clustering\IClusteringBenchmarkProblemDataGenerator.cs" />
     142    <Compile Include="Interfaces\IDataAnalysisBenchmarkProblemDataGenerator.cs" />
     143    <Compile Include="Interfaces\Regression\IRegressionBenchmarkProblemDataGenerator.cs" />
    140144    <Compile Include="Interfaces\Regression\IRegressionEnsembleModel.cs">
    141145      <SubType>Code</SubType>
     
    143147    <Compile Include="Interfaces\Regression\IRegressionEnsembleSolution.cs" />
    144148    <Compile Include="Implementation\Regression\RegressionSolutionBase.cs" />
     149    <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesBenchmarkProblemDataGenerator.cs" />
    145150    <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisModel.cs" />
    146151    <Compile Include="Interfaces\TimeSeriesPrognosis\ITimeSeriesPrognosisProblem.cs" />
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Classification/ClassificationProblem.cs

    r5809 r6968  
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.PluginInfrastructure;
    2527
    2628namespace HeuristicLab.Problems.DataAnalysis {
     
    4345      ProblemData = problemData;
    4446    }
     47
     48    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     49      throw new System.NotImplementedException();
     50    }
     51
     52    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     53      return ApplicationManager.Manager.GetInstances<IClassificationBenchmarkProblemDataGenerator>();
     54    }
    4555  }
    4656}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Clustering/ClusteringProblem.cs

    r5809 r6968  
    2323using HeuristicLab.Core;
    2424using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.PluginInfrastructure;
    2526
    2627namespace HeuristicLab.Problems.DataAnalysis {
     
    4344      ProblemData = problemData;
    4445    }
     46
     47    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     48      throw new System.NotImplementedException();
     49    }
     50
     51    public override System.Collections.Generic.IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     52      return ApplicationManager.Manager.GetInstances<IClusteringBenchmarkProblemDataGenerator>();
     53    }
    4554  }
    4655}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/DataAnalysisProblem.cs

    r6635 r6968  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using HeuristicLab.Common;
    2425using HeuristicLab.Core;
     
    9293
    9394    public abstract void ImportProblemDataFromFile(string fileName);
     95
     96    public abstract void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator);
     97
     98    public abstract IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators();
    9499  }
    95100}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/Regression/RegressionProblem.cs

    r5809 r6968  
    2020#endregion
    2121
     22using System;
     23using System.Collections.Generic;
    2224using HeuristicLab.Common;
    2325using HeuristicLab.Core;
    2426using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     27using HeuristicLab.PluginInfrastructure;
    2528
    2629namespace HeuristicLab.Problems.DataAnalysis {
     
    4346      ProblemData = problemData;
    4447    }
     48
     49    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     50      return ApplicationManager.Manager.GetInstances<IRegressionBenchmarkProblemDataGenerator>();
     51    }
     52
     53    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     54      if (!(benchmarkGenerator is IRegressionBenchmarkProblemDataGenerator)) {
     55        throw new ArgumentException("BenchmarkGenerator is not an IRegressionBenchmarkProblemDataGenerator.");
     56      }
     57
     58      IDataAnalysisProblemData problemData = benchmarkGenerator.GenerateProblemData();
     59
     60      if (problemData is IRegressionProblemData)
     61        ProblemData = (IRegressionProblemData)problemData;
     62      else
     63        throw new InvalidCastException("ProblemDataGenerator didn't return an IRegressionProblemData.");
     64    }
    4565  }
    4666}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Implementation/TimeSeriesPrognosis/TimeSeriesPrognosisProblem.cs

    r6802 r6968  
    2020#endregion
    2121
     22using System.Collections.Generic;
    2223using HeuristicLab.Common;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.PluginInfrastructure;
    2527
    2628namespace HeuristicLab.Problems.DataAnalysis {
     
    4345      ProblemData = problemData;
    4446    }
     47
     48    public override void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator) {
     49      throw new System.NotImplementedException();
     50    }
     51
     52    public override IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators() {
     53      return ApplicationManager.Manager.GetInstances<ITimeSeriesBenchmarkProblemDataGenerator>();
     54    }
    4555  }
    4656}
  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisProblem.cs

    r5809 r6968  
    2121
    2222using System;
     23using System.Collections.Generic;
    2324using HeuristicLab.Core;
    2425using HeuristicLab.Optimization;
     
    3132
    3233    void ImportProblemDataFromFile(string fileName);
     34    void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator);
     35    IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators();
    3336  }
    3437
Note: See TracChangeset for help on using the changeset viewer.