Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/16/13 13:13:41 (12 years ago)
Author:
spimming
Message:

#1888:

  • Merged revisions from trunk
Location:
branches/OaaS
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • branches/OaaS

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis

    • Property svn:mergeinfo set to (toggle deleted branches)
      /trunk/sources/HeuristicLab.Problems.Instances.DataAnalysismergedeligible
      /branches/Algorithms.GradientDescent/HeuristicLab.Problems.Instances.DataAnalysis5516-5520
      /branches/Benchmarking/sources/HeuristicLab.Problems.Instances.DataAnalysis6917-7005
      /branches/CloningRefactoring/HeuristicLab.Problems.Instances.DataAnalysis4656-4721
      /branches/DataAnalysis Refactoring/HeuristicLab.Problems.Instances.DataAnalysis5471-5808
      /branches/DataAnalysis SolutionEnsembles/HeuristicLab.Problems.Instances.DataAnalysis5815-6180
      /branches/DataAnalysis/HeuristicLab.Problems.Instances.DataAnalysis4458-4459,​4462,​4464
      /branches/DataAnalysisCSVImport/HeuristicLab.Problems.Instances.DataAnalysis8695-8875
      /branches/GP.Grammar.Editor/HeuristicLab.Problems.Instances.DataAnalysis6284-6795
      /branches/GP.Symbols (TimeLag, Diff, Integral)/HeuristicLab.Problems.Instances.DataAnalysis5060
      /branches/HeuristicLab.TimeSeries/HeuristicLab.Problems.Instances.DataAnalysis7889-8789
      /branches/NET40/sources/HeuristicLab.Problems.Instances.DataAnalysis5138-5162
      /branches/ParallelEngine/HeuristicLab.Problems.Instances.DataAnalysis5175-5192
      /branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.DataAnalysis7568-7810
      /branches/QAPAlgorithms/HeuristicLab.Problems.Instances.DataAnalysis6350-6627
      /branches/Restructure trunk solution/HeuristicLab.Problems.Instances.DataAnalysis6828
      /branches/RuntimeOptimizer/HeuristicLab.Problems.Instances.DataAnalysis8943-9078
      /branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.Instances.DataAnalysis7787-8333
      /branches/SlaveShutdown/HeuristicLab.Problems.Instances.DataAnalysis8944-8956
      /branches/SuccessProgressAnalysis/HeuristicLab.Problems.Instances.DataAnalysis5370-5682
      /branches/Trunk/HeuristicLab.Problems.Instances.DataAnalysis6829-6865
      /branches/UnloadJobs/HeuristicLab.Problems.Instances.DataAnalysis9168-9215
      /branches/VNS/HeuristicLab.Problems.Instances.DataAnalysis5594-5752
      /branches/histogram/HeuristicLab.Problems.Instances.DataAnalysis5959-6341

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionEight.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, 0, 4).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, 0, 4).ToList());
    5151
    5252      double x;

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionEleven.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Z"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 500; } }
    46     protected override int TestPartitionEnd { get { return 1000; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 1020; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionFive.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
    5151
    5252      double x;
    … …  
    5454      for (int i = 0; i < data[0].Count; i++) {
    5555        x = data[0][i];
    56         results.Add(Math.Sin(Math.Pow(x, 2)) * Math.Cos(x) - 1);
     56        results.Add(Math.Sin(x * x) * Math.Cos(x) - 1);
    5757      }
    5858      data.Add(results);

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionFour.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
    5151
    5252      double x;
    … …  
    5454      for (int i = 0; i < data[0].Count; i++) {
    5555        x = data[0][i];
    56         results.Add(Math.Pow(x, 6) + Math.Pow(x, 5) + Math.Pow(x, 4) + Math.Pow(x, 3) + Math.Pow(x, 2) + x);
     56        results.Add(Math.Pow(x, 6) + Math.Pow(x, 5) + Math.Pow(x, 4) + Math.Pow(x, 3) + x * x + x);
    5757      }
    5858      data.Add(results);

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionNine.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Z"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 500; } }
    46     protected override int TestPartitionEnd { get { return 1000; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 1020; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    … …  
    5656        x = data[0][i];
    5757        y = data[1][i];
    58         results.Add(Math.Sin(x) + Math.Sin(Math.Pow(y, 2)));
     58        results.Add(Math.Sin(x) + Math.Sin(y * y));
    5959      }
    6060      data.Add(results);

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionOne.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
    5151
    5252      double x;

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionSeven.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, 0, 2).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, 0, 2).ToList());
    5151
    5252      double x;
    … …  
    5454      for (int i = 0; i < data[0].Count; i++) {
    5555        x = data[0][i];
    56         results.Add(Math.Log(x + 1) + Math.Log(Math.Pow(x, 2) + 1));
     56        results.Add(Math.Log(x + 1) + Math.Log(x * x + 1));
    5757      }
    5858      data.Add(results);

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionSix.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
    5151
    5252      double x;
    … …  
    5454      for (int i = 0; i < data[0].Count; i++) {
    5555        x = data[0][i];
    56         results.Add(Math.Sin(x) + Math.Sin(x + Math.Pow(x, 2)));
     56        results.Add(Math.Sin(x) + Math.Sin(x + x*x));
    5757      }
    5858      data.Add(results);

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTen.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Z"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 500; } }
    46     protected override int TestPartitionEnd { get { return 1000; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 1020; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0, 1).ToList());
    51       data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
     51      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
    5252
    5353      double x, y;

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionThree.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
    5151
    5252      double x;

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTwelve.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Z"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y", "Z" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y", "Z" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X", "Y" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 500; } }
    46     protected override int TestPartitionEnd { get { return 1000; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 1020; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0, 1).ToList());
    51       data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
     51      data.Add(ValueGenerator.GenerateUniformDistributedValues(1020, 0, 1).ToList());
    5252
    5353      double x, y;
    … …  
    5656        x = data[0][i];
    5757        y = data[1][i];
    58         results.Add(Math.Pow(x, 4) - Math.Pow(x, 3) + Math.Pow(y, 2) / 2 - y);
     58        results.Add(Math.Pow(x, 4) - Math.Pow(x, 3) + y * y / 2 - y);
    5959      }
    6060      data.Add(results);

  • branches/OaaS/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Nguyen/NguyenFunctionTwo.cs

    r8224 r9363  
    3939    }
    4040    protected override string TargetVariable { get { return "Y"; } }
    41     protected override string[] InputVariables { get { return new string[] { "X", "Y" }; } }
     41    protected override string[] VariableNames { get { return new string[] { "X", "Y" }; } }
    4242    protected override string[] AllowedInputVariables { get { return new string[] { "X" }; } }
    4343    protected override int TrainingPartitionStart { get { return 0; } }
    4444    protected override int TrainingPartitionEnd { get { return 20; } }
    45     protected override int TestPartitionStart { get { return 250; } }
    46     protected override int TestPartitionEnd { get { return 350; } }
     45    protected override int TestPartitionStart { get { return 20; } }
     46    protected override int TestPartitionEnd { get { return 520; } }
    4747
    4848    protected override List<List<double>> GenerateValues() {
    4949      List<List<double>> data = new List<List<double>>();
    50       data.Add(ValueGenerator.GenerateUniformDistributedValues(500, -1, 1).ToList());
     50      data.Add(ValueGenerator.GenerateUniformDistributedValues(520, -1, 1).ToList());
    5151
    5252      double x;
    … …  
    5454      for (int i = 0; i < data[0].Count; i++) {
    5555        x = data[0][i];
    56         results.Add(Math.Pow(x, 4) + Math.Pow(x, 3) + Math.Pow(x, 2) + x);
     56        results.Add(Math.Pow(x, 4) + Math.Pow(x, 3) + x*x + x);
    5757      }
    5858      data.Add(results);
Note: See TracChangeset for help on using the changeset viewer.