Optimise exist(...) and getNode(...) #3

bokkypoobah · Feb 24, 2019 · d1d3649 · d1d3649
1 parent d540dfc
commit d1d3649
Show file tree

Hide file tree

Showing 7 changed files with 162 additions and 225 deletions.
diff --git a/contracts/BokkyPoobahsRedBlackTreeLibrary.sol b/contracts/BokkyPoobahsRedBlackTreeLibrary.sol
@@ -76,35 +76,14 @@ library BokkyPooBahsRedBlackTreeLibrary {
         return y;
     }
     function exists(Tree storage self, uint key) internal view returns (bool) {
-        require(key != SENTINEL);
-        uint _key = self.root;
-        while (_key != SENTINEL) {
-            if (key == _key) {
-                return true;
-            }
-            if (key < _key) {
-                _key = self.nodes[_key].left;
-            } else {
-                _key = self.nodes[_key].right;
-            }
+        if (key != SENTINEL) {
+            return (key == self.root) || (self.nodes[key].parent != SENTINEL);
         }
         return false;
     }
     function getNode(Tree storage self, uint key) internal view returns (uint _returnKey, uint _parent, uint _left, uint _right, bool _red) {
-        require(key != SENTINEL);
-        uint _key = self.root;
-        while (_key != SENTINEL) {
-            if (key == _key) {
-                Node memory node = self.nodes[key];
-                return (key, node.parent, node.left, node.right, node.red);
-            }
-            if (key < _key) {
-                _key = self.nodes[_key].left;
-            } else {
-                _key = self.nodes[_key].right;
-            }
-        }
-        return (SENTINEL, SENTINEL, SENTINEL, SENTINEL, false);
+        require(exists(self, key));
+        return(key, self.nodes[key].parent, self.nodes[key].left, self.nodes[key].right, self.nodes[key].red);
     }
     function parent(Tree storage self, uint key) internal view returns (uint _parent) {
         require(key != SENTINEL);

diff --git a/flattened/TestBokkyPooBahsRedBlackTreeRaw_flattened.sol b/flattened/TestBokkyPooBahsRedBlackTreeRaw_flattened.sol
@@ -77,35 +77,14 @@ library BokkyPooBahsRedBlackTreeLibrary {
         return y;
     }
     function exists(Tree storage self, uint key) internal view returns (bool) {
-        require(key != SENTINEL);
-        uint _key = self.root;
-        while (_key != SENTINEL) {
-            if (key == _key) {
-                return true;
-            }
-            if (key < _key) {
-                _key = self.nodes[_key].left;
-            } else {
-                _key = self.nodes[_key].right;
-            }
+        if (key != SENTINEL) {
+            return (key == self.root) || (self.nodes[key].parent != SENTINEL);
         }
         return false;
     }
     function getNode(Tree storage self, uint key) internal view returns (uint _returnKey, uint _parent, uint _left, uint _right, bool _red) {
-        require(key != SENTINEL);
-        uint _key = self.root;
-        while (_key != SENTINEL) {
-            if (key == _key) {
-                Node memory node = self.nodes[key];
-                return (key, node.parent, node.left, node.right, node.red);
-            }
-            if (key < _key) {
-                _key = self.nodes[_key].left;
-            } else {
-                _key = self.nodes[_key].right;
-            }
-        }
-        return (SENTINEL, SENTINEL, SENTINEL, SENTINEL, false);
+        require(exists(self, key));
+        return(key, self.nodes[key].parent, self.nodes[key].left, self.nodes[key].right, self.nodes[key].red);
     }
     function parent(Tree storage self, uint key) internal view returns (uint _parent) {
         require(key != SENTINEL);

diff --git a/test/BokkyPoobahsRedBlackTreeLibrary.sol b/test/BokkyPoobahsRedBlackTreeLibrary.sol
@@ -76,35 +76,14 @@ library BokkyPooBahsRedBlackTreeLibrary {
         return y;
     }
     function exists(Tree storage self, uint key) internal view returns (bool) {
-        require(key != SENTINEL);
-        uint _key = self.root;
-        while (_key != SENTINEL) {
-            if (key == _key) {
-                return true;
-            }
-            if (key < _key) {
-                _key = self.nodes[_key].left;
-            } else {
-                _key = self.nodes[_key].right;
-            }
+        if (key != SENTINEL) {
+            return (key == self.root) || (self.nodes[key].parent != SENTINEL);
         }
         return false;
     }
     function getNode(Tree storage self, uint key) internal view returns (uint _returnKey, uint _parent, uint _left, uint _right, bool _red) {
-        require(key != SENTINEL);
-        uint _key = self.root;
-        while (_key != SENTINEL) {
-            if (key == _key) {
-                Node memory node = self.nodes[key];
-                return (key, node.parent, node.left, node.right, node.red);
-            }
-            if (key < _key) {
-                _key = self.nodes[_key].left;
-            } else {
-                _key = self.nodes[_key].right;
-            }
-        }
-        return (SENTINEL, SENTINEL, SENTINEL, SENTINEL, false);
+        require(exists(self, key));
+        return(key, self.nodes[key].parent, self.nodes[key].left, self.nodes[key].right, self.nodes[key].red);
     }
     function parent(Tree storage self, uint key) internal view returns (uint _parent) {
         require(key != SENTINEL);