Merge pull request #14 from fei028/master

link queue bug xg
zeyuanpinghe · Feb 26, 2017 · 2cb892a · 2cb892a
2 parents f63ec74 + 4378cd8
commit 2cb892a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/group01/2137642225/work01/src/com/coding/mybasic/LinkedList.java b/group01/2137642225/work01/src/com/coding/mybasic/LinkedList.java
@@ -55,7 +55,6 @@ else if(index == (size - 1)){
 		else {
 			element = removeMiddle(index);
 		}
-		size--;
 		return element;
 	}
 
@@ -95,6 +94,7 @@ public void addFirst(Object o){
 		node.data = o;
 		node.next = head.next;
 		head = node;
+		size++;
 	}
 	public void addLast(Object o){
 		Node node = new Node();
@@ -116,6 +116,7 @@ private Object removeMiddle(int index) {
 		Object element = removeNode.data;
 		temp.next = removeNode.next;
 		removeNode = null;
+		size--;
 		return element;
 	}
 
@@ -190,6 +191,7 @@ private Object removeLastNode() {
 		Object element = lastNode.data;
 		lastNode = null;
 		last = node;
+		size--;
 		return element;
 	}
 	/**
@@ -201,6 +203,7 @@ private Object removeFirstNode() {
 		Object element = head.data;
 		head = null;
 		head = node;
+		size--;
 		return element;
 	}
 

diff --git a/group01/2137642225/work01/src/com/coding/mybasic/Queue.java b/group01/2137642225/work01/src/com/coding/mybasic/Queue.java
@@ -8,7 +8,7 @@ public void enQueue(Object o){
 
 	public Object deQueue(){
 		checkEmptyQueue();
-		return linkedList.remove(size() - 1);
+		return linkedList.remove(0);
 	}
 
 	public boolean isEmpty(){