diff --git a/pyproject.toml b/pyproject.toml index 7187d0b..dd01f91 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,3 +1,3 @@ [build-system] -requires = ["setuptools >= 42", "wheel", "Cython", "numpy"] +requires = ["setuptools >= 42", "wheel", "numpy"] build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 4ba0f95..58a049a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,40 @@ alabaster==0.7.12 Babel==2.9.1 +bleach==4.1.0 +build==0.7.0 certifi==2021.5.30 +cffi==1.14.6 charset-normalizer==2.0.6 +colorama==0.4.4 +cryptography==3.4.8 cycler==0.10.0 +Cython==0.29.24 docutils==0.17.1 idna==3.2 imagesize==1.2.0 +importlib-metadata==4.8.1 +jeepney==0.7.1 Jinja2==3.0.1 +keyring==23.2.1 kiwisolver==1.3.2 MarkupSafe==2.0.1 matplotlib==3.4.3 numpy==1.21.2 packaging==21.0 +pep517==0.11.0 Pillow==8.3.2 +pkginfo==1.7.1 +pycparser==2.20 Pygments==2.10.0 pyparsing==2.4.7 python-dateutil==2.8.2 pytz==2021.1 +readme-renderer==29.0 requests==2.26.0 +requests-toolbelt==0.9.1 +rfc3986==1.5.0 scipy==1.7.1 +SecretStorage==3.3.1 six==1.16.0 snowballstemmer==2.1.0 Sphinx==4.2.0 @@ -29,5 +45,9 @@ sphinxcontrib-htmlhelp==2.0.0 sphinxcontrib-jsmath==1.0.1 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 --e git+git@github.com:ksjdragon/packsim.git@e2f25182310c1f9a950df55c0219165366466e9b#egg=squish +tomli==1.2.1 +tqdm==4.62.3 +twine==3.4.2 urllib3==1.26.6 +webencodings==0.5.1 +zipp==3.5.0 diff --git a/setup.cfg b/setup.cfg index 188d84e..d7c43a5 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,10 +1,10 @@ [metadata] -name = squish-ksjdragon +name = squish version = 0.1 author = Kenneth Jao author_email = ksjdragon@gmail.com description = squish is Python program which perform simulations for the flow of 'soft' or 'compressible' objects under some energy in a periodic domain. -long_description = file: README.md +long_description = file: README.rst long_description_content_type = text/markdown url = https://github.com/ksjdragon/squish project_urls = @@ -18,19 +18,13 @@ classifiers = [options] zip_safe = False -package_dir = - = src -pacakges = find: +packages = squish python_requires = >= 3.8 install_requires = numpy == 1.21.2 scipy == 1.7.1 matplotlib == 3.4.3 -[options.packages.find] - where = src - - [options.entry_points] console_scripts = squish = squish.squish:pre \ No newline at end of file diff --git a/setup.py b/setup.py index a4d2507..13e045f 100644 --- a/setup.py +++ b/setup.py @@ -1,20 +1,31 @@ from setuptools import Extension, setup -from Cython.Build import cythonize import numpy -ext_modules = [ - Extension( - "_squish", - ["src/_squish/_squish.pyx"], - extra_compile_args=['-fopenmp'], - extra_link_args=['-fopenmp'] - ) +try: + from Cython.Build import cythonize + USE_CYTHON = True +except ImportError: + USE_CYTHON = False + +if USE_CYTHON: + ext_modules = cythonize([ + Extension( + "_squish", + ["squish/_squish/_squish.pyx"], + extra_compile_args=['-fopenmp'], + extra_link_args=['-fopenmp'] + ) + ], + compiler_directives={ + 'language_level': 3, 'boundscheck' : False, 'wraparound': False, 'cdivision' : True + }) +else: + ext_modules = [ + Extension('squish._squish', ["squish/_squish/_squish.c"]) ] +#annotate='fullc' setup( - name="squish", - ext_modules = cythonize(ext_modules, compiler_directives={ - 'language_level': 3, 'boundscheck' : False, 'wraparound': False, 'cdivision' : True - }), - include_dirs = [numpy.get_include()] + ext_modules = ext_modules, + include_dirs = [numpy.get_include()] ) \ No newline at end of file diff --git a/src/squish/__init__.py b/squish/__init__.py similarity index 100% rename from src/squish/__init__.py rename to squish/__init__.py diff --git a/src/_squish/_squish.c b/squish/_squish/_squish.c similarity index 95% rename from src/_squish/_squish.c rename to squish/_squish/_squish.c index 224875a..ddeb5d5 100644 --- a/src/_squish/_squish.c +++ b/squish/_squish/_squish.c @@ -12,7 +12,7 @@ ], "name": "_squish", "sources": [ - "src/_squish/_squish.pyx" + "squish/_squish/_squish.pyx" ] }, "module_name": "_squish" @@ -878,17 +878,17 @@ static const char *__pyx_filename; static const char *__pyx_f[] = { - "src/_squish/core.pyx", - "src/_squish/voronoi_dcel.pyx", + "squish/_squish/core.pyx", + "squish/_squish/voronoi_dcel.pyx", "stringsource", - "src/_squish/energy.pyx", - "src/_squish/_squish.pxd", - "__init__.pxd", - "array.pxd", - "src/_squish/_squish.pyx", - "type.pxd", - "bool.pxd", - "complex.pxd", + "squish/_squish/energy.pyx", + "squish/_squish/_squish.pxd", + ".venv/lib/python3.8/site-packages/numpy/__init__.pxd", + ".venv/lib/python3.8/site-packages/Cython/Includes/cpython/array.pxd", + "squish/_squish/_squish.pyx", + ".venv/lib/python3.8/site-packages/Cython/Includes/cpython/type.pxd", + ".venv/lib/python3.8/site-packages/Cython/Includes/cpython/bool.pxd", + ".venv/lib/python3.8/site-packages/Cython/Includes/cpython/complex.pxd", }; /* ForceInitThreads.proto */ #ifndef __PYX_FORCE_INIT_THREADS @@ -999,7 +999,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int; #endif -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":690 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":690 * # in Cython to enable them only on the right systems. * * ctypedef npy_int8 int8_t # <<<<<<<<<<<<<< @@ -1008,7 +1008,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int; */ typedef npy_int8 __pyx_t_5numpy_int8_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":691 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":691 * * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t # <<<<<<<<<<<<<< @@ -1017,7 +1017,7 @@ typedef npy_int8 __pyx_t_5numpy_int8_t; */ typedef npy_int16 __pyx_t_5numpy_int16_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":692 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":692 * ctypedef npy_int8 int8_t * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t # <<<<<<<<<<<<<< @@ -1026,7 +1026,7 @@ typedef npy_int16 __pyx_t_5numpy_int16_t; */ typedef npy_int32 __pyx_t_5numpy_int32_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":693 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":693 * ctypedef npy_int16 int16_t * ctypedef npy_int32 int32_t * ctypedef npy_int64 int64_t # <<<<<<<<<<<<<< @@ -1035,7 +1035,7 @@ typedef npy_int32 __pyx_t_5numpy_int32_t; */ typedef npy_int64 __pyx_t_5numpy_int64_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":697 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":697 * #ctypedef npy_int128 int128_t * * ctypedef npy_uint8 uint8_t # <<<<<<<<<<<<<< @@ -1044,7 +1044,7 @@ typedef npy_int64 __pyx_t_5numpy_int64_t; */ typedef npy_uint8 __pyx_t_5numpy_uint8_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":698 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":698 * * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t # <<<<<<<<<<<<<< @@ -1053,7 +1053,7 @@ typedef npy_uint8 __pyx_t_5numpy_uint8_t; */ typedef npy_uint16 __pyx_t_5numpy_uint16_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":699 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":699 * ctypedef npy_uint8 uint8_t * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t # <<<<<<<<<<<<<< @@ -1062,7 +1062,7 @@ typedef npy_uint16 __pyx_t_5numpy_uint16_t; */ typedef npy_uint32 __pyx_t_5numpy_uint32_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":700 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":700 * ctypedef npy_uint16 uint16_t * ctypedef npy_uint32 uint32_t * ctypedef npy_uint64 uint64_t # <<<<<<<<<<<<<< @@ -1071,7 +1071,7 @@ typedef npy_uint32 __pyx_t_5numpy_uint32_t; */ typedef npy_uint64 __pyx_t_5numpy_uint64_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":704 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":704 * #ctypedef npy_uint128 uint128_t * * ctypedef npy_float32 float32_t # <<<<<<<<<<<<<< @@ -1080,7 +1080,7 @@ typedef npy_uint64 __pyx_t_5numpy_uint64_t; */ typedef npy_float32 __pyx_t_5numpy_float32_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":705 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":705 * * ctypedef npy_float32 float32_t * ctypedef npy_float64 float64_t # <<<<<<<<<<<<<< @@ -1089,7 +1089,7 @@ typedef npy_float32 __pyx_t_5numpy_float32_t; */ typedef npy_float64 __pyx_t_5numpy_float64_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":714 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":714 * # The int types are mapped a bit surprising -- * # numpy.int corresponds to 'l' and numpy.long to 'q' * ctypedef npy_long int_t # <<<<<<<<<<<<<< @@ -1098,7 +1098,7 @@ typedef npy_float64 __pyx_t_5numpy_float64_t; */ typedef npy_long __pyx_t_5numpy_int_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":715 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":715 * # numpy.int corresponds to 'l' and numpy.long to 'q' * ctypedef npy_long int_t * ctypedef npy_longlong long_t # <<<<<<<<<<<<<< @@ -1107,7 +1107,7 @@ typedef npy_long __pyx_t_5numpy_int_t; */ typedef npy_longlong __pyx_t_5numpy_long_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":716 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":716 * ctypedef npy_long int_t * ctypedef npy_longlong long_t * ctypedef npy_longlong longlong_t # <<<<<<<<<<<<<< @@ -1116,7 +1116,7 @@ typedef npy_longlong __pyx_t_5numpy_long_t; */ typedef npy_longlong __pyx_t_5numpy_longlong_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":718 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":718 * ctypedef npy_longlong longlong_t * * ctypedef npy_ulong uint_t # <<<<<<<<<<<<<< @@ -1125,7 +1125,7 @@ typedef npy_longlong __pyx_t_5numpy_longlong_t; */ typedef npy_ulong __pyx_t_5numpy_uint_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":719 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":719 * * ctypedef npy_ulong uint_t * ctypedef npy_ulonglong ulong_t # <<<<<<<<<<<<<< @@ -1134,7 +1134,7 @@ typedef npy_ulong __pyx_t_5numpy_uint_t; */ typedef npy_ulonglong __pyx_t_5numpy_ulong_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":720 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":720 * ctypedef npy_ulong uint_t * ctypedef npy_ulonglong ulong_t * ctypedef npy_ulonglong ulonglong_t # <<<<<<<<<<<<<< @@ -1143,7 +1143,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulong_t; */ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":722 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":722 * ctypedef npy_ulonglong ulonglong_t * * ctypedef npy_intp intp_t # <<<<<<<<<<<<<< @@ -1152,7 +1152,7 @@ typedef npy_ulonglong __pyx_t_5numpy_ulonglong_t; */ typedef npy_intp __pyx_t_5numpy_intp_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":723 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":723 * * ctypedef npy_intp intp_t * ctypedef npy_uintp uintp_t # <<<<<<<<<<<<<< @@ -1161,7 +1161,7 @@ typedef npy_intp __pyx_t_5numpy_intp_t; */ typedef npy_uintp __pyx_t_5numpy_uintp_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":725 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":725 * ctypedef npy_uintp uintp_t * * ctypedef npy_double float_t # <<<<<<<<<<<<<< @@ -1170,7 +1170,7 @@ typedef npy_uintp __pyx_t_5numpy_uintp_t; */ typedef npy_double __pyx_t_5numpy_float_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":726 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":726 * * ctypedef npy_double float_t * ctypedef npy_double double_t # <<<<<<<<<<<<<< @@ -1179,7 +1179,7 @@ typedef npy_double __pyx_t_5numpy_float_t; */ typedef npy_double __pyx_t_5numpy_double_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":727 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":727 * ctypedef npy_double float_t * ctypedef npy_double double_t * ctypedef npy_longdouble longdouble_t # <<<<<<<<<<<<<< @@ -1245,7 +1245,7 @@ struct __pyx_MemviewEnum_obj; struct __pyx_memoryview_obj; struct __pyx_memoryviewslice_obj; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":729 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":729 * ctypedef npy_longdouble longdouble_t * * ctypedef npy_cfloat cfloat_t # <<<<<<<<<<<<<< @@ -1254,7 +1254,7 @@ struct __pyx_memoryviewslice_obj; */ typedef npy_cfloat __pyx_t_5numpy_cfloat_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":730 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":730 * * ctypedef npy_cfloat cfloat_t * ctypedef npy_cdouble cdouble_t # <<<<<<<<<<<<<< @@ -1263,7 +1263,7 @@ typedef npy_cfloat __pyx_t_5numpy_cfloat_t; */ typedef npy_cdouble __pyx_t_5numpy_cdouble_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":731 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":731 * ctypedef npy_cfloat cfloat_t * ctypedef npy_cdouble cdouble_t * ctypedef npy_clongdouble clongdouble_t # <<<<<<<<<<<<<< @@ -1272,7 +1272,7 @@ typedef npy_cdouble __pyx_t_5numpy_cdouble_t; */ typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t; -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":733 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":733 * ctypedef npy_clongdouble clongdouble_t * * ctypedef npy_cdouble complex_t # <<<<<<<<<<<<<< @@ -1840,7 +1840,7 @@ struct __pyx_memoryviewslice_obj { -/* "src/_squish/voronoi_dcel.pyx":388 +/* "squish/_squish/voronoi_dcel.pyx":388 * * * cdef class VoronoiContainer: # <<<<<<<<<<<<<< @@ -1863,7 +1863,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai static CYTHON_INLINE int __pyx_f_7_squish_16VoronoiContainer_sign(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice); -/* "src/_squish/energy.pyx":1 +/* "squish/_squish/energy.pyx":1 * cdef class AreaEnergy(VoronoiContainer): # <<<<<<<<<<<<<< * """ * Class for formulas relevant to the Area energy. @@ -1875,7 +1875,7 @@ struct __pyx_vtabstruct_7_squish_AreaEnergy { static struct __pyx_vtabstruct_7_squish_AreaEnergy *__pyx_vtabptr_7_squish_AreaEnergy; -/* "src/_squish/energy.pyx":95 +/* "squish/_squish/energy.pyx":95 * * * cdef class RadialALEnergy(VoronoiContainer): # <<<<<<<<<<<<<< @@ -1889,7 +1889,7 @@ struct __pyx_vtabstruct_7_squish_RadialALEnergy { static struct __pyx_vtabstruct_7_squish_RadialALEnergy *__pyx_vtabptr_7_squish_RadialALEnergy; -/* "src/_squish/energy.pyx":131 +/* "squish/_squish/energy.pyx":131 * * * cdef class RadialTEnergy(VoronoiContainer): # <<<<<<<<<<<<<< @@ -1903,7 +1903,7 @@ struct __pyx_vtabstruct_7_squish_RadialTEnergy { static struct __pyx_vtabstruct_7_squish_RadialTEnergy *__pyx_vtabptr_7_squish_RadialTEnergy; -/* "src/_squish/energy.pyx":263 +/* "squish/_squish/energy.pyx":263 * * * cdef class Calc: # <<<<<<<<<<<<<< @@ -3728,7 +3728,7 @@ static PyObject *__pyx_codeobj__32; static PyObject *__pyx_codeobj__39; /* Late includes */ -/* "src/_squish/core.pyx":61 +/* "squish/_squish/core.pyx":61 * #### IArray Methods #### * * cdef inline IArray init_iarray(INT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -3742,7 +3742,7 @@ static CYTHON_INLINE struct __pyx_t_7_squish_IArray __pyx_f_7_squish_init_iarray __pyx_t_7_squish_INT_T *__pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/core.pyx":63 + /* "squish/_squish/core.pyx":63 * cdef inline IArray init_iarray(INT_T* arr, (INT_T, INT_T) shape) nogil: * cdef IArray iarray * iarray.arr, iarray.shape = arr, shape # <<<<<<<<<<<<<< @@ -3754,7 +3754,7 @@ static CYTHON_INLINE struct __pyx_t_7_squish_IArray __pyx_f_7_squish_init_iarray __pyx_v_iarray.arr = __pyx_t_1; __pyx_v_iarray.shape = __pyx_t_2; - /* "src/_squish/core.pyx":65 + /* "squish/_squish/core.pyx":65 * iarray.arr, iarray.shape = arr, shape * * iarray.get = iarray_get # <<<<<<<<<<<<<< @@ -3763,7 +3763,7 @@ static CYTHON_INLINE struct __pyx_t_7_squish_IArray __pyx_f_7_squish_init_iarray */ __pyx_v_iarray.get = __pyx_f_7_squish_iarray_get; - /* "src/_squish/core.pyx":66 + /* "squish/_squish/core.pyx":66 * * iarray.get = iarray_get * iarray.set = iarray_set # <<<<<<<<<<<<<< @@ -3772,7 +3772,7 @@ static CYTHON_INLINE struct __pyx_t_7_squish_IArray __pyx_f_7_squish_init_iarray */ __pyx_v_iarray.set = __pyx_f_7_squish_iarray_set; - /* "src/_squish/core.pyx":67 + /* "squish/_squish/core.pyx":67 * iarray.get = iarray_get * iarray.set = iarray_set * return iarray # <<<<<<<<<<<<<< @@ -3782,7 +3782,7 @@ static CYTHON_INLINE struct __pyx_t_7_squish_IArray __pyx_f_7_squish_init_iarray __pyx_r = __pyx_v_iarray; goto __pyx_L0; - /* "src/_squish/core.pyx":61 + /* "squish/_squish/core.pyx":61 * #### IArray Methods #### * * cdef inline IArray init_iarray(INT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -3795,7 +3795,7 @@ static CYTHON_INLINE struct __pyx_t_7_squish_IArray __pyx_f_7_squish_init_iarray return __pyx_r; } -/* "src/_squish/core.pyx":69 +/* "squish/_squish/core.pyx":69 * return iarray * * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -3818,7 +3818,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ #endif __Pyx_RefNannySetupContext("iarray_valid_indices", 1); - /* "src/_squish/core.pyx":70 + /* "squish/_squish/core.pyx":70 * * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: # <<<<<<<<<<<<<< @@ -3837,7 +3837,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ __pyx_L7_bool_binop_done:; if (__pyx_t_1) { - /* "src/_squish/core.pyx":71 + /* "squish/_squish/core.pyx":71 * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: * with gil: # <<<<<<<<<<<<<< @@ -3850,7 +3850,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ #endif /*try:*/ { - /* "src/_squish/core.pyx":72 + /* "squish/_squish/core.pyx":72 * if index[0] > self.shape[0] or index[1] > self.shape[1]: * with gil: * raise IndexError(f"Index out of range for IArray with shape {self.shape}") # <<<<<<<<<<<<<< @@ -3873,7 +3873,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ __PYX_ERR(0, 72, __pyx_L10_error) } - /* "src/_squish/core.pyx":71 + /* "squish/_squish/core.pyx":71 * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: * with gil: # <<<<<<<<<<<<<< @@ -3890,7 +3890,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ } } - /* "src/_squish/core.pyx":70 + /* "squish/_squish/core.pyx":70 * * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: # <<<<<<<<<<<<<< @@ -3915,7 +3915,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ __pyx_L5:; } - /* "src/_squish/core.pyx":69 + /* "squish/_squish/core.pyx":69 * return iarray * * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -3938,7 +3938,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ return __pyx_r; } -/* "src/_squish/core.pyx":74 +/* "squish/_squish/core.pyx":74 * raise IndexError(f"Index out of range for IArray with shape {self.shape}") * * cdef inline INT_T iarray_get(IArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -3949,7 +3949,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_iarray_valid_indices(struct __pyx_t_7_ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_iarray_get(struct __pyx_t_7_squish_IArray *__pyx_v_self, __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_v_index) { __pyx_t_7_squish_INT_T __pyx_r; - /* "src/_squish/core.pyx":76 + /* "squish/_squish/core.pyx":76 * cdef inline INT_T iarray_get(IArray* self, (INT_T, INT_T) index) nogil: * #iarray_valid_indices(&self, index) * return self.arr[index[0]*self.shape[1] + index[1]] # <<<<<<<<<<<<<< @@ -3959,7 +3959,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_iarray_get(struct _ __pyx_r = (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]); goto __pyx_L0; - /* "src/_squish/core.pyx":74 + /* "squish/_squish/core.pyx":74 * raise IndexError(f"Index out of range for IArray with shape {self.shape}") * * cdef inline INT_T iarray_get(IArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -3972,7 +3972,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_iarray_get(struct _ return __pyx_r; } -/* "src/_squish/core.pyx":78 +/* "squish/_squish/core.pyx":78 * return self.arr[index[0]*self.shape[1] + index[1]] * * cdef inline void iarray_set(IArray* self, (INT_T, INT_T) index, INT_T val) nogil: # <<<<<<<<<<<<<< @@ -3982,7 +3982,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_iarray_get(struct _ static CYTHON_INLINE void __pyx_f_7_squish_iarray_set(struct __pyx_t_7_squish_IArray *__pyx_v_self, __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_v_index, __pyx_t_7_squish_INT_T __pyx_v_val) { - /* "src/_squish/core.pyx":80 + /* "squish/_squish/core.pyx":80 * cdef inline void iarray_set(IArray* self, (INT_T, INT_T) index, INT_T val) nogil: * #iarray_valid_indices(&self, index) * self.arr[index[0]*self.shape[1] + index[1]] = val # <<<<<<<<<<<<<< @@ -3991,7 +3991,7 @@ static CYTHON_INLINE void __pyx_f_7_squish_iarray_set(struct __pyx_t_7_squish_IA */ (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]) = __pyx_v_val; - /* "src/_squish/core.pyx":78 + /* "squish/_squish/core.pyx":78 * return self.arr[index[0]*self.shape[1] + index[1]] * * cdef inline void iarray_set(IArray* self, (INT_T, INT_T) index, INT_T val) nogil: # <<<<<<<<<<<<<< @@ -4002,7 +4002,7 @@ static CYTHON_INLINE void __pyx_f_7_squish_iarray_set(struct __pyx_t_7_squish_IA /* function exit code */ } -/* "src/_squish/core.pyx":85 +/* "squish/_squish/core.pyx":85 * #### FArray Methods #### * * cdef inline FArray init_farray(FLOAT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -4016,7 +4016,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FArray __pyx_f_7_squish_init_farray(__pyx_ __pyx_t_7_squish_FLOAT_T *__pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/core.pyx":87 + /* "squish/_squish/core.pyx":87 * cdef inline FArray init_farray(FLOAT_T* arr, (INT_T, INT_T) shape) nogil: * cdef FArray farray * farray.arr, farray.shape = arr, shape # <<<<<<<<<<<<<< @@ -4028,7 +4028,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FArray __pyx_f_7_squish_init_farray(__pyx_ __pyx_v_farray.arr = __pyx_t_1; __pyx_v_farray.shape = __pyx_t_2; - /* "src/_squish/core.pyx":89 + /* "squish/_squish/core.pyx":89 * farray.arr, farray.shape = arr, shape * * farray.get = farray_get # <<<<<<<<<<<<<< @@ -4037,7 +4037,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FArray __pyx_f_7_squish_init_farray(__pyx_ */ __pyx_v_farray.get = __pyx_f_7_squish_farray_get; - /* "src/_squish/core.pyx":90 + /* "squish/_squish/core.pyx":90 * * farray.get = farray_get * farray.set = farray_set # <<<<<<<<<<<<<< @@ -4046,7 +4046,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FArray __pyx_f_7_squish_init_farray(__pyx_ */ __pyx_v_farray.set = __pyx_f_7_squish_farray_set; - /* "src/_squish/core.pyx":91 + /* "squish/_squish/core.pyx":91 * farray.get = farray_get * farray.set = farray_set * return farray # <<<<<<<<<<<<<< @@ -4056,7 +4056,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FArray __pyx_f_7_squish_init_farray(__pyx_ __pyx_r = __pyx_v_farray; goto __pyx_L0; - /* "src/_squish/core.pyx":85 + /* "squish/_squish/core.pyx":85 * #### FArray Methods #### * * cdef inline FArray init_farray(FLOAT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -4069,7 +4069,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FArray __pyx_f_7_squish_init_farray(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":93 +/* "squish/_squish/core.pyx":93 * return farray * * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -4092,7 +4092,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ #endif __Pyx_RefNannySetupContext("farray_valid_indices", 1); - /* "src/_squish/core.pyx":94 + /* "squish/_squish/core.pyx":94 * * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: # <<<<<<<<<<<<<< @@ -4111,7 +4111,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ __pyx_L7_bool_binop_done:; if (__pyx_t_1) { - /* "src/_squish/core.pyx":95 + /* "squish/_squish/core.pyx":95 * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: * with gil: # <<<<<<<<<<<<<< @@ -4124,7 +4124,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ #endif /*try:*/ { - /* "src/_squish/core.pyx":96 + /* "squish/_squish/core.pyx":96 * if index[0] > self.shape[0] or index[1] > self.shape[1]: * with gil: * raise IndexError(f"Index out of range for FArray with shape {self.shape}") # <<<<<<<<<<<<<< @@ -4147,7 +4147,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ __PYX_ERR(0, 96, __pyx_L10_error) } - /* "src/_squish/core.pyx":95 + /* "squish/_squish/core.pyx":95 * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: * with gil: # <<<<<<<<<<<<<< @@ -4164,7 +4164,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ } } - /* "src/_squish/core.pyx":94 + /* "squish/_squish/core.pyx":94 * * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: * if index[0] > self.shape[0] or index[1] > self.shape[1]: # <<<<<<<<<<<<<< @@ -4189,7 +4189,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ __pyx_L5:; } - /* "src/_squish/core.pyx":93 + /* "squish/_squish/core.pyx":93 * return farray * * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -4212,7 +4212,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ return __pyx_r; } -/* "src/_squish/core.pyx":98 +/* "squish/_squish/core.pyx":98 * raise IndexError(f"Index out of range for FArray with shape {self.shape}") * * cdef inline FLOAT_T farray_get(FArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -4223,7 +4223,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_farray_valid_indices(__pyx_t_7_squish_ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_farray_get(__pyx_t_7_squish_FArray *__pyx_v_self, __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_v_index) { __pyx_t_7_squish_FLOAT_T __pyx_r; - /* "src/_squish/core.pyx":100 + /* "squish/_squish/core.pyx":100 * cdef inline FLOAT_T farray_get(FArray* self, (INT_T, INT_T) index) nogil: * #iarray_valid_indices(&self, index) * return self.arr[index[0]*self.shape[1] + index[1]] # <<<<<<<<<<<<<< @@ -4233,7 +4233,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_farray_get(__pyx_ __pyx_r = (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]); goto __pyx_L0; - /* "src/_squish/core.pyx":98 + /* "squish/_squish/core.pyx":98 * raise IndexError(f"Index out of range for FArray with shape {self.shape}") * * cdef inline FLOAT_T farray_get(FArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -4246,7 +4246,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_farray_get(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":102 +/* "squish/_squish/core.pyx":102 * return self.arr[index[0]*self.shape[1] + index[1]] * * cdef inline void farray_set(FArray* self, (INT_T, INT_T) index, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -4256,7 +4256,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_farray_get(__pyx_ static CYTHON_INLINE void __pyx_f_7_squish_farray_set(__pyx_t_7_squish_FArray *__pyx_v_self, __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_v_index, __pyx_t_7_squish_FLOAT_T __pyx_v_val) { - /* "src/_squish/core.pyx":104 + /* "squish/_squish/core.pyx":104 * cdef inline void farray_set(FArray* self, (INT_T, INT_T) index, FLOAT_T val) nogil: * #iarray_valid_indices(&self, index) * self.arr[index[0]*self.shape[1] + index[1]] = val # <<<<<<<<<<<<<< @@ -4265,7 +4265,7 @@ static CYTHON_INLINE void __pyx_f_7_squish_farray_set(__pyx_t_7_squish_FArray *_ */ (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]) = __pyx_v_val; - /* "src/_squish/core.pyx":102 + /* "squish/_squish/core.pyx":102 * return self.arr[index[0]*self.shape[1] + index[1]] * * cdef inline void farray_set(FArray* self, (INT_T, INT_T) index, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -4276,7 +4276,7 @@ static CYTHON_INLINE void __pyx_f_7_squish_farray_set(__pyx_t_7_squish_FArray *_ /* function exit code */ } -/* "src/_squish/core.pyx":132 +/* "squish/_squish/core.pyx":132 * #### BitSet Methods #### * * cdef inline BitSet init_bitset(INT_T elements) nogil: # <<<<<<<<<<<<<< @@ -4290,7 +4290,7 @@ static CYTHON_INLINE __pyx_t_7_squish_BitSet __pyx_f_7_squish_init_bitset(__pyx_ int (*__pyx_t_1)(__pyx_t_7_squish_BitSet *, __pyx_t_7_squish_INT_T); void (*__pyx_t_2)(__pyx_t_7_squish_BitSet *); - /* "src/_squish/core.pyx":134 + /* "squish/_squish/core.pyx":134 * cdef inline BitSet init_bitset(INT_T elements) nogil: * cdef BitSet bitset * bitset.bits = calloc(((elements/sizeof(INT_T))+1), sizeof(INT_T)) # <<<<<<<<<<<<<< @@ -4299,7 +4299,7 @@ static CYTHON_INLINE __pyx_t_7_squish_BitSet __pyx_f_7_squish_init_bitset(__pyx_ */ __pyx_v_bitset.bits = ((__pyx_t_7_squish_INT_T *)calloc(((__pyx_v_elements / ((__pyx_t_7_squish_INT_T)(sizeof(__pyx_t_7_squish_INT_T)))) + 1), (sizeof(__pyx_t_7_squish_INT_T)))); - /* "src/_squish/core.pyx":136 + /* "squish/_squish/core.pyx":136 * bitset.bits = calloc(((elements/sizeof(INT_T))+1), sizeof(INT_T)) * * bitset.add, bitset.free = bitset_add, bitset_free # <<<<<<<<<<<<<< @@ -4311,7 +4311,7 @@ static CYTHON_INLINE __pyx_t_7_squish_BitSet __pyx_f_7_squish_init_bitset(__pyx_ __pyx_v_bitset.add = __pyx_t_1; __pyx_v_bitset.free = __pyx_t_2; - /* "src/_squish/core.pyx":137 + /* "squish/_squish/core.pyx":137 * * bitset.add, bitset.free = bitset_add, bitset_free * return bitset # <<<<<<<<<<<<<< @@ -4321,7 +4321,7 @@ static CYTHON_INLINE __pyx_t_7_squish_BitSet __pyx_f_7_squish_init_bitset(__pyx_ __pyx_r = __pyx_v_bitset; goto __pyx_L0; - /* "src/_squish/core.pyx":132 + /* "squish/_squish/core.pyx":132 * #### BitSet Methods #### * * cdef inline BitSet init_bitset(INT_T elements) nogil: # <<<<<<<<<<<<<< @@ -4334,7 +4334,7 @@ static CYTHON_INLINE __pyx_t_7_squish_BitSet __pyx_f_7_squish_init_bitset(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":139 +/* "squish/_squish/core.pyx":139 * return bitset * * cdef inline bint bitset_add(BitSet* self, INT_T val) nogil: # <<<<<<<<<<<<<< @@ -4348,7 +4348,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ __pyx_t_7_squish_INT_T __pyx_v_old; int __pyx_r; - /* "src/_squish/core.pyx":141 + /* "squish/_squish/core.pyx":141 * cdef inline bint bitset_add(BitSet* self, INT_T val) nogil: * cdef INT_T index, rel_index, old * index = val/sizeof(INT_T) # <<<<<<<<<<<<<< @@ -4357,7 +4357,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ */ __pyx_v_index = (__pyx_v_val / ((__pyx_t_7_squish_INT_T)(sizeof(__pyx_t_7_squish_INT_T)))); - /* "src/_squish/core.pyx":142 + /* "squish/_squish/core.pyx":142 * cdef INT_T index, rel_index, old * index = val/sizeof(INT_T) * old = self.bits[index] # <<<<<<<<<<<<<< @@ -4366,7 +4366,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ */ __pyx_v_old = (__pyx_v_self->bits[__pyx_v_index]); - /* "src/_squish/core.pyx":143 + /* "squish/_squish/core.pyx":143 * index = val/sizeof(INT_T) * old = self.bits[index] * rel_index = val - index*sizeof(INT_T) # <<<<<<<<<<<<<< @@ -4375,7 +4375,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ */ __pyx_v_rel_index = (__pyx_v_val - (__pyx_v_index * (sizeof(__pyx_t_7_squish_INT_T)))); - /* "src/_squish/core.pyx":145 + /* "squish/_squish/core.pyx":145 * rel_index = val - index*sizeof(INT_T) * * self.bits[index] = (1 << rel_index) | old # New value. # <<<<<<<<<<<<<< @@ -4384,7 +4384,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ */ (__pyx_v_self->bits[__pyx_v_index]) = ((1 << __pyx_v_rel_index) | __pyx_v_old); - /* "src/_squish/core.pyx":147 + /* "squish/_squish/core.pyx":147 * self.bits[index] = (1 << rel_index) | old # New value. * * return old == self.bits[index] # Means 1 was already there. # <<<<<<<<<<<<<< @@ -4394,7 +4394,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ __pyx_r = (__pyx_v_old == (__pyx_v_self->bits[__pyx_v_index])); goto __pyx_L0; - /* "src/_squish/core.pyx":139 + /* "squish/_squish/core.pyx":139 * return bitset * * cdef inline bint bitset_add(BitSet* self, INT_T val) nogil: # <<<<<<<<<<<<<< @@ -4407,7 +4407,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ return __pyx_r; } -/* "src/_squish/core.pyx":149 +/* "squish/_squish/core.pyx":149 * return old == self.bits[index] # Means 1 was already there. * * cdef inline void bitset_free(BitSet* self) nogil: # <<<<<<<<<<<<<< @@ -4417,7 +4417,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_bitset_add(__pyx_t_7_squish_BitSet *__ static CYTHON_INLINE void __pyx_f_7_squish_bitset_free(__pyx_t_7_squish_BitSet *__pyx_v_self) { - /* "src/_squish/core.pyx":150 + /* "squish/_squish/core.pyx":150 * * cdef inline void bitset_free(BitSet* self) nogil: * free(self.bits) # <<<<<<<<<<<<<< @@ -4426,7 +4426,7 @@ static CYTHON_INLINE void __pyx_f_7_squish_bitset_free(__pyx_t_7_squish_BitSet * */ free(__pyx_v_self->bits); - /* "src/_squish/core.pyx":149 + /* "squish/_squish/core.pyx":149 * return old == self.bits[index] # Means 1 was already there. * * cdef inline void bitset_free(BitSet* self) nogil: # <<<<<<<<<<<<<< @@ -4437,7 +4437,7 @@ static CYTHON_INLINE void __pyx_f_7_squish_bitset_free(__pyx_t_7_squish_BitSet * /* function exit code */ } -/* "src/_squish/core.pyx":163 +/* "squish/_squish/core.pyx":163 * """ * * cdef inline Vector2D init_vector2d(FLOAT_T x, FLOAT_T y) nogil: # <<<<<<<<<<<<<< @@ -4457,7 +4457,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_init_vector2d(__ __pyx_t_7_squish_FLOAT_T (*__pyx_t_7)(__pyx_t_7_squish_Vector2D *, __pyx_t_7_squish_Vector2D); __pyx_t_7_squish_FLOAT_T (*__pyx_t_8)(__pyx_t_7_squish_Vector2D *); - /* "src/_squish/core.pyx":165 + /* "squish/_squish/core.pyx":165 * cdef inline Vector2D init_vector2d(FLOAT_T x, FLOAT_T y) nogil: * cdef Vector2D vec * vec.x, vec.y = x, y # <<<<<<<<<<<<<< @@ -4469,7 +4469,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_init_vector2d(__ __pyx_v_vec.x = __pyx_t_1; __pyx_v_vec.y = __pyx_t_2; - /* "src/_squish/core.pyx":166 + /* "squish/_squish/core.pyx":166 * cdef Vector2D vec * vec.x, vec.y = x, y * vec.self, vec.copy = VSO, VCO # <<<<<<<<<<<<<< @@ -4481,7 +4481,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_init_vector2d(__ __pyx_v_vec.self = __pyx_t_3; __pyx_v_vec.copy = __pyx_t_4; - /* "src/_squish/core.pyx":168 + /* "squish/_squish/core.pyx":168 * vec.self, vec.copy = VSO, VCO * * vec.equals, vec.rot, vec.dot, vec.mag = v_equals, rot, dot, mag # <<<<<<<<<<<<<< @@ -4497,7 +4497,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_init_vector2d(__ __pyx_v_vec.dot = __pyx_t_7; __pyx_v_vec.mag = __pyx_t_8; - /* "src/_squish/core.pyx":170 + /* "squish/_squish/core.pyx":170 * vec.equals, vec.rot, vec.dot, vec.mag = v_equals, rot, dot, mag * * return vec # <<<<<<<<<<<<<< @@ -4507,7 +4507,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_init_vector2d(__ __pyx_r = __pyx_v_vec; goto __pyx_L0; - /* "src/_squish/core.pyx":163 + /* "squish/_squish/core.pyx":163 * """ * * cdef inline Vector2D init_vector2d(FLOAT_T x, FLOAT_T y) nogil: # <<<<<<<<<<<<<< @@ -4520,7 +4520,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_init_vector2d(__ return __pyx_r; } -/* "src/_squish/core.pyx":173 +/* "squish/_squish/core.pyx":173 * * * cdef inline bint v_equals(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4533,7 +4533,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_v_equals(__pyx_t_7_squish_Vector2D *__ int __pyx_t_1; int __pyx_t_2; - /* "src/_squish/core.pyx":174 + /* "squish/_squish/core.pyx":174 * * cdef inline bint v_equals(Vector2D* self, Vector2D w) nogil: * return ((self.x == w.x) and (self.y == w.y)) # <<<<<<<<<<<<<< @@ -4552,7 +4552,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_v_equals(__pyx_t_7_squish_Vector2D *__ __pyx_r = __pyx_t_1; goto __pyx_L0; - /* "src/_squish/core.pyx":173 + /* "squish/_squish/core.pyx":173 * * * cdef inline bint v_equals(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4565,7 +4565,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_v_equals(__pyx_t_7_squish_Vector2D *__ return __pyx_r; } -/* "src/_squish/core.pyx":176 +/* "squish/_squish/core.pyx":176 * return ((self.x == w.x) and (self.y == w.y)) * * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -4576,7 +4576,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_v_equals(__pyx_t_7_squish_Vector2D *__ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_neg_s(__pyx_t_7_squish_Vector2D *__pyx_v_self) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":177 + /* "squish/_squish/core.pyx":177 * * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: * self.x = -self.x # <<<<<<<<<<<<<< @@ -4585,7 +4585,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_neg_s(__pyx_t */ __pyx_v_self->x = (-__pyx_v_self->x); - /* "src/_squish/core.pyx":178 + /* "squish/_squish/core.pyx":178 * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: * self.x = -self.x * self.y = -self.y # <<<<<<<<<<<<<< @@ -4594,7 +4594,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_neg_s(__pyx_t */ __pyx_v_self->y = (-__pyx_v_self->y); - /* "src/_squish/core.pyx":179 + /* "squish/_squish/core.pyx":179 * self.x = -self.x * self.y = -self.y * return self # <<<<<<<<<<<<<< @@ -4604,7 +4604,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_neg_s(__pyx_t __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":176 + /* "squish/_squish/core.pyx":176 * return ((self.x == w.x) and (self.y == w.y)) * * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -4617,7 +4617,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_neg_s(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":181 +/* "squish/_squish/core.pyx":181 * return self * * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4628,7 +4628,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_neg_s(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vadd_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":182 + /* "squish/_squish/core.pyx":182 * * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: * self.x += w.x # <<<<<<<<<<<<<< @@ -4637,7 +4637,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vadd_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x + __pyx_v_w.x); - /* "src/_squish/core.pyx":183 + /* "squish/_squish/core.pyx":183 * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: * self.x += w.x * self.y += w.y # <<<<<<<<<<<<<< @@ -4646,7 +4646,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vadd_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y + __pyx_v_w.y); - /* "src/_squish/core.pyx":184 + /* "squish/_squish/core.pyx":184 * self.x += w.x * self.y += w.y * return self # <<<<<<<<<<<<<< @@ -4656,7 +4656,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vadd_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":181 + /* "squish/_squish/core.pyx":181 * return self * * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4669,7 +4669,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vadd_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":186 +/* "squish/_squish/core.pyx":186 * return self * * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4680,7 +4680,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vadd_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vsub_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":187 + /* "squish/_squish/core.pyx":187 * * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: * self.x -= w.x # <<<<<<<<<<<<<< @@ -4689,7 +4689,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vsub_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x - __pyx_v_w.x); - /* "src/_squish/core.pyx":188 + /* "squish/_squish/core.pyx":188 * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: * self.x -= w.x * self.y -= w.y # <<<<<<<<<<<<<< @@ -4698,7 +4698,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vsub_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y - __pyx_v_w.y); - /* "src/_squish/core.pyx":189 + /* "squish/_squish/core.pyx":189 * self.x -= w.x * self.y -= w.y * return self # <<<<<<<<<<<<<< @@ -4708,7 +4708,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vsub_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":186 + /* "squish/_squish/core.pyx":186 * return self * * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4721,7 +4721,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vsub_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":191 +/* "squish/_squish/core.pyx":191 * return self * * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4732,7 +4732,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vsub_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vmul_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":192 + /* "squish/_squish/core.pyx":192 * * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: * self.x *= w.x # <<<<<<<<<<<<<< @@ -4741,7 +4741,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vmul_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x * __pyx_v_w.x); - /* "src/_squish/core.pyx":193 + /* "squish/_squish/core.pyx":193 * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: * self.x *= w.x * self.y *= w.y # <<<<<<<<<<<<<< @@ -4750,7 +4750,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vmul_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y * __pyx_v_w.y); - /* "src/_squish/core.pyx":194 + /* "squish/_squish/core.pyx":194 * self.x *= w.x * self.y *= w.y * return self # <<<<<<<<<<<<<< @@ -4760,7 +4760,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vmul_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":191 + /* "squish/_squish/core.pyx":191 * return self * * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4773,7 +4773,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vmul_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":196 +/* "squish/_squish/core.pyx":196 * return self * * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4784,7 +4784,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vmul_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vdiv_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":197 + /* "squish/_squish/core.pyx":197 * * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: * self.x /= w.x # <<<<<<<<<<<<<< @@ -4793,7 +4793,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vdiv_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x / __pyx_v_w.x); - /* "src/_squish/core.pyx":198 + /* "squish/_squish/core.pyx":198 * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: * self.x /= w.x * self.y /= w.y # <<<<<<<<<<<<<< @@ -4802,7 +4802,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vdiv_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y / __pyx_v_w.y); - /* "src/_squish/core.pyx":199 + /* "squish/_squish/core.pyx":199 * self.x /= w.x * self.y /= w.y * return self # <<<<<<<<<<<<<< @@ -4812,7 +4812,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vdiv_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":196 + /* "squish/_squish/core.pyx":196 * return self * * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4825,7 +4825,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vdiv_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":201 +/* "squish/_squish/core.pyx":201 * return self * * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4836,7 +4836,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_vdiv_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sadd_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":202 + /* "squish/_squish/core.pyx":202 * * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: * self.x += s # <<<<<<<<<<<<<< @@ -4845,7 +4845,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sadd_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x + __pyx_v_s); - /* "src/_squish/core.pyx":203 + /* "squish/_squish/core.pyx":203 * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: * self.x += s * self.y += s # <<<<<<<<<<<<<< @@ -4854,7 +4854,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sadd_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y + __pyx_v_s); - /* "src/_squish/core.pyx":204 + /* "squish/_squish/core.pyx":204 * self.x += s * self.y += s * return self # <<<<<<<<<<<<<< @@ -4864,7 +4864,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sadd_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":201 + /* "squish/_squish/core.pyx":201 * return self * * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4877,7 +4877,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sadd_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":206 +/* "squish/_squish/core.pyx":206 * return self * * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4888,7 +4888,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sadd_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_ssub_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":207 + /* "squish/_squish/core.pyx":207 * * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: * self.x -= s # <<<<<<<<<<<<<< @@ -4897,7 +4897,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_ssub_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x - __pyx_v_s); - /* "src/_squish/core.pyx":208 + /* "squish/_squish/core.pyx":208 * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: * self.x -= s * self.y -= s # <<<<<<<<<<<<<< @@ -4906,7 +4906,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_ssub_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y - __pyx_v_s); - /* "src/_squish/core.pyx":209 + /* "squish/_squish/core.pyx":209 * self.x -= s * self.y -= s * return self # <<<<<<<<<<<<<< @@ -4916,7 +4916,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_ssub_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":206 + /* "squish/_squish/core.pyx":206 * return self * * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4929,7 +4929,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_ssub_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":211 +/* "squish/_squish/core.pyx":211 * return self * * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4940,7 +4940,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_ssub_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_smul_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":212 + /* "squish/_squish/core.pyx":212 * * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: * self.x *= s # <<<<<<<<<<<<<< @@ -4949,7 +4949,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_smul_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x * __pyx_v_s); - /* "src/_squish/core.pyx":213 + /* "squish/_squish/core.pyx":213 * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: * self.x *= s * self.y *= s # <<<<<<<<<<<<<< @@ -4958,7 +4958,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_smul_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y * __pyx_v_s); - /* "src/_squish/core.pyx":214 + /* "squish/_squish/core.pyx":214 * self.x *= s * self.y *= s * return self # <<<<<<<<<<<<<< @@ -4968,7 +4968,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_smul_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":211 + /* "squish/_squish/core.pyx":211 * return self * * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4981,7 +4981,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_smul_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":216 +/* "squish/_squish/core.pyx":216 * return self * * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4992,7 +4992,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_smul_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sdiv_s(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D *__pyx_r; - /* "src/_squish/core.pyx":217 + /* "squish/_squish/core.pyx":217 * * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: * self.x /= s # <<<<<<<<<<<<<< @@ -5001,7 +5001,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sdiv_s(__pyx_ */ __pyx_v_self->x = (__pyx_v_self->x / __pyx_v_s); - /* "src/_squish/core.pyx":218 + /* "squish/_squish/core.pyx":218 * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: * self.x /= s * self.y /= s # <<<<<<<<<<<<<< @@ -5010,7 +5010,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sdiv_s(__pyx_ */ __pyx_v_self->y = (__pyx_v_self->y / __pyx_v_s); - /* "src/_squish/core.pyx":219 + /* "squish/_squish/core.pyx":219 * self.x /= s * self.y /= s * return self # <<<<<<<<<<<<<< @@ -5020,7 +5020,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sdiv_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":216 + /* "squish/_squish/core.pyx":216 * return self * * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5033,7 +5033,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_sdiv_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":221 +/* "squish/_squish/core.pyx":221 * return self * * cdef inline Vector2D* v_matmul_s(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5046,7 +5046,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_matmul_s(__py __pyx_t_7_squish_FLOAT_T __pyx_t_1; __pyx_t_7_squish_FLOAT_T __pyx_t_2; - /* "src/_squish/core.pyx":222 + /* "squish/_squish/core.pyx":222 * * cdef inline Vector2D* v_matmul_s(Vector2D* self, Matrix2x2 m) nogil: * self.x, self.y = self.x*m.a + self.y*m.c, self.x*m.b + self.y*m.d # <<<<<<<<<<<<<< @@ -5058,7 +5058,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_matmul_s(__py __pyx_v_self->x = __pyx_t_1; __pyx_v_self->y = __pyx_t_2; - /* "src/_squish/core.pyx":223 + /* "squish/_squish/core.pyx":223 * cdef inline Vector2D* v_matmul_s(Vector2D* self, Matrix2x2 m) nogil: * self.x, self.y = self.x*m.a + self.y*m.c, self.x*m.b + self.y*m.d * return self # <<<<<<<<<<<<<< @@ -5068,7 +5068,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_matmul_s(__py __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":221 + /* "squish/_squish/core.pyx":221 * return self * * cdef inline Vector2D* v_matmul_s(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5081,7 +5081,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_matmul_s(__py return __pyx_r; } -/* "src/_squish/core.pyx":225 +/* "squish/_squish/core.pyx":225 * return self * * cdef inline Vector2D v_neg_c(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5092,7 +5092,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D *__pyx_f_7_squish_v_matmul_s(__py static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_neg_c(__pyx_t_7_squish_Vector2D *__pyx_v_self) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":226 + /* "squish/_squish/core.pyx":226 * * cdef inline Vector2D v_neg_c(Vector2D* self) nogil: * return init.Vector2D(-self.x, -self.y) # <<<<<<<<<<<<<< @@ -5102,7 +5102,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_neg_c(__pyx_t_ __pyx_r = __pyx_v_7_squish_init.Vector2D((-__pyx_v_self->x), (-__pyx_v_self->y)); goto __pyx_L0; - /* "src/_squish/core.pyx":225 + /* "squish/_squish/core.pyx":225 * return self * * cdef inline Vector2D v_neg_c(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5115,7 +5115,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_neg_c(__pyx_t_ return __pyx_r; } -/* "src/_squish/core.pyx":228 +/* "squish/_squish/core.pyx":228 * return init.Vector2D(-self.x, -self.y) * * cdef inline Vector2D v_vadd_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5126,7 +5126,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_neg_c(__pyx_t_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vadd_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":229 + /* "squish/_squish/core.pyx":229 * * cdef inline Vector2D v_vadd_c(Vector2D* self, Vector2D w) nogil: * return init.Vector2D(self.x + w.x, self.y + w.y) # <<<<<<<<<<<<<< @@ -5136,7 +5136,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vadd_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x + __pyx_v_w.x), (__pyx_v_self->y + __pyx_v_w.y)); goto __pyx_L0; - /* "src/_squish/core.pyx":228 + /* "squish/_squish/core.pyx":228 * return init.Vector2D(-self.x, -self.y) * * cdef inline Vector2D v_vadd_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5149,7 +5149,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vadd_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":231 +/* "squish/_squish/core.pyx":231 * return init.Vector2D(self.x + w.x, self.y + w.y) * * cdef inline Vector2D v_vsub_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5160,7 +5160,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vadd_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vsub_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":232 + /* "squish/_squish/core.pyx":232 * * cdef inline Vector2D v_vsub_c(Vector2D* self, Vector2D w) nogil: * return init.Vector2D(self.x - w.x, self.y - w.y) # <<<<<<<<<<<<<< @@ -5170,7 +5170,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vsub_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x - __pyx_v_w.x), (__pyx_v_self->y - __pyx_v_w.y)); goto __pyx_L0; - /* "src/_squish/core.pyx":231 + /* "squish/_squish/core.pyx":231 * return init.Vector2D(self.x + w.x, self.y + w.y) * * cdef inline Vector2D v_vsub_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5183,7 +5183,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vsub_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":234 +/* "squish/_squish/core.pyx":234 * return init.Vector2D(self.x - w.x, self.y - w.y) * * cdef inline Vector2D v_vmul_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5194,7 +5194,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vsub_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vmul_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":235 + /* "squish/_squish/core.pyx":235 * * cdef inline Vector2D v_vmul_c(Vector2D* self, Vector2D w) nogil: * return init.Vector2D(self.x * w.x, self.y * w.y) # <<<<<<<<<<<<<< @@ -5204,7 +5204,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vmul_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x * __pyx_v_w.x), (__pyx_v_self->y * __pyx_v_w.y)); goto __pyx_L0; - /* "src/_squish/core.pyx":234 + /* "squish/_squish/core.pyx":234 * return init.Vector2D(self.x - w.x, self.y - w.y) * * cdef inline Vector2D v_vmul_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5217,7 +5217,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vmul_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":237 +/* "squish/_squish/core.pyx":237 * return init.Vector2D(self.x * w.x, self.y * w.y) * * cdef inline Vector2D v_vdiv_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5228,7 +5228,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vmul_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vdiv_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":238 + /* "squish/_squish/core.pyx":238 * * cdef inline Vector2D v_vdiv_c(Vector2D* self, Vector2D w) nogil: * return init.Vector2D(self.x / w.x, self.y / w.y) # <<<<<<<<<<<<<< @@ -5238,7 +5238,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vdiv_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x / __pyx_v_w.x), (__pyx_v_self->y / __pyx_v_w.y)); goto __pyx_L0; - /* "src/_squish/core.pyx":237 + /* "squish/_squish/core.pyx":237 * return init.Vector2D(self.x * w.x, self.y * w.y) * * cdef inline Vector2D v_vdiv_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5251,7 +5251,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vdiv_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":240 +/* "squish/_squish/core.pyx":240 * return init.Vector2D(self.x / w.x, self.y / w.y) * * cdef inline Vector2D v_sadd_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5262,7 +5262,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_vdiv_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sadd_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":241 + /* "squish/_squish/core.pyx":241 * * cdef inline Vector2D v_sadd_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x + s, self.y + s) # <<<<<<<<<<<<<< @@ -5272,7 +5272,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sadd_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x + __pyx_v_s), (__pyx_v_self->y + __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":240 + /* "squish/_squish/core.pyx":240 * return init.Vector2D(self.x / w.x, self.y / w.y) * * cdef inline Vector2D v_sadd_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5285,7 +5285,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sadd_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":243 +/* "squish/_squish/core.pyx":243 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_ssub_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5296,7 +5296,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sadd_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_ssub_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":244 + /* "squish/_squish/core.pyx":244 * * cdef inline Vector2D v_ssub_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x + s, self.y + s) # <<<<<<<<<<<<<< @@ -5306,7 +5306,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_ssub_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x + __pyx_v_s), (__pyx_v_self->y + __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":243 + /* "squish/_squish/core.pyx":243 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_ssub_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5319,7 +5319,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_ssub_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":246 +/* "squish/_squish/core.pyx":246 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_smul_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5330,7 +5330,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_ssub_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_smul_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":247 + /* "squish/_squish/core.pyx":247 * * cdef inline Vector2D v_smul_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x * s, self.y * s) # <<<<<<<<<<<<<< @@ -5340,7 +5340,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_smul_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x * __pyx_v_s), (__pyx_v_self->y * __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":246 + /* "squish/_squish/core.pyx":246 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_smul_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5353,7 +5353,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_smul_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":249 +/* "squish/_squish/core.pyx":249 * return init.Vector2D(self.x * s, self.y * s) * * cdef inline Vector2D v_sdiv_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5364,7 +5364,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_smul_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sdiv_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":250 + /* "squish/_squish/core.pyx":250 * * cdef inline Vector2D v_sdiv_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x / s, self.y / s) # <<<<<<<<<<<<<< @@ -5374,7 +5374,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sdiv_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D((__pyx_v_self->x / __pyx_v_s), (__pyx_v_self->y / __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":249 + /* "squish/_squish/core.pyx":249 * return init.Vector2D(self.x * s, self.y * s) * * cdef inline Vector2D v_sdiv_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5387,7 +5387,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sdiv_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":252 +/* "squish/_squish/core.pyx":252 * return init.Vector2D(self.x / s, self.y / s) * * cdef inline Vector2D v_matmul_c(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5398,7 +5398,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_sdiv_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_matmul_c(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":253 + /* "squish/_squish/core.pyx":253 * * cdef inline Vector2D v_matmul_c(Vector2D* self, Matrix2x2 m) nogil: * return init.Vector2D( # <<<<<<<<<<<<<< @@ -5408,7 +5408,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_matmul_c(__pyx __pyx_r = __pyx_v_7_squish_init.Vector2D(((__pyx_v_self->x * __pyx_v_m.a) + (__pyx_v_self->y * __pyx_v_m.c)), ((__pyx_v_self->x * __pyx_v_m.b) + (__pyx_v_self->y * __pyx_v_m.d))); goto __pyx_L0; - /* "src/_squish/core.pyx":252 + /* "squish/_squish/core.pyx":252 * return init.Vector2D(self.x / s, self.y / s) * * cdef inline Vector2D v_matmul_c(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5421,7 +5421,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_matmul_c(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":257 +/* "squish/_squish/core.pyx":257 * ) * * cdef inline Vector2D rot(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5432,7 +5432,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_v_matmul_c(__pyx static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_rot(__pyx_t_7_squish_Vector2D *__pyx_v_self) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":258 + /* "squish/_squish/core.pyx":258 * * cdef inline Vector2D rot(Vector2D* self) nogil: * return init.Vector2D(-self.y, self.x) # <<<<<<<<<<<<<< @@ -5442,7 +5442,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_rot(__pyx_t_7_sq __pyx_r = __pyx_v_7_squish_init.Vector2D((-__pyx_v_self->y), __pyx_v_self->x); goto __pyx_L0; - /* "src/_squish/core.pyx":257 + /* "squish/_squish/core.pyx":257 * ) * * cdef inline Vector2D rot(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5455,7 +5455,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_rot(__pyx_t_7_sq return __pyx_r; } -/* "src/_squish/core.pyx":260 +/* "squish/_squish/core.pyx":260 * return init.Vector2D(-self.y, self.x) * * cdef inline FLOAT_T dot(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5466,7 +5466,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_rot(__pyx_t_7_sq static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_dot(__pyx_t_7_squish_Vector2D *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_w) { __pyx_t_7_squish_FLOAT_T __pyx_r; - /* "src/_squish/core.pyx":261 + /* "squish/_squish/core.pyx":261 * * cdef inline FLOAT_T dot(Vector2D* self, Vector2D w) nogil: * return self.x*w.x + self.y*w.y # <<<<<<<<<<<<<< @@ -5476,7 +5476,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_dot(__pyx_t_7_squ __pyx_r = ((__pyx_v_self->x * __pyx_v_w.x) + (__pyx_v_self->y * __pyx_v_w.y)); goto __pyx_L0; - /* "src/_squish/core.pyx":260 + /* "squish/_squish/core.pyx":260 * return init.Vector2D(-self.y, self.x) * * cdef inline FLOAT_T dot(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5489,7 +5489,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_dot(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/core.pyx":263 +/* "squish/_squish/core.pyx":263 * return self.x*w.x + self.y*w.y * * cdef inline FLOAT_T mag(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5500,7 +5500,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_dot(__pyx_t_7_squ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_mag(__pyx_t_7_squish_Vector2D *__pyx_v_self) { __pyx_t_7_squish_FLOAT_T __pyx_r; - /* "src/_squish/core.pyx":264 + /* "squish/_squish/core.pyx":264 * * cdef inline FLOAT_T mag(Vector2D* self) nogil: * return sqrt((self.x*self.x + self.y*self.y)) # <<<<<<<<<<<<<< @@ -5510,7 +5510,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_mag(__pyx_t_7_squ __pyx_r = ((__pyx_t_7_squish_FLOAT_T)sqrt(((double)((__pyx_v_self->x * __pyx_v_self->x) + (__pyx_v_self->y * __pyx_v_self->y))))); goto __pyx_L0; - /* "src/_squish/core.pyx":263 + /* "squish/_squish/core.pyx":263 * return self.x*w.x + self.y*w.y * * cdef inline FLOAT_T mag(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5523,7 +5523,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_mag(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/core.pyx":269 +/* "squish/_squish/core.pyx":269 * #### Matrix2x2 Methods #### * * cdef inline Matrix2x2 init_matrix2x2(FLOAT_T a, FLOAT_T b, FLOAT_T c, FLOAT_T d) nogil: # <<<<<<<<<<<<<< @@ -5543,7 +5543,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_init_matrix2x2( int (*__pyx_t_7)(__pyx_t_7_squish_Matrix2x2 *, __pyx_t_7_squish_Matrix2x2); __pyx_t_7_squish_Vector2D (*__pyx_t_8)(__pyx_t_7_squish_Matrix2x2 *, __pyx_t_7_squish_Vector2D); - /* "src/_squish/core.pyx":271 + /* "squish/_squish/core.pyx":271 * cdef inline Matrix2x2 init_matrix2x2(FLOAT_T a, FLOAT_T b, FLOAT_T c, FLOAT_T d) nogil: * cdef Matrix2x2 matrix * matrix.a, matrix.b, matrix.c, matrix.d = a, b, c, d # <<<<<<<<<<<<<< @@ -5559,7 +5559,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_init_matrix2x2( __pyx_v_matrix.c = __pyx_t_3; __pyx_v_matrix.d = __pyx_t_4; - /* "src/_squish/core.pyx":272 + /* "squish/_squish/core.pyx":272 * cdef Matrix2x2 matrix * matrix.a, matrix.b, matrix.c, matrix.d = a, b, c, d * matrix.self, matrix.copy = MSO, MCO # <<<<<<<<<<<<<< @@ -5571,7 +5571,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_init_matrix2x2( __pyx_v_matrix.self = __pyx_t_5; __pyx_v_matrix.copy = __pyx_t_6; - /* "src/_squish/core.pyx":274 + /* "squish/_squish/core.pyx":274 * matrix.self, matrix.copy = MSO, MCO * * matrix.equals, matrix.vecmul = m_equals, m_vecmul # <<<<<<<<<<<<<< @@ -5583,7 +5583,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_init_matrix2x2( __pyx_v_matrix.equals = __pyx_t_7; __pyx_v_matrix.vecmul = __pyx_t_8; - /* "src/_squish/core.pyx":276 + /* "squish/_squish/core.pyx":276 * matrix.equals, matrix.vecmul = m_equals, m_vecmul * * return matrix # <<<<<<<<<<<<<< @@ -5593,7 +5593,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_init_matrix2x2( __pyx_r = __pyx_v_matrix; goto __pyx_L0; - /* "src/_squish/core.pyx":269 + /* "squish/_squish/core.pyx":269 * #### Matrix2x2 Methods #### * * cdef inline Matrix2x2 init_matrix2x2(FLOAT_T a, FLOAT_T b, FLOAT_T c, FLOAT_T d) nogil: # <<<<<<<<<<<<<< @@ -5606,7 +5606,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_init_matrix2x2( return __pyx_r; } -/* "src/_squish/core.pyx":278 +/* "squish/_squish/core.pyx":278 * return matrix * * cdef inline bint m_equals(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5619,7 +5619,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_m_equals(__pyx_t_7_squish_Matrix2x2 *_ int __pyx_t_1; int __pyx_t_2; - /* "src/_squish/core.pyx":280 + /* "squish/_squish/core.pyx":280 * cdef inline bint m_equals(Matrix2x2* self, Matrix2x2 m) nogil: * return ( * (self.a == m.a) and (self.b == m.b) and (self.c == m.c) and (self.d == m.d) # <<<<<<<<<<<<<< @@ -5650,7 +5650,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_m_equals(__pyx_t_7_squish_Matrix2x2 *_ __pyx_r = __pyx_t_1; goto __pyx_L0; - /* "src/_squish/core.pyx":278 + /* "squish/_squish/core.pyx":278 * return matrix * * cdef inline bint m_equals(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5663,7 +5663,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_m_equals(__pyx_t_7_squish_Matrix2x2 *_ return __pyx_r; } -/* "src/_squish/core.pyx":283 +/* "squish/_squish/core.pyx":283 * ) * * cdef inline Vector2D m_vecmul(Matrix2x2* self, Vector2D v) nogil: # <<<<<<<<<<<<<< @@ -5674,7 +5674,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_m_equals(__pyx_t_7_squish_Matrix2x2 *_ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_m_vecmul(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Vector2D __pyx_v_v) { __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/core.pyx":284 + /* "squish/_squish/core.pyx":284 * * cdef inline Vector2D m_vecmul(Matrix2x2* self, Vector2D v) nogil: * return init.Vector2D( # <<<<<<<<<<<<<< @@ -5684,7 +5684,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_m_vecmul(__pyx_t __pyx_r = __pyx_v_7_squish_init.Vector2D(((__pyx_v_self->a * __pyx_v_v.x) + (__pyx_v_self->b * __pyx_v_v.y)), ((__pyx_v_self->c * __pyx_v_v.x) + (__pyx_v_self->d * __pyx_v_v.y))); goto __pyx_L0; - /* "src/_squish/core.pyx":283 + /* "squish/_squish/core.pyx":283 * ) * * cdef inline Vector2D m_vecmul(Matrix2x2* self, Vector2D v) nogil: # <<<<<<<<<<<<<< @@ -5697,7 +5697,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_m_vecmul(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":288 +/* "squish/_squish/core.pyx":288 * ) * * cdef inline Matrix2x2* m_neg_s(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -5712,7 +5712,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_neg_s(__pyx_ __pyx_t_7_squish_FLOAT_T __pyx_t_3; __pyx_t_7_squish_FLOAT_T __pyx_t_4; - /* "src/_squish/core.pyx":289 + /* "squish/_squish/core.pyx":289 * * cdef inline Matrix2x2* m_neg_s(Matrix2x2* self) nogil: * self.a, self.b, self.c, self.d = -self.a, -self.b, -self.c, -self.d # <<<<<<<<<<<<<< @@ -5728,7 +5728,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_neg_s(__pyx_ __pyx_v_self->c = __pyx_t_3; __pyx_v_self->d = __pyx_t_4; - /* "src/_squish/core.pyx":290 + /* "squish/_squish/core.pyx":290 * cdef inline Matrix2x2* m_neg_s(Matrix2x2* self) nogil: * self.a, self.b, self.c, self.d = -self.a, -self.b, -self.c, -self.d * return self # <<<<<<<<<<<<<< @@ -5738,7 +5738,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_neg_s(__pyx_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":288 + /* "squish/_squish/core.pyx":288 * ) * * cdef inline Matrix2x2* m_neg_s(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -5751,7 +5751,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_neg_s(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":292 +/* "squish/_squish/core.pyx":292 * return self * * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5762,7 +5762,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_neg_s(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":293 + /* "squish/_squish/core.pyx":293 * * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a += m.a # <<<<<<<<<<<<<< @@ -5771,7 +5771,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a + __pyx_v_m.a); - /* "src/_squish/core.pyx":294 + /* "squish/_squish/core.pyx":294 * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a += m.a * self.b += m.b # <<<<<<<<<<<<<< @@ -5780,7 +5780,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b + __pyx_v_m.b); - /* "src/_squish/core.pyx":295 + /* "squish/_squish/core.pyx":295 * self.a += m.a * self.b += m.b * self.c += m.c # <<<<<<<<<<<<<< @@ -5789,7 +5789,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c + __pyx_v_m.c); - /* "src/_squish/core.pyx":296 + /* "squish/_squish/core.pyx":296 * self.b += m.b * self.c += m.c * self.d += m.d # <<<<<<<<<<<<<< @@ -5798,7 +5798,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d + __pyx_v_m.d); - /* "src/_squish/core.pyx":297 + /* "squish/_squish/core.pyx":297 * self.c += m.c * self.d += m.d * return self # <<<<<<<<<<<<<< @@ -5808,7 +5808,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":292 + /* "squish/_squish/core.pyx":292 * return self * * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5821,7 +5821,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":299 +/* "squish/_squish/core.pyx":299 * return self * * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5832,7 +5832,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_madd_s(__pyx static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":300 + /* "squish/_squish/core.pyx":300 * * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a -= m.a # <<<<<<<<<<<<<< @@ -5841,7 +5841,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a - __pyx_v_m.a); - /* "src/_squish/core.pyx":301 + /* "squish/_squish/core.pyx":301 * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a -= m.a * self.b -= m.b # <<<<<<<<<<<<<< @@ -5850,7 +5850,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b - __pyx_v_m.b); - /* "src/_squish/core.pyx":302 + /* "squish/_squish/core.pyx":302 * self.a -= m.a * self.b -= m.b * self.c -= m.c # <<<<<<<<<<<<<< @@ -5859,7 +5859,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c - __pyx_v_m.c); - /* "src/_squish/core.pyx":303 + /* "squish/_squish/core.pyx":303 * self.b -= m.b * self.c -= m.c * self.d -= m.d # <<<<<<<<<<<<<< @@ -5868,7 +5868,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d - __pyx_v_m.d); - /* "src/_squish/core.pyx":304 + /* "squish/_squish/core.pyx":304 * self.c -= m.c * self.d -= m.d * return self # <<<<<<<<<<<<<< @@ -5878,7 +5878,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":299 + /* "squish/_squish/core.pyx":299 * return self * * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5891,7 +5891,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":306 +/* "squish/_squish/core.pyx":306 * return self * * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5902,7 +5902,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_msub_s(__pyx static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":307 + /* "squish/_squish/core.pyx":307 * * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a *= m.a # <<<<<<<<<<<<<< @@ -5911,7 +5911,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a * __pyx_v_m.a); - /* "src/_squish/core.pyx":308 + /* "squish/_squish/core.pyx":308 * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a *= m.a * self.b *= m.b # <<<<<<<<<<<<<< @@ -5920,7 +5920,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b * __pyx_v_m.b); - /* "src/_squish/core.pyx":309 + /* "squish/_squish/core.pyx":309 * self.a *= m.a * self.b *= m.b * self.c *= m.c # <<<<<<<<<<<<<< @@ -5929,7 +5929,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c * __pyx_v_m.c); - /* "src/_squish/core.pyx":310 + /* "squish/_squish/core.pyx":310 * self.b *= m.b * self.c *= m.c * self.d *= m.d # <<<<<<<<<<<<<< @@ -5938,7 +5938,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d * __pyx_v_m.d); - /* "src/_squish/core.pyx":311 + /* "squish/_squish/core.pyx":311 * self.c *= m.c * self.d *= m.d * return self # <<<<<<<<<<<<<< @@ -5948,7 +5948,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":306 + /* "squish/_squish/core.pyx":306 * return self * * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5961,7 +5961,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":313 +/* "squish/_squish/core.pyx":313 * return self * * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5972,7 +5972,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mmul_s(__pyx static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":314 + /* "squish/_squish/core.pyx":314 * * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a /= m.a # <<<<<<<<<<<<<< @@ -5981,7 +5981,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a / __pyx_v_m.a); - /* "src/_squish/core.pyx":315 + /* "squish/_squish/core.pyx":315 * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a /= m.a * self.b /= m.b # <<<<<<<<<<<<<< @@ -5990,7 +5990,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b / __pyx_v_m.b); - /* "src/_squish/core.pyx":316 + /* "squish/_squish/core.pyx":316 * self.a /= m.a * self.b /= m.b * self.c /= m.c # <<<<<<<<<<<<<< @@ -5999,7 +5999,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c / __pyx_v_m.c); - /* "src/_squish/core.pyx":317 + /* "squish/_squish/core.pyx":317 * self.b /= m.b * self.c /= m.c * self.d /= m.d # <<<<<<<<<<<<<< @@ -6008,7 +6008,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d / __pyx_v_m.d); - /* "src/_squish/core.pyx":318 + /* "squish/_squish/core.pyx":318 * self.c /= m.c * self.d /= m.d * return self # <<<<<<<<<<<<<< @@ -6018,7 +6018,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":313 + /* "squish/_squish/core.pyx":313 * return self * * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6031,7 +6031,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":320 +/* "squish/_squish/core.pyx":320 * return self * * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6042,7 +6042,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_mdiv_s(__pyx static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":321 + /* "squish/_squish/core.pyx":321 * * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a += s # <<<<<<<<<<<<<< @@ -6051,7 +6051,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a + __pyx_v_s); - /* "src/_squish/core.pyx":322 + /* "squish/_squish/core.pyx":322 * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a += s * self.b += s # <<<<<<<<<<<<<< @@ -6060,7 +6060,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b + __pyx_v_s); - /* "src/_squish/core.pyx":323 + /* "squish/_squish/core.pyx":323 * self.a += s * self.b += s * self.c += s # <<<<<<<<<<<<<< @@ -6069,7 +6069,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c + __pyx_v_s); - /* "src/_squish/core.pyx":324 + /* "squish/_squish/core.pyx":324 * self.b += s * self.c += s * self.d += s # <<<<<<<<<<<<<< @@ -6078,7 +6078,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d + __pyx_v_s); - /* "src/_squish/core.pyx":325 + /* "squish/_squish/core.pyx":325 * self.c += s * self.d += s * return self # <<<<<<<<<<<<<< @@ -6088,7 +6088,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":320 + /* "squish/_squish/core.pyx":320 * return self * * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6101,7 +6101,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":327 +/* "squish/_squish/core.pyx":327 * return self * * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6112,7 +6112,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sadd_s(__pyx static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":328 + /* "squish/_squish/core.pyx":328 * * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a -= s # <<<<<<<<<<<<<< @@ -6121,7 +6121,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a - __pyx_v_s); - /* "src/_squish/core.pyx":329 + /* "squish/_squish/core.pyx":329 * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a -= s * self.b -= s # <<<<<<<<<<<<<< @@ -6130,7 +6130,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b - __pyx_v_s); - /* "src/_squish/core.pyx":330 + /* "squish/_squish/core.pyx":330 * self.a -= s * self.b -= s * self.c -= s # <<<<<<<<<<<<<< @@ -6139,7 +6139,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c - __pyx_v_s); - /* "src/_squish/core.pyx":331 + /* "squish/_squish/core.pyx":331 * self.b -= s * self.c -= s * self.d -= s # <<<<<<<<<<<<<< @@ -6148,7 +6148,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d - __pyx_v_s); - /* "src/_squish/core.pyx":332 + /* "squish/_squish/core.pyx":332 * self.c -= s * self.d -= s * return self # <<<<<<<<<<<<<< @@ -6158,7 +6158,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":327 + /* "squish/_squish/core.pyx":327 * return self * * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6171,7 +6171,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":334 +/* "squish/_squish/core.pyx":334 * return self * * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6182,7 +6182,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_ssub_s(__pyx static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":335 + /* "squish/_squish/core.pyx":335 * * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a *= s # <<<<<<<<<<<<<< @@ -6191,7 +6191,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a * __pyx_v_s); - /* "src/_squish/core.pyx":336 + /* "squish/_squish/core.pyx":336 * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a *= s * self.b *= s # <<<<<<<<<<<<<< @@ -6200,7 +6200,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b * __pyx_v_s); - /* "src/_squish/core.pyx":337 + /* "squish/_squish/core.pyx":337 * self.a *= s * self.b *= s * self.c *= s # <<<<<<<<<<<<<< @@ -6209,7 +6209,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c * __pyx_v_s); - /* "src/_squish/core.pyx":338 + /* "squish/_squish/core.pyx":338 * self.b *= s * self.c *= s * self.d *= s # <<<<<<<<<<<<<< @@ -6218,7 +6218,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d * __pyx_v_s); - /* "src/_squish/core.pyx":339 + /* "squish/_squish/core.pyx":339 * self.c *= s * self.d *= s * return self # <<<<<<<<<<<<<< @@ -6228,7 +6228,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":334 + /* "squish/_squish/core.pyx":334 * return self * * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6241,7 +6241,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":341 +/* "squish/_squish/core.pyx":341 * return self * * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6252,7 +6252,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_smul_s(__pyx static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sdiv_s(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 *__pyx_r; - /* "src/_squish/core.pyx":342 + /* "squish/_squish/core.pyx":342 * * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a /= s # <<<<<<<<<<<<<< @@ -6261,7 +6261,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sdiv_s(__pyx */ __pyx_v_self->a = (__pyx_v_self->a / __pyx_v_s); - /* "src/_squish/core.pyx":343 + /* "squish/_squish/core.pyx":343 * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a /= s * self.b /= s # <<<<<<<<<<<<<< @@ -6270,7 +6270,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sdiv_s(__pyx */ __pyx_v_self->b = (__pyx_v_self->b / __pyx_v_s); - /* "src/_squish/core.pyx":344 + /* "squish/_squish/core.pyx":344 * self.a /= s * self.b /= s * self.c /= s # <<<<<<<<<<<<<< @@ -6279,7 +6279,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sdiv_s(__pyx */ __pyx_v_self->c = (__pyx_v_self->c / __pyx_v_s); - /* "src/_squish/core.pyx":345 + /* "squish/_squish/core.pyx":345 * self.b /= s * self.c /= s * self.d /= s # <<<<<<<<<<<<<< @@ -6288,7 +6288,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sdiv_s(__pyx */ __pyx_v_self->d = (__pyx_v_self->d / __pyx_v_s); - /* "src/_squish/core.pyx":346 + /* "squish/_squish/core.pyx":346 * self.c /= s * self.d /= s * return self # <<<<<<<<<<<<<< @@ -6298,7 +6298,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sdiv_s(__pyx __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":341 + /* "squish/_squish/core.pyx":341 * return self * * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6311,7 +6311,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_sdiv_s(__pyx return __pyx_r; } -/* "src/_squish/core.pyx":348 +/* "squish/_squish/core.pyx":348 * return self * * cdef inline Matrix2x2* m_matmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6326,7 +6326,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_matmul_s(__p __pyx_t_7_squish_FLOAT_T __pyx_t_3; __pyx_t_7_squish_FLOAT_T __pyx_t_4; - /* "src/_squish/core.pyx":350 + /* "squish/_squish/core.pyx":350 * cdef inline Matrix2x2* m_matmul_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a, self.b, self.c, self.d = \ * self.a*m.a + self.b*m.c, self.a*m.b + self.b*m.d, \ # <<<<<<<<<<<<<< @@ -6336,7 +6336,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_matmul_s(__p __pyx_t_1 = ((__pyx_v_self->a * __pyx_v_m.a) + (__pyx_v_self->b * __pyx_v_m.c)); __pyx_t_2 = ((__pyx_v_self->a * __pyx_v_m.b) + (__pyx_v_self->b * __pyx_v_m.d)); - /* "src/_squish/core.pyx":351 + /* "squish/_squish/core.pyx":351 * self.a, self.b, self.c, self.d = \ * self.a*m.a + self.b*m.c, self.a*m.b + self.b*m.d, \ * self.c*m.a + self.d*m.c, self.c*m.b + self.d*m.d # <<<<<<<<<<<<<< @@ -6346,7 +6346,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_matmul_s(__p __pyx_t_3 = ((__pyx_v_self->c * __pyx_v_m.a) + (__pyx_v_self->d * __pyx_v_m.c)); __pyx_t_4 = ((__pyx_v_self->c * __pyx_v_m.b) + (__pyx_v_self->d * __pyx_v_m.d)); - /* "src/_squish/core.pyx":349 + /* "squish/_squish/core.pyx":349 * * cdef inline Matrix2x2* m_matmul_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a, self.b, self.c, self.d = \ # <<<<<<<<<<<<<< @@ -6358,7 +6358,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_matmul_s(__p __pyx_v_self->c = __pyx_t_3; __pyx_v_self->d = __pyx_t_4; - /* "src/_squish/core.pyx":352 + /* "squish/_squish/core.pyx":352 * self.a*m.a + self.b*m.c, self.a*m.b + self.b*m.d, \ * self.c*m.a + self.d*m.c, self.c*m.b + self.d*m.d * return self # <<<<<<<<<<<<<< @@ -6368,7 +6368,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_matmul_s(__p __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "src/_squish/core.pyx":348 + /* "squish/_squish/core.pyx":348 * return self * * cdef inline Matrix2x2* m_matmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6381,7 +6381,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_matmul_s(__p return __pyx_r; } -/* "src/_squish/core.pyx":354 +/* "squish/_squish/core.pyx":354 * return self * * cdef inline Matrix2x2 m_neg_c(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -6392,7 +6392,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 *__pyx_f_7_squish_m_matmul_s(__p static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_neg_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":355 + /* "squish/_squish/core.pyx":355 * * cdef inline Matrix2x2 m_neg_c(Matrix2x2* self) nogil: * return init.Matrix2x2(-self.a, -self.b, -self.c, -self.d) # <<<<<<<<<<<<<< @@ -6402,7 +6402,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_neg_c(__pyx_t __pyx_r = __pyx_v_7_squish_init.Matrix2x2((-__pyx_v_self->a), (-__pyx_v_self->b), (-__pyx_v_self->c), (-__pyx_v_self->d)); goto __pyx_L0; - /* "src/_squish/core.pyx":354 + /* "squish/_squish/core.pyx":354 * return self * * cdef inline Matrix2x2 m_neg_c(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -6415,7 +6415,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_neg_c(__pyx_t return __pyx_r; } -/* "src/_squish/core.pyx":357 +/* "squish/_squish/core.pyx":357 * return init.Matrix2x2(-self.a, -self.b, -self.c, -self.d) * * cdef inline Matrix2x2 m_madd_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6426,7 +6426,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_neg_c(__pyx_t static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_madd_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":358 + /* "squish/_squish/core.pyx":358 * * cdef inline Matrix2x2 m_madd_c(Matrix2x2* self, Matrix2x2 m) nogil: * return init.Matrix2x2(self.a+m.a, self.b+m.b, self.c+m.c, self.d+m.d) # <<<<<<<<<<<<<< @@ -6436,7 +6436,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_madd_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a + __pyx_v_m.a), (__pyx_v_self->b + __pyx_v_m.b), (__pyx_v_self->c + __pyx_v_m.c), (__pyx_v_self->d + __pyx_v_m.d)); goto __pyx_L0; - /* "src/_squish/core.pyx":357 + /* "squish/_squish/core.pyx":357 * return init.Matrix2x2(-self.a, -self.b, -self.c, -self.d) * * cdef inline Matrix2x2 m_madd_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6449,7 +6449,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_madd_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":360 +/* "squish/_squish/core.pyx":360 * return init.Matrix2x2(self.a+m.a, self.b+m.b, self.c+m.c, self.d+m.d) * * cdef inline Matrix2x2 m_msub_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6460,7 +6460,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_madd_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_msub_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":361 + /* "squish/_squish/core.pyx":361 * * cdef inline Matrix2x2 m_msub_c(Matrix2x2* self, Matrix2x2 m) nogil: * return init.Matrix2x2(self.a-m.a, self.b-m.b, self.c-m.c, self.d-m.d) # <<<<<<<<<<<<<< @@ -6470,7 +6470,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_msub_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a - __pyx_v_m.a), (__pyx_v_self->b - __pyx_v_m.b), (__pyx_v_self->c - __pyx_v_m.c), (__pyx_v_self->d - __pyx_v_m.d)); goto __pyx_L0; - /* "src/_squish/core.pyx":360 + /* "squish/_squish/core.pyx":360 * return init.Matrix2x2(self.a+m.a, self.b+m.b, self.c+m.c, self.d+m.d) * * cdef inline Matrix2x2 m_msub_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6483,7 +6483,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_msub_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":363 +/* "squish/_squish/core.pyx":363 * return init.Matrix2x2(self.a-m.a, self.b-m.b, self.c-m.c, self.d-m.d) * * cdef inline Matrix2x2 m_mmul_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6494,7 +6494,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_msub_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mmul_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":364 + /* "squish/_squish/core.pyx":364 * * cdef inline Matrix2x2 m_mmul_c(Matrix2x2* self, Matrix2x2 m) nogil: * return init.Matrix2x2(self.a*m.a, self.b*m.b, self.c*m.c, self.d*m.d) # <<<<<<<<<<<<<< @@ -6504,7 +6504,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mmul_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a * __pyx_v_m.a), (__pyx_v_self->b * __pyx_v_m.b), (__pyx_v_self->c * __pyx_v_m.c), (__pyx_v_self->d * __pyx_v_m.d)); goto __pyx_L0; - /* "src/_squish/core.pyx":363 + /* "squish/_squish/core.pyx":363 * return init.Matrix2x2(self.a-m.a, self.b-m.b, self.c-m.c, self.d-m.d) * * cdef inline Matrix2x2 m_mmul_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6517,7 +6517,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mmul_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":366 +/* "squish/_squish/core.pyx":366 * return init.Matrix2x2(self.a*m.a, self.b*m.b, self.c*m.c, self.d*m.d) * * cdef inline Matrix2x2 m_mdiv_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6528,7 +6528,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mmul_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mdiv_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":367 + /* "squish/_squish/core.pyx":367 * * cdef inline Matrix2x2 m_mdiv_c(Matrix2x2* self, Matrix2x2 m) nogil: * return init.Matrix2x2(self.a/m.a, self.b/m.b, self.c/m.c, self.d/m.d) # <<<<<<<<<<<<<< @@ -6538,7 +6538,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mdiv_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a / __pyx_v_m.a), (__pyx_v_self->b / __pyx_v_m.b), (__pyx_v_self->c / __pyx_v_m.c), (__pyx_v_self->d / __pyx_v_m.d)); goto __pyx_L0; - /* "src/_squish/core.pyx":366 + /* "squish/_squish/core.pyx":366 * return init.Matrix2x2(self.a*m.a, self.b*m.b, self.c*m.c, self.d*m.d) * * cdef inline Matrix2x2 m_mdiv_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6551,7 +6551,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mdiv_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":369 +/* "squish/_squish/core.pyx":369 * return init.Matrix2x2(self.a/m.a, self.b/m.b, self.c/m.c, self.d/m.d) * * cdef inline Matrix2x2 m_sadd_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6562,7 +6562,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_mdiv_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sadd_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":370 + /* "squish/_squish/core.pyx":370 * * cdef inline Matrix2x2 m_sadd_c(Matrix2x2* self, FLOAT_T s) nogil: * return init.Matrix2x2(self.a+s, self.b+s, self.c+s, self.d+s) # <<<<<<<<<<<<<< @@ -6572,7 +6572,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sadd_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a + __pyx_v_s), (__pyx_v_self->b + __pyx_v_s), (__pyx_v_self->c + __pyx_v_s), (__pyx_v_self->d + __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":369 + /* "squish/_squish/core.pyx":369 * return init.Matrix2x2(self.a/m.a, self.b/m.b, self.c/m.c, self.d/m.d) * * cdef inline Matrix2x2 m_sadd_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6585,7 +6585,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sadd_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":372 +/* "squish/_squish/core.pyx":372 * return init.Matrix2x2(self.a+s, self.b+s, self.c+s, self.d+s) * * cdef inline Matrix2x2 m_ssub_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6596,7 +6596,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sadd_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_ssub_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":373 + /* "squish/_squish/core.pyx":373 * * cdef inline Matrix2x2 m_ssub_c(Matrix2x2* self, FLOAT_T s) nogil: * return init.Matrix2x2(self.a-s, self.b-s, self.c-s, self.d-s) # <<<<<<<<<<<<<< @@ -6606,7 +6606,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_ssub_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a - __pyx_v_s), (__pyx_v_self->b - __pyx_v_s), (__pyx_v_self->c - __pyx_v_s), (__pyx_v_self->d - __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":372 + /* "squish/_squish/core.pyx":372 * return init.Matrix2x2(self.a+s, self.b+s, self.c+s, self.d+s) * * cdef inline Matrix2x2 m_ssub_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6619,7 +6619,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_ssub_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":375 +/* "squish/_squish/core.pyx":375 * return init.Matrix2x2(self.a-s, self.b-s, self.c-s, self.d-s) * * cdef inline Matrix2x2 m_smul_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6630,7 +6630,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_ssub_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_smul_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":376 + /* "squish/_squish/core.pyx":376 * * cdef inline Matrix2x2 m_smul_c(Matrix2x2* self, FLOAT_T s) nogil: * return init.Matrix2x2(self.a*s, self.b*s, self.c*s, self.d*s) # <<<<<<<<<<<<<< @@ -6640,7 +6640,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_smul_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a * __pyx_v_s), (__pyx_v_self->b * __pyx_v_s), (__pyx_v_self->c * __pyx_v_s), (__pyx_v_self->d * __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":375 + /* "squish/_squish/core.pyx":375 * return init.Matrix2x2(self.a-s, self.b-s, self.c-s, self.d-s) * * cdef inline Matrix2x2 m_smul_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6653,7 +6653,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_smul_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":378 +/* "squish/_squish/core.pyx":378 * return init.Matrix2x2(self.a*s, self.b*s, self.c*s, self.d*s) * * cdef inline Matrix2x2 m_sdiv_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6664,7 +6664,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_smul_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sdiv_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_FLOAT_T __pyx_v_s) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":379 + /* "squish/_squish/core.pyx":379 * * cdef inline Matrix2x2 m_sdiv_c(Matrix2x2* self, FLOAT_T s) nogil: * return init.Matrix2x2(self.a/s, self.b/s, self.c/s, self.d/s) # <<<<<<<<<<<<<< @@ -6674,7 +6674,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sdiv_c(__pyx_ __pyx_r = __pyx_v_7_squish_init.Matrix2x2((__pyx_v_self->a / __pyx_v_s), (__pyx_v_self->b / __pyx_v_s), (__pyx_v_self->c / __pyx_v_s), (__pyx_v_self->d / __pyx_v_s)); goto __pyx_L0; - /* "src/_squish/core.pyx":378 + /* "squish/_squish/core.pyx":378 * return init.Matrix2x2(self.a*s, self.b*s, self.c*s, self.d*s) * * cdef inline Matrix2x2 m_sdiv_c(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6687,7 +6687,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sdiv_c(__pyx_ return __pyx_r; } -/* "src/_squish/core.pyx":381 +/* "squish/_squish/core.pyx":381 * return init.Matrix2x2(self.a/s, self.b/s, self.c/s, self.d/s) * * cdef inline Matrix2x2 m_matmul_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6698,7 +6698,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_sdiv_c(__pyx_ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_matmul_c(__pyx_t_7_squish_Matrix2x2 *__pyx_v_self, __pyx_t_7_squish_Matrix2x2 __pyx_v_m) { __pyx_t_7_squish_Matrix2x2 __pyx_r; - /* "src/_squish/core.pyx":382 + /* "squish/_squish/core.pyx":382 * * cdef inline Matrix2x2 m_matmul_c(Matrix2x2* self, Matrix2x2 m) nogil: * return init.Matrix2x2( # <<<<<<<<<<<<<< @@ -6708,7 +6708,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_matmul_c(__py __pyx_r = __pyx_v_7_squish_init.Matrix2x2(((__pyx_v_self->a * __pyx_v_m.a) + (__pyx_v_self->b * __pyx_v_m.c)), ((__pyx_v_self->a * __pyx_v_m.b) + (__pyx_v_self->b * __pyx_v_m.d)), ((__pyx_v_self->c * __pyx_v_m.a) + (__pyx_v_self->d * __pyx_v_m.c)), ((__pyx_v_self->c * __pyx_v_m.b) + (__pyx_v_self->d * __pyx_v_m.d))); goto __pyx_L0; - /* "src/_squish/core.pyx":381 + /* "squish/_squish/core.pyx":381 * return init.Matrix2x2(self.a/s, self.b/s, self.c/s, self.d/s) * * cdef inline Matrix2x2 m_matmul_c(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6721,7 +6721,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_m_matmul_c(__py return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":17 +/* "squish/_squish/voronoi_dcel.pyx":17 * #### SiteCacheMap Methods #### * * cdef inline SiteCacheMap init_sitecachemap(INT_T iarea, INT_T iperim, INT_T iisoparam, # <<<<<<<<<<<<<< @@ -6743,7 +6743,7 @@ static CYTHON_INLINE __pyx_t_7_squish_SiteCacheMap __pyx_f_7_squish_init_sitecac __pyx_t_7_squish_FLOAT_T (*__pyx_t_9)(__pyx_t_7_squish_Site *, __pyx_t_7_squish_FLOAT_T); __pyx_t_7_squish_FLOAT_T (*__pyx_t_10)(__pyx_t_7_squish_Site *, __pyx_t_7_squish_FLOAT_T); - /* "src/_squish/voronoi_dcel.pyx":21 + /* "squish/_squish/voronoi_dcel.pyx":21 * cdef SiteCacheMap sc * sc.iarea, sc.iperim, sc.iisoparam, sc.ienergy, sc.iavg_radius = \ * iarea, iperim, iisoparam, ienergy, iavg_radius # <<<<<<<<<<<<<< @@ -6756,7 +6756,7 @@ static CYTHON_INLINE __pyx_t_7_squish_SiteCacheMap __pyx_f_7_squish_init_sitecac __pyx_t_4 = __pyx_v_ienergy; __pyx_t_5 = __pyx_v_iavg_radius; - /* "src/_squish/voronoi_dcel.pyx":20 + /* "squish/_squish/voronoi_dcel.pyx":20 * INT_T ienergy, INT_T iavg_radius) nogil: * cdef SiteCacheMap sc * sc.iarea, sc.iperim, sc.iisoparam, sc.ienergy, sc.iavg_radius = \ # <<<<<<<<<<<<<< @@ -6769,7 +6769,7 @@ static CYTHON_INLINE __pyx_t_7_squish_SiteCacheMap __pyx_f_7_squish_init_sitecac __pyx_v_sc.ienergy = __pyx_t_4; __pyx_v_sc.iavg_radius = __pyx_t_5; - /* "src/_squish/voronoi_dcel.pyx":24 + /* "squish/_squish/voronoi_dcel.pyx":24 * * sc.area, sc.perim, sc.isoparam, sc.energy, sc.avg_radius = \ * area, perim, isoparam, energy, avg_radius # <<<<<<<<<<<<<< @@ -6782,7 +6782,7 @@ static CYTHON_INLINE __pyx_t_7_squish_SiteCacheMap __pyx_f_7_squish_init_sitecac __pyx_t_9 = __pyx_f_7_squish_energy; __pyx_t_10 = __pyx_f_7_squish_avg_radius; - /* "src/_squish/voronoi_dcel.pyx":23 + /* "squish/_squish/voronoi_dcel.pyx":23 * iarea, iperim, iisoparam, ienergy, iavg_radius * * sc.area, sc.perim, sc.isoparam, sc.energy, sc.avg_radius = \ # <<<<<<<<<<<<<< @@ -6795,7 +6795,7 @@ static CYTHON_INLINE __pyx_t_7_squish_SiteCacheMap __pyx_f_7_squish_init_sitecac __pyx_v_sc.energy = __pyx_t_9; __pyx_v_sc.avg_radius = __pyx_t_10; - /* "src/_squish/voronoi_dcel.pyx":26 + /* "squish/_squish/voronoi_dcel.pyx":26 * area, perim, isoparam, energy, avg_radius * * return sc # <<<<<<<<<<<<<< @@ -6805,7 +6805,7 @@ static CYTHON_INLINE __pyx_t_7_squish_SiteCacheMap __pyx_f_7_squish_init_sitecac __pyx_r = __pyx_v_sc; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":17 + /* "squish/_squish/voronoi_dcel.pyx":17 * #### SiteCacheMap Methods #### * * cdef inline SiteCacheMap init_sitecachemap(INT_T iarea, INT_T iperim, INT_T iisoparam, # <<<<<<<<<<<<<< @@ -6818,7 +6818,7 @@ static CYTHON_INLINE __pyx_t_7_squish_SiteCacheMap __pyx_f_7_squish_init_sitecac return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":29 +/* "squish/_squish/voronoi_dcel.pyx":29 * * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -6831,7 +6831,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":30 + /* "squish/_squish/voronoi_dcel.pyx":30 * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6841,7 +6841,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":32 + /* "squish/_squish/voronoi_dcel.pyx":32 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iarea) # <<<<<<<<<<<<<< @@ -6851,7 +6851,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iarea; - /* "src/_squish/voronoi_dcel.pyx":31 + /* "squish/_squish/voronoi_dcel.pyx":31 * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6861,7 +6861,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":30 + /* "squish/_squish/voronoi_dcel.pyx":30 * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6870,7 +6870,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq */ } - /* "src/_squish/voronoi_dcel.pyx":35 + /* "squish/_squish/voronoi_dcel.pyx":35 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6879,7 +6879,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":36 + /* "squish/_squish/voronoi_dcel.pyx":36 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iarea), val) # <<<<<<<<<<<<<< @@ -6889,7 +6889,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iarea; - /* "src/_squish/voronoi_dcel.pyx":35 + /* "squish/_squish/voronoi_dcel.pyx":35 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6898,7 +6898,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":37 + /* "squish/_squish/voronoi_dcel.pyx":37 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iarea), val) * return val # <<<<<<<<<<<<<< @@ -6909,7 +6909,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":29 + /* "squish/_squish/voronoi_dcel.pyx":29 * * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -6922,7 +6922,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_area(__pyx_t_7_sq return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":39 +/* "squish/_squish/voronoi_dcel.pyx":39 * return val * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -6935,7 +6935,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":40 + /* "squish/_squish/voronoi_dcel.pyx":40 * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6945,7 +6945,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":42 + /* "squish/_squish/voronoi_dcel.pyx":42 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iperim) # <<<<<<<<<<<<<< @@ -6955,7 +6955,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iperim; - /* "src/_squish/voronoi_dcel.pyx":41 + /* "squish/_squish/voronoi_dcel.pyx":41 * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6965,7 +6965,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":40 + /* "squish/_squish/voronoi_dcel.pyx":40 * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6974,7 +6974,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s */ } - /* "src/_squish/voronoi_dcel.pyx":45 + /* "squish/_squish/voronoi_dcel.pyx":45 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6983,7 +6983,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":46 + /* "squish/_squish/voronoi_dcel.pyx":46 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iperim), val) # <<<<<<<<<<<<<< @@ -6993,7 +6993,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iperim; - /* "src/_squish/voronoi_dcel.pyx":45 + /* "squish/_squish/voronoi_dcel.pyx":45 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7002,7 +7002,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":47 + /* "squish/_squish/voronoi_dcel.pyx":47 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iperim), val) * return val # <<<<<<<<<<<<<< @@ -7013,7 +7013,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":39 + /* "squish/_squish/voronoi_dcel.pyx":39 * return val * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7026,7 +7026,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_perim(__pyx_t_7_s return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":49 +/* "squish/_squish/voronoi_dcel.pyx":49 * return val * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7039,7 +7039,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":50 + /* "squish/_squish/voronoi_dcel.pyx":50 * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7049,7 +7049,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":52 + /* "squish/_squish/voronoi_dcel.pyx":52 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iisoparam) # <<<<<<<<<<<<<< @@ -7059,7 +7059,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iisoparam; - /* "src/_squish/voronoi_dcel.pyx":51 + /* "squish/_squish/voronoi_dcel.pyx":51 * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7069,7 +7069,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":50 + /* "squish/_squish/voronoi_dcel.pyx":50 * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7078,7 +7078,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ */ } - /* "src/_squish/voronoi_dcel.pyx":55 + /* "squish/_squish/voronoi_dcel.pyx":55 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7087,7 +7087,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":56 + /* "squish/_squish/voronoi_dcel.pyx":56 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iisoparam), val) # <<<<<<<<<<<<<< @@ -7097,7 +7097,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iisoparam; - /* "src/_squish/voronoi_dcel.pyx":55 + /* "squish/_squish/voronoi_dcel.pyx":55 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7106,7 +7106,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":57 + /* "squish/_squish/voronoi_dcel.pyx":57 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iisoparam), val) * return val # <<<<<<<<<<<<<< @@ -7117,7 +7117,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":49 + /* "squish/_squish/voronoi_dcel.pyx":49 * return val * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7130,7 +7130,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_isoparam(__pyx_t_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":59 +/* "squish/_squish/voronoi_dcel.pyx":59 * return val * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7143,7 +7143,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":60 + /* "squish/_squish/voronoi_dcel.pyx":60 * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7153,7 +7153,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":62 + /* "squish/_squish/voronoi_dcel.pyx":62 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.ienergy) # <<<<<<<<<<<<<< @@ -7163,7 +7163,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ienergy; - /* "src/_squish/voronoi_dcel.pyx":61 + /* "squish/_squish/voronoi_dcel.pyx":61 * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7173,7 +7173,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":60 + /* "squish/_squish/voronoi_dcel.pyx":60 * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7182,7 +7182,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ */ } - /* "src/_squish/voronoi_dcel.pyx":65 + /* "squish/_squish/voronoi_dcel.pyx":65 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7191,7 +7191,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":66 + /* "squish/_squish/voronoi_dcel.pyx":66 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.ienergy), val) # <<<<<<<<<<<<<< @@ -7201,7 +7201,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ienergy; - /* "src/_squish/voronoi_dcel.pyx":65 + /* "squish/_squish/voronoi_dcel.pyx":65 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7210,7 +7210,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":67 + /* "squish/_squish/voronoi_dcel.pyx":67 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.ienergy), val) * return val # <<<<<<<<<<<<<< @@ -7221,7 +7221,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":59 + /* "squish/_squish/voronoi_dcel.pyx":59 * return val * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7234,7 +7234,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_energy(__pyx_t_7_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":69 +/* "squish/_squish/voronoi_dcel.pyx":69 * return val * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7247,7 +7247,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":70 + /* "squish/_squish/voronoi_dcel.pyx":70 * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7257,7 +7257,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":72 + /* "squish/_squish/voronoi_dcel.pyx":72 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iavg_radius) # <<<<<<<<<<<<<< @@ -7267,7 +7267,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iavg_radius; - /* "src/_squish/voronoi_dcel.pyx":71 + /* "squish/_squish/voronoi_dcel.pyx":71 * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7277,7 +7277,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":70 + /* "squish/_squish/voronoi_dcel.pyx":70 * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7286,7 +7286,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ */ } - /* "src/_squish/voronoi_dcel.pyx":75 + /* "squish/_squish/voronoi_dcel.pyx":75 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7295,7 +7295,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":76 + /* "squish/_squish/voronoi_dcel.pyx":76 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iavg_radius), val) # <<<<<<<<<<<<<< @@ -7305,7 +7305,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iavg_radius; - /* "src/_squish/voronoi_dcel.pyx":75 + /* "squish/_squish/voronoi_dcel.pyx":75 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7314,7 +7314,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":77 + /* "squish/_squish/voronoi_dcel.pyx":77 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iavg_radius), val) * return val # <<<<<<<<<<<<<< @@ -7325,7 +7325,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":69 + /* "squish/_squish/voronoi_dcel.pyx":69 * return val * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7338,7 +7338,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_avg_radius(__pyx_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":82 +/* "squish/_squish/voronoi_dcel.pyx":82 * #### EdgeCacheMap Methods #### * * cdef inline EdgeCacheMap init_edgecachemap(INT_T iH, INT_T ila, INT_T ida, INT_T ixij, # <<<<<<<<<<<<<< @@ -7376,7 +7376,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_t_7_squish_FLOAT_T (*__pyx_t_25)(__pyx_t_7_squish_HalfEdge *, __pyx_t_7_squish_FLOAT_T); __pyx_t_7_squish_FLOAT_T (*__pyx_t_26)(__pyx_t_7_squish_HalfEdge *, __pyx_t_7_squish_FLOAT_T); - /* "src/_squish/voronoi_dcel.pyx":87 + /* "squish/_squish/voronoi_dcel.pyx":87 * cdef EdgeCacheMap ec * ec.iH, ec.ila, ec.ida, ec.ixij, ec.idVdv, ec.ii2p, ec.ila_mag, ec.ida_mag, ec.iphi, \ * ec.iB, ec.iF, ec.ilntan, ec.icsc = iH, ila, ida, ixij, idVdv, ii2p, \ # <<<<<<<<<<<<<< @@ -7390,7 +7390,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_t_5 = __pyx_v_idVdv; __pyx_t_6 = __pyx_v_ii2p; - /* "src/_squish/voronoi_dcel.pyx":88 + /* "squish/_squish/voronoi_dcel.pyx":88 * ec.iH, ec.ila, ec.ida, ec.ixij, ec.idVdv, ec.ii2p, ec.ila_mag, ec.ida_mag, ec.iphi, \ * ec.iB, ec.iF, ec.ilntan, ec.icsc = iH, ila, ida, ixij, idVdv, ii2p, \ * ila_mag, ida_mag, iphi, iB, iF, ilntan, icsc # <<<<<<<<<<<<<< @@ -7405,7 +7405,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_t_12 = __pyx_v_ilntan; __pyx_t_13 = __pyx_v_icsc; - /* "src/_squish/voronoi_dcel.pyx":86 + /* "squish/_squish/voronoi_dcel.pyx":86 * INT_T iF, INT_T ilntan, INT_T icsc, INT_T size) nogil: * cdef EdgeCacheMap ec * ec.iH, ec.ila, ec.ida, ec.ixij, ec.idVdv, ec.ii2p, ec.ila_mag, ec.ida_mag, ec.iphi, \ # <<<<<<<<<<<<<< @@ -7422,7 +7422,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_v_ec.ida_mag = __pyx_t_8; __pyx_v_ec.iphi = __pyx_t_9; - /* "src/_squish/voronoi_dcel.pyx":87 + /* "squish/_squish/voronoi_dcel.pyx":87 * cdef EdgeCacheMap ec * ec.iH, ec.ila, ec.ida, ec.ixij, ec.idVdv, ec.ii2p, ec.ila_mag, ec.ida_mag, ec.iphi, \ * ec.iB, ec.iF, ec.ilntan, ec.icsc = iH, ila, ida, ixij, idVdv, ii2p, \ # <<<<<<<<<<<<<< @@ -7434,7 +7434,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_v_ec.ilntan = __pyx_t_12; __pyx_v_ec.icsc = __pyx_t_13; - /* "src/_squish/voronoi_dcel.pyx":89 + /* "squish/_squish/voronoi_dcel.pyx":89 * ec.iB, ec.iF, ec.ilntan, ec.icsc = iH, ila, ida, ixij, idVdv, ii2p, \ * ila_mag, ida_mag, iphi, iB, iF, ilntan, icsc * ec.size = size # <<<<<<<<<<<<<< @@ -7443,7 +7443,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac */ __pyx_v_ec.size = __pyx_v_size; - /* "src/_squish/voronoi_dcel.pyx":92 + /* "squish/_squish/voronoi_dcel.pyx":92 * * ec.H, ec.la, ec.da, ec.xij, ec.dVdv, ec.i2p, ec.la_mag, ec.da_mag, ec.phi, ec.B, ec.F, \ * ec.lntan, ec.csc = H, la, da, xij, dVdv, i2p, la_mag, da_mag, phi, B, F, lntan, csc # <<<<<<<<<<<<<< @@ -7464,7 +7464,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_t_25 = __pyx_f_7_squish_lntan; __pyx_t_26 = __pyx_f_7_squish_csc; - /* "src/_squish/voronoi_dcel.pyx":91 + /* "squish/_squish/voronoi_dcel.pyx":91 * ec.size = size * * ec.H, ec.la, ec.da, ec.xij, ec.dVdv, ec.i2p, ec.la_mag, ec.da_mag, ec.phi, ec.B, ec.F, \ # <<<<<<<<<<<<<< @@ -7483,7 +7483,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_v_ec.B = __pyx_t_23; __pyx_v_ec.F = __pyx_t_24; - /* "src/_squish/voronoi_dcel.pyx":92 + /* "squish/_squish/voronoi_dcel.pyx":92 * * ec.H, ec.la, ec.da, ec.xij, ec.dVdv, ec.i2p, ec.la_mag, ec.da_mag, ec.phi, ec.B, ec.F, \ * ec.lntan, ec.csc = H, la, da, xij, dVdv, i2p, la_mag, da_mag, phi, B, F, lntan, csc # <<<<<<<<<<<<<< @@ -7493,7 +7493,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_v_ec.lntan = __pyx_t_25; __pyx_v_ec.csc = __pyx_t_26; - /* "src/_squish/voronoi_dcel.pyx":94 + /* "squish/_squish/voronoi_dcel.pyx":94 * ec.lntan, ec.csc = H, la, da, xij, dVdv, i2p, la_mag, da_mag, phi, B, F, lntan, csc * * return ec # <<<<<<<<<<<<<< @@ -7503,7 +7503,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac __pyx_r = __pyx_v_ec; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":82 + /* "squish/_squish/voronoi_dcel.pyx":82 * #### EdgeCacheMap Methods #### * * cdef inline EdgeCacheMap init_edgecachemap(INT_T iH, INT_T ila, INT_T ida, INT_T ixij, # <<<<<<<<<<<<<< @@ -7516,7 +7516,7 @@ static CYTHON_INLINE __pyx_t_7_squish_EdgeCacheMap __pyx_f_7_squish_init_edgecac return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":97 +/* "squish/_squish/voronoi_dcel.pyx":97 * * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: # <<<<<<<<<<<<<< @@ -7532,7 +7532,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_4; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_5; - /* "src/_squish/voronoi_dcel.pyx":98 + /* "squish/_squish/voronoi_dcel.pyx":98 * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: * if isnan(val.a): # <<<<<<<<<<<<<< @@ -7542,7 +7542,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_1 = (isnan(((double)__pyx_v_val.a)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":101 + /* "squish/_squish/voronoi_dcel.pyx":101 * return init.Matrix2x2( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH) # <<<<<<<<<<<<<< @@ -7552,7 +7552,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iH; - /* "src/_squish/voronoi_dcel.pyx":104 + /* "squish/_squish/voronoi_dcel.pyx":104 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH+1) # <<<<<<<<<<<<<< @@ -7562,7 +7562,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->iH + 1); - /* "src/_squish/voronoi_dcel.pyx":107 + /* "squish/_squish/voronoi_dcel.pyx":107 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH+2) # <<<<<<<<<<<<<< @@ -7572,7 +7572,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_4.f0 = __pyx_v_self->arr_index; __pyx_t_4.f1 = (__pyx_v_self->cache->iH + 2); - /* "src/_squish/voronoi_dcel.pyx":110 + /* "squish/_squish/voronoi_dcel.pyx":110 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH+3) # <<<<<<<<<<<<<< @@ -7582,7 +7582,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 3); - /* "src/_squish/voronoi_dcel.pyx":99 + /* "squish/_squish/voronoi_dcel.pyx":99 * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: * if isnan(val.a): * return init.Matrix2x2( # <<<<<<<<<<<<<< @@ -7592,7 +7592,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_r = __pyx_v_7_squish_init.Matrix2x2(__pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_3), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_4), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_5)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":98 + /* "squish/_squish/voronoi_dcel.pyx":98 * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: * if isnan(val.a): # <<<<<<<<<<<<<< @@ -7601,7 +7601,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ */ } - /* "src/_squish/voronoi_dcel.pyx":114 + /* "squish/_squish/voronoi_dcel.pyx":114 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7610,7 +7610,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":115 + /* "squish/_squish/voronoi_dcel.pyx":115 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH), val.a) # <<<<<<<<<<<<<< @@ -7620,7 +7620,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = __pyx_v_self->cache->iH; - /* "src/_squish/voronoi_dcel.pyx":114 + /* "squish/_squish/voronoi_dcel.pyx":114 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7629,7 +7629,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.a); - /* "src/_squish/voronoi_dcel.pyx":117 + /* "squish/_squish/voronoi_dcel.pyx":117 * (self.arr_index, self.cache.iH), val.a) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH+1), val.b) # <<<<<<<<<<<<<< @@ -7639,7 +7639,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 1); - /* "src/_squish/voronoi_dcel.pyx":116 + /* "squish/_squish/voronoi_dcel.pyx":116 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH), val.a) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7648,7 +7648,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.b); - /* "src/_squish/voronoi_dcel.pyx":119 + /* "squish/_squish/voronoi_dcel.pyx":119 * (self.arr_index, self.cache.iH+1), val.b) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH+2), val.c) # <<<<<<<<<<<<<< @@ -7658,7 +7658,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 2); - /* "src/_squish/voronoi_dcel.pyx":118 + /* "squish/_squish/voronoi_dcel.pyx":118 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH+1), val.b) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7667,7 +7667,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.c); - /* "src/_squish/voronoi_dcel.pyx":121 + /* "squish/_squish/voronoi_dcel.pyx":121 * (self.arr_index, self.cache.iH+2), val.c) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH+3), val.d) # <<<<<<<<<<<<<< @@ -7677,7 +7677,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 3); - /* "src/_squish/voronoi_dcel.pyx":120 + /* "squish/_squish/voronoi_dcel.pyx":120 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH+2), val.c) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7686,7 +7686,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.d); - /* "src/_squish/voronoi_dcel.pyx":122 + /* "squish/_squish/voronoi_dcel.pyx":122 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH+3), val.d) * return val # <<<<<<<<<<<<<< @@ -7697,7 +7697,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":97 + /* "squish/_squish/voronoi_dcel.pyx":97 * * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: # <<<<<<<<<<<<<< @@ -7710,7 +7710,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_H(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":124 +/* "squish/_squish/voronoi_dcel.pyx":124 * return val * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7724,7 +7724,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":125 + /* "squish/_squish/voronoi_dcel.pyx":125 * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7734,7 +7734,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":128 + /* "squish/_squish/voronoi_dcel.pyx":128 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ila) # <<<<<<<<<<<<<< @@ -7744,7 +7744,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ila; - /* "src/_squish/voronoi_dcel.pyx":131 + /* "squish/_squish/voronoi_dcel.pyx":131 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ila+1) # <<<<<<<<<<<<<< @@ -7754,7 +7754,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ila + 1); - /* "src/_squish/voronoi_dcel.pyx":126 + /* "squish/_squish/voronoi_dcel.pyx":126 * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< @@ -7764,7 +7764,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ __pyx_r = __pyx_v_7_squish_init.Vector2D(__pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_3)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":125 + /* "squish/_squish/voronoi_dcel.pyx":125 * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7773,7 +7773,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ */ } - /* "src/_squish/voronoi_dcel.pyx":135 + /* "squish/_squish/voronoi_dcel.pyx":135 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7782,7 +7782,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":136 + /* "squish/_squish/voronoi_dcel.pyx":136 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila), val.x) # <<<<<<<<<<<<<< @@ -7792,7 +7792,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ila; - /* "src/_squish/voronoi_dcel.pyx":135 + /* "squish/_squish/voronoi_dcel.pyx":135 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7801,7 +7801,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "src/_squish/voronoi_dcel.pyx":138 + /* "squish/_squish/voronoi_dcel.pyx":138 * (self.arr_index, self.cache.ila), val.x) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila+1), val.y) # <<<<<<<<<<<<<< @@ -7811,7 +7811,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ila + 1); - /* "src/_squish/voronoi_dcel.pyx":137 + /* "squish/_squish/voronoi_dcel.pyx":137 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila), val.x) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7820,7 +7820,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "src/_squish/voronoi_dcel.pyx":139 + /* "squish/_squish/voronoi_dcel.pyx":139 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila+1), val.y) * return val # <<<<<<<<<<<<<< @@ -7831,7 +7831,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":124 + /* "squish/_squish/voronoi_dcel.pyx":124 * return val * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7844,7 +7844,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_la(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":141 +/* "squish/_squish/voronoi_dcel.pyx":141 * return val * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7858,7 +7858,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":142 + /* "squish/_squish/voronoi_dcel.pyx":142 * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7868,7 +7868,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":145 + /* "squish/_squish/voronoi_dcel.pyx":145 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ida) # <<<<<<<<<<<<<< @@ -7878,7 +7878,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ida; - /* "src/_squish/voronoi_dcel.pyx":148 + /* "squish/_squish/voronoi_dcel.pyx":148 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ida+1) # <<<<<<<<<<<<<< @@ -7888,7 +7888,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ida + 1); - /* "src/_squish/voronoi_dcel.pyx":143 + /* "squish/_squish/voronoi_dcel.pyx":143 * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< @@ -7898,7 +7898,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ __pyx_r = __pyx_v_7_squish_init.Vector2D(__pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_3)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":142 + /* "squish/_squish/voronoi_dcel.pyx":142 * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7907,7 +7907,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ */ } - /* "src/_squish/voronoi_dcel.pyx":152 + /* "squish/_squish/voronoi_dcel.pyx":152 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7916,7 +7916,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":153 + /* "squish/_squish/voronoi_dcel.pyx":153 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida), val.x) # <<<<<<<<<<<<<< @@ -7926,7 +7926,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ida; - /* "src/_squish/voronoi_dcel.pyx":152 + /* "squish/_squish/voronoi_dcel.pyx":152 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7935,7 +7935,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "src/_squish/voronoi_dcel.pyx":155 + /* "squish/_squish/voronoi_dcel.pyx":155 * (self.arr_index, self.cache.ida), val.x) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida+1), val.y) # <<<<<<<<<<<<<< @@ -7945,7 +7945,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ida + 1); - /* "src/_squish/voronoi_dcel.pyx":154 + /* "squish/_squish/voronoi_dcel.pyx":154 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida), val.x) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7954,7 +7954,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "src/_squish/voronoi_dcel.pyx":156 + /* "squish/_squish/voronoi_dcel.pyx":156 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida+1), val.y) * return val # <<<<<<<<<<<<<< @@ -7965,7 +7965,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":141 + /* "squish/_squish/voronoi_dcel.pyx":141 * return val * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7978,7 +7978,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_da(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":158 +/* "squish/_squish/voronoi_dcel.pyx":158 * return val * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7992,7 +7992,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":159 + /* "squish/_squish/voronoi_dcel.pyx":159 * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8002,7 +8002,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":162 + /* "squish/_squish/voronoi_dcel.pyx":162 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ixij) # <<<<<<<<<<<<<< @@ -8012,7 +8012,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ixij; - /* "src/_squish/voronoi_dcel.pyx":165 + /* "squish/_squish/voronoi_dcel.pyx":165 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ixij+1) # <<<<<<<<<<<<<< @@ -8022,7 +8022,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ixij + 1); - /* "src/_squish/voronoi_dcel.pyx":160 + /* "squish/_squish/voronoi_dcel.pyx":160 * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< @@ -8032,7 +8032,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq __pyx_r = __pyx_v_7_squish_init.Vector2D(__pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_3)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":159 + /* "squish/_squish/voronoi_dcel.pyx":159 * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8041,7 +8041,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq */ } - /* "src/_squish/voronoi_dcel.pyx":169 + /* "squish/_squish/voronoi_dcel.pyx":169 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8050,7 +8050,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":170 + /* "squish/_squish/voronoi_dcel.pyx":170 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ixij), val.x) # <<<<<<<<<<<<<< @@ -8060,7 +8060,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ixij; - /* "src/_squish/voronoi_dcel.pyx":169 + /* "squish/_squish/voronoi_dcel.pyx":169 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8069,7 +8069,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "src/_squish/voronoi_dcel.pyx":172 + /* "squish/_squish/voronoi_dcel.pyx":172 * (self.arr_index, self.cache.ixij), val.x) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ixij+1), val.y) # <<<<<<<<<<<<<< @@ -8079,7 +8079,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ixij + 1); - /* "src/_squish/voronoi_dcel.pyx":171 + /* "squish/_squish/voronoi_dcel.pyx":171 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ixij), val.x) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8088,7 +8088,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "src/_squish/voronoi_dcel.pyx":173 + /* "squish/_squish/voronoi_dcel.pyx":173 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ixij+1), val.y) * return val # <<<<<<<<<<<<<< @@ -8099,7 +8099,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":158 + /* "squish/_squish/voronoi_dcel.pyx":158 * return val * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8112,7 +8112,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_xij(__pyx_t_7_sq return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":175 +/* "squish/_squish/voronoi_dcel.pyx":175 * return val * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8126,7 +8126,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":176 + /* "squish/_squish/voronoi_dcel.pyx":176 * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8136,7 +8136,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":179 + /* "squish/_squish/voronoi_dcel.pyx":179 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv) # <<<<<<<<<<<<<< @@ -8146,7 +8146,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->idVdv; - /* "src/_squish/voronoi_dcel.pyx":182 + /* "squish/_squish/voronoi_dcel.pyx":182 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv+1) # <<<<<<<<<<<<<< @@ -8156,7 +8156,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->idVdv + 1); - /* "src/_squish/voronoi_dcel.pyx":177 + /* "squish/_squish/voronoi_dcel.pyx":177 * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< @@ -8166,7 +8166,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s __pyx_r = __pyx_v_7_squish_init.Vector2D(__pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_3)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":176 + /* "squish/_squish/voronoi_dcel.pyx":176 * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8175,7 +8175,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s */ } - /* "src/_squish/voronoi_dcel.pyx":186 + /* "squish/_squish/voronoi_dcel.pyx":186 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8184,7 +8184,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":187 + /* "squish/_squish/voronoi_dcel.pyx":187 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv), val.x) # <<<<<<<<<<<<<< @@ -8194,7 +8194,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->idVdv; - /* "src/_squish/voronoi_dcel.pyx":186 + /* "squish/_squish/voronoi_dcel.pyx":186 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8203,7 +8203,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "src/_squish/voronoi_dcel.pyx":189 + /* "squish/_squish/voronoi_dcel.pyx":189 * (self.arr_index, self.cache.idVdv), val.x) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv+1), val.y) # <<<<<<<<<<<<<< @@ -8213,7 +8213,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->idVdv + 1); - /* "src/_squish/voronoi_dcel.pyx":188 + /* "squish/_squish/voronoi_dcel.pyx":188 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv), val.x) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8222,7 +8222,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "src/_squish/voronoi_dcel.pyx":190 + /* "squish/_squish/voronoi_dcel.pyx":190 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv+1), val.y) * return val # <<<<<<<<<<<<<< @@ -8233,7 +8233,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":175 + /* "squish/_squish/voronoi_dcel.pyx":175 * return val * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8246,7 +8246,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_dVdv(__pyx_t_7_s return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":192 +/* "squish/_squish/voronoi_dcel.pyx":192 * return val * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8260,7 +8260,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":193 + /* "squish/_squish/voronoi_dcel.pyx":193 * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8270,7 +8270,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":196 + /* "squish/_squish/voronoi_dcel.pyx":196 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p) # <<<<<<<<<<<<<< @@ -8280,7 +8280,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ii2p; - /* "src/_squish/voronoi_dcel.pyx":199 + /* "squish/_squish/voronoi_dcel.pyx":199 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p+1) # <<<<<<<<<<<<<< @@ -8290,7 +8290,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ii2p + 1); - /* "src/_squish/voronoi_dcel.pyx":194 + /* "squish/_squish/voronoi_dcel.pyx":194 * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< @@ -8300,7 +8300,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq __pyx_r = __pyx_v_7_squish_init.Vector2D(__pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2), __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_3)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":193 + /* "squish/_squish/voronoi_dcel.pyx":193 * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8309,7 +8309,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq */ } - /* "src/_squish/voronoi_dcel.pyx":203 + /* "squish/_squish/voronoi_dcel.pyx":203 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8318,7 +8318,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":204 + /* "squish/_squish/voronoi_dcel.pyx":204 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p), val.x) # <<<<<<<<<<<<<< @@ -8328,7 +8328,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ii2p; - /* "src/_squish/voronoi_dcel.pyx":203 + /* "squish/_squish/voronoi_dcel.pyx":203 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8337,7 +8337,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "src/_squish/voronoi_dcel.pyx":206 + /* "squish/_squish/voronoi_dcel.pyx":206 * (self.arr_index, self.cache.ii2p), val.x) * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p+1), val.y) # <<<<<<<<<<<<<< @@ -8347,7 +8347,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ii2p + 1); - /* "src/_squish/voronoi_dcel.pyx":205 + /* "squish/_squish/voronoi_dcel.pyx":205 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p), val.x) * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8356,7 +8356,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "src/_squish/voronoi_dcel.pyx":207 + /* "squish/_squish/voronoi_dcel.pyx":207 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p+1), val.y) * return val # <<<<<<<<<<<<<< @@ -8367,7 +8367,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":192 + /* "squish/_squish/voronoi_dcel.pyx":192 * return val * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8380,7 +8380,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_i2p(__pyx_t_7_sq return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":209 +/* "squish/_squish/voronoi_dcel.pyx":209 * return val * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8393,7 +8393,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":210 + /* "squish/_squish/voronoi_dcel.pyx":210 * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8403,7 +8403,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":212 + /* "squish/_squish/voronoi_dcel.pyx":212 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ila_mag) # <<<<<<<<<<<<<< @@ -8413,7 +8413,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ila_mag; - /* "src/_squish/voronoi_dcel.pyx":211 + /* "squish/_squish/voronoi_dcel.pyx":211 * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8423,7 +8423,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":210 + /* "squish/_squish/voronoi_dcel.pyx":210 * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8432,7 +8432,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ */ } - /* "src/_squish/voronoi_dcel.pyx":215 + /* "squish/_squish/voronoi_dcel.pyx":215 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8441,7 +8441,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":216 + /* "squish/_squish/voronoi_dcel.pyx":216 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila_mag), val) # <<<<<<<<<<<<<< @@ -8451,7 +8451,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ila_mag; - /* "src/_squish/voronoi_dcel.pyx":215 + /* "squish/_squish/voronoi_dcel.pyx":215 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8460,7 +8460,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":217 + /* "squish/_squish/voronoi_dcel.pyx":217 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila_mag), val) * return val # <<<<<<<<<<<<<< @@ -8471,7 +8471,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":209 + /* "squish/_squish/voronoi_dcel.pyx":209 * return val * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8484,7 +8484,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_la_mag(__pyx_t_7_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":219 +/* "squish/_squish/voronoi_dcel.pyx":219 * return val * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8497,7 +8497,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":220 + /* "squish/_squish/voronoi_dcel.pyx":220 * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8507,7 +8507,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":222 + /* "squish/_squish/voronoi_dcel.pyx":222 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ida_mag) # <<<<<<<<<<<<<< @@ -8517,7 +8517,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ida_mag; - /* "src/_squish/voronoi_dcel.pyx":221 + /* "squish/_squish/voronoi_dcel.pyx":221 * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8527,7 +8527,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":220 + /* "squish/_squish/voronoi_dcel.pyx":220 * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8536,7 +8536,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ */ } - /* "src/_squish/voronoi_dcel.pyx":225 + /* "squish/_squish/voronoi_dcel.pyx":225 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8545,7 +8545,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":226 + /* "squish/_squish/voronoi_dcel.pyx":226 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida_mag), val) # <<<<<<<<<<<<<< @@ -8555,7 +8555,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ida_mag; - /* "src/_squish/voronoi_dcel.pyx":225 + /* "squish/_squish/voronoi_dcel.pyx":225 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8564,7 +8564,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":227 + /* "squish/_squish/voronoi_dcel.pyx":227 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida_mag), val) * return val # <<<<<<<<<<<<<< @@ -8575,7 +8575,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":219 + /* "squish/_squish/voronoi_dcel.pyx":219 * return val * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8588,7 +8588,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_da_mag(__pyx_t_7_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":229 +/* "squish/_squish/voronoi_dcel.pyx":229 * return val * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8601,7 +8601,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":230 + /* "squish/_squish/voronoi_dcel.pyx":230 * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8611,7 +8611,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":232 + /* "squish/_squish/voronoi_dcel.pyx":232 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iphi) # <<<<<<<<<<<<<< @@ -8621,7 +8621,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iphi; - /* "src/_squish/voronoi_dcel.pyx":231 + /* "squish/_squish/voronoi_dcel.pyx":231 * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8631,7 +8631,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":230 + /* "squish/_squish/voronoi_dcel.pyx":230 * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8640,7 +8640,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ */ } - /* "src/_squish/voronoi_dcel.pyx":235 + /* "squish/_squish/voronoi_dcel.pyx":235 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8649,7 +8649,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":236 + /* "squish/_squish/voronoi_dcel.pyx":236 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iphi), val) # <<<<<<<<<<<<<< @@ -8659,7 +8659,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iphi; - /* "src/_squish/voronoi_dcel.pyx":235 + /* "squish/_squish/voronoi_dcel.pyx":235 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8668,7 +8668,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":237 + /* "squish/_squish/voronoi_dcel.pyx":237 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iphi), val) * return val # <<<<<<<<<<<<<< @@ -8679,7 +8679,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":229 + /* "squish/_squish/voronoi_dcel.pyx":229 * return val * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8692,7 +8692,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_phi(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":239 +/* "squish/_squish/voronoi_dcel.pyx":239 * return val * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8705,7 +8705,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":240 + /* "squish/_squish/voronoi_dcel.pyx":240 * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8715,7 +8715,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":242 + /* "squish/_squish/voronoi_dcel.pyx":242 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iB) # <<<<<<<<<<<<<< @@ -8725,7 +8725,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iB; - /* "src/_squish/voronoi_dcel.pyx":241 + /* "squish/_squish/voronoi_dcel.pyx":241 * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8735,7 +8735,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":240 + /* "squish/_squish/voronoi_dcel.pyx":240 * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8744,7 +8744,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis */ } - /* "src/_squish/voronoi_dcel.pyx":245 + /* "squish/_squish/voronoi_dcel.pyx":245 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8753,7 +8753,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":246 + /* "squish/_squish/voronoi_dcel.pyx":246 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iB), val) # <<<<<<<<<<<<<< @@ -8763,7 +8763,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iB; - /* "src/_squish/voronoi_dcel.pyx":245 + /* "squish/_squish/voronoi_dcel.pyx":245 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8772,7 +8772,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":247 + /* "squish/_squish/voronoi_dcel.pyx":247 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iB), val) * return val # <<<<<<<<<<<<<< @@ -8783,7 +8783,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":239 + /* "squish/_squish/voronoi_dcel.pyx":239 * return val * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8796,7 +8796,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_B(__pyx_t_7_squis return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":249 +/* "squish/_squish/voronoi_dcel.pyx":249 * return val * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8809,7 +8809,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":250 + /* "squish/_squish/voronoi_dcel.pyx":250 * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8819,7 +8819,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":252 + /* "squish/_squish/voronoi_dcel.pyx":252 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iF) # <<<<<<<<<<<<<< @@ -8829,7 +8829,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iF; - /* "src/_squish/voronoi_dcel.pyx":251 + /* "squish/_squish/voronoi_dcel.pyx":251 * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8839,7 +8839,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":250 + /* "squish/_squish/voronoi_dcel.pyx":250 * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8848,7 +8848,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis */ } - /* "src/_squish/voronoi_dcel.pyx":255 + /* "squish/_squish/voronoi_dcel.pyx":255 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8857,7 +8857,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":256 + /* "squish/_squish/voronoi_dcel.pyx":256 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iF), val) # <<<<<<<<<<<<<< @@ -8867,7 +8867,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iF; - /* "src/_squish/voronoi_dcel.pyx":255 + /* "squish/_squish/voronoi_dcel.pyx":255 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8876,7 +8876,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":257 + /* "squish/_squish/voronoi_dcel.pyx":257 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iF), val) * return val # <<<<<<<<<<<<<< @@ -8887,7 +8887,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":249 + /* "squish/_squish/voronoi_dcel.pyx":249 * return val * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8900,7 +8900,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_F(__pyx_t_7_squis return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":259 +/* "squish/_squish/voronoi_dcel.pyx":259 * return val * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8913,7 +8913,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":260 + /* "squish/_squish/voronoi_dcel.pyx":260 * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8923,7 +8923,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":262 + /* "squish/_squish/voronoi_dcel.pyx":262 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ilntan) # <<<<<<<<<<<<<< @@ -8933,7 +8933,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ilntan; - /* "src/_squish/voronoi_dcel.pyx":261 + /* "squish/_squish/voronoi_dcel.pyx":261 * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8943,7 +8943,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":260 + /* "squish/_squish/voronoi_dcel.pyx":260 * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8952,7 +8952,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s */ } - /* "src/_squish/voronoi_dcel.pyx":265 + /* "squish/_squish/voronoi_dcel.pyx":265 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8961,7 +8961,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":266 + /* "squish/_squish/voronoi_dcel.pyx":266 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ilntan), val) # <<<<<<<<<<<<<< @@ -8971,7 +8971,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ilntan; - /* "src/_squish/voronoi_dcel.pyx":265 + /* "squish/_squish/voronoi_dcel.pyx":265 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8980,7 +8980,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":267 + /* "squish/_squish/voronoi_dcel.pyx":267 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ilntan), val) * return val # <<<<<<<<<<<<<< @@ -8991,7 +8991,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":259 + /* "squish/_squish/voronoi_dcel.pyx":259 * return val * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -9004,7 +9004,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_lntan(__pyx_t_7_s return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":269 +/* "squish/_squish/voronoi_dcel.pyx":269 * return val * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -9017,7 +9017,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ int __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":270 + /* "squish/_squish/voronoi_dcel.pyx":270 * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -9027,7 +9027,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "src/_squish/voronoi_dcel.pyx":272 + /* "squish/_squish/voronoi_dcel.pyx":272 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.icsc) # <<<<<<<<<<<<<< @@ -9037,7 +9037,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->icsc; - /* "src/_squish/voronoi_dcel.pyx":271 + /* "squish/_squish/voronoi_dcel.pyx":271 * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -9047,7 +9047,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":270 + /* "squish/_squish/voronoi_dcel.pyx":270 * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -9056,7 +9056,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ */ } - /* "src/_squish/voronoi_dcel.pyx":275 + /* "squish/_squish/voronoi_dcel.pyx":275 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -9065,7 +9065,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ */ /*else*/ { - /* "src/_squish/voronoi_dcel.pyx":276 + /* "squish/_squish/voronoi_dcel.pyx":276 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.icsc), val) # <<<<<<<<<<<<<< @@ -9075,7 +9075,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->icsc; - /* "src/_squish/voronoi_dcel.pyx":275 + /* "squish/_squish/voronoi_dcel.pyx":275 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -9084,7 +9084,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "src/_squish/voronoi_dcel.pyx":277 + /* "squish/_squish/voronoi_dcel.pyx":277 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.icsc), val) * return val # <<<<<<<<<<<<<< @@ -9095,7 +9095,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ goto __pyx_L0; } - /* "src/_squish/voronoi_dcel.pyx":269 + /* "squish/_squish/voronoi_dcel.pyx":269 * return val * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -9108,7 +9108,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_csc(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":282 +/* "squish/_squish/voronoi_dcel.pyx":282 * #### VoronoiInfo Methods #### * * cdef inline VoronoiInfo init_voronoiinfo(INT_T [:, ::1] sites, INT_T [:, ::1] edges, # <<<<<<<<<<<<<< @@ -9123,7 +9123,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii Py_ssize_t __pyx_t_2; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":287 + /* "squish/_squish/voronoi_dcel.pyx":287 * EdgeCacheMap* edge_cache_map) nogil: * cdef VoronoiInfo info * info.sites = init_iarray(&sites[0,0], (sites.shape[0], sites.shape[1])) # <<<<<<<<<<<<<< @@ -9136,7 +9136,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_3.f1 = ((__pyx_t_7_squish_INT_T)(__pyx_v_sites.shape[1])); __pyx_v_info.sites = __pyx_f_7_squish_init_iarray((&(*((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_sites.data + __pyx_t_1 * __pyx_v_sites.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); - /* "src/_squish/voronoi_dcel.pyx":288 + /* "squish/_squish/voronoi_dcel.pyx":288 * cdef VoronoiInfo info * info.sites = init_iarray(&sites[0,0], (sites.shape[0], sites.shape[1])) * info.edges = init_iarray(&edges[0,0], (edges.shape[0], edges.shape[1])) # <<<<<<<<<<<<<< @@ -9149,7 +9149,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_3.f1 = ((__pyx_t_7_squish_INT_T)(__pyx_v_edges.shape[1])); __pyx_v_info.edges = __pyx_f_7_squish_init_iarray((&(*((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_edges.data + __pyx_t_2 * __pyx_v_edges.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); - /* "src/_squish/voronoi_dcel.pyx":289 + /* "squish/_squish/voronoi_dcel.pyx":289 * info.sites = init_iarray(&sites[0,0], (sites.shape[0], sites.shape[1])) * info.edges = init_iarray(&edges[0,0], (edges.shape[0], edges.shape[1])) * info.points = init_farray(&points[0,0], (points.shape[0], points.shape[1])) # <<<<<<<<<<<<<< @@ -9162,7 +9162,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_3.f1 = ((__pyx_t_7_squish_INT_T)(__pyx_v_points.shape[1])); __pyx_v_info.points = __pyx_f_7_squish_init_farray((&(*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_points.data + __pyx_t_1 * __pyx_v_points.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); - /* "src/_squish/voronoi_dcel.pyx":290 + /* "squish/_squish/voronoi_dcel.pyx":290 * info.edges = init_iarray(&edges[0,0], (edges.shape[0], edges.shape[1])) * info.points = init_farray(&points[0,0], (points.shape[0], points.shape[1])) * info.vertices = init_farray(&vertices[0,0], # <<<<<<<<<<<<<< @@ -9172,7 +9172,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_2 = 0; __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":291 + /* "squish/_squish/voronoi_dcel.pyx":291 * info.points = init_farray(&points[0,0], (points.shape[0], points.shape[1])) * info.vertices = init_farray(&vertices[0,0], * (vertices.shape[0], vertices.shape[1]) # <<<<<<<<<<<<<< @@ -9182,7 +9182,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_3.f0 = ((__pyx_t_7_squish_INT_T)(__pyx_v_vertices.shape[0])); __pyx_t_3.f1 = ((__pyx_t_7_squish_INT_T)(__pyx_v_vertices.shape[1])); - /* "src/_squish/voronoi_dcel.pyx":290 + /* "squish/_squish/voronoi_dcel.pyx":290 * info.edges = init_iarray(&edges[0,0], (edges.shape[0], edges.shape[1])) * info.points = init_farray(&points[0,0], (points.shape[0], points.shape[1])) * info.vertices = init_farray(&vertices[0,0], # <<<<<<<<<<<<<< @@ -9191,7 +9191,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii */ __pyx_v_info.vertices = __pyx_f_7_squish_init_farray((&(*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_vertices.data + __pyx_t_2 * __pyx_v_vertices.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); - /* "src/_squish/voronoi_dcel.pyx":293 + /* "squish/_squish/voronoi_dcel.pyx":293 * (vertices.shape[0], vertices.shape[1]) * ) * info.site_cache = init_farray(&site_cache[0,0], # <<<<<<<<<<<<<< @@ -9201,7 +9201,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_1 = 0; __pyx_t_2 = 0; - /* "src/_squish/voronoi_dcel.pyx":294 + /* "squish/_squish/voronoi_dcel.pyx":294 * ) * info.site_cache = init_farray(&site_cache[0,0], * (site_cache.shape[0], site_cache.shape[1]) # <<<<<<<<<<<<<< @@ -9211,7 +9211,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_3.f0 = ((__pyx_t_7_squish_INT_T)(__pyx_v_site_cache.shape[0])); __pyx_t_3.f1 = ((__pyx_t_7_squish_INT_T)(__pyx_v_site_cache.shape[1])); - /* "src/_squish/voronoi_dcel.pyx":293 + /* "squish/_squish/voronoi_dcel.pyx":293 * (vertices.shape[0], vertices.shape[1]) * ) * info.site_cache = init_farray(&site_cache[0,0], # <<<<<<<<<<<<<< @@ -9220,7 +9220,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii */ __pyx_v_info.site_cache = __pyx_f_7_squish_init_farray((&(*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_cache.data + __pyx_t_1 * __pyx_v_site_cache.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); - /* "src/_squish/voronoi_dcel.pyx":296 + /* "squish/_squish/voronoi_dcel.pyx":296 * (site_cache.shape[0], site_cache.shape[1]) * ) * info.edge_cache = init_farray(&edge_cache[0,0], # <<<<<<<<<<<<<< @@ -9230,7 +9230,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_2 = 0; __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":297 + /* "squish/_squish/voronoi_dcel.pyx":297 * ) * info.edge_cache = init_farray(&edge_cache[0,0], * (edge_cache.shape[0], edge_cache.shape[1]) # <<<<<<<<<<<<<< @@ -9240,7 +9240,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_t_3.f0 = ((__pyx_t_7_squish_INT_T)(__pyx_v_edge_cache.shape[0])); __pyx_t_3.f1 = ((__pyx_t_7_squish_INT_T)(__pyx_v_edge_cache.shape[1])); - /* "src/_squish/voronoi_dcel.pyx":296 + /* "squish/_squish/voronoi_dcel.pyx":296 * (site_cache.shape[0], site_cache.shape[1]) * ) * info.edge_cache = init_farray(&edge_cache[0,0], # <<<<<<<<<<<<<< @@ -9249,7 +9249,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii */ __pyx_v_info.edge_cache = __pyx_f_7_squish_init_farray((&(*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_edge_cache.data + __pyx_t_2 * __pyx_v_edge_cache.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); - /* "src/_squish/voronoi_dcel.pyx":299 + /* "squish/_squish/voronoi_dcel.pyx":299 * (edge_cache.shape[0], edge_cache.shape[1]) * ) * info.edge_cache_map = edge_cache_map # <<<<<<<<<<<<<< @@ -9258,7 +9258,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii */ __pyx_v_info.edge_cache_map = __pyx_v_edge_cache_map; - /* "src/_squish/voronoi_dcel.pyx":301 + /* "squish/_squish/voronoi_dcel.pyx":301 * info.edge_cache_map = edge_cache_map * * return info # <<<<<<<<<<<<<< @@ -9268,7 +9268,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii __pyx_r = __pyx_v_info; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":282 + /* "squish/_squish/voronoi_dcel.pyx":282 * #### VoronoiInfo Methods #### * * cdef inline VoronoiInfo init_voronoiinfo(INT_T [:, ::1] sites, INT_T [:, ::1] edges, # <<<<<<<<<<<<<< @@ -9281,7 +9281,7 @@ static CYTHON_INLINE __pyx_t_7_squish_VoronoiInfo __pyx_f_7_squish_init_voronoii return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":306 +/* "squish/_squish/voronoi_dcel.pyx":306 * #### Site Methods #### * * cdef inline Site init_site(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9300,7 +9300,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_init_site(__pyx_t_7_ __pyx_t_7_squish_HalfEdge (*__pyx_t_6)(__pyx_t_7_squish_Site *); __pyx_t_7_squish_INT_T (*__pyx_t_7)(__pyx_t_7_squish_Site *); - /* "src/_squish/voronoi_dcel.pyx":308 + /* "squish/_squish/voronoi_dcel.pyx":308 * cdef inline Site init_site(INT_T arr_index, VoronoiInfo* info) nogil: * cdef Site site * site.arr_index, site.info, site.cache = arr_index, info, &SITE_CACHE_MAP # <<<<<<<<<<<<<< @@ -9314,7 +9314,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_init_site(__pyx_t_7_ __pyx_v_site.info = __pyx_t_2; __pyx_v_site.cache = __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":310 + /* "squish/_squish/voronoi_dcel.pyx":310 * site.arr_index, site.info, site.cache = arr_index, info, &SITE_CACHE_MAP * * site.index, site.vec, site.edge, site.edge_num = index, vec, edge, edge_num # <<<<<<<<<<<<<< @@ -9330,7 +9330,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_init_site(__pyx_t_7_ __pyx_v_site.edge = __pyx_t_6; __pyx_v_site.edge_num = __pyx_t_7; - /* "src/_squish/voronoi_dcel.pyx":312 + /* "squish/_squish/voronoi_dcel.pyx":312 * site.index, site.vec, site.edge, site.edge_num = index, vec, edge, edge_num * * return site # <<<<<<<<<<<<<< @@ -9340,7 +9340,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_init_site(__pyx_t_7_ __pyx_r = __pyx_v_site; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":306 + /* "squish/_squish/voronoi_dcel.pyx":306 * #### Site Methods #### * * cdef inline Site init_site(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9353,7 +9353,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_init_site(__pyx_t_7_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":315 +/* "squish/_squish/voronoi_dcel.pyx":315 * * * cdef inline INT_T index(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9365,7 +9365,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_index(__pyx_t_7_squ __pyx_t_7_squish_INT_T __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":316 + /* "squish/_squish/voronoi_dcel.pyx":316 * * cdef inline INT_T index(Site* self) nogil: * return self.info.sites.get(&self.info.sites, (self.arr_index, 0)) # <<<<<<<<<<<<<< @@ -9377,7 +9377,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_index(__pyx_t_7_squ __pyx_r = __pyx_v_self->info->sites.get((&__pyx_v_self->info->sites), __pyx_t_1); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":315 + /* "squish/_squish/voronoi_dcel.pyx":315 * * * cdef inline INT_T index(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9390,7 +9390,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_index(__pyx_t_7_squ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":318 +/* "squish/_squish/voronoi_dcel.pyx":318 * return self.info.sites.get(&self.info.sites, (self.arr_index, 0)) * * cdef inline Vector2D vec(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9403,7 +9403,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_vec(__pyx_t_7_sq __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":320 + /* "squish/_squish/voronoi_dcel.pyx":320 * cdef inline Vector2D vec(Site* self) nogil: * return init.Vector2D( * self.info.points.get(&self.info.points, (self.index(self), 0)), # <<<<<<<<<<<<<< @@ -9413,7 +9413,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_vec(__pyx_t_7_sq __pyx_t_1.f0 = __pyx_v_self->index(__pyx_v_self); __pyx_t_1.f1 = 0; - /* "src/_squish/voronoi_dcel.pyx":321 + /* "squish/_squish/voronoi_dcel.pyx":321 * return init.Vector2D( * self.info.points.get(&self.info.points, (self.index(self), 0)), * self.info.points.get(&self.info.points, (self.index(self), 1)) # <<<<<<<<<<<<<< @@ -9423,7 +9423,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_vec(__pyx_t_7_sq __pyx_t_2.f0 = __pyx_v_self->index(__pyx_v_self); __pyx_t_2.f1 = 1; - /* "src/_squish/voronoi_dcel.pyx":319 + /* "squish/_squish/voronoi_dcel.pyx":319 * * cdef inline Vector2D vec(Site* self) nogil: * return init.Vector2D( # <<<<<<<<<<<<<< @@ -9433,7 +9433,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_vec(__pyx_t_7_sq __pyx_r = __pyx_v_7_squish_init.Vector2D(__pyx_v_self->info->points.get((&__pyx_v_self->info->points), __pyx_t_1), __pyx_v_self->info->points.get((&__pyx_v_self->info->points), __pyx_t_2)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":318 + /* "squish/_squish/voronoi_dcel.pyx":318 * return self.info.sites.get(&self.info.sites, (self.arr_index, 0)) * * cdef inline Vector2D vec(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9446,7 +9446,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_vec(__pyx_t_7_sq return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":324 +/* "squish/_squish/voronoi_dcel.pyx":324 * ) * * cdef inline HalfEdge edge(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9458,7 +9458,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge(__pyx_t_7_s __pyx_t_7_squish_HalfEdge __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":326 + /* "squish/_squish/voronoi_dcel.pyx":326 * cdef inline HalfEdge edge(Site* self) nogil: * return init.HalfEdge( * self.info.sites.get(&self.info.sites, (self.arr_index, 1)), self.info # <<<<<<<<<<<<<< @@ -9468,7 +9468,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge(__pyx_t_7_s __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 1; - /* "src/_squish/voronoi_dcel.pyx":325 + /* "squish/_squish/voronoi_dcel.pyx":325 * * cdef inline HalfEdge edge(Site* self) nogil: * return init.HalfEdge( # <<<<<<<<<<<<<< @@ -9478,7 +9478,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge(__pyx_t_7_s __pyx_r = __pyx_v_7_squish_init.HalfEdge(__pyx_v_self->info->sites.get((&__pyx_v_self->info->sites), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":324 + /* "squish/_squish/voronoi_dcel.pyx":324 * ) * * cdef inline HalfEdge edge(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9491,7 +9491,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge(__pyx_t_7_s return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":329 +/* "squish/_squish/voronoi_dcel.pyx":329 * ) * * cdef inline INT_T edge_num(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9503,7 +9503,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_edge_num(__pyx_t_7_ __pyx_t_7_squish_INT_T __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":330 + /* "squish/_squish/voronoi_dcel.pyx":330 * * cdef inline INT_T edge_num(Site* self) nogil: * return self.info.sites.get(&self.info.sites, (self.arr_index, 2)) # <<<<<<<<<<<<<< @@ -9515,7 +9515,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_edge_num(__pyx_t_7_ __pyx_r = __pyx_v_self->info->sites.get((&__pyx_v_self->info->sites), __pyx_t_1); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":329 + /* "squish/_squish/voronoi_dcel.pyx":329 * ) * * cdef inline INT_T edge_num(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9528,7 +9528,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_edge_num(__pyx_t_7_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":335 +/* "squish/_squish/voronoi_dcel.pyx":335 * #### HalfEdge Methods #### * * cdef inline HalfEdge init_halfedge(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9550,7 +9550,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_init_halfedge(__ __pyx_t_7_squish_HalfEdge (*__pyx_t_9)(__pyx_t_7_squish_HalfEdge *); __pyx_t_7_squish_Matrix2x2 (*__pyx_t_10)(__pyx_t_7_squish_HalfEdge *, __pyx_t_7_squish_Site); - /* "src/_squish/voronoi_dcel.pyx":337 + /* "squish/_squish/voronoi_dcel.pyx":337 * cdef inline HalfEdge init_halfedge(INT_T arr_index, VoronoiInfo* info) nogil: * cdef HalfEdge edge * edge.arr_index, edge.info, edge.cache = arr_index, info, info.edge_cache_map # <<<<<<<<<<<<<< @@ -9564,7 +9564,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_init_halfedge(__ __pyx_v_edge.info = __pyx_t_2; __pyx_v_edge.cache = __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":338 + /* "squish/_squish/voronoi_dcel.pyx":338 * cdef HalfEdge edge * edge.arr_index, edge.info, edge.cache = arr_index, info, info.edge_cache_map * edge.orig_arr_index = arr_index # <<<<<<<<<<<<<< @@ -9573,7 +9573,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_init_halfedge(__ */ __pyx_v_edge.orig_arr_index = __pyx_v_arr_index; - /* "src/_squish/voronoi_dcel.pyx":341 + /* "squish/_squish/voronoi_dcel.pyx":341 * * edge.origin_index, edge.origin, edge.face, edge.next, edge.prev, edge.twin, edge.get_H = \ * origin_index, origin, face, edge_next, prev, twin, get_H # <<<<<<<<<<<<<< @@ -9588,7 +9588,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_init_halfedge(__ __pyx_t_9 = __pyx_f_7_squish_twin; __pyx_t_10 = __pyx_f_7_squish_get_H; - /* "src/_squish/voronoi_dcel.pyx":340 + /* "squish/_squish/voronoi_dcel.pyx":340 * edge.orig_arr_index = arr_index * * edge.origin_index, edge.origin, edge.face, edge.next, edge.prev, edge.twin, edge.get_H = \ # <<<<<<<<<<<<<< @@ -9603,7 +9603,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_init_halfedge(__ __pyx_v_edge.twin = __pyx_t_9; __pyx_v_edge.get_H = __pyx_t_10; - /* "src/_squish/voronoi_dcel.pyx":343 + /* "squish/_squish/voronoi_dcel.pyx":343 * origin_index, origin, face, edge_next, prev, twin, get_H * * return edge # <<<<<<<<<<<<<< @@ -9613,7 +9613,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_init_halfedge(__ __pyx_r = __pyx_v_edge; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":335 + /* "squish/_squish/voronoi_dcel.pyx":335 * #### HalfEdge Methods #### * * cdef inline HalfEdge init_halfedge(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9626,7 +9626,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_init_halfedge(__ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":346 +/* "squish/_squish/voronoi_dcel.pyx":346 * * * cdef inline INT_T origin_index(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9638,7 +9638,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_origin_index(__pyx_ __pyx_t_7_squish_INT_T __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":347 + /* "squish/_squish/voronoi_dcel.pyx":347 * * cdef inline INT_T origin_index(HalfEdge* self) nogil: * return self.info.edges.get(&self.info.edges, (self.arr_index, 0)) # <<<<<<<<<<<<<< @@ -9650,7 +9650,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_origin_index(__pyx_ __pyx_r = __pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":346 + /* "squish/_squish/voronoi_dcel.pyx":346 * * * cdef inline INT_T origin_index(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9663,7 +9663,7 @@ static CYTHON_INLINE __pyx_t_7_squish_INT_T __pyx_f_7_squish_origin_index(__pyx_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":349 +/* "squish/_squish/voronoi_dcel.pyx":349 * return self.info.edges.get(&self.info.edges, (self.arr_index, 0)) * * cdef inline Vector2D origin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9676,7 +9676,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_origin(__pyx_t_7 __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":351 + /* "squish/_squish/voronoi_dcel.pyx":351 * cdef inline Vector2D origin(HalfEdge* self) nogil: * return init.Vector2D( * self.info.vertices.get(&self.info.vertices, (self.origin_index(self), 0)), # <<<<<<<<<<<<<< @@ -9686,7 +9686,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_origin(__pyx_t_7 __pyx_t_1.f0 = __pyx_v_self->origin_index(__pyx_v_self); __pyx_t_1.f1 = 0; - /* "src/_squish/voronoi_dcel.pyx":352 + /* "squish/_squish/voronoi_dcel.pyx":352 * return init.Vector2D( * self.info.vertices.get(&self.info.vertices, (self.origin_index(self), 0)), * self.info.vertices.get(&self.info.vertices, (self.origin_index(self), 1)) # <<<<<<<<<<<<<< @@ -9696,7 +9696,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_origin(__pyx_t_7 __pyx_t_2.f0 = __pyx_v_self->origin_index(__pyx_v_self); __pyx_t_2.f1 = 1; - /* "src/_squish/voronoi_dcel.pyx":350 + /* "squish/_squish/voronoi_dcel.pyx":350 * * cdef inline Vector2D origin(HalfEdge* self) nogil: * return init.Vector2D( # <<<<<<<<<<<<<< @@ -9706,7 +9706,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_origin(__pyx_t_7 __pyx_r = __pyx_v_7_squish_init.Vector2D(__pyx_v_self->info->vertices.get((&__pyx_v_self->info->vertices), __pyx_t_1), __pyx_v_self->info->vertices.get((&__pyx_v_self->info->vertices), __pyx_t_2)); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":349 + /* "squish/_squish/voronoi_dcel.pyx":349 * return self.info.edges.get(&self.info.edges, (self.arr_index, 0)) * * cdef inline Vector2D origin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9719,7 +9719,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_origin(__pyx_t_7 return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":355 +/* "squish/_squish/voronoi_dcel.pyx":355 * ) * * cdef inline Site face(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9731,7 +9731,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_face(__pyx_t_7_squis __pyx_t_7_squish_Site __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":357 + /* "squish/_squish/voronoi_dcel.pyx":357 * cdef inline Site face(HalfEdge* self) nogil: * return init.Site( * self.info.edges.get(&self.info.edges, (self.arr_index, 1)), self.info # <<<<<<<<<<<<<< @@ -9741,7 +9741,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_face(__pyx_t_7_squis __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 1; - /* "src/_squish/voronoi_dcel.pyx":356 + /* "squish/_squish/voronoi_dcel.pyx":356 * * cdef inline Site face(HalfEdge* self) nogil: * return init.Site( # <<<<<<<<<<<<<< @@ -9751,7 +9751,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_face(__pyx_t_7_squis __pyx_r = __pyx_v_7_squish_init.Site(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":355 + /* "squish/_squish/voronoi_dcel.pyx":355 * ) * * cdef inline Site face(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9764,7 +9764,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Site __pyx_f_7_squish_face(__pyx_t_7_squis return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":360 +/* "squish/_squish/voronoi_dcel.pyx":360 * ) * * cdef inline HalfEdge edge_next(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9776,7 +9776,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge_next(__pyx_ __pyx_t_7_squish_HalfEdge __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":363 + /* "squish/_squish/voronoi_dcel.pyx":363 * * return init.HalfEdge( * self.info.edges.get(&self.info.edges, (self.arr_index, 2)), self.info # <<<<<<<<<<<<<< @@ -9786,7 +9786,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge_next(__pyx_ __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 2; - /* "src/_squish/voronoi_dcel.pyx":362 + /* "squish/_squish/voronoi_dcel.pyx":362 * cdef inline HalfEdge edge_next(HalfEdge* self) nogil: * * return init.HalfEdge( # <<<<<<<<<<<<<< @@ -9796,7 +9796,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge_next(__pyx_ __pyx_r = __pyx_v_7_squish_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":360 + /* "squish/_squish/voronoi_dcel.pyx":360 * ) * * cdef inline HalfEdge edge_next(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9809,7 +9809,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_edge_next(__pyx_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":366 +/* "squish/_squish/voronoi_dcel.pyx":366 * ) * * cdef inline HalfEdge prev(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9821,7 +9821,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_prev(__pyx_t_7_s __pyx_t_7_squish_HalfEdge __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":368 + /* "squish/_squish/voronoi_dcel.pyx":368 * cdef inline HalfEdge prev(HalfEdge* self) nogil: * return init.HalfEdge( * self.info.edges.get(&self.info.edges, (self.arr_index, 3)), self.info # <<<<<<<<<<<<<< @@ -9831,7 +9831,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_prev(__pyx_t_7_s __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 3; - /* "src/_squish/voronoi_dcel.pyx":367 + /* "squish/_squish/voronoi_dcel.pyx":367 * * cdef inline HalfEdge prev(HalfEdge* self) nogil: * return init.HalfEdge( # <<<<<<<<<<<<<< @@ -9841,7 +9841,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_prev(__pyx_t_7_s __pyx_r = __pyx_v_7_squish_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":366 + /* "squish/_squish/voronoi_dcel.pyx":366 * ) * * cdef inline HalfEdge prev(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9854,7 +9854,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_prev(__pyx_t_7_s return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":371 +/* "squish/_squish/voronoi_dcel.pyx":371 * ) * * cdef inline HalfEdge twin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9866,7 +9866,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_twin(__pyx_t_7_s __pyx_t_7_squish_HalfEdge __pyx_r; __pyx_ctuple___dunderpyx_t_7_squish_INT_T__and___dunderpyx_t_7_squish_INT_T __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":373 + /* "squish/_squish/voronoi_dcel.pyx":373 * cdef inline HalfEdge twin(HalfEdge* self) nogil: * return init.HalfEdge( * self.info.edges.get(&self.info.edges, (self.arr_index, 4)), self.info # <<<<<<<<<<<<<< @@ -9876,7 +9876,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_twin(__pyx_t_7_s __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 4; - /* "src/_squish/voronoi_dcel.pyx":372 + /* "squish/_squish/voronoi_dcel.pyx":372 * * cdef inline HalfEdge twin(HalfEdge* self) nogil: * return init.HalfEdge( # <<<<<<<<<<<<<< @@ -9886,7 +9886,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_twin(__pyx_t_7_s __pyx_r = __pyx_v_7_squish_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":371 + /* "squish/_squish/voronoi_dcel.pyx":371 * ) * * cdef inline HalfEdge twin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9899,7 +9899,7 @@ static CYTHON_INLINE __pyx_t_7_squish_HalfEdge __pyx_f_7_squish_twin(__pyx_t_7_s return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":376 +/* "squish/_squish/voronoi_dcel.pyx":376 * ) * * cdef inline Matrix2x2 get_H(HalfEdge* self, Site xi) nogil: # <<<<<<<<<<<<<< @@ -9917,7 +9917,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 __pyx_t_7_squish_INT_T __pyx_t_3; int __pyx_t_4; - /* "src/_squish/voronoi_dcel.pyx":377 + /* "squish/_squish/voronoi_dcel.pyx":377 * * cdef inline Matrix2x2 get_H(HalfEdge* self, Site xi) nogil: * cdef INT_T this_e = self.origin_index(self) # <<<<<<<<<<<<<< @@ -9926,7 +9926,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 */ __pyx_v_this_e = __pyx_v_self->origin_index(__pyx_v_self); - /* "src/_squish/voronoi_dcel.pyx":378 + /* "squish/_squish/voronoi_dcel.pyx":378 * cdef inline Matrix2x2 get_H(HalfEdge* self, Site xi) nogil: * cdef INT_T this_e = self.origin_index(self) * cdef HalfEdge s_e = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -9935,7 +9935,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 */ __pyx_v_s_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "src/_squish/voronoi_dcel.pyx":381 + /* "squish/_squish/voronoi_dcel.pyx":381 * cdef INT_T i * * for i in range(xi.edge_num(&xi)): # <<<<<<<<<<<<<< @@ -9947,7 +9947,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) { __pyx_v_i = __pyx_t_3; - /* "src/_squish/voronoi_dcel.pyx":382 + /* "squish/_squish/voronoi_dcel.pyx":382 * * for i in range(xi.edge_num(&xi)): * if s_e.origin_index(&s_e) == this_e: # <<<<<<<<<<<<<< @@ -9957,7 +9957,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 __pyx_t_4 = ((__pyx_v_s_e.origin_index((&__pyx_v_s_e)) == __pyx_v_this_e) != 0); if (__pyx_t_4) { - /* "src/_squish/voronoi_dcel.pyx":383 + /* "squish/_squish/voronoi_dcel.pyx":383 * for i in range(xi.edge_num(&xi)): * if s_e.origin_index(&s_e) == this_e: * return s_e.cache.H(&s_e, NAN_MATRIX) # <<<<<<<<<<<<<< @@ -9967,7 +9967,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 __pyx_r = __pyx_v_s_e.cache->H((&__pyx_v_s_e), __pyx_v_7_squish_NAN_MATRIX); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":382 + /* "squish/_squish/voronoi_dcel.pyx":382 * * for i in range(xi.edge_num(&xi)): * if s_e.origin_index(&s_e) == this_e: # <<<<<<<<<<<<<< @@ -9976,7 +9976,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 */ } - /* "src/_squish/voronoi_dcel.pyx":384 + /* "squish/_squish/voronoi_dcel.pyx":384 * if s_e.origin_index(&s_e) == this_e: * return s_e.cache.H(&s_e, NAN_MATRIX) * s_e = s_e.next(&s_e) # <<<<<<<<<<<<<< @@ -9986,7 +9986,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 __pyx_v_s_e = __pyx_v_s_e.next((&__pyx_v_s_e)); } - /* "src/_squish/voronoi_dcel.pyx":385 + /* "squish/_squish/voronoi_dcel.pyx":385 * return s_e.cache.H(&s_e, NAN_MATRIX) * s_e = s_e.next(&s_e) * return init.Matrix2x2(0.0, 0.0, 0.0, 0.0) # <<<<<<<<<<<<<< @@ -9996,7 +9996,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 __pyx_r = __pyx_v_7_squish_init.Matrix2x2(0.0, 0.0, 0.0, 0.0); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":376 + /* "squish/_squish/voronoi_dcel.pyx":376 * ) * * cdef inline Matrix2x2 get_H(HalfEdge* self, Site xi) nogil: # <<<<<<<<<<<<<< @@ -10009,7 +10009,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_get_H(__pyx_t_7 return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":398 +/* "squish/_squish/voronoi_dcel.pyx":398 * """ * * def __init__(VoronoiContainer self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, object site_arr): # <<<<<<<<<<<<<< @@ -10131,7 +10131,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__init__", 0); - /* "src/_squish/voronoi_dcel.pyx":399 + /* "squish/_squish/voronoi_dcel.pyx":399 * * def __init__(VoronoiContainer self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, object site_arr): * self.n, self.w, self.h, self.r = n, w, h, r # <<<<<<<<<<<<<< @@ -10147,7 +10147,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi __pyx_v_self->h = __pyx_t_3; __pyx_v_self->r = __pyx_t_4; - /* "src/_squish/voronoi_dcel.pyx":400 + /* "squish/_squish/voronoi_dcel.pyx":400 * def __init__(VoronoiContainer self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, object site_arr): * self.n, self.w, self.h, self.r = n, w, h, r * self.dim = [w, h] # <<<<<<<<<<<<<< @@ -10158,7 +10158,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi __pyx_t_5[1] = __pyx_v_h; memcpy(&(__pyx_v_self->dim[0]), __pyx_t_5, sizeof(__pyx_v_self->dim[0]) * (2)); - /* "src/_squish/voronoi_dcel.pyx":402 + /* "squish/_squish/voronoi_dcel.pyx":402 * self.dim = [w, h] * * self.calculate_voronoi(site_arr.astype(FLOAT)) # <<<<<<<<<<<<<< @@ -10189,7 +10189,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi ((struct __pyx_vtabstruct_7_squish_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->calculate_voronoi(__pyx_v_self, ((PyArrayObject *)__pyx_t_6)); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 402, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - /* "src/_squish/voronoi_dcel.pyx":403 + /* "squish/_squish/voronoi_dcel.pyx":403 * * self.calculate_voronoi(site_arr.astype(FLOAT)) * self.generate_dcel() # <<<<<<<<<<<<<< @@ -10198,7 +10198,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi */ ((struct __pyx_vtabstruct_7_squish_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->generate_dcel(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 403, __pyx_L1_error) - /* "src/_squish/voronoi_dcel.pyx":405 + /* "squish/_squish/voronoi_dcel.pyx":405 * self.generate_dcel() * * self.common_cache() # <<<<<<<<<<<<<< @@ -10207,7 +10207,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi */ ((struct __pyx_vtabstruct_7_squish_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->common_cache(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 405, __pyx_L1_error) - /* "src/_squish/voronoi_dcel.pyx":406 + /* "squish/_squish/voronoi_dcel.pyx":406 * * self.common_cache() * self.precompute() # <<<<<<<<<<<<<< @@ -10216,7 +10216,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi */ ((struct __pyx_vtabstruct_7_squish_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->precompute(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 406, __pyx_L1_error) - /* "src/_squish/voronoi_dcel.pyx":407 + /* "squish/_squish/voronoi_dcel.pyx":407 * self.common_cache() * self.precompute() * self.calc_grad() # <<<<<<<<<<<<<< @@ -10225,7 +10225,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi */ ((struct __pyx_vtabstruct_7_squish_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->calc_grad(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 407, __pyx_L1_error) - /* "src/_squish/voronoi_dcel.pyx":408 + /* "squish/_squish/voronoi_dcel.pyx":408 * self.precompute() * self.calc_grad() * self.get_statistics() # <<<<<<<<<<<<<< @@ -10234,7 +10234,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi */ ((struct __pyx_vtabstruct_7_squish_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->get_statistics(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 408, __pyx_L1_error) - /* "src/_squish/voronoi_dcel.pyx":398 + /* "squish/_squish/voronoi_dcel.pyx":398 * """ * * def __init__(VoronoiContainer self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, object site_arr): # <<<<<<<<<<<<<< @@ -10257,7 +10257,7 @@ static int __pyx_pf_7_squish_16VoronoiContainer___init__(struct __pyx_obj_7_squi return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":411 +/* "squish/_squish/voronoi_dcel.pyx":411 * * * cdef void calculate_voronoi(VoronoiContainer self, # <<<<<<<<<<<<<< @@ -10316,7 +10316,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o } __pyx_pybuffernd_site_arr.diminfo[0].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_site_arr.diminfo[0].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_site_arr.diminfo[1].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_site_arr.diminfo[1].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[1]; - /* "src/_squish/voronoi_dcel.pyx":418 + /* "squish/_squish/voronoi_dcel.pyx":418 * """ * global SYMM * cdef np.ndarray[FLOAT_T, ndim=2] symm = np.asarray(SYMM).reshape(9,2) # <<<<<<<<<<<<<< @@ -10366,7 +10366,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __pyx_v_symm = ((PyArrayObject *)__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":419 + /* "squish/_squish/voronoi_dcel.pyx":419 * global SYMM * cdef np.ndarray[FLOAT_T, ndim=2] symm = np.asarray(SYMM).reshape(9,2) * cdef np.ndarray[FLOAT_T, ndim=1] dim = np.asarray(self.dim) # <<<<<<<<<<<<<< @@ -10410,7 +10410,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __pyx_v_dim = ((PyArrayObject *)__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":420 + /* "squish/_squish/voronoi_dcel.pyx":420 * cdef np.ndarray[FLOAT_T, ndim=2] symm = np.asarray(SYMM).reshape(9,2) * cdef np.ndarray[FLOAT_T, ndim=1] dim = np.asarray(self.dim) * cdef np.ndarray[FLOAT_T, ndim=2] full_site_arr = np.empty((self.n*9+8, 2), dtype=FLOAT) # <<<<<<<<<<<<<< @@ -10462,7 +10462,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __pyx_v_full_site_arr = ((PyArrayObject *)__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":424 + /* "squish/_squish/voronoi_dcel.pyx":424 * # Generate periodic sites and sites that bound periodic sites. * cdef INT_T i * for i in range(9): # <<<<<<<<<<<<<< @@ -10472,7 +10472,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o for (__pyx_t_8 = 0; __pyx_t_8 < 9; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "src/_squish/voronoi_dcel.pyx":425 + /* "squish/_squish/voronoi_dcel.pyx":425 * cdef INT_T i * for i in range(9): * full_site_arr[self.n*i:self.n*(i+1)] = site_arr + symm[i]*dim # <<<<<<<<<<<<<< @@ -10499,7 +10499,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":426 + /* "squish/_squish/voronoi_dcel.pyx":426 * for i in range(9): * full_site_arr[self.n*i:self.n*(i+1)] = site_arr + symm[i]*dim * if i > 0: # <<<<<<<<<<<<<< @@ -10509,7 +10509,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __pyx_t_9 = ((__pyx_v_i > 0) != 0); if (__pyx_t_9) { - /* "src/_squish/voronoi_dcel.pyx":427 + /* "squish/_squish/voronoi_dcel.pyx":427 * full_site_arr[self.n*i:self.n*(i+1)] = site_arr + symm[i]*dim * if i > 0: * full_site_arr[9*self.n+i-1] = dim/2 + 2*dim*symm[i] # <<<<<<<<<<<<<< @@ -10534,7 +10534,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o if (unlikely(__Pyx_SetItemInt(((PyObject *)__pyx_v_full_site_arr), __pyx_t_10, __pyx_t_1, __pyx_t_7_squish_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0) < 0)) __PYX_ERR(1, 427, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":426 + /* "squish/_squish/voronoi_dcel.pyx":426 * for i in range(9): * full_site_arr[self.n*i:self.n*(i+1)] = site_arr + symm[i]*dim * if i > 0: # <<<<<<<<<<<<<< @@ -10544,7 +10544,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o } } - /* "src/_squish/voronoi_dcel.pyx":430 + /* "squish/_squish/voronoi_dcel.pyx":430 * * # Use SciPy to compute the Voronoi set. * self.scipy_vor = scipy.spatial.Voronoi(full_site_arr) # <<<<<<<<<<<<<< @@ -10577,7 +10577,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor, __pyx_t_1) < 0) __PYX_ERR(1, 430, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":431 + /* "squish/_squish/voronoi_dcel.pyx":431 * # Use SciPy to compute the Voronoi set. * self.scipy_vor = scipy.spatial.Voronoi(full_site_arr) * self.points = self.scipy_vor.points # <<<<<<<<<<<<<< @@ -10596,7 +10596,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __pyx_t_11.memview = NULL; __pyx_t_11.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":432 + /* "squish/_squish/voronoi_dcel.pyx":432 * self.scipy_vor = scipy.spatial.Voronoi(full_site_arr) * self.points = self.scipy_vor.points * self.vertices = self.scipy_vor.vertices # <<<<<<<<<<<<<< @@ -10615,7 +10615,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __pyx_t_11.memview = NULL; __pyx_t_11.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":411 + /* "squish/_squish/voronoi_dcel.pyx":411 * * * cdef void calculate_voronoi(VoronoiContainer self, # <<<<<<<<<<<<<< @@ -10654,7 +10654,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calculate_voronoi(struct __pyx_o __Pyx_RefNannyFinishContext(); } -/* "src/_squish/voronoi_dcel.pyx":435 +/* "squish/_squish/voronoi_dcel.pyx":435 * * * cdef void generate_dcel(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -10751,7 +10751,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_pybuffernd_site_verts.data = NULL; __pyx_pybuffernd_site_verts.rcbuffer = &__pyx_pybuffer_site_verts; - /* "src/_squish/voronoi_dcel.pyx":436 + /* "squish/_squish/voronoi_dcel.pyx":436 * * cdef void generate_dcel(VoronoiContainer self) except *: * cdef INT_T npoints = self.n*9+8 # <<<<<<<<<<<<<< @@ -10760,7 +10760,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 */ __pyx_v_npoints = ((__pyx_v_self->n * 9) + 8); - /* "src/_squish/voronoi_dcel.pyx":437 + /* "squish/_squish/voronoi_dcel.pyx":437 * cdef void generate_dcel(VoronoiContainer self) except *: * cdef INT_T npoints = self.n*9+8 * cdef array.array int_tmplt = array.array('q', []) # <<<<<<<<<<<<<< @@ -10783,7 +10783,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_v_int_tmplt = ((arrayobject *)__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":439 + /* "squish/_squish/voronoi_dcel.pyx":439 * cdef array.array int_tmplt = array.array('q', []) * * cdef np.ndarray[INT_T, ndim=1] offsets = np.zeros(self.n*9+1, dtype=INT) # <<<<<<<<<<<<<< @@ -10827,7 +10827,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_v_offsets = ((PyArrayObject *)__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":440 + /* "squish/_squish/voronoi_dcel.pyx":440 * * cdef np.ndarray[INT_T, ndim=1] offsets = np.zeros(self.n*9+1, dtype=INT) * cdef array.array vert_indices = array.clone(int_tmplt, 0, False) # <<<<<<<<<<<<<< @@ -10839,7 +10839,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_v_vert_indices = ((arrayobject *)__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":444 + /* "squish/_squish/voronoi_dcel.pyx":444 * # Flatten regions into array, so it can be used later. * cdef INT_T i * for i in range(self.n*9): # <<<<<<<<<<<<<< @@ -10851,7 +10851,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "src/_squish/voronoi_dcel.pyx":445 + /* "squish/_squish/voronoi_dcel.pyx":445 * cdef INT_T i * for i in range(self.n*9): * verts = self.scipy_vor.regions[self.scipy_vor.point_region[i]] # <<<<<<<<<<<<<< @@ -10878,7 +10878,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_XDECREF_SET(__pyx_v_verts, __pyx_t_3); __pyx_t_3 = 0; - /* "src/_squish/voronoi_dcel.pyx":446 + /* "squish/_squish/voronoi_dcel.pyx":446 * for i in range(self.n*9): * verts = self.scipy_vor.regions[self.scipy_vor.point_region[i]] * offsets[i+1] = offsets[i] + len(verts) # Build offsets. # <<<<<<<<<<<<<< @@ -10890,7 +10890,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_11 = (__pyx_v_i + 1); *__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_11, __pyx_pybuffernd_offsets.diminfo[0].strides) = ((*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_offsets.diminfo[0].strides)) + __pyx_t_10); - /* "src/_squish/voronoi_dcel.pyx":447 + /* "squish/_squish/voronoi_dcel.pyx":447 * verts = self.scipy_vor.regions[self.scipy_vor.point_region[i]] * offsets[i+1] = offsets[i] + len(verts) # Build offsets. * vert_indices.extend(array.array('q', verts)) # Flatten # <<<<<<<<<<<<<< @@ -10929,7 +10929,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } - /* "src/_squish/voronoi_dcel.pyx":450 + /* "squish/_squish/voronoi_dcel.pyx":450 * * # Get vertices of original N sites. * cdef np.ndarray[INT_T, ndim=1] vert_indices_np = np.asarray(vert_indices) # <<<<<<<<<<<<<< @@ -10970,7 +10970,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_v_vert_indices_np = ((PyArrayObject *)__pyx_t_3); __pyx_t_3 = 0; - /* "src/_squish/voronoi_dcel.pyx":451 + /* "squish/_squish/voronoi_dcel.pyx":451 * # Get vertices of original N sites. * cdef np.ndarray[INT_T, ndim=1] vert_indices_np = np.asarray(vert_indices) * cdef np.ndarray[INT_T, ndim=1] border_sites = np.unique(np.searchsorted( # <<<<<<<<<<<<<< @@ -10983,7 +10983,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "src/_squish/voronoi_dcel.pyx":458 + /* "squish/_squish/voronoi_dcel.pyx":458 * ))[0] + offsets[self.n], * side='right' # If on index == offset_number, should be part of the next site. * ) - 1) # Subtract by one to get actual site number. # <<<<<<<<<<<<<< @@ -10993,7 +10993,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 451, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - /* "src/_squish/voronoi_dcel.pyx":451 + /* "squish/_squish/voronoi_dcel.pyx":451 * # Get vertices of original N sites. * cdef np.ndarray[INT_T, ndim=1] vert_indices_np = np.asarray(vert_indices) * cdef np.ndarray[INT_T, ndim=1] border_sites = np.unique(np.searchsorted( # <<<<<<<<<<<<<< @@ -11004,7 +11004,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "src/_squish/voronoi_dcel.pyx":452 + /* "squish/_squish/voronoi_dcel.pyx":452 * cdef np.ndarray[INT_T, ndim=1] vert_indices_np = np.asarray(vert_indices) * cdef np.ndarray[INT_T, ndim=1] border_sites = np.unique(np.searchsorted( * np.asarray(offsets), # Check indices where below matches would be inserted # <<<<<<<<<<<<<< @@ -11032,7 +11032,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - /* "src/_squish/voronoi_dcel.pyx":453 + /* "squish/_squish/voronoi_dcel.pyx":453 * cdef np.ndarray[INT_T, ndim=1] border_sites = np.unique(np.searchsorted( * np.asarray(offsets), # Check indices where below matches would be inserted * np.nonzero(np.isin( # Indices of other verts being in bound verts. # <<<<<<<<<<<<<< @@ -11050,7 +11050,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_17); __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0; - /* "src/_squish/voronoi_dcel.pyx":454 + /* "squish/_squish/voronoi_dcel.pyx":454 * np.asarray(offsets), # Check indices where below matches would be inserted * np.nonzero(np.isin( # Indices of other verts being in bound verts. * vert_indices_np[offsets[self.n]:], # Rest of the verts to check. # <<<<<<<<<<<<<< @@ -11067,7 +11067,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_16); __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0; - /* "src/_squish/voronoi_dcel.pyx":455 + /* "squish/_squish/voronoi_dcel.pyx":455 * np.nonzero(np.isin( # Indices of other verts being in bound verts. * vert_indices_np[offsets[self.n]:], # Rest of the verts to check. * np.unique(vert_indices_np[:offsets[self.n]]) # Bound verts # <<<<<<<<<<<<<< @@ -11170,7 +11170,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_14); __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; - /* "src/_squish/voronoi_dcel.pyx":456 + /* "squish/_squish/voronoi_dcel.pyx":456 * vert_indices_np[offsets[self.n]:], # Rest of the verts to check. * np.unique(vert_indices_np[:offsets[self.n]]) # Bound verts * ))[0] + offsets[self.n], # <<<<<<<<<<<<<< @@ -11188,7 +11188,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - /* "src/_squish/voronoi_dcel.pyx":451 + /* "squish/_squish/voronoi_dcel.pyx":451 * # Get vertices of original N sites. * cdef np.ndarray[INT_T, ndim=1] vert_indices_np = np.asarray(vert_indices) * cdef np.ndarray[INT_T, ndim=1] border_sites = np.unique(np.searchsorted( # <<<<<<<<<<<<<< @@ -11204,7 +11204,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_2 = 0; __pyx_t_13 = 0; - /* "src/_squish/voronoi_dcel.pyx":457 + /* "squish/_squish/voronoi_dcel.pyx":457 * np.unique(vert_indices_np[:offsets[self.n]]) # Bound verts * ))[0] + offsets[self.n], * side='right' # If on index == offset_number, should be part of the next site. # <<<<<<<<<<<<<< @@ -11215,7 +11215,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_13); if (PyDict_SetItem(__pyx_t_13, __pyx_n_s_side, __pyx_n_u_right) < 0) __PYX_ERR(1, 457, __pyx_L1_error) - /* "src/_squish/voronoi_dcel.pyx":451 + /* "squish/_squish/voronoi_dcel.pyx":451 * # Get vertices of original N sites. * cdef np.ndarray[INT_T, ndim=1] vert_indices_np = np.asarray(vert_indices) * cdef np.ndarray[INT_T, ndim=1] border_sites = np.unique(np.searchsorted( # <<<<<<<<<<<<<< @@ -11228,7 +11228,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - /* "src/_squish/voronoi_dcel.pyx":458 + /* "squish/_squish/voronoi_dcel.pyx":458 * ))[0] + offsets[self.n], * side='right' # If on index == offset_number, should be part of the next site. * ) - 1) # Subtract by one to get actual site number. # <<<<<<<<<<<<<< @@ -11255,7 +11255,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":451 + /* "squish/_squish/voronoi_dcel.pyx":451 * # Get vertices of original N sites. * cdef np.ndarray[INT_T, ndim=1] vert_indices_np = np.asarray(vert_indices) * cdef np.ndarray[INT_T, ndim=1] border_sites = np.unique(np.searchsorted( # <<<<<<<<<<<<<< @@ -11276,7 +11276,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_v_border_sites = ((PyArrayObject *)__pyx_t_3); __pyx_t_3 = 0; - /* "src/_squish/voronoi_dcel.pyx":460 + /* "squish/_squish/voronoi_dcel.pyx":460 * ) - 1) # Subtract by one to get actual site number. * * cdef INT_T border_num = len(border_sites) # <<<<<<<<<<<<<< @@ -11286,7 +11286,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_10 = PyObject_Length(((PyObject *)__pyx_v_border_sites)); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(1, 460, __pyx_L1_error) __pyx_v_border_num = __pyx_t_10; - /* "src/_squish/voronoi_dcel.pyx":464 + /* "squish/_squish/voronoi_dcel.pyx":464 * # Build sites array. * # [Site Index, Edge Index/Offset, Edge Count] * self.sites = np.empty((self.n+border_num, 3), dtype=INT) # <<<<<<<<<<<<<< @@ -11331,7 +11331,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_24.memview = NULL; __pyx_t_24.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":465 + /* "squish/_squish/voronoi_dcel.pyx":465 * # [Site Index, Edge Index/Offset, Edge Count] * self.sites = np.empty((self.n+border_num, 3), dtype=INT) * self.sites.base[:self.n, 0] = np.arange(self.n, dtype=INT) # <<<<<<<<<<<<<< @@ -11385,7 +11385,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":466 + /* "squish/_squish/voronoi_dcel.pyx":466 * self.sites = np.empty((self.n+border_num, 3), dtype=INT) * self.sites.base[:self.n, 0] = np.arange(self.n, dtype=INT) * self.sites.base[self.n:, 0] = border_sites # <<<<<<<<<<<<<< @@ -11415,7 +11415,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":467 + /* "squish/_squish/voronoi_dcel.pyx":467 * self.sites.base[:self.n, 0] = np.arange(self.n, dtype=INT) * self.sites.base[self.n:, 0] = border_sites * self.sites.base[:self.n+1, 1] = offsets[:self.n+1] # <<<<<<<<<<<<<< @@ -11454,7 +11454,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":468 + /* "squish/_squish/voronoi_dcel.pyx":468 * self.sites.base[self.n:, 0] = border_sites * self.sites.base[:self.n+1, 1] = offsets[:self.n+1] * for i in range(self.n): # <<<<<<<<<<<<<< @@ -11466,7 +11466,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "src/_squish/voronoi_dcel.pyx":469 + /* "squish/_squish/voronoi_dcel.pyx":469 * self.sites.base[:self.n+1, 1] = offsets[:self.n+1] * for i in range(self.n): * self.sites[i, 2] = self.sites[i+1, 1] - self.sites[i, 1] # <<<<<<<<<<<<<< @@ -11485,7 +11485,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_28)) )) = ((*((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_9 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_25)) ))) - (*((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_11 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) )))); } - /* "src/_squish/voronoi_dcel.pyx":471 + /* "squish/_squish/voronoi_dcel.pyx":471 * self.sites[i, 2] = self.sites[i+1, 1] - self.sites[i, 1] * * cdef INT_T edge_count = offsets[self.n] # <<<<<<<<<<<<<< @@ -11495,7 +11495,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_6 = __pyx_v_self->n; __pyx_v_edge_count = (*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides)); - /* "src/_squish/voronoi_dcel.pyx":473 + /* "squish/_squish/voronoi_dcel.pyx":473 * cdef INT_T edge_count = offsets[self.n] * cdef INT_T diff * for i in range(border_num): # <<<<<<<<<<<<<< @@ -11507,7 +11507,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "src/_squish/voronoi_dcel.pyx":474 + /* "squish/_squish/voronoi_dcel.pyx":474 * cdef INT_T diff * for i in range(border_num): * diff = offsets[border_sites[i]+1] - offsets[border_sites[i]] # <<<<<<<<<<<<<< @@ -11520,7 +11520,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_29 = (*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_border_sites.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_border_sites.diminfo[0].strides)); __pyx_v_diff = ((*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_offsets.diminfo[0].strides)) - (*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_29, __pyx_pybuffernd_offsets.diminfo[0].strides))); - /* "src/_squish/voronoi_dcel.pyx":475 + /* "squish/_squish/voronoi_dcel.pyx":475 * for i in range(border_num): * diff = offsets[border_sites[i]+1] - offsets[border_sites[i]] * edge_count += diff # <<<<<<<<<<<<<< @@ -11529,7 +11529,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 */ __pyx_v_edge_count = (__pyx_v_edge_count + __pyx_v_diff); - /* "src/_squish/voronoi_dcel.pyx":476 + /* "squish/_squish/voronoi_dcel.pyx":476 * diff = offsets[border_sites[i]+1] - offsets[border_sites[i]] * edge_count += diff * self.sites[self.n+i, 2] = diff # <<<<<<<<<<<<<< @@ -11541,7 +11541,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_26 = 2; *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) )) = __pyx_v_diff; - /* "src/_squish/voronoi_dcel.pyx":477 + /* "squish/_squish/voronoi_dcel.pyx":477 * edge_count += diff * self.sites[self.n+i, 2] = diff * if i < border_num - 1: # <<<<<<<<<<<<<< @@ -11551,7 +11551,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_30 = ((__pyx_v_i < (__pyx_v_border_num - 1)) != 0); if (__pyx_t_30) { - /* "src/_squish/voronoi_dcel.pyx":478 + /* "squish/_squish/voronoi_dcel.pyx":478 * self.sites[self.n+i, 2] = diff * if i < border_num - 1: * self.sites[self.n+i+1, 1] = self.sites[self.n+i, 1] + diff # <<<<<<<<<<<<<< @@ -11566,7 +11566,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_25 = 1; *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_29 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_25)) )) = ((*((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))) + __pyx_v_diff); - /* "src/_squish/voronoi_dcel.pyx":477 + /* "squish/_squish/voronoi_dcel.pyx":477 * edge_count += diff * self.sites[self.n+i, 2] = diff * if i < border_num - 1: # <<<<<<<<<<<<<< @@ -11576,7 +11576,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 } } - /* "src/_squish/voronoi_dcel.pyx":482 + /* "squish/_squish/voronoi_dcel.pyx":482 * # Build edges array * # [Origin Index, Site Index, Next Index, Prev Index, Twin Index] * self.edges = np.empty((edge_count, 5), dtype=INT) # <<<<<<<<<<<<<< @@ -11621,7 +11621,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_24.memview = NULL; __pyx_t_24.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":486 + /* "squish/_squish/voronoi_dcel.pyx":486 * cdef INT_T j, site_i, edge_i, edge_offset, vert_num, twin_index, prev_res * * edge_indices = dict() # <<<<<<<<<<<<<< @@ -11633,7 +11633,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_v_edge_indices = ((PyObject*)__pyx_t_13); __pyx_t_13 = 0; - /* "src/_squish/voronoi_dcel.pyx":488 + /* "squish/_squish/voronoi_dcel.pyx":488 * edge_indices = dict() * * for i in range(self.n + border_num): # <<<<<<<<<<<<<< @@ -11645,7 +11645,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "src/_squish/voronoi_dcel.pyx":489 + /* "squish/_squish/voronoi_dcel.pyx":489 * * for i in range(self.n + border_num): * site_i = self.sites[i, 0] # <<<<<<<<<<<<<< @@ -11657,7 +11657,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_26 = 0; __pyx_v_site_i = (*((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))); - /* "src/_squish/voronoi_dcel.pyx":490 + /* "squish/_squish/voronoi_dcel.pyx":490 * for i in range(self.n + border_num): * site_i = self.sites[i, 0] * edge_offset = self.sites[i, 1] # <<<<<<<<<<<<<< @@ -11669,7 +11669,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __pyx_t_26 = 1; __pyx_v_edge_offset = (*((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))); - /* "src/_squish/voronoi_dcel.pyx":491 + /* "squish/_squish/voronoi_dcel.pyx":491 * site_i = self.sites[i, 0] * edge_offset = self.sites[i, 1] * site_verts = vert_indices_np[offsets[site_i]:offsets[site_i+1]] # <<<<<<<<<<<<<< @@ -11712,7 +11712,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_generate_dcel(struct __pyx_obj_7 __Pyx_XDECREF_SET(__pyx_v_site_verts, ((PyArrayObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "src/_squish/voronoi_dcel.pyx":494 + /* "squish/_squish/voronoi_dcel.pyx":494 * * # Scipy outputs sorted vertices, but reverse if not counterclockwise. * if not VoronoiContainer.sign(self.points[site_i], # <<<<<<<<<<<<<< @@ -11735,7 +11735,7 @@ __pyx_t_35.strides[0] = __pyx_v_self->points.strides[1]; if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 495, __pyx_L1_error)} - /* "src/_squish/voronoi_dcel.pyx":495 + /* "squish/_squish/voronoi_dcel.pyx":495 * # Scipy outputs sorted vertices, but reverse if not counterclockwise. * if not VoronoiContainer.sign(self.points[site_i], * self.vertices[site_verts[0]], self.vertices[site_verts[1]]): # <<<<<<<<<<<<<< @@ -11773,7 +11773,7 @@ __pyx_t_37.strides[0] = __pyx_v_self->vertices.strides[1]; __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36, __pyx_t_37) != 0)) != 0); - /* "src/_squish/voronoi_dcel.pyx":494 + /* "squish/_squish/voronoi_dcel.pyx":494 * * # Scipy outputs sorted vertices, but reverse if not counterclockwise. * if not VoronoiContainer.sign(self.points[site_i], # <<<<<<<<<<<<<< @@ -11791,7 +11791,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_37.data = NULL; if (__pyx_t_30) { - /* "src/_squish/voronoi_dcel.pyx":496 + /* "squish/_squish/voronoi_dcel.pyx":496 * if not VoronoiContainer.sign(self.points[site_i], * self.vertices[site_verts[0]], self.vertices[site_verts[1]]): * site_verts = np.flip(site_verts) # <<<<<<<<<<<<<< @@ -11841,7 +11841,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __Pyx_DECREF_SET(__pyx_v_site_verts, ((PyArrayObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "src/_squish/voronoi_dcel.pyx":494 + /* "squish/_squish/voronoi_dcel.pyx":494 * * # Scipy outputs sorted vertices, but reverse if not counterclockwise. * if not VoronoiContainer.sign(self.points[site_i], # <<<<<<<<<<<<<< @@ -11850,7 +11850,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 */ } - /* "src/_squish/voronoi_dcel.pyx":498 + /* "squish/_squish/voronoi_dcel.pyx":498 * site_verts = np.flip(site_verts) * * vert_num = offsets[site_i+1] - offsets[site_i] # <<<<<<<<<<<<<< @@ -11861,7 +11861,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_29 = __pyx_v_site_i; __pyx_v_vert_num = ((*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_offsets.diminfo[0].strides)) - (*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_29, __pyx_pybuffernd_offsets.diminfo[0].strides))); - /* "src/_squish/voronoi_dcel.pyx":500 + /* "squish/_squish/voronoi_dcel.pyx":500 * vert_num = offsets[site_i+1] - offsets[site_i] * * for j in range(vert_num): # <<<<<<<<<<<<<< @@ -11873,7 +11873,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_27; __pyx_t_11+=1) { __pyx_v_j = __pyx_t_11; - /* "src/_squish/voronoi_dcel.pyx":501 + /* "squish/_squish/voronoi_dcel.pyx":501 * * for j in range(vert_num): * edge_i = edge_offset+j # <<<<<<<<<<<<<< @@ -11882,7 +11882,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 */ __pyx_v_edge_i = (__pyx_v_edge_offset + __pyx_v_j); - /* "src/_squish/voronoi_dcel.pyx":502 + /* "squish/_squish/voronoi_dcel.pyx":502 * for j in range(vert_num): * edge_i = edge_offset+j * self.edges[edge_i, 0] = site_verts[j] # <<<<<<<<<<<<<< @@ -11895,7 +11895,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_26 = 0; *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->edges.data + __pyx_t_38 * __pyx_v_self->edges.strides[0]) )) + __pyx_t_26)) )) = (*__Pyx_BufPtrStrided1d(__pyx_t_7_squish_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides)); - /* "src/_squish/voronoi_dcel.pyx":503 + /* "squish/_squish/voronoi_dcel.pyx":503 * edge_i = edge_offset+j * self.edges[edge_i, 0] = site_verts[j] * self.edges[edge_i, 1] = i # <<<<<<<<<<<<<< @@ -11907,7 +11907,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_26 = 1; *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->edges.data + __pyx_t_9 * __pyx_v_self->edges.strides[0]) )) + __pyx_t_26)) )) = __pyx_v_i; - /* "src/_squish/voronoi_dcel.pyx":505 + /* "squish/_squish/voronoi_dcel.pyx":505 * self.edges[edge_i, 1] = i * # Add vert_num because of C modulo to get always positive. * self.edges[edge_i, 2] = (j+vert_num+1) % vert_num + edge_offset # <<<<<<<<<<<<<< @@ -11919,7 +11919,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_26 = 2; *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->edges.data + __pyx_t_9 * __pyx_v_self->edges.strides[0]) )) + __pyx_t_26)) )) = ((((__pyx_v_j + __pyx_v_vert_num) + 1) % __pyx_v_vert_num) + __pyx_v_edge_offset); - /* "src/_squish/voronoi_dcel.pyx":506 + /* "squish/_squish/voronoi_dcel.pyx":506 * # Add vert_num because of C modulo to get always positive. * self.edges[edge_i, 2] = (j+vert_num+1) % vert_num + edge_offset * self.edges[edge_i, 3] = (j+vert_num-1) % vert_num + edge_offset # <<<<<<<<<<<<<< @@ -11931,7 +11931,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_26 = 3; *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->edges.data + __pyx_t_9 * __pyx_v_self->edges.strides[0]) )) + __pyx_t_26)) )) = ((((__pyx_v_j + __pyx_v_vert_num) - 1) % __pyx_v_vert_num) + __pyx_v_edge_offset); - /* "src/_squish/voronoi_dcel.pyx":510 + /* "squish/_squish/voronoi_dcel.pyx":510 * # Get reversed tuple to theck for twin. * twin_index = edge_indices.get( * (site_verts[(j+1) % vert_num], site_verts[j] # <<<<<<<<<<<<<< @@ -11953,7 +11953,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_3 = 0; __pyx_t_13 = 0; - /* "src/_squish/voronoi_dcel.pyx":509 + /* "squish/_squish/voronoi_dcel.pyx":509 * * # Get reversed tuple to theck for twin. * twin_index = edge_indices.get( # <<<<<<<<<<<<<< @@ -11967,7 +11967,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __pyx_v_twin_index = __pyx_t_9; - /* "src/_squish/voronoi_dcel.pyx":513 + /* "squish/_squish/voronoi_dcel.pyx":513 * ), -1) * * self.edges[edge_i, 4] = twin_index # <<<<<<<<<<<<<< @@ -11979,7 +11979,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_26 = 4; *((__pyx_t_7_squish_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_INT_T *) ( /* dim=0 */ (__pyx_v_self->edges.data + __pyx_t_9 * __pyx_v_self->edges.strides[0]) )) + __pyx_t_26)) )) = __pyx_v_twin_index; - /* "src/_squish/voronoi_dcel.pyx":514 + /* "squish/_squish/voronoi_dcel.pyx":514 * * self.edges[edge_i, 4] = twin_index * if twin_index == -1: # <<<<<<<<<<<<<< @@ -11989,7 +11989,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_30 = ((__pyx_v_twin_index == -1LL) != 0); if (__pyx_t_30) { - /* "src/_squish/voronoi_dcel.pyx":516 + /* "squish/_squish/voronoi_dcel.pyx":516 * if twin_index == -1: * edge_indices[(site_verts[j], site_verts[(j+1) % vert_num])] = \ * j + edge_offset # <<<<<<<<<<<<<< @@ -11999,7 +11999,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_13 = __Pyx_PyInt_From_npy_int64((__pyx_v_j + __pyx_v_edge_offset)); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 516, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - /* "src/_squish/voronoi_dcel.pyx":515 + /* "squish/_squish/voronoi_dcel.pyx":515 * self.edges[edge_i, 4] = twin_index * if twin_index == -1: * edge_indices[(site_verts[j], site_verts[(j+1) % vert_num])] = \ # <<<<<<<<<<<<<< @@ -12024,7 +12024,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - /* "src/_squish/voronoi_dcel.pyx":514 + /* "squish/_squish/voronoi_dcel.pyx":514 * * self.edges[edge_i, 4] = twin_index * if twin_index == -1: # <<<<<<<<<<<<<< @@ -12034,7 +12034,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 goto __pyx_L15; } - /* "src/_squish/voronoi_dcel.pyx":518 + /* "squish/_squish/voronoi_dcel.pyx":518 * j + edge_offset * else: * self.edges[twin_index, 4] = j + edge_offset # <<<<<<<<<<<<<< @@ -12051,7 +12051,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 } } - /* "src/_squish/voronoi_dcel.pyx":520 + /* "squish/_squish/voronoi_dcel.pyx":520 * self.edges[twin_index, 4] = j + edge_offset * * self.site_cache = np.empty((self.n + border_num, 5), dtype=FLOAT) # <<<<<<<<<<<<<< @@ -12096,7 +12096,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_39.memview = NULL; __pyx_t_39.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":521 + /* "squish/_squish/voronoi_dcel.pyx":521 * * self.site_cache = np.empty((self.n + border_num, 5), dtype=FLOAT) * self.edge_cache = np.empty((edge_count, self.edge_cache_map.size), dtype=FLOAT) # <<<<<<<<<<<<<< @@ -12143,7 +12143,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __pyx_t_39.memview = NULL; __pyx_t_39.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":435 + /* "squish/_squish/voronoi_dcel.pyx":435 * * * cdef void generate_dcel(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -12200,7 +12200,7 @@ __pyx_t_30 = ((!(__pyx_f_7_squish_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36 __Pyx_RefNannyFinishContext(); } -/* "src/_squish/voronoi_dcel.pyx":524 +/* "squish/_squish/voronoi_dcel.pyx":524 * * * cdef void common_cache(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -12245,7 +12245,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("common_cache", 0); - /* "src/_squish/voronoi_dcel.pyx":525 + /* "squish/_squish/voronoi_dcel.pyx":525 * * cdef void common_cache(VoronoiContainer self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -12256,7 +12256,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 525, __pyx_L1_error)} if (unlikely(!__pyx_v_self->points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 525, __pyx_L1_error)} - /* "src/_squish/voronoi_dcel.pyx":526 + /* "squish/_squish/voronoi_dcel.pyx":526 * cdef void common_cache(VoronoiContainer self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) # <<<<<<<<<<<<<< @@ -12267,7 +12267,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ if (unlikely(!__pyx_v_self->site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 526, __pyx_L1_error)} if (unlikely(!__pyx_v_self->edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 526, __pyx_L1_error)} - /* "src/_squish/voronoi_dcel.pyx":525 + /* "squish/_squish/voronoi_dcel.pyx":525 * * cdef void common_cache(VoronoiContainer self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -12276,7 +12276,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ */ __pyx_v_info = __pyx_v_7_squish_init.VoronoiInfo(__pyx_v_self->sites, __pyx_v_self->edges, __pyx_v_self->points, __pyx_v_self->vertices, __pyx_v_self->site_cache, __pyx_v_self->edge_cache, __pyx_v_self->edge_cache_map); - /* "src/_squish/voronoi_dcel.pyx":532 + /* "squish/_squish/voronoi_dcel.pyx":532 * cdef Vector2D p, q, la, da, Rla * * cdef FLOAT_T [:] area = np.zeros(self.sites.shape[0], dtype=FLOAT) # <<<<<<<<<<<<<< @@ -12313,7 +12313,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ __pyx_t_5.memview = NULL; __pyx_t_5.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":533 + /* "squish/_squish/voronoi_dcel.pyx":533 * * cdef FLOAT_T [:] area = np.zeros(self.sites.shape[0], dtype=FLOAT) * cdef FLOAT_T [:] perim = np.zeros(self.sites.shape[0], dtype=FLOAT) # <<<<<<<<<<<<<< @@ -12350,7 +12350,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ __pyx_t_5.memview = NULL; __pyx_t_5.data = NULL; - /* "src/_squish/voronoi_dcel.pyx":537 + /* "squish/_squish/voronoi_dcel.pyx":537 * cdef INT_T i, j * cdef FLOAT_T e_area, la_mag * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -12392,249 +12392,230 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ __pyx_v_j = ((__pyx_t_7_squish_INT_T)0xbad0bad0); __pyx_v_la_mag = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); - /* "src/_squish/voronoi_dcel.pyx":538 + /* "squish/_squish/voronoi_dcel.pyx":538 * cdef FLOAT_T e_area, la_mag * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< * em = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): */ __pyx_v_xi = __pyx_v_7_squish_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "src/_squish/voronoi_dcel.pyx":539 + /* "squish/_squish/voronoi_dcel.pyx":539 * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) * em = xi.edge(&xi) # <<<<<<<<<<<<<< - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): * ep = em.next(&em) */ __pyx_v_em = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "src/_squish/voronoi_dcel.pyx":540 + /* "squish/_squish/voronoi_dcel.pyx":540 * xi = init.Site(i, &info) * em = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< + * for j in range(xi.edge_num(&xi)): # <<<<<<<<<<<<<< * ep = em.next(&em) * p, q = em.origin(&em), ep.origin(&ep) */ __pyx_t_9 = __pyx_v_xi.edge_num((&__pyx_v_xi)); - if ((1 == 0)) abort(); - { - __pyx_t_11 = (__pyx_t_9 - 0 + 1 - 1/abs(1)) / 1; - if (__pyx_t_11 > 0) - { - #if 0 - #pragma omp parallel - #endif /* _OPENMP */ - { - #if 0 - #pragma omp for lastprivate(__pyx_v_Rla) lastprivate(__pyx_v_da) lastprivate(__pyx_v_e_area) lastprivate(__pyx_v_em) lastprivate(__pyx_v_ep) firstprivate(__pyx_v_j) lastprivate(__pyx_v_j) lastprivate(__pyx_v_la) lastprivate(__pyx_v_la_mag) lastprivate(__pyx_v_p) lastprivate(__pyx_v_q) - #endif /* _OPENMP */ - for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_11; __pyx_t_10++){ - { - __pyx_v_j = (__pyx_t_7_squish_INT_T)(0 + 1 * __pyx_t_10); - /* Initialize private variables to invalid values */ - __pyx_v_e_area = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); - __pyx_v_la_mag = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); + __pyx_t_10 = __pyx_t_9; + for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) { + __pyx_v_j = __pyx_t_11; - /* "src/_squish/voronoi_dcel.pyx":541 + /* "squish/_squish/voronoi_dcel.pyx":541 * em = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): * ep = em.next(&em) # <<<<<<<<<<<<<< * p, q = em.origin(&em), ep.origin(&ep) * la, da = q.copy.vsub(&q, p), p.copy.vsub(&p, xi.vec(&xi)) # vp - vm, vm - xi */ - __pyx_v_ep = __pyx_v_em.next((&__pyx_v_em)); + __pyx_v_ep = __pyx_v_em.next((&__pyx_v_em)); - /* "src/_squish/voronoi_dcel.pyx":542 - * for j in prange(xi.edge_num(&xi)): + /* "squish/_squish/voronoi_dcel.pyx":542 + * for j in range(xi.edge_num(&xi)): * ep = em.next(&em) * p, q = em.origin(&em), ep.origin(&ep) # <<<<<<<<<<<<<< * la, da = q.copy.vsub(&q, p), p.copy.vsub(&p, xi.vec(&xi)) # vp - vm, vm - xi * */ - __pyx_t_12 = __pyx_v_em.origin((&__pyx_v_em)); - __pyx_t_13 = __pyx_v_ep.origin((&__pyx_v_ep)); - __pyx_v_p = __pyx_t_12; - __pyx_v_q = __pyx_t_13; + __pyx_t_12 = __pyx_v_em.origin((&__pyx_v_em)); + __pyx_t_13 = __pyx_v_ep.origin((&__pyx_v_ep)); + __pyx_v_p = __pyx_t_12; + __pyx_v_q = __pyx_t_13; - /* "src/_squish/voronoi_dcel.pyx":543 + /* "squish/_squish/voronoi_dcel.pyx":543 * ep = em.next(&em) * p, q = em.origin(&em), ep.origin(&ep) * la, da = q.copy.vsub(&q, p), p.copy.vsub(&p, xi.vec(&xi)) # vp - vm, vm - xi # <<<<<<<<<<<<<< * * la_mag = la.mag(&la) */ - __pyx_t_13 = __pyx_v_q.copy.vsub((&__pyx_v_q), __pyx_v_p); - __pyx_t_12 = __pyx_v_p.copy.vsub((&__pyx_v_p), __pyx_v_xi.vec((&__pyx_v_xi))); - __pyx_v_la = __pyx_t_13; - __pyx_v_da = __pyx_t_12; + __pyx_t_13 = __pyx_v_q.copy.vsub((&__pyx_v_q), __pyx_v_p); + __pyx_t_12 = __pyx_v_p.copy.vsub((&__pyx_v_p), __pyx_v_xi.vec((&__pyx_v_xi))); + __pyx_v_la = __pyx_t_13; + __pyx_v_da = __pyx_t_12; - /* "src/_squish/voronoi_dcel.pyx":545 + /* "squish/_squish/voronoi_dcel.pyx":545 * la, da = q.copy.vsub(&q, p), p.copy.vsub(&p, xi.vec(&xi)) # vp - vm, vm - xi * * la_mag = la.mag(&la) # <<<<<<<<<<<<<< * e_area = la.dot(&la, da.rot(&da)) * Rla = la.rot(&la) */ - __pyx_v_la_mag = __pyx_v_la.mag((&__pyx_v_la)); + __pyx_v_la_mag = __pyx_v_la.mag((&__pyx_v_la)); - /* "src/_squish/voronoi_dcel.pyx":546 + /* "squish/_squish/voronoi_dcel.pyx":546 * * la_mag = la.mag(&la) * e_area = la.dot(&la, da.rot(&da)) # <<<<<<<<<<<<<< * Rla = la.rot(&la) * */ - __pyx_v_e_area = __pyx_v_la.dot((&__pyx_v_la), __pyx_v_da.rot((&__pyx_v_da))); + __pyx_v_e_area = __pyx_v_la.dot((&__pyx_v_la), __pyx_v_da.rot((&__pyx_v_da))); - /* "src/_squish/voronoi_dcel.pyx":547 + /* "squish/_squish/voronoi_dcel.pyx":547 * la_mag = la.mag(&la) * e_area = la.dot(&la, da.rot(&da)) * Rla = la.rot(&la) # <<<<<<<<<<<<<< * * em.cache.la(&em, la) */ - __pyx_v_Rla = __pyx_v_la.rot((&__pyx_v_la)); + __pyx_v_Rla = __pyx_v_la.rot((&__pyx_v_la)); - /* "src/_squish/voronoi_dcel.pyx":549 + /* "squish/_squish/voronoi_dcel.pyx":549 * Rla = la.rot(&la) * * em.cache.la(&em, la) # <<<<<<<<<<<<<< * em.cache.la_mag(&em, la_mag) * em.cache.da(&em, da) */ - (void)(__pyx_v_em.cache->la((&__pyx_v_em), __pyx_v_la)); + (void)(__pyx_v_em.cache->la((&__pyx_v_em), __pyx_v_la)); - /* "src/_squish/voronoi_dcel.pyx":550 + /* "squish/_squish/voronoi_dcel.pyx":550 * * em.cache.la(&em, la) * em.cache.la_mag(&em, la_mag) # <<<<<<<<<<<<<< * em.cache.da(&em, da) * em.cache.da_mag(&em, da.mag(&da)) */ - (void)(__pyx_v_em.cache->la_mag((&__pyx_v_em), __pyx_v_la_mag)); + (void)(__pyx_v_em.cache->la_mag((&__pyx_v_em), __pyx_v_la_mag)); - /* "src/_squish/voronoi_dcel.pyx":551 + /* "squish/_squish/voronoi_dcel.pyx":551 * em.cache.la(&em, la) * em.cache.la_mag(&em, la_mag) * em.cache.da(&em, da) # <<<<<<<<<<<<<< * em.cache.da_mag(&em, da.mag(&da)) * em.cache.xij(&em, Rla.copy.smul(&Rla, -e_area/la.dot(&la, la))) */ - (void)(__pyx_v_em.cache->da((&__pyx_v_em), __pyx_v_da)); + (void)(__pyx_v_em.cache->da((&__pyx_v_em), __pyx_v_da)); - /* "src/_squish/voronoi_dcel.pyx":552 + /* "squish/_squish/voronoi_dcel.pyx":552 * em.cache.la_mag(&em, la_mag) * em.cache.da(&em, da) * em.cache.da_mag(&em, da.mag(&da)) # <<<<<<<<<<<<<< * em.cache.xij(&em, Rla.copy.smul(&Rla, -e_area/la.dot(&la, la))) * */ - (void)(__pyx_v_em.cache->da_mag((&__pyx_v_em), __pyx_v_da.mag((&__pyx_v_da)))); + (void)(__pyx_v_em.cache->da_mag((&__pyx_v_em), __pyx_v_da.mag((&__pyx_v_da)))); - /* "src/_squish/voronoi_dcel.pyx":553 + /* "squish/_squish/voronoi_dcel.pyx":553 * em.cache.da(&em, da) * em.cache.da_mag(&em, da.mag(&da)) * em.cache.xij(&em, Rla.copy.smul(&Rla, -e_area/la.dot(&la, la))) # <<<<<<<<<<<<<< * * if info.edge_cache_map.iF != -1: */ - (void)(__pyx_v_em.cache->xij((&__pyx_v_em), __pyx_v_Rla.copy.smul((&__pyx_v_Rla), ((-__pyx_v_e_area) / __pyx_v_la.dot((&__pyx_v_la), __pyx_v_la))))); + (void)(__pyx_v_em.cache->xij((&__pyx_v_em), __pyx_v_Rla.copy.smul((&__pyx_v_Rla), ((-__pyx_v_e_area) / __pyx_v_la.dot((&__pyx_v_la), __pyx_v_la))))); - /* "src/_squish/voronoi_dcel.pyx":555 + /* "squish/_squish/voronoi_dcel.pyx":555 * em.cache.xij(&em, Rla.copy.smul(&Rla, -e_area/la.dot(&la, la))) * * if info.edge_cache_map.iF != -1: # <<<<<<<<<<<<<< * em.cache.F(&em, e_area) * */ - __pyx_t_14 = ((__pyx_v_info.edge_cache_map->iF != -1LL) != 0); - if (__pyx_t_14) { + __pyx_t_14 = ((__pyx_v_info.edge_cache_map->iF != -1LL) != 0); + if (__pyx_t_14) { - /* "src/_squish/voronoi_dcel.pyx":556 + /* "squish/_squish/voronoi_dcel.pyx":556 * * if info.edge_cache_map.iF != -1: * em.cache.F(&em, e_area) # <<<<<<<<<<<<<< * * area[i] += e_area */ - (void)(__pyx_v_em.cache->F((&__pyx_v_em), __pyx_v_e_area)); + (void)(__pyx_v_em.cache->F((&__pyx_v_em), __pyx_v_e_area)); - /* "src/_squish/voronoi_dcel.pyx":555 + /* "squish/_squish/voronoi_dcel.pyx":555 * em.cache.xij(&em, Rla.copy.smul(&Rla, -e_area/la.dot(&la, la))) * * if info.edge_cache_map.iF != -1: # <<<<<<<<<<<<<< * em.cache.F(&em, e_area) * */ - } + } - /* "src/_squish/voronoi_dcel.pyx":558 + /* "squish/_squish/voronoi_dcel.pyx":558 * em.cache.F(&em, e_area) * * area[i] += e_area # <<<<<<<<<<<<<< * perim[i] += la_mag * */ - __pyx_t_15 = __pyx_v_i; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_15 * __pyx_v_area.strides[0]) )) += __pyx_v_e_area; + __pyx_t_15 = __pyx_v_i; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_15 * __pyx_v_area.strides[0]) )) += __pyx_v_e_area; - /* "src/_squish/voronoi_dcel.pyx":559 + /* "squish/_squish/voronoi_dcel.pyx":559 * * area[i] += e_area * perim[i] += la_mag # <<<<<<<<<<<<<< * * em = em.next(&em) */ - __pyx_t_15 = __pyx_v_i; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_15 * __pyx_v_perim.strides[0]) )) += __pyx_v_la_mag; + __pyx_t_15 = __pyx_v_i; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_15 * __pyx_v_perim.strides[0]) )) += __pyx_v_la_mag; - /* "src/_squish/voronoi_dcel.pyx":561 + /* "squish/_squish/voronoi_dcel.pyx":561 * perim[i] += la_mag * * em = em.next(&em) # <<<<<<<<<<<<<< * * xi.cache.area(&xi, area[i]/2) */ - __pyx_v_em = __pyx_v_em.next((&__pyx_v_em)); - } - } - } - } + __pyx_v_em = __pyx_v_em.next((&__pyx_v_em)); } - /* "src/_squish/voronoi_dcel.pyx":563 + /* "squish/_squish/voronoi_dcel.pyx":563 * em = em.next(&em) * * xi.cache.area(&xi, area[i]/2) # <<<<<<<<<<<<<< * xi.cache.perim(&xi, perim[i]) * xi.cache.isoparam(&xi, 2*PI*area[i]/(perim[i]*perim[i])) */ - __pyx_t_11 = __pyx_v_i; - (void)(__pyx_v_xi.cache->area((&__pyx_v_xi), ((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_11 * __pyx_v_area.strides[0]) ))) / 2.0))); + __pyx_t_9 = __pyx_v_i; + (void)(__pyx_v_xi.cache->area((&__pyx_v_xi), ((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_9 * __pyx_v_area.strides[0]) ))) / 2.0))); - /* "src/_squish/voronoi_dcel.pyx":564 + /* "squish/_squish/voronoi_dcel.pyx":564 * * xi.cache.area(&xi, area[i]/2) * xi.cache.perim(&xi, perim[i]) # <<<<<<<<<<<<<< * xi.cache.isoparam(&xi, 2*PI*area[i]/(perim[i]*perim[i])) * */ - __pyx_t_11 = __pyx_v_i; - (void)(__pyx_v_xi.cache->perim((&__pyx_v_xi), (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_11 * __pyx_v_perim.strides[0]) ))))); + __pyx_t_9 = __pyx_v_i; + (void)(__pyx_v_xi.cache->perim((&__pyx_v_xi), (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_9 * __pyx_v_perim.strides[0]) ))))); - /* "src/_squish/voronoi_dcel.pyx":565 + /* "squish/_squish/voronoi_dcel.pyx":565 * xi.cache.area(&xi, area[i]/2) * xi.cache.perim(&xi, perim[i]) * xi.cache.isoparam(&xi, 2*PI*area[i]/(perim[i]*perim[i])) # <<<<<<<<<<<<<< * * */ - __pyx_t_11 = __pyx_v_i; - __pyx_t_10 = __pyx_v_i; __pyx_t_9 = __pyx_v_i; - (void)(__pyx_v_xi.cache->isoparam((&__pyx_v_xi), (((2.0 * M_PI) * (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_11 * __pyx_v_area.strides[0]) )))) / ((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_10 * __pyx_v_perim.strides[0]) ))) * (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_9 * __pyx_v_perim.strides[0]) ))))))); + __pyx_t_10 = __pyx_v_i; + __pyx_t_11 = __pyx_v_i; + (void)(__pyx_v_xi.cache->isoparam((&__pyx_v_xi), (((2.0 * M_PI) * (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_9 * __pyx_v_area.strides[0]) )))) / ((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_10 * __pyx_v_perim.strides[0]) ))) * (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_11 * __pyx_v_perim.strides[0]) ))))))); } } } @@ -12648,7 +12629,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ #endif } - /* "src/_squish/voronoi_dcel.pyx":537 + /* "squish/_squish/voronoi_dcel.pyx":537 * cdef INT_T i, j * cdef FLOAT_T e_area, la_mag * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -12674,7 +12655,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ } } - /* "src/_squish/voronoi_dcel.pyx":524 + /* "squish/_squish/voronoi_dcel.pyx":524 * * * cdef void common_cache(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -12697,7 +12678,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_common_cache(struct __pyx_obj_7_ __Pyx_RefNannyFinishContext(); } -/* "src/_squish/voronoi_dcel.pyx":569 +/* "squish/_squish/voronoi_dcel.pyx":569 * * @staticmethod * cdef inline Matrix2x2 calc_H(HalfEdge em, HalfEdge ep) nogil: # <<<<<<<<<<<<<< @@ -12723,7 +12704,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai __pyx_t_7_squish_FLOAT_T __pyx_t_3; __pyx_t_7_squish_FLOAT_T __pyx_t_4; - /* "src/_squish/voronoi_dcel.pyx":575 + /* "squish/_squish/voronoi_dcel.pyx":575 * * # Vectors from xi to xm and xp. * xmv, xpv = em.cache.xij(&em, NAN_VECTOR), ep.cache.xij(&ep, NAN_VECTOR) # <<<<<<<<<<<<<< @@ -12735,7 +12716,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai __pyx_v_xmv = __pyx_t_1; __pyx_v_xpv = __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":576 + /* "squish/_squish/voronoi_dcel.pyx":576 * # Vectors from xi to xm and xp. * xmv, xpv = em.cache.xij(&em, NAN_VECTOR), ep.cache.xij(&ep, NAN_VECTOR) * im, mp = xmv.copy.neg(&xmv), xmv.copy.vsub(&xmv, xpv) # -xmv, xmv - xpv # <<<<<<<<<<<<<< @@ -12747,7 +12728,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai __pyx_v_im = __pyx_t_2; __pyx_v_mp = __pyx_t_1; - /* "src/_squish/voronoi_dcel.pyx":577 + /* "squish/_squish/voronoi_dcel.pyx":577 * xmv, xpv = em.cache.xij(&em, NAN_VECTOR), ep.cache.xij(&ep, NAN_VECTOR) * im, mp = xmv.copy.neg(&xmv), xmv.copy.vsub(&xmv, xpv) # -xmv, xmv - xpv * im2, mp2 = -(xmv.dot(&xmv, xmv)), xmv.dot(&xmv, xmv) - xpv.dot(&xpv, xpv) # <<<<<<<<<<<<<< @@ -12759,7 +12740,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai __pyx_v_im2 = __pyx_t_3; __pyx_v_mp2 = __pyx_t_4; - /* "src/_squish/voronoi_dcel.pyx":579 + /* "squish/_squish/voronoi_dcel.pyx":579 * im2, mp2 = -(xmv.dot(&xmv, xmv)), xmv.dot(&xmv, xmv) - xpv.dot(&xpv, xpv) * # (-xmv*xmv, xmv*xmv - xpv*xpv) * right = init.Vector2D(im2, mp2) # <<<<<<<<<<<<<< @@ -12768,7 +12749,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai */ __pyx_v_right = __pyx_v_7_squish_init.Vector2D(__pyx_v_im2, __pyx_v_mp2); - /* "src/_squish/voronoi_dcel.pyx":580 + /* "squish/_squish/voronoi_dcel.pyx":580 * # (-xmv*xmv, xmv*xmv - xpv*xpv) * right = init.Vector2D(im2, mp2) * Rpm, Rim = R.vecmul(&R, mp.copy.neg(&mp)), im.rot(&im) # R*-mp, R*im # <<<<<<<<<<<<<< @@ -12780,7 +12761,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai __pyx_v_Rpm = __pyx_t_1; __pyx_v_Rim = __pyx_t_2; - /* "src/_squish/voronoi_dcel.pyx":582 + /* "squish/_squish/voronoi_dcel.pyx":582 * Rpm, Rim = R.vecmul(&R, mp.copy.neg(&mp)), im.rot(&im) # R*-mp, R*im * * h = init.Matrix2x2(Rpm.x, Rim.x, Rpm.y, Rim.y) # [Rpm | Rim], h is temporary. # <<<<<<<<<<<<<< @@ -12789,7 +12770,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai */ __pyx_v_h = __pyx_v_7_squish_init.Matrix2x2(__pyx_v_Rpm.x, __pyx_v_Rim.x, __pyx_v_Rpm.y, __pyx_v_Rim.y); - /* "src/_squish/voronoi_dcel.pyx":583 + /* "squish/_squish/voronoi_dcel.pyx":583 * * h = init.Matrix2x2(Rpm.x, Rim.x, Rpm.y, Rim.y) # [Rpm | Rim], h is temporary. * f = h.vecmul(&h, right) # [Rpm | Rim]*right # <<<<<<<<<<<<<< @@ -12798,7 +12779,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai */ __pyx_v_f = __pyx_v_h.vecmul((&__pyx_v_h), __pyx_v_right); - /* "src/_squish/voronoi_dcel.pyx":584 + /* "squish/_squish/voronoi_dcel.pyx":584 * h = init.Matrix2x2(Rpm.x, Rim.x, Rpm.y, Rim.y) # [Rpm | Rim], h is temporary. * f = h.vecmul(&h, right) # [Rpm | Rim]*right * h = R.copy.smul(&R, mp2*(2*mp.dot(&mp, Rim))) # fp*g, g is a scalar. # <<<<<<<<<<<<<< @@ -12807,7 +12788,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai */ __pyx_v_h = __pyx_v_7_squish_R.copy.smul((&__pyx_v_7_squish_R), (__pyx_v_mp2 * (2.0 * __pyx_v_mp.dot((&__pyx_v_mp), __pyx_v_Rim)))); - /* "src/_squish/voronoi_dcel.pyx":586 + /* "squish/_squish/voronoi_dcel.pyx":586 * h = R.copy.smul(&R, mp2*(2*mp.dot(&mp, Rim))) # fp*g, g is a scalar. * # (fp*g - f*gp)/(g**2). f is a column vector, gp = 2*Rpm is a row vector. * h.self.msub(&h, init.Matrix2x2( # <<<<<<<<<<<<<< @@ -12816,7 +12797,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai */ (void)(__pyx_v_h.self.msub((&__pyx_v_h), __pyx_v_7_squish_init.Matrix2x2(((__pyx_v_f.x * 2.0) * __pyx_v_Rpm.x), ((__pyx_v_f.x * 2.0) * __pyx_v_Rpm.y), ((__pyx_v_f.y * 2.0) * __pyx_v_Rpm.x), ((__pyx_v_f.y * 2.0) * __pyx_v_Rpm.y)))); - /* "src/_squish/voronoi_dcel.pyx":589 + /* "squish/_squish/voronoi_dcel.pyx":589 * f.x*2*Rpm.x, f.x*2*Rpm.y, f.y*2*Rpm.x, f.y*2*Rpm.y * )) * h.self.sdiv(&h, (2*mp.dot(&mp, Rim))**2) # <<<<<<<<<<<<<< @@ -12825,7 +12806,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai */ (void)(__pyx_v_h.self.sdiv((&__pyx_v_h), pow((2.0 * __pyx_v_mp.dot((&__pyx_v_mp), __pyx_v_Rim)), 2.0))); - /* "src/_squish/voronoi_dcel.pyx":591 + /* "squish/_squish/voronoi_dcel.pyx":591 * h.self.sdiv(&h, (2*mp.dot(&mp, Rim))**2) * * return h # <<<<<<<<<<<<<< @@ -12835,7 +12816,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai __pyx_r = __pyx_v_h; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":569 + /* "squish/_squish/voronoi_dcel.pyx":569 * * @staticmethod * cdef inline Matrix2x2 calc_H(HalfEdge em, HalfEdge ep) nogil: # <<<<<<<<<<<<<< @@ -12848,7 +12829,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Matrix2x2 __pyx_f_7_squish_16VoronoiContai return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":595 +/* "squish/_squish/voronoi_dcel.pyx":595 * * @staticmethod * cdef inline bint sign(FLOAT_T [::1] ref, FLOAT_T [::1] p, FLOAT_T [::1] q): # <<<<<<<<<<<<<< @@ -12869,7 +12850,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_16VoronoiContainer_sign(__Pyx_memviews Py_ssize_t __pyx_t_8; __Pyx_RefNannySetupContext("sign", 0); - /* "src/_squish/voronoi_dcel.pyx":602 + /* "squish/_squish/voronoi_dcel.pyx":602 * :return: [bool] returns if counterclockwise. * """ * return ((q[0] - ref[0])*-(p[1] - ref[1]) + \ # <<<<<<<<<<<<<< @@ -12881,7 +12862,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_16VoronoiContainer_sign(__Pyx_memviews __pyx_t_3 = 1; __pyx_t_4 = 1; - /* "src/_squish/voronoi_dcel.pyx":603 + /* "squish/_squish/voronoi_dcel.pyx":603 * """ * return ((q[0] - ref[0])*-(p[1] - ref[1]) + \ * (q[1] - ref[1])*(p[0] - ref[0])) >= 0 # <<<<<<<<<<<<<< @@ -12893,7 +12874,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_16VoronoiContainer_sign(__Pyx_memviews __pyx_t_7 = 0; __pyx_t_8 = 0; - /* "src/_squish/voronoi_dcel.pyx":602 + /* "squish/_squish/voronoi_dcel.pyx":602 * :return: [bool] returns if counterclockwise. * """ * return ((q[0] - ref[0])*-(p[1] - ref[1]) + \ # <<<<<<<<<<<<<< @@ -12903,7 +12884,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_16VoronoiContainer_sign(__Pyx_memviews __pyx_r = (((((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_q.data) + __pyx_t_1)) ))) - (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_2)) )))) * (-((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_p.data) + __pyx_t_3)) ))) - (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_4)) )))))) + (((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_q.data) + __pyx_t_5)) ))) - (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_6)) )))) * ((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_p.data) + __pyx_t_7)) ))) - (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_8)) )))))) >= 0.0); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":595 + /* "squish/_squish/voronoi_dcel.pyx":595 * * @staticmethod * cdef inline bint sign(FLOAT_T [::1] ref, FLOAT_T [::1] p, FLOAT_T [::1] q): # <<<<<<<<<<<<<< @@ -12917,7 +12898,7 @@ static CYTHON_INLINE int __pyx_f_7_squish_16VoronoiContainer_sign(__Pyx_memviews return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":609 +/* "squish/_squish/voronoi_dcel.pyx":609 * # return (q - ref).dot(rot.dot(p - ref)) >= 0 * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -12933,7 +12914,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_precompute(CYTHON_UNUSED struct __Pyx_RefNannyFinishContext(); } -/* "src/_squish/voronoi_dcel.pyx":612 +/* "squish/_squish/voronoi_dcel.pyx":612 * pass * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -12949,7 +12930,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_calc_grad(CYTHON_UNUSED struct _ __Pyx_RefNannyFinishContext(); } -/* "src/_squish/voronoi_dcel.pyx":615 +/* "squish/_squish/voronoi_dcel.pyx":615 * pass * * cdef void get_statistics(self) except *: # <<<<<<<<<<<<<< @@ -12977,7 +12958,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_get_statistics(struct __pyx_obj_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_statistics", 0); - /* "src/_squish/voronoi_dcel.pyx":616 + /* "squish/_squish/voronoi_dcel.pyx":616 * * cdef void get_statistics(self) except *: * self.stats = {} # <<<<<<<<<<<<<< @@ -12989,7 +12970,7 @@ static void __pyx_f_7_squish_16VoronoiContainer_get_statistics(struct __pyx_obj_ if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats, __pyx_t_1) < 0) __PYX_ERR(1, 616, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":617 + /* "squish/_squish/voronoi_dcel.pyx":617 * cdef void get_statistics(self) except *: * self.stats = {} * cache = self.site_cache[:self.n, :] # <<<<<<<<<<<<<< @@ -13030,7 +13011,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __pyx_v_cache = __pyx_t_1; __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":619 + /* "squish/_squish/voronoi_dcel.pyx":619 * cache = self.site_cache[:self.n, :] * * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) # <<<<<<<<<<<<<< @@ -13077,7 +13058,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":620 + /* "squish/_squish/voronoi_dcel.pyx":620 * * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) * self.stats["site_edge_count"] = np.asarray(self.sites[:self.n, 2]) # <<<<<<<<<<<<<< @@ -13144,7 +13125,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":622 + /* "squish/_squish/voronoi_dcel.pyx":622 * self.stats["site_edge_count"] = np.asarray(self.sites[:self.n, 2]) * * self.stats["site_isos"] = np.asarray(cache[:, SITE_CACHE_MAP.iisoparam]) # <<<<<<<<<<<<<< @@ -13191,7 +13172,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":623 + /* "squish/_squish/voronoi_dcel.pyx":623 * * self.stats["site_isos"] = np.asarray(cache[:, SITE_CACHE_MAP.iisoparam]) * self.stats["site_energies"] = np.asarray(cache[:, SITE_CACHE_MAP.ienergy]) # <<<<<<<<<<<<<< @@ -13238,7 +13219,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":624 + /* "squish/_squish/voronoi_dcel.pyx":624 * self.stats["site_isos"] = np.asarray(cache[:, SITE_CACHE_MAP.iisoparam]) * self.stats["site_energies"] = np.asarray(cache[:, SITE_CACHE_MAP.ienergy]) * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) # <<<<<<<<<<<<<< @@ -13285,7 +13266,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":626 + /* "squish/_squish/voronoi_dcel.pyx":626 * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) * * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ # <<<<<<<<<<<<<< @@ -13298,7 +13279,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":627 + /* "squish/_squish/voronoi_dcel.pyx":627 * * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ * (PI*self.stats["avg_radius"]**2) # <<<<<<<<<<<<<< @@ -13320,7 +13301,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":626 + /* "squish/_squish/voronoi_dcel.pyx":626 * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) * * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ # <<<<<<<<<<<<<< @@ -13337,7 +13318,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":629 + /* "squish/_squish/voronoi_dcel.pyx":629 * (PI*self.stats["avg_radius"]**2) * * edges = np.asarray(self.edges) # <<<<<<<<<<<<<< @@ -13371,7 +13352,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __pyx_v_edges = __pyx_t_4; __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":631 + /* "squish/_squish/voronoi_dcel.pyx":631 * edges = np.asarray(self.edges) * * mask = np.nonzero(edges[:, 0] != -1)[0] # <<<<<<<<<<<<<< @@ -13410,7 +13391,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __pyx_v_mask = __pyx_t_6; __pyx_t_6 = 0; - /* "src/_squish/voronoi_dcel.pyx":632 + /* "squish/_squish/voronoi_dcel.pyx":632 * * mask = np.nonzero(edges[:, 0] != -1)[0] * all_edges = mask[(mask % 2 == 0)] # <<<<<<<<<<<<<< @@ -13428,7 +13409,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __pyx_v_all_edges = __pyx_t_6; __pyx_t_6 = 0; - /* "src/_squish/voronoi_dcel.pyx":633 + /* "squish/_squish/voronoi_dcel.pyx":633 * mask = np.nonzero(edges[:, 0] != -1)[0] * all_edges = mask[(mask % 2 == 0)] * caches = edges[all_edges, 4] # <<<<<<<<<<<<<< @@ -13449,7 +13430,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __pyx_v_caches = __pyx_t_4; __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":635 + /* "squish/_squish/voronoi_dcel.pyx":635 * caches = edges[all_edges, 4] * * edge_cache = np.asarray(self.edge_cache) # <<<<<<<<<<<<<< @@ -13483,7 +13464,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __pyx_v_edge_cache = __pyx_t_4; __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":637 + /* "squish/_squish/voronoi_dcel.pyx":637 * edge_cache = np.asarray(self.edge_cache) * * self.stats["edge_lengths"] = edge_cache[caches, self.edge_cache_map.ila_mag] # <<<<<<<<<<<<<< @@ -13509,7 +13490,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "src/_squish/voronoi_dcel.pyx":615 + /* "squish/_squish/voronoi_dcel.pyx":615 * pass * * cdef void get_statistics(self) except *: # <<<<<<<<<<<<<< @@ -13537,7 +13518,7 @@ __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __p __Pyx_RefNannyFinishContext(); } -/* "src/_squish/voronoi_dcel.pyx":640 +/* "squish/_squish/voronoi_dcel.pyx":640 * * @property * def site_arr(self): # <<<<<<<<<<<<<< @@ -13572,7 +13553,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_8site_arr___get__(struct _ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 0); - /* "src/_squish/voronoi_dcel.pyx":641 + /* "squish/_squish/voronoi_dcel.pyx":641 * @property * def site_arr(self): * return np.asarray(self.points[:self.n], dtype=FLOAT) # <<<<<<<<<<<<<< @@ -13636,7 +13617,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __p __pyx_t_6 = 0; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":640 + /* "squish/_squish/voronoi_dcel.pyx":640 * * @property * def site_arr(self): # <<<<<<<<<<<<<< @@ -13659,7 +13640,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __p return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":644 +/* "squish/_squish/voronoi_dcel.pyx":644 * * @property * def vor_data(self): # <<<<<<<<<<<<<< @@ -13689,7 +13670,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_8vor_data___get__(struct _ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 0); - /* "src/_squish/voronoi_dcel.pyx":645 + /* "squish/_squish/voronoi_dcel.pyx":645 * @property * def vor_data(self): * return self.scipy_vor # <<<<<<<<<<<<<< @@ -13703,7 +13684,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_8vor_data___get__(struct _ __pyx_t_1 = 0; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":644 + /* "squish/_squish/voronoi_dcel.pyx":644 * * @property * def vor_data(self): # <<<<<<<<<<<<<< @@ -13722,7 +13703,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_8vor_data___get__(struct _ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":648 +/* "squish/_squish/voronoi_dcel.pyx":648 * * @property * def gradient(self): # <<<<<<<<<<<<<< @@ -13755,7 +13736,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_8gradient___get__(struct _ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 0); - /* "src/_squish/voronoi_dcel.pyx":649 + /* "squish/_squish/voronoi_dcel.pyx":649 * @property * def gradient(self): * return np.asarray(self.grad, dtype=FLOAT) # <<<<<<<<<<<<<< @@ -13791,7 +13772,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_8gradient___get__(struct _ __pyx_t_4 = 0; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":648 + /* "squish/_squish/voronoi_dcel.pyx":648 * * @property * def gradient(self): # <<<<<<<<<<<<<< @@ -13813,7 +13794,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_8gradient___get__(struct _ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":651 +/* "squish/_squish/voronoi_dcel.pyx":651 * return np.asarray(self.grad, dtype=FLOAT) * * def add_sites(self, add): # <<<<<<<<<<<<<< @@ -13847,7 +13828,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_2add_sites(struct __pyx_ob int __pyx_clineno = 0; __Pyx_RefNannySetupContext("add_sites", 0); - /* "src/_squish/voronoi_dcel.pyx":652 + /* "squish/_squish/voronoi_dcel.pyx":652 * * def add_sites(self, add): * return (self.site_arr + add) % np.asarray(self.dim, dtype=FLOAT) # <<<<<<<<<<<<<< @@ -13891,7 +13872,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_2add_sites(struct __pyx_ob __pyx_t_1 = 0; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":651 + /* "squish/_squish/voronoi_dcel.pyx":651 * return np.asarray(self.grad, dtype=FLOAT) * * def add_sites(self, add): # <<<<<<<<<<<<<< @@ -13914,7 +13895,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_2add_sites(struct __pyx_ob return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":654 +/* "squish/_squish/voronoi_dcel.pyx":654 * return (self.site_arr + add) % np.asarray(self.dim, dtype=FLOAT) * * def iterate(self, FLOAT_T step): # <<<<<<<<<<<<<< @@ -13969,7 +13950,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_4iterate(struct __pyx_obj_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("iterate", 0); - /* "src/_squish/voronoi_dcel.pyx":655 + /* "squish/_squish/voronoi_dcel.pyx":655 * * def iterate(self, FLOAT_T step): * k1 = self.gradient # <<<<<<<<<<<<<< @@ -13981,7 +13962,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_4iterate(struct __pyx_obj_ __pyx_v_k1 = __pyx_t_1; __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":656 + /* "squish/_squish/voronoi_dcel.pyx":656 * def iterate(self, FLOAT_T step): * k1 = self.gradient * k2 = self.__class__(self.n, self.w, self.h, self.r, # <<<<<<<<<<<<<< @@ -13999,7 +13980,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_4iterate(struct __pyx_obj_ __pyx_t_6 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - /* "src/_squish/voronoi_dcel.pyx":657 + /* "squish/_squish/voronoi_dcel.pyx":657 * k1 = self.gradient * k2 = self.__class__(self.n, self.w, self.h, self.r, * self.add_sites(step*k1) # <<<<<<<<<<<<<< @@ -14094,7 +14075,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_4iterate(struct __pyx_obj_ } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "src/_squish/voronoi_dcel.pyx":658 + /* "squish/_squish/voronoi_dcel.pyx":658 * k2 = self.__class__(self.n, self.w, self.h, self.r, * self.add_sites(step*k1) * ).gradient # <<<<<<<<<<<<<< @@ -14107,7 +14088,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_4iterate(struct __pyx_obj_ __pyx_v_k2 = __pyx_t_2; __pyx_t_2 = 0; - /* "src/_squish/voronoi_dcel.pyx":660 + /* "squish/_squish/voronoi_dcel.pyx":660 * ).gradient * * return (step/2)*(k1+k2), k1 # <<<<<<<<<<<<<< @@ -14135,7 +14116,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_4iterate(struct __pyx_obj_ __pyx_t_1 = 0; goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":654 + /* "squish/_squish/voronoi_dcel.pyx":654 * return (self.site_arr + add) % np.asarray(self.dim, dtype=FLOAT) * * def iterate(self, FLOAT_T step): # <<<<<<<<<<<<<< @@ -14165,7 +14146,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_4iterate(struct __pyx_obj_ return __pyx_r; } -/* "src/_squish/voronoi_dcel.pyx":680 +/* "squish/_squish/voronoi_dcel.pyx":680 * #return higher, k1 * * def hessian(self, d: float) -> np.ndarray: # <<<<<<<<<<<<<< @@ -14231,7 +14212,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx int __pyx_clineno = 0; __Pyx_RefNannySetupContext("hessian", 0); - /* "src/_squish/voronoi_dcel.pyx":686 + /* "squish/_squish/voronoi_dcel.pyx":686 * :return: 2Nx2N array that represents Hessian. * """ * HE = np.zeros((2*self.n, 2*self.n)) # <<<<<<<<<<<<<< @@ -14274,7 +14255,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __pyx_v_HE = __pyx_t_1; __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":687 + /* "squish/_squish/voronoi_dcel.pyx":687 * """ * HE = np.zeros((2*self.n, 2*self.n)) * new_sites = np.copy(self.site_arr) # Maintain one copy for speed. # <<<<<<<<<<<<<< @@ -14307,7 +14288,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __pyx_v_new_sites = __pyx_t_1; __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":688 + /* "squish/_squish/voronoi_dcel.pyx":688 * HE = np.zeros((2*self.n, 2*self.n)) * new_sites = np.copy(self.site_arr) # Maintain one copy for speed. * for i in range(self.n): # <<<<<<<<<<<<<< @@ -14362,7 +14343,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":689 + /* "squish/_squish/voronoi_dcel.pyx":689 * new_sites = np.copy(self.site_arr) # Maintain one copy for speed. * for i in range(self.n): * for j in range(2): # <<<<<<<<<<<<<< @@ -14375,7 +14356,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_XDECREF_SET(__pyx_v_j, __pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":690 + /* "squish/_squish/voronoi_dcel.pyx":690 * for i in range(self.n): * for j in range(2): * mod = self.w if j == 0 else self.h # <<<<<<<<<<<<<< @@ -14400,7 +14381,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_XDECREF_SET(__pyx_v_mod, __pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":691 + /* "squish/_squish/voronoi_dcel.pyx":691 * for j in range(2): * mod = self.w if j == 0 else self.h * new_sites[i][j] = (new_sites[i][j] + d) % mod # <<<<<<<<<<<<<< @@ -14427,7 +14408,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":692 + /* "squish/_squish/voronoi_dcel.pyx":692 * mod = self.w if j == 0 else self.h * new_sites[i][j] = (new_sites[i][j] + d) % mod * Ep = self.__class__(self.n, self.w, self.h, self.r, new_sites) # <<<<<<<<<<<<<< @@ -14509,7 +14490,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_XDECREF_SET(__pyx_v_Ep, __pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":693 + /* "squish/_squish/voronoi_dcel.pyx":693 * new_sites[i][j] = (new_sites[i][j] + d) % mod * Ep = self.__class__(self.n, self.w, self.h, self.r, new_sites) * new_sites[i][j] = (new_sites[i][j] - 2*d) % mod # <<<<<<<<<<<<<< @@ -14536,7 +14517,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":694 + /* "squish/_squish/voronoi_dcel.pyx":694 * Ep = self.__class__(self.n, self.w, self.h, self.r, new_sites) * new_sites[i][j] = (new_sites[i][j] - 2*d) % mod * Em = self.__class__(self.n, self.w, self.h, self.r, new_sites) # <<<<<<<<<<<<<< @@ -14618,7 +14599,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_XDECREF_SET(__pyx_v_Em, __pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":695 + /* "squish/_squish/voronoi_dcel.pyx":695 * new_sites[i][j] = (new_sites[i][j] - 2*d) % mod * Em = self.__class__(self.n, self.w, self.h, self.r, new_sites) * new_sites[i][j] = (new_sites[i][j] + d) % mod # <<<<<<<<<<<<<< @@ -14645,7 +14626,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":697 + /* "squish/_squish/voronoi_dcel.pyx":697 * new_sites[i][j] = (new_sites[i][j] + d) % mod * * HE[:, 2*i+j] = ((Ep.gradient - Em.gradient)/(2*d)).flatten() # <<<<<<<<<<<<<< @@ -14702,7 +14683,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } - /* "src/_squish/voronoi_dcel.pyx":688 + /* "squish/_squish/voronoi_dcel.pyx":688 * HE = np.zeros((2*self.n, 2*self.n)) * new_sites = np.copy(self.site_arr) # Maintain one copy for speed. * for i in range(self.n): # <<<<<<<<<<<<<< @@ -14712,7 +14693,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":700 + /* "squish/_squish/voronoi_dcel.pyx":700 * * # Average out discrepencies, since it should be symmetric. * for i in range(2*self.n): # <<<<<<<<<<<<<< @@ -14767,7 +14748,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":701 + /* "squish/_squish/voronoi_dcel.pyx":701 * # Average out discrepencies, since it should be symmetric. * for i in range(2*self.n): * for j in range(i, 2*self.n): # <<<<<<<<<<<<<< @@ -14830,7 +14811,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_XDECREF_SET(__pyx_v_j, __pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":702 + /* "squish/_squish/voronoi_dcel.pyx":702 * for i in range(2*self.n): * for j in range(i, 2*self.n): * HE[i][j] = (HE[i][j] + HE[j][i])/2 # <<<<<<<<<<<<<< @@ -14860,7 +14841,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "src/_squish/voronoi_dcel.pyx":703 + /* "squish/_squish/voronoi_dcel.pyx":703 * for j in range(i, 2*self.n): * HE[i][j] = (HE[i][j] + HE[j][i])/2 * HE[j][i] = HE[i][j] # <<<<<<<<<<<<<< @@ -14878,7 +14859,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "src/_squish/voronoi_dcel.pyx":701 + /* "squish/_squish/voronoi_dcel.pyx":701 * # Average out discrepencies, since it should be symmetric. * for i in range(2*self.n): * for j in range(i, 2*self.n): # <<<<<<<<<<<<<< @@ -14888,7 +14869,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx } __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - /* "src/_squish/voronoi_dcel.pyx":700 + /* "squish/_squish/voronoi_dcel.pyx":700 * * # Average out discrepencies, since it should be symmetric. * for i in range(2*self.n): # <<<<<<<<<<<<<< @@ -14898,7 +14879,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/voronoi_dcel.pyx":705 + /* "squish/_squish/voronoi_dcel.pyx":705 * HE[j][i] = HE[i][j] * * return HE # <<<<<<<<<<<<<< @@ -14910,7 +14891,7 @@ static PyArrayObject *__pyx_pf_7_squish_16VoronoiContainer_6hessian(struct __pyx __pyx_r = ((PyArrayObject *)__pyx_v_HE); goto __pyx_L0; - /* "src/_squish/voronoi_dcel.pyx":680 + /* "squish/_squish/voronoi_dcel.pyx":680 * #return higher, k1 * * def hessian(self, d: float) -> np.ndarray: # <<<<<<<<<<<<<< @@ -15268,7 +15249,7 @@ static PyObject *__pyx_pf_7_squish_16VoronoiContainer_10__setstate_cython__(CYTH return __pyx_r; } -/* "src/_squish/energy.pyx":14 +/* "squish/_squish/energy.pyx":14 * title_str = "Area" * * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -15406,7 +15387,7 @@ static int __pyx_pf_7_squish_10AreaEnergy___init__(struct __pyx_obj_7_squish_Are } __pyx_pybuffernd_site_arr.diminfo[0].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_site_arr.diminfo[0].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_site_arr.diminfo[1].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_site_arr.diminfo[1].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[1]; - /* "src/_squish/energy.pyx":16 + /* "squish/_squish/energy.pyx":16 * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, * np.ndarray[FLOAT_T, ndim=2] site_arr): * self.edge_cache_map = &AREA_EDGE_CACHE_MAP # <<<<<<<<<<<<<< @@ -15415,7 +15396,7 @@ static int __pyx_pf_7_squish_10AreaEnergy___init__(struct __pyx_obj_7_squish_Are */ __pyx_v_self->__pyx_base.edge_cache_map = (&__pyx_v_7_squish_AREA_EDGE_CACHE_MAP); - /* "src/_squish/energy.pyx":17 + /* "squish/_squish/energy.pyx":17 * np.ndarray[FLOAT_T, ndim=2] site_arr): * self.edge_cache_map = &AREA_EDGE_CACHE_MAP * self.energy = 0.0 # <<<<<<<<<<<<<< @@ -15424,7 +15405,7 @@ static int __pyx_pf_7_squish_10AreaEnergy___init__(struct __pyx_obj_7_squish_Are */ __pyx_v_self->__pyx_base.energy = 0.0; - /* "src/_squish/energy.pyx":19 + /* "squish/_squish/energy.pyx":19 * self.energy = 0.0 * * super().__init__(n, w, h, r, site_arr) # <<<<<<<<<<<<<< @@ -15517,7 +15498,7 @@ static int __pyx_pf_7_squish_10AreaEnergy___init__(struct __pyx_obj_7_squish_Are __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/energy.pyx":20 + /* "squish/_squish/energy.pyx":20 * * super().__init__(n, w, h, r, site_arr) * self.minimum = (n)*(w*h/(n)-PI*r**2)**2 # <<<<<<<<<<<<<< @@ -15526,7 +15507,7 @@ static int __pyx_pf_7_squish_10AreaEnergy___init__(struct __pyx_obj_7_squish_Are */ __pyx_v_self->minimum = (((__pyx_t_7_squish_FLOAT_T)__pyx_v_n) * pow((((__pyx_v_w * __pyx_v_h) / ((__pyx_t_7_squish_FLOAT_T)__pyx_v_n)) - (M_PI * pow(__pyx_v_r, 2.0))), 2.0)); - /* "src/_squish/energy.pyx":14 + /* "squish/_squish/energy.pyx":14 * title_str = "Area" * * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -15562,7 +15543,7 @@ static int __pyx_pf_7_squish_10AreaEnergy___init__(struct __pyx_obj_7_squish_Are return __pyx_r; } -/* "src/_squish/energy.pyx":23 +/* "squish/_squish/energy.pyx":23 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -15596,7 +15577,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A int __pyx_clineno = 0; __Pyx_RefNannySetupContext("precompute", 0); - /* "src/_squish/energy.pyx":24 + /* "squish/_squish/energy.pyx":24 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -15607,7 +15588,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 24, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 24, __pyx_L1_error)} - /* "src/_squish/energy.pyx":25 + /* "squish/_squish/energy.pyx":25 * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) # <<<<<<<<<<<<<< @@ -15618,7 +15599,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 25, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 25, __pyx_L1_error)} - /* "src/_squish/energy.pyx":24 + /* "squish/_squish/energy.pyx":24 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -15627,7 +15608,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ __pyx_v_info = __pyx_v_7_squish_init.VoronoiInfo(__pyx_v_self->__pyx_base.sites, __pyx_v_self->__pyx_base.edges, __pyx_v_self->__pyx_base.points, __pyx_v_self->__pyx_base.vertices, __pyx_v_self->__pyx_base.site_cache, __pyx_v_self->__pyx_base.edge_cache, __pyx_v_self->__pyx_base.edge_cache_map); - /* "src/_squish/energy.pyx":30 + /* "squish/_squish/energy.pyx":30 * cdef HalfEdge em, e, ep * cdef Vector2D vdiff * cdef FLOAT_T A = PI*self.r**2 # <<<<<<<<<<<<<< @@ -15636,7 +15617,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ __pyx_v_A = (M_PI * pow(__pyx_v_self->__pyx_base.r, 2.0)); - /* "src/_squish/energy.pyx":31 + /* "squish/_squish/energy.pyx":31 * cdef Vector2D vdiff * cdef FLOAT_T A = PI*self.r**2 * cdef FLOAT_T energy = 0 # <<<<<<<<<<<<<< @@ -15645,7 +15626,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ __pyx_v_energy = 0.0; - /* "src/_squish/energy.pyx":34 + /* "squish/_squish/energy.pyx":34 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -15685,7 +15666,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A /* Initialize private variables to invalid values */ __pyx_v_j = ((__pyx_t_7_squish_INT_T)0xbad0bad0); - /* "src/_squish/energy.pyx":35 + /* "squish/_squish/energy.pyx":35 * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< @@ -15694,7 +15675,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ __pyx_v_xi = __pyx_v_7_squish_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "src/_squish/energy.pyx":36 + /* "squish/_squish/energy.pyx":36 * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -15703,7 +15684,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "src/_squish/energy.pyx":37 + /* "squish/_squish/energy.pyx":37 * xi = init.Site(i, &info) * e = xi.edge(&xi) * xi.cache.energy(&xi, # <<<<<<<<<<<<<< @@ -15712,7 +15693,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ (void)(__pyx_v_xi.cache->energy((&__pyx_v_xi), pow((__pyx_v_xi.cache->area((&__pyx_v_xi), NAN) - __pyx_v_A), 2.0))); - /* "src/_squish/energy.pyx":40 + /* "squish/_squish/energy.pyx":40 * (xi.cache.area(&xi, NAN) - A)**2 * ) * if i < self.n: # <<<<<<<<<<<<<< @@ -15722,16 +15703,16 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A __pyx_t_4 = ((__pyx_v_i < __pyx_v_self->__pyx_base.n) != 0); if (__pyx_t_4) { - /* "src/_squish/energy.pyx":41 + /* "squish/_squish/energy.pyx":41 * ) * if i < self.n: * energy += xi.cache.energy(&xi, NAN) # <<<<<<<<<<<<<< * - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): */ __pyx_v_energy = (__pyx_v_energy + __pyx_v_xi.cache->energy((&__pyx_v_xi), NAN)); - /* "src/_squish/energy.pyx":40 + /* "squish/_squish/energy.pyx":40 * (xi.cache.area(&xi, NAN) - A)**2 * ) * if i < self.n: # <<<<<<<<<<<<<< @@ -15740,90 +15721,74 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ } - /* "src/_squish/energy.pyx":43 + /* "squish/_squish/energy.pyx":43 * energy += xi.cache.energy(&xi, NAN) * - * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< + * for j in range(xi.edge_num(&xi)): # <<<<<<<<<<<<<< * em, ep = e.prev(&e), e.next(&e) * vdiff = em.origin(&em) */ __pyx_t_5 = __pyx_v_xi.edge_num((&__pyx_v_xi)); - if ((1 == 0)) abort(); - { - __pyx_t_7 = (__pyx_t_5 - 0 + 1 - 1/abs(1)) / 1; - if (__pyx_t_7 > 0) - { - #if 0 - #pragma omp parallel - #endif /* _OPENMP */ - { - #if 0 - #pragma omp for lastprivate(__pyx_v_e) lastprivate(__pyx_v_em) lastprivate(__pyx_v_ep) firstprivate(__pyx_v_j) lastprivate(__pyx_v_j) lastprivate(__pyx_v_vdiff) - #endif /* _OPENMP */ - for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_7; __pyx_t_6++){ - { - __pyx_v_j = (__pyx_t_7_squish_INT_T)(0 + 1 * __pyx_t_6); + __pyx_t_6 = __pyx_t_5; + for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_6; __pyx_t_7+=1) { + __pyx_v_j = __pyx_t_7; - /* "src/_squish/energy.pyx":44 + /* "squish/_squish/energy.pyx":44 * - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): * em, ep = e.prev(&e), e.next(&e) # <<<<<<<<<<<<<< * vdiff = em.origin(&em) * vdiff.self.vsub(&vdiff, ep.origin(&ep)) */ - __pyx_t_8 = __pyx_v_e.prev((&__pyx_v_e)); - __pyx_t_9 = __pyx_v_e.next((&__pyx_v_e)); - __pyx_v_em = __pyx_t_8; - __pyx_v_ep = __pyx_t_9; + __pyx_t_8 = __pyx_v_e.prev((&__pyx_v_e)); + __pyx_t_9 = __pyx_v_e.next((&__pyx_v_e)); + __pyx_v_em = __pyx_t_8; + __pyx_v_ep = __pyx_t_9; - /* "src/_squish/energy.pyx":45 - * for j in prange(xi.edge_num(&xi)): + /* "squish/_squish/energy.pyx":45 + * for j in range(xi.edge_num(&xi)): * em, ep = e.prev(&e), e.next(&e) * vdiff = em.origin(&em) # <<<<<<<<<<<<<< * vdiff.self.vsub(&vdiff, ep.origin(&ep)) * e.cache.dVdv(&e, R.vecmul(&R, vdiff)) */ - __pyx_v_vdiff = __pyx_v_em.origin((&__pyx_v_em)); + __pyx_v_vdiff = __pyx_v_em.origin((&__pyx_v_em)); - /* "src/_squish/energy.pyx":46 + /* "squish/_squish/energy.pyx":46 * em, ep = e.prev(&e), e.next(&e) * vdiff = em.origin(&em) * vdiff.self.vsub(&vdiff, ep.origin(&ep)) # <<<<<<<<<<<<<< * e.cache.dVdv(&e, R.vecmul(&R, vdiff)) * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) */ - (void)(__pyx_v_vdiff.self.vsub((&__pyx_v_vdiff), __pyx_v_ep.origin((&__pyx_v_ep)))); + (void)(__pyx_v_vdiff.self.vsub((&__pyx_v_vdiff), __pyx_v_ep.origin((&__pyx_v_ep)))); - /* "src/_squish/energy.pyx":47 + /* "squish/_squish/energy.pyx":47 * vdiff = em.origin(&em) * vdiff.self.vsub(&vdiff, ep.origin(&ep)) * e.cache.dVdv(&e, R.vecmul(&R, vdiff)) # <<<<<<<<<<<<<< * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) * */ - (void)(__pyx_v_e.cache->dVdv((&__pyx_v_e), __pyx_v_7_squish_R.vecmul((&__pyx_v_7_squish_R), __pyx_v_vdiff))); + (void)(__pyx_v_e.cache->dVdv((&__pyx_v_e), __pyx_v_7_squish_R.vecmul((&__pyx_v_7_squish_R), __pyx_v_vdiff))); - /* "src/_squish/energy.pyx":48 + /* "squish/_squish/energy.pyx":48 * vdiff.self.vsub(&vdiff, ep.origin(&ep)) * e.cache.dVdv(&e, R.vecmul(&R, vdiff)) * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) # <<<<<<<<<<<<<< * * e = e.next(&e) */ - (void)(__pyx_v_e.cache->H((&__pyx_v_e), __pyx_f_7_squish_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); + (void)(__pyx_v_e.cache->H((&__pyx_v_e), __pyx_f_7_squish_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); - /* "src/_squish/energy.pyx":50 + /* "squish/_squish/energy.pyx":50 * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) * * e = e.next(&e) # <<<<<<<<<<<<<< * * self.energy = energy */ - __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); - } - } - } - } + __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); } } } @@ -15838,7 +15803,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A #endif } - /* "src/_squish/energy.pyx":34 + /* "squish/_squish/energy.pyx":34 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -15864,7 +15829,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A } } - /* "src/_squish/energy.pyx":52 + /* "squish/_squish/energy.pyx":52 * e = e.next(&e) * * self.energy = energy # <<<<<<<<<<<<<< @@ -15873,7 +15838,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A */ __pyx_v_self->__pyx_base.energy = __pyx_v_energy; - /* "src/_squish/energy.pyx":23 + /* "squish/_squish/energy.pyx":23 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -15889,7 +15854,7 @@ static void __pyx_f_7_squish_10AreaEnergy_precompute(struct __pyx_obj_7_squish_A __Pyx_RefNannyFinishContext(); } -/* "src/_squish/energy.pyx":55 +/* "squish/_squish/energy.pyx":55 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -15930,7 +15895,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar int __pyx_clineno = 0; __Pyx_RefNannySetupContext("calc_grad", 0); - /* "src/_squish/energy.pyx":56 + /* "squish/_squish/energy.pyx":56 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -15941,7 +15906,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 56, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 56, __pyx_L1_error)} - /* "src/_squish/energy.pyx":57 + /* "squish/_squish/energy.pyx":57 * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) # <<<<<<<<<<<<<< @@ -15952,7 +15917,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 57, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 57, __pyx_L1_error)} - /* "src/_squish/energy.pyx":56 + /* "squish/_squish/energy.pyx":56 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -15961,7 +15926,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar */ __pyx_v_info = __pyx_v_7_squish_init.VoronoiInfo(__pyx_v_self->__pyx_base.sites, __pyx_v_self->__pyx_base.edges, __pyx_v_self->__pyx_base.points, __pyx_v_self->__pyx_base.vertices, __pyx_v_self->__pyx_base.site_cache, __pyx_v_self->__pyx_base.edge_cache, __pyx_v_self->__pyx_base.edge_cache_map); - /* "src/_squish/energy.pyx":64 + /* "squish/_squish/energy.pyx":64 * cdef BitSet edge_set * * cdef INT_T num_edges = self.edges.shape[0] # <<<<<<<<<<<<<< @@ -15971,7 +15936,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 64, __pyx_L1_error)} __pyx_v_num_edges = (__pyx_v_self->__pyx_base.edges.shape[0]); - /* "src/_squish/energy.pyx":65 + /* "squish/_squish/energy.pyx":65 * * cdef INT_T num_edges = self.edges.shape[0] * cdef FLOAT_T A = PI*self.r**2 # <<<<<<<<<<<<<< @@ -15980,7 +15945,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar */ __pyx_v_A = (M_PI * pow(__pyx_v_self->__pyx_base.r, 2.0)); - /* "src/_squish/energy.pyx":67 + /* "squish/_squish/energy.pyx":67 * cdef FLOAT_T A = PI*self.r**2 * * cdef FLOAT_T [:, ::1] dedx = np.zeros((self.n, 2), dtype=FLOAT) # <<<<<<<<<<<<<< @@ -16024,7 +15989,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar __pyx_t_5.memview = NULL; __pyx_t_5.data = NULL; - /* "src/_squish/energy.pyx":70 + /* "squish/_squish/energy.pyx":70 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -16063,7 +16028,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar /* Initialize private variables to invalid values */ __pyx_v_j = ((__pyx_t_7_squish_INT_T)0xbad0bad0); - /* "src/_squish/energy.pyx":71 + /* "squish/_squish/energy.pyx":71 * cdef INT_T i, j * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< @@ -16072,206 +16037,190 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar */ __pyx_v_xi = __pyx_v_7_squish_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "src/_squish/energy.pyx":72 + /* "squish/_squish/energy.pyx":72 * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< * edge_set = init.BitSet(num_edges) - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. + * for j in range(xi.edge_num(&xi)): # Looping through site edges. */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "src/_squish/energy.pyx":73 + /* "squish/_squish/energy.pyx":73 * xi = init.Site(i, &info) * e = xi.edge(&xi) * edge_set = init.BitSet(num_edges) # <<<<<<<<<<<<<< - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. + * for j in range(xi.edge_num(&xi)): # Looping through site edges. * f = e */ __pyx_v_edge_set = __pyx_v_7_squish_init.BitSet(__pyx_v_num_edges); - /* "src/_squish/energy.pyx":74 + /* "squish/_squish/energy.pyx":74 * e = xi.edge(&xi) * edge_set = init.BitSet(num_edges) - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. # <<<<<<<<<<<<<< + * for j in range(xi.edge_num(&xi)): # Looping through site edges. # <<<<<<<<<<<<<< * f = e * while True: # Circling this vertex. */ __pyx_t_9 = __pyx_v_xi.edge_num((&__pyx_v_xi)); - if ((1 == 0)) abort(); - { - __pyx_t_11 = (__pyx_t_9 - 0 + 1 - 1/abs(1)) / 1; - if (__pyx_t_11 > 0) - { - #if 0 - #pragma omp parallel - #endif /* _OPENMP */ - { - #if 0 - #pragma omp for lastprivate(__pyx_v_dedxi_p) lastprivate(__pyx_v_e) lastprivate(__pyx_v_f) firstprivate(__pyx_v_j) lastprivate(__pyx_v_j) lastprivate(__pyx_v_xf) - #endif /* _OPENMP */ - for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_11; __pyx_t_10++){ - { - __pyx_v_j = (__pyx_t_7_squish_INT_T)(0 + 1 * __pyx_t_10); + __pyx_t_10 = __pyx_t_9; + for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_10; __pyx_t_11+=1) { + __pyx_v_j = __pyx_t_11; - /* "src/_squish/energy.pyx":75 + /* "squish/_squish/energy.pyx":75 * edge_set = init.BitSet(num_edges) - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. + * for j in range(xi.edge_num(&xi)): # Looping through site edges. * f = e # <<<<<<<<<<<<<< * while True: # Circling this vertex. * if not edge_set.add(&edge_set, f.arr_index): */ - __pyx_v_f = __pyx_v_e; + __pyx_v_f = __pyx_v_e; - /* "src/_squish/energy.pyx":76 - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. + /* "squish/_squish/energy.pyx":76 + * for j in range(xi.edge_num(&xi)): # Looping through site edges. * f = e * while True: # Circling this vertex. # <<<<<<<<<<<<<< * if not edge_set.add(&edge_set, f.arr_index): * xf = f.face(&f) */ - while (1) { + while (1) { - /* "src/_squish/energy.pyx":77 + /* "squish/_squish/energy.pyx":77 * f = e * while True: # Circling this vertex. * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< * xf = f.face(&f) * dedxi_p = f.cache.dVdv(&f, NAN_VECTOR) #dVdv */ - __pyx_t_12 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_f.arr_index) != 0)) != 0); - if (__pyx_t_12) { + __pyx_t_12 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_f.arr_index) != 0)) != 0); + if (__pyx_t_12) { - /* "src/_squish/energy.pyx":78 + /* "squish/_squish/energy.pyx":78 * while True: # Circling this vertex. * if not edge_set.add(&edge_set, f.arr_index): * xf = f.face(&f) # <<<<<<<<<<<<<< * dedxi_p = f.cache.dVdv(&f, NAN_VECTOR) #dVdv * dedxi_p.self.smul(&dedxi_p, xf.cache.area(&xf, NAN) - A) */ - __pyx_v_xf = __pyx_v_f.face((&__pyx_v_f)); + __pyx_v_xf = __pyx_v_f.face((&__pyx_v_f)); - /* "src/_squish/energy.pyx":79 + /* "squish/_squish/energy.pyx":79 * if not edge_set.add(&edge_set, f.arr_index): * xf = f.face(&f) * dedxi_p = f.cache.dVdv(&f, NAN_VECTOR) #dVdv # <<<<<<<<<<<<<< * dedxi_p.self.smul(&dedxi_p, xf.cache.area(&xf, NAN) - A) * dedxi_p.self.matmul(&dedxi_p, e.cache.H(&e, NAN_MATRIX)) */ - __pyx_v_dedxi_p = __pyx_v_f.cache->dVdv((&__pyx_v_f), __pyx_v_7_squish_NAN_VECTOR); + __pyx_v_dedxi_p = __pyx_v_f.cache->dVdv((&__pyx_v_f), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":80 + /* "squish/_squish/energy.pyx":80 * xf = f.face(&f) * dedxi_p = f.cache.dVdv(&f, NAN_VECTOR) #dVdv * dedxi_p.self.smul(&dedxi_p, xf.cache.area(&xf, NAN) - A) # <<<<<<<<<<<<<< * dedxi_p.self.matmul(&dedxi_p, e.cache.H(&e, NAN_MATRIX)) * dedx[i][0] -= dedxi_p.x */ - (void)(__pyx_v_dedxi_p.self.smul((&__pyx_v_dedxi_p), (__pyx_v_xf.cache->area((&__pyx_v_xf), NAN) - __pyx_v_A))); + (void)(__pyx_v_dedxi_p.self.smul((&__pyx_v_dedxi_p), (__pyx_v_xf.cache->area((&__pyx_v_xf), NAN) - __pyx_v_A))); - /* "src/_squish/energy.pyx":81 + /* "squish/_squish/energy.pyx":81 * dedxi_p = f.cache.dVdv(&f, NAN_VECTOR) #dVdv * dedxi_p.self.smul(&dedxi_p, xf.cache.area(&xf, NAN) - A) * dedxi_p.self.matmul(&dedxi_p, e.cache.H(&e, NAN_MATRIX)) # <<<<<<<<<<<<<< * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y */ - (void)(__pyx_v_dedxi_p.self.matmul((&__pyx_v_dedxi_p), __pyx_v_e.cache->H((&__pyx_v_e), __pyx_v_7_squish_NAN_MATRIX))); + (void)(__pyx_v_dedxi_p.self.matmul((&__pyx_v_dedxi_p), __pyx_v_e.cache->H((&__pyx_v_e), __pyx_v_7_squish_NAN_MATRIX))); - /* "src/_squish/energy.pyx":82 + /* "squish/_squish/energy.pyx":82 * dedxi_p.self.smul(&dedxi_p, xf.cache.area(&xf, NAN) - A) * dedxi_p.self.matmul(&dedxi_p, e.cache.H(&e, NAN_MATRIX)) * dedx[i][0] -= dedxi_p.x # <<<<<<<<<<<<<< * dedx[i][1] -= dedxi_p.y * */ - __pyx_t_13 = __pyx_v_i; - __pyx_t_14 = 0; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_13 * __pyx_v_dedx.strides[0]) )) + __pyx_t_14)) )) -= __pyx_v_dedxi_p.x; + __pyx_t_13 = __pyx_v_i; + __pyx_t_14 = 0; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_13 * __pyx_v_dedx.strides[0]) )) + __pyx_t_14)) )) -= __pyx_v_dedxi_p.x; - /* "src/_squish/energy.pyx":83 + /* "squish/_squish/energy.pyx":83 * dedxi_p.self.matmul(&dedxi_p, e.cache.H(&e, NAN_MATRIX)) * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y # <<<<<<<<<<<<<< * * f = f.twin(&f) */ - __pyx_t_13 = __pyx_v_i; - __pyx_t_14 = 1; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_13 * __pyx_v_dedx.strides[0]) )) + __pyx_t_14)) )) -= __pyx_v_dedxi_p.y; + __pyx_t_13 = __pyx_v_i; + __pyx_t_14 = 1; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_13 * __pyx_v_dedx.strides[0]) )) + __pyx_t_14)) )) -= __pyx_v_dedxi_p.y; - /* "src/_squish/energy.pyx":77 + /* "squish/_squish/energy.pyx":77 * f = e * while True: # Circling this vertex. * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< * xf = f.face(&f) * dedxi_p = f.cache.dVdv(&f, NAN_VECTOR) #dVdv */ - } + } - /* "src/_squish/energy.pyx":85 + /* "squish/_squish/energy.pyx":85 * dedx[i][1] -= dedxi_p.y * * f = f.twin(&f) # <<<<<<<<<<<<<< * f = f.next(&f) * if f.arr_index == e.arr_index: */ - __pyx_v_f = __pyx_v_f.twin((&__pyx_v_f)); + __pyx_v_f = __pyx_v_f.twin((&__pyx_v_f)); - /* "src/_squish/energy.pyx":86 + /* "squish/_squish/energy.pyx":86 * * f = f.twin(&f) * f = f.next(&f) # <<<<<<<<<<<<<< * if f.arr_index == e.arr_index: * break */ - __pyx_v_f = __pyx_v_f.next((&__pyx_v_f)); + __pyx_v_f = __pyx_v_f.next((&__pyx_v_f)); - /* "src/_squish/energy.pyx":87 + /* "squish/_squish/energy.pyx":87 * f = f.twin(&f) * f = f.next(&f) * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< * break * */ - __pyx_t_12 = ((__pyx_v_f.arr_index == __pyx_v_e.arr_index) != 0); - if (__pyx_t_12) { + __pyx_t_12 = ((__pyx_v_f.arr_index == __pyx_v_e.arr_index) != 0); + if (__pyx_t_12) { - /* "src/_squish/energy.pyx":88 + /* "squish/_squish/energy.pyx":88 * f = f.next(&f) * if f.arr_index == e.arr_index: * break # <<<<<<<<<<<<<< * * e = e.next(&e) */ - goto __pyx_L15_break; + goto __pyx_L13_break; - /* "src/_squish/energy.pyx":87 + /* "squish/_squish/energy.pyx":87 * f = f.twin(&f) * f = f.next(&f) * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< * break * */ - } - } - __pyx_L15_break:; + } + } + __pyx_L13_break:; - /* "src/_squish/energy.pyx":90 + /* "squish/_squish/energy.pyx":90 * break * * e = e.next(&e) # <<<<<<<<<<<<<< * edge_set.free(&edge_set) * self.grad = dedx */ - __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); - } - } - } - } + __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); } - /* "src/_squish/energy.pyx":91 + /* "squish/_squish/energy.pyx":91 * * e = e.next(&e) * edge_set.free(&edge_set) # <<<<<<<<<<<<<< @@ -16292,7 +16241,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar #endif } - /* "src/_squish/energy.pyx":70 + /* "squish/_squish/energy.pyx":70 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -16311,7 +16260,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar } } - /* "src/_squish/energy.pyx":92 + /* "squish/_squish/energy.pyx":92 * e = e.next(&e) * edge_set.free(&edge_set) * self.grad = dedx # <<<<<<<<<<<<<< @@ -16322,7 +16271,7 @@ static void __pyx_f_7_squish_10AreaEnergy_calc_grad(struct __pyx_obj_7_squish_Ar __PYX_INC_MEMVIEW(&__pyx_v_dedx, 0); __pyx_v_self->__pyx_base.grad = __pyx_v_dedx; - /* "src/_squish/energy.pyx":55 + /* "squish/_squish/energy.pyx":55 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -16504,7 +16453,7 @@ static PyObject *__pyx_pf_7_squish_10AreaEnergy_4__setstate_cython__(CYTHON_UNUS return __pyx_r; } -/* "src/_squish/energy.pyx":109 +/* "squish/_squish/energy.pyx":109 * * * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -16642,7 +16591,7 @@ static int __pyx_pf_7_squish_14RadialALEnergy___init__(struct __pyx_obj_7_squish } __pyx_pybuffernd_site_arr.diminfo[0].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_site_arr.diminfo[0].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_site_arr.diminfo[1].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_site_arr.diminfo[1].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[1]; - /* "src/_squish/energy.pyx":112 + /* "squish/_squish/energy.pyx":112 * np.ndarray[FLOAT_T, ndim=2] site_arr): * #self.edge_cache_map = &AREA_EDGE_CACHE_MAP * self.energy = 0.0 # <<<<<<<<<<<<<< @@ -16651,7 +16600,7 @@ static int __pyx_pf_7_squish_14RadialALEnergy___init__(struct __pyx_obj_7_squish */ __pyx_v_self->__pyx_base.energy = 0.0; - /* "src/_squish/energy.pyx":114 + /* "squish/_squish/energy.pyx":114 * self.energy = 0.0 * * super().__init__(n, w, h, r, site_arr) # <<<<<<<<<<<<<< @@ -16744,7 +16693,7 @@ static int __pyx_pf_7_squish_14RadialALEnergy___init__(struct __pyx_obj_7_squish __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/energy.pyx":109 + /* "squish/_squish/energy.pyx":109 * * * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -16780,7 +16729,7 @@ static int __pyx_pf_7_squish_14RadialALEnergy___init__(struct __pyx_obj_7_squish return __pyx_r; } -/* "src/_squish/energy.pyx":117 +/* "squish/_squish/energy.pyx":117 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -16796,7 +16745,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_precompute(struct __pyx_obj_7_squi int __pyx_clineno = 0; __Pyx_RefNannySetupContext("precompute", 0); - /* "src/_squish/energy.pyx":118 + /* "squish/_squish/energy.pyx":118 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -16807,7 +16756,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_precompute(struct __pyx_obj_7_squi if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 118, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 118, __pyx_L1_error)} - /* "src/_squish/energy.pyx":119 + /* "squish/_squish/energy.pyx":119 * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) # <<<<<<<<<<<<<< @@ -16818,7 +16767,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_precompute(struct __pyx_obj_7_squi if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 119, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 119, __pyx_L1_error)} - /* "src/_squish/energy.pyx":118 + /* "squish/_squish/energy.pyx":118 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -16827,7 +16776,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_precompute(struct __pyx_obj_7_squi */ __pyx_v_info = __pyx_v_7_squish_init.VoronoiInfo(__pyx_v_self->__pyx_base.sites, __pyx_v_self->__pyx_base.edges, __pyx_v_self->__pyx_base.points, __pyx_v_self->__pyx_base.vertices, __pyx_v_self->__pyx_base.site_cache, __pyx_v_self->__pyx_base.edge_cache, __pyx_v_self->__pyx_base.edge_cache_map); - /* "src/_squish/energy.pyx":117 + /* "squish/_squish/energy.pyx":117 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -16843,7 +16792,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_precompute(struct __pyx_obj_7_squi __Pyx_RefNannyFinishContext(); } -/* "src/_squish/energy.pyx":124 +/* "squish/_squish/energy.pyx":124 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -16859,7 +16808,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_calc_grad(struct __pyx_obj_7_squis int __pyx_clineno = 0; __Pyx_RefNannySetupContext("calc_grad", 0); - /* "src/_squish/energy.pyx":125 + /* "squish/_squish/energy.pyx":125 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -16870,7 +16819,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_calc_grad(struct __pyx_obj_7_squis if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 125, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 125, __pyx_L1_error)} - /* "src/_squish/energy.pyx":126 + /* "squish/_squish/energy.pyx":126 * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) # <<<<<<<<<<<<<< @@ -16881,7 +16830,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_calc_grad(struct __pyx_obj_7_squis if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 126, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 126, __pyx_L1_error)} - /* "src/_squish/energy.pyx":125 + /* "squish/_squish/energy.pyx":125 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -16890,7 +16839,7 @@ static void __pyx_f_7_squish_14RadialALEnergy_calc_grad(struct __pyx_obj_7_squis */ __pyx_v_info = __pyx_v_7_squish_init.VoronoiInfo(__pyx_v_self->__pyx_base.sites, __pyx_v_self->__pyx_base.edges, __pyx_v_self->__pyx_base.points, __pyx_v_self->__pyx_base.vertices, __pyx_v_self->__pyx_base.site_cache, __pyx_v_self->__pyx_base.edge_cache, __pyx_v_self->__pyx_base.edge_cache_map); - /* "src/_squish/energy.pyx":124 + /* "squish/_squish/energy.pyx":124 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -17019,7 +16968,7 @@ static PyObject *__pyx_pf_7_squish_14RadialALEnergy_4__setstate_cython__(CYTHON_ return __pyx_r; } -/* "src/_squish/energy.pyx":143 +/* "squish/_squish/energy.pyx":143 * attr_str = "radial-t" * title_str = "Radial[T]" * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -17157,7 +17106,7 @@ static int __pyx_pf_7_squish_13RadialTEnergy___init__(struct __pyx_obj_7_squish_ } __pyx_pybuffernd_site_arr.diminfo[0].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_site_arr.diminfo[0].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_site_arr.diminfo[1].strides = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_site_arr.diminfo[1].shape = __pyx_pybuffernd_site_arr.rcbuffer->pybuffer.shape[1]; - /* "src/_squish/energy.pyx":145 + /* "squish/_squish/energy.pyx":145 * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, * np.ndarray[FLOAT_T, ndim=2] site_arr): * self.edge_cache_map = &RADIALT_EDGE_CACHE_MAP # <<<<<<<<<<<<<< @@ -17166,7 +17115,7 @@ static int __pyx_pf_7_squish_13RadialTEnergy___init__(struct __pyx_obj_7_squish_ */ __pyx_v_self->__pyx_base.edge_cache_map = (&__pyx_v_7_squish_RADIALT_EDGE_CACHE_MAP); - /* "src/_squish/energy.pyx":146 + /* "squish/_squish/energy.pyx":146 * np.ndarray[FLOAT_T, ndim=2] site_arr): * self.edge_cache_map = &RADIALT_EDGE_CACHE_MAP * self.energy = 0.0 # <<<<<<<<<<<<<< @@ -17175,7 +17124,7 @@ static int __pyx_pf_7_squish_13RadialTEnergy___init__(struct __pyx_obj_7_squish_ */ __pyx_v_self->__pyx_base.energy = 0.0; - /* "src/_squish/energy.pyx":148 + /* "squish/_squish/energy.pyx":148 * self.energy = 0.0 * * super().__init__(n, w, h, r, site_arr) # <<<<<<<<<<<<<< @@ -17268,7 +17217,7 @@ static int __pyx_pf_7_squish_13RadialTEnergy___init__(struct __pyx_obj_7_squish_ __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/energy.pyx":143 + /* "squish/_squish/energy.pyx":143 * attr_str = "radial-t" * title_str = "Radial[T]" * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -17304,7 +17253,7 @@ static int __pyx_pf_7_squish_13RadialTEnergy___init__(struct __pyx_obj_7_squish_ return __pyx_r; } -/* "src/_squish/energy.pyx":151 +/* "squish/_squish/energy.pyx":151 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -17353,7 +17302,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis int __pyx_clineno = 0; __Pyx_RefNannySetupContext("precompute", 0); - /* "src/_squish/energy.pyx":152 + /* "squish/_squish/energy.pyx":152 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -17364,7 +17313,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 152, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 152, __pyx_L1_error)} - /* "src/_squish/energy.pyx":153 + /* "squish/_squish/energy.pyx":153 * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) # <<<<<<<<<<<<<< @@ -17375,7 +17324,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 153, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 153, __pyx_L1_error)} - /* "src/_squish/energy.pyx":152 + /* "squish/_squish/energy.pyx":152 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -17384,7 +17333,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis */ __pyx_v_info = __pyx_v_7_squish_init.VoronoiInfo(__pyx_v_self->__pyx_base.sites, __pyx_v_self->__pyx_base.edges, __pyx_v_self->__pyx_base.points, __pyx_v_self->__pyx_base.vertices, __pyx_v_self->__pyx_base.site_cache, __pyx_v_self->__pyx_base.edge_cache, __pyx_v_self->__pyx_base.edge_cache_map); - /* "src/_squish/energy.pyx":160 + /* "squish/_squish/energy.pyx":160 * * # All energy has a 2pir_0 term. * cdef FLOAT_T [:] site_energy = np.full(self.sites.shape[0], TAU*self.r**2) # <<<<<<<<<<<<<< @@ -17456,7 +17405,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_t_8.memview = NULL; __pyx_t_8.data = NULL; - /* "src/_squish/energy.pyx":161 + /* "squish/_squish/energy.pyx":161 * # All energy has a 2pir_0 term. * cdef FLOAT_T [:] site_energy = np.full(self.sites.shape[0], TAU*self.r**2) * cdef FLOAT_T [:] avg_radii = np.zeros(self.sites.shape[0]) # <<<<<<<<<<<<<< @@ -17493,7 +17442,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_t_8.memview = NULL; __pyx_t_8.data = NULL; - /* "src/_squish/energy.pyx":163 + /* "squish/_squish/energy.pyx":163 * cdef FLOAT_T [:] avg_radii = np.zeros(self.sites.shape[0]) * cdef FLOAT_T energy, r0, t, tp, B, lntan, csc * energy, r0 = 0, self.r # <<<<<<<<<<<<<< @@ -17505,7 +17454,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_v_energy = __pyx_t_9; __pyx_v_r0 = __pyx_t_10; - /* "src/_squish/energy.pyx":166 + /* "squish/_squish/energy.pyx":166 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -17550,307 +17499,267 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_v_t = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); __pyx_v_tp = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); - /* "src/_squish/energy.pyx":167 + /* "squish/_squish/energy.pyx":167 * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< * e = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): */ __pyx_v_xi = __pyx_v_7_squish_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "src/_squish/energy.pyx":168 + /* "squish/_squish/energy.pyx":168 * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): * em = e.prev(&e) */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "src/_squish/energy.pyx":169 + /* "squish/_squish/energy.pyx":169 * xi = init.Site(i, &info) * e = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< + * for j in range(xi.edge_num(&xi)): # <<<<<<<<<<<<<< * em = e.prev(&e) * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) */ __pyx_t_14 = __pyx_v_xi.edge_num((&__pyx_v_xi)); - if ((1 == 0)) abort(); - { - __pyx_t_16 = (__pyx_t_14 - 0 + 1 - 1/abs(1)) / 1; - if (__pyx_t_16 > 0) - { - #if 0 - #pragma omp parallel - #endif /* _OPENMP */ - { - #if 0 - #pragma omp for lastprivate(__pyx_v_Rnla) lastprivate(__pyx_v_e) lastprivate(__pyx_v_em) firstprivate(__pyx_v_j) lastprivate(__pyx_v_j) lastprivate(__pyx_v_t) - #endif /* _OPENMP */ - for (__pyx_t_15 = 0; __pyx_t_15 < __pyx_t_16; __pyx_t_15++){ - { - __pyx_v_j = (__pyx_t_7_squish_INT_T)(0 + 1 * __pyx_t_15); - /* Initialize private variables to invalid values */ - __pyx_v_t = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); + __pyx_t_15 = __pyx_t_14; + for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) { + __pyx_v_j = __pyx_t_16; - /* "src/_squish/energy.pyx":170 + /* "squish/_squish/energy.pyx":170 * e = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): * em = e.prev(&e) # <<<<<<<<<<<<<< * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) * t = Calc.phi(e) */ - __pyx_v_em = __pyx_v_e.prev((&__pyx_v_e)); + __pyx_v_em = __pyx_v_e.prev((&__pyx_v_e)); - /* "src/_squish/energy.pyx":171 - * for j in prange(xi.edge_num(&xi)): + /* "squish/_squish/energy.pyx":171 + * for j in range(xi.edge_num(&xi)): * em = e.prev(&e) * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) # <<<<<<<<<<<<<< * t = Calc.phi(e) * */ - (void)(__pyx_v_e.cache->H((&__pyx_v_e), __pyx_f_7_squish_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); + (void)(__pyx_v_e.cache->H((&__pyx_v_e), __pyx_f_7_squish_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); - /* "src/_squish/energy.pyx":172 + /* "squish/_squish/energy.pyx":172 * em = e.prev(&e) * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) * t = Calc.phi(e) # <<<<<<<<<<<<<< * * e.cache.phi(&e, t) */ - __pyx_v_t = __pyx_f_7_squish_4Calc_phi(__pyx_v_e); + __pyx_v_t = __pyx_f_7_squish_4Calc_phi(__pyx_v_e); - /* "src/_squish/energy.pyx":174 + /* "squish/_squish/energy.pyx":174 * t = Calc.phi(e) * * e.cache.phi(&e, t) # <<<<<<<<<<<<<< * Rnla = e.cache.la(&e, NAN_VECTOR) * Rnla.self.neg(&Rnla) */ - (void)(__pyx_v_e.cache->phi((&__pyx_v_e), __pyx_v_t)); + (void)(__pyx_v_e.cache->phi((&__pyx_v_e), __pyx_v_t)); - /* "src/_squish/energy.pyx":175 + /* "squish/_squish/energy.pyx":175 * * e.cache.phi(&e, t) * Rnla = e.cache.la(&e, NAN_VECTOR) # <<<<<<<<<<<<<< * Rnla.self.neg(&Rnla) * Rnla = Rnla.rot(&Rnla) */ - __pyx_v_Rnla = __pyx_v_e.cache->la((&__pyx_v_e), __pyx_v_7_squish_NAN_VECTOR); + __pyx_v_Rnla = __pyx_v_e.cache->la((&__pyx_v_e), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":176 + /* "squish/_squish/energy.pyx":176 * e.cache.phi(&e, t) * Rnla = e.cache.la(&e, NAN_VECTOR) * Rnla.self.neg(&Rnla) # <<<<<<<<<<<<<< * Rnla = Rnla.rot(&Rnla) * */ - (void)(__pyx_v_Rnla.self.neg((&__pyx_v_Rnla))); + (void)(__pyx_v_Rnla.self.neg((&__pyx_v_Rnla))); - /* "src/_squish/energy.pyx":177 + /* "squish/_squish/energy.pyx":177 * Rnla = e.cache.la(&e, NAN_VECTOR) * Rnla.self.neg(&Rnla) * Rnla = Rnla.rot(&Rnla) # <<<<<<<<<<<<<< * * if Rnla.x < 0: */ - __pyx_v_Rnla = __pyx_v_Rnla.rot((&__pyx_v_Rnla)); + __pyx_v_Rnla = __pyx_v_Rnla.rot((&__pyx_v_Rnla)); - /* "src/_squish/energy.pyx":179 + /* "squish/_squish/energy.pyx":179 * Rnla = Rnla.rot(&Rnla) * * if Rnla.x < 0: # <<<<<<<<<<<<<< * e.cache.B(&e, -acos((Rnla.y/e.cache.la_mag(&e, NAN)))) * else: */ - __pyx_t_17 = ((__pyx_v_Rnla.x < 0.0) != 0); - if (__pyx_t_17) { + __pyx_t_17 = ((__pyx_v_Rnla.x < 0.0) != 0); + if (__pyx_t_17) { - /* "src/_squish/energy.pyx":180 + /* "squish/_squish/energy.pyx":180 * * if Rnla.x < 0: * e.cache.B(&e, -acos((Rnla.y/e.cache.la_mag(&e, NAN)))) # <<<<<<<<<<<<<< * else: * e.cache.B(&e, acos((Rnla.y/e.cache.la_mag(&e, NAN)))) */ - (void)(__pyx_v_e.cache->B((&__pyx_v_e), (-((__pyx_t_7_squish_FLOAT_T)acos(((double)(__pyx_v_Rnla.y / __pyx_v_e.cache->la_mag((&__pyx_v_e), NAN)))))))); + (void)(__pyx_v_e.cache->B((&__pyx_v_e), (-((__pyx_t_7_squish_FLOAT_T)acos(((double)(__pyx_v_Rnla.y / __pyx_v_e.cache->la_mag((&__pyx_v_e), NAN)))))))); - /* "src/_squish/energy.pyx":179 + /* "squish/_squish/energy.pyx":179 * Rnla = Rnla.rot(&Rnla) * * if Rnla.x < 0: # <<<<<<<<<<<<<< * e.cache.B(&e, -acos((Rnla.y/e.cache.la_mag(&e, NAN)))) * else: */ - goto __pyx_L14; - } + goto __pyx_L12; + } - /* "src/_squish/energy.pyx":182 + /* "squish/_squish/energy.pyx":182 * e.cache.B(&e, -acos((Rnla.y/e.cache.la_mag(&e, NAN)))) * else: * e.cache.B(&e, acos((Rnla.y/e.cache.la_mag(&e, NAN)))) # <<<<<<<<<<<<<< * * e.cache.i2p(&e, Calc.I2(e, r0, t)) */ - /*else*/ { - (void)(__pyx_v_e.cache->B((&__pyx_v_e), ((__pyx_t_7_squish_FLOAT_T)acos(((double)(__pyx_v_Rnla.y / __pyx_v_e.cache->la_mag((&__pyx_v_e), NAN))))))); - } - __pyx_L14:; + /*else*/ { + (void)(__pyx_v_e.cache->B((&__pyx_v_e), ((__pyx_t_7_squish_FLOAT_T)acos(((double)(__pyx_v_Rnla.y / __pyx_v_e.cache->la_mag((&__pyx_v_e), NAN))))))); + } + __pyx_L12:; - /* "src/_squish/energy.pyx":184 + /* "squish/_squish/energy.pyx":184 * e.cache.B(&e, acos((Rnla.y/e.cache.la_mag(&e, NAN)))) * * e.cache.i2p(&e, Calc.I2(e, r0, t)) # <<<<<<<<<<<<<< * e = e.next(&e) * */ - (void)(__pyx_v_e.cache->i2p((&__pyx_v_e), __pyx_f_7_squish_4Calc_I2(__pyx_v_e, __pyx_v_r0, __pyx_v_t))); + (void)(__pyx_v_e.cache->i2p((&__pyx_v_e), __pyx_f_7_squish_4Calc_I2(__pyx_v_e, __pyx_v_r0, __pyx_v_t))); - /* "src/_squish/energy.pyx":185 + /* "squish/_squish/energy.pyx":185 * * e.cache.i2p(&e, Calc.I2(e, r0, t)) * e = e.next(&e) # <<<<<<<<<<<<<< * * # For looping again to calculate integrals. */ - __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); - } - } - } - } + __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); } - /* "src/_squish/energy.pyx":188 + /* "squish/_squish/energy.pyx":188 * * # For looping again to calculate integrals. * em = xi.edge(&xi) # <<<<<<<<<<<<<< - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): * e = em.next(&em) */ __pyx_v_em = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "src/_squish/energy.pyx":189 + /* "squish/_squish/energy.pyx":189 * # For looping again to calculate integrals. * em = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< + * for j in range(xi.edge_num(&xi)): # <<<<<<<<<<<<<< * e = em.next(&em) * B = em.cache.B(&em, NAN) */ - __pyx_t_16 = __pyx_v_xi.edge_num((&__pyx_v_xi)); - if ((1 == 0)) abort(); - { - __pyx_t_14 = (__pyx_t_16 - 0 + 1 - 1/abs(1)) / 1; - if (__pyx_t_14 > 0) - { - #if 0 - #pragma omp parallel - #endif /* _OPENMP */ - { - #if 0 - #pragma omp for lastprivate(__pyx_v_B) lastprivate(__pyx_v_csc) lastprivate(__pyx_v_e) lastprivate(__pyx_v_em) firstprivate(__pyx_v_j) lastprivate(__pyx_v_j) lastprivate(__pyx_v_lntan) lastprivate(__pyx_v_t) lastprivate(__pyx_v_tp) - #endif /* _OPENMP */ - for (__pyx_t_15 = 0; __pyx_t_15 < __pyx_t_14; __pyx_t_15++){ - { - __pyx_v_j = (__pyx_t_7_squish_INT_T)(0 + 1 * __pyx_t_15); - /* Initialize private variables to invalid values */ - __pyx_v_B = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); - __pyx_v_csc = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); - __pyx_v_lntan = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); - __pyx_v_t = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); - __pyx_v_tp = ((__pyx_t_7_squish_FLOAT_T)__PYX_NAN()); + __pyx_t_14 = __pyx_v_xi.edge_num((&__pyx_v_xi)); + __pyx_t_15 = __pyx_t_14; + for (__pyx_t_16 = 0; __pyx_t_16 < __pyx_t_15; __pyx_t_16+=1) { + __pyx_v_j = __pyx_t_16; - /* "src/_squish/energy.pyx":190 + /* "squish/_squish/energy.pyx":190 * em = xi.edge(&xi) - * for j in prange(xi.edge_num(&xi)): + * for j in range(xi.edge_num(&xi)): * e = em.next(&em) # <<<<<<<<<<<<<< * B = em.cache.B(&em, NAN) * t, tp = em.cache.phi(&em, NAN), e.cache.phi(&e, NAN) */ - __pyx_v_e = __pyx_v_em.next((&__pyx_v_em)); + __pyx_v_e = __pyx_v_em.next((&__pyx_v_em)); - /* "src/_squish/energy.pyx":191 - * for j in prange(xi.edge_num(&xi)): + /* "squish/_squish/energy.pyx":191 + * for j in range(xi.edge_num(&xi)): * e = em.next(&em) * B = em.cache.B(&em, NAN) # <<<<<<<<<<<<<< * t, tp = em.cache.phi(&em, NAN), e.cache.phi(&e, NAN) * */ - __pyx_v_B = __pyx_v_em.cache->B((&__pyx_v_em), NAN); + __pyx_v_B = __pyx_v_em.cache->B((&__pyx_v_em), NAN); - /* "src/_squish/energy.pyx":192 + /* "squish/_squish/energy.pyx":192 * e = em.next(&em) * B = em.cache.B(&em, NAN) * t, tp = em.cache.phi(&em, NAN), e.cache.phi(&e, NAN) # <<<<<<<<<<<<<< * * lntan = (log(fabs(tan(((tp+B)/2))))) - \ */ - __pyx_t_10 = __pyx_v_em.cache->phi((&__pyx_v_em), NAN); - __pyx_t_9 = __pyx_v_e.cache->phi((&__pyx_v_e), NAN); - __pyx_v_t = __pyx_t_10; - __pyx_v_tp = __pyx_t_9; + __pyx_t_10 = __pyx_v_em.cache->phi((&__pyx_v_em), NAN); + __pyx_t_9 = __pyx_v_e.cache->phi((&__pyx_v_e), NAN); + __pyx_v_t = __pyx_t_10; + __pyx_v_tp = __pyx_t_9; - /* "src/_squish/energy.pyx":194 + /* "squish/_squish/energy.pyx":194 * t, tp = em.cache.phi(&em, NAN), e.cache.phi(&e, NAN) * * lntan = (log(fabs(tan(((tp+B)/2))))) - \ # <<<<<<<<<<<<<< * (log(fabs(tan(((t+B)/2))))) * */ - __pyx_v_lntan = (((__pyx_t_7_squish_FLOAT_T)log(fabs(tan(((double)((__pyx_v_tp + __pyx_v_B) / 2.0)))))) - ((__pyx_t_7_squish_FLOAT_T)log(fabs(tan(((double)((__pyx_v_t + __pyx_v_B) / 2.0))))))); + __pyx_v_lntan = (((__pyx_t_7_squish_FLOAT_T)log(fabs(tan(((double)((__pyx_v_tp + __pyx_v_B) / 2.0)))))) - ((__pyx_t_7_squish_FLOAT_T)log(fabs(tan(((double)((__pyx_v_t + __pyx_v_B) / 2.0))))))); - /* "src/_squish/energy.pyx":197 + /* "squish/_squish/energy.pyx":197 * (log(fabs(tan(((t+B)/2))))) * * csc = 1/((sin((tp+B)))) - \ # <<<<<<<<<<<<<< * 1/((sin((t+B)))) * */ - __pyx_v_csc = ((1.0 / ((__pyx_t_7_squish_FLOAT_T)sin(((double)(__pyx_v_tp + __pyx_v_B))))) - (1.0 / ((__pyx_t_7_squish_FLOAT_T)sin(((double)(__pyx_v_t + __pyx_v_B)))))); + __pyx_v_csc = ((1.0 / ((__pyx_t_7_squish_FLOAT_T)sin(((double)(__pyx_v_tp + __pyx_v_B))))) - (1.0 / ((__pyx_t_7_squish_FLOAT_T)sin(((double)(__pyx_v_t + __pyx_v_B)))))); - /* "src/_squish/energy.pyx":200 + /* "squish/_squish/energy.pyx":200 * 1/((sin((t+B)))) * * em.cache.lntan(&em, lntan) # <<<<<<<<<<<<<< * em.cache.csc(&em, csc) * */ - (void)(__pyx_v_em.cache->lntan((&__pyx_v_em), __pyx_v_lntan)); + (void)(__pyx_v_em.cache->lntan((&__pyx_v_em), __pyx_v_lntan)); - /* "src/_squish/energy.pyx":201 + /* "squish/_squish/energy.pyx":201 * * em.cache.lntan(&em, lntan) * em.cache.csc(&em, csc) # <<<<<<<<<<<<<< * * avg_radii[i] += (em.cache.F(&em, NAN)/em.cache.la_mag(&em, NAN))*lntan */ - (void)(__pyx_v_em.cache->csc((&__pyx_v_em), __pyx_v_csc)); + (void)(__pyx_v_em.cache->csc((&__pyx_v_em), __pyx_v_csc)); - /* "src/_squish/energy.pyx":203 + /* "squish/_squish/energy.pyx":203 * em.cache.csc(&em, csc) * * avg_radii[i] += (em.cache.F(&em, NAN)/em.cache.la_mag(&em, NAN))*lntan # <<<<<<<<<<<<<< * * em = em.next(&em) */ - __pyx_t_18 = __pyx_v_i; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_18 * __pyx_v_avg_radii.strides[0]) )) += ((__pyx_v_em.cache->F((&__pyx_v_em), NAN) / __pyx_v_em.cache->la_mag((&__pyx_v_em), NAN)) * __pyx_v_lntan); + __pyx_t_18 = __pyx_v_i; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_18 * __pyx_v_avg_radii.strides[0]) )) += ((__pyx_v_em.cache->F((&__pyx_v_em), NAN) / __pyx_v_em.cache->la_mag((&__pyx_v_em), NAN)) * __pyx_v_lntan); - /* "src/_squish/energy.pyx":205 + /* "squish/_squish/energy.pyx":205 * avg_radii[i] += (em.cache.F(&em, NAN)/em.cache.la_mag(&em, NAN))*lntan * * em = em.next(&em) # <<<<<<<<<<<<<< * * site_energy[i] += 2*(xi.cache.area(&xi, NAN) - r0*avg_radii[i]) */ - __pyx_v_em = __pyx_v_em.next((&__pyx_v_em)); - } - } - } - } + __pyx_v_em = __pyx_v_em.next((&__pyx_v_em)); } - /* "src/_squish/energy.pyx":207 + /* "squish/_squish/energy.pyx":207 * em = em.next(&em) * * site_energy[i] += 2*(xi.cache.area(&xi, NAN) - r0*avg_radii[i]) # <<<<<<<<<<<<<< @@ -17861,7 +17770,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_t_15 = __pyx_v_i; *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_energy.data + __pyx_t_15 * __pyx_v_site_energy.strides[0]) )) += (2.0 * (__pyx_v_xi.cache->area((&__pyx_v_xi), NAN) - (__pyx_v_r0 * (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_14 * __pyx_v_avg_radii.strides[0]) )))))); - /* "src/_squish/energy.pyx":209 + /* "squish/_squish/energy.pyx":209 * site_energy[i] += 2*(xi.cache.area(&xi, NAN) - r0*avg_radii[i]) * * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) # <<<<<<<<<<<<<< @@ -17871,7 +17780,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_t_14 = __pyx_v_i; (void)(__pyx_v_xi.cache->avg_radius((&__pyx_v_xi), ((*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_14 * __pyx_v_avg_radii.strides[0]) ))) / __pyx_v_7_squish_TAU))); - /* "src/_squish/energy.pyx":210 + /* "squish/_squish/energy.pyx":210 * * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) * xi.cache.energy(&xi, site_energy[i]) # <<<<<<<<<<<<<< @@ -17881,7 +17790,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_t_14 = __pyx_v_i; (void)(__pyx_v_xi.cache->energy((&__pyx_v_xi), (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_energy.data + __pyx_t_14 * __pyx_v_site_energy.strides[0]) ))))); - /* "src/_squish/energy.pyx":211 + /* "squish/_squish/energy.pyx":211 * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) * xi.cache.energy(&xi, site_energy[i]) * if i < self.n: # <<<<<<<<<<<<<< @@ -17891,7 +17800,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_t_17 = ((__pyx_v_i < __pyx_v_self->__pyx_base.n) != 0); if (__pyx_t_17) { - /* "src/_squish/energy.pyx":212 + /* "squish/_squish/energy.pyx":212 * xi.cache.energy(&xi, site_energy[i]) * if i < self.n: * energy += site_energy[i] # <<<<<<<<<<<<<< @@ -17901,7 +17810,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __pyx_t_14 = __pyx_v_i; __pyx_v_energy = (__pyx_v_energy + (*((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_energy.data + __pyx_t_14 * __pyx_v_site_energy.strides[0]) )))); - /* "src/_squish/energy.pyx":211 + /* "squish/_squish/energy.pyx":211 * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) * xi.cache.energy(&xi, site_energy[i]) * if i < self.n: # <<<<<<<<<<<<<< @@ -17922,7 +17831,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis #endif } - /* "src/_squish/energy.pyx":166 + /* "squish/_squish/energy.pyx":166 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -17948,7 +17857,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis } } - /* "src/_squish/energy.pyx":214 + /* "squish/_squish/energy.pyx":214 * energy += site_energy[i] * * self.energy = energy # <<<<<<<<<<<<<< @@ -17957,7 +17866,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis */ __pyx_v_self->__pyx_base.energy = __pyx_v_energy; - /* "src/_squish/energy.pyx":151 + /* "squish/_squish/energy.pyx":151 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -17982,7 +17891,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_precompute(struct __pyx_obj_7_squis __Pyx_RefNannyFinishContext(); } -/* "src/_squish/energy.pyx":217 +/* "squish/_squish/energy.pyx":217 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -18024,7 +17933,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish int __pyx_clineno = 0; __Pyx_RefNannySetupContext("calc_grad", 0); - /* "src/_squish/energy.pyx":218 + /* "squish/_squish/energy.pyx":218 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -18035,7 +17944,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 218, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 218, __pyx_L1_error)} - /* "src/_squish/energy.pyx":219 + /* "squish/_squish/energy.pyx":219 * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) # <<<<<<<<<<<<<< @@ -18046,7 +17955,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 219, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 219, __pyx_L1_error)} - /* "src/_squish/energy.pyx":218 + /* "squish/_squish/energy.pyx":218 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -18055,7 +17964,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish */ __pyx_v_info = __pyx_v_7_squish_init.VoronoiInfo(__pyx_v_self->__pyx_base.sites, __pyx_v_self->__pyx_base.edges, __pyx_v_self->__pyx_base.points, __pyx_v_self->__pyx_base.vertices, __pyx_v_self->__pyx_base.site_cache, __pyx_v_self->__pyx_base.edge_cache, __pyx_v_self->__pyx_base.edge_cache_map); - /* "src/_squish/energy.pyx":226 + /* "squish/_squish/energy.pyx":226 * cdef BitSet edge_set * * cdef INT_T num_edges = self.edges.shape[0] # <<<<<<<<<<<<<< @@ -18065,7 +17974,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 226, __pyx_L1_error)} __pyx_v_num_edges = (__pyx_v_self->__pyx_base.edges.shape[0]); - /* "src/_squish/energy.pyx":227 + /* "squish/_squish/energy.pyx":227 * * cdef INT_T num_edges = self.edges.shape[0] * cdef FLOAT_T r0 = self.r # <<<<<<<<<<<<<< @@ -18075,7 +17984,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish __pyx_t_1 = __pyx_v_self->__pyx_base.r; __pyx_v_r0 = __pyx_t_1; - /* "src/_squish/energy.pyx":229 + /* "squish/_squish/energy.pyx":229 * cdef FLOAT_T r0 = self.r * * cdef FLOAT_T [:, ::1] dedx = np.zeros((self.n, 2), dtype=FLOAT) # <<<<<<<<<<<<<< @@ -18119,7 +18028,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish __pyx_t_6.memview = NULL; __pyx_t_6.data = NULL; - /* "src/_squish/energy.pyx":232 + /* "squish/_squish/energy.pyx":232 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -18158,7 +18067,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish /* Initialize private variables to invalid values */ __pyx_v_j = ((__pyx_t_7_squish_INT_T)0xbad0bad0); - /* "src/_squish/energy.pyx":233 + /* "squish/_squish/energy.pyx":233 * cdef INT_T i, j * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< @@ -18167,7 +18076,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish */ __pyx_v_xi = __pyx_v_7_squish_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "src/_squish/energy.pyx":234 + /* "squish/_squish/energy.pyx":234 * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -18176,229 +18085,213 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "src/_squish/energy.pyx":235 + /* "squish/_squish/energy.pyx":235 * xi = init.Site(i, &info) * e = xi.edge(&xi) * edge_set = init.BitSet(num_edges) # <<<<<<<<<<<<<< * - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. + * for j in range(xi.edge_num(&xi)): # Looping through site edges. */ __pyx_v_edge_set = __pyx_v_7_squish_init.BitSet(__pyx_v_num_edges); - /* "src/_squish/energy.pyx":237 + /* "squish/_squish/energy.pyx":237 * edge_set = init.BitSet(num_edges) * - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. # <<<<<<<<<<<<<< + * for j in range(xi.edge_num(&xi)): # Looping through site edges. # <<<<<<<<<<<<<< * f = e * while True: # Circling this vertex. */ __pyx_t_10 = __pyx_v_xi.edge_num((&__pyx_v_xi)); - if ((1 == 0)) abort(); - { - __pyx_t_12 = (__pyx_t_10 - 0 + 1 - 1/abs(1)) / 1; - if (__pyx_t_12 > 0) - { - #if 0 - #pragma omp parallel - #endif /* _OPENMP */ - { - #if 0 - #pragma omp for lastprivate(__pyx_v_dedxi_p) lastprivate(__pyx_v_e) lastprivate(__pyx_v_f) lastprivate(__pyx_v_fm) firstprivate(__pyx_v_j) lastprivate(__pyx_v_j) - #endif /* _OPENMP */ - for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_12; __pyx_t_11++){ - { - __pyx_v_j = (__pyx_t_7_squish_INT_T)(0 + 1 * __pyx_t_11); + __pyx_t_11 = __pyx_t_10; + for (__pyx_t_12 = 0; __pyx_t_12 < __pyx_t_11; __pyx_t_12+=1) { + __pyx_v_j = __pyx_t_12; - /* "src/_squish/energy.pyx":238 + /* "squish/_squish/energy.pyx":238 * - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. + * for j in range(xi.edge_num(&xi)): # Looping through site edges. * f = e # <<<<<<<<<<<<<< * while True: # Circling this vertex. * fm = f.prev(&f) */ - __pyx_v_f = __pyx_v_e; + __pyx_v_f = __pyx_v_e; - /* "src/_squish/energy.pyx":239 - * for j in prange(xi.edge_num(&xi)): # Looping through site edges. + /* "squish/_squish/energy.pyx":239 + * for j in range(xi.edge_num(&xi)): # Looping through site edges. * f = e * while True: # Circling this vertex. # <<<<<<<<<<<<<< * fm = f.prev(&f) * if not edge_set.add(&edge_set, f.arr_index): */ - while (1) { + while (1) { - /* "src/_squish/energy.pyx":240 + /* "squish/_squish/energy.pyx":240 * f = e * while True: # Circling this vertex. * fm = f.prev(&f) # <<<<<<<<<<<<<< * if not edge_set.add(&edge_set, f.arr_index): * dedxi_p = Calc.radialt_edge_grad(f, xi, r0) */ - __pyx_v_fm = __pyx_v_f.prev((&__pyx_v_f)); + __pyx_v_fm = __pyx_v_f.prev((&__pyx_v_f)); - /* "src/_squish/energy.pyx":241 + /* "squish/_squish/energy.pyx":241 * while True: # Circling this vertex. * fm = f.prev(&f) * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< * dedxi_p = Calc.radialt_edge_grad(f, xi, r0) * dedx[i][0] -= dedxi_p.x */ - __pyx_t_13 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_f.arr_index) != 0)) != 0); - if (__pyx_t_13) { + __pyx_t_13 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_f.arr_index) != 0)) != 0); + if (__pyx_t_13) { - /* "src/_squish/energy.pyx":242 + /* "squish/_squish/energy.pyx":242 * fm = f.prev(&f) * if not edge_set.add(&edge_set, f.arr_index): * dedxi_p = Calc.radialt_edge_grad(f, xi, r0) # <<<<<<<<<<<<<< * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y */ - __pyx_v_dedxi_p = __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_v_f, __pyx_v_xi, __pyx_v_r0); + __pyx_v_dedxi_p = __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_v_f, __pyx_v_xi, __pyx_v_r0); - /* "src/_squish/energy.pyx":243 + /* "squish/_squish/energy.pyx":243 * if not edge_set.add(&edge_set, f.arr_index): * dedxi_p = Calc.radialt_edge_grad(f, xi, r0) * dedx[i][0] -= dedxi_p.x # <<<<<<<<<<<<<< * dedx[i][1] -= dedxi_p.y * */ - __pyx_t_14 = __pyx_v_i; - __pyx_t_15 = 0; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.x; + __pyx_t_14 = __pyx_v_i; + __pyx_t_15 = 0; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.x; - /* "src/_squish/energy.pyx":244 + /* "squish/_squish/energy.pyx":244 * dedxi_p = Calc.radialt_edge_grad(f, xi, r0) * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y # <<<<<<<<<<<<<< * * if not edge_set.add(&edge_set, fm.arr_index): */ - __pyx_t_14 = __pyx_v_i; - __pyx_t_15 = 1; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.y; + __pyx_t_14 = __pyx_v_i; + __pyx_t_15 = 1; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.y; - /* "src/_squish/energy.pyx":241 + /* "squish/_squish/energy.pyx":241 * while True: # Circling this vertex. * fm = f.prev(&f) * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< * dedxi_p = Calc.radialt_edge_grad(f, xi, r0) * dedx[i][0] -= dedxi_p.x */ - } + } - /* "src/_squish/energy.pyx":246 + /* "squish/_squish/energy.pyx":246 * dedx[i][1] -= dedxi_p.y * * if not edge_set.add(&edge_set, fm.arr_index): # <<<<<<<<<<<<<< * dedxi_p = Calc.radialt_edge_grad(fm, xi, r0) * dedx[i][0] -= dedxi_p.x */ - __pyx_t_13 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_fm.arr_index) != 0)) != 0); - if (__pyx_t_13) { + __pyx_t_13 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_fm.arr_index) != 0)) != 0); + if (__pyx_t_13) { - /* "src/_squish/energy.pyx":247 + /* "squish/_squish/energy.pyx":247 * * if not edge_set.add(&edge_set, fm.arr_index): * dedxi_p = Calc.radialt_edge_grad(fm, xi, r0) # <<<<<<<<<<<<<< * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y */ - __pyx_v_dedxi_p = __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_v_fm, __pyx_v_xi, __pyx_v_r0); + __pyx_v_dedxi_p = __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_v_fm, __pyx_v_xi, __pyx_v_r0); - /* "src/_squish/energy.pyx":248 + /* "squish/_squish/energy.pyx":248 * if not edge_set.add(&edge_set, fm.arr_index): * dedxi_p = Calc.radialt_edge_grad(fm, xi, r0) * dedx[i][0] -= dedxi_p.x # <<<<<<<<<<<<<< * dedx[i][1] -= dedxi_p.y * */ - __pyx_t_14 = __pyx_v_i; - __pyx_t_15 = 0; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.x; + __pyx_t_14 = __pyx_v_i; + __pyx_t_15 = 0; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.x; - /* "src/_squish/energy.pyx":249 + /* "squish/_squish/energy.pyx":249 * dedxi_p = Calc.radialt_edge_grad(fm, xi, r0) * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y # <<<<<<<<<<<<<< * * */ - __pyx_t_14 = __pyx_v_i; - __pyx_t_15 = 1; - *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.y; + __pyx_t_14 = __pyx_v_i; + __pyx_t_15 = 1; + *((__pyx_t_7_squish_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_7_squish_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.y; - /* "src/_squish/energy.pyx":246 + /* "squish/_squish/energy.pyx":246 * dedx[i][1] -= dedxi_p.y * * if not edge_set.add(&edge_set, fm.arr_index): # <<<<<<<<<<<<<< * dedxi_p = Calc.radialt_edge_grad(fm, xi, r0) * dedx[i][0] -= dedxi_p.x */ - } + } - /* "src/_squish/energy.pyx":252 + /* "squish/_squish/energy.pyx":252 * * * f = f.twin(&f) # <<<<<<<<<<<<<< * f = f.next(&f) * */ - __pyx_v_f = __pyx_v_f.twin((&__pyx_v_f)); + __pyx_v_f = __pyx_v_f.twin((&__pyx_v_f)); - /* "src/_squish/energy.pyx":253 + /* "squish/_squish/energy.pyx":253 * * f = f.twin(&f) * f = f.next(&f) # <<<<<<<<<<<<<< * * if f.arr_index == e.arr_index: */ - __pyx_v_f = __pyx_v_f.next((&__pyx_v_f)); + __pyx_v_f = __pyx_v_f.next((&__pyx_v_f)); - /* "src/_squish/energy.pyx":255 + /* "squish/_squish/energy.pyx":255 * f = f.next(&f) * * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< * break * */ - __pyx_t_13 = ((__pyx_v_f.arr_index == __pyx_v_e.arr_index) != 0); - if (__pyx_t_13) { + __pyx_t_13 = ((__pyx_v_f.arr_index == __pyx_v_e.arr_index) != 0); + if (__pyx_t_13) { - /* "src/_squish/energy.pyx":256 + /* "squish/_squish/energy.pyx":256 * * if f.arr_index == e.arr_index: * break # <<<<<<<<<<<<<< * * e = e.next(&e) */ - goto __pyx_L15_break; + goto __pyx_L13_break; - /* "src/_squish/energy.pyx":255 + /* "squish/_squish/energy.pyx":255 * f = f.next(&f) * * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< * break * */ - } - } - __pyx_L15_break:; + } + } + __pyx_L13_break:; - /* "src/_squish/energy.pyx":258 + /* "squish/_squish/energy.pyx":258 * break * * e = e.next(&e) # <<<<<<<<<<<<<< * edge_set.free(&edge_set) * self.grad = dedx */ - __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); - } - } - } - } + __pyx_v_e = __pyx_v_e.next((&__pyx_v_e)); } - /* "src/_squish/energy.pyx":259 + /* "squish/_squish/energy.pyx":259 * * e = e.next(&e) * edge_set.free(&edge_set) # <<<<<<<<<<<<<< @@ -18419,7 +18312,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish #endif } - /* "src/_squish/energy.pyx":232 + /* "squish/_squish/energy.pyx":232 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -18438,7 +18331,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish } } - /* "src/_squish/energy.pyx":260 + /* "squish/_squish/energy.pyx":260 * e = e.next(&e) * edge_set.free(&edge_set) * self.grad = dedx # <<<<<<<<<<<<<< @@ -18449,7 +18342,7 @@ static void __pyx_f_7_squish_13RadialTEnergy_calc_grad(struct __pyx_obj_7_squish __PYX_INC_MEMVIEW(&__pyx_v_dedx, 0); __pyx_v_self->__pyx_base.grad = __pyx_v_dedx; - /* "src/_squish/energy.pyx":217 + /* "squish/_squish/energy.pyx":217 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -18584,7 +18477,7 @@ static PyObject *__pyx_pf_7_squish_13RadialTEnergy_4__setstate_cython__(CYTHON_U return __pyx_r; } -/* "src/_squish/energy.pyx":265 +/* "squish/_squish/energy.pyx":265 * cdef class Calc: * @staticmethod * cdef inline FLOAT_T phi(HalfEdge e) nogil: # <<<<<<<<<<<<<< @@ -18598,7 +18491,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_4Calc_phi(__pyx_t __pyx_t_7_squish_FLOAT_T __pyx_r; __pyx_t_7_squish_FLOAT_T __pyx_t_1; - /* "src/_squish/energy.pyx":266 + /* "squish/_squish/energy.pyx":266 * @staticmethod * cdef inline FLOAT_T phi(HalfEdge e) nogil: * cdef Vector2D da = e.cache.da(&e, NAN_VECTOR) # <<<<<<<<<<<<<< @@ -18607,7 +18500,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_4Calc_phi(__pyx_t */ __pyx_v_da = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":267 + /* "squish/_squish/energy.pyx":267 * cdef inline FLOAT_T phi(HalfEdge e) nogil: * cdef Vector2D da = e.cache.da(&e, NAN_VECTOR) * cdef FLOAT_T angle = acos((da.x/e.cache.da_mag(&e, NAN))) # <<<<<<<<<<<<<< @@ -18616,7 +18509,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_4Calc_phi(__pyx_t */ __pyx_v_angle = ((__pyx_t_7_squish_FLOAT_T)acos(((double)(__pyx_v_da.x / __pyx_v_e.cache->da_mag((&__pyx_v_e), NAN))))); - /* "src/_squish/energy.pyx":268 + /* "squish/_squish/energy.pyx":268 * cdef Vector2D da = e.cache.da(&e, NAN_VECTOR) * cdef FLOAT_T angle = acos((da.x/e.cache.da_mag(&e, NAN))) * return angle if da.y >= 0 else TAU - angle # <<<<<<<<<<<<<< @@ -18631,7 +18524,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_4Calc_phi(__pyx_t __pyx_r = __pyx_t_1; goto __pyx_L0; - /* "src/_squish/energy.pyx":265 + /* "squish/_squish/energy.pyx":265 * cdef class Calc: * @staticmethod * cdef inline FLOAT_T phi(HalfEdge e) nogil: # <<<<<<<<<<<<<< @@ -18644,7 +18537,7 @@ static CYTHON_INLINE __pyx_t_7_squish_FLOAT_T __pyx_f_7_squish_4Calc_phi(__pyx_t return __pyx_r; } -/* "src/_squish/energy.pyx":272 +/* "squish/_squish/energy.pyx":272 * * @staticmethod * cdef inline Vector2D I2(HalfEdge e, FLOAT_T r0, FLOAT_T t) nogil: # <<<<<<<<<<<<<< @@ -18656,7 +18549,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_I2(__pyx_t __pyx_t_7_squish_Vector2D __pyx_v_Rda; __pyx_t_7_squish_Vector2D __pyx_r; - /* "src/_squish/energy.pyx":273 + /* "squish/_squish/energy.pyx":273 * @staticmethod * cdef inline Vector2D I2(HalfEdge e, FLOAT_T r0, FLOAT_T t) nogil: * cdef Vector2D Rda = e.cache.da(&e, NAN_VECTOR) # <<<<<<<<<<<<<< @@ -18665,7 +18558,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_I2(__pyx_t */ __pyx_v_Rda = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":274 + /* "squish/_squish/energy.pyx":274 * cdef inline Vector2D I2(HalfEdge e, FLOAT_T r0, FLOAT_T t) nogil: * cdef Vector2D Rda = e.cache.da(&e, NAN_VECTOR) * Rda = Rda.rot(&Rda) # <<<<<<<<<<<<<< @@ -18674,7 +18567,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_I2(__pyx_t */ __pyx_v_Rda = __pyx_v_Rda.rot((&__pyx_v_Rda)); - /* "src/_squish/energy.pyx":275 + /* "squish/_squish/energy.pyx":275 * cdef Vector2D Rda = e.cache.da(&e, NAN_VECTOR) * Rda = Rda.rot(&Rda) * Rda.self.sdiv(&Rda, e.cache.da_mag(&e, NAN)) # <<<<<<<<<<<<<< @@ -18683,7 +18576,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_I2(__pyx_t */ (void)(__pyx_v_Rda.self.sdiv((&__pyx_v_Rda), __pyx_v_e.cache->da_mag((&__pyx_v_e), NAN))); - /* "src/_squish/energy.pyx":277 + /* "squish/_squish/energy.pyx":277 * Rda.self.sdiv(&Rda, e.cache.da_mag(&e, NAN)) * * return Rda # <<<<<<<<<<<<<< @@ -18693,7 +18586,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_I2(__pyx_t __pyx_r = __pyx_v_Rda; goto __pyx_L0; - /* "src/_squish/energy.pyx":272 + /* "squish/_squish/energy.pyx":272 * * @staticmethod * cdef inline Vector2D I2(HalfEdge e, FLOAT_T r0, FLOAT_T t) nogil: # <<<<<<<<<<<<<< @@ -18706,7 +18599,7 @@ static CYTHON_INLINE __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_I2(__pyx_t return __pyx_r; } -/* "src/_squish/energy.pyx":281 +/* "squish/_squish/energy.pyx":281 * * @staticmethod * cdef Vector2D radialt_edge_grad(HalfEdge e, Site xi, FLOAT_T r0) nogil: # <<<<<<<<<<<<<< @@ -18744,7 +18637,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_t_7_squish_Matrix2x2 __pyx_t_5; int __pyx_t_6; - /* "src/_squish/energy.pyx":289 + /* "squish/_squish/energy.pyx":289 * cdef FLOAT_T t1, t2, lntan, csc, sinB, cosB, sinBp, cosBp, F, A, B * * xe = e.face(&e) # <<<<<<<<<<<<<< @@ -18753,7 +18646,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_xe = __pyx_v_e.face((&__pyx_v_e)); - /* "src/_squish/energy.pyx":290 + /* "squish/_squish/energy.pyx":290 * * xe = e.face(&e) * ep = e.next(&e) # <<<<<<<<<<<<<< @@ -18762,7 +18655,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_ep = __pyx_v_e.next((&__pyx_v_e)); - /* "src/_squish/energy.pyx":291 + /* "squish/_squish/energy.pyx":291 * xe = e.face(&e) * ep = e.next(&e) * F, A, B = e.cache.F(&e, NAN), e.cache.la_mag(&e, NAN), e.cache.B(&e, NAN) # <<<<<<<<<<<<<< @@ -18776,7 +18669,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_v_A = __pyx_t_2; __pyx_v_B = __pyx_t_3; - /* "src/_squish/energy.pyx":292 + /* "squish/_squish/energy.pyx":292 * ep = e.next(&e) * F, A, B = e.cache.F(&e, NAN), e.cache.la_mag(&e, NAN), e.cache.B(&e, NAN) * t1, t2 = e.cache.phi(&e, NAN), ep.cache.phi(&ep, NAN) # <<<<<<<<<<<<<< @@ -18788,7 +18681,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_v_t1 = __pyx_t_3; __pyx_v_t2 = __pyx_t_2; - /* "src/_squish/energy.pyx":294 + /* "squish/_squish/energy.pyx":294 * t1, t2 = e.cache.phi(&e, NAN), ep.cache.phi(&ep, NAN) * * lntan, csc = e.cache.lntan(&e, NAN), e.cache.csc(&e, NAN) # <<<<<<<<<<<<<< @@ -18800,7 +18693,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_v_lntan = __pyx_t_2; __pyx_v_csc = __pyx_t_3; - /* "src/_squish/energy.pyx":296 + /* "squish/_squish/energy.pyx":296 * lntan, csc = e.cache.lntan(&e, NAN), e.cache.csc(&e, NAN) * * sinB, cosB = (sin((B))), (cos((B))) # <<<<<<<<<<<<<< @@ -18812,7 +18705,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_v_sinB = __pyx_t_3; __pyx_v_cosB = __pyx_t_2; - /* "src/_squish/energy.pyx":297 + /* "squish/_squish/energy.pyx":297 * * sinB, cosB = (sin((B))), (cos((B))) * sinBp, cosBp = (sin((B-PI_2))), \ # <<<<<<<<<<<<<< @@ -18821,7 +18714,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_t_2 = ((__pyx_t_7_squish_FLOAT_T)sin(((double)(__pyx_v_B - M_PI_2)))); - /* "src/_squish/energy.pyx":298 + /* "squish/_squish/energy.pyx":298 * sinB, cosB = (sin((B))), (cos((B))) * sinBp, cosBp = (sin((B-PI_2))), \ * (cos((B-PI_2))) # <<<<<<<<<<<<<< @@ -18832,7 +18725,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_v_sinBp = __pyx_t_2; __pyx_v_cosBp = __pyx_t_3; - /* "src/_squish/energy.pyx":301 + /* "squish/_squish/energy.pyx":301 * * * ha, hap = e.get_H(&e, xi), ep.get_H(&ep, xi) # <<<<<<<<<<<<<< @@ -18844,7 +18737,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_v_ha = __pyx_t_4; __pyx_v_hap = __pyx_t_5; - /* "src/_squish/energy.pyx":302 + /* "squish/_squish/energy.pyx":302 * * ha, hap = e.get_H(&e, xi), ep.get_H(&ep, xi) * hdiff = hap.copy.msub(&hap, ha) # <<<<<<<<<<<<<< @@ -18853,7 +18746,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_hdiff = __pyx_v_hap.copy.msub((&__pyx_v_hap), __pyx_v_ha); - /* "src/_squish/energy.pyx":304 + /* "squish/_squish/energy.pyx":304 * hdiff = hap.copy.msub(&hap, ha) * # If edge is part of differentiated site. * if xe.index(&xe) == xi.index(&xi): # <<<<<<<<<<<<<< @@ -18863,7 +18756,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_t_6 = ((__pyx_v_xe.index((&__pyx_v_xe)) == __pyx_v_xi.index((&__pyx_v_xi))) != 0); if (__pyx_t_6) { - /* "src/_squish/energy.pyx":305 + /* "squish/_squish/energy.pyx":305 * # If edge is part of differentiated site. * if xe.index(&xe) == xi.index(&xi): * ha.self.msub(&ha, init.Matrix2x2(1.0, 0.0, 0.0, 1.0)) # <<<<<<<<<<<<<< @@ -18872,7 +18765,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_ha.self.msub((&__pyx_v_ha), __pyx_v_7_squish_init.Matrix2x2(1.0, 0.0, 0.0, 1.0))); - /* "src/_squish/energy.pyx":306 + /* "squish/_squish/energy.pyx":306 * if xe.index(&xe) == xi.index(&xi): * ha.self.msub(&ha, init.Matrix2x2(1.0, 0.0, 0.0, 1.0)) * hap.self.msub(&hap, init.Matrix2x2(1.0, 0.0, 0.0, 1.0)) # <<<<<<<<<<<<<< @@ -18881,7 +18774,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_hap.self.msub((&__pyx_v_hap), __pyx_v_7_squish_init.Matrix2x2(1.0, 0.0, 0.0, 1.0))); - /* "src/_squish/energy.pyx":304 + /* "squish/_squish/energy.pyx":304 * hdiff = hap.copy.msub(&hap, ha) * # If edge is part of differentiated site. * if xe.index(&xe) == xi.index(&xi): # <<<<<<<<<<<<<< @@ -18890,7 +18783,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ } - /* "src/_squish/energy.pyx":308 + /* "squish/_squish/energy.pyx":308 * hap.self.msub(&hap, init.Matrix2x2(1.0, 0.0, 0.0, 1.0)) * * i2ps = ep.cache.i2p(&ep, NAN_VECTOR) # <<<<<<<<<<<<<< @@ -18899,7 +18792,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_i2ps = __pyx_v_ep.cache->i2p((&__pyx_v_ep), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":309 + /* "squish/_squish/energy.pyx":309 * * i2ps = ep.cache.i2p(&ep, NAN_VECTOR) * i2ps.self.matmul(&i2ps, hap) # <<<<<<<<<<<<<< @@ -18908,7 +18801,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_i2ps.self.matmul((&__pyx_v_i2ps), __pyx_v_hap)); - /* "src/_squish/energy.pyx":311 + /* "squish/_squish/energy.pyx":311 * i2ps.self.matmul(&i2ps, hap) * * q = e.cache.i2p(&e, NAN_VECTOR) # <<<<<<<<<<<<<< @@ -18917,7 +18810,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_q = __pyx_v_e.cache->i2p((&__pyx_v_e), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":312 + /* "squish/_squish/energy.pyx":312 * * q = e.cache.i2p(&e, NAN_VECTOR) * q.self.matmul(&q, ha) # <<<<<<<<<<<<<< @@ -18926,7 +18819,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_q.self.matmul((&__pyx_v_q), __pyx_v_ha)); - /* "src/_squish/energy.pyx":314 + /* "squish/_squish/energy.pyx":314 * q.self.matmul(&q, ha) * * i2ps.self.vsub(&i2ps, q) # <<<<<<<<<<<<<< @@ -18935,7 +18828,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_i2ps.self.vsub((&__pyx_v_i2ps), __pyx_v_q)); - /* "src/_squish/energy.pyx":316 + /* "squish/_squish/energy.pyx":316 * i2ps.self.vsub(&i2ps, q) * * Rda = e.cache.da(&e, NAN_VECTOR) # <<<<<<<<<<<<<< @@ -18944,7 +18837,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_Rda = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":317 + /* "squish/_squish/energy.pyx":317 * * Rda = e.cache.da(&e, NAN_VECTOR) * Rda = Rda.rot(&Rda) # <<<<<<<<<<<<<< @@ -18953,7 +18846,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_Rda = __pyx_v_Rda.rot((&__pyx_v_Rda)); - /* "src/_squish/energy.pyx":319 + /* "squish/_squish/energy.pyx":319 * Rda = Rda.rot(&Rda) * * fp = e.cache.la(&e, NAN_VECTOR) # <<<<<<<<<<<<<< @@ -18962,7 +18855,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_fp = __pyx_v_e.cache->la((&__pyx_v_e), __pyx_v_7_squish_NAN_VECTOR); - /* "src/_squish/energy.pyx":320 + /* "squish/_squish/energy.pyx":320 * * fp = e.cache.la(&e, NAN_VECTOR) * fp.self.matmul(&fp, R.copy.matmul(&R, ha)) # <<<<<<<<<<<<<< @@ -18971,7 +18864,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_fp.self.matmul((&__pyx_v_fp), __pyx_v_7_squish_R.copy.matmul((&__pyx_v_7_squish_R), __pyx_v_ha))); - /* "src/_squish/energy.pyx":321 + /* "squish/_squish/energy.pyx":321 * fp = e.cache.la(&e, NAN_VECTOR) * fp.self.matmul(&fp, R.copy.matmul(&R, ha)) * fp.self.vadd(&fp, Rda.copy.matmul(&Rda, hdiff)) # <<<<<<<<<<<<<< @@ -18980,7 +18873,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_fp.self.vadd((&__pyx_v_fp), __pyx_v_Rda.copy.matmul((&__pyx_v_Rda), __pyx_v_hdiff))); - /* "src/_squish/energy.pyx":322 + /* "squish/_squish/energy.pyx":322 * fp.self.matmul(&fp, R.copy.matmul(&R, ha)) * fp.self.vadd(&fp, Rda.copy.matmul(&Rda, hdiff)) * fp.self.smul(&fp, lntan/A) # <<<<<<<<<<<<<< @@ -18989,7 +18882,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_fp.self.smul((&__pyx_v_fp), (__pyx_v_lntan / __pyx_v_A))); - /* "src/_squish/energy.pyx":324 + /* "squish/_squish/energy.pyx":324 * fp.self.smul(&fp, lntan/A) * * gterms = init.Vector2D( # <<<<<<<<<<<<<< @@ -18998,7 +18891,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_gterms = __pyx_v_7_squish_init.Vector2D(((__pyx_v_cosBp * __pyx_v_lntan) + (__pyx_v_sinBp * __pyx_v_csc)), ((__pyx_v_cosB * __pyx_v_lntan) + (__pyx_v_sinB * __pyx_v_csc))); - /* "src/_squish/energy.pyx":328 + /* "squish/_squish/energy.pyx":328 * cosB*lntan + sinB*csc * ) * gterms.self.smul(>erms, -F/A**2) # <<<<<<<<<<<<<< @@ -19007,7 +18900,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_gterms.self.smul((&__pyx_v_gterms), ((-__pyx_v_F) / pow(__pyx_v_A, 2.0)))); - /* "src/_squish/energy.pyx":330 + /* "squish/_squish/energy.pyx":330 * gterms.self.smul(>erms, -F/A**2) * * gterms = gterms.rot(>erms) # <<<<<<<<<<<<<< @@ -19016,7 +18909,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ __pyx_v_gterms = __pyx_v_gterms.rot((&__pyx_v_gterms)); - /* "src/_squish/energy.pyx":331 + /* "squish/_squish/energy.pyx":331 * * gterms = gterms.rot(>erms) * gterms.self.matmul(>erms, hdiff) # <<<<<<<<<<<<<< @@ -19025,7 +18918,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_gterms.self.matmul((&__pyx_v_gterms), __pyx_v_hdiff)); - /* "src/_squish/energy.pyx":333 + /* "squish/_squish/energy.pyx":333 * gterms.self.matmul(>erms, hdiff) * * fp.self.vadd(&fp, gterms) # <<<<<<<<<<<<<< @@ -19034,7 +18927,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_fp.self.vadd((&__pyx_v_fp), __pyx_v_gterms)); - /* "src/_squish/energy.pyx":335 + /* "squish/_squish/energy.pyx":335 * fp.self.vadd(&fp, gterms) * * i2ps.self.vadd(&i2ps, fp) # <<<<<<<<<<<<<< @@ -19043,7 +18936,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_i2ps.self.vadd((&__pyx_v_i2ps), __pyx_v_fp)); - /* "src/_squish/energy.pyx":336 + /* "squish/_squish/energy.pyx":336 * * i2ps.self.vadd(&i2ps, fp) * i2ps.self.smul(&i2ps, -2*r0) # <<<<<<<<<<<<<< @@ -19052,7 +18945,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ */ (void)(__pyx_v_i2ps.self.smul((&__pyx_v_i2ps), (-2.0 * __pyx_v_r0))); - /* "src/_squish/energy.pyx":338 + /* "squish/_squish/energy.pyx":338 * i2ps.self.smul(&i2ps, -2*r0) * * return i2ps # <<<<<<<<<<<<<< @@ -19060,7 +18953,7 @@ static __pyx_t_7_squish_Vector2D __pyx_f_7_squish_4Calc_radialt_edge_grad(__pyx_ __pyx_r = __pyx_v_i2ps; goto __pyx_L0; - /* "src/_squish/energy.pyx":281 + /* "squish/_squish/energy.pyx":281 * * @staticmethod * cdef Vector2D radialt_edge_grad(HalfEdge e, Site xi, FLOAT_T r0) nogil: # <<<<<<<<<<<<<< @@ -19733,7 +19626,7 @@ static PyObject *__pyx_f_7_squish___pyx_unpickle_Calc__set_state(struct __pyx_ob return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":735 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":735 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -19750,7 +19643,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":736 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":736 * * cdef inline object PyArray_MultiIterNew1(a): * return PyArray_MultiIterNew(1, a) # <<<<<<<<<<<<<< @@ -19764,7 +19657,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":735 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":735 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -19783,7 +19676,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":738 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":738 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -19800,7 +19693,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":739 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":739 * * cdef inline object PyArray_MultiIterNew2(a, b): * return PyArray_MultiIterNew(2, a, b) # <<<<<<<<<<<<<< @@ -19814,7 +19707,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":738 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":738 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -19833,7 +19726,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":741 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":741 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -19850,7 +19743,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":742 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":742 * * cdef inline object PyArray_MultiIterNew3(a, b, c): * return PyArray_MultiIterNew(3, a, b, c) # <<<<<<<<<<<<<< @@ -19864,7 +19757,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":741 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":741 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -19883,7 +19776,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":744 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":744 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -19900,7 +19793,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":745 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":745 * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): * return PyArray_MultiIterNew(4, a, b, c, d) # <<<<<<<<<<<<<< @@ -19914,7 +19807,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":744 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":744 * return PyArray_MultiIterNew(3, a, b, c) * * cdef inline object PyArray_MultiIterNew4(a, b, c, d): # <<<<<<<<<<<<<< @@ -19933,7 +19826,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":747 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":747 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -19950,7 +19843,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":748 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":748 * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): * return PyArray_MultiIterNew(5, a, b, c, d, e) # <<<<<<<<<<<<<< @@ -19964,7 +19857,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":747 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":747 * return PyArray_MultiIterNew(4, a, b, c, d) * * cdef inline object PyArray_MultiIterNew5(a, b, c, d, e): # <<<<<<<<<<<<<< @@ -19983,7 +19876,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":750 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":750 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -19997,7 +19890,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ int __pyx_t_1; __Pyx_RefNannySetupContext("PyDataType_SHAPE", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":751 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":751 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -20007,7 +19900,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_t_1 = (PyDataType_HASSUBARRAY(__pyx_v_d) != 0); if (__pyx_t_1) { - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":752 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":752 * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): * return d.subarray.shape # <<<<<<<<<<<<<< @@ -20019,7 +19912,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape); goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":751 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":751 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -20028,7 +19921,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ */ } - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":754 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":754 * return d.subarray.shape * else: * return () # <<<<<<<<<<<<<< @@ -20042,7 +19935,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ goto __pyx_L0; } - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":750 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":750 * return PyArray_MultiIterNew(5, a, b, c, d, e) * * cdef inline tuple PyDataType_SHAPE(dtype d): # <<<<<<<<<<<<<< @@ -20057,7 +19950,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":929 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":929 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -20069,7 +19962,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("set_array_base", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":930 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":930 * * cdef inline void set_array_base(ndarray arr, object base): * Py_INCREF(base) # important to do this before stealing the reference below! # <<<<<<<<<<<<<< @@ -20078,7 +19971,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ Py_INCREF(__pyx_v_base); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":931 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":931 * cdef inline void set_array_base(ndarray arr, object base): * Py_INCREF(base) # important to do this before stealing the reference below! * PyArray_SetBaseObject(arr, base) # <<<<<<<<<<<<<< @@ -20087,7 +19980,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ (void)(PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base)); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":929 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":929 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -20099,7 +19992,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __Pyx_RefNannyFinishContext(); } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":933 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":933 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -20114,7 +20007,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py int __pyx_t_1; __Pyx_RefNannySetupContext("get_array_base", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":934 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":934 * * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) # <<<<<<<<<<<<<< @@ -20123,7 +20016,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ __pyx_v_base = PyArray_BASE(__pyx_v_arr); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":935 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":935 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -20133,7 +20026,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_t_1 = ((__pyx_v_base == NULL) != 0); if (__pyx_t_1) { - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":936 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":936 * base = PyArray_BASE(arr) * if base is NULL: * return None # <<<<<<<<<<<<<< @@ -20144,7 +20037,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":935 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":935 * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) * if base is NULL: # <<<<<<<<<<<<<< @@ -20153,7 +20046,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ } - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":937 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":937 * if base is NULL: * return None * return base # <<<<<<<<<<<<<< @@ -20165,7 +20058,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = ((PyObject *)__pyx_v_base); goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":933 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":933 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -20180,7 +20073,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":941 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":941 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -20204,7 +20097,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_array", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -20220,7 +20113,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":943 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":943 * cdef inline int import_array() except -1: * try: * __pyx_import_array() # <<<<<<<<<<<<<< @@ -20229,7 +20122,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { */ __pyx_t_4 = _import_array(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(5, 943, __pyx_L3_error) - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -20243,7 +20136,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":944 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":944 * try: * __pyx_import_array() * except Exception: # <<<<<<<<<<<<<< @@ -20258,7 +20151,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":945 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":945 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -20274,7 +20167,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -20289,7 +20182,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_L8_try_end:; } - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":941 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":941 * # Versions of the import_* functions which are more suitable for * # Cython code. * cdef inline int import_array() except -1: # <<<<<<<<<<<<<< @@ -20312,7 +20205,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":947 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":947 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -20336,7 +20229,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_umath", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -20352,7 +20245,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":949 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":949 * cdef inline int import_umath() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -20361,7 +20254,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(5, 949, __pyx_L3_error) - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -20375,7 +20268,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":950 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":950 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -20390,7 +20283,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":951 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":951 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -20406,7 +20299,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -20421,7 +20314,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_L8_try_end:; } - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":947 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":947 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -20444,7 +20337,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":953 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":953 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -20468,7 +20361,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_ufunc", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -20484,7 +20377,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":955 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":955 * cdef inline int import_ufunc() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -20493,7 +20386,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { */ __pyx_t_4 = _import_umath(); if (unlikely(__pyx_t_4 == ((int)-1))) __PYX_ERR(5, 955, __pyx_L3_error) - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -20507,7 +20400,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":956 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":956 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -20522,7 +20415,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":957 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":957 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -20538,7 +20431,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -20553,7 +20446,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_L8_try_end:; } - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":953 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":953 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -20576,7 +20469,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":967 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":967 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -20589,7 +20482,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("is_timedelta64_object", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":979 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":979 * bool * """ * return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<< @@ -20599,7 +20492,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyTimedeltaArrType_Type)); goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":967 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":967 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -20613,7 +20506,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":982 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":982 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -20626,7 +20519,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("is_datetime64_object", 0); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":994 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":994 * bool * """ * return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<< @@ -20636,7 +20529,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o __pyx_r = PyObject_TypeCheck(__pyx_v_obj, (&PyDatetimeArrType_Type)); goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":982 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":982 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -20650,7 +20543,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":997 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":997 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20661,7 +20554,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject *__pyx_v_obj) { npy_datetime __pyx_r; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1004 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":1004 * also needed. That can be found using `get_datetime64_unit`. * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -20671,7 +20564,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":997 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":997 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20684,7 +20577,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1007 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":1007 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20695,7 +20588,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject *__pyx_v_obj) { npy_timedelta __pyx_r; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1011 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":1011 * returns the int64 value underlying scalar numpy timedelta64 object * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -20705,7 +20598,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1007 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":1007 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20718,7 +20611,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject return __pyx_r; } -/* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1014 +/* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":1014 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -20729,7 +20622,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObject *__pyx_v_obj) { NPY_DATETIMEUNIT __pyx_r; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1018 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":1018 * returns the unit part of the dtype for a numpy datetime64 object. * """ * return (obj).obmeta.base # <<<<<<<<<<<<<< @@ -20737,7 +20630,7 @@ static CYTHON_INLINE NPY_DATETIMEUNIT __pyx_f_5numpy_get_datetime64_unit(PyObjec __pyx_r = ((NPY_DATETIMEUNIT)((PyDatetimeScalarObject *)__pyx_v_obj)->obmeta.base); goto __pyx_L0; - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1014 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":1014 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -36186,7 +36079,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0); - /* "src/_squish/voronoi_dcel.pyx":418 + /* "squish/_squish/voronoi_dcel.pyx":418 * """ * global SYMM * cdef np.ndarray[FLOAT_T, ndim=2] symm = np.asarray(SYMM).reshape(9,2) # <<<<<<<<<<<<<< @@ -36197,7 +36090,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple_); __Pyx_GIVEREF(__pyx_tuple_); - /* "src/_squish/voronoi_dcel.pyx":619 + /* "squish/_squish/voronoi_dcel.pyx":619 * cache = self.site_cache[:self.n, :] * * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) # <<<<<<<<<<<<<< @@ -36208,7 +36101,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_slice__2); __Pyx_GIVEREF(__pyx_slice__2); - /* "src/_squish/voronoi_dcel.pyx":631 + /* "squish/_squish/voronoi_dcel.pyx":631 * edges = np.asarray(self.edges) * * mask = np.nonzero(edges[:, 0] != -1)[0] # <<<<<<<<<<<<<< @@ -36295,7 +36188,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple__11); __Pyx_GIVEREF(__pyx_tuple__11); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":945 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":945 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -36306,7 +36199,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple__12); __Pyx_GIVEREF(__pyx_tuple__12); - /* "../../../../../../../tmp/pip-build-env-m9q1l3sb/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":951 + /* ".venv/lib/python3.8/site-packages/numpy/__init__.pxd":951 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -37117,7 +37010,7 @@ if (!__Pyx_RefNanny) { if (__Pyx_patch_abc() < 0) __PYX_ERR(7, 1, __pyx_L1_error) #endif - /* "src/_squish/core.pyx":1 + /* "squish/_squish/core.pyx":1 * import array, scipy.spatial, numpy as np # <<<<<<<<<<<<<< * from cython.parallel import parallel, prange * @@ -37135,7 +37028,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_np, __pyx_t_1) < 0) __PYX_ERR(0, 1, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/core.pyx":15 + /* "squish/_squish/core.pyx":15 * #### Constants #### * * INT = np.int64 # <<<<<<<<<<<<<< @@ -37150,7 +37043,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_INT, __pyx_t_2) < 0) __PYX_ERR(0, 15, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "src/_squish/core.pyx":16 + /* "squish/_squish/core.pyx":16 * * INT = np.int64 * FLOAT = np.float64 # <<<<<<<<<<<<<< @@ -37165,7 +37058,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem(__pyx_d, __pyx_n_s_FLOAT, __pyx_t_1) < 0) __PYX_ERR(0, 16, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "src/_squish/core.pyx":18 + /* "squish/_squish/core.pyx":18 * FLOAT = np.float64 * * cdef FLOAT_T TAU = 2*PI # <<<<<<<<<<<<<< @@ -37174,7 +37067,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_TAU = (2.0 * M_PI); - /* "src/_squish/core.pyx":22 + /* "squish/_squish/core.pyx":22 * # not exceed this number. However, we assign a growth rate of 8 edges, * # when dynamically allocating. * cdef INT_T EDGE_ARR_SIZE = 32 # <<<<<<<<<<<<<< @@ -37183,7 +37076,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_EDGE_ARR_SIZE = 32; - /* "src/_squish/core.pyx":26 + /* "squish/_squish/core.pyx":26 * cdef Init init * init.IArray, init.FArray, init.BitSet, init.Vector2D, init.Matrix2x2 = \ * init_iarray, init_farray, init_bitset, init_vector2d, init_matrix2x2 # <<<<<<<<<<<<<< @@ -37196,7 +37089,7 @@ if (!__Pyx_RefNanny) { __pyx_t_6 = __pyx_f_7_squish_init_vector2d; __pyx_t_7 = __pyx_f_7_squish_init_matrix2x2; - /* "src/_squish/core.pyx":25 + /* "squish/_squish/core.pyx":25 * * cdef Init init * init.IArray, init.FArray, init.BitSet, init.Vector2D, init.Matrix2x2 = \ # <<<<<<<<<<<<<< @@ -37209,7 +37102,7 @@ if (!__Pyx_RefNanny) { __pyx_v_7_squish_init.Vector2D = __pyx_t_6; __pyx_v_7_squish_init.Matrix2x2 = __pyx_t_7; - /* "src/_squish/core.pyx":34 + /* "squish/_squish/core.pyx":34 * * VSO.neg, VSO.vadd, VSO.vsub, VSO.vmul, VSO.vdiv, VSO.sadd, VSO.ssub, VSO.smul, VSO.sdiv = \ * v_neg_s, v_vadd_s, v_vsub_s, v_vmul_s, v_vdiv_s, v_sadd_s, v_ssub_s, v_smul_s, v_sdiv_s # <<<<<<<<<<<<<< @@ -37226,7 +37119,7 @@ if (!__Pyx_RefNanny) { __pyx_t_15 = __pyx_f_7_squish_v_smul_s; __pyx_t_16 = __pyx_f_7_squish_v_sdiv_s; - /* "src/_squish/core.pyx":33 + /* "squish/_squish/core.pyx":33 * cdef MatrixCopyOps MCO * * VSO.neg, VSO.vadd, VSO.vsub, VSO.vmul, VSO.vdiv, VSO.sadd, VSO.ssub, VSO.smul, VSO.sdiv = \ # <<<<<<<<<<<<<< @@ -37243,7 +37136,7 @@ if (!__Pyx_RefNanny) { __pyx_v_7_squish_VSO.smul = __pyx_t_15; __pyx_v_7_squish_VSO.sdiv = __pyx_t_16; - /* "src/_squish/core.pyx":35 + /* "squish/_squish/core.pyx":35 * VSO.neg, VSO.vadd, VSO.vsub, VSO.vmul, VSO.vdiv, VSO.sadd, VSO.ssub, VSO.smul, VSO.sdiv = \ * v_neg_s, v_vadd_s, v_vsub_s, v_vmul_s, v_vdiv_s, v_sadd_s, v_ssub_s, v_smul_s, v_sdiv_s * VSO.matmul = v_matmul_s # <<<<<<<<<<<<<< @@ -37252,7 +37145,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_VSO.matmul = __pyx_f_7_squish_v_matmul_s; - /* "src/_squish/core.pyx":38 + /* "squish/_squish/core.pyx":38 * * VCO.neg, VCO.vadd, VCO.vsub, VCO.vmul, VCO.vdiv, VCO.sadd, VCO.ssub, VCO.smul, VCO.sdiv = \ * v_neg_c, v_vadd_c, v_vsub_c, v_vmul_c, v_vdiv_c, v_sadd_c, v_ssub_c, v_smul_c, v_sdiv_c # <<<<<<<<<<<<<< @@ -37269,7 +37162,7 @@ if (!__Pyx_RefNanny) { __pyx_t_24 = __pyx_f_7_squish_v_smul_c; __pyx_t_25 = __pyx_f_7_squish_v_sdiv_c; - /* "src/_squish/core.pyx":37 + /* "squish/_squish/core.pyx":37 * VSO.matmul = v_matmul_s * * VCO.neg, VCO.vadd, VCO.vsub, VCO.vmul, VCO.vdiv, VCO.sadd, VCO.ssub, VCO.smul, VCO.sdiv = \ # <<<<<<<<<<<<<< @@ -37286,7 +37179,7 @@ if (!__Pyx_RefNanny) { __pyx_v_7_squish_VCO.smul = __pyx_t_24; __pyx_v_7_squish_VCO.sdiv = __pyx_t_25; - /* "src/_squish/core.pyx":39 + /* "squish/_squish/core.pyx":39 * VCO.neg, VCO.vadd, VCO.vsub, VCO.vmul, VCO.vdiv, VCO.sadd, VCO.ssub, VCO.smul, VCO.sdiv = \ * v_neg_c, v_vadd_c, v_vsub_c, v_vmul_c, v_vdiv_c, v_sadd_c, v_ssub_c, v_smul_c, v_sdiv_c * VCO.matmul = v_matmul_c # <<<<<<<<<<<<<< @@ -37295,7 +37188,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_VCO.matmul = __pyx_f_7_squish_v_matmul_c; - /* "src/_squish/core.pyx":42 + /* "squish/_squish/core.pyx":42 * * MSO.neg, MSO.madd, MSO.msub, MSO.mmul, MSO.mdiv, MSO.sadd, MSO.ssub, MSO.smul, MSO.sdiv = \ * m_neg_s, m_madd_s, m_msub_s, m_mmul_s, m_mdiv_s, m_sadd_s, m_ssub_s, m_smul_s, m_sdiv_s # <<<<<<<<<<<<<< @@ -37312,7 +37205,7 @@ if (!__Pyx_RefNanny) { __pyx_t_33 = __pyx_f_7_squish_m_smul_s; __pyx_t_34 = __pyx_f_7_squish_m_sdiv_s; - /* "src/_squish/core.pyx":41 + /* "squish/_squish/core.pyx":41 * VCO.matmul = v_matmul_c * * MSO.neg, MSO.madd, MSO.msub, MSO.mmul, MSO.mdiv, MSO.sadd, MSO.ssub, MSO.smul, MSO.sdiv = \ # <<<<<<<<<<<<<< @@ -37329,7 +37222,7 @@ if (!__Pyx_RefNanny) { __pyx_v_7_squish_MSO.smul = __pyx_t_33; __pyx_v_7_squish_MSO.sdiv = __pyx_t_34; - /* "src/_squish/core.pyx":43 + /* "squish/_squish/core.pyx":43 * MSO.neg, MSO.madd, MSO.msub, MSO.mmul, MSO.mdiv, MSO.sadd, MSO.ssub, MSO.smul, MSO.sdiv = \ * m_neg_s, m_madd_s, m_msub_s, m_mmul_s, m_mdiv_s, m_sadd_s, m_ssub_s, m_smul_s, m_sdiv_s * MSO.matmul = m_matmul_s # <<<<<<<<<<<<<< @@ -37338,7 +37231,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_MSO.matmul = __pyx_f_7_squish_m_matmul_s; - /* "src/_squish/core.pyx":46 + /* "squish/_squish/core.pyx":46 * * MCO.neg, MCO.madd, MCO.msub, MCO.mmul, MCO.mdiv, MCO.sadd, MCO.ssub, MCO.smul, MCO.sdiv = \ * m_neg_c, m_madd_c, m_msub_c, m_mmul_c, m_mdiv_c, m_sadd_c, m_ssub_c, m_smul_c, m_sdiv_c # <<<<<<<<<<<<<< @@ -37355,7 +37248,7 @@ if (!__Pyx_RefNanny) { __pyx_t_42 = __pyx_f_7_squish_m_smul_c; __pyx_t_43 = __pyx_f_7_squish_m_sdiv_c; - /* "src/_squish/core.pyx":45 + /* "squish/_squish/core.pyx":45 * MSO.matmul = m_matmul_s * * MCO.neg, MCO.madd, MCO.msub, MCO.mmul, MCO.mdiv, MCO.sadd, MCO.ssub, MCO.smul, MCO.sdiv = \ # <<<<<<<<<<<<<< @@ -37372,7 +37265,7 @@ if (!__Pyx_RefNanny) { __pyx_v_7_squish_MCO.smul = __pyx_t_42; __pyx_v_7_squish_MCO.sdiv = __pyx_t_43; - /* "src/_squish/core.pyx":47 + /* "squish/_squish/core.pyx":47 * MCO.neg, MCO.madd, MCO.msub, MCO.mmul, MCO.mdiv, MCO.sadd, MCO.ssub, MCO.smul, MCO.sdiv = \ * m_neg_c, m_madd_c, m_msub_c, m_mmul_c, m_mdiv_c, m_sadd_c, m_ssub_c, m_smul_c, m_sdiv_c * MCO.matmul = m_matmul_c # <<<<<<<<<<<<<< @@ -37381,7 +37274,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_MCO.matmul = __pyx_f_7_squish_m_matmul_c; - /* "src/_squish/core.pyx":49 + /* "squish/_squish/core.pyx":49 * MCO.matmul = m_matmul_c * * cdef Vector2D NAN_VECTOR = init.Vector2D(NAN, NAN) # <<<<<<<<<<<<<< @@ -37390,7 +37283,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_NAN_VECTOR = __pyx_v_7_squish_init.Vector2D(NAN, NAN); - /* "src/_squish/core.pyx":50 + /* "squish/_squish/core.pyx":50 * * cdef Vector2D NAN_VECTOR = init.Vector2D(NAN, NAN) * cdef Matrix2x2 NAN_MATRIX = init.Matrix2x2(NAN, NAN, NAN, NAN) # <<<<<<<<<<<<<< @@ -37399,7 +37292,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_NAN_MATRIX = __pyx_v_7_squish_init.Matrix2x2(NAN, NAN, NAN, NAN); - /* "src/_squish/core.pyx":52 + /* "squish/_squish/core.pyx":52 * cdef Matrix2x2 NAN_MATRIX = init.Matrix2x2(NAN, NAN, NAN, NAN) * * cdef FLOAT_T[18] SYMM = [0,0, 1,0, 1,1, 0,1, -1,1, -1,0, -1,-1, 0,-1, 1,-1] # <<<<<<<<<<<<<< @@ -37426,7 +37319,7 @@ if (!__Pyx_RefNanny) { __pyx_t_44[17] = -1.0; memcpy(&(__pyx_v_7_squish_SYMM[0]), __pyx_t_44, sizeof(__pyx_v_7_squish_SYMM[0]) * (18)); - /* "src/_squish/core.pyx":53 + /* "squish/_squish/core.pyx":53 * * cdef FLOAT_T[18] SYMM = [0,0, 1,0, 1,1, 0,1, -1,1, -1,0, -1,-1, 0,-1, 1,-1] * cdef Matrix2x2 R = init.Matrix2x2(0, -1, 1, 0) # <<<<<<<<<<<<<< @@ -37435,7 +37328,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_R = __pyx_v_7_squish_init.Matrix2x2(0.0, -1.0, 1.0, 0.0); - /* "src/_squish/voronoi_dcel.pyx":6 + /* "squish/_squish/voronoi_dcel.pyx":6 * * init.SiteCacheMap, init.EdgeCacheMap, init.VoronoiInfo, init.Site, init.HalfEdge = \ * init_sitecachemap, init_edgecachemap, init_voronoiinfo, init_site, init_halfedge # <<<<<<<<<<<<<< @@ -37448,7 +37341,7 @@ if (!__Pyx_RefNanny) { __pyx_t_48 = __pyx_f_7_squish_init_site; __pyx_t_49 = __pyx_f_7_squish_init_halfedge; - /* "src/_squish/voronoi_dcel.pyx":5 + /* "squish/_squish/voronoi_dcel.pyx":5 * #### Constants #### * * init.SiteCacheMap, init.EdgeCacheMap, init.VoronoiInfo, init.Site, init.HalfEdge = \ # <<<<<<<<<<<<<< @@ -37461,7 +37354,7 @@ if (!__Pyx_RefNanny) { __pyx_v_7_squish_init.Site = __pyx_t_48; __pyx_v_7_squish_init.HalfEdge = __pyx_t_49; - /* "src/_squish/voronoi_dcel.pyx":8 + /* "squish/_squish/voronoi_dcel.pyx":8 * init_sitecachemap, init_edgecachemap, init_voronoiinfo, init_site, init_halfedge * * cdef SiteCacheMap SITE_CACHE_MAP = init.SiteCacheMap(0, 1, 2, 3, 4) # <<<<<<<<<<<<<< @@ -37470,7 +37363,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_SITE_CACHE_MAP = __pyx_v_7_squish_init.SiteCacheMap(0, 1, 2, 3, 4); - /* "src/_squish/voronoi_dcel.pyx":10 + /* "squish/_squish/voronoi_dcel.pyx":10 * cdef SiteCacheMap SITE_CACHE_MAP = init.SiteCacheMap(0, 1, 2, 3, 4) * * cdef EdgeCacheMap AREA_EDGE_CACHE_MAP = init.EdgeCacheMap(0, 4, 6, 8, 10, -1, 12, 13, # <<<<<<<<<<<<<< @@ -37479,7 +37372,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_AREA_EDGE_CACHE_MAP = __pyx_v_7_squish_init.EdgeCacheMap(0, 4, 6, 8, 10, -1LL, 12, 13, -1LL, -1LL, -1LL, -1LL, -1LL, 14); - /* "src/_squish/voronoi_dcel.pyx":12 + /* "squish/_squish/voronoi_dcel.pyx":12 * cdef EdgeCacheMap AREA_EDGE_CACHE_MAP = init.EdgeCacheMap(0, 4, 6, 8, 10, -1, 12, 13, * -1, -1, -1, -1, -1, 14) * cdef EdgeCacheMap RADIALT_EDGE_CACHE_MAP = init.EdgeCacheMap(0, 4, 6, 8, -1, 10, 12, 13, # <<<<<<<<<<<<<< @@ -37488,7 +37381,7 @@ if (!__Pyx_RefNanny) { */ __pyx_v_7_squish_RADIALT_EDGE_CACHE_MAP = __pyx_v_7_squish_init.EdgeCacheMap(0, 4, 6, 8, -1LL, 10, 12, 13, 14, 15, 16, 17, 18, 19); - /* "src/_squish/energy.pyx":11 + /* "squish/_squish/energy.pyx":11 * """ * * attr_str = "area" # <<<<<<<<<<<<<< @@ -37498,7 +37391,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem((PyObject *)__pyx_ptype_7_squish_AreaEnergy->tp_dict, __pyx_n_s_attr_str, __pyx_n_u_area) < 0) __PYX_ERR(3, 11, __pyx_L1_error) PyType_Modified(__pyx_ptype_7_squish_AreaEnergy); - /* "src/_squish/energy.pyx":12 + /* "squish/_squish/energy.pyx":12 * * attr_str = "area" * title_str = "Area" # <<<<<<<<<<<<<< @@ -37508,7 +37401,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem((PyObject *)__pyx_ptype_7_squish_AreaEnergy->tp_dict, __pyx_n_s_title_str, __pyx_n_u_Area) < 0) __PYX_ERR(3, 12, __pyx_L1_error) PyType_Modified(__pyx_ptype_7_squish_AreaEnergy); - /* "src/_squish/energy.pyx":105 + /* "squish/_squish/energy.pyx":105 * """ * * attr_str = "radial-al" # <<<<<<<<<<<<<< @@ -37518,7 +37411,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem((PyObject *)__pyx_ptype_7_squish_RadialALEnergy->tp_dict, __pyx_n_s_attr_str, __pyx_kp_u_radial_al) < 0) __PYX_ERR(3, 105, __pyx_L1_error) PyType_Modified(__pyx_ptype_7_squish_RadialALEnergy); - /* "src/_squish/energy.pyx":106 + /* "squish/_squish/energy.pyx":106 * * attr_str = "radial-al" * title_str = "Radial[AL]" # <<<<<<<<<<<<<< @@ -37528,7 +37421,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem((PyObject *)__pyx_ptype_7_squish_RadialALEnergy->tp_dict, __pyx_n_s_title_str, __pyx_kp_u_Radial_AL) < 0) __PYX_ERR(3, 106, __pyx_L1_error) PyType_Modified(__pyx_ptype_7_squish_RadialALEnergy); - /* "src/_squish/energy.pyx":141 + /* "squish/_squish/energy.pyx":141 * """ * * attr_str = "radial-t" # <<<<<<<<<<<<<< @@ -37538,7 +37431,7 @@ if (!__Pyx_RefNanny) { if (PyDict_SetItem((PyObject *)__pyx_ptype_7_squish_RadialTEnergy->tp_dict, __pyx_n_s_attr_str, __pyx_kp_u_radial_t) < 0) __PYX_ERR(3, 141, __pyx_L1_error) PyType_Modified(__pyx_ptype_7_squish_RadialTEnergy); - /* "src/_squish/energy.pyx":142 + /* "squish/_squish/energy.pyx":142 * * attr_str = "radial-t" * title_str = "Radial[T]" # <<<<<<<<<<<<<< diff --git a/src/_squish/_squish.pxd b/squish/_squish/_squish.pxd similarity index 100% rename from src/_squish/_squish.pxd rename to squish/_squish/_squish.pxd diff --git a/src/_squish/_squish.pyx b/squish/_squish/_squish.pyx similarity index 100% rename from src/_squish/_squish.pyx rename to squish/_squish/_squish.pyx diff --git a/src/_squish/core.pyx b/squish/_squish/core.pyx similarity index 100% rename from src/_squish/core.pyx rename to squish/_squish/core.pyx diff --git a/src/_squish/energy.pyx b/squish/_squish/energy.pyx similarity index 94% rename from src/_squish/energy.pyx rename to squish/_squish/energy.pyx index e292044..411e37b 100644 --- a/src/_squish/energy.pyx +++ b/squish/_squish/energy.pyx @@ -40,7 +40,7 @@ cdef class AreaEnergy(VoronoiContainer): if i < self.n: energy += xi.cache.energy(&xi, NAN) - for j in prange(xi.edge_num(&xi)): + for j in range(xi.edge_num(&xi)): em, ep = e.prev(&e), e.next(&e) vdiff = em.origin(&em) vdiff.self.vsub(&vdiff, ep.origin(&ep)) @@ -71,7 +71,7 @@ cdef class AreaEnergy(VoronoiContainer): xi = init.Site(i, &info) e = xi.edge(&xi) edge_set = init.BitSet(num_edges) - for j in prange(xi.edge_num(&xi)): # Looping through site edges. + for j in range(xi.edge_num(&xi)): # Looping through site edges. f = e while True: # Circling this vertex. if not edge_set.add(&edge_set, f.arr_index): @@ -166,7 +166,7 @@ cdef class RadialTEnergy(VoronoiContainer): for i in prange(self.sites.shape[0], nogil=True): xi = init.Site(i, &info) e = xi.edge(&xi) - for j in prange(xi.edge_num(&xi)): + for j in range(xi.edge_num(&xi)): em = e.prev(&e) e.cache.H(&e, VoronoiContainer.calc_H(em, e)) t = Calc.phi(e) @@ -186,7 +186,7 @@ cdef class RadialTEnergy(VoronoiContainer): # For looping again to calculate integrals. em = xi.edge(&xi) - for j in prange(xi.edge_num(&xi)): + for j in range(xi.edge_num(&xi)): e = em.next(&em) B = em.cache.B(&em, NAN) t, tp = em.cache.phi(&em, NAN), e.cache.phi(&e, NAN) @@ -234,7 +234,7 @@ cdef class RadialTEnergy(VoronoiContainer): e = xi.edge(&xi) edge_set = init.BitSet(num_edges) - for j in prange(xi.edge_num(&xi)): # Looping through site edges. + for j in range(xi.edge_num(&xi)): # Looping through site edges. f = e while True: # Circling this vertex. fm = f.prev(&f) diff --git a/src/_squish/voronoi_dcel.pyx b/squish/_squish/voronoi_dcel.pyx similarity index 96% rename from src/_squish/voronoi_dcel.pyx rename to squish/_squish/voronoi_dcel.pyx index 6d935dd..5ec5fb7 100644 --- a/src/_squish/voronoi_dcel.pyx +++ b/squish/_squish/voronoi_dcel.pyx @@ -537,7 +537,7 @@ cdef class VoronoiContainer: for i in prange(self.sites.shape[0], nogil=True): xi = init.Site(i, &info) em = xi.edge(&xi) - for j in prange(xi.edge_num(&xi)): + for j in range(xi.edge_num(&xi)): ep = em.next(&em) p, q = em.origin(&em), ep.origin(&ep) la, da = q.copy.vsub(&q, p), p.copy.vsub(&p, xi.vec(&xi)) # vp - vm, vm - xi diff --git a/src/squish/common.py b/squish/common.py similarity index 97% rename from src/squish/common.py rename to squish/common.py index cef396f..cf5d9de 100644 --- a/src/squish/common.py +++ b/squish/common.py @@ -2,7 +2,7 @@ from __future__ import annotations from typing import List, Union, Optional, Iterator, Generator import pickle, numpy as np from pathlib import Path -from _squish import AreaEnergy, RadialALEnergy, RadialTEnergy +from ._squish import AreaEnergy, RadialALEnergy, RadialTEnergy OUTPUT_DIR = Path("squish_output") OUTPUT_DIR.mkdir(exist_ok=True) diff --git a/src/squish/diagram.py b/squish/diagram.py similarity index 100% rename from src/squish/diagram.py rename to squish/diagram.py diff --git a/src/squish/simulation.py b/squish/simulation.py similarity index 95% rename from src/squish/simulation.py rename to squish/simulation.py index 3938ecb..7098fa4 100644 --- a/src/squish/simulation.py +++ b/squish/simulation.py @@ -298,7 +298,7 @@ class Search(Simulation): for i in range(self.count): # Get to equilibrium. - sim = Flow(self.domain, self.energy, self.thres, self.step_size, self.accel) + sim = Flow(self.domain, self.energy, self.step_size, self.thres, self.accel) sim.add_frame(new_sites) sim.run(False, log, log_steps) @@ -382,7 +382,7 @@ class Shrink(Simulation): while width >= self.stop_width: # Get to equilibrium. new_domain = DomainParams(self.domain.n, width, self.domain.h, self.domain.r) - sim = Flow(new_domain, self.energy, self.thres, self.step_size, self.accel) + sim = Flow(new_domain, self.energy, self.step_size, self.thres, self.accel) sim.add_frame(new_sites) sim.run(False, log, log_steps) new_sites = sim[-1].site_arr diff --git a/src/squish/squish.py b/squish/squish.py similarity index 100% rename from src/squish/squish.py rename to squish/squish.py