Changeset 15475


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

#2853: Merged r15461 into stable.

Location:
stable
Files:
7 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
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs

    r14305 r15475  
    3636        + "Function: f(x, y) = x³ / 5 + y³ / 2 - y - x" + Environment.NewLine
    3737        + "range(train): 20 Training cases x,y = rnd(-3, 3)" + Environment.NewLine
    38         + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
    39         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
     38        + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
     39        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
     40        + "Comments: Reduced test set compared to original publication!";
    4041      }
    4142    }
     
    4647    protected override int TrainingPartitionEnd { get { return 20; } }
    4748    protected override int TestPartitionStart { get { return 20; } }
    48     protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
     49    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
    4950    public int Seed { get; private set; }
    5051
     
    5657    protected override List<List<double>> GenerateValues() {
    5758      List<List<double>> data = new List<List<double>>();
    58       List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
     59      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
    5960      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    6061
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs

    r14305 r15475  
    3636        + "Function: f(x, y) = 8 / (2 + x² + y²)" + Environment.NewLine
    3737        + "range(train): 20 Train cases x,y = rnd(-3, 3)" + Environment.NewLine
    38         + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
    39         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
     38        + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
     39        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
     40        + "Comments: Reduced test set compared to original publication!";
    4041      }
    4142    }
     
    4647    protected override int TrainingPartitionEnd { get { return 20; } }
    4748    protected override int TestPartitionStart { get { return 20; } }
    48     protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
     49    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
    4950    public int Seed { get; private set; }
    5051
     
    5859    protected override List<List<double>> GenerateValues() {
    5960      List<List<double>> data = new List<List<double>>();
    60       List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
     61      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
    6162      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    6263
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs

    r14305 r15475  
    3636        + "Function: f(x, y) = 6 * sin(x) * cos(y)" + Environment.NewLine
    3737        + "range(train): 20 Train cases x,y = rnd(-3, 3)" + Environment.NewLine
    38         + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
    39         + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
     38        + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
     39        + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
     40        + "Comments: Reduced test set compared to original publication!";
    4041      }
    4142    }
     
    4647    protected override int TrainingPartitionEnd { get { return 20; } }
    4748    protected override int TestPartitionStart { get { return 20; } }
    48     protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
     49    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
    4950    public int Seed { get; private set; }
    5051
     
    5657    protected override List<List<double>> GenerateValues() {
    5758      List<List<double>> data = new List<List<double>>();
    58       List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
     59      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
    5960      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    6061
  • stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs

    r14305 r15475  
    3636               + "Function: f(x, y) = x^4 - x³ + y² / 2 - y" + Environment.NewLine
    3737               + "range(train): 20 Training cases x,y = rnd(-3, 3)" + Environment.NewLine
    38                + "range(test): x,y = [-3:0.01:3]" + Environment.NewLine
    39                + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)";
     38               + "range(test): x,y = [-3:0.1:3]" + Environment.NewLine
     39               + "Function Set: x + y, x * y, 1/x, -x, sqrt(x)" + Environment.NewLine
     40               + "Comments: Reduced test set compared to original publication!";
    4041      }
    4142    }
     
    4647    protected override int TrainingPartitionEnd { get { return 20; } }
    4748    protected override int TestPartitionStart { get { return 20; } }
    48     protected override int TestPartitionEnd { get { return 20 + (601 * 601); } }
     49    protected override int TestPartitionEnd { get { return 20 + (61 * 61); } }
    4950    public int Seed { get; private set; }
    5051
     
    5657    protected override List<List<double>> GenerateValues() {
    5758      List<List<double>> data = new List<List<double>>();
    58       List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
     59      List<double> oneVariableTestData = SequenceGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList();
    5960      List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
    6061
Note: See TracChangeset for help on using the changeset viewer.