Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
11/15/17 14:37:01 (7 years ago)
Author:
mkommend
Message:

#2853: Merged r15461 into stable.

Location:
stable
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable

  • stable/HeuristicLab.Problems.Instances.DataAnalysis

  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEleven.cs

    r14305 r15475  
    3737          + "Function: f(x, y) = xy + sin((x - 1)(y - 1))" + Environment.NewLine
    3838          + "range(train): 20 Training cases x,y = rnd(-3, 3)" + Environment.NewLine
    39           + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
    40           + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
     39          + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
     40          + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
     41          + "Comments: Reduced test set compared to original publication!";
    4142      }
    4243    }
     
    4748    protected override int TrainingPartitionEnd { get { return 20; } }
    4849    protected override int TestPartitionStart { get { return 20; } }
    49     protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
     50    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
    5051    public int Seed { get; private set; }
    5152
     
    5758    protected override List<List<double>> GenerateValues() {
    5859      List<List<double>> data = new List<List<double>>();
    59       List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
     60      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
    6061      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    6162
Note: See TracChangeset for help on using the changeset viewer.