Changeset 10873 for branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Utils

Timestamp:

05/21/14 13:07:40 (11 years ago)

Author:

sbreuer

Message:

• Bugfixing

File:

• branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Utils/FindPreprocessingItemsIterator.cs (modified) (2 diffs)

branches/DataPreprocessing/HeuristicLab.DataPreprocessing.Views/3.3/Utils/FindPreprocessingItemsIterator.cs

@@ -37 +37 @@
     public void SetStartCell(int columnIndex, int rowIndex) {
       Tuple<int, int> startCell = GetNextFoundCell(columnIndex, rowIndex);
-      int tmpColumnIndex = columnIndex + 1;
-      while (startCell == null && tmpColumnIndex != columnIndex) {
-        if (!items.ContainsKey(tmpColumnIndex)) {
-          tmpColumnIndex = 0;
+      if (startCell == null) {
+        int tmpColumnIndex = columnIndex;
+        do {
+          ++tmpColumnIndex;
+          if (!items.ContainsKey(tmpColumnIndex)) {
+            tmpColumnIndex = 0;
+          }
+          startCell = GetNextFoundCell(tmpColumnIndex, 0);
+        } while (startCell == null && tmpColumnIndex != columnIndex);
+
+        if (startCell == null && tmpColumnIndex == columnIndex && rowIndex != 0) {
+          startCell = GetNextFoundCell(columnIndex, 0);
         }
-        startCell = GetNextFoundCell(tmpColumnIndex, 0);
-        ++tmpColumnIndex;
-      }
-      if (startCell == null && tmpColumnIndex == columnIndex && rowIndex != 0) {
-        startCell = GetNextFoundCell(columnIndex, 0);
       }
       currentCell = startCell;
@@ -90 +93 @@
 
     public void Reset() {
-      currentCell = new Tuple<int, int>(0, 0);
+      SetStartCell(0, 0);
       if (!CurrentCellExists()) {
         MoveNext();