Context Navigation

← Previous Change
Next Change →

Keijzer

Timestamp:

02/03/15 14:00:39 (10 years ago)

Author:

mkommend

Message:

#2259: Merged r11434, r11435, r11441 and r11313, r11348 into stable.

Location:

stable

Files:

: 16 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) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.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) (1 diff)
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) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThree.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs (modified) (1 diff)
HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwo.cs (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 11313,11348,11434-11435,11441
stable/HeuristicLab.Problems.Instances.DataAnalysis
- Property svn:mergeinfo changed
  /trunk/sources/HeuristicLab.Problems.Instances.DataAnalysis merged: 11313,11348,11434-11435

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionEight.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(0, 100, 1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(0, 100, 0.1));
+      data.Add(ValueGenerator.GenerateSteps(0m, 100, 1).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(0m, 100, 0.1m).Select(v => (double)v));
       double x;

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

r11170	r11868
49	49	protected override List<List<double>> GenerateValues() {
50	50	List<List<double>> data = new List<List<double>>();
51		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01).ToList();
	51	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
52	52	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
53	53

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFifteen.cs

r11170	r11868
48	48	protected override List<List<double>> GenerateValues() {
49	49	List<List<double>> data = new List<List<double>>();
50		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01).ToList();
	50	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
51	51	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
52	52

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFour.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(0, 10, 0.05).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(0.05, 10.05, 0.05));
+      data.Add(ValueGenerator.GenerateSteps(0, 10, 0.05m).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(0.05m, 10.05m, 0.05m).Select(v => (double)v));
       double x;

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionFourteen.cs

r11170	r11868
48	48	protected override List<List<double>> GenerateValues() {
49	49	List<List<double>> data = new List<List<double>>();
50		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01).ToList();
	50	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double) v).ToList();
51	51	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
52	52

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionNine.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(0, 100, 1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(0, 100, 0.1));
+      data.Add(ValueGenerator.GenerateSteps(0m, 100, 1).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(0, 100, 0.1m).Select(v => (double)v));
       double x;

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionOne.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(-1, 1, 0.1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(-1, 1, 0.001));
+      data.Add(ValueGenerator.GenerateSteps(-1, 1, 0.1m).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(-1, 1, 0.001m).Select(v => (double)v));
       double x;

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSeven.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(1, 100, 1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(1, 100, 0.1));
+      data.Add(ValueGenerator.GenerateSteps(1m, 100, 1).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(1m, 100, 0.1m).Select(v => (double)v));
       double x;

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionSix.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(1, 50, 1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(1, 120, 1));
+      data.Add(ValueGenerator.GenerateSteps(1m, 50, 1).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(1m, 120, 1).Select(v => (double)v));
       double x;

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTen.cs

r11170	r11868
49	49	List<List<double>> data = new List<List<double>>();
50	50
51		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(0, 1, 0.01).ToList();
	51	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(0, 1, 0.01m).Select(v => (double)v).ToList();
52	52	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
53	53

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThirteen.cs

r11170	r11868
48	48	protected override List<List<double>> GenerateValues() {
49	49	List<List<double>> data = new List<List<double>>();
50		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01).ToList();
	50	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
51	51	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
52	52

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionThree.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(-3, 3, 0.1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(-3, 3, 0.001));
+      data.Add(ValueGenerator.GenerateSteps(-3, 3, 0.1m).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(-3, 3, 0.001m).Select(v => (double)v));
       double x;

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwelve.cs

r11170	r11868
48	48	protected override List<List<double>> GenerateValues() {
49	49	List<List<double>> data = new List<List<double>>();
50		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01).ToList();
	50	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-3, 3, 0.01m).Select(v => (double)v).ToList();
51	51	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
52	52

stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer/KeijzerFunctionTwo.cs

-                      r11170
+                      r11868
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
       data.Add(ValueGenerator.GenerateSteps(-2, 2, 0.1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(-2, 2, 0.001));
+      data.Add(ValueGenerator.GenerateSteps(-2, 2, 0.1m).Select(v => (double)v).ToList());
+      data[0].AddRange(ValueGenerator.GenerateSteps(-2, 2, 0.001m).Select(v => (double)v));
       double x;

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 11868 for stable/HeuristicLab.Problems.Instances.DataAnalysis/3.3/Regression/Keijzer

Legend:

Download in other formats: