update

Author: LukeLin

src/List/LinkedList.js

@@ -10,7 +10,7 @@ class Node {
 }
 
 export default class LinkedList {
-    constructor(sqList){
+    constructor(sqList = []){
         this.head = null;
         this.tail = null;
 
@@ -20,6 +20,12 @@ export default class LinkedList {
         } 
     }
 
+    /**
+     * merge list, note: this operation will delete a and b nodes.
+     * @param {LinkedList} a 
+     * @param {LinkedList} b
+     * @param {*} compare 
+     */
     static mergeList (a, b, compare = compFn) {
         let ha = a.head;
         let hb = b.head;
@@ -233,6 +239,11 @@ export default class LinkedList {
         return str;
     }
 
+    /**
+     * insert element by order
+     * @param {*} data 
+     * @param {Function} cmp 
+     */
     orderInsert (data, cmp) {
         cmp = typeof cmp === 'function' ? cmp : (a, b) => {
             if (a > b)
@@ -335,6 +346,7 @@ export default class LinkedList {
         let p = this.head;
         let q = p.next;
         let s = q.next;
+        this.tail = p;
         p.next = null;
 
         while (s.next) {
@@ -438,56 +450,6 @@ function intersect_delete(list, b, c) {
     list.tail = r;
 }
 
-var list = new LinkedList();
-list.push('b');
-list.unshift('a');
-list.insertAfter('b', 'c');
-console.log(list.item(2));
-console.log(JSON.stringify(list));
-list.each(function (node) {
-    if (node.data === 'b') {
-        console.log('get b in each');
-    }
-});
-list.remove('c');
-list.remove('a');
-console.log(list);
-
-let list2 = new LinkedList();
-list2.push('c');
-list2.unshift('d');
-list2.insertAfter('d', 'b');
-console.log(JSON.stringify(list2));
-
-let list3 = LinkedList.mergeList(list, list2);
-console.log(list3);
-
-
-var list = new LinkedList();
-
-list.orderInsert(5);
-list.orderInsert(2);
-list.orderInsert(3);
-list.orderInsert(1);
-list.orderInsert(4);
-list.orderInsert(4);
-list.orderInsert(6);
-list.orderInsert(6);
-list.orderInsert(7);
-
-list.delete_between(5, 8);
-console.log('delete-between:  ');
-console.log(list);
-
-list.orderInsert(2);
-list.orderInsert(3);
-list.orderInsert(1);
-
-list.delete_equal();
-console.log(list);
-
-list.reverse();
-console.log(list);
 
 let a = new LinkedList();
 a.orderInsert(1);
@@ -524,9 +486,3 @@ test.orderInsert(9);
 
 intersect_delete(test, a, b);
 console.log(test);
-
-var popTest = new LinkedList();
-popTest.push(1);
-popTest.push(2);
-popTest.pop();
-popTest.pop();

src/List/Polynomial.js

@@ -1,20 +1,21 @@
 var List = require('./complete-LinkedList');
 
-function Term(coef, expn) {
-    // 系数
-    this.coef = coef || null;
-    // 指数
-    this.expn = expn || null;
+class Term {
+    constructor(coef = null, expn = null){
+        // 系数
+        this.coef = coef;
+        // 指数
+        this.expn = expn;
+    }
 }
 
 // 一元多项式
-function Polynomial() {
-    List.call(this);
-}
-Polynomial.prototype = {
-    __proto__: List.prototype,
+class Polynomial extends List {
+    constructor(...args) {
+        super(...args);
+    }
 
-    locateElem: function (elem, compare) {
+    locateElem(elem, compare) {
         var current = this.head;
         var prev = current;
         var obj;
@@ -37,23 +38,23 @@ Polynomial.prototype = {
         }
 
         return obj;
-    },
-    initList: function () {
+    }
+    initList() {
         this.head = List.makeNode();
         this.head.data = new Term();
         this.tail = this.head;
-    },
-    cmp: function (a, b) {
+    }
+    cmp(a, b) {
         if (a.expn < b.expn) {
             return -1;
         } else if (a.expn === b.expn) {
             return 0;
         } else {
             return 1;
         }
-    },
+    }
     // 输入m项的系数和指数，建立表示一元多项式的有序链表p
-    createPolyn: function (elems, elems2) {
+    createPolyn(elems, elems2) {
         var m = elems.length;
         this.initList();
         var h = this.head;
@@ -72,9 +73,9 @@ Polynomial.prototype = {
 
             e = {};
         }
-    },
+    }
     // 多项式加法，a = a + b
-    addPolyn: function (b) {
+    addPolyn(b) {
         var a = this;
         // ha, hb分别指向头结点
         var ha = a.head;
@@ -125,7 +126,8 @@ Polynomial.prototype = {
             a.append(qb);
         }
     }
-};
+}
+
 
 var test = new Polynomial();
 test.createPolyn([-1, 2, 4], [1, 2, 3]);

test/List/LinkedList.js

@@ -10,6 +10,11 @@ describe('linkedList tests', function () {
     assert.equal(list.head.data, 'b');
     assert.equal(list.tail.next, null);
 
+    list.push('c');
+    list.pop();
+    assert.equal(list.head.data, 'b');
+    assert.equal(list.tail.next, null);
+
     list.unshift('a');
     assert.equal(list.head.data, 'a');
     assert.equal(list.head.next.data, 'b');
@@ -70,5 +75,49 @@ describe('linkedList tests', function () {
     list.each(function (node, index) {
       assert.equal(node.data, arr[index]);
     });
+
+    for (let [index, node] of list){
+      assert.equal(node.data, arr[index]);
+    }
+  });
+
+  var list = new List();
+
+  it('LinkedList orderInsert', function(){
+    list.orderInsert(5);
+    list.orderInsert(2);
+    list.orderInsert(3);
+    list.orderInsert(1);
+    list.orderInsert(4);
+    list.orderInsert(4);
+    list.orderInsert(6);
+    list.orderInsert(6);
+    list.orderInsert(7);
+
+    var result = new List([1, 2, 3, 4, 4, 5, 6, 6, 7]);
+
+    assert.deepEqual(list, result);
   });
+
+  it('LinkedList delete_between', function(){
+    list.delete_between(5, 8);
+
+    var result = new List([1, 2, 3, 4, 4, 5]);
+    assert.deepEqual(list, result);
+  });
+
+  it('LinkedList delete_equal', function () {
+    list.delete_equal();
+
+    var result = new List([1, 2, 3, 4, 5]);
+    assert.deepEqual(list, result);
+  });
+
+  it('LinkedList reverse', function () {
+    list.reverse();
+
+    var result = new List([5, 4, 3, 2, 1]);
+    assert.deepEqual(list, result);
+  });
+
 });