Merge pull request #6 from boromil/master

Clean up the Python code. Make Go a bit nicer using the built-in time.Since() and time.ParseDuration().
master
Ivan Zahariev 2016-10-12 20:16:08 +03:00 committed by GitHub
commit fea51cf287
2 changed files with 39 additions and 37 deletions

View File

@ -3,9 +3,8 @@ package main
import (
"fmt"
"math"
"time"
"os"
"strconv"
"time"
)
func getPrimes7(n int) []int {
@ -50,12 +49,12 @@ func getPrimes7(n int) []int {
}
func main() {
var startTime = int32(time.Now().Unix())
var periodTime, _ = strconv.ParseInt(os.Getenv("RUN_TIME"), 10, 32)
var startTime = time.Now()
var periodTime, _ = time.ParseDuration(os.Getenv("RUN_TIME") + "s")
var res []int
for (int32(time.Now().Unix()) - startTime) < int32(periodTime) {
for time.Since(startTime) < periodTime {
res = getPrimes7(10000000)
fmt.Printf("Found %d prime numbers.\n", len(res))
}

View File

@ -1,38 +1,41 @@
import os
import sys
import time
import os
def get_primes7(n):
"""
standard optimized sieve algorithm to get a list of prime numbers
--- this is the function to compare your functions against! ---
"""
if n < 2: return []
if n == 2: return [2]
# do only odd numbers starting at 3
if sys.version_info.major <= 2:
s = range(3, n+1, 2)
else: # Python 3
s = list(range(3, n+1, 2))
# n**0.5 simpler than math.sqr(n)
mroot = n ** 0.5
half = len(s)
i = 0
m = 3
while m <= mroot:
if s[i]:
j = (m*m-3)//2 # int div
s[j] = 0
while j < half:
s[j] = 0
j += m
i = i+1
m = 2*i+3
return [2]+[x for x in s if x]
"""
standard optimized sieve algorithm to get a list of prime numbers
--- this is the function to compare your functions against! ---
"""
if n < 2:
return []
if n == 2:
return [2]
# do only odd numbers starting at 3
if sys.version_info.major <= 2:
s = range(3, n + 1, 2)
else: # Python 3
s = list(range(3, n + 1, 2))
# n**0.5 simpler than math.sqr(n)
mroot = n ** 0.5
half = len(s)
i = 0
m = 3
while m <= mroot:
if s[i]:
j = (m * m - 3) // 2 # int div
s[j] = 0
while j < half:
s[j] = 0
j += m
i = i + 1
m = 2 * i + 3
return [2] + [x for x in s if x]
startTime = int(time.time())
periodTime = int(os.environ['RUN_TIME'])
start_time = int(time.time())
period_time = int(os.environ['RUN_TIME'])
while (int(time.time()) - startTime) < periodTime:
res = get_primes7(10000000)
print("Found {} prime numbers.".format(len(res)))
while (int(time.time()) - start_time) < period_time:
res = get_primes7(10000000)
print("Found {} prime numbers.".format(len(res)))