|
|
@@ -25,8 +25,14 @@ class Main { |
|
|
|
t.start(); |
|
|
|
long n = maxNum * maxNum; |
|
|
|
for (long j = n; j >= n - 100; --j) { |
|
|
|
|
|
|
|
Timer t2 = new Timer().start(); |
|
|
|
long[] factors = s.factor(sieve, j); |
|
|
|
System.out.println( |
|
|
|
t2.end().prettyTime()+": "+ |
|
|
|
Util.factors(j, factors)); |
|
|
|
|
|
|
|
/* |
|
|
|
if (j > (n - 5) || j < (n - 95)) { |
|
|
|
if (j == n - 96) |
|
|
|
System.out.println("............."); |
|
|
@@ -34,6 +40,7 @@ class Main { |
|
|
|
System.out.println( |
|
|
|
Util.factors(j, factors)); |
|
|
|
} |
|
|
|
*/ |
|
|
|
} |
|
|
|
t.end(); |
|
|
|
} |
|
|
@@ -50,7 +57,8 @@ class Main { |
|
|
|
Sequential sseq = new Sequential(); |
|
|
|
Parallel spar = new Parallel(); |
|
|
|
|
|
|
|
boolean findPrimes = true; |
|
|
|
//boolean findPrimes = true; |
|
|
|
boolean findPrimes = false; |
|
|
|
boolean factor = true; |
|
|
|
|
|
|
|
int maxNum = Integer.parseInt(args[0]); |
|
|
@@ -73,11 +81,17 @@ class Main { |
|
|
|
|
|
|
|
System.out.println("\nFactoring sequentially..."); |
|
|
|
Timer seq = testFactor(sseq, maxNum, sieve); |
|
|
|
System.out.println("Sequential: "+seq.prettyTime()); |
|
|
|
Timer seqAvg = new Timer(seq.time / 100); |
|
|
|
System.out.println( |
|
|
|
"Sequential: "+seq.prettyTime()+ |
|
|
|
" ("+seqAvg.prettyTime()+" per factor)"); |
|
|
|
|
|
|
|
System.out.println("\nFactoring in parallel..."); |
|
|
|
Timer par = testFactor(spar, maxNum, sieve); |
|
|
|
System.out.println("Parallel: "+par.prettySpeedup(seq)); |
|
|
|
Timer parAvg = new Timer(par.time / 100); |
|
|
|
System.out.println( |
|
|
|
"Parallel: "+par.prettySpeedup(seq)+ |
|
|
|
" ("+parAvg.prettyTime()+" per factor)"); |
|
|
|
} |
|
|
|
|
|
|
|
spar.stopThreads(); |