Update to uniform code version

Author: gjbex

source-code/cython/Primes/primes_cython.pyx

@@ -1,18 +1,15 @@
-def primes(int kmax):
-    cdef int n, k, i
-    cdef int p[1000]
-    result = []
-    if kmax > 1000:
-        kmax = 1000
-    k = 0
-    n = 2
-    while k < kmax:
-        i = 0
-        while i < k and n % p[i] != 0:
-            i = i + 1
-        if i == k:
-            p[k] = n
-            k = k + 1
-            result.append(n)
-        n = n + 1
-    return result
+def primes(int nr_primes):
+    cdef int primes[1000]
+    if nr_primes > 1000:
+        nr_primes = 1000
+    cdef int n = 2
+    cdef int nr_found = 0
+    while nr_found < nr_primes:
+        for prime in primes[:nr_found]:
+            if n % prime == 0:
+                break
+        else:
+            primes[nr_found] = n
+            nr_found += 1
+        n += 1
+    return [prime for prime in primes[:nr_found]]

source-code/cython/Primes/primes_malloc.pyx

@@ -1,22 +1,21 @@
 from libc.stdlib cimport malloc, free
 
 
-def primes(int kmax):
-    cdef int n, k, i
-    cdef int *p = <int *> malloc(kmax*sizeof(int))
-    result = []
-    if kmax > 1000:
-        kmax = 1000
-    k = 0
-    n = 2
-    while k < kmax:
-        i = 0
-        while i < k and n % p[i] != 0:
-            i = i + 1
-        if i == k:
-            p[k] = n
-            k = k + 1
-            result.append(n)
-        n = n + 1
-    free(p)
+def primes(int nr_primes):
+    cdef int nr_bytes = nr_primes*sizeof(int)
+    cdef int *primes = <int *> malloc(nr_bytes)
+    if nr_primes > 1000:
+        nr_primes = 1000
+    cdef int n = 2
+    cdef int nr_found = 0
+    while nr_found < nr_primes:
+        for prime in primes[:nr_found]:
+            if n % prime == 0:
+                break
+        else:
+            primes[nr_found] = n
+            nr_found += 1
+        n += 1
+    result = [prime for prime in primes[:nr_found]]
+    free(primes)
     return result

source-code/cython/Primes/primes_pure_malloc.py

@@ -1,26 +1,22 @@
 import cython
 from cython.cimports.libc.stdlib import malloc, free
 
-def primes(nb_primes: cython.int):
-    i: cython.int
-    p: cython.p_int = cython.cast(cython.p_int, malloc(nb_primes*cython.sizeof(cython.int)))
-
-
-    len_p: cython.int = 0  # The current number of elements in p.
+def primes(nr_primes: cython.int):
+    nr_bytes: cython.int = nr_primes*cython.sizeof(cython.int)
+    primes: cython.p_int = cython.cast(
+                cython.p_int,
+                malloc(nr_bytes)
+            )
     n: cython.int = 2
-    while len_p < nb_primes:
-        # Is n prime?
-        for i in p[:len_p]:
-            if n % i == 0:
+    nr_found: cython.int = 0
+    while nr_found < nr_primes:
+        for prime in primes[:nr_found]:
+            if n % prime == 0:
                 break
-
-        # If no break occurred in the loop, we have a prime.
         else:
-            p[len_p] = n
-            len_p += 1
+            primes[nr_found] = n
+            nr_found += 1
         n += 1
-
-    # Let's copy the result into a Python list:
-    result_as_list = [prime for prime in p[:len_p]]
-    free(p)
-    return result_as_list
+    result = [prime for prime in primes[:nr_found]]
+    free(primes)
+    return result

source-code/cython/Primes/primes_pure_python.py

@@ -1,29 +1,21 @@
 import cython
+import sys
 
-def primes(nb_primes: cython.int):
-    i: cython.int
-    p: cython.int[1000]
-
-    if nb_primes > 1000:
-        nb_primes = 1000
-
-    if not cython.compiled:  # Only if regular Python is running
-        p = [0] * 1000       # Make p work almost like a C array
-
-    len_p: cython.int = 0  # The current number of elements in p.
+def primes(nr_primes: cython.int):
+    primes: cython.int[1000]
+    if nr_primes > 1000:
+        nr_primes = 1000
+    if not cython.compiled:
+        primes = [0] * 1000
+        print('fall back on Python', file=sys.stderr)
     n: cython.int = 2
-    while len_p < nb_primes:
-        # Is n prime?
-        for i in p[:len_p]:
-            if n % i == 0:
+    nr_found: cython.int = 0
+    while nr_found < nr_primes:
+        for prime in primes[:nr_found]:
+            if n % prime == 0:
                 break
-
-        # If no break occurred in the loop, we have a prime.
         else:
-            p[len_p] = n
-            len_p += 1
+            primes[nr_found] = n
+            nr_found += 1
         n += 1
-
-    # Let's copy the result into a Python list:
-    result_as_list = [prime for prime in p[:len_p]]
-    return result_as_list
+    return [prime for prime in primes[:nr_found]]

source-code/cython/Primes/primes_vanilla.py

@@ -1,17 +1,15 @@
-def primes(kmax):
-    p = [0]*1000
-    result = []
-    if kmax > 1000:
-        kmax = 1000
-    k = 0
+def primes(nr_primes):
+    primes = [0]*1000
+    if nr_primes > 1000:
+        nr_primes = 1000
     n = 2
-    while k < kmax:
-        i = 0
-        while i < k and n % p[i] != 0:
-            i = i + 1
-        if i == k:
-            p[k] = n
-            k = k + 1
-            result.append(n)
-        n = n + 1
-    return result
+    nr_found = 0
+    while nr_found < nr_primes:
+        for prime in primes[:nr_found]:
+            if n % prime == 0:
+                break
+        else:
+            primes[nr_found] = n
+            nr_found += 1
+        n += 1
+    return primes[:nr_found]