。。。

zhiyuan0101 · zhiyuan0101 · commit 8872d607e7cb · 2017-02-25T23:59:40.000+08:00
diff --git a/group17/1264835468/src/assignment/BinaryTree.java b/group17/1264835468/src/assignment/BinaryTree.java
@@ -27,7 +27,7 @@ public BinaryTreeNode<T> insert(BinaryTreeNode<T> node) {
 
 	private void insert(BinaryTreeNode<T> current, BinaryTreeNode<T> node) {
 
-		if (current.getData().compareTo(node.getData()) >= 0) {
+		if (current.getData().compareTo(node.getData()) > 0) {
 			if (current.getLeft() == null)
 				current.setLeft(node);
 			else
diff --git a/group17/1264835468/src/assignment/MyArrayList.java b/group17/1264835468/src/assignment/MyArrayList.java
@@ -12,7 +12,9 @@ public MyArrayList() {
 	}
 
 	public MyArrayList(int initSize) {
-		if (initSize < 0) throw new IllegalArgumentException(initSize + " < 0");
+		if (initSize < 0) {
+			throw new IllegalArgumentException(initSize + " < 0");
+		}
 		if (initSize == 0) {
 			elementData = new Object[DEFAULT_SIZE];
 		}
@@ -28,6 +30,9 @@ public void add(E o) {
 	}
 
 	public void add(int index, E o) {
+		if (index < 0 || index > size) {
+			throw new IllegalArgumentException("index:" + index);
+		}
 		growIfNeed();
 		System.arraycopy(elementData, index, elementData, index + 1, size - index);
 		elementData[index] = o;
@@ -43,7 +48,6 @@ public E get(int index) {
 	public E remove(int index) {
 		rangeCheck(index);
 		E target = get(index);
-		// moveForwardFrom(index + 1);
 		System.arraycopy(elementData, index + 1, elementData, index, size - index - 1);
 		size--;
 		return target;
@@ -55,12 +59,13 @@ public int size() {
 
 	private void rangeCheck(int index) {
 		if (index >= size) {
-			throw new NoElementException("index:" + index);
+			throw new NoSuchElementException("index:" + index);
 		}
 	}
 
 	private void growIfNeed() {
-		if (size == elementData.length) grow();
+		if (size == elementData.length)
+			grow();
 	}
 
 	private void grow() {
@@ -96,9 +101,9 @@ public String toString() {
 
 }
 
-class NoElementException extends RuntimeException {
+class NoSuchElementException extends RuntimeException {
 
-	public NoElementException(String string) {
+	public NoSuchElementException(String string) {
 		super(string);
 	}
 
diff --git a/group17/1264835468/src/assignment/MyLinkedList.java b/group17/1264835468/src/assignment/MyLinkedList.java
@@ -34,7 +34,9 @@ public void addLast(E o) {
 	}
 
 	public void add(int index, E o) {
-		rangeCheck(index - 1);
+		if (index > size || index < 0) {
+			throw new IllegalArgumentException("index:" + index);
+		}
 		if (index == 0) {
 			addFirst(o);
 			return;
@@ -64,6 +66,7 @@ public E remove(int index) {
 	}
 
 	public E get(int index) {
+		rangeCheck(index);
 		return movePtrTo(index).data;
 	}
 
@@ -81,7 +84,7 @@ private Node<E> movePtrTo(int index) {
 
 	private void rangeCheck(int index) {
 		if (index >= size) {
-			throw new NoElementException("index:" + index);
+			throw new NoSuchElementException("index:" + index);
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,9 @@ public MyArrayList() {`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public MyArrayList(int initSize) {`
`15`		`- if (initSize < 0) throw new IllegalArgumentException(initSize + " < 0");`
	`15`	`+ if (initSize < 0) {`
	`16`	`+ throw new IllegalArgumentException(initSize + " < 0");`
	`17`	`+ }`
`16`	`18`	`if (initSize == 0) {`
`17`	`19`	`elementData = new Object[DEFAULT_SIZE];`
`18`	`20`	`}`
`@@ -28,6 +30,9 @@ public void add(E o) {`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`public void add(int index, E o) {`
	`33`	`+ if (index < 0 \|\| index > size) {`
	`34`	`+ throw new IllegalArgumentException("index:" + index);`
	`35`	`+ }`
`31`	`36`	`growIfNeed();`
`32`	`37`	`System.arraycopy(elementData, index, elementData, index + 1, size - index);`
`33`	`38`	`elementData[index] = o;`
`@@ -43,7 +48,6 @@ public E get(int index) {`
`43`	`48`	`public E remove(int index) {`
`44`	`49`	`rangeCheck(index);`
`45`	`50`	`E target = get(index);`
`46`		`- // moveForwardFrom(index + 1);`
`47`	`51`	`System.arraycopy(elementData, index + 1, elementData, index, size - index - 1);`
`48`	`52`	`size--;`
`49`	`53`	`return target;`
`@@ -55,12 +59,13 @@ public int size() {`
`55`	`59`
`56`	`60`	`private void rangeCheck(int index) {`
`57`	`61`	`if (index >= size) {`
`58`		`- throw new NoElementException("index:" + index);`
	`62`	`+ throw new NoSuchElementException("index:" + index);`
`59`	`63`	`}`
`60`	`64`	`}`
`61`	`65`
`62`	`66`	`private void growIfNeed() {`
`63`		`- if (size == elementData.length) grow();`
	`67`	`+ if (size == elementData.length)`
	`68`	`+ grow();`
`64`	`69`	`}`
`65`	`70`
`66`	`71`	`private void grow() {`
`@@ -96,9 +101,9 @@ public String toString() {`
`96`	`101`
`97`	`102`	`}`
`98`	`103`
`99`		`-class NoElementException extends RuntimeException {`
	`104`	`+class NoSuchElementException extends RuntimeException {`
`100`	`105`
`101`		`- public NoElementException(String string) {`
	`106`	`+ public NoSuchElementException(String string) {`
`102`	`107`	`super(string);`
`103`	`108`	`}`
`104`	`109`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,9 @@ public void addLast(E o) {`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public void add(int index, E o) {`
`37`		`- rangeCheck(index - 1);`
	`37`	`+ if (index > size \|\| index < 0) {`
	`38`	`+ throw new IllegalArgumentException("index:" + index);`
	`39`	`+ }`
`38`	`40`	`if (index == 0) {`
`39`	`41`	`addFirst(o);`
`40`	`42`	`return;`
`@@ -64,6 +66,7 @@ public E remove(int index) {`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`public E get(int index) {`
	`69`	`+ rangeCheck(index);`
`67`	`70`	`return movePtrTo(index).data;`
`68`	`71`	`}`
`69`	`72`
`@@ -81,7 +84,7 @@ private Node<E> movePtrTo(int index) {`
`81`	`84`
`82`	`85`	`private void rangeCheck(int index) {`
`83`	`86`	`if (index >= size) {`
`84`		`- throw new NoElementException("index:" + index);`
	`87`	`+ throw new NoSuchElementException("index:" + index);`
`85`	`88`	`}`
`86`	`89`	`}`
`87`	`90`