vitalif
/
langs-performance
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
parent 619fae261d 3039b31506
commit fea51cf287
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
primes.go
View File

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

67
primes.py
View File

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