作业提交

Administrator · Administrator · commit 758fb4c72ec9 · 2017-02-26T15:05:05.000+08:00
diff --git a/group20/423184723/src/basic/ArrayList.java b/group20/423184723/src/basic/ArrayList.java
@@ -1,32 +1,78 @@
 package com.coding.basic;
 
+import com.sun.media.sound.EmergencySoundbank;
+
 public class ArrayList implements List {
-	
+	/**
+	 * 列表中元素的个数
+	 */
 	private int size = 0;
 	
-	private Object[] elementData = new Object[100];
+	/**
+	 * 初始化数组大小
+	 */
+	private int arraySize = 100;
+	/**
+	 * 初始化数组
+	 */
+	private Object[] elementData = new Object[arraySize];
 	
+	/**
+	 * 添加方法
+	 */
 	public void add(Object o){
-		
+		if(size>=(arraySize*0.75)){
+			Object [] target = new Object[(int) (arraySize*1.5)];
+			System.arraycopy(elementData,0,target,0,arraySize);
+			target[size-1] = o;
+			size++;
+		}else if(size<(arraySize*0.75)){
+			elementData[size-1]=o;
+			size++;
+		}
 	}
+	/**
+	 * 根据索引添加方法
+	 */
 	public void add(int index, Object o){
-		
+		if(size >= arraySize*0.75){
+			Object [] target = new Object[(int) (arraySize*1.5)];
+			System.arraycopy(elementData,0,target,0,arraySize);
+			 for (int j = target.length;j>=index;j--){
+	                target[j-1] = target[j-2];
+	            }
+	            target[index] = o;
+	            size++;
+		}else if(size < arraySize*0.75){
+			 for (int j = elementData.length;j>=index;j--){
+	                elementData[j-1] = elementData[j-2];
+	            }
+	            elementData[index] = o;
+	            size++;
+		}
 	}
-	
+	/**
+	 * 根据索引获取对象
+	 */
 	public Object get(int index){
-		return null;
+		return elementData[index];
 	}
-	
+	/**
+	 * 根据索引移除对象
+	 */
 	public Object remove(int index){
-		return null;
+		for (int i = index; i < elementData.length; i++) {
+			elementData[i]=elementData[i+1];
+			size++;
+		}
+		return elementData[index];
 	}
-	
+	/**
+	 * 获取数组大小
+	 */
 	public int size(){
-		return -1;
+		return this.size;
 	}
 	
-	public Iterator iterator(){
-		return null;
-	}
 	
 }
diff --git a/group20/423184723/src/basic/Queue.java b/group20/423184723/src/basic/Queue.java
@@ -2,18 +2,28 @@
 
 public class Queue {
 	
-	public void enQueue(Object o){		
+	private LinkedList list = new LinkedList();
+	public void enQueue(Object o){	
+		list.add(o);
 	}
 	
 	public Object deQueue(){
-		return null;
+		int length = list.size();
+		if (length == 0) {
+			return null;
+		}
+		return list.removeFirst();
 	}
 	
 	public boolean isEmpty(){
-		return false;
+		if (list.size() == 0) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 	
 	public int size(){
-		return -1;
+		return list.size;
 	}
 }
diff --git a/group20/423184723/src/basic/Stack.java b/group20/423184723/src/basic/Stack.java
@@ -4,19 +4,32 @@ public class Stack {
 	private ArrayList elementData = new ArrayList();
 	
 	public void push(Object o){		
+		elementData.add(o);
 	}
 	
 	public Object pop(){
-		return null;
+		int length = elementData.size();
+		if (length == 0) {
+			return null;
+		}
+		return elementData.remove(length - 1);
 	}
 	
 	public Object peek(){
-		return null;
+		int length = elementData.size();
+		if (length == 0) {
+			return null;
+		}
+		return elementData.get(length - 1);
 	}
 	public boolean isEmpty(){
-		return false;
+		if (elementData.size() != 0) {
+			return false;
+		} else {
+			return true;
+		}
 	}
 	public int size(){
-		return -1;
+		return elementData.size();
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,28 @@`
`2`	`2`
`3`	`3`	`public class Queue {`
`4`	`4`
`5`		`- public void enQueue(Object o){`
	`5`	`+ private LinkedList list = new LinkedList();`
	`6`	`+ public void enQueue(Object o){`
	`7`	`+ list.add(o);`
`6`	`8`	`}`
`7`	`9`
`8`	`10`	`public Object deQueue(){`
`9`		`- return null;`
	`11`	`+ int length = list.size();`
	`12`	`+ if (length == 0) {`
	`13`	`+ return null;`
	`14`	`+ }`
	`15`	`+ return list.removeFirst();`
`10`	`16`	`}`
`11`	`17`
`12`	`18`	`public boolean isEmpty(){`
`13`		`- return false;`
	`19`	`+ if (list.size() == 0) {`
	`20`	`+ return true;`
	`21`	`+ } else {`
	`22`	`+ return false;`
	`23`	`+ }`
`14`	`24`	`}`
`15`	`25`
`16`	`26`	`public int size(){`
`17`		`- return -1;`
	`27`	`+ return list.size;`
`18`	`28`	`}`
`19`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,19 +4,32 @@ public class Stack {`
`4`	`4`	`private ArrayList elementData = new ArrayList();`
`5`	`5`
`6`	`6`	`public void push(Object o){`
	`7`	`+ elementData.add(o);`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`public Object pop(){`
`10`		`- return null;`
	`11`	`+ int length = elementData.size();`
	`12`	`+ if (length == 0) {`
	`13`	`+ return null;`
	`14`	`+ }`
	`15`	`+ return elementData.remove(length - 1);`
`11`	`16`	`}`
`12`	`17`
`13`	`18`	`public Object peek(){`
`14`		`- return null;`
	`19`	`+ int length = elementData.size();`
	`20`	`+ if (length == 0) {`
	`21`	`+ return null;`
	`22`	`+ }`
	`23`	`+ return elementData.get(length - 1);`
`15`	`24`	`}`
`16`	`25`	`public boolean isEmpty(){`
`17`		`- return false;`
	`26`	`+ if (elementData.size() != 0) {`
	`27`	`+ return false;`
	`28`	`+ } else {`
	`29`	`+ return true;`
	`30`	`+ }`
`18`	`31`	`}`
`19`	`32`	`public int size(){`
`20`		`- return -1;`
	`33`	`+ return elementData.size();`
`21`	`34`	`}`
`22`	`35`	`}`