更正完全数

yc · yc · commit 534e9f57d79d · 2017-03-05T12:53:52.000+08:00
diff --git a/group20/755659358/week02/src/com/coderising/practice/array/ArrayUtil.java b/group20/755659358/week02/src/com/coderising/practice/array/ArrayUtil.java
@@ -160,7 +160,7 @@ public boolean isPrime(int a) {
 	public int[] getPerfectNumbers(int max) {
 		ArrayList<Integer> list=new ArrayList<>();
 		for (int i = 2; i < max; i++) {
-			int [] splits=primeSplit(i);
+			int [] splits=numSplit(i);
 			if (sumArray(splits)==i) {
 				list.add(i);
 			}
@@ -177,23 +177,20 @@ public int sumArray(int[] arr){
 		return sum;
 	}
 	
-	public int[] primeSplit(int x){
+	public int[] numSplit(int x){
 		if (x<=1) {
 			return new int[]{};
 		}
 		if (x==2) {
 			return new int[]{1,2};
 		}
-		int k=2;
+		int k=1;
 		ArrayList<Integer> list=new ArrayList<>();
-		list.add(1);
-		while (k<=x) {
+		while (k<=x&&(x/k>=2)) {
 			if (x%k==0) {
 				list.add(k);
-				x=x/k;
-			}else {
-				k++;
 			}
+			k++;
 		}
 		
 		
diff --git a/group20/755659358/week02/src/com/coderising/practice/array/ArrayUtisTest.java b/group20/755659358/week02/src/com/coderising/practice/array/ArrayUtisTest.java
@@ -61,7 +61,7 @@ public void testGetPrime(){
 	@Test
 	public void testGetPerfectNum(){
 		
-		assertArrayEquals(new int[]{6}, util.getPerfectNumbers(13));
+		assertArrayEquals(new int[]{6,28,496}, util.getPerfectNumbers(1000));
 	}
 	
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -160,7 +160,7 @@ public boolean isPrime(int a) {`
`160`	`160`	`public int[] getPerfectNumbers(int max) {`
`161`	`161`	`ArrayList<Integer> list=new ArrayList<>();`
`162`	`162`	`for (int i = 2; i < max; i++) {`
`163`		`- int [] splits=primeSplit(i);`
	`163`	`+ int [] splits=numSplit(i);`
`164`	`164`	`if (sumArray(splits)==i) {`
`165`	`165`	`list.add(i);`
`166`	`166`	`}`
`@@ -177,23 +177,20 @@ public int sumArray(int[] arr){`
`177`	`177`	`return sum;`
`178`	`178`	`}`
`179`	`179`
`180`		`- public int[] primeSplit(int x){`
	`180`	`+ public int[] numSplit(int x){`
`181`	`181`	`if (x<=1) {`
`182`	`182`	`return new int[]{};`
`183`	`183`	`}`
`184`	`184`	`if (x==2) {`
`185`	`185`	`return new int[]{1,2};`
`186`	`186`	`}`
`187`		`- int k=2;`
	`187`	`+ int k=1;`
`188`	`188`	`ArrayList<Integer> list=new ArrayList<>();`
`189`		`- list.add(1);`
`190`		`- while (k<=x) {`
	`189`	`+ while (k<=x&&(x/k>=2)) {`
`191`	`190`	`if (x%k==0) {`
`192`	`191`	`list.add(k);`
`193`		`- x=x/k;`
`194`		`- }else {`
`195`		`- k++;`
`196`	`192`	`}`
	`193`	`+ k++;`
`197`	`194`	`}`
`198`	`195`
`199`	`196`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public void testGetPrime(){`
`61`	`61`	`@Test`
`62`	`62`	`public void testGetPerfectNum(){`
`63`	`63`
`64`		`- assertArrayEquals(new int[]{6}, util.getPerfectNumbers(13));`
	`64`	`+ assertArrayEquals(new int[]{6,28,496}, util.getPerfectNumbers(1000));`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`@Test`