perf: improve speed of TreeSet.forEach

appsup-dart · Feb 26, 2024 · cb98a5c · cb98a5c
1 parent 7b90b36
commit cb98a5c
Showing 1 changed file with 23 additions and 17 deletions.
diff --git a/lib/src/treeset.dart b/lib/src/treeset.dart
@@ -641,6 +641,12 @@ class _Path<V> {
   }
 
   factory _Path.minimum(AvlNode<V> node, [_Path<V>? parent]) {
+    var p = parent;
+    while (node.left != null) {
+      p = _Path(node, p);
+      node = node.left!;
+    }
+    return _Path(node, p);
     if (node.left == null) return _Path(node, parent);
     return _Path.minimum(node.left!, _Path(node, parent));
   }
@@ -801,15 +807,6 @@ class TreeCursor<V> extends BidirectionalIterator<V> {
       throw ConcurrentModificationError(tree);
     }
     switch (_state) {
-      case _TreeCursorState.willBeOnAfterFirstMove:
-        _state = _TreeCursorState.on;
-        return true;
-
-      case _TreeCursorState.before:
-        if (_root == null) return false;
-        _path ??= _Path.minimum(_root!);
-        _state = _TreeCursorState.on;
-        return true;
       case _TreeCursorState.on:
       case _TreeCursorState.after:
       case _TreeCursorState.willBeOnNextOrPreviousAfterFirstMove:
@@ -820,6 +817,15 @@ class TreeCursor<V> extends BidirectionalIterator<V> {
         }
         _state = _TreeCursorState.on;
         return true;
+      case _TreeCursorState.willBeOnAfterFirstMove:
+        _state = _TreeCursorState.on;
+        return true;
+
+      case _TreeCursorState.before:
+        if (_root == null) return false;
+        _path ??= _Path.minimum(_root!);
+        _state = _TreeCursorState.on;
+        return true;
     }
   }
 
@@ -829,14 +835,6 @@ class TreeCursor<V> extends BidirectionalIterator<V> {
       throw ConcurrentModificationError(tree);
     }
     switch (_state) {
-      case _TreeCursorState.willBeOnAfterFirstMove:
-        _state = _TreeCursorState.on;
-        return true;
-      case _TreeCursorState.after:
-        if (_root == null) return false;
-        _path ??= _Path.maximum(_root!);
-        _state = _TreeCursorState.on;
-        return true;
       case _TreeCursorState.on:
       case _TreeCursorState.before:
       case _TreeCursorState.willBeOnNextOrPreviousAfterFirstMove:
@@ -847,6 +845,14 @@ class TreeCursor<V> extends BidirectionalIterator<V> {
         }
         _state = _TreeCursorState.on;
         return true;
+      case _TreeCursorState.willBeOnAfterFirstMove:
+        _state = _TreeCursorState.on;
+        return true;
+      case _TreeCursorState.after:
+        if (_root == null) return false;
+        _path ??= _Path.maximum(_root!);
+        _state = _TreeCursorState.on;
+        return true;
     }
   }
 }