Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/02/12 10:55:26 (12 years ago)
Author:
sforsten
Message:

#1784:

  • added Problem.Instances.Classification project
  • added classification problem instances
  • added a class Transformer to Problem.Instances
Location:
branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4
Files:
51 edited

Legend:

Unmodified
Added
Removed

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ArtificialRegressionDataDescriptor.cs

    r7664 r7682  
    2020#endregion
    2121
    22 
    2322using System.Collections.Generic;
    2423namespace HeuristicLab.Problems.Instances.Regression {
    … …  
    2827
    2928    protected abstract string TargetVariable { get; }
    30     protected abstract IEnumerable<string> InputVariables { get; }
    31     protected abstract IEnumerable<string> AllowedInputVariables { get; }
     29    protected abstract string[] InputVariables { get; }
     30    protected abstract string[] AllowedInputVariables { get; }
    3231    protected abstract int TrainingPartitionStart { get; }
    3332    protected abstract int TrainingPartitionEnd { get; }
    … …  
    4241      regData.AllowedInputVariables = this.AllowedInputVariables;
    4342      regData.TargetVariable = this.TargetVariable;
    44       regData.Values = this.GenerateValues();
     43      regData.Values = Transformer.Transformation(this.GenerateValues());
    4544      regData.TrainingPartitionStart = this.TrainingPartitionStart;
    4645      regData.TrainingPartitionEnd = this.TrainingPartitionEnd;
    … …  
    5049    }
    5150
    52     protected abstract double[,] GenerateValues();
     51    protected abstract List<List<double>> GenerateValues();
    5352  }
    5453}

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionEight.cs

    r7664 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "F"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "F" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X", "F" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 100; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 1091; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050      data.Add(ValueGenerator.GenerateSteps(1, 100, 1));
    … …  
    5959      data.Add(results);
    6060
    61       return ValueGenerator.Transformation(data);
     61      return data;
    6262    }
    6363  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionFifteen.cs

    r7664 r7682  
    4141    }
    4242    protected override string TargetVariable { get { return "F"; } }
    43     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "F" }; } }
    44     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     43    protected override string[] InputVariables { get { return new string[] { "X", "Y", "F" }; } }
     44    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4545    protected override int TrainingPartitionStart { get { return 0; } }
    4646    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4848    protected override int TestPartitionEnd { get { return 5000; } }
    4949
    50     protected override double[,] GenerateValues() {
     50    protected override List<List<double>> GenerateValues() {
    5151      List<List<double>> data = new List<List<double>>();
    5252      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6363      data.Add(results);
    6464
    65       return ValueGenerator.Transformation(data);
     65      return data;
    6666    }
    6767  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionFour.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "F"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "F" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "F" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 21; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 2022; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateSteps(-1, 1, 0.1));
    … …  
    5858      data.Add(results);
    5959
    60       return ValueGenerator.Transformation(data);
     60      return data;
    6161    }
    6262  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionSeven.cs

    r7664 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "F"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "F" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X", "F" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 50; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 170; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050      data.Add(ValueGenerator.GenerateSteps(1, 50, 1));
    … …  
    5959      data.Add(results);
    6060
    61       return ValueGenerator.Transformation(data);
     61      return data;
    6262    }
    6363  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionSix.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "F"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "Z", "F" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y", "Z" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z", "F" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y", "Z" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 1000; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 11000; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -1, 1));
    … …  
    6161      data.Add(results);
    6262
    63       return ValueGenerator.Transformation(data);
     63      return data;
    6464    }
    6565  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionSixteen.cs

    r7664 r7682  
    4141    }
    4242    protected override string TargetVariable { get { return "F"; } }
    43     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "F" }; } }
    44     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     43    protected override string[] InputVariables { get { return new string[] { "X", "Y", "F" }; } }
     44    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4545    protected override int TrainingPartitionStart { get { return 0; } }
    4646    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4848    protected override int TestPartitionEnd { get { return 5000; } }
    4949
    50     protected override double[,] GenerateValues() {
     50    protected override List<List<double>> GenerateValues() {
    5151      List<List<double>> data = new List<List<double>>();
    5252      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6363      data.Add(results);
    6464
    65       return ValueGenerator.Transformation(data);
     65      return data;
    6666    }
    6767  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionThirteen.cs

    r7664 r7682  
    4141    }
    4242    protected override string TargetVariable { get { return "F"; } }
    43     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "F" }; } }
    44     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     43    protected override string[] InputVariables { get { return new string[] { "X", "Y", "F" }; } }
     44    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4545    protected override int TrainingPartitionStart { get { return 0; } }
    4646    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4848    protected override int TestPartitionEnd { get { return 5000; } }
    4949
    50     protected override double[,] GenerateValues() {
     50    protected override List<List<double>> GenerateValues() {
    5151      List<List<double>> data = new List<List<double>>();
    5252      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6363      data.Add(results);
    6464
    65       return ValueGenerator.Transformation(data);
     65      return data;
    6666    }
    6767  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionTwelve.cs

    r7664 r7682  
    4141    }
    4242    protected override string TargetVariable { get { return "F"; } }
    43     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "F" }; } }
    44     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     43    protected override string[] InputVariables { get { return new string[] { "X", "Y", "F" }; } }
     44    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4545    protected override int TrainingPartitionStart { get { return 0; } }
    4646    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4848    protected override int TestPartitionEnd { get { return 5000; } }
    4949
    50     protected override double[,] GenerateValues() {
     50    protected override List<List<double>> GenerateValues() {
    5151      List<List<double>> data = new List<List<double>>();
    5252      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6363      data.Add(results);
    6464
    65       return ValueGenerator.Transformation(data);
     65      return data;
    6666    }
    6767  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionEight.cs

    r7664 r7682  
    4545    }
    4646    protected override string TargetVariable { get { return "Y"; } }
    47     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    48     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     47    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     48    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4949    protected override int TrainingPartitionStart { get { return 0; } }
    5050    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5252    protected override int TestPartitionEnd { get { return 10000; } }
    5353
    54     protected override double[,] GenerateValues() {
     54    protected override List<List<double>> GenerateValues() {
    5555      List<List<double>> data = new List<List<double>>();
    5656      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6868      data.Add(results);
    6969
    70       return ValueGenerator.Transformation(data);
     70      return data;
    7171    }
    7272  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionEleven.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6565      data.Add(results);
    6666
    67       return ValueGenerator.Transformation(data);
     67      return data;
    6868    }
    6969  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionFive.cs

    r7664 r7682  
    4545    }
    4646    protected override string TargetVariable { get { return "Y"; } }
    47     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    48     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     47    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     48    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4949    protected override int TrainingPartitionStart { get { return 0; } }
    5050    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5252    protected override int TestPartitionEnd { get { return 10000; } }
    5353
    54     protected override double[,] GenerateValues() {
     54    protected override List<List<double>> GenerateValues() {
    5555      List<List<double>> data = new List<List<double>>();
    5656      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6666      data.Add(results);
    6767
    68       return ValueGenerator.Transformation(data);
     68      return data;
    6969    }
    7070  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionFiveteen.cs

    r7664 r7682  
    4545    }
    4646    protected override string TargetVariable { get { return "Y"; } }
    47     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    48     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     47    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     48    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4949    protected override int TrainingPartitionStart { get { return 0; } }
    5050    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5252    protected override int TestPartitionEnd { get { return 10000; } }
    5353
    54     protected override double[,] GenerateValues() {
     54    protected override List<List<double>> GenerateValues() {
    5555      List<List<double>> data = new List<List<double>>();
    5656      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6969      data.Add(results);
    7070
    71       return ValueGenerator.Transformation(data);
     71      return data;
    7272    }
    7373  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionFour.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6565      data.Add(results);
    6666
    67       return ValueGenerator.Transformation(data);
     67      return data;
    6868    }
    6969  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionFourteen.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6868      data.Add(results);
    6969
    70       return ValueGenerator.Transformation(data);
     70      return data;
    7171    }
    7272  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionNine.cs

    r7664 r7682  
    4545    }
    4646    protected override string TargetVariable { get { return "Y"; } }
    47     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    48     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     47    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     48    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4949    protected override int TrainingPartitionStart { get { return 0; } }
    5050    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5252    protected override int TestPartitionEnd { get { return 10000; } }
    5353
    54     protected override double[,] GenerateValues() {
     54    protected override List<List<double>> GenerateValues() {
    5555      List<List<double>> data = new List<List<double>>();
    5656      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6969      data.Add(results);
    7070
    71       return ValueGenerator.Transformation(data);
     71      return data;
    7272    }
    7373  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionOne.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6565      data.Add(results);
    6666
    67       return ValueGenerator.Transformation(data);
     67      return data;
    6868    }
    6969  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionSeven.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6565      data.Add(results);
    6666
    67       return ValueGenerator.Transformation(data);
     67      return data;
    6868    }
    6969  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionSix.cs

    r7664 r7682  
    4545    }
    4646    protected override string TargetVariable { get { return "Y"; } }
    47     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    48     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     47    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     48    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4949    protected override int TrainingPartitionStart { get { return 0; } }
    5050    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5252    protected override int TestPartitionEnd { get { return 10000; } }
    5353
    54     protected override double[,] GenerateValues() {
     54    protected override List<List<double>> GenerateValues() {
    5555      List<List<double>> data = new List<List<double>>();
    5656      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6666      data.Add(results);
    6767
    68       return ValueGenerator.Transformation(data);
     68      return data;
    6969    }
    7070  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionTen.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6868      data.Add(results);
    6969
    70       return ValueGenerator.Transformation(data);
     70      return data;
    7171    }
    7272  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionThirteen.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6868      data.Add(results);
    6969
    70       return ValueGenerator.Transformation(data);
     70      return data;
    7171    }
    7272  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionThree.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6868      data.Add(results);
    6969
    70       return ValueGenerator.Transformation(data);
     70      return data;
    7171    }
    7272  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionTwelve.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6666      data.Add(results);
    6767
    68       return ValueGenerator.Transformation(data);
     68      return data;
    6969    }
    7070  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Korns/KornsFunctionTwo.cs

    r7664 r7682  
    4444    }
    4545    protected override string TargetVariable { get { return "Y"; } }
    46     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
    47     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X0", "X1", "X2", "X3", "X4" }; } }
     46    protected override string[] InputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4", "Y" }; } }
     47    protected override string[] AllowedInputVariables { get { return new string[] { "X0", "X1", "X2", "X3", "X4" }; } }
    4848    protected override int TrainingPartitionStart { get { return 0; } }
    4949    protected override int TrainingPartitionEnd { get { return 5000; } }
    … …  
    5151    protected override int TestPartitionEnd { get { return 10000; } }
    5252
    53     protected override double[,] GenerateValues() {
     53    protected override List<List<double>> GenerateValues() {
    5454      List<List<double>> data = new List<List<double>>();
    5555      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6767      data.Add(results);
    6868
    69       return ValueGenerator.Transformation(data);
     69      return data;
    7070    }
    7171  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionEight.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, 0, 4));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionEleven.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Z"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "Z" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 100; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 1000; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 1));
    … …  
    5959      data.Add(results);
    6060
    61       return ValueGenerator.Transformation(data);
     61      return data;
    6262    }
    6363  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionFive.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionFour.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionNine.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Z"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "Z" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 100; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 1000; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 0, 1));
    … …  
    5959      data.Add(results);
    6060
    61       return ValueGenerator.Transformation(data);
     61      return data;
    6262    }
    6363  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionOne.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionSeven.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, 0, 2));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionSix.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionTen.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Z"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "Z" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 100; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 1000; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0, 1));
    … …  
    5959      data.Add(results);
    6060
    61       return ValueGenerator.Transformation(data);
     61      return data;
    6262    }
    6363  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionThree.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionTwelve.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Z"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "Z" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 100; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 1000; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0, 1));
    … …  
    5959      data.Add(results);
    6060
    61       return ValueGenerator.Transformation(data);
     61      return data;
    6262    }
    6363  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Nguyen/NguyenFunctionTwo.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 20; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 350; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1));
    … …  
    5757      data.Add(results);
    5858
    59       return ValueGenerator.Transformation(data);
     59      return data;
    6060    }
    6161  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Properties/AssemblyInfo.cs

    r7667 r7682  
    5555// [assembly: AssemblyVersion("1.0.*")]
    5656[assembly: AssemblyVersion("3.4.0.0")]
    57 [assembly: AssemblyFileVersion("3.4.0.7666")]
     57[assembly: AssemblyFileVersion("3.4.0.7667")]

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/RegressionInstanceProvider.cs

    r7664 r7682  
    4141        regData.Name = path.Substring(pos, path.Length - pos);
    4242      }
    43       regData.InputVariables = new List<string>(csvFileParser.VariableNames);
     43      regData.InputVariables = new List<string>(csvFileParser.VariableNames).ToArray();
    4444      regData.TargetVariable = csvFileParser.VariableNames.Last();
    45       regData.AllowedInputVariables = regData.InputVariables.Where(x => !x.Equals(regData.TargetVariable));
     45      regData.AllowedInputVariables = regData.InputVariables.Where(x => !x.Equals(regData.TargetVariable)).ToArray();
    4646      //convert to multidimensional array
    4747      List<IList> values = csvFileParser.Values;

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/TrentMcConaghy/TrentMcConaghyInstanceProvider.cs

    r7667 r7682  
    4949
    5050      regData.TargetVariable = regData.InputVariables.First();
    51       regData.AllowedInputVariables = regData.InputVariables.Where(x => !x.Equals(regData.TargetVariable));
     51      regData.AllowedInputVariables = regData.InputVariables.Where(x => !x.Equals(regData.TargetVariable)).ToArray();
    5252
    5353      return regData;

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ValueGenerator.cs

    r7664 r7682  
    2828  public class ValueGenerator {
    2929    protected static FastRandom rand = new FastRandom();
    30 
    31     public static double[,] Transformation(List<List<double>> data) {
    32       if (!data.All(x => x.Count.Equals(data.First().Count)))
    33         throw new ArgumentException("Can't create jagged array.");
    34       double[,] values = new double[data.First().Count, data.Count];
    35       for (int i = 0; i < values.GetLength(0); i++) {
    36         for (int j = 0; j < values.GetLength(1); j++) {
    37           values[i, j] = data[j][i];
    38         }
    39       }
    40       return values;
    41     }
    4230
    4331    public static List<double> GenerateSteps(double start, double end, double stepWidth) {

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Various/BreimanOne.cs

    r7666 r7682  
    3636    }
    3737    protected override string TargetVariable { get { return "Y"; } }
    38     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
    39     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
     38    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
     39    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
    4040    protected override int TrainingPartitionStart { get { return 0; } }
    4141    protected override int TrainingPartitionEnd { get { return 5001; } }
    … …  
    4545    protected static FastRandom rand = new FastRandom();
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      List<int> values = new List<int>() { -1, 1 };
    … …  
    7676      data.Add(results);
    7777
    78       return ValueGenerator.Transformation(data);
     78      return data;
    7979    }
    8080

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Various/PolyTen.cs

    r7666 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10", "Y" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "X6", "X7", "X8", "X9", "X10" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 250; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 500; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6969      data.Add(results);
    7070
    71       return ValueGenerator.Transformation(data);
     71      return data;
    7272    }
    7373  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Various/SpatialCoevolution.cs

    r7666 r7682  
    4242    }
    4343    protected override string TargetVariable { get { return "F"; } }
    44     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y", "F" }; } }
    45     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X", "Y" }; } }
     44    protected override string[] InputVariables { get { return new string[] { "X", "Y", "F" }; } }
     45    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4646    protected override int TrainingPartitionStart { get { return 0; } }
    4747    protected override int TrainingPartitionEnd { get { return 250; } }
    … …  
    4949    protected override int TestPartitionEnd { get { return 500; } }
    5050
    51     protected override double[,] GenerateValues() {
     51    protected override List<List<double>> GenerateValues() {
    5252      List<List<double>> data = new List<List<double>>();
    5353
    … …  
    7070      data.Add(results);
    7171
    72       return ValueGenerator.Transformation(data);
     72      return data;
    7373    }
    7474  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/KotanchekFunction.cs

    r7666 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "Y" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "Y" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 100; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 3025; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050
    … …  
    6666      data.Add(results);
    6767
    68       return ValueGenerator.Transformation(data);
     68      return data;
    6969    }
    7070  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/RationalPolynomialThreeDimensional.cs

    r7664 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "X3", "Y" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2", "X3" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "X3", "Y" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 300; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 3700; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050
    … …  
    7676      data.Add(results);
    7777
    78       return ValueGenerator.Transformation(data);
     78      return data;
    7979    }
    8080  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/RationalPolynomialTwoDimensional.cs

    r7664 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "Y" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "Y" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 50; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 2157; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050
    … …  
    6767      data.Add(results);
    6868
    69       return ValueGenerator.Transformation(data);
     69      return data;
    7070    }
    7171  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/RippleFunction.cs

    r7664 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "Y" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "Y" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 300; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 1300; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6565      data.Add(results);
    6666
    67       return ValueGenerator.Transformation(data);
     67      return data;
    6868    }
    6969  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/SalutowiczFunctionOneDimensional.cs

    r7664 r7682  
    3838    }
    3939    protected override string TargetVariable { get { return "Y"; } }
    40     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X", "Y" }; } }
    41     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X" }; } }
     40    protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4242    protected override int TrainingPartitionStart { get { return 0; } }
    4343    protected override int TrainingPartitionEnd { get { return 100; } }
    … …  
    4545    protected override int TestPartitionEnd { get { return 321; } }
    4646
    47     protected override double[,] GenerateValues() {
     47    protected override List<List<double>> GenerateValues() {
    4848      List<List<double>> data = new List<List<double>>();
    4949      data.Add(ValueGenerator.GenerateSteps(0.05, 10, 0.1));
    … …  
    5858      data.Add(results);
    5959
    60       return ValueGenerator.Transformation(data);
     60      return data;
    6161    }
    6262  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/SalutowiczFunctionTwoDimensional.cs

    r7664 r7682  
    4040    }
    4141    protected override string TargetVariable { get { return "Y"; } }
    42     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "Y" }; } }
    43     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2" }; } }
     42    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "Y" }; } }
     43    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
    4444    protected override int TrainingPartitionStart { get { return 0; } }
    4545    protected override int TrainingPartitionEnd { get { return 601; } }
    … …  
    4747    protected override int TestPartitionEnd { get { return 3155; } }
    4848
    49     protected override double[,] GenerateValues() {
     49    protected override List<List<double>> GenerateValues() {
    5050      List<List<double>> data = new List<List<double>>();
    5151      List<List<double>> trainingData = new List<List<double>>() {
    … …  
    7676      data.Add(results);
    7777
    78       return ValueGenerator.Transformation(data);
     78      return data;
    7979    }
    8080  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/SineCosineFunction.cs

    r7664 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "Y" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "Y" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 30; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 1461; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050      List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.05, 6.05, 0.02);
    … …  
    6666      data.Add(results);
    6767
    68       return ValueGenerator.Transformation(data);
     68      return data;
    6969    }
    7070  }

  • branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/UnwrappedBallFunctionFiveDimensional.cs

    r7664 r7682  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override IEnumerable<string> InputVariables { get { return new List<string>() { "X1", "X2", "X3", "X4", "X5", "Y" }; } }
    42     protected override IEnumerable<string> AllowedInputVariables { get { return new List<string>() { "X1", "X2", "X3", "X4", "X5" }; } }
     41    protected override string[] InputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5", "Y" }; } }
     42    protected override string[] AllowedInputVariables { get { return new string[] { "X1", "X2", "X3", "X4", "X5" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 1024; } }
    … …  
    4646    protected override int TestPartitionEnd { get { return 6024; } }
    4747
    48     protected override double[,] GenerateValues() {
     48    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    5050      for (int i = 0; i < AllowedInputVariables.Count(); i++) {
    … …  
    6565      data.Add(results);
    6666
    67       return ValueGenerator.Transformation(data);
     67      return data;
    6868    }
    6969  }
Note: See TracChangeset for help on using the changeset viewer.