diff options
author | gabrieldemarmiesse <gabriel.demarmiesse@teraki.com> | 2018-05-26 14:41:16 +0200 |
---|---|---|
committer | gabrieldemarmiesse <gabriel.demarmiesse@teraki.com> | 2018-05-27 14:14:29 +0200 |
commit | f35173fba8614b83d26ce11c9a34af5fc3b3bc71 (patch) | |
tree | 7de1a76a7bcd7eed5aed8ccfc00c8bf39d2e6c4d /docs/examples/tutorial | |
parent | 45df48301b0ab5dd35e9d68581b57f15b69dd74f (diff) | |
download | cython-f35173fba8614b83d26ce11c9a34af5fc3b3bc71.tar.gz |
Now all the files in the example directory are tested.
Diffstat (limited to 'docs/examples/tutorial')
-rw-r--r-- | docs/examples/tutorial/cython_tutorial/fib.pyx (renamed from docs/examples/tutorial/fib1/fib.pyx) | 0 | ||||
-rw-r--r-- | docs/examples/tutorial/cython_tutorial/primes.py (renamed from docs/examples/tutorial/primes/primes.py) | 0 | ||||
-rw-r--r-- | docs/examples/tutorial/cython_tutorial/primes.pyx (renamed from docs/examples/tutorial/primes/primes.pyx) | 0 | ||||
-rw-r--r-- | docs/examples/tutorial/cython_tutorial/primes_cpp.pyx (renamed from docs/examples/tutorial/primes/primes_cpp.pyx) | 2 | ||||
-rw-r--r-- | docs/examples/tutorial/cython_tutorial/setup.py (renamed from docs/examples/tutorial/fib1/setup.py) | 0 | ||||
-rw-r--r-- | docs/examples/tutorial/great_circle/c1.pyx | 12 | ||||
-rw-r--r-- | docs/examples/tutorial/great_circle/c2.pyx | 13 | ||||
-rw-r--r-- | docs/examples/tutorial/great_circle/p1.py | 12 | ||||
-rw-r--r-- | docs/examples/tutorial/primes/setup.py | 6 |
9 files changed, 1 insertions, 44 deletions
diff --git a/docs/examples/tutorial/fib1/fib.pyx b/docs/examples/tutorial/cython_tutorial/fib.pyx index 473719cb3..473719cb3 100644 --- a/docs/examples/tutorial/fib1/fib.pyx +++ b/docs/examples/tutorial/cython_tutorial/fib.pyx diff --git a/docs/examples/tutorial/primes/primes.py b/docs/examples/tutorial/cython_tutorial/primes.py index 5e0d32e69..5e0d32e69 100644 --- a/docs/examples/tutorial/primes/primes.py +++ b/docs/examples/tutorial/cython_tutorial/primes.py diff --git a/docs/examples/tutorial/primes/primes.pyx b/docs/examples/tutorial/cython_tutorial/primes.pyx index 96ecdb59a..96ecdb59a 100644 --- a/docs/examples/tutorial/primes/primes.pyx +++ b/docs/examples/tutorial/cython_tutorial/primes.pyx diff --git a/docs/examples/tutorial/primes/primes_cpp.pyx b/docs/examples/tutorial/cython_tutorial/primes_cpp.pyx index 4b6f4e4af..57bfe9cc2 100644 --- a/docs/examples/tutorial/primes/primes_cpp.pyx +++ b/docs/examples/tutorial/cython_tutorial/primes_cpp.pyx @@ -2,7 +2,7 @@ from libcpp.vector cimport vector
-def primes(int nb_primes):
+def primes(unsigned int nb_primes):
cdef int n, i
cdef vector[int] p
p.reserve(nb_primes) # allocate memory for 'nb_primes' elements.
diff --git a/docs/examples/tutorial/fib1/setup.py b/docs/examples/tutorial/cython_tutorial/setup.py index 302a08e5f..302a08e5f 100644 --- a/docs/examples/tutorial/fib1/setup.py +++ b/docs/examples/tutorial/cython_tutorial/setup.py diff --git a/docs/examples/tutorial/great_circle/c1.pyx b/docs/examples/tutorial/great_circle/c1.pyx deleted file mode 100644 index c0694a235..000000000 --- a/docs/examples/tutorial/great_circle/c1.pyx +++ /dev/null @@ -1,12 +0,0 @@ -import math - -def great_circle(lon1, lat1, lon2, lat2): - radius = 3956 # miles - x = math.pi/180.0 - - a = (90.0 - lat1)*x - b = (90.0 - lat2)*x - theta = (lon2 - lon1)*x - c = math.acos(math.cos(a)*math.cos(b) + math.sin(a)*math.sin(b)*math.cos(theta)) - - return radius*c diff --git a/docs/examples/tutorial/great_circle/c2.pyx b/docs/examples/tutorial/great_circle/c2.pyx deleted file mode 100644 index eb4915caf..000000000 --- a/docs/examples/tutorial/great_circle/c2.pyx +++ /dev/null @@ -1,13 +0,0 @@ -import math - -def great_circle(double lon1, double lat1, double lon2, double lat2): - cdef double radius = 3956 # miles - cdef double x = math.pi/180.0 - cdef double a, b, theta, c - - a = (90.0 - lat1)*x - b = (90.0 - lat2)*x - theta = (lon2 - lon1)*x - c = math.acos(math.cos(a)*math.cos(b) + math.sin(a)*math.sin(b)*math.cos(theta)) - - return radius*c diff --git a/docs/examples/tutorial/great_circle/p1.py b/docs/examples/tutorial/great_circle/p1.py deleted file mode 100644 index c0694a235..000000000 --- a/docs/examples/tutorial/great_circle/p1.py +++ /dev/null @@ -1,12 +0,0 @@ -import math - -def great_circle(lon1, lat1, lon2, lat2): - radius = 3956 # miles - x = math.pi/180.0 - - a = (90.0 - lat1)*x - b = (90.0 - lat2)*x - theta = (lon2 - lon1)*x - c = math.acos(math.cos(a)*math.cos(b) + math.sin(a)*math.sin(b)*math.cos(theta)) - - return radius*c diff --git a/docs/examples/tutorial/primes/setup.py b/docs/examples/tutorial/primes/setup.py deleted file mode 100644 index ae9994be6..000000000 --- a/docs/examples/tutorial/primes/setup.py +++ /dev/null @@ -1,6 +0,0 @@ -from distutils.core import setup -from Cython.Build import cythonize - -setup( - ext_modules=cythonize("primes.pyx"), -) |