Changeset 7698 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer

Timestamp:

04/03/12 09:29:07 (13 years ago)

Author:

sforsten

Message:

#1784:

• ProblemInstanceProvider are sorted now
• the return values of ValueGenerator have been changed to !IEnumerable
• changes have been applied to classes which are using the ValueGenerator
• change of the cast in ProblemInstanceProviderViewGeneric and !importButton.Enable is set now in SetEnabledStateOfControls

Location:

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer

Files:

• KeijzerFunctionEight.cs (modified) (2 diffs)
• KeijzerFunctionFifteen.cs (modified) (1 diff)
• KeijzerFunctionFour.cs (modified) (2 diffs)
• KeijzerFunctionSeven.cs (modified) (1 diff)
• KeijzerFunctionSix.cs (modified) (2 diffs)
• KeijzerFunctionSixteen.cs (modified) (1 diff)
• KeijzerFunctionThirteen.cs (modified) (1 diff)
• KeijzerFunctionTwelve.cs (modified) (1 diff)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionEight.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Problems.Instances.Regression {
@@ -48 +49 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateSteps(1, 100, 1));
+      data.Add(ValueGenerator.GenerateSteps(1, 100, 1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(1, 100, 0.1));
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionFifteen.cs

@@ -51 +51 @@
       List<List<double>> data = new List<List<double>>();
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3));
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3).ToList());
       }
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionFour.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Problems.Instances.Regression {
@@ -47 +48 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateSteps(-1, 1, 0.1));
+      data.Add(ValueGenerator.GenerateSteps(-1, 1, 0.1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(-1, 1, 0.001));
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionSeven.cs

@@ -48 +48 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateSteps(1, 50, 1));
+      data.Add(ValueGenerator.GenerateSteps(1, 50, 1).ToList());
       data[0].AddRange(ValueGenerator.GenerateSteps(1, 120, 1));
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionSix.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace HeuristicLab.Problems.Instances.Regression {
@@ -47 +48 @@
     protected override List<List<double>> GenerateValues() {
       List<List<double>> data = new List<List<double>>();
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -1, 1));
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 1, 2));
-      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -1, 1));
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -1, 1).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, 1, 2).ToList());
+      data.Add(ValueGenerator.GenerateUniformDistributedValues(TestPartitionEnd, -1, 1).ToList());
 
       double x, y, z;

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionSixteen.cs

@@ -51 +51 @@
       List<List<double>> data = new List<List<double>>();
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3));
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3).ToList());
       }
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionThirteen.cs

@@ -51 +51 @@
       List<List<double>> data = new List<List<double>>();
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3));
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3).ToList());
       }
 

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Keijzer/KeijzerFunctionTwelve.cs

@@ -51 +51 @@
       List<List<double>> data = new List<List<double>>();
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3));
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(5000, -3, 3).ToList());
       }