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

Timestamp:

04/02/14 13:47:19 (10 years ago)

Author:

sbreuer

Message:

• enhanced usability

File:

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

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

@@ -37 +37 @@
     public bool MoveNext() {
       bool result = false;
+      bool endReached = false;
       if (items != null) {
         do {
@@ -43 +44 @@
           } else if (currentCell.Item1 < items.Count - 1) {
             currentCell = new Tuple<int, int>(currentCell.Item1 + 1, 0);
+          } else {
+            endReached = true;
           }
-        } while (!EndReached() && !CurrentCellExists());
-        result = EndReached();
+        } while (!endReached && !CurrentCellExists());
+        result = !endReached;
       }
       return result;
@@ -61 +64 @@
     public void Reset() {
       currentCell = new Tuple<int, int>(0, 0);
+      if (!CurrentCellExists()) {
+        MoveNext();
+      }
     }
 
@@ -71 +77 @@
     }
 
-    private bool EndReached() {
-      bool result = true;
-      if (items != null && CurrentCellExists()) {
-        result = currentCell.Item1 >= items.Count - 1 && currentCell.Item2 >= items[currentCell.Item1].Count - 1;
-      }
-      return result;
-    }
+    //private bool EndReached() {
+    //  bool result = true;
+    //  if (items != null && CurrentCellExists()) {
+    //    result = currentCell.Item1 >= items.Count - 1 && currentCell.Item2 >= items[currentCell.Item1].Count - 1;
+    //  }
+    //  return result;
+    //}
   }
 }