Changeset 7698 for branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/Vladislavleva/KotanchekFunction.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/KotanchekFunction.cs (modified) (1 diff)

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

@@ -49 +49 @@
       List<List<double>> data = new List<List<double>>();
 
-      List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.2, 4.2, 0.1);
+      List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.2, 4.2, 0.1).ToList();
       List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
-      testData = ValueGenerator.GenerateAllCombinationsOfValuesInLists(testData);
+      var combinations = ValueGenerator.GenerateAllCombinationsOfValuesInLists(testData).ToList<IEnumerable<double>>();
       for (int i = 0; i < AllowedInputVariables.Count(); i++) {
-        data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0.3, 4));
-        data[i].AddRange(testData[i]);
+        data.Add(ValueGenerator.GenerateUniformDistributedValues(1000, 0.3, 4).ToList());
+        data[i].AddRange(combinations[i]);
       }