Changeset 16140 for branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer
- Timestamp:
- 09/14/18 11:36:59 (6 years ago)
- Location:
- branches/2817-BinPackingSpeedup
- Files:
-
- 18 edited
-
. (modified) (1 prop)
-
HeuristicLab.Problems.Instances.DataAnalysis (modified) (1 prop)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEight.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEleven.cs (modified) (4 diffs)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs (modified) (4 diffs)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFive.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFour.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs (modified) (4 diffs)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionNine.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionOne.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSeven.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSix.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTen.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs (modified) (4 diffs)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThree.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs (modified) (4 diffs)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwo.cs (modified) (1 diff)
-
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerInstanceProvider.cs (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2817-BinPackingSpeedup
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
/stable/HeuristicLab.Problems.Instances.DataAnalysis merged: 15587 /trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis (added) merged: 15461,15513,15581,15583,15589
- Property svn:mergeinfo changed
-
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEight.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEleven.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 37 37 + "Function: f(x, y) = xy + sin((x - 1)(y - 1))" + Environment.NewLine 38 38 + "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!"; 41 42 } 42 43 } … … 47 48 protected override int TrainingPartitionEnd { get { return 20; } } 48 49 protected override int TestPartitionStart { get { return 20; } } 49 protected override int TestPartitionEnd { get { return 20 + (6 01 * 601); } }50 protected override int TestPartitionEnd { get { return 20 + (61 * 61); } } 50 51 public int Seed { get; private set; } 51 52 … … 57 58 protected override List<List<double>> GenerateValues() { 58 59 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(); 60 61 List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData }; 61 62 -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 36 36 + "Function: f(x, y) = x³ / 5 + y³ / 2 - y - x" + Environment.NewLine 37 37 + "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!"; 40 41 } 41 42 } … … 46 47 protected override int TrainingPartitionEnd { get { return 20; } } 47 48 protected override int TestPartitionStart { get { return 20; } } 48 protected override int TestPartitionEnd { get { return 20 + (6 01 * 601); } }49 protected override int TestPartitionEnd { get { return 20 + (61 * 61); } } 49 50 public int Seed { get; private set; } 50 51 … … 56 57 protected override List<List<double>> GenerateValues() { 57 58 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(); 59 60 List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData }; 60 61 -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFive.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFour.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 36 36 + "Function: f(x, y) = 8 / (2 + x² + y²)" + Environment.NewLine 37 37 + "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!"; 40 41 } 41 42 } … … 46 47 protected override int TrainingPartitionEnd { get { return 20; } } 47 48 protected override int TestPartitionStart { get { return 20; } } 48 protected override int TestPartitionEnd { get { return 20 + (6 01 * 601); } }49 protected override int TestPartitionEnd { get { return 20 + (61 * 61); } } 49 50 public int Seed { get; private set; } 50 51 … … 58 59 protected override List<List<double>> GenerateValues() { 59 60 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(); 61 62 List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData }; 62 63 -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionNine.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionOne.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSeven.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSix.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTen.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 36 36 + "Function: f(x, y) = 6 * sin(x) * cos(y)" + Environment.NewLine 37 37 + "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!"; 40 41 } 41 42 } … … 46 47 protected override int TrainingPartitionEnd { get { return 20; } } 47 48 protected override int TestPartitionStart { get { return 20; } } 48 protected override int TestPartitionEnd { get { return 20 + (6 01 * 601); } }49 protected override int TestPartitionEnd { get { return 20 + (61 * 61); } } 49 50 public int Seed { get; private set; } 50 51 … … 56 57 protected override List<List<double>> GenerateValues() { 57 58 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(); 59 60 List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData }; 60 61 -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThree.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. … … 36 36 + "Function: f(x, y) = x^4 - x³ + y² / 2 - y" + Environment.NewLine 37 37 + "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!"; 40 41 } 41 42 } … … 46 47 protected override int TrainingPartitionEnd { get { return 20; } } 47 48 protected override int TestPartitionStart { get { return 20; } } 48 protected override int TestPartitionEnd { get { return 20 + (6 01 * 601); } }49 protected override int TestPartitionEnd { get { return 20 + (61 * 61); } } 49 50 public int Seed { get; private set; } 50 51 … … 56 57 protected override List<List<double>> GenerateValues() { 57 58 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(); 59 60 List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData }; 60 61 -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwo.cs
r14185 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab. -
branches/2817-BinPackingSpeedup/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerInstanceProvider.cs
r14229 r16140 1 1 #region License Information 2 2 /* HeuristicLab 3 * Copyright (C) 2002-201 6Heuristic and Evolutionary Algorithms Laboratory (HEAL)3 * Copyright (C) 2002-2018 Heuristic and Evolutionary Algorithms Laboratory (HEAL) 4 4 * 5 5 * This file is part of HeuristicLab.
Note: See TracChangeset
for help on using the changeset viewer.
