Use Map for node meta data.

trekhleb · trekhleb · commit 7a4265403c67 · 2018-05-31T07:59:20.000+03:00
diff --git a/src/data-structures/tree/BinaryTreeNode.js b/src/data-structures/tree/BinaryTreeNode.js
@@ -3,14 +3,15 @@ import Comparator from '../../utils/comparator/Comparator';
 export default class BinaryTreeNode {
   /**
    * @param {*} [value] - node value.
-   * @param {Object} meta - any meta information that needs to be attached to the node.
    */
-  constructor(value = null, meta = {}) {
+  constructor(value = null) {
     this.left = null;
     this.right = null;
     this.parent = null;
     this.value = value;
-    this.meta = meta;
+
+    // Any node related meta information may be stored here.
+    this.meta = new Map();
 
     // This comparator is used to compare binary tree nodes with each other.
     this.nodeComparator = new Comparator();
@@ -157,29 +158,6 @@ export default class BinaryTreeNode {
     return traverse;
   }
 
-  /**
-   * @param {string} property
-   * @param {*} value
-   * @return {BinaryTreeNode}
-   */
-  setMeta(property, value) {
-    this.meta[property] = value;
-
-    return this;
-  }
-
-  /**
-   * @param property
-   * @return {*}
-   */
-  getMeta(property) {
-    if (!this.meta || !Object.prototype.hasOwnProperty.call(this.meta, property)) {
-      return null;
-    }
-
-    return this.meta[property];
-  }
-
   /**
    * @return {string}
    */
diff --git a/src/data-structures/tree/__test__/BinaryTreeNode.test.js b/src/data-structures/tree/__test__/BinaryTreeNode.test.js
@@ -198,29 +198,13 @@ describe('BinaryTreeNode', () => {
   });
 
   it('should be possible to attach meta information to the node', () => {
-    const redNode = new BinaryTreeNode(1, { color: 'red' });
-    const blackNode = new BinaryTreeNode(2, { color: 'black' });
+    const redNode = new BinaryTreeNode(1);
+    const blackNode = new BinaryTreeNode(2);
 
-    expect(redNode.meta.color).toBe('red');
-    expect(blackNode.meta.color).toBe('black');
-  });
-
-  it('should be possible to use get/set methods to change node meta information', () => {
-    const redNode = new BinaryTreeNode(1, { color: 'red' });
-    const blackNode = new BinaryTreeNode(2, { color: 'black' });
-
-    expect(redNode.getMeta('color')).toBe('red');
-    expect(blackNode.getMeta('color')).toBe('black');
-
-    redNode.setMeta('size', 8);
-
-    expect(redNode.getMeta('size')).toBe(8);
-    expect(redNode.getMeta('color')).toBe('red');
-    expect(redNode.getMeta('not_existing')).toBeNull();
+    redNode.meta.set('color', 'red');
+    blackNode.meta.set('color', 'black');
 
-    // It must also be possible to override meta information.
-    redNode.setMeta('color', 'blue');
-    expect(redNode.getMeta('size')).toBe(8);
-    expect(redNode.getMeta('color')).toBe('blue');
+    expect(redNode.meta.get('color')).toBe('red');
+    expect(blackNode.meta.get('color')).toBe('black');
   });
 });
diff --git a/src/data-structures/tree/binary-search-tree/BinarySearchTree.js b/src/data-structures/tree/binary-search-tree/BinarySearchTree.js
@@ -5,7 +5,7 @@ export default class BinarySearchTree {
    * @param {function} [nodeValueCompareFunction]
    */
   constructor(nodeValueCompareFunction) {
-    this.root = new BinarySearchTreeNode(null, null, nodeValueCompareFunction);
+    this.root = new BinarySearchTreeNode(null, nodeValueCompareFunction);
   }
 
   /**
diff --git a/src/data-structures/tree/binary-search-tree/BinarySearchTreeNode.js b/src/data-structures/tree/binary-search-tree/BinarySearchTreeNode.js
@@ -4,11 +4,10 @@ import Comparator from '../../../utils/comparator/Comparator';
 export default class BinarySearchTreeNode extends BinaryTreeNode {
   /**
    * @param {*} [value] - node value.
-   * @param {Object} [meta] - any meta information that is attached to the node.
    * @param {function} [compareFunction] - comparator function for node values.
    */
-  constructor(value = null, meta = null, compareFunction = undefined) {
-    super(value, meta);
+  constructor(value = null, compareFunction = undefined) {
+    super(value);
 
     // This comparator is used to compare node values with each other.
     this.compareFunction = compareFunction;
@@ -17,31 +16,35 @@ export default class BinarySearchTreeNode extends BinaryTreeNode {
 
   /**
    * @param {*} value
-   * @param {Object} [meta]
    * @return {BinarySearchTreeNode}
    */
-  insert(value, meta = null) {
+  insert(value) {
     if (this.nodeValueComparator.equal(this.value, null)) {
       this.value = value;
-      this.meta = meta;
 
       return this;
     }
 
     if (this.nodeValueComparator.lessThan(value, this.value)) {
       // Insert to the left.
       if (this.left) {
-        this.left.insert(value, meta);
-      } else {
-        this.setLeft(new BinarySearchTreeNode(value, meta, this.compareFunction));
+        return this.left.insert(value);
       }
+
+      const newNode = new BinarySearchTreeNode(value, this.compareFunction);
+      this.setLeft(newNode);
+
+      return newNode;
     } else if (this.nodeValueComparator.greaterThan(value, this.value)) {
       // Insert to the right.
       if (this.right) {
-        this.right.insert(value, meta);
-      } else {
-        this.setRight(new BinarySearchTreeNode(value, meta, this.compareFunction));
+        return this.right.insert(value);
       }
+
+      const newNode = new BinarySearchTreeNode(value, this.compareFunction);
+      this.setRight(newNode);
+
+      return newNode;
     }
 
     return this;
@@ -78,6 +81,7 @@ export default class BinarySearchTreeNode extends BinaryTreeNode {
 
   /**
    * @param {*} value
+   * @return {BinarySearchTreeNode}
    */
   remove(value) {
     const nodeToRemove = this.find(value);
@@ -115,6 +119,8 @@ export default class BinarySearchTreeNode extends BinaryTreeNode {
         parent.replaceChild(nodeToRemove, nodeToRemove.right);
       }
     }
+
+    return nodeToRemove;
   }
 
   /**
diff --git a/src/data-structures/tree/binary-search-tree/__test__/BinarySearchTreeNode.test.js b/src/data-structures/tree/binary-search-tree/__test__/BinarySearchTreeNode.test.js
@@ -20,14 +20,16 @@ describe('BinarySearchTreeNode', () => {
 
   it('should insert nodes in correct order', () => {
     const bstNode = new BinarySearchTreeNode(2);
-    bstNode.insert(1);
+    const insertedNode1 = bstNode.insert(1);
 
+    expect(insertedNode1.value).toBe(1);
     expect(bstNode.toString()).toBe('1,2');
     expect(bstNode.contains(1)).toBeTruthy();
     expect(bstNode.contains(3)).toBeFalsy();
 
-    bstNode.insert(3);
+    const insertedNode2 = bstNode.insert(3);
 
+    expect(insertedNode2.value).toBe(3);
     expect(bstNode.toString()).toBe('1,2,3');
     expect(bstNode.contains(3)).toBeTruthy();
     expect(bstNode.contains(4)).toBeFalsy();
@@ -80,20 +82,24 @@ describe('BinarySearchTreeNode', () => {
   });
 
   it('should be possible to attach meta information to binary search tree nodes', () => {
-    const node = new BinarySearchTreeNode(10, { value: 10 });
+    const node = new BinarySearchTreeNode(10);
+
+    node.insert(20);
+    const node1 = node.insert(30);
+    node.insert(5);
+    node.insert(40);
+    const node2 = node.insert(1);
 
-    node.insert(20, { value: 20 });
-    node.insert(30, { value: 30 });
-    node.insert(5, { value: 5 });
-    node.insert(40, { value: 40 });
-    node.insert(1, { value: 1 });
+    node.meta.set('color', 'red');
+    node1.meta.set('color', 'black');
+    node2.meta.set('color', 'white');
 
-    expect(node.meta.value).toBe(10);
+    expect(node.meta.get('color')).toBe('red');
 
     expect(node.findMin()).not.toBeNull();
     expect(node.findMin().value).toBe(1);
-    expect(node.findMin().meta.value).toBe(1);
-    expect(node.find(30).meta.value).toBe(30);
+    expect(node.findMin().meta.get('color')).toBe('white');
+    expect(node.find(30).meta.get('color')).toBe('black');
   });
 
   it('should find node', () => {
@@ -205,7 +211,7 @@ describe('BinarySearchTreeNode', () => {
     const obj2 = { key: 'obj2', value: 2, toString: () => 'obj2' };
     const obj3 = { key: 'obj3', value: 3, toString: () => 'obj3' };
 
-    const bstNode = new BinarySearchTreeNode(obj2, null, nodeValueComparatorCallback);
+    const bstNode = new BinarySearchTreeNode(obj2, nodeValueComparatorCallback);
     bstNode.insert(obj1);
 
     expect(bstNode.toString()).toBe('obj1,obj2');

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ export default class BinarySearchTree {`
`5`	`5`	`* @param {function} [nodeValueCompareFunction]`
`6`	`6`	`*/`
`7`	`7`	`constructor(nodeValueCompareFunction) {`
`8`		`- this.root = new BinarySearchTreeNode(null, null, nodeValueCompareFunction);`
	`8`	`+ this.root = new BinarySearchTreeNode(null, nodeValueCompareFunction);`
`9`	`9`	`}`
`10`	`10`
`11`	`11`	`/**`