update

Author: dp9u0

src/linked-list/DoublyLinkedList.js

@@ -1,3 +1,5 @@
+const Comparator = require("../common/Comparator");
+
 /**
  * 双向链表
  */
@@ -6,11 +8,12 @@ class DoublyLinkedList {
   /**
    * 构造函数
    */
-  constructor() {
+  constructor(fn = null) {
+    this.comparator = new Comparator(fn);
     this.dummyHead = new DoublyLinkedListNode();
     this.dummyTail = new DoublyLinkedListNode();
-    this.dummyHead.next = this.dummyTail;
-    this.dummyTail.previous = this.dummyHead;
+    this.dummyHead._next = this.dummyTail;
+    this.dummyTail._previous = this.dummyHead;
   }
 
 
@@ -19,25 +22,34 @@ class DoublyLinkedList {
    */
   length() {
     let length = 0
-    let node = this.dummyHead.next;
+    let node = this.dummyHead._next;
     while (node !== this.dummyTail) {
       length++;
     }
     return length;
   }
 
   /**
-   * 是否包含某个值
-   * @param {*} value 
+   * find node's value equals value 
+   * @param {*} value value to found
+   * @return {DoublyLinkedListNode} node founded
    */
-  contains(value) {
-    let node = this.dummyHead.next;
+  find(value) {
+    let node = this.dummyHead._next;
     while (node !== this.dummyTail) {
-      if (node.value === value) {
-        return true;
+      if (this.comparator.equal(node.value, value)) {
+        return node;
       }
     }
-    return false;
+    return null;
+  }
+
+  /**
+   * 是否包含某个值
+   * @param {*} value 
+   */
+  contains(value) {
+    return find(value) !== null;
   }
 
   /**
@@ -46,10 +58,10 @@ class DoublyLinkedList {
    */
   prepend(value) {
     let newNode = new DoublyLinkedListNode(value);
-    newNode.previous = this.dummyHead;
-    newNode.next = this.dummyHead.next;
-    this.dummyHead.next.previous = newNode;
-    this.dummyHead.next = newNode;
+    newNode._previous = this.dummyHead;
+    newNode._next = this.dummyHead._next;
+    this.dummyHead._next._previous = newNode;
+    this.dummyHead._next = newNode;
   }
 
   /**
@@ -58,10 +70,10 @@ class DoublyLinkedList {
    */
   append(value) {
     let newNode = new DoublyLinkedListNode(value);
-    newNode.previous = this.dummyTail.previous;
-    newNode.next = this.dummyTail;
-    this.dummyTail.previous.next = newNode;
-    this.dummyTail.previous = newNode;
+    newNode._previous = this.dummyTail._previous;
+    newNode._next = this.dummyTail;
+    this.dummyTail._previous._next = newNode;
+    this.dummyTail._previous = newNode;
   }
 
   /**
@@ -71,44 +83,44 @@ class DoublyLinkedList {
    */
   insert(value, after) {
     let node = this.dummyHead;
-    while (node.value !== after && node.next != this.dummyTail) {
-      node = node.next;
+    while (!this.comparator.equal(node.value, after) && node._next != this.dummyTail) {
+      node = node._next;
     }
     let newNode = new DoublyLinkedListNode(value);
-    newNode.next = node.next;
-    newNode.previous = node;
-    node.next.previous = newNode;
-    node.next = newNode;
+    newNode._next = node._next;
+    newNode._previous = node;
+    node._next._previous = newNode;
+    node._next = newNode;
   }
 
   /**
    * remove first node 
    */
   removeHead() {
-    if (this.dummyHead.next !== this.dummyTail) {
-      let remove = this.dummyHead.next;
-      remove.previous.next = remove.next;
-      remove.next.previous = remove.previous;
+    if (this.dummyHead._next !== this.dummyTail) {
+      let remove = this.dummyHead._next;
+      remove._previous._next = remove._next;
+      remove._next._previous = remove._previous;
 
       // NOTE: for memory leak
       remove.value = null;
-      remove.previous = null;
-      remove.next = null;
+      remove._previous = null;
+      remove._next = null;
     }
   }
 
   /**
    * remove last node
    */
   removeTail() {
-    if (this.dummyTail.previous !== this.dummyHead) {
-      let remove = this.dummyTail.previous;
-      remove.previous.next = remove.next;
-      remove.next.previous = remove.previous;
+    if (this.dummyTail._previous !== this.dummyHead) {
+      let remove = this.dummyTail._previous;
+      remove._previous._next = remove._next;
+      remove._next._previous = remove._previous;
       // NOTE: for memory leak
       remove.value = null;
-      remove.previous = null;
-      remove.next = null;
+      remove._previous = null;
+      remove._next = null;
     }
   }
 
@@ -117,16 +129,16 @@ class DoublyLinkedList {
    * @param {*} value 
    */
   remove(value) {
-    let node = this.dummyHead.next;
+    let node = this.dummyHead._next;
     while (node !== this.dummyTail) {
-      let next = node.next;
-      if (node.value === value) {
-        node.previous.next = node.next;
-        node.next.previous = node.previous;
+      let next = node._next;
+      if (this.comparator.equal(node.value, value)) {
+        node._previous._next = node._next;
+        node._next._previous = node._previous;
         // NOTE: for memory leak
         node.value = null;
-        node.previous = null;
-        node.next = null;
+        node._previous = null;
+        node._next = null;
       }
       node = next;
     }
@@ -137,10 +149,10 @@ class DoublyLinkedList {
    */
   toArray() {
     let array = new Array();
-    let node = this.dummyHead.next;
+    let node = this.dummyHead._next;
     while (node != this.dummyTail) {
       array.push(node.value);
-      node = node.next;
+      node = node._next;
     }
     return array;
   }
@@ -156,9 +168,18 @@ class DoublyLinkedListNode {
    * @param {*} value 
    */
   constructor(value) {
+    /**
+     * @type {*}
+     */
     this.value = value;
-    this.previous = null;
-    this.next = null;
+    /**
+     * @type {DoublyLinkedListNode}
+     */
+    this._previous = null;
+    /**
+     * @type {DoublyLinkedListNode}
+     */
+    this._next = null;
   }
 
 }

src/linked-list/LinkedList.js

@@ -1,3 +1,5 @@
+const Comparator = require("../common/Comparator");
+
 /**
  * LinkedListNode
  */
@@ -9,7 +11,10 @@ class LinkedListNode {
    */
   constructor(value) {
     this.value = value;
-    this.next = null;
+    /**
+     * @type {LinkedListNode}
+     */
+    this._next = null;
   }
 }
 
@@ -21,30 +26,40 @@ class LinkedList {
   /**
    * LinkedList 构造
    */
-  constructor() {
+  constructor(fn = null) {
+    this.comparator = new Comparator(fn);
     this.dummyHead = new LinkedListNode();
   }
 
   /**
-   * 链表中是否存在某个值
-   * @param {*} value 
+   * find node's value equals value 
+   * @param {*} value value to found
+   * @return {LinkedListNode} node founded
    */
-  contains(value) {
-    let node = this.dummyHead.next;
+  find(value) {
+    let node = this.dummyHead._next;
     while (node) {
-      if (node.value === value) {
-        return true;
+      if (this.comparator.equal(node.value, value)) {
+        return node;
       }
     }
-    return false;
+    return null;
+  }
+
+  /**
+   * 链表中是否存在某个值
+   * @param {*} value 
+   */
+  contains(value) {
+    return find(value) !== null;
   }
 
   /**
    * 计算链表长度
    */
   length() {
     let length = 0;
-    let node = this.dummyHead.next;
+    let node = this.dummyHead._next;
     while (node) {
       length++;
     }
@@ -57,8 +72,8 @@ class LinkedList {
    */
   prepend(value) {
     let newNode = new LinkedListNode(value);
-    newNode.next = this.dummyHead.next;
-    this.dummyHead.next = newNode;
+    newNode._next = this.dummyHead._next;
+    this.dummyHead._next = newNode;
   }
 
   /**
@@ -67,10 +82,10 @@ class LinkedList {
    */
   append(value) {
     let node = this.dummyHead;
-    while (node.next) {
-      node = node.next;
+    while (node._next) {
+      node = node._next;
     }
-    node.next = new LinkedListNode(value);
+    node._next = new LinkedListNode(value);
   }
 
   /**
@@ -80,24 +95,24 @@ class LinkedList {
    */
   insert(value, after) {
     let node = this.dummyHead;
-    while (node.value !== after && node.next) {
-      node = node.next;
+    while (!this.comparator.equal(node.value, after) && node._next) {
+      node = node._next;
     }
     let newNode = new LinkedListNode(value);
-    newNode.next = node.next;
-    node.next = newNode;
+    newNode._next = node._next;
+    node._next = newNode;
   }
 
   /**
    * remove first node 
    */
   removeHead() {
-    if (this.dummyHead.next) {
-      let remove = this.dummyHead.next;
-      this.dummyHead.next = remove.next;
+    if (this.dummyHead._next) {
+      let remove = this.dummyHead._next;
+      this.dummyHead._next = remove._next;
       // NOTE: for memory leak
       remove.value = null;
-      remove.next = null;
+      remove._next = null;
     }
   }
 
@@ -107,15 +122,15 @@ class LinkedList {
   removeTail() {
     let node = this.dummyHead;
     let pre = null;
-    while (node.next) {
+    while (node._next) {
       pre = node;
-      node = node.next;
+      node = node._next;
     }
     if (pre) {
-      pre.next = null;
+      pre._next = null;
       // NOTE: for memory leak
       node.value = null;
-      node.next = null;
+      node._next = null;
     }
   }
 
@@ -125,16 +140,16 @@ class LinkedList {
    */
   remove(value) {
     let pre = this.dummyHead;
-    let node = pre.next;
+    let node = pre._next;
     while (node) {
-      if (node.value === value) {
-        pre.next = node.next;
-        node.next = null;
+      if (this.comparator.equal(node.value, value)) {
+        pre._next = node._next;
+        node._next = null;
         node.value = null;
       } else {
-        pre = pre.next;
+        pre = pre._next;
       }
-      node = (pre ? pre.next : null);
+      node = (pre ? pre._next : null);
     }
   }
 
@@ -143,10 +158,10 @@ class LinkedList {
    */
   toArray() {
     let array = new Array();
-    let node = this.dummyHead.next;
+    let node = this.dummyHead._next;
     while (node) {
       array.push(node.value);
-      node = node.next;
+      node = node._next;
     }
     return array;
   }