Changeset 7698 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/SalutowiczFunctionTwoDimensional.cs

Timestamp:

04/03/12 09:29:07 (12 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

File:

• branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/SalutowiczFunctionTwoDimensional.cs (modified) (1 diff)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/SalutowiczFunctionTwoDimensional.cs

@@ -50 +50 @@
       List<List<double>> data = new List<List<double>>();
       List<List<double>> trainingData = new List<List<double>>() {
-        ValueGenerator.GenerateSteps(0.05, 10, 0.1),
-        ValueGenerator.GenerateSteps(0.05, 10.05, 2)
+        ValueGenerator.GenerateSteps(0.05, 10, 0.1).ToList(),
+        ValueGenerator.GenerateSteps(0.05, 10.05, 2).ToList()
       };
 
       List<List<double>> testData = new List<List<double>>() {
-        ValueGenerator.GenerateSteps(-0.5, 10.5, 0.1),
-        ValueGenerator.GenerateSteps(-0.5, 10.5, 0.5)
+        ValueGenerator.GenerateSteps(-0.5, 10.5, 0.1).ToList(),
+        ValueGenerator.GenerateSteps(-0.5, 10.5, 0.5).ToList()
       };
 
-      trainingData = ValueGenerator.GenerateAllCombinationsOfValuesInLists(trainingData);
-      testData = ValueGenerator.GenerateAllCombinationsOfValuesInLists(testData);
+      var trainingComb = ValueGenerator.GenerateAllCombinationsOfValuesInLists(trainingData).ToList<IEnumerable<double>>();
+      var testComb = ValueGenerator.GenerateAllCombinationsOfValuesInLists(testData).ToList<IEnumerable<double>>();
 
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(trainingData[i]);
-        data[i].AddRange(testData[i]);
+        data.Add(trainingComb[i].ToList());
+        data[i].AddRange(testComb[i]);
       }