Update insertion

mgechev · mgechev · commit f32eea583cc6 · 2014-05-16T23:26:00.000-07:00
diff --git a/src/data-structures/red-black-tree.js b/src/data-structures/red-black-tree.js
@@ -63,14 +63,14 @@
     } else if (node.getKey() < key) {
       node.setRight(this._put(key, value, node.getRight()));
     }
-    if (this.isRed(node.getRight())) {
+    if (this.isRed(node.getRight()) && !this.isRed(node.getLeft())) {
       newRoot = this._rotateLeft(node);
     }
     if (this.isRed(node.getLeft()) && this.isRed(node.getLeft().getLeft())) {
       newRoot = this._rotateRight(node);
     }
     if (this.isRed(node.getLeft()) && this.isRed(node.getRight())) {
-      this._flipColors();
+      this._flipColors(node);
     }
     return newRoot;
   };
diff --git a/test/data-structures/red-black-tree.spec.js b/test/data-structures/red-black-tree.spec.js
@@ -61,7 +61,7 @@ describe('RBTree', function () {
       expect(tree._root._left).not.toBeNull();
       expect(tree._root._left.isRed()).toBeTruthy();
       tree.put(2, 'baz');
-      expect(tree._root._left).not.toBeNull();
+      expect(tree._root._right).not.toBeNull();
     });
 
   });

Original file line number	Diff line number	Diff line change
`@@ -63,14 +63,14 @@`
`63`	`63`	`} else if (node.getKey() < key) {`
`64`	`64`	`node.setRight(this._put(key, value, node.getRight()));`
`65`	`65`	`}`
`66`		`- if (this.isRed(node.getRight())) {`
	`66`	`+ if (this.isRed(node.getRight()) && !this.isRed(node.getLeft())) {`
`67`	`67`	`newRoot = this._rotateLeft(node);`
`68`	`68`	`}`
`69`	`69`	`if (this.isRed(node.getLeft()) && this.isRed(node.getLeft().getLeft())) {`
`70`	`70`	`newRoot = this._rotateRight(node);`
`71`	`71`	`}`
`72`	`72`	`if (this.isRed(node.getLeft()) && this.isRed(node.getRight())) {`
`73`		`- this._flipColors();`
	`73`	`+ this._flipColors(node);`
`74`	`74`	`}`
`75`	`75`	`return newRoot;`
`76`	`76`	`};`