Skip to content

Commit

Permalink
Merge pull request #27 from shlugood/master
Browse files Browse the repository at this point in the history 
第三次作业
  • Loading branch information
@zeyuanpinghe
zeyuanpinghe authored Mar 20, 2017
2 parents e4e110a + 9ead947 commit 00beaa6
Show file tree
Hide file tree
Showing 16 changed files with 1,011 additions and 51 deletions.
128 changes: 84 additions & 44 deletions group19/972815123/src/com/coderising/array/ArrayUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ public void reverseArray(int[] origin){
int tem = 0;
for(int i = 0, len = origin.length; i < len/2; i ++){
tem = origin[i];
origin[i] = origin[len - i + 1];
origin[len - i + 1] = tem;
origin[i] = origin[len - i - 1];
origin[len - i - 1] = tem;
}

System.out.println(join(origin, ","));
}

/**
Expand All @@ -33,12 +33,12 @@ public void reverseArray(int[] origin){
public int[] removeZero(int[] oldArray){
int withoutZeroSize = 0;
for(int i = 0, len = oldArray.length; i < len; i ++ ){
if( oldArray[i] == 0){
if( oldArray[i] != 0){
withoutZeroSize ++;
}
}
int[] newArray = new int[withoutZeroSize];
int point = 1;
int point = 0;
for(int i = 0 ,len = oldArray.length; i < len; i ++ ){
if( oldArray[i] != 0){
newArray[point] = oldArray[i];
Expand All @@ -57,19 +57,39 @@ public int[] removeZero(int[] oldArray){
*/

