Changeset 7772

Timestamp:

04/30/12 13:41:40 (13 years ago)

Author:

sforsten

Message:

#1784:

• corrected build path of Problems.Instances
• simplified the GenerateAllCombinationsOfValuesInLists method in ValueGenerator

Location:

branches/ProblemInstancesRegressionAndClassification

Files:

• HeuristicLab.Problems.Instances.Regression/3.4/ValueGenerator.cs (modified) (6 diffs)
• HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj (modified) (1 diff)

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances.Regression/3.4/ValueGenerator.cs

@@ -54 +54 @@
       List<IEnumerator<double>> enumerators = new List<IEnumerator<double>>();
       foreach (var list in lists) {
+        allCombinations.Add(new List<double>());
         enumerators.Add(list.GetEnumerator());
       }
@@ -60 +61 @@
 
       while (!finished) {
-        allCombinations.Add(GetCurrentCombination(enumerators));
+        GetCurrentCombination(enumerators, allCombinations);
         finished = MoveNext(enumerators, lists);
       }
-
-      IEnumerable<IEnumerable<double>> res = (from i in Enumerable.Range(0, lists.Count)
-                                              select (from list in allCombinations
-                                                      select list.ElementAt(i)));
-      return res;
+      return allCombinations;
     }
 
@@ -80 +77 @@
     }
 
-    private static List<double> GetCurrentCombination(List<IEnumerator<double>> enumerators) {
-      List<double> combination = new List<double>();
-      foreach (var enumerator in enumerators) {
-        combination.Add(enumerator.Current);
+    private static void GetCurrentCombination(List<IEnumerator<double>> enumerators, List<List<double>> allCombinations) {
+      for (int i = 0; i < enumerators.Count(); i++) {
+        allCombinations[i].Add(enumerators[i].Current);
       }
-      return combination;
     }
 
@@ -93 +88 @@
       List<double> curCombination = new List<double>();
       List<List<double>> allCombinations = new List<List<double>>();
+      for (int i = 0; i < lists.Count; i++) {
+        allCombinations.Add(new List<double>());
+      }
       if (lists.Count() > cur) {
         foreach (var item in lists[cur]) {
@@ -100 +98 @@
         }
       }
-
-      IEnumerable<IEnumerable<double>> res = (from i in Enumerable.Range(0, lists.Count)
-                                              select (from list in allCombinations
-                                                      select list.ElementAt(i)));
-
-      return res;
+      return allCombinations;
     }
 
@@ -118 +111 @@
         }
       } else {
-        allCombinations.Add(new List<double>(curCombinations));
+        for (int i = 0; i < curCombinations.Count; i++) {
+          allCombinations[i].Add(curCombinations[i]);
+        }
       }
-    }    */
+    }         */
 
     //original

branches/ProblemInstancesRegressionAndClassification/HeuristicLab.Problems.Instances/3.3/HeuristicLab.Problems.Instances-3.3.csproj

@@ -26 +26 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\bin\</OutputPath>
+    <OutputPath>..\..\..\..\trunk\sources\bin\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>