Merge pull request #26 from lingchen1dian21fen/master

download file

group10/904627477/.settings/org.eclipse.core.resources.prefs

@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

group10/904627477/src/com/coding/array/ArrayUtil.java

@@ -10,6 +10,9 @@ public class ArrayUtil {
 	 * @return
 	 */
 	public void reverseArray(int[] origin){
+		if(origin==null){
+			return ;
+		}
 		int len = origin.length;
 		for (int i = 0; i < len/2 ; i++) {
 			int temp = origin[len-1-i];
@@ -27,6 +30,9 @@ public void reverseArray(int[] origin){
 	 */
 
 	public int[] removeZero(int[] oldArray){
+		if(oldArray==null){
+			return new int[0];
+		}
 		int[] tempArr = new int[oldArray.length];
 		int size = 0;
 		for (int i = 0; i < oldArray.length; i++) {
@@ -49,6 +55,11 @@ public int[] removeZero(int[] oldArray){
 	 */
 
 	public int[] merge(int[] array1, int[] array2){
+		if(array1==null&&array2==null){
+			return new int[0];
+		}else if(array1==null||array2==null){
+			return array1==null?array2:array1;
+		}
 		int[] arr3 = new int[array1.length+array2.length];
 		int len1 = array1.length;
 		int len2 = array2.length; 
@@ -85,6 +96,9 @@ public int[] merge(int[] array1, int[] array2){
 	 * @return
 	 */
 	public int[] grow(int [] oldArray,  int size){
+		if(oldArray==null){
+			return new int[0];
+		}
 		if(size<0){
 			throw new IllegalArgumentException();
 		}
@@ -95,6 +109,20 @@ public int[] grow(int [] oldArray,  int size){
 		return newArr;
 	}
 
+	public static byte[] grow(byte[] oldArray,  int size){
+		if(oldArray==null){
+			return new byte[0];
+		}
+		if(size<0){
+			throw new IllegalArgumentException();
+		}
+		byte[] newArr = new byte[oldArray.length + size];
+		for (int i = 0; i < oldArray.length; i++) {
+			newArr[i] = oldArray[i];
+		}
+		return newArr;
+	}
+
 	/**
 	 * 斐波那契数列为：1，1，2，3，5，8，13，21......  ，给定一个最大值， 返回小于该值的数列
 	 * 例如， max = 15 , 则返回的数组应该为 [1，1，2，3，5，8，13]
@@ -202,13 +230,28 @@ public boolean isPerfectNumber(int n){
 	 * @param s
 	 * @return
 	 */
-	public String join(int[] array, String seperator){
+	/*My
+	 public String join(int[] array, String seperator){
 		String result = "";
 		for (int i = 0; i < array.length; i++) {
 			result = result + array[i] + seperator;
 		}
 		int index = result.lastIndexOf(seperator);
 		return result.substring(0, index);
+	}*/
+
+	public String join(int[] array, String seperator){
+		if(array==null){
+			return "";
+		}
+		StringBuffer sb = new StringBuffer();
+		for (int i = 0; i < array.length; i++) {
+			sb.append(array[i]);
+			if(i<array.length-1){
+				sb.append(seperator);
+			}
+		}
+		return sb.toString();
 	}
 
 

group10/904627477/src/com/coding/ArrayList.java → group10/904627477/src/com/coding/basic/ArrayList.java

@@ -1,4 +1,4 @@
-package com.coding;
+package com.coding.basic;
 
 import java.util.NoSuchElementException;
 

group10/904627477/src/com/coding/BinaryTreeNode.java → group10/904627477/src/com/coding/basic/BinaryTreeNode.java

@@ -1,4 +1,4 @@
-package com.coding;
+package com.coding.basic;
 
 public class BinaryTreeNode {
 

group10/904627477/src/com/coding/Iterator.java → group10/904627477/src/com/coding/basic/Iterator.java

@@ -1,4 +1,4 @@
-package com.coding;
+package com.coding.basic;
 
 public interface Iterator {
 	public boolean hasNext();