Merge pull request #67 from GiacomoPope/refactor-functions

Refactor functions into submodule

Author: oscarbenjamin

setup.py

@@ -68,6 +68,7 @@
     'flint.flintlib',
     'flint.flint_base',
     'flint.types',
+    'flint.functions',
     'flint.utils',
     'flint.test',
 ]
@@ -102,6 +103,8 @@
     ("flint.types.dirichlet", ["src/flint/types/dirichlet.pyx"]),
     ("flint.flint_base.flint_base", ["src/flint/flint_base/flint_base.pyx"]),
     ("flint.flint_base.flint_context", ["src/flint/flint_base/flint_context.pyx"]),
+    # Helper for unittests
+    ("flint.functions.showgood", ["src/flint/functions/showgood.pyx"]),
 
 ]
 

src/flint/__init__.py

@@ -21,5 +21,6 @@
 from .types.acb_mat import *
 from .types.acb_series import *
 from .types.fmpz_mpoly import *
+from .functions.showgood import showgood
 
 __version__ = '0.4.4'

src/flint/functions/__init__.py

@@ -1,4 +1,5 @@
-from .utils.conversion cimport dps_to_prec
+from flint.flint_base.flint_context cimport thectx
+from flint.utils.conversion cimport dps_to_prec
 from flint.types.arb_mat cimport arb_mat
 from flint.types.acb_mat cimport acb_mat
 from flint.types.arb_poly cimport arb_poly
@@ -10,6 +11,7 @@ from flint.types.acb_series cimport acb_series
 from flint.flintlib.arb cimport *
 from flint.flintlib.acb cimport *
 
+ctx = thectx
 
 # xxx: this doesn't work when changed to a cdef function. why?
 def __goodness(x, bint parts=True, metric=None):

src/flint/functions.pyx src/flint/functions/showgood.pyx

@@ -12,5 +12,3 @@ cdef flint_rand_t global_random_state
 flint_randinit(global_random_state)
 
 ctx = thectx
-
-include "functions.pyx"