Free cookie consent management tool by TermsFeed Policy Generator

Changeset 7044


Ignore:
Timestamp:
11/22/11 16:52:43 (12 years ago)
Author:
sforsten
Message:

#1669: real world problems have been added

Location:
branches/RegressionBenchmarks
Files:
14 added
54 edited

Legend:

Unmodified
Added
Removed

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/Generator/RegressionBenchmark.cs

    r7025 r7044  
    5757    }
    5858
    59     protected abstract List<double> CalculateFunction(List<List<double>> data);
    60 
    61     protected abstract List<List<double>> GenerateInput(List<List<double>> dataList);
    62 
    63     public IDataAnalysisProblemData GenerateProblemData() {
    64       List<string> varNames = new List<string>();
    65       varNames.Add(this.TargetVariable);
    66       varNames.AddRange(InputVariable);
    67 
    68       List<List<double>> dataList = GenerateInput(new List<List<double>>());
    69 
    70       dataList.Insert(0, CalculateFunction(dataList));
    71 
    72       Dataset dataset = new Dataset(varNames, dataList);
    73 
    74       RegressionProblemData problemData = new RegressionProblemData(dataset, dataset.DoubleVariables.Skip(1), dataset.DoubleVariables.First());
    75 
    76       problemData.Name = "Data generated for benchmark problem \"" + this.Name + "\"";
    77       problemData.Description = this.Description;
    78 
    79       problemData.TestPartition.Start = this.TestPartition.Start;
    80       problemData.TestPartition.End = this.TestPartition.End;
    81 
    82       problemData.TrainingPartition.Start = this.TrainingPartition.Start;
    83       problemData.TrainingPartition.End = this.TrainingPartition.End;
    84 
    85       return problemData;
    86     }
     59    public abstract IDataAnalysisProblemData GenerateProblemData();
    8760
    8861    public static List<double> GenerateSteps(DoubleRange range, double stepWidth) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/HeuristicLab.Problems.DataAnalysis.Benchmarks-3.4.csproj

    r7031 r7044  
    4949  <ItemGroup>
    5050    <Compile Include="Benchmark.cs" />
     51    <Compile Include="Generator\RegressionRealWorldBenchmark.cs" />
     52    <Compile Include="Generator\RegressionToyBenchmark.cs" />
    5153    <Compile Include="Plugin.cs" />
    5254    <Compile Include="Properties\AssemblyInfo.cs" />
    53     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionSixteen.cs" />
    54     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionFifteen.cs" />
    55     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionThirteen.cs" />
    56     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionTwelve.cs" />
    57     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionEight.cs" />
    58     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionSeven.cs" />
    59     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionSix.cs" />
    60     <Compile Include="RegressionBenchmarks\Korns\KornFunctionFiveteen.cs" />
    61     <Compile Include="RegressionBenchmarks\Korns\KornFunctionFourteen.cs" />
    62     <Compile Include="RegressionBenchmarks\Korns\KornFunctionThirteen.cs" />
    63     <Compile Include="RegressionBenchmarks\Korns\KornFunctionTwelve.cs" />
    64     <Compile Include="RegressionBenchmarks\Korns\KornFunctionEleven.cs" />
    65     <Compile Include="RegressionBenchmarks\Korns\KornFunctionTen.cs" />
    66     <Compile Include="RegressionBenchmarks\Korns\KornFunctionNine.cs" />
    67     <Compile Include="RegressionBenchmarks\Korns\KornFunctionEight.cs" />
    68     <Compile Include="RegressionBenchmarks\Korns\KornFunctionSeven.cs" />
    69     <Compile Include="RegressionBenchmarks\Korns\KornFunctionSix.cs" />
    70     <Compile Include="RegressionBenchmarks\Korns\KornFunctionFive.cs" />
    71     <Compile Include="RegressionBenchmarks\Korns\KornFunctionFour.cs" />
    72     <Compile Include="RegressionBenchmarks\Korns\KornFunctionThree.cs" />
    73     <Compile Include="RegressionBenchmarks\Korns\KornFunctionTwo.cs" />
    74     <Compile Include="RegressionBenchmarks\Korns\KornFunctionOne.cs" />
    75     <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionFour.cs" />
    76     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwelve.cs" />
    77     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEleven.cs" />
    78     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTen.cs" />
    79     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionNine.cs" />
    80     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEight.cs" />
    81     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSeven.cs" />
    82     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSix.cs" />
    83     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFive.cs" />
    84     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFour.cs" />
    85     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionThree.cs" />
    86     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwo.cs" />
    87     <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionOne.cs" />
    88     <Compile Include="RegressionBenchmarks\Vladislavleva\KotanchekFunction.cs" />
     55    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionEight.cs">
     56      <SubType>Code</SubType>
     57    </Compile>
     58    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionFifteen.cs">
     59      <SubType>Code</SubType>
     60    </Compile>
     61    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionFour.cs">
     62      <SubType>Code</SubType>
     63    </Compile>
     64    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionSeven.cs">
     65      <SubType>Code</SubType>
     66    </Compile>
     67    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionSix.cs">
     68      <SubType>Code</SubType>
     69    </Compile>
     70    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionSixteen.cs">
     71      <SubType>Code</SubType>
     72    </Compile>
     73    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionThirteen.cs">
     74      <SubType>Code</SubType>
     75    </Compile>
     76    <Compile Include="RegressionBenchmarks\Keijzer\KeijzerFunctionTwelve.cs">
     77      <SubType>Code</SubType>
     78    </Compile>
     79    <Compile Include="RegressionBenchmarks\Korns\KornFunctionEight.cs">
     80      <SubType>Code</SubType>
     81    </Compile>
     82    <Compile Include="RegressionBenchmarks\Korns\KornFunctionEleven.cs">
     83      <SubType>Code</SubType>
     84    </Compile>
     85    <Compile Include="RegressionBenchmarks\Korns\KornFunctionFive.cs">
     86      <SubType>Code</SubType>
     87    </Compile>
     88    <Compile Include="RegressionBenchmarks\Korns\KornFunctionFiveteen.cs">
     89      <SubType>Code</SubType>
     90    </Compile>
     91    <Compile Include="RegressionBenchmarks\Korns\KornFunctionFour.cs">
     92      <SubType>Code</SubType>
     93    </Compile>
     94    <Compile Include="RegressionBenchmarks\Korns\KornFunctionFourteen.cs">
     95      <SubType>Code</SubType>
     96    </Compile>
     97    <Compile Include="RegressionBenchmarks\Korns\KornFunctionNine.cs">
     98      <SubType>Code</SubType>
     99    </Compile>
     100    <Compile Include="RegressionBenchmarks\Korns\KornFunctionOne.cs">
     101      <SubType>Code</SubType>
     102    </Compile>
     103    <Compile Include="RegressionBenchmarks\Korns\KornFunctionSeven.cs">
     104      <SubType>Code</SubType>
     105    </Compile>
     106    <Compile Include="RegressionBenchmarks\Korns\KornFunctionSix.cs">
     107      <SubType>Code</SubType>
     108    </Compile>
     109    <Compile Include="RegressionBenchmarks\Korns\KornFunctionTen.cs">
     110      <SubType>Code</SubType>
     111    </Compile>
     112    <Compile Include="RegressionBenchmarks\Korns\KornFunctionThirteen.cs">
     113      <SubType>Code</SubType>
     114    </Compile>
     115    <Compile Include="RegressionBenchmarks\Korns\KornFunctionThree.cs">
     116      <SubType>Code</SubType>
     117    </Compile>
     118    <Compile Include="RegressionBenchmarks\Korns\KornFunctionTwelve.cs">
     119      <SubType>Code</SubType>
     120    </Compile>
     121    <Compile Include="RegressionBenchmarks\Korns\KornFunctionTwo.cs">
     122      <SubType>Code</SubType>
     123    </Compile>
     124    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEight.cs">
     125      <SubType>Code</SubType>
     126    </Compile>
     127    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionEleven.cs">
     128      <SubType>Code</SubType>
     129    </Compile>
     130    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFive.cs">
     131      <SubType>Code</SubType>
     132    </Compile>
     133    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionFour.cs">
     134      <SubType>Code</SubType>
     135    </Compile>
     136    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionNine.cs">
     137      <SubType>Code</SubType>
     138    </Compile>
     139    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionOne.cs">
     140      <SubType>Code</SubType>
     141    </Compile>
     142    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSeven.cs">
     143      <SubType>Code</SubType>
     144    </Compile>
     145    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionSix.cs">
     146      <SubType>Code</SubType>
     147    </Compile>
     148    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTen.cs">
     149      <SubType>Code</SubType>
     150    </Compile>
     151    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionThree.cs">
     152      <SubType>Code</SubType>
     153    </Compile>
     154    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwelve.cs">
     155      <SubType>Code</SubType>
     156    </Compile>
     157    <Compile Include="RegressionBenchmarks\Nguyen\NguyenFunctionTwo.cs">
     158      <SubType>Code</SubType>
     159    </Compile>
     160    <Compile Include="RegressionBenchmarks\RealWorldProblems\ChemicalOne.cs" />
     161    <Compile Include="RegressionBenchmarks\RealWorldProblems\MacroEconomic.cs" />
     162    <Compile Include="RegressionBenchmarks\RealWorldProblems\Housing.cs" />
     163    <Compile Include="RegressionBenchmarks\RealWorldProblems\FinancialOne.cs" />
     164    <Compile Include="RegressionBenchmarks\RealWorldProblems\TowerProblem.cs" />
    89165    <Compile Include="Generator\RegressionBenchmark.cs" />
    90     <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialThreeDimensional.cs" />
    91     <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialTwoDimensional.cs" />
    92     <Compile Include="RegressionBenchmarks\Vladislavleva\RippleFunction.cs" />
    93     <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionOneDimensional.cs" />
    94     <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionTwoDimensional.cs" />
    95     <Compile Include="RegressionBenchmarks\Vladislavleva\SineCosineFunction.cs" />
    96     <Compile Include="RegressionBenchmarks\Vladislavleva\UnwrappedBallFunctionFiveDimensional.cs" />
     166    <Compile Include="RegressionBenchmarks\Vladislavleva\KotanchekFunction.cs">
     167      <SubType>Code</SubType>
     168    </Compile>
     169    <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialThreeDimensional.cs">
     170      <SubType>Code</SubType>
     171    </Compile>
     172    <Compile Include="RegressionBenchmarks\Vladislavleva\RationalPolynomialTwoDimensional.cs">
     173      <SubType>Code</SubType>
     174    </Compile>
     175    <Compile Include="RegressionBenchmarks\Vladislavleva\RippleFunction.cs">
     176      <SubType>Code</SubType>
     177    </Compile>
     178    <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionOneDimensional.cs">
     179      <SubType>Code</SubType>
     180    </Compile>
     181    <Compile Include="RegressionBenchmarks\Vladislavleva\SalustowiczFunctionTwoDimensional.cs">
     182      <SubType>Code</SubType>
     183    </Compile>
     184    <Compile Include="RegressionBenchmarks\Vladislavleva\SineCosineFunction.cs">
     185      <SubType>Code</SubType>
     186    </Compile>
     187    <Compile Include="RegressionBenchmarks\Vladislavleva\UnwrappedBallFunctionFiveDimensional.cs">
     188      <SubType>Code</SubType>
     189    </Compile>
    97190  </ItemGroup>
    98191  <ItemGroup>
    … …  
    134227    <None Include="Plugin.cs.frame" />
    135228    <None Include="Properties\AssemblyInfo.cs.frame" />
     229    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\chemical-I.csv" />
     230    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\financial-I.csv" />
     231    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\housing.csv" />
     232    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\macro-economic.csv" />
    136233  </ItemGroup>
    137234  <ItemGroup />
     235  <ItemGroup>
     236    <EmbeddedResource Include="RegressionBenchmarks\RealWorldProblems\files\towerData.txt" />
     237  </ItemGroup>
    138238  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
    139239  <PropertyGroup>

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionEight.cs

    r7031 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KeijzerFunctionEight : RegressionBenchmark {
     27  public class KeijzerFunctionEight : RegressionToyBenchmark {
    2828
    2929    public KeijzerFunctionEight() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      dataList.Add(RegressionBenchmark.GenerateSteps(new DoubleRange(0, 100), 1));
    5556      dataList[0].AddRange(RegressionBenchmark.GenerateSteps(new DoubleRange(0, 100), 0.1));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFifteen.cs

    r7031 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KeijzerFunctionFifteen : RegressionBenchmark {
     27  public class KeijzerFunctionFifteen : RegressionToyBenchmark {
    2828
    2929    public KeijzerFunctionFifteen() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(-3, 3);
    5657

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionFour.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KeijzerFunctionFour : RegressionBenchmark {
     27  public class KeijzerFunctionFour : RegressionToyBenchmark {
    2828
    2929    public KeijzerFunctionFour() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(-1, 1);
    5556      dataList.Add(RegressionBenchmark.GenerateSteps(range, 0.1));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSeven.cs

    r7025 r7044  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    28   public class KeijzerFunctionSeven : RegressionBenchmark {
     28  public class KeijzerFunctionSeven : RegressionToyBenchmark {
    2929
    3030    public KeijzerFunctionSeven() {
    … …  
    4242    }
    4343
    44     protected override List<double> CalculateFunction(List<List<double>> data) {
     44    protected override List<double> GenerateTarget(List<List<double>> data) {
    4545      double x;
    4646      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      dataList.Add(RegressionBenchmark.GenerateSteps(new DoubleRange(1, 50), 1));
    5657      dataList[0].AddRange(RegressionBenchmark.GenerateSteps(new DoubleRange(1, 120), 1));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSix.cs

    r7031 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KeijzerFunctionSix : RegressionBenchmark {
     27  public class KeijzerFunctionSix : RegressionToyBenchmark {
    2828
    2929    public KeijzerFunctionSix() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y, z;
    4545      List<double> results = new List<double>();
    … …  
    5353    }
    5454
    55     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     55    protected override List<List<double>> GenerateInput() {
     56      List<List<double>> dataList = new List<List<double>>();
    5657      DoubleRange rangeXZ = new DoubleRange(-1, 1);
    5758      DoubleRange rangeY = new DoubleRange(1, 2);

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionSixteen.cs

    r7031 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KeijzerFunctionSixteen : RegressionBenchmark {
     27  public class KeijzerFunctionSixteen : RegressionToyBenchmark {
    2828
    2929    public KeijzerFunctionSixteen() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(-3, 3);
    5657

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionThirteen.cs

    r7031 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KeijzerFunctionThirteen : RegressionBenchmark {
     27  public class KeijzerFunctionThirteen : RegressionToyBenchmark {
    2828
    2929    public KeijzerFunctionThirteen() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(-3, 3);
    5657

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Keijzer/KeijzerFunctionTwelve.cs

    r7031 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KeijzerFunctionTwelve : RegressionBenchmark {
     27  public class KeijzerFunctionTwelve : RegressionToyBenchmark {
    2828
    2929    public KeijzerFunctionTwelve() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(-3, 3);
    5657

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionEight.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionEight : RegressionBenchmark {
     27  public class KornFunctionEight : RegressionToyBenchmark {
    2828
    2929    public KornFunctionEight() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0, x3, x4;
    5050      List<double> results = new List<double>();
    … …  
    5858    }
    5959
    60     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     60    protected override List<List<double>> GenerateInput() {
     61      List<List<double>> dataList = new List<List<double>>();
    6162      DoubleRange range = new DoubleRange(-50, 50);
    6263      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionEleven.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornsFunctionEleven : RegressionBenchmark {
     27  public class KornsFunctionEleven : RegressionToyBenchmark {
    2828
    2929    public KornsFunctionEleven() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0;
    5050      List<double> results = new List<double>();
    … …  
    5656    }
    5757
    58     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     58    protected override List<List<double>> GenerateInput() {
     59      List<List<double>> dataList = new List<List<double>>();
    5960      DoubleRange range = new DoubleRange(-50, 50);
    6061      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFive.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionFive : RegressionBenchmark {
     27  public class KornFunctionFive : RegressionToyBenchmark {
    2828
    2929    public KornFunctionFive() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x4;
    5050      List<double> results = new List<double>();
    … …  
    5656    }
    5757
    58     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     58    protected override List<List<double>> GenerateInput() {
     59      List<List<double>> dataList = new List<List<double>>();
    5960      DoubleRange range = new DoubleRange(-50, 50);
    6061      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFiveteen.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionFiveteen : RegressionBenchmark {
     27  public class KornFunctionFiveteen : RegressionToyBenchmark {
    2828
    2929    public KornFunctionFiveteen() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0, x1, x2, x3;
    5050      List<double> results = new List<double>();
    … …  
    5959    }
    6060
    61     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     61    protected override List<List<double>> GenerateInput() {
     62      List<List<double>> dataList = new List<List<double>>();
    6263      DoubleRange range = new DoubleRange(-50, 50);
    6364      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFour.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionFour : RegressionBenchmark {
     27  public class KornFunctionFour : RegressionToyBenchmark {
    2828
    2929    public KornFunctionFour() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x2;
    5050      List<double> results = new List<double>();
    … …  
    5656    }
    5757
    58     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     58    protected override List<List<double>> GenerateInput() {
     59      List<List<double>> dataList = new List<List<double>>();
    5960      DoubleRange range = new DoubleRange(-50, 50);
    6061      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionFourteen.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionFourteen : RegressionBenchmark {
     27  public class KornFunctionFourteen : RegressionToyBenchmark {
    2828
    2929    public KornFunctionFourteen() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0, x1, x2, x3;
    5050      List<double> results = new List<double>();
    … …  
    5959    }
    6060
    61     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     61    protected override List<List<double>> GenerateInput() {
     62      List<List<double>> dataList = new List<List<double>>();
    6263      DoubleRange range = new DoubleRange(-50, 50);
    6364      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionNine.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionNine : RegressionBenchmark {
     27  public class KornFunctionNine : RegressionToyBenchmark {
    2828
    2929    public KornFunctionNine() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0, x1, x2, x3;
    5050      List<double> results = new List<double>();
    … …  
    5959    }
    6060
    61     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     61    protected override List<List<double>> GenerateInput() {
     62      List<List<double>> dataList = new List<List<double>>();
    6263      DoubleRange range = new DoubleRange(-50, 50);
    6364      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionOne.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornsFunctionOne : RegressionBenchmark {
     27  public class KornsFunctionOne : RegressionToyBenchmark {
    2828
    2929    public KornsFunctionOne() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x3;
    5050      List<double> results = new List<double>();
    … …  
    5656    }
    5757
    58     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     58    protected override List<List<double>> GenerateInput() {
     59      List<List<double>> dataList = new List<List<double>>();
    5960      DoubleRange range = new DoubleRange(-50, 50);
    6061      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionSeven.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionSeven : RegressionBenchmark {
     27  public class KornFunctionSeven : RegressionToyBenchmark {
    2828
    2929    public KornFunctionSeven() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0;
    5050      List<double> results = new List<double>();
    … …  
    5656    }
    5757
    58     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     58    protected override List<List<double>> GenerateInput() {
     59      List<List<double>> dataList = new List<List<double>>();
    5960      DoubleRange range = new DoubleRange(-50, 50);
    6061      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionSix.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornsFunctionSix : RegressionBenchmark {
     27  public class KornsFunctionSix : RegressionToyBenchmark {
    2828
    2929    public KornsFunctionSix() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0;
    5050      List<double> results = new List<double>();
    … …  
    5656    }
    5757
    58     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     58    protected override List<List<double>> GenerateInput() {
     59      List<List<double>> dataList = new List<List<double>>();
    5960      DoubleRange range = new DoubleRange(-50, 50);
    6061      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTen.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionTen : RegressionBenchmark {
     27  public class KornFunctionTen : RegressionToyBenchmark {
    2828
    2929    public KornFunctionTen() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x1, x2, x3, x4;
    5050      List<double> results = new List<double>();
    … …  
    5959    }
    6060
    61     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     61    protected override List<List<double>> GenerateInput() {
     62      List<List<double>> dataList = new List<List<double>>();
    6263      DoubleRange range = new DoubleRange(-50, 50);
    6364      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionThirteen.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionThirteen : RegressionBenchmark {
     27  public class KornFunctionThirteen : RegressionToyBenchmark {
    2828
    2929    public KornFunctionThirteen() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0, x1, x2, x3;
    5050      List<double> results = new List<double>();
    … …  
    5959    }
    6060
    61     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     61    protected override List<List<double>> GenerateInput() {
     62      List<List<double>> dataList = new List<List<double>>();
    6263      DoubleRange range = new DoubleRange(-50, 50);
    6364      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionThree.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionThree : RegressionBenchmark {
     27  public class KornFunctionThree : RegressionToyBenchmark {
    2828
    2929    public KornFunctionThree() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0, x1, x3, x4;
    5050      List<double> results = new List<double>();
    … …  
    5959    }
    6060
    61     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     61    protected override List<List<double>> GenerateInput() {
     62      List<List<double>> dataList = new List<List<double>>();
    6263      DoubleRange range = new DoubleRange(-50, 50);
    6364      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTwelve.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionTwelve : RegressionBenchmark {
     27  public class KornFunctionTwelve : RegressionToyBenchmark {
    2828
    2929    public KornFunctionTwelve() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x0, x4;
    5050      List<double> results = new List<double>();
    … …  
    5757    }
    5858
    59     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     59    protected override List<List<double>> GenerateInput() {
     60      List<List<double>> dataList = new List<List<double>>();
    6061      DoubleRange range = new DoubleRange(-50, 50);
    6162      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Korns/KornFunctionTwo.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KornFunctionTwo : RegressionBenchmark {
     27  public class KornFunctionTwo : RegressionToyBenchmark {
    2828
    2929    public KornFunctionTwo() {
    … …  
    4646    }
    4747
    48     protected override List<double> CalculateFunction(List<List<double>> data) {
     48    protected override List<double> GenerateTarget(List<List<double>> data) {
    4949      double x1, x3, x4;
    5050      List<double> results = new List<double>();
    … …  
    5858    }
    5959
    60     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     60    protected override List<List<double>> GenerateInput() {
     61      List<List<double>> dataList = new List<List<double>>();
    6162      DoubleRange range = new DoubleRange(-50, 50);
    6263      for (int i = 0; i < inputVariables.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionEight.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionEight : RegressionBenchmark {
     27  public class NguyenFunctionEight : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionEight() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(0, 4);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionEleven.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionEleven : RegressionBenchmark {
     27  public class NguyenFunctionEleven : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionEleven() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(0, 1);
    5657      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionFive.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionFive : RegressionBenchmark {
     27  public class NguyenFunctionFive : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionFive() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(-1, 1);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionFour.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionFour : RegressionBenchmark {
     27  public class NguyenFunctionFour : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionFour() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(-1, 1);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionNine.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionNine : RegressionBenchmark {
     27  public class NguyenFunctionNine : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionNine() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(0, 1);
    5657      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionOne.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionOne : RegressionBenchmark {
     27  public class NguyenFunctionOne : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionOne() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(-1, 1);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionSeven.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionSeven : RegressionBenchmark {
     27  public class NguyenFunctionSeven : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionSeven() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(0, 2);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionSix.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionSix : RegressionBenchmark {
     27  public class NguyenFunctionSix : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionSix() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(1, -1);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTen.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionTen : RegressionBenchmark {
     27  public class NguyenFunctionTen : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionTen() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(0, 1);
    5657      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionThree.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionThree : RegressionBenchmark {
     27  public class NguyenFunctionThree : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionThree() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(-1, 1);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTwelve.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionTwelve : RegressionBenchmark {
     27  public class NguyenFunctionTwelve : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionTwelve() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x, y;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(0, 1);
    5657      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Nguyen/NguyenFunctionTwo.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class NguyenFunctionTwo : RegressionBenchmark {
     27  public class NguyenFunctionTwo : RegressionToyBenchmark {
    2828
    2929    public NguyenFunctionTwo() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      DoubleRange range = new DoubleRange(-1, 1);
    5556      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(testPartition.End, range));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/KotanchekFunction.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class KotanchekFunction : RegressionBenchmark {
     27  public class KotanchekFunction : RegressionToyBenchmark {
    2828
    2929    public KotanchekFunction() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x1, x2;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange trainingRange = new DoubleRange(0.3, 4);
    5657      for (int i = 0; i < InputVariable.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialThreeDimensional.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class RationalPolynomial : RegressionBenchmark {
     27  public class RationalPolynomial : RegressionToyBenchmark {
    2828
    2929    public RationalPolynomial() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x1, x2, x3;
    4545      List<double> results = new List<double>();
    … …  
    5353    }
    5454
    55     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     55    protected override List<List<double>> GenerateInput() {
     56      List<List<double>> dataList = new List<List<double>>();
    5657      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(300, new DoubleRange(0.05, 2)));
    5758      dataList.Add(RegressionBenchmark.GenerateUniformDistributedValues(300, new DoubleRange(1, 2)));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RationalPolynomialTwoDimensional.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class RationalPolynomialTwoDimensional : RegressionBenchmark {
     27  public class RationalPolynomialTwoDimensional : RegressionToyBenchmark {
    2828
    2929    public RationalPolynomialTwoDimensional() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x1, x2;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange trainingRange = new DoubleRange(0.05, 6.05);
    5657      for (int i = 0; i < InputVariable.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/RippleFunction.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class RippleFunction : RegressionBenchmark {
     27  public class RippleFunction : RegressionToyBenchmark {
    2828
    2929    public RippleFunction() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x1, x2;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange range = new DoubleRange(0.05, 6.05);
    5657      for (int i = 0; i < InputVariable.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalustowiczFunctionOneDimensional.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class SalustowiczFunctionOneDimensional : RegressionBenchmark {
     27  public class SalustowiczFunctionOneDimensional : RegressionToyBenchmark {
    2828
    2929    public SalustowiczFunctionOneDimensional() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x;
    4545      List<double> results = new List<double>();
    … …  
    5151    }
    5252
    53     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     53    protected override List<List<double>> GenerateInput() {
     54      List<List<double>> dataList = new List<List<double>>();
    5455      dataList.Add(RegressionBenchmark.GenerateSteps(new DoubleRange(0.05, 10), 0.1));
    5556      dataList[0].AddRange(RegressionBenchmark.GenerateSteps(new DoubleRange(-0.5, 10.5), 0.05));

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SalustowiczFunctionTwoDimensional.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class SalustowiczFunctionTwoDimensional : RegressionBenchmark {
     27  public class SalustowiczFunctionTwoDimensional : RegressionToyBenchmark {
    2828
    2929    public SalustowiczFunctionTwoDimensional() {
    … …  
    4242    }
    4343
    44     protected override List<double> CalculateFunction(List<List<double>> data) {
     44    protected override List<double> GenerateTarget(List<List<double>> data) {
    4545      double x1, x2;
    4646      List<double> results = new List<double>();
    … …  
    5353    }
    5454
    55     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     55    protected override List<List<double>> GenerateInput() {
     56      List<List<double>> dataList = new List<List<double>>();
    5657      List<List<double>> trainingData = new List<List<double>>() {
    5758        RegressionBenchmark.GenerateSteps(new DoubleRange(0.05, 10), 0.1),

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/SineCosineFunction.cs

    r7025 r7044  
    2525
    2626namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    27   public class SineCosineFunction : RegressionBenchmark {
     27  public class SineCosineFunction : RegressionToyBenchmark {
    2828
    2929    public SineCosineFunction() {
    … …  
    4141    }
    4242
    43     protected override List<double> CalculateFunction(List<List<double>> data) {
     43    protected override List<double> GenerateTarget(List<List<double>> data) {
    4444      double x1, x2;
    4545      List<double> results = new List<double>();
    … …  
    5252    }
    5353
    54     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     54    protected override List<List<double>> GenerateInput() {
     55      List<List<double>> dataList = new List<List<double>>();
    5556      DoubleRange trainingRange = new DoubleRange(0.1, 5.9);
    5657      for (int i = 0; i < InputVariable.Count; i++) {

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Benchmarks/3.4/RegressionBenchmarks/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs

    r7025 r7044  
    2626
    2727namespace HeuristicLab.Problems.DataAnalysis.Benchmarks {
    28   public class UnwrappedBallFunctionFiveDimensional : RegressionBenchmark {
     28  public class UnwrappedBallFunctionFiveDimensional : RegressionToyBenchmark {
    2929
    3030    public UnwrappedBallFunctionFiveDimensional() {
    … …  
    4242    }
    4343
    44     protected override List<double> CalculateFunction(List<List<double>> data) {
     44    protected override List<double> GenerateTarget(List<List<double>> data) {
    4545      double x1, x2, x3, x4, x5;
    4646      List<double> results = new List<double>();
    … …  
    5656    }
    5757
    58     protected override List<List<double>> GenerateInput(List<List<double>> dataList) {
     58    protected override List<List<double>> GenerateInput() {
     59      List<List<double>> dataList = new List<List<double>>();
    5960      DoubleRange testRange = new DoubleRange(0.05, 6.05);
    6061      DoubleRange trainingRange = new DoubleRange(-0.25, 6.35);

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/MultiObjective/SymbolicClassificationMultiObjectiveProblem.cs

    r6968 r7044  
    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     }
    122114  }
    123115}

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveProblem.cs

    r6968 r7044  
    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     }
    121113  }
    122114}

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveProblem.cs

    r6968 r7044  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.Linq;
    2523using HeuristicLab.Common;
    … …  
    2826using HeuristicLab.Parameters;
    2927using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    30 using HeuristicLab.PluginInfrastructure;
    3128
    3229namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    … …  
    119116      ProblemData = problemData;
    120117    }
    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     }
    138118  }
    139119}

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveProblem.cs

    r6968 r7044  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.Linq;
    2523using HeuristicLab.Common;
    … …  
    2725using HeuristicLab.Parameters;
    2826using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
    29 using HeuristicLab.PluginInfrastructure;
    3027
    3128namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression {
    … …  
    116113      ProblemData = problemData;
    117114    }
    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     }
    135115  }
    136116}

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic.TimeSeriesPrognosis/3.4/SingleObjective/SymbolicTimeSeriesPrognosisSingleObjectiveProblem.cs

    r6968 r7044  
    2020#endregion
    2121
    22 using System.Collections.Generic;
    2322using System.Linq;
    2423using HeuristicLab.Common;
    … …  
    115114      ProblemData = problemData;
    116115    }
    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     }
    125116  }
    126117}

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisProblem.cs

    r7025 r7044  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.Drawing;
    2524using System.Linq;
    … …  
    313312
    314313    public abstract void ImportProblemDataFromFile(string fileName);
    315 
    316     public abstract void CreateProblemDataFromBenchmark(IDataAnalysisBenchmarkProblemDataGenerator benchmarkGenerator);
    317 
    318     public abstract IEnumerable<IDataAnalysisBenchmarkProblemDataGenerator> GetBenchmarkProblemDataGenerators();
    319314  }
    320315}

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisSingleObjectiveProblem.cs

    r6533 r7044  
    116116      }
    117117    }
     118
     119    public override void ImportProblemDataFromFile(string fileName) {
     120      throw new NotImplementedException();
     121    }
    118122  }
    119123}

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisProblemView.cs

    r7025 r7044  
    6565      base.OnContentChanged();
    6666      benchmarkComboBox.Items.Clear();
    67       benchmarkComboBox.Items.AddRange(GetBenchmarkProblemDataGenerators().OrderBy(b => b.ItemName).ToArray());
     67      benchmarkComboBox.Items.AddRange(GetBenchmarkProblemDataGenerators().OrderBy(b => b.Name).ToArray());
    6868      if (benchmarkComboBox.Items.Count > 0)
    6969        benchmarkComboBox.SelectedIndex = 0;

  • branches/RegressionBenchmarks/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisBenchmarkProblemDataGenerator.cs

    r6968 r7044  
    2323using HeuristicLab.Core;
    2424namespace HeuristicLab.Problems.DataAnalysis {
    25   public interface IDataAnalysisBenchmarkProblemDataGenerator : IItem {
     25  public interface IDataAnalysisBenchmarkProblemDataGenerator : INamedItem {
    2626    IDataAnalysisProblemData GenerateProblemData();
    2727  }
Note: See TracChangeset for help on using the changeset viewer.