Context Navigation

Vladislavleva

Timestamp:

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

Author:

mkommend

Message:

Location:

stable

Files:

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

r11170	r11868
49	49	List<List<double>> data = new List<List<double>>();
50	50
51		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.2~~, 4.2, 0.1~~).ToList();
	51	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.2m, 4.2m, 0.1m).Select(v => (double)v).ToList();
52	52	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
53	53	var combinations = ValueGenerator.GenerateAllCombinationsOfValuesInLists(testData).ToList<IEnumerable<double>>();

-                      r11170
+                      r11868
       List<List<double>> testData = new List<List<double>>() {
         ValueGenerator.GenerateSteps(-0.05, 2.05, 0.15).ToList(),
         ValueGenerator.GenerateSteps( 0.95, 2.05, 0.1).ToList(),
         ValueGenerator.GenerateSteps(-0.05, 2.05, 0.15).ToList()
+        ValueGenerator.GenerateSteps(-0.05m, 2.05m, 0.15m).Select(v => (double)v).ToList(),
+        ValueGenerator.GenerateSteps( 0.95m, 2.05m, 0.1m).Select(v => (double)v).ToList(),
+        ValueGenerator.GenerateSteps(-0.05m, 2.05m, 0.15m).Select(v => (double)v).ToList()
       };

r11170	r11868
49	49	List<List<double>> data = new List<List<double>>();
50	50
51		List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.25~~, 6.35, 0.2~~).ToList();
	51	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.25m, 6.35m, 0.2m).Select(v => (double)v).ToList();
52	52
53	53	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };

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

-                      r11170
+                      r11868
       List<List<double>> data = new List<List<double>>();
       List<List<double>> trainingData = new List<List<double>>() {
         ValueGenerator.GenerateSteps(0.05, 10, 0.1).ToList(),
         ValueGenerator.GenerateSteps(0.05, 10.05, 2).ToList()
+        ValueGenerator.GenerateSteps(0.05m, 10, 0.1m).Select(v => (double)v).ToList(),
+        ValueGenerator.GenerateSteps(0.05m, 10.05m, 2).Select(v => (double)v).ToList()
       };
       List<List<double>> testData = new List<List<double>>() {
         ValueGenerator.GenerateSteps(-0.5, 10.5, 0.05).ToList(),
         ValueGenerator.GenerateSteps(-0.5, 10.5, 0.5).ToList()
+        ValueGenerator.GenerateSteps(-0.5m, 10.5m, 0.05m).Select(v => (double)v).ToList(),
+        ValueGenerator.GenerateSteps(-0.5m, 10.5m, 0.5m).Select(v => (double)v).ToList()
       };

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(-0.05~~, 6.05, 0.02~~).ToList();
	50	List<double> oneVariableTestData = ValueGenerator.GenerateSteps(-0.05m, 6.05m, 0.02m).Select(v => (double)v).ToList();
51	51	List<List<double>> testData = new List<List<double>>() { oneVariableTestData, oneVariableTestData };
52	52	var combinations = ValueGenerator.GenerateAllCombinationsOfValuesInLists(testData).ToList<IEnumerable<double>>();

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