public int[] merge(int[] array1, int[] array2){
int point2 = 0;
int[] result = new int[array1.length + array2.length];
int point1 = 0, len1 = array1.length;
while(point1 < len1){
if(array1[point1] < array2[point2]){
result[point1 + point2] = array1[point1];
point1 ++;
int point = 0;
int point2 = 0, point1 = 0;
int len1 = array1.length, len2 = array2.length;

int[] result = new int[len1 + len2];
while(point1 < len1 || point2 < len2){
if(point1 < len1 && point2 < len2){
if(array1[point1] <= array2[point2]){
result[point] = array1[point1];
point++;
point1++;
}else{
if(result[point - 1] == array2[point2]){
point2++;
}else{
result[point] = array2[point2];
point++;
point2++;
}
}
}else{
result[point1 + point2] = array2[point2];
point2 ++;
if(point1 < len1){
result[point] = array1[point1];
point++;
point1++;
}else{
result[point] = array2[point2];
point++;
point2++;
}
}
}

result = removeZero(result);
return result;
}
/**
Expand Down Expand Up @@ -97,24 +117,26 @@ public int[] grow(int [] oldArray, int size){
* @return
*/
public int[] fibonacci(int max){
int[] result = {1,1,2};
int a1 = 1, a2 = 2;
int[] result = {1,1};
if(max <= 1){
return null;
}else if(max == 2){
return result;
}else{
result = grow(result, 10);
int index = 2;
while(result[index] > max){
if(result.length < index + 2){
int index = 1;
while(true){
index ++;
if(result.length < index + 1){
result = grow(result, 10);
}
result[index + 1] = result[index -1] + result[index];
index ++;
result[index] = result[index -1] + result[index - 2];
if(result[index] > max){
break;
}
}
}
return result;
return removeZero(result);
}

/**
Expand All @@ -124,32 +146,36 @@ public int[] fibonacci(int max){
* @return
*/
public int[] getPrimes(int max){
int[] temArr = null;
int[] temArr = {2};
if(max < 2){
return null;
}else if (max == 2){
int[] re = {2};
return re;
return temArr;
}else{
temArr = new int[max/2];
temArr[0] = 2;
int index = 1;
for(int i = 3; i < max ; i= i+2){
temArr = grow(temArr, 10);
int index = 0;
for(int i = 3;i < max; i ++){
boolean flag = true;
int isql = (int) Math.sqrt(i);
for(int j = 3; j < isql; j++){
if(i % j == 0){
int iSqrt = (int) Math.sqrt(i);
for(int j = 0; j < index + 1; j ++){
if(iSqrt < temArr[j]){
break;
}
if(i % temArr[j] == 0){
flag = false;
break;
}
}
if(flag){
temArr[index] = i;
index ++;
if(temArr.length < index + 1){
temArr = grow(temArr, 30);
}
temArr[index] = i;
}
}
}
temArr = this.removeZero(temArr);
return temArr;
return removeZero(temArr);
}

/**
Expand All @@ -163,17 +189,17 @@ public int[] getPerfectNumbers(int max){
int index = 0;
if(max < 6){
return null;
}else{
}
}

for (int n = 6; n <= max ; n ++){
int[] allPrimeFactore = getPrimeFactors(n);
int[] allFactors = getAllFactors(n);
int sum = 0;
for(int i = 0, len = allPrimeFactore.length; i < len; i ++){
sum += allPrimeFactore[i];
for(int i = 0, len = allFactors.length; i < len; i ++){
sum += allFactors[i];
}
if(sum == n){
if(result.length < index + 1){
result = this.grow(result, 1);
result = this.grow(result, 3);
}
result[index] = n;
index ++;
Expand All @@ -183,10 +209,24 @@ public int[] getPerfectNumbers(int max){
return removeZero(result);
}

private int[] getPrimeFactors(int n){
public int[] getAllFactors(int n){
int[] result = new int[n];
int index = 0;
for(int i = 1; i < n; i++){
if(n % i == 0){
result[index] = i;
index ++;
}
}
return removeZero(result);
}

//分解因式算法
public int[] getPrimeFactors(int n){
int[] allPrimes = getPrimes(n);
int[] result = new int[allPrimes.length];
int index = 0;
int index = 1;
result[0] = 1;
for(int i = 0, len = allPrimes.length; i < len; i ++){
int devide = n;
while(devide % allPrimes[i] == 0){
Expand Down
120 changes: 120 additions & 0 deletions group19/972815123/src/com/coderising/array/ArrayUtilTest.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
package com.coderising.array;

import static org.junit.Assert.*;

import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;

import junit.framework.Assert;

public class ArrayUtilTest {

private ArrayUtil au;

@BeforeClass
public static void setUpBeforeClass() throws Exception {
}

@AfterClass
public static void tearDownAfterClass() throws Exception {
}

@Before
public void setUp() throws Exception {
au = new ArrayUtil();
}

@After
public void tearDown() throws Exception {
}

@Test
public void testReverseArray() {
int[] test = {1,2,3};
au.reverseArray(test);
String result = au.join(test, "-");
Assert.assertEquals(result, "3-2-1");
}

@Test
public void testRemoveZero() {
int[] test = {1,3,4,5,0,0,6,6,0,5,4,7,6,7,0,5};
test = au.removeZero(test);
String result = au.join(test, ",");
Assert.assertEquals(result, "1,3,4,5,6,6,5,4,7,6,7,5");
}

@Test
public void testMerge() {
int[] arr1 = {3, 5, 7,8};
int[] arr2 = {4, 5, 6,7};
int[] test = au.merge(arr1, arr2);
String result = au.join(test, ",");
System.out.println(result);
Assert.assertEquals(result, "3,4,5,6,7,8");
}

@Test
public void testGrow() {
int[] test = {3,5,6};
test = au.grow(test, 2);
String result = au.join(test, ",");
System.out.println(result);
System.out.println(test.length);
Assert.assertTrue(5 == test.length);
}

@Test
public void testFibonacci() {
int[] test = au.fibonacci(250);
String result = au.join(test, ",");
System.out.println(result);
Assert.assertEquals(result, "1,1,2,3,5,8,13,21,34,55,89,144,233,377");
}

@Test
public void testGetPrimes() {
//2,3,5,7,11,13,17,19
int[] test = au.getPrimes(23);
String result = au.join(test, ",");
System.out.println(result);
Assert.assertEquals(result, "2,3,5,7,11,13,17,19");
}

@Test
public void testGetPerfectNumbers() {
int[] test = au.getPerfectNumbers(10000);
String result = au.join(test, ",");
System.out.println(result);
Assert.assertEquals(result, "6,28,496,8128");
}


@Test
public void testGetAllFactors(){
int[] test = au.getAllFactors(98);
String result = au.join(test, ",");
System.out.println(result);
Assert.fail();
}

@Test
public void testGetPrimeFactors(){
int[] test = au.getPrimeFactors(98);
String result = au.join(test, ",");
System.out.println(result);
Assert.fail();
}

@Test
public void testJoin() {
int[] test = {1,2,3};
String result = au.join(test, ",");

Assert.assertEquals(result, "1,2,3");
}

}
20 changes: 20 additions & 0 deletions group19/972815123/src/com/coderising/array/Main.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.coderising.array;

public class Main {

public static void main(String[] args) {
ArrayUtil au = new ArrayUtil();
// int[] test = {1,2};
// au.reverseArray(test);
// String result = au.join(test, "-");


int[] arr1 = {3, 5, 7,8};
int[] arr2 = {4, 5, 6,7};
int[] test = au.merge(arr1, arr2);
String result = au.join(test, ",");

System.out.println(result);
}

}
2 changes: 1 addition & 1 deletion group19/972815123/src/com/coderising/litestruts/Struts.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public class Struts {

public static View runAction(String actionName, Map<String,String> parameters) {
HashMap<String, HashMap<String, String>> xml = parseStrutsXml(url);
HashMap<String, String> login = xml.get("login");
HashMap<String, String> login = xml.get(actionName);
String loginClassName = login.get("class");
System.out.println(loginClassName);

Expand Down
Loading

0 comments on commit 00beaa6

Please sign in to comment.