diff --git a/.gitignore b/.gitignore index 04ebaf4..021abbc 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,10 @@ -.venv -__pycache__ -src/build -src/packsim.c +.venv/ +__pycache__/ +build/ +dist/ +*.egg-info +src/packsim.c *.so -figures -simulations -old_simulations -*.json \ No newline at end of file diff --git a/build.sh b/build.sh deleted file mode 100644 index f094996..0000000 --- a/build.sh +++ /dev/null @@ -1,4 +0,0 @@ -rm -f packsim_core* -cd src -python3 setup.py build_ext --inplace --quiet -mv *.so ../ \ No newline at end of file diff --git a/docs/Makefile b/docs/Makefile new file mode 100644 index 0000000..d0c3cbf --- /dev/null +++ b/docs/Makefile @@ -0,0 +1,20 @@ +# Minimal makefile for Sphinx documentation +# + +# You can set these variables from the command line, and also +# from the environment for the first two. +SPHINXOPTS ?= +SPHINXBUILD ?= sphinx-build +SOURCEDIR = source +BUILDDIR = build + +# Put it first so that "make" without argument is like "make help". +help: + @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) + +.PHONY: help Makefile + +# Catch-all target: route all unknown targets to Sphinx using the new +# "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). +%: Makefile + @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) diff --git a/docs/make.bat b/docs/make.bat new file mode 100644 index 0000000..6247f7e --- /dev/null +++ b/docs/make.bat @@ -0,0 +1,35 @@ +@ECHO OFF + +pushd %~dp0 + +REM Command file for Sphinx documentation + +if "%SPHINXBUILD%" == "" ( + set SPHINXBUILD=sphinx-build +) +set SOURCEDIR=source +set BUILDDIR=build + +if "%1" == "" goto help + +%SPHINXBUILD% >NUL 2>NUL +if errorlevel 9009 ( + echo. + echo.The 'sphinx-build' command was not found. Make sure you have Sphinx + echo.installed, then set the SPHINXBUILD environment variable to point + echo.to the full path of the 'sphinx-build' executable. Alternatively you + echo.may add the Sphinx directory to PATH. + echo. + echo.If you don't have Sphinx installed, grab it from + echo.http://sphinx-doc.org/ + exit /b 1 +) + +%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% +goto end + +:help +%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O% + +:end +popd diff --git a/docs/source/api.rst b/docs/source/api.rst new file mode 100644 index 0000000..ec94338 --- /dev/null +++ b/docs/source/api.rst @@ -0,0 +1,7 @@ +API +=== + +.. autosummary:: + :toctree: generated + + lumache diff --git a/docs/source/conf.py b/docs/source/conf.py new file mode 100644 index 0000000..6e9e8c0 --- /dev/null +++ b/docs/source/conf.py @@ -0,0 +1,35 @@ +# Configuration file for the Sphinx documentation builder. + +# -- Project information + +project = 'Lumache' +copyright = '2021, Graziella' +author = 'Graziella' + +release = '0.1' +version = '0.1.0' + +# -- General configuration + +extensions = [ + 'sphinx.ext.duration', + 'sphinx.ext.doctest', + 'sphinx.ext.autodoc', + 'sphinx.ext.autosummary', + 'sphinx.ext.intersphinx', +] + +intersphinx_mapping = { + 'python': ('https://docs.python.org/3/', None), + 'sphinx': ('https://www.sphinx-doc.org/en/master/', None), +} +intersphinx_disabled_domains = ['std'] + +templates_path = ['_templates'] + +# -- Options for HTML output + +html_theme = 'sphinx_rtd_theme' + +# -- Options for EPUB output +epub_show_urls = 'footnote' diff --git a/docs/source/index.rst b/docs/source/index.rst new file mode 100644 index 0000000..03d09a5 --- /dev/null +++ b/docs/source/index.rst @@ -0,0 +1,22 @@ +Welcome to Lumache's documentation! +=================================== + +**Lumache** (/lu'make/) is a Python library for cooks and food lovers +that creates recipes mixing random ingredients. +It pulls data from the `Open Food Facts database `_ +and offers a *simple* and *intuitive* API. + +Check out the :doc:`usage` section for further information, including +how to :ref:`installation` the project. + +.. note:: + + This project is under active development. + +Contents +-------- + +.. toctree:: + + usage + api diff --git a/docs/source/usage.rst b/docs/source/usage.rst new file mode 100644 index 0000000..924afcf --- /dev/null +++ b/docs/source/usage.rst @@ -0,0 +1,34 @@ +Usage +===== + +.. _installation: + +Installation +------------ + +To use Lumache, first install it using pip: + +.. code-block:: console + + (.venv) $ pip install lumache + +Creating recipes +---------------- + +To retrieve a list of random ingredients, +you can use the ``lumache.get_random_ingredients()`` function: + +.. autofunction:: lumache.get_random_ingredients + +The ``kind`` parameter should be either ``"meat"``, ``"fish"``, +or ``"veggies"``. Otherwise, :py:func:`lumache.get_random_ingredients` +will raise an exception. + +.. autoexception:: lumache.InvalidKindError + +For example: + +>>> import lumache +>>> lumache.get_random_ingredients() +['shells', 'gorgonzola', 'parsley'] + diff --git a/packsim/__init__.py b/packsim/__init__.py new file mode 100644 index 0000000..9ca1ecd --- /dev/null +++ b/packsim/__init__.py @@ -0,0 +1 @@ +__all__ = ["simulation"] \ No newline at end of file diff --git a/check_width_exists.py b/packsim/scripts/check_width_exists.py similarity index 94% rename from check_width_exists.py rename to packsim/scripts/check_width_exists.py index 435b321..c108839 100644 --- a/check_width_exists.py +++ b/packsim/scripts/check_width_exists.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python3 - from pathlib import Path import sys, numpy as np diff --git a/shrink_energy_comparison.py b/packsim/scripts/shrink_energy_comparison.py similarity index 100% rename from shrink_energy_comparison.py rename to packsim/scripts/shrink_energy_comparison.py diff --git a/packsim.py b/packsim/scripts/simulate.py similarity index 93% rename from packsim.py rename to packsim/scripts/simulate.py index ad2637c..1355818 100644 --- a/packsim.py +++ b/packsim/scripts/simulate.py @@ -5,7 +5,7 @@ from shutil import which from pathlib import Path from simulation import Diagram, Flow, Search, Shrink -from packsim_core import RadialTEnergy +from _packsim import RadialTEnergy dia_presets = { "animate": [["voronoi"]], @@ -91,7 +91,11 @@ def config_sim(args): points = None if "points" in dmn_params: - points = np.asarray(dmn_params["points"]) + if type(dmn_params["points"]) is str: + with open(Path(dmn_params["points"]), 'rb') as f: + points = np.load(f) + else: + points = np.asarray(dmn_params["points"]) check_params(sim_params, ["mode", "step_size", "threshold", "save_sim"], { "mode": ["flow", "search", "shrink"], "step_size": "positive", "threshold": "positive" diff --git a/simulation.py b/packsim/simulation.py similarity index 89% rename from simulation.py rename to packsim/simulation.py index c733838..985be47 100644 --- a/simulation.py +++ b/packsim/simulation.py @@ -122,8 +122,8 @@ class Diagram(): ax.title.set_text('Energy vs. Time') max_value = round(self.sim[0].energy) min_value = round(self.sim[-1].energy) - diff = max_value-min_value - ax.set_yticks(np.arange(int(min_value-diff/5), int(max_value+diff/5), diff/25)) + #diff = max_value-min_value + #ax.set_yticks(np.arange(int(min_value-diff/5), int(max_value+diff/5), diff/25)) ax.set_xlabel("Iterations") ax.set_ylabel("Energy") ax.grid() @@ -494,7 +494,7 @@ class Simulation: if filename is None: path = gen_filepath(self, "sim", "simulations") else: - path = f'new_simulations/{filename}.sim' + path = f'simulations/{filename}.sim' all_info = [] for frame in self.frames: @@ -521,8 +521,11 @@ class Simulation: frames = [] with open(filename, 'rb') as data: all_info, sim_class = pickle.load(data) - sim_class = {"flow": Flow, "search": Search, "shrink": Shrink}[sim_class] - sim = sim_class(*all_info[0]["params"], all_info[0]["energy"], 0,0,0,0) + if type(sim_class) == str: + sim_class = {"flow": Flow, "search": Search, "shrink": Shrink}[sim_class] + + + sim = sim_class(*all_info[0]["params"], "radial-t", 0,0) for frame_info in all_info: frames.append(sim.energy(*frame_info["params"], frame_info["arr"])) #frames[-1].stats = frame_info["stats"] @@ -575,35 +578,37 @@ class Flow(Simulation): print(f'Find - N = {self.n}, R = {self.r}, {self.w} X {self.h}', flush=True) i, grad_norm = 0, float('inf') - trial = 2 - while grad_norm > self.thres: # Get to threshold. - # Iterate and generate next frame using RK-3 + #trial = 2 + j = 1 + while i*self.step_size <= 500: + #while grad_norm > self.thres: # Get to threshold. + # Iterate and generate next frame using RK-2 start = timer() - change, grad = self.frames[i].iterate(self.step_size) + change, grad = self.frames[-1].iterate(self.step_size) new_frame = self.energy(self.n, self.w, self.h, self.r, - self.frames[i].add_sites(change)) - grad_norm = np.sum(np.absolute(grad))/self.n + self.frames[-1].add_sites(change)) + grad_norm = np.linalg.norm(grad) end = timer() - if new_frame.energy < self.frames[i].energy: # If energy decreases. - if trial < 20: # Try increasing step size for 10 times. - factor = 1 + .1**trial + # if new_frame.energy < self.frames[i].energy: # If energy decreases. + # if trial < 20: # Try increasing step size for 10 times. + # factor = 1 + .1**trial - test_frame = self.energy(self.n, self.w, self.h, self.r, - self.frames[i].add_sites(change*factor)) - # If increased step has less energy than original step. - if test_frame.energy < new_frame.energy: - self.step_size *= factor - trial = max(2, trial-1) - new_frame = test_frame - else: # Otherwise, increases trials, and use original. - trial += 1 - else: # Step size too large, decrease and reset trial counter. - trial = 2 - shrink_factor = 1.5 - new_frame = self.energy(self.n, self.w, self.h, self.r, - self.frames[i].add_sites(change/shrink_factor)) - self.step_size /= shrink_factor + # test_frame = self.energy(self.n, self.w, self.h, self.r, + # self.frames[i].add_sites(change*factor)) + # # If increased step has less energy than original step. + # if test_frame.energy < new_frame.energy: + # self.step_size *= factor + # trial = max(2, trial-1) + # new_frame = test_frame + # else: # Otherwise, increases trials, and use original. + # trial += 1 + # else: # Step size too large, decrease and reset trial counter. + # trial = 2 + # shrink_factor = 1.5 + # new_frame = self.energy(self.n, self.w, self.h, self.r, + # self.frames[i].add_sites(change/shrink_factor)) + # self.step_size /= shrink_factor #self.step_size *= abs(.01/np.linalg.norm(error))**(1/3) #self.step_size = max(10e-4, self.step_size) @@ -611,10 +616,17 @@ class Flow(Simulation): i += 1 if(log and i % log_steps == 0): - print(f'Iteration: {i:05} | Energy: {self.frames[i].energy: .5f}' + \ + print(f'Iteration: {i:05} | Energy: {self.frames[-1].energy: .5f}' + \ f' | Gradient: {grad_norm:.8f} | Step: {self.step_size: .5f} | ' + \ f'Time: {end-start: .3f}', flush=True) + if i % 5000 == 0: + new_frames = [self.frames[-1]] + self.frames = self.frames[:-1] + self.save(f"N200-{self.step_size}-part{j}") + j += 1 + self.frames = new_frames + class Search(Simulation): """ @@ -677,8 +689,6 @@ class Search(Simulation): if zero_eigs != 2: print("WARNING, 0 EIGS NOT 2", zero_eigs) - if i == self.iter-1: - break if len(ns) <= 2: new_sites = dim * np.random.random_sample((self.n, 2)) @@ -687,7 +697,10 @@ class Search(Simulation): new_sites = self.frames[i].add_sites(self.kernel_step*vec.reshape((self.n, 2))) new_sites += (center - new_sites[fixed]) % dim # Offset - self.frames.append(None) + + if i < self.iter-1: + self.frames.append(None) + class Shrink(Simulation): diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..7187d0b --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["setuptools >= 42", "wheel", "Cython", "numpy"] +build-backend = "setuptools.build_meta" \ No newline at end of file diff --git a/setup.cfg b/setup.cfg new file mode 100644 index 0000000..7424bfc --- /dev/null +++ b/setup.cfg @@ -0,0 +1,36 @@ +[metadata] +name = packsim-ksjdragon +version = 0.1 +author = Kenneth Jao +author_email = ksjdragon@gmail.com +description = PackSim is a Python package that handles the simulations for Voronoi cells undergoing a gradient flow. +long_description = file: README.md +long_description_content_type = text/markdown +url = https://github.com/ksjdragon/packsim +project_urls = + Bug Tracker = https://github.com/ksjdragon/packsim/issues +classifiers = + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 + License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+) + Operating System :: OS Independent + +[options] +zip_safe = False +package_dir = + = packsim +packages = find: +python_requires = >= 3.8 +install_requires = + numpy == 1.21.2 + scipy == 1.7.1 + matplotlib == 3.4.3 + +[options.packages.find] +where = packsim + +[options.entry_points] +console_scripts = + simulate = packsim.scripts.simulate:main + shrink_energy_comparison = packsim.scripts.shrink_energy_comparison:main \ No newline at end of file diff --git a/src/setup.py b/setup.py similarity index 76% rename from src/setup.py rename to setup.py index 68eb23f..b8c87be 100644 --- a/src/setup.py +++ b/setup.py @@ -2,19 +2,17 @@ from setuptools import Extension, setup from Cython.Build import cythonize import numpy -MODULE_NAME = "packsim_core" - ext_modules = [ Extension( - MODULE_NAME, - [f'{MODULE_NAME}.pyx'], + "_packsim", + ["src/_packsim.pyx"], extra_compile_args=['-fopenmp'], extra_link_args=['-fopenmp'] ) ] setup( - name=MODULE_NAME, + name="packsim", ext_modules = cythonize(ext_modules, compiler_directives={ 'language_level': 3, 'boundscheck' : False, 'wraparound': False, 'cdivision' : True }), diff --git a/src/packsim_core.c b/src/_packsim.c similarity index 84% rename from src/packsim_core.c rename to src/_packsim.c index b0c6bc9..7c94566 100644 --- a/src/packsim_core.c +++ b/src/_packsim.c @@ -10,12 +10,12 @@ "extra_link_args": [ "-fopenmp" ], - "name": "packsim_core", + "name": "_packsim", "sources": [ - "packsim_core.pyx" + "src/_packsim.pyx" ] }, - "module_name": "packsim_core" + "module_name": "_packsim" } END: Cython Metadata */ @@ -631,8 +631,8 @@ static CYTHON_INLINE float __PYX_NAN() { #endif #endif -#define __PYX_HAVE__packsim_core -#define __PYX_HAVE_API__packsim_core +#define __PYX_HAVE___packsim +#define __PYX_HAVE_API___packsim /* Early includes */ #include #include @@ -878,14 +878,14 @@ static const char *__pyx_filename; static const char *__pyx_f[] = { - "core.pyx", - "voronoi_dcel.pyx", + "src/core.pyx", + "src/voronoi_dcel.pyx", "stringsource", - "energy.pyx", - "packsim_core.pxd", + "src/energy.pyx", + "src/_packsim.pxd", "__init__.pxd", "array.pxd", - "packsim_core.pyx", + "src/_packsim.pyx", "type.pxd", "bool.pxd", "complex.pxd", @@ -999,7 +999,7 @@ typedef volatile __pyx_atomic_int_type __pyx_atomic_int; #endif -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":690 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":691 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":692 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":693 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":697 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":698 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":699 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":700 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":704 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":705 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":714 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":715 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":716 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":718 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":719 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":720 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":722 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":723 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":725 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":726 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":727 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":727 * ctypedef npy_double float_t * ctypedef npy_double double_t * ctypedef npy_longdouble longdouble_t # <<<<<<<<<<<<<< @@ -1188,23 +1188,23 @@ typedef npy_double __pyx_t_5numpy_double_t; */ typedef npy_longdouble __pyx_t_5numpy_longdouble_t; -/* "packsim_core.pxd":4 +/* "_packsim.pxd":4 * * # Cython Types. * ctypedef np.int64_t INT_T # <<<<<<<<<<<<<< * ctypedef np.float64_t FLOAT_T * */ -typedef __pyx_t_5numpy_int64_t __pyx_t_12packsim_core_INT_T; +typedef __pyx_t_5numpy_int64_t __pyx_t_8_packsim_INT_T; -/* "packsim_core.pxd":5 +/* "_packsim.pxd":5 * # Cython Types. * ctypedef np.int64_t INT_T * ctypedef np.float64_t FLOAT_T # <<<<<<<<<<<<<< * * # Stores initialization functions. */ -typedef __pyx_t_5numpy_float64_t __pyx_t_12packsim_core_FLOAT_T; +typedef __pyx_t_5numpy_float64_t __pyx_t_8_packsim_FLOAT_T; /* Declarations.proto */ #if CYTHON_CCOMPLEX #ifdef __cplusplus @@ -1235,17 +1235,17 @@ static CYTHON_INLINE __pyx_t_double_complex __pyx_t_double_complex_from_parts(do struct arrayobject; typedef struct arrayobject arrayobject; #endif -struct __pyx_obj_12packsim_core_VoronoiContainer; -struct __pyx_obj_12packsim_core_AreaEnergy; -struct __pyx_obj_12packsim_core_RadialALEnergy; -struct __pyx_obj_12packsim_core_RadialTEnergy; -struct __pyx_obj_12packsim_core_Calc; +struct __pyx_obj_8_packsim_VoronoiContainer; +struct __pyx_obj_8_packsim_AreaEnergy; +struct __pyx_obj_8_packsim_RadialALEnergy; +struct __pyx_obj_8_packsim_RadialTEnergy; +struct __pyx_obj_8_packsim_Calc; struct __pyx_array_obj; struct __pyx_MemviewEnum_obj; struct __pyx_memoryview_obj; struct __pyx_memoryviewslice_obj; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":729 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":730 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":731 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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; -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":733 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":733 * ctypedef npy_clongdouble clongdouble_t * * ctypedef npy_cdouble complex_t # <<<<<<<<<<<<<< @@ -1280,426 +1280,426 @@ typedef npy_clongdouble __pyx_t_5numpy_clongdouble_t; * cdef inline object PyArray_MultiIterNew1(a): */ typedef npy_cdouble __pyx_t_5numpy_complex_t; -struct __pyx_t_12packsim_core_Init; -struct __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc; -typedef struct __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc; -struct __pyx_t_12packsim_core_IArray; -struct __pyx_t_12packsim_core_FArray; -typedef struct __pyx_t_12packsim_core_FArray __pyx_t_12packsim_core_FArray; -struct __pyx_t_12packsim_core_BitSet; -typedef struct __pyx_t_12packsim_core_BitSet __pyx_t_12packsim_core_BitSet; -struct __pyx_t_12packsim_core_VectorSelfOps; -typedef struct __pyx_t_12packsim_core_VectorSelfOps __pyx_t_12packsim_core_VectorSelfOps; -struct __pyx_t_12packsim_core_VectorCopyOps; -typedef struct __pyx_t_12packsim_core_VectorCopyOps __pyx_t_12packsim_core_VectorCopyOps; -struct __pyx_t_12packsim_core_MatrixSelfOps; -typedef struct __pyx_t_12packsim_core_MatrixSelfOps __pyx_t_12packsim_core_MatrixSelfOps; -struct __pyx_t_12packsim_core_MatrixCopyOps; -typedef struct __pyx_t_12packsim_core_MatrixCopyOps __pyx_t_12packsim_core_MatrixCopyOps; -struct __pyx_t_12packsim_core_Vector2D; -typedef struct __pyx_t_12packsim_core_Vector2D __pyx_t_12packsim_core_Vector2D; -struct __pyx_t_12packsim_core_Matrix2x2; -typedef struct __pyx_t_12packsim_core_Matrix2x2 __pyx_t_12packsim_core_Matrix2x2; -struct __pyx_t_12packsim_core_SiteCacheMap; -typedef struct __pyx_t_12packsim_core_SiteCacheMap __pyx_t_12packsim_core_SiteCacheMap; -struct __pyx_t_12packsim_core_EdgeCacheMap; -typedef struct __pyx_t_12packsim_core_EdgeCacheMap __pyx_t_12packsim_core_EdgeCacheMap; -struct __pyx_t_12packsim_core_VoronoiInfo; -typedef struct __pyx_t_12packsim_core_VoronoiInfo __pyx_t_12packsim_core_VoronoiInfo; -struct __pyx_t_12packsim_core_Site; -typedef struct __pyx_t_12packsim_core_Site __pyx_t_12packsim_core_Site; -struct __pyx_t_12packsim_core_HalfEdge; -typedef struct __pyx_t_12packsim_core_HalfEdge __pyx_t_12packsim_core_HalfEdge; +struct __pyx_t_8_packsim_Init; +struct __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc; +typedef struct __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc; +struct __pyx_t_8_packsim_IArray; +struct __pyx_t_8_packsim_FArray; +typedef struct __pyx_t_8_packsim_FArray __pyx_t_8_packsim_FArray; +struct __pyx_t_8_packsim_BitSet; +typedef struct __pyx_t_8_packsim_BitSet __pyx_t_8_packsim_BitSet; +struct __pyx_t_8_packsim_VectorSelfOps; +typedef struct __pyx_t_8_packsim_VectorSelfOps __pyx_t_8_packsim_VectorSelfOps; +struct __pyx_t_8_packsim_VectorCopyOps; +typedef struct __pyx_t_8_packsim_VectorCopyOps __pyx_t_8_packsim_VectorCopyOps; +struct __pyx_t_8_packsim_MatrixSelfOps; +typedef struct __pyx_t_8_packsim_MatrixSelfOps __pyx_t_8_packsim_MatrixSelfOps; +struct __pyx_t_8_packsim_MatrixCopyOps; +typedef struct __pyx_t_8_packsim_MatrixCopyOps __pyx_t_8_packsim_MatrixCopyOps; +struct __pyx_t_8_packsim_Vector2D; +typedef struct __pyx_t_8_packsim_Vector2D __pyx_t_8_packsim_Vector2D; +struct __pyx_t_8_packsim_Matrix2x2; +typedef struct __pyx_t_8_packsim_Matrix2x2 __pyx_t_8_packsim_Matrix2x2; +struct __pyx_t_8_packsim_SiteCacheMap; +typedef struct __pyx_t_8_packsim_SiteCacheMap __pyx_t_8_packsim_SiteCacheMap; +struct __pyx_t_8_packsim_EdgeCacheMap; +typedef struct __pyx_t_8_packsim_EdgeCacheMap __pyx_t_8_packsim_EdgeCacheMap; +struct __pyx_t_8_packsim_VoronoiInfo; +typedef struct __pyx_t_8_packsim_VoronoiInfo __pyx_t_8_packsim_VoronoiInfo; +struct __pyx_t_8_packsim_Site; +typedef struct __pyx_t_8_packsim_Site __pyx_t_8_packsim_Site; +struct __pyx_t_8_packsim_HalfEdge; +typedef struct __pyx_t_8_packsim_HalfEdge __pyx_t_8_packsim_HalfEdge; -/* "packsim_core.pxd":8 +/* "_packsim.pxd":8 * * # Stores initialization functions. * cdef struct Init: # <<<<<<<<<<<<<< * IArray (*IArray)(INT_T*, (INT_T, INT_T)) nogil * FArray (*FArray)(FLOAT_T*, (INT_T, INT_T)) nogil */ -struct __pyx_t_12packsim_core_Init { - struct __pyx_t_12packsim_core_IArray (*IArray)(__pyx_t_12packsim_core_INT_T *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); - __pyx_t_12packsim_core_FArray (*FArray)(__pyx_t_12packsim_core_FLOAT_T *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); - __pyx_t_12packsim_core_BitSet (*BitSet)(__pyx_t_12packsim_core_INT_T); - __pyx_t_12packsim_core_Vector2D (*Vector2D)(__pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 (*Matrix2x2)(__pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_SiteCacheMap (*SiteCacheMap)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T); - __pyx_t_12packsim_core_EdgeCacheMap (*EdgeCacheMap)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T); - __pyx_t_12packsim_core_VoronoiInfo (*VoronoiInfo)(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __pyx_t_12packsim_core_EdgeCacheMap *); - __pyx_t_12packsim_core_Site (*Site)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_VoronoiInfo *); - __pyx_t_12packsim_core_HalfEdge (*HalfEdge)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_VoronoiInfo *); +struct __pyx_t_8_packsim_Init { + struct __pyx_t_8_packsim_IArray (*IArray)(__pyx_t_8_packsim_INT_T *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); + __pyx_t_8_packsim_FArray (*FArray)(__pyx_t_8_packsim_FLOAT_T *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); + __pyx_t_8_packsim_BitSet (*BitSet)(__pyx_t_8_packsim_INT_T); + __pyx_t_8_packsim_Vector2D (*Vector2D)(__pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 (*Matrix2x2)(__pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_SiteCacheMap (*SiteCacheMap)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T); + __pyx_t_8_packsim_EdgeCacheMap (*EdgeCacheMap)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T); + __pyx_t_8_packsim_VoronoiInfo (*VoronoiInfo)(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __pyx_t_8_packsim_EdgeCacheMap *); + __pyx_t_8_packsim_Site (*Site)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_VoronoiInfo *); + __pyx_t_8_packsim_HalfEdge (*HalfEdge)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_VoronoiInfo *); }; -/* "packsim_core.pxd":9 +/* "_packsim.pxd":9 * # Stores initialization functions. * cdef struct Init: * IArray (*IArray)(INT_T*, (INT_T, INT_T)) nogil # <<<<<<<<<<<<<< * FArray (*FArray)(FLOAT_T*, (INT_T, INT_T)) nogil * #IList (*IList)() nogil */ -struct __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc { - __pyx_t_12packsim_core_INT_T f0; - __pyx_t_12packsim_core_INT_T f1; +struct __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc { + __pyx_t_8_packsim_INT_T f0; + __pyx_t_8_packsim_INT_T f1; }; -/* "packsim_core.pxd":25 +/* "_packsim.pxd":25 * * # Integer Array psuedo-class for continguous arrays. * cdef struct IArray: # <<<<<<<<<<<<<< * INT_T* arr * (INT_T, INT_T) shape */ -struct __pyx_t_12packsim_core_IArray { - __pyx_t_12packsim_core_INT_T *arr; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc shape; - __pyx_t_12packsim_core_INT_T (*get)(struct __pyx_t_12packsim_core_IArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); - void (*set)(struct __pyx_t_12packsim_core_IArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc, __pyx_t_12packsim_core_INT_T); +struct __pyx_t_8_packsim_IArray { + __pyx_t_8_packsim_INT_T *arr; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc shape; + __pyx_t_8_packsim_INT_T (*get)(struct __pyx_t_8_packsim_IArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); + void (*set)(struct __pyx_t_8_packsim_IArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc, __pyx_t_8_packsim_INT_T); }; -/* "packsim_core.pxd":33 +/* "_packsim.pxd":33 * * # Float Array psuedo-class for continguous arrays. * ctypedef struct FArray: # <<<<<<<<<<<<<< * FLOAT_T* arr * (INT_T, INT_T) shape */ -struct __pyx_t_12packsim_core_FArray { - __pyx_t_12packsim_core_FLOAT_T *arr; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc shape; - __pyx_t_12packsim_core_FLOAT_T (*get)(__pyx_t_12packsim_core_FArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); - void (*set)(__pyx_t_12packsim_core_FArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc, __pyx_t_12packsim_core_FLOAT_T); +struct __pyx_t_8_packsim_FArray { + __pyx_t_8_packsim_FLOAT_T *arr; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc shape; + __pyx_t_8_packsim_FLOAT_T (*get)(__pyx_t_8_packsim_FArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); + void (*set)(__pyx_t_8_packsim_FArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc, __pyx_t_8_packsim_FLOAT_T); }; -/* "packsim_core.pxd":49 +/* "_packsim.pxd":49 * * # Uses an array of bits to determine if value in set. * ctypedef struct BitSet: # <<<<<<<<<<<<<< * INT_T* bits * */ -struct __pyx_t_12packsim_core_BitSet { - __pyx_t_12packsim_core_INT_T *bits; - int (*add)(__pyx_t_12packsim_core_BitSet *, __pyx_t_12packsim_core_INT_T); - void (*free)(__pyx_t_12packsim_core_BitSet *); +struct __pyx_t_8_packsim_BitSet { + __pyx_t_8_packsim_INT_T *bits; + int (*add)(__pyx_t_8_packsim_BitSet *, __pyx_t_8_packsim_INT_T); + void (*free)(__pyx_t_8_packsim_BitSet *); }; -/* "packsim_core.pxd":56 +/* "_packsim.pxd":56 * * # Psuedo-operator definitions. * ctypedef Vector2D* (*VectorSelfVecOp)(Vector2D*, Vector2D) nogil # <<<<<<<<<<<<<< * ctypedef Vector2D (*VectorCopyVecOp)(Vector2D*, Vector2D) nogil * ctypedef Vector2D* (*VectorSelfSclOp)(Vector2D*, FLOAT_T) nogil */ -typedef __pyx_t_12packsim_core_Vector2D *(*__pyx_t_12packsim_core_VectorSelfVecOp)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); +typedef __pyx_t_8_packsim_Vector2D *(*__pyx_t_8_packsim_VectorSelfVecOp)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); -/* "packsim_core.pxd":57 +/* "_packsim.pxd":57 * # Psuedo-operator definitions. * ctypedef Vector2D* (*VectorSelfVecOp)(Vector2D*, Vector2D) nogil * ctypedef Vector2D (*VectorCopyVecOp)(Vector2D*, Vector2D) nogil # <<<<<<<<<<<<<< * ctypedef Vector2D* (*VectorSelfSclOp)(Vector2D*, FLOAT_T) nogil * ctypedef Vector2D (*VectorCopySclOp)(Vector2D*, FLOAT_T) nogil */ -typedef __pyx_t_12packsim_core_Vector2D (*__pyx_t_12packsim_core_VectorCopyVecOp)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); +typedef __pyx_t_8_packsim_Vector2D (*__pyx_t_8_packsim_VectorCopyVecOp)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); -/* "packsim_core.pxd":58 +/* "_packsim.pxd":58 * ctypedef Vector2D* (*VectorSelfVecOp)(Vector2D*, Vector2D) nogil * ctypedef Vector2D (*VectorCopyVecOp)(Vector2D*, Vector2D) nogil * ctypedef Vector2D* (*VectorSelfSclOp)(Vector2D*, FLOAT_T) nogil # <<<<<<<<<<<<<< * ctypedef Vector2D (*VectorCopySclOp)(Vector2D*, FLOAT_T) nogil * */ -typedef __pyx_t_12packsim_core_Vector2D *(*__pyx_t_12packsim_core_VectorSelfSclOp)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); +typedef __pyx_t_8_packsim_Vector2D *(*__pyx_t_8_packsim_VectorSelfSclOp)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); -/* "packsim_core.pxd":59 +/* "_packsim.pxd":59 * ctypedef Vector2D (*VectorCopyVecOp)(Vector2D*, Vector2D) nogil * ctypedef Vector2D* (*VectorSelfSclOp)(Vector2D*, FLOAT_T) nogil * ctypedef Vector2D (*VectorCopySclOp)(Vector2D*, FLOAT_T) nogil # <<<<<<<<<<<<<< * * ctypedef Matrix2x2* (*MatrixSelfMatOp)(Matrix2x2*, Matrix2x2) nogil */ -typedef __pyx_t_12packsim_core_Vector2D (*__pyx_t_12packsim_core_VectorCopySclOp)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); +typedef __pyx_t_8_packsim_Vector2D (*__pyx_t_8_packsim_VectorCopySclOp)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); -/* "packsim_core.pxd":61 +/* "_packsim.pxd":61 * ctypedef Vector2D (*VectorCopySclOp)(Vector2D*, FLOAT_T) nogil * * ctypedef Matrix2x2* (*MatrixSelfMatOp)(Matrix2x2*, Matrix2x2) nogil # <<<<<<<<<<<<<< * ctypedef Matrix2x2 (*MatrixCopyMatOp)(Matrix2x2*, Matrix2x2) nogil * ctypedef Matrix2x2* (*MatrixSelfSclOp)(Matrix2x2*, FLOAT_T) nogil */ -typedef __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_12packsim_core_MatrixSelfMatOp)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); +typedef __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_8_packsim_MatrixSelfMatOp)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); -/* "packsim_core.pxd":62 +/* "_packsim.pxd":62 * * ctypedef Matrix2x2* (*MatrixSelfMatOp)(Matrix2x2*, Matrix2x2) nogil * ctypedef Matrix2x2 (*MatrixCopyMatOp)(Matrix2x2*, Matrix2x2) nogil # <<<<<<<<<<<<<< * ctypedef Matrix2x2* (*MatrixSelfSclOp)(Matrix2x2*, FLOAT_T) nogil * ctypedef Matrix2x2 (*MatrixCopySclOp)(Matrix2x2*, FLOAT_T) nogil */ -typedef __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_12packsim_core_MatrixCopyMatOp)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); +typedef __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_8_packsim_MatrixCopyMatOp)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); -/* "packsim_core.pxd":63 +/* "_packsim.pxd":63 * ctypedef Matrix2x2* (*MatrixSelfMatOp)(Matrix2x2*, Matrix2x2) nogil * ctypedef Matrix2x2 (*MatrixCopyMatOp)(Matrix2x2*, Matrix2x2) nogil * ctypedef Matrix2x2* (*MatrixSelfSclOp)(Matrix2x2*, FLOAT_T) nogil # <<<<<<<<<<<<<< * ctypedef Matrix2x2 (*MatrixCopySclOp)(Matrix2x2*, FLOAT_T) nogil * */ -typedef __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_12packsim_core_MatrixSelfSclOp)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); +typedef __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_8_packsim_MatrixSelfSclOp)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); -/* "packsim_core.pxd":64 +/* "_packsim.pxd":64 * ctypedef Matrix2x2 (*MatrixCopyMatOp)(Matrix2x2*, Matrix2x2) nogil * ctypedef Matrix2x2* (*MatrixSelfSclOp)(Matrix2x2*, FLOAT_T) nogil * ctypedef Matrix2x2 (*MatrixCopySclOp)(Matrix2x2*, FLOAT_T) nogil # <<<<<<<<<<<<<< * * */ -typedef __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_12packsim_core_MatrixCopySclOp)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); +typedef __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_8_packsim_MatrixCopySclOp)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); -/* "packsim_core.pxd":67 +/* "_packsim.pxd":67 * * * ctypedef struct VectorSelfOps: # <<<<<<<<<<<<<< * Vector2D* (*neg)(Vector2D*) nogil * */ -struct __pyx_t_12packsim_core_VectorSelfOps { - __pyx_t_12packsim_core_Vector2D *(*neg)(__pyx_t_12packsim_core_Vector2D *); - __pyx_t_12packsim_core_VectorSelfVecOp vadd; - __pyx_t_12packsim_core_VectorSelfVecOp vsub; - __pyx_t_12packsim_core_VectorSelfVecOp vmul; - __pyx_t_12packsim_core_VectorSelfVecOp vdiv; - __pyx_t_12packsim_core_Vector2D *(*matmul)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_VectorSelfSclOp sadd; - __pyx_t_12packsim_core_VectorSelfSclOp ssub; - __pyx_t_12packsim_core_VectorSelfSclOp smul; - __pyx_t_12packsim_core_VectorSelfSclOp sdiv; +struct __pyx_t_8_packsim_VectorSelfOps { + __pyx_t_8_packsim_Vector2D *(*neg)(__pyx_t_8_packsim_Vector2D *); + __pyx_t_8_packsim_VectorSelfVecOp vadd; + __pyx_t_8_packsim_VectorSelfVecOp vsub; + __pyx_t_8_packsim_VectorSelfVecOp vmul; + __pyx_t_8_packsim_VectorSelfVecOp vdiv; + __pyx_t_8_packsim_Vector2D *(*matmul)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_VectorSelfSclOp sadd; + __pyx_t_8_packsim_VectorSelfSclOp ssub; + __pyx_t_8_packsim_VectorSelfSclOp smul; + __pyx_t_8_packsim_VectorSelfSclOp sdiv; }; -/* "packsim_core.pxd":82 +/* "_packsim.pxd":82 * * * ctypedef struct VectorCopyOps: # <<<<<<<<<<<<<< * Vector2D (*neg)(Vector2D*) nogil * */ -struct __pyx_t_12packsim_core_VectorCopyOps { - __pyx_t_12packsim_core_Vector2D (*neg)(__pyx_t_12packsim_core_Vector2D *); - __pyx_t_12packsim_core_VectorCopyVecOp vadd; - __pyx_t_12packsim_core_VectorCopyVecOp vsub; - __pyx_t_12packsim_core_VectorCopyVecOp vmul; - __pyx_t_12packsim_core_VectorCopyVecOp vdiv; - __pyx_t_12packsim_core_Vector2D (*matmul)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_VectorCopySclOp sadd; - __pyx_t_12packsim_core_VectorCopySclOp ssub; - __pyx_t_12packsim_core_VectorCopySclOp smul; - __pyx_t_12packsim_core_VectorCopySclOp sdiv; +struct __pyx_t_8_packsim_VectorCopyOps { + __pyx_t_8_packsim_Vector2D (*neg)(__pyx_t_8_packsim_Vector2D *); + __pyx_t_8_packsim_VectorCopyVecOp vadd; + __pyx_t_8_packsim_VectorCopyVecOp vsub; + __pyx_t_8_packsim_VectorCopyVecOp vmul; + __pyx_t_8_packsim_VectorCopyVecOp vdiv; + __pyx_t_8_packsim_Vector2D (*matmul)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_VectorCopySclOp sadd; + __pyx_t_8_packsim_VectorCopySclOp ssub; + __pyx_t_8_packsim_VectorCopySclOp smul; + __pyx_t_8_packsim_VectorCopySclOp sdiv; }; -/* "packsim_core.pxd":97 +/* "_packsim.pxd":97 * * * ctypedef struct MatrixSelfOps: # <<<<<<<<<<<<<< * Matrix2x2* (*neg)(Matrix2x2*) nogil * */ -struct __pyx_t_12packsim_core_MatrixSelfOps { - __pyx_t_12packsim_core_Matrix2x2 *(*neg)(__pyx_t_12packsim_core_Matrix2x2 *); - __pyx_t_12packsim_core_MatrixSelfMatOp madd; - __pyx_t_12packsim_core_MatrixSelfMatOp msub; - __pyx_t_12packsim_core_MatrixSelfMatOp mmul; - __pyx_t_12packsim_core_MatrixSelfMatOp mdiv; - __pyx_t_12packsim_core_MatrixSelfMatOp matmul; - __pyx_t_12packsim_core_MatrixSelfSclOp sadd; - __pyx_t_12packsim_core_MatrixSelfSclOp ssub; - __pyx_t_12packsim_core_MatrixSelfSclOp smul; - __pyx_t_12packsim_core_MatrixSelfSclOp sdiv; +struct __pyx_t_8_packsim_MatrixSelfOps { + __pyx_t_8_packsim_Matrix2x2 *(*neg)(__pyx_t_8_packsim_Matrix2x2 *); + __pyx_t_8_packsim_MatrixSelfMatOp madd; + __pyx_t_8_packsim_MatrixSelfMatOp msub; + __pyx_t_8_packsim_MatrixSelfMatOp mmul; + __pyx_t_8_packsim_MatrixSelfMatOp mdiv; + __pyx_t_8_packsim_MatrixSelfMatOp matmul; + __pyx_t_8_packsim_MatrixSelfSclOp sadd; + __pyx_t_8_packsim_MatrixSelfSclOp ssub; + __pyx_t_8_packsim_MatrixSelfSclOp smul; + __pyx_t_8_packsim_MatrixSelfSclOp sdiv; }; -/* "packsim_core.pxd":112 +/* "_packsim.pxd":112 * * * ctypedef struct MatrixCopyOps: # <<<<<<<<<<<<<< * Matrix2x2 (*neg)(Matrix2x2*) nogil * */ -struct __pyx_t_12packsim_core_MatrixCopyOps { - __pyx_t_12packsim_core_Matrix2x2 (*neg)(__pyx_t_12packsim_core_Matrix2x2 *); - __pyx_t_12packsim_core_MatrixCopyMatOp madd; - __pyx_t_12packsim_core_MatrixCopyMatOp msub; - __pyx_t_12packsim_core_MatrixCopyMatOp mmul; - __pyx_t_12packsim_core_MatrixCopyMatOp mdiv; - __pyx_t_12packsim_core_MatrixCopyMatOp matmul; - __pyx_t_12packsim_core_MatrixCopySclOp sadd; - __pyx_t_12packsim_core_MatrixCopySclOp ssub; - __pyx_t_12packsim_core_MatrixCopySclOp smul; - __pyx_t_12packsim_core_MatrixCopySclOp sdiv; +struct __pyx_t_8_packsim_MatrixCopyOps { + __pyx_t_8_packsim_Matrix2x2 (*neg)(__pyx_t_8_packsim_Matrix2x2 *); + __pyx_t_8_packsim_MatrixCopyMatOp madd; + __pyx_t_8_packsim_MatrixCopyMatOp msub; + __pyx_t_8_packsim_MatrixCopyMatOp mmul; + __pyx_t_8_packsim_MatrixCopyMatOp mdiv; + __pyx_t_8_packsim_MatrixCopyMatOp matmul; + __pyx_t_8_packsim_MatrixCopySclOp sadd; + __pyx_t_8_packsim_MatrixCopySclOp ssub; + __pyx_t_8_packsim_MatrixCopySclOp smul; + __pyx_t_8_packsim_MatrixCopySclOp sdiv; }; -/* "packsim_core.pxd":127 +/* "_packsim.pxd":127 * * # Psuedo-class for a 2-dimensional vector. No orientation. * ctypedef struct Vector2D: # <<<<<<<<<<<<<< * FLOAT_T x, y * VectorSelfOps self */ -struct __pyx_t_12packsim_core_Vector2D { - __pyx_t_12packsim_core_FLOAT_T x; - __pyx_t_12packsim_core_FLOAT_T y; - __pyx_t_12packsim_core_VectorSelfOps self; - __pyx_t_12packsim_core_VectorCopyOps copy; - int (*equals)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*rot)(__pyx_t_12packsim_core_Vector2D *); - __pyx_t_12packsim_core_FLOAT_T (*dot)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_FLOAT_T (*mag)(__pyx_t_12packsim_core_Vector2D *); +struct __pyx_t_8_packsim_Vector2D { + __pyx_t_8_packsim_FLOAT_T x; + __pyx_t_8_packsim_FLOAT_T y; + __pyx_t_8_packsim_VectorSelfOps self; + __pyx_t_8_packsim_VectorCopyOps copy; + int (*equals)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*rot)(__pyx_t_8_packsim_Vector2D *); + __pyx_t_8_packsim_FLOAT_T (*dot)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_FLOAT_T (*mag)(__pyx_t_8_packsim_Vector2D *); }; -/* "packsim_core.pxd":138 +/* "_packsim.pxd":138 * * # Psuedo-class for a 2x2 matrix. * ctypedef struct Matrix2x2: # <<<<<<<<<<<<<< * FLOAT_T a, b, c, d * MatrixSelfOps self */ -struct __pyx_t_12packsim_core_Matrix2x2 { - __pyx_t_12packsim_core_FLOAT_T a; - __pyx_t_12packsim_core_FLOAT_T b; - __pyx_t_12packsim_core_FLOAT_T c; - __pyx_t_12packsim_core_FLOAT_T d; - __pyx_t_12packsim_core_MatrixSelfOps self; - __pyx_t_12packsim_core_MatrixCopyOps copy; - int (*equals)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Vector2D (*vecmul)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Vector2D); +struct __pyx_t_8_packsim_Matrix2x2 { + __pyx_t_8_packsim_FLOAT_T a; + __pyx_t_8_packsim_FLOAT_T b; + __pyx_t_8_packsim_FLOAT_T c; + __pyx_t_8_packsim_FLOAT_T d; + __pyx_t_8_packsim_MatrixSelfOps self; + __pyx_t_8_packsim_MatrixCopyOps copy; + int (*equals)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Vector2D (*vecmul)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Vector2D); }; -/* "packsim_core.pxd":147 +/* "_packsim.pxd":147 * * # Psuedo-class that handles caching for sites. * ctypedef struct SiteCacheMap: # <<<<<<<<<<<<<< * INT_T iarea, iperim, iisoparam, ienergy, iavg_radius * */ -struct __pyx_t_12packsim_core_SiteCacheMap { - __pyx_t_12packsim_core_INT_T iarea; - __pyx_t_12packsim_core_INT_T iperim; - __pyx_t_12packsim_core_INT_T iisoparam; - __pyx_t_12packsim_core_INT_T ienergy; - __pyx_t_12packsim_core_INT_T iavg_radius; - __pyx_t_12packsim_core_FLOAT_T (*area)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*perim)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*isoparam)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*energy)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*avg_radius)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); +struct __pyx_t_8_packsim_SiteCacheMap { + __pyx_t_8_packsim_INT_T iarea; + __pyx_t_8_packsim_INT_T iperim; + __pyx_t_8_packsim_INT_T iisoparam; + __pyx_t_8_packsim_INT_T ienergy; + __pyx_t_8_packsim_INT_T iavg_radius; + __pyx_t_8_packsim_FLOAT_T (*area)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*perim)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*isoparam)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*energy)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*avg_radius)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); }; -/* "packsim_core.pxd":157 +/* "_packsim.pxd":157 * * # Psuedo-class that handles caching for edges. * ctypedef struct EdgeCacheMap: # <<<<<<<<<<<<<< * INT_T iH, ila, ila_mag, ida, ida_mag, ixij, idVdv, iphi, iB, iF, ii2p,\ * ilntan, icsc, size */ -struct __pyx_t_12packsim_core_EdgeCacheMap { - __pyx_t_12packsim_core_INT_T iH; - __pyx_t_12packsim_core_INT_T ila; - __pyx_t_12packsim_core_INT_T ila_mag; - __pyx_t_12packsim_core_INT_T ida; - __pyx_t_12packsim_core_INT_T ida_mag; - __pyx_t_12packsim_core_INT_T ixij; - __pyx_t_12packsim_core_INT_T idVdv; - __pyx_t_12packsim_core_INT_T iphi; - __pyx_t_12packsim_core_INT_T iB; - __pyx_t_12packsim_core_INT_T iF; - __pyx_t_12packsim_core_INT_T ii2p; - __pyx_t_12packsim_core_INT_T ilntan; - __pyx_t_12packsim_core_INT_T icsc; - __pyx_t_12packsim_core_INT_T size; - __pyx_t_12packsim_core_Matrix2x2 (*H)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Vector2D (*la)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*da)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*xij)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*dVdv)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*i2p)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_FLOAT_T (*la_mag)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*da_mag)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*phi)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*B)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*F)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*lntan)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*csc)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); +struct __pyx_t_8_packsim_EdgeCacheMap { + __pyx_t_8_packsim_INT_T iH; + __pyx_t_8_packsim_INT_T ila; + __pyx_t_8_packsim_INT_T ila_mag; + __pyx_t_8_packsim_INT_T ida; + __pyx_t_8_packsim_INT_T ida_mag; + __pyx_t_8_packsim_INT_T ixij; + __pyx_t_8_packsim_INT_T idVdv; + __pyx_t_8_packsim_INT_T iphi; + __pyx_t_8_packsim_INT_T iB; + __pyx_t_8_packsim_INT_T iF; + __pyx_t_8_packsim_INT_T ii2p; + __pyx_t_8_packsim_INT_T ilntan; + __pyx_t_8_packsim_INT_T icsc; + __pyx_t_8_packsim_INT_T size; + __pyx_t_8_packsim_Matrix2x2 (*H)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Vector2D (*la)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*da)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*xij)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*dVdv)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*i2p)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_FLOAT_T (*la_mag)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*da_mag)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*phi)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*B)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*F)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*lntan)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*csc)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); }; -/* "packsim_core.pxd":178 +/* "_packsim.pxd":178 * * # Psuedo-class to just contain all pertaining info for sites and edges. * ctypedef struct VoronoiInfo: # <<<<<<<<<<<<<< * IArray sites, edges * FArray points, vertices, site_cache, edge_cache */ -struct __pyx_t_12packsim_core_VoronoiInfo { - struct __pyx_t_12packsim_core_IArray sites; - struct __pyx_t_12packsim_core_IArray edges; - __pyx_t_12packsim_core_FArray points; - __pyx_t_12packsim_core_FArray vertices; - __pyx_t_12packsim_core_FArray site_cache; - __pyx_t_12packsim_core_FArray edge_cache; - __pyx_t_12packsim_core_EdgeCacheMap *edge_cache_map; +struct __pyx_t_8_packsim_VoronoiInfo { + struct __pyx_t_8_packsim_IArray sites; + struct __pyx_t_8_packsim_IArray edges; + __pyx_t_8_packsim_FArray points; + __pyx_t_8_packsim_FArray vertices; + __pyx_t_8_packsim_FArray site_cache; + __pyx_t_8_packsim_FArray edge_cache; + __pyx_t_8_packsim_EdgeCacheMap *edge_cache_map; }; -/* "packsim_core.pxd":184 +/* "_packsim.pxd":184 * * # Psuedo-class for a Site. * ctypedef struct Site: # <<<<<<<<<<<<<< * INT_T arr_index * VoronoiInfo* info */ -struct __pyx_t_12packsim_core_Site { - __pyx_t_12packsim_core_INT_T arr_index; - __pyx_t_12packsim_core_VoronoiInfo *info; - __pyx_t_12packsim_core_SiteCacheMap *cache; - __pyx_t_12packsim_core_INT_T (*index)(__pyx_t_12packsim_core_Site *); - __pyx_t_12packsim_core_Vector2D (*vec)(__pyx_t_12packsim_core_Site *); - __pyx_t_12packsim_core_HalfEdge (*edge)(__pyx_t_12packsim_core_Site *); - __pyx_t_12packsim_core_INT_T (*edge_num)(__pyx_t_12packsim_core_Site *); +struct __pyx_t_8_packsim_Site { + __pyx_t_8_packsim_INT_T arr_index; + __pyx_t_8_packsim_VoronoiInfo *info; + __pyx_t_8_packsim_SiteCacheMap *cache; + __pyx_t_8_packsim_INT_T (*index)(__pyx_t_8_packsim_Site *); + __pyx_t_8_packsim_Vector2D (*vec)(__pyx_t_8_packsim_Site *); + __pyx_t_8_packsim_HalfEdge (*edge)(__pyx_t_8_packsim_Site *); + __pyx_t_8_packsim_INT_T (*edge_num)(__pyx_t_8_packsim_Site *); }; -/* "packsim_core.pxd":195 +/* "_packsim.pxd":195 * * # Psuedo-class for an HalfEdge. * ctypedef struct HalfEdge: # <<<<<<<<<<<<<< * INT_T orig_arr_index, arr_index * VoronoiInfo* info */ -struct __pyx_t_12packsim_core_HalfEdge { - __pyx_t_12packsim_core_INT_T orig_arr_index; - __pyx_t_12packsim_core_INT_T arr_index; - __pyx_t_12packsim_core_VoronoiInfo *info; - __pyx_t_12packsim_core_EdgeCacheMap *cache; - __pyx_t_12packsim_core_INT_T (*origin_index)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_Vector2D (*origin)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_Site (*face)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_HalfEdge (*next)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_HalfEdge (*prev)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_HalfEdge (*twin)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_Matrix2x2 (*get_H)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Site); +struct __pyx_t_8_packsim_HalfEdge { + __pyx_t_8_packsim_INT_T orig_arr_index; + __pyx_t_8_packsim_INT_T arr_index; + __pyx_t_8_packsim_VoronoiInfo *info; + __pyx_t_8_packsim_EdgeCacheMap *cache; + __pyx_t_8_packsim_INT_T (*origin_index)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_Vector2D (*origin)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_Site (*face)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_HalfEdge (*next)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_HalfEdge (*prev)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_HalfEdge (*twin)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_Matrix2x2 (*get_H)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Site); }; -/* "packsim_core.pxd":209 +/* "_packsim.pxd":209 * * * cdef class VoronoiContainer: # <<<<<<<<<<<<<< * cdef readonly INT_T n * cdef readonly FLOAT_T w, h, r, energy */ -struct __pyx_obj_12packsim_core_VoronoiContainer { +struct __pyx_obj_8_packsim_VoronoiContainer { PyObject_HEAD - struct __pyx_vtabstruct_12packsim_core_VoronoiContainer *__pyx_vtab; - __pyx_t_12packsim_core_INT_T n; - __pyx_t_12packsim_core_FLOAT_T w; - __pyx_t_12packsim_core_FLOAT_T h; - __pyx_t_12packsim_core_FLOAT_T r; - __pyx_t_12packsim_core_FLOAT_T energy; - __pyx_t_12packsim_core_FLOAT_T dim[2]; + struct __pyx_vtabstruct_8_packsim_VoronoiContainer *__pyx_vtab; + __pyx_t_8_packsim_INT_T n; + __pyx_t_8_packsim_FLOAT_T w; + __pyx_t_8_packsim_FLOAT_T h; + __pyx_t_8_packsim_FLOAT_T r; + __pyx_t_8_packsim_FLOAT_T energy; + __pyx_t_8_packsim_FLOAT_T dim[2]; __Pyx_memviewslice points; __Pyx_memviewslice vertices; __Pyx_memviewslice site_cache; @@ -1707,58 +1707,58 @@ struct __pyx_obj_12packsim_core_VoronoiContainer { __Pyx_memviewslice grad; __Pyx_memviewslice sites; __Pyx_memviewslice edges; - __pyx_t_12packsim_core_EdgeCacheMap *edge_cache_map; + __pyx_t_8_packsim_EdgeCacheMap *edge_cache_map; PyObject *__dict__; }; -/* "packsim_core.pxd":232 +/* "_packsim.pxd":232 * * * cdef class AreaEnergy(VoronoiContainer): # <<<<<<<<<<<<<< * cdef readonly FLOAT_T minimum * cdef void precompute(self) except * */ -struct __pyx_obj_12packsim_core_AreaEnergy { - struct __pyx_obj_12packsim_core_VoronoiContainer __pyx_base; - __pyx_t_12packsim_core_FLOAT_T minimum; +struct __pyx_obj_8_packsim_AreaEnergy { + struct __pyx_obj_8_packsim_VoronoiContainer __pyx_base; + __pyx_t_8_packsim_FLOAT_T minimum; }; -/* "packsim_core.pxd":238 +/* "_packsim.pxd":238 * * * cdef class RadialALEnergy(VoronoiContainer): # <<<<<<<<<<<<<< * cdef void precompute(self) except * * cdef void calc_grad(self) except * */ -struct __pyx_obj_12packsim_core_RadialALEnergy { - struct __pyx_obj_12packsim_core_VoronoiContainer __pyx_base; +struct __pyx_obj_8_packsim_RadialALEnergy { + struct __pyx_obj_8_packsim_VoronoiContainer __pyx_base; }; -/* "packsim_core.pxd":243 +/* "_packsim.pxd":243 * * * cdef class RadialTEnergy(VoronoiContainer): # <<<<<<<<<<<<<< * cdef void precompute(self) except * * cdef void calc_grad(self) except * */ -struct __pyx_obj_12packsim_core_RadialTEnergy { - struct __pyx_obj_12packsim_core_VoronoiContainer __pyx_base; +struct __pyx_obj_8_packsim_RadialTEnergy { + struct __pyx_obj_8_packsim_VoronoiContainer __pyx_base; }; -/* "packsim_core.pxd":247 +/* "_packsim.pxd":247 * cdef void calc_grad(self) except * * * cdef class Calc: # <<<<<<<<<<<<<< * @staticmethod * cdef inline FLOAT_T phi(HalfEdge) nogil */ -struct __pyx_obj_12packsim_core_Calc { +struct __pyx_obj_8_packsim_Calc { PyObject_HEAD - struct __pyx_vtabstruct_12packsim_core_Calc *__pyx_vtab; + struct __pyx_vtabstruct_8_packsim_Calc *__pyx_vtab; }; @@ -1840,7 +1840,7 @@ struct __pyx_memoryviewslice_obj { -/* "voronoi_dcel.pyx":388 +/* "src/voronoi_dcel.pyx":388 * * * cdef class VoronoiContainer: # <<<<<<<<<<<<<< @@ -1848,34 +1848,34 @@ struct __pyx_memoryviewslice_obj { * Class for Voronoi diagrams, stored in a modified DCEL. */ -struct __pyx_vtabstruct_12packsim_core_VoronoiContainer { - void (*calculate_voronoi)(struct __pyx_obj_12packsim_core_VoronoiContainer *, PyArrayObject *); - void (*generate_dcel)(struct __pyx_obj_12packsim_core_VoronoiContainer *); - void (*common_cache)(struct __pyx_obj_12packsim_core_VoronoiContainer *); - void (*precompute)(struct __pyx_obj_12packsim_core_VoronoiContainer *); - void (*calc_grad)(struct __pyx_obj_12packsim_core_VoronoiContainer *); - void (*get_statistics)(struct __pyx_obj_12packsim_core_VoronoiContainer *); - __pyx_t_12packsim_core_Matrix2x2 (*calc_H)(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_HalfEdge); +struct __pyx_vtabstruct_8_packsim_VoronoiContainer { + void (*calculate_voronoi)(struct __pyx_obj_8_packsim_VoronoiContainer *, PyArrayObject *); + void (*generate_dcel)(struct __pyx_obj_8_packsim_VoronoiContainer *); + void (*common_cache)(struct __pyx_obj_8_packsim_VoronoiContainer *); + void (*precompute)(struct __pyx_obj_8_packsim_VoronoiContainer *); + void (*calc_grad)(struct __pyx_obj_8_packsim_VoronoiContainer *); + void (*get_statistics)(struct __pyx_obj_8_packsim_VoronoiContainer *); + __pyx_t_8_packsim_Matrix2x2 (*calc_H)(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_HalfEdge); int (*sign)(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice); }; -static struct __pyx_vtabstruct_12packsim_core_VoronoiContainer *__pyx_vtabptr_12packsim_core_VoronoiContainer; -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16VoronoiContainer_calc_H(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_HalfEdge); -static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice); +static struct __pyx_vtabstruct_8_packsim_VoronoiContainer *__pyx_vtabptr_8_packsim_VoronoiContainer; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_16VoronoiContainer_calc_H(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_HalfEdge); +static CYTHON_INLINE int __pyx_f_8_packsim_16VoronoiContainer_sign(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice); -/* "energy.pyx":1 +/* "src/energy.pyx":1 * cdef class AreaEnergy(VoronoiContainer): # <<<<<<<<<<<<<< * """ * Class for formulas relevant to the Area energy. */ -struct __pyx_vtabstruct_12packsim_core_AreaEnergy { - struct __pyx_vtabstruct_12packsim_core_VoronoiContainer __pyx_base; +struct __pyx_vtabstruct_8_packsim_AreaEnergy { + struct __pyx_vtabstruct_8_packsim_VoronoiContainer __pyx_base; }; -static struct __pyx_vtabstruct_12packsim_core_AreaEnergy *__pyx_vtabptr_12packsim_core_AreaEnergy; +static struct __pyx_vtabstruct_8_packsim_AreaEnergy *__pyx_vtabptr_8_packsim_AreaEnergy; -/* "energy.pyx":91 +/* "src/energy.pyx":91 * * * cdef class RadialALEnergy(VoronoiContainer): # <<<<<<<<<<<<<< @@ -1883,13 +1883,13 @@ static struct __pyx_vtabstruct_12packsim_core_AreaEnergy *__pyx_vtabptr_12packsi * Class for formulas relevant to the Area energy. */ -struct __pyx_vtabstruct_12packsim_core_RadialALEnergy { - struct __pyx_vtabstruct_12packsim_core_VoronoiContainer __pyx_base; +struct __pyx_vtabstruct_8_packsim_RadialALEnergy { + struct __pyx_vtabstruct_8_packsim_VoronoiContainer __pyx_base; }; -static struct __pyx_vtabstruct_12packsim_core_RadialALEnergy *__pyx_vtabptr_12packsim_core_RadialALEnergy; +static struct __pyx_vtabstruct_8_packsim_RadialALEnergy *__pyx_vtabptr_8_packsim_RadialALEnergy; -/* "energy.pyx":122 +/* "src/energy.pyx":122 * * * cdef class RadialTEnergy(VoronoiContainer): # <<<<<<<<<<<<<< @@ -1897,13 +1897,13 @@ static struct __pyx_vtabstruct_12packsim_core_RadialALEnergy *__pyx_vtabptr_12pa * Class for formulas relevant to the Area energy. */ -struct __pyx_vtabstruct_12packsim_core_RadialTEnergy { - struct __pyx_vtabstruct_12packsim_core_VoronoiContainer __pyx_base; +struct __pyx_vtabstruct_8_packsim_RadialTEnergy { + struct __pyx_vtabstruct_8_packsim_VoronoiContainer __pyx_base; }; -static struct __pyx_vtabstruct_12packsim_core_RadialTEnergy *__pyx_vtabptr_12packsim_core_RadialTEnergy; +static struct __pyx_vtabstruct_8_packsim_RadialTEnergy *__pyx_vtabptr_8_packsim_RadialTEnergy; -/* "energy.pyx":250 +/* "src/energy.pyx":250 * * * cdef class Calc: # <<<<<<<<<<<<<< @@ -1911,14 +1911,14 @@ static struct __pyx_vtabstruct_12packsim_core_RadialTEnergy *__pyx_vtabptr_12pac * cdef inline FLOAT_T phi(HalfEdge e) nogil: */ -struct __pyx_vtabstruct_12packsim_core_Calc { - __pyx_t_12packsim_core_FLOAT_T (*phi)(__pyx_t_12packsim_core_HalfEdge); - __pyx_t_12packsim_core_Vector2D (*I2)(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D (*radialt_edge_grad)(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_Site, __pyx_t_12packsim_core_FLOAT_T); +struct __pyx_vtabstruct_8_packsim_Calc { + __pyx_t_8_packsim_FLOAT_T (*phi)(__pyx_t_8_packsim_HalfEdge); + __pyx_t_8_packsim_Vector2D (*I2)(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D (*radialt_edge_grad)(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_Site, __pyx_t_8_packsim_FLOAT_T); }; -static struct __pyx_vtabstruct_12packsim_core_Calc *__pyx_vtabptr_12packsim_core_Calc; -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_4Calc_phi(__pyx_t_12packsim_core_HalfEdge); -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_I2(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); +static struct __pyx_vtabstruct_8_packsim_Calc *__pyx_vtabptr_8_packsim_Calc; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_4Calc_phi(__pyx_t_8_packsim_HalfEdge); +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_4Calc_I2(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); /* "View.MemoryView":105 @@ -2381,6 +2381,13 @@ static PyObject* __Pyx_PyInt_RemainderObjC(PyObject *op1, PyObject *op2, long in (inplace ? PyNumber_InPlaceRemainder(op1, op2) : PyNumber_Remainder(op1, op2)) #endif +/* PyObjectCallNoArg.proto */ +#if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func); +#else +#define __Pyx_PyObject_CallNoArg(func) __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL) +#endif + /* PyIntBinop.proto */ #if !CYTHON_COMPILING_IN_PYPY static PyObject* __Pyx_PyInt_TrueDivideObjC(PyObject *op1, PyObject *op2, long intval, int inplace, int zerodivision_check); @@ -2389,13 +2396,6 @@ static PyObject* __Pyx_PyInt_TrueDivideObjC(PyObject *op1, PyObject *op2, long i (inplace ? PyNumber_InPlaceTrueDivide(op1, op2) : PyNumber_TrueDivide(op1, op2)) #endif -/* PyObjectCallNoArg.proto */ -#if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func); -#else -#define __Pyx_PyObject_CallNoArg(func) __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL) -#endif - /* ArgTypeTest.proto */ #define __Pyx_ArgTypeTest(obj, type, none_allowed, name, exact)\ ((likely((Py_TYPE(obj) == type) | (none_allowed && (obj == Py_None)))) ? 1 :\ @@ -2792,7 +2792,7 @@ static CYTHON_INLINE int resize_smart(arrayobject *self, Py_ssize_t n) { #endif /* ToPyCTupleUtility.proto */ -static PyObject* __pyx_convert__to_py___pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc(__pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); +static PyObject* __pyx_convert__to_py___pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc(__pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); /* TypeInfoCompare.proto */ static int __pyx_typeinfo_cmp(__Pyx_TypeInfo *a, __Pyx_TypeInfo *b); @@ -2809,21 +2809,21 @@ static int __Pyx_ValidateAndInit_memviewslice( PyObject *original_obj); /* ObjectToMemviewSlice.proto */ -static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(PyObject *, int writable_flag); +static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(PyObject *, int writable_flag); /* ObjectToMemviewSlice.proto */ -static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_INT_T(PyObject *, int writable_flag); +static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_INT_T(PyObject *, int writable_flag); /* MemviewDtypeToObject.proto */ -static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_12packsim_core_INT_T(const char *itemp); -static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_12packsim_core_INT_T(const char *itemp, PyObject *obj); +static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_8_packsim_INT_T(const char *itemp); +static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_8_packsim_INT_T(const char *itemp, PyObject *obj); /* ObjectToMemviewSlice.proto */ -static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_12packsim_core_FLOAT_T(PyObject *, int writable_flag); +static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_8_packsim_FLOAT_T(PyObject *, int writable_flag); /* MemviewDtypeToObject.proto */ -static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_12packsim_core_FLOAT_T(const char *itemp); -static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_12packsim_core_FLOAT_T(const char *itemp, PyObject *obj); +static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_8_packsim_FLOAT_T(const char *itemp); +static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_8_packsim_FLOAT_T(const char *itemp, PyObject *obj); /* RealImag.proto */ #if CYTHON_CCOMPLEX @@ -2960,23 +2960,23 @@ static int __Pyx_check_binary_version(void); /* InitStrings.proto */ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t); -static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, PyArrayObject *__pyx_v_site_arr); /* proto*/ -static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16VoronoiContainer_calc_H(__pyx_t_12packsim_core_HalfEdge __pyx_v_em, __pyx_t_12packsim_core_HalfEdge __pyx_v_ep); /* proto*/ -static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_memviewslice __pyx_v_ref, __Pyx_memviewslice __pyx_v_p, __Pyx_memviewslice __pyx_v_q); /* proto*/ -static void __pyx_f_12packsim_core_16VoronoiContainer_precompute(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_16VoronoiContainer_calc_grad(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_16VoronoiContainer_get_statistics(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_14RadialALEnergy_precompute(struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_14RadialALEnergy_calc_grad(struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self); /* proto*/ -static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self); /* proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_4Calc_phi(__pyx_t_12packsim_core_HalfEdge __pyx_v_e); /* proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_I2(__pyx_t_12packsim_core_HalfEdge __pyx_v_e, CYTHON_UNUSED __pyx_t_12packsim_core_FLOAT_T __pyx_v_r0, CYTHON_UNUSED __pyx_t_12packsim_core_FLOAT_T __pyx_v_t); /* proto*/ -static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge_grad(__pyx_t_12packsim_core_HalfEdge __pyx_v_e, __pyx_t_12packsim_core_Site __pyx_v_xi, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r0); /* proto*/ +static void __pyx_f_8_packsim_16VoronoiContainer_calculate_voronoi(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, PyArrayObject *__pyx_v_site_arr); /* proto*/ +static void __pyx_f_8_packsim_16VoronoiContainer_generate_dcel(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_16VoronoiContainer_common_cache(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_16VoronoiContainer_calc_H(__pyx_t_8_packsim_HalfEdge __pyx_v_em, __pyx_t_8_packsim_HalfEdge __pyx_v_ep); /* proto*/ +static CYTHON_INLINE int __pyx_f_8_packsim_16VoronoiContainer_sign(__Pyx_memviewslice __pyx_v_ref, __Pyx_memviewslice __pyx_v_p, __Pyx_memviewslice __pyx_v_q); /* proto*/ +static void __pyx_f_8_packsim_16VoronoiContainer_precompute(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_16VoronoiContainer_calc_grad(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_16VoronoiContainer_get_statistics(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_10AreaEnergy_precompute(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_10AreaEnergy_calc_grad(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_14RadialALEnergy_precompute(struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_14RadialALEnergy_calc_grad(struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_13RadialTEnergy_precompute(struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self); /* proto*/ +static void __pyx_f_8_packsim_13RadialTEnergy_calc_grad(struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self); /* proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_4Calc_phi(__pyx_t_8_packsim_HalfEdge __pyx_v_e); /* proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_4Calc_I2(__pyx_t_8_packsim_HalfEdge __pyx_v_e, CYTHON_UNUSED __pyx_t_8_packsim_FLOAT_T __pyx_v_r0, CYTHON_UNUSED __pyx_t_8_packsim_FLOAT_T __pyx_v_t); /* proto*/ +static __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_4Calc_radialt_edge_grad(__pyx_t_8_packsim_HalfEdge __pyx_v_e, __pyx_t_8_packsim_Site __pyx_v_xi, __pyx_t_8_packsim_FLOAT_T __pyx_v_r0); /* proto*/ static PyObject *__pyx_array_get_memview(struct __pyx_array_obj *__pyx_v_self); /* proto*/ static char *__pyx_memoryview_get_item_pointer(struct __pyx_memoryview_obj *__pyx_v_self, PyObject *__pyx_v_index); /* proto*/ static PyObject *__pyx_memoryview_is_slice(struct __pyx_memoryview_obj *__pyx_v_self, PyObject *__pyx_v_obj); /* proto*/ @@ -3101,30 +3101,30 @@ static CYTHON_INLINE int __pyx_f_7cpython_5array_extend_buffer(arrayobject *, ch /* Module declarations from 'libc.math' */ -/* Module declarations from 'packsim_core' */ -static PyTypeObject *__pyx_ptype_12packsim_core_VoronoiContainer = 0; -static PyTypeObject *__pyx_ptype_12packsim_core_AreaEnergy = 0; -static PyTypeObject *__pyx_ptype_12packsim_core_RadialALEnergy = 0; -static PyTypeObject *__pyx_ptype_12packsim_core_RadialTEnergy = 0; -static PyTypeObject *__pyx_ptype_12packsim_core_Calc = 0; +/* Module declarations from '_packsim' */ +static PyTypeObject *__pyx_ptype_8_packsim_VoronoiContainer = 0; +static PyTypeObject *__pyx_ptype_8_packsim_AreaEnergy = 0; +static PyTypeObject *__pyx_ptype_8_packsim_RadialALEnergy = 0; +static PyTypeObject *__pyx_ptype_8_packsim_RadialTEnergy = 0; +static PyTypeObject *__pyx_ptype_8_packsim_Calc = 0; static PyTypeObject *__pyx_array_type = 0; static PyTypeObject *__pyx_MemviewEnum_type = 0; static PyTypeObject *__pyx_memoryview_type = 0; static PyTypeObject *__pyx_memoryviewslice_type = 0; -static __pyx_t_12packsim_core_FLOAT_T __pyx_v_12packsim_core_TAU; -static __pyx_t_12packsim_core_INT_T __pyx_v_12packsim_core_EDGE_ARR_SIZE; -static struct __pyx_t_12packsim_core_Init __pyx_v_12packsim_core_init; -static __pyx_t_12packsim_core_VectorSelfOps __pyx_v_12packsim_core_VSO; -static __pyx_t_12packsim_core_VectorCopyOps __pyx_v_12packsim_core_VCO; -static __pyx_t_12packsim_core_MatrixSelfOps __pyx_v_12packsim_core_MSO; -static __pyx_t_12packsim_core_MatrixCopyOps __pyx_v_12packsim_core_MCO; -static __pyx_t_12packsim_core_Vector2D __pyx_v_12packsim_core_NAN_VECTOR; -static __pyx_t_12packsim_core_Matrix2x2 __pyx_v_12packsim_core_NAN_MATRIX; -static __pyx_t_12packsim_core_FLOAT_T __pyx_v_12packsim_core_SYMM[18]; -static __pyx_t_12packsim_core_Matrix2x2 __pyx_v_12packsim_core_R; -static __pyx_t_12packsim_core_SiteCacheMap __pyx_v_12packsim_core_SITE_CACHE_MAP; -static __pyx_t_12packsim_core_EdgeCacheMap __pyx_v_12packsim_core_AREA_EDGE_CACHE_MAP; -static __pyx_t_12packsim_core_EdgeCacheMap __pyx_v_12packsim_core_RADIALT_EDGE_CACHE_MAP; +static __pyx_t_8_packsim_FLOAT_T __pyx_v_8_packsim_TAU; +static __pyx_t_8_packsim_INT_T __pyx_v_8_packsim_EDGE_ARR_SIZE; +static struct __pyx_t_8_packsim_Init __pyx_v_8_packsim_init; +static __pyx_t_8_packsim_VectorSelfOps __pyx_v_8_packsim_VSO; +static __pyx_t_8_packsim_VectorCopyOps __pyx_v_8_packsim_VCO; +static __pyx_t_8_packsim_MatrixSelfOps __pyx_v_8_packsim_MSO; +static __pyx_t_8_packsim_MatrixCopyOps __pyx_v_8_packsim_MCO; +static __pyx_t_8_packsim_Vector2D __pyx_v_8_packsim_NAN_VECTOR; +static __pyx_t_8_packsim_Matrix2x2 __pyx_v_8_packsim_NAN_MATRIX; +static __pyx_t_8_packsim_FLOAT_T __pyx_v_8_packsim_SYMM[18]; +static __pyx_t_8_packsim_Matrix2x2 __pyx_v_8_packsim_R; +static __pyx_t_8_packsim_SiteCacheMap __pyx_v_8_packsim_SITE_CACHE_MAP; +static __pyx_t_8_packsim_EdgeCacheMap __pyx_v_8_packsim_AREA_EDGE_CACHE_MAP; +static __pyx_t_8_packsim_EdgeCacheMap __pyx_v_8_packsim_RADIALT_EDGE_CACHE_MAP; static PyObject *generic = 0; static PyObject *strided = 0; static PyObject *indirect = 0; @@ -3132,100 +3132,100 @@ static PyObject *contiguous = 0; static PyObject *indirect_contiguous = 0; static int __pyx_memoryview_thread_locks_used; static PyThread_type_lock __pyx_memoryview_thread_locks[8]; -static CYTHON_INLINE struct __pyx_t_12packsim_core_IArray __pyx_f_12packsim_core_init_iarray(__pyx_t_12packsim_core_INT_T *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_iarray_get(struct __pyx_t_12packsim_core_IArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); /*proto*/ -static CYTHON_INLINE void __pyx_f_12packsim_core_iarray_set(struct __pyx_t_12packsim_core_IArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc, __pyx_t_12packsim_core_INT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FArray __pyx_f_12packsim_core_init_farray(__pyx_t_12packsim_core_FLOAT_T *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_farray_get(__pyx_t_12packsim_core_FArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); /*proto*/ -static CYTHON_INLINE void __pyx_f_12packsim_core_farray_set(__pyx_t_12packsim_core_FArray *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_BitSet __pyx_f_12packsim_core_init_bitset(__pyx_t_12packsim_core_INT_T); /*proto*/ -static CYTHON_INLINE int __pyx_f_12packsim_core_bitset_add(__pyx_t_12packsim_core_BitSet *, __pyx_t_12packsim_core_INT_T); /*proto*/ -static CYTHON_INLINE void __pyx_f_12packsim_core_bitset_free(__pyx_t_12packsim_core_BitSet *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_init_vector2d(__pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE int __pyx_f_12packsim_core_v_equals(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_neg_s(__pyx_t_12packsim_core_Vector2D *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vadd_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vsub_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vmul_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vdiv_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_sadd_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_ssub_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_smul_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_sdiv_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_matmul_s(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_neg_c(__pyx_t_12packsim_core_Vector2D *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vadd_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vsub_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vmul_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vdiv_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sadd_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ssub_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_smul_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sdiv_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_matmul_c(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_rot(__pyx_t_12packsim_core_Vector2D *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_dot(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_mag(__pyx_t_12packsim_core_Vector2D *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_init_matrix2x2(__pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE int __pyx_f_12packsim_core_m_equals(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_m_vecmul(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_neg_s(__pyx_t_12packsim_core_Matrix2x2 *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_madd_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_msub_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_mmul_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_mdiv_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_sadd_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ssub_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_smul_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_sdiv_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_matmul_s(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_neg_c(__pyx_t_12packsim_core_Matrix2x2 *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_madd_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_msub_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_mmul_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_mdiv_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_sadd_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_ssub_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_smul_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_sdiv_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_matmul_c(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_init_sitecachemap(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isoparam(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energy(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_radius(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_init_edgecachemap(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Matrix2x2); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_mag(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_mag(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_init_voronoiinfo(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __pyx_t_12packsim_core_EdgeCacheMap *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_init_site(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_VoronoiInfo *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_index(__pyx_t_12packsim_core_Site *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_vec(__pyx_t_12packsim_core_Site *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge(__pyx_t_12packsim_core_Site *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_edge_num(__pyx_t_12packsim_core_Site *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init_halfedge(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_VoronoiInfo *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_origin_index(__pyx_t_12packsim_core_HalfEdge *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_origin(__pyx_t_12packsim_core_HalfEdge *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_face(__pyx_t_12packsim_core_HalfEdge *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge_next(__pyx_t_12packsim_core_HalfEdge *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_prev(__pyx_t_12packsim_core_HalfEdge *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_twin(__pyx_t_12packsim_core_HalfEdge *); /*proto*/ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get_H(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Site); /*proto*/ -static PyObject *__pyx_f_12packsim_core___pyx_unpickle_Calc__set_state(struct __pyx_obj_12packsim_core_Calc *, PyObject *); /*proto*/ -static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T(__pyx_t_12packsim_core_FLOAT_T *, Py_ssize_t); /*proto*/ -static CYTHON_INLINE PyObject *__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T(__pyx_t_12packsim_core_FLOAT_T *, Py_ssize_t); /*proto*/ +static CYTHON_INLINE struct __pyx_t_8_packsim_IArray __pyx_f_8_packsim_init_iarray(__pyx_t_8_packsim_INT_T *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_iarray_get(struct __pyx_t_8_packsim_IArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); /*proto*/ +static CYTHON_INLINE void __pyx_f_8_packsim_iarray_set(struct __pyx_t_8_packsim_IArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc, __pyx_t_8_packsim_INT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FArray __pyx_f_8_packsim_init_farray(__pyx_t_8_packsim_FLOAT_T *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_farray_get(__pyx_t_8_packsim_FArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); /*proto*/ +static CYTHON_INLINE void __pyx_f_8_packsim_farray_set(__pyx_t_8_packsim_FArray *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_BitSet __pyx_f_8_packsim_init_bitset(__pyx_t_8_packsim_INT_T); /*proto*/ +static CYTHON_INLINE int __pyx_f_8_packsim_bitset_add(__pyx_t_8_packsim_BitSet *, __pyx_t_8_packsim_INT_T); /*proto*/ +static CYTHON_INLINE void __pyx_f_8_packsim_bitset_free(__pyx_t_8_packsim_BitSet *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_init_vector2d(__pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE int __pyx_f_8_packsim_v_equals(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_neg_s(__pyx_t_8_packsim_Vector2D *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vadd_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vsub_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vmul_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vdiv_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_sadd_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_ssub_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_smul_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_sdiv_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_matmul_s(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_neg_c(__pyx_t_8_packsim_Vector2D *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vadd_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vsub_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vmul_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vdiv_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_sadd_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_ssub_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_smul_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_sdiv_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_matmul_c(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_rot(__pyx_t_8_packsim_Vector2D *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_dot(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_mag(__pyx_t_8_packsim_Vector2D *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_init_matrix2x2(__pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE int __pyx_f_8_packsim_m_equals(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_m_vecmul(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_neg_s(__pyx_t_8_packsim_Matrix2x2 *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_madd_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_msub_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_mmul_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_mdiv_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_sadd_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_ssub_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_smul_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_sdiv_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_matmul_s(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_neg_c(__pyx_t_8_packsim_Matrix2x2 *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_madd_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_msub_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_mmul_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_mdiv_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_sadd_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_ssub_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_smul_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_sdiv_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_matmul_c(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_SiteCacheMap __pyx_f_8_packsim_init_sitecachemap(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_area(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_perim(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_isoparam(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_energy(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_avg_radius(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_EdgeCacheMap __pyx_f_8_packsim_init_edgecachemap(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_H(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Matrix2x2); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_la(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_da(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_xij(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_dVdv(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_i2p(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_la_mag(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_da_mag(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_phi(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_B(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_F(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_lntan(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_csc(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_VoronoiInfo __pyx_f_8_packsim_init_voronoiinfo(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __pyx_t_8_packsim_EdgeCacheMap *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Site __pyx_f_8_packsim_init_site(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_VoronoiInfo *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_index(__pyx_t_8_packsim_Site *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_vec(__pyx_t_8_packsim_Site *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_edge(__pyx_t_8_packsim_Site *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_edge_num(__pyx_t_8_packsim_Site *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_init_halfedge(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_VoronoiInfo *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_origin_index(__pyx_t_8_packsim_HalfEdge *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_origin(__pyx_t_8_packsim_HalfEdge *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Site __pyx_f_8_packsim_face(__pyx_t_8_packsim_HalfEdge *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_edge_next(__pyx_t_8_packsim_HalfEdge *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_prev(__pyx_t_8_packsim_HalfEdge *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_twin(__pyx_t_8_packsim_HalfEdge *); /*proto*/ +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_get_H(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Site); /*proto*/ +static PyObject *__pyx_f_8_packsim___pyx_unpickle_Calc__set_state(struct __pyx_obj_8_packsim_Calc *, PyObject *); /*proto*/ +static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T(__pyx_t_8_packsim_FLOAT_T *, Py_ssize_t); /*proto*/ +static CYTHON_INLINE PyObject *__Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T(__pyx_t_8_packsim_FLOAT_T *, Py_ssize_t); /*proto*/ static struct __pyx_array_obj *__pyx_array_new(PyObject *, Py_ssize_t, char *, char *, char *); /*proto*/ static void *__pyx_align_pointer(void *, size_t); /*proto*/ static PyObject *__pyx_memoryview_new(PyObject *, int, int, __Pyx_TypeInfo *); /*proto*/ @@ -3259,13 +3259,13 @@ static void __pyx_memoryview_refcount_objects_in_slice(char *, Py_ssize_t *, Py_ static void __pyx_memoryview_slice_assign_scalar(__Pyx_memviewslice *, int, size_t, void *, int); /*proto*/ static void __pyx_memoryview__slice_assign_scalar(char *, Py_ssize_t *, Py_ssize_t *, int, size_t, void *); /*proto*/ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *, PyObject *); /*proto*/ -static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T = { "FLOAT_T", NULL, sizeof(__pyx_t_12packsim_core_FLOAT_T), { 0 }, 0, 'R', 0, 0 }; -static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T = { "INT_T", NULL, sizeof(__pyx_t_12packsim_core_INT_T), { 0 }, 0, IS_UNSIGNED(__pyx_t_12packsim_core_INT_T) ? 'U' : 'I', IS_UNSIGNED(__pyx_t_12packsim_core_INT_T), 0 }; -#define __Pyx_MODULE_NAME "packsim_core" -extern int __pyx_module_is_main_packsim_core; -int __pyx_module_is_main_packsim_core = 0; +static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T = { "FLOAT_T", NULL, sizeof(__pyx_t_8_packsim_FLOAT_T), { 0 }, 0, 'R', 0, 0 }; +static __Pyx_TypeInfo __Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T = { "INT_T", NULL, sizeof(__pyx_t_8_packsim_INT_T), { 0 }, 0, IS_UNSIGNED(__pyx_t_8_packsim_INT_T) ? 'U' : 'I', IS_UNSIGNED(__pyx_t_8_packsim_INT_T), 0 }; +#define __Pyx_MODULE_NAME "_packsim" +extern int __pyx_module_is_main__packsim; +int __pyx_module_is_main__packsim = 0; -/* Implementation of 'packsim_core' */ +/* Implementation of '_packsim' */ static PyObject *__pyx_builtin_IndexError; static PyObject *__pyx_builtin_range; static PyObject *__pyx_builtin_TypeError; @@ -3346,6 +3346,7 @@ static const char __pyx_k_float64[] = "float64"; static const char __pyx_k_fortran[] = "fortran"; static const char __pyx_k_memview[] = "memview"; static const char __pyx_k_nonzero[] = "nonzero"; +static const char __pyx_k_packsim[] = "_packsim"; static const char __pyx_k_regions[] = "regions"; static const char __pyx_k_reshape[] = "reshape"; static const char __pyx_k_spatial[] = "spatial"; @@ -3357,7 +3358,6 @@ static const char __pyx_k_pyx_type[] = "__pyx_type"; static const char __pyx_k_setstate[] = "__setstate__"; static const char __pyx_k_site_arr[] = "site_arr"; static const char __pyx_k_vertices[] = "vertices"; -static const char __pyx_k_vor_data[] = "vor_data"; static const char __pyx_k_TypeError[] = "TypeError"; static const char __pyx_k_add_sites[] = "add_sites"; static const char __pyx_k_enumerate[] = "enumerate"; @@ -3377,7 +3377,6 @@ static const char __pyx_k_MemoryError[] = "MemoryError"; static const char __pyx_k_PickleError[] = "PickleError"; static const char __pyx_k_edge_lengths[] = "edge_lengths"; static const char __pyx_k_isoparam_avg[] = "isoparam_avg"; -static const char __pyx_k_packsim_core[] = "packsim_core"; static const char __pyx_k_point_region[] = "point_region"; static const char __pyx_k_pyx_checksum[] = "__pyx_checksum"; static const char __pyx_k_searchsorted[] = "searchsorted"; @@ -3524,7 +3523,7 @@ static PyObject *__pyx_kp_u_numpy_core_multiarray_failed_to; static PyObject *__pyx_kp_u_numpy_core_umath_failed_to_impor; static PyObject *__pyx_n_s_obj; static PyObject *__pyx_n_s_pack; -static PyObject *__pyx_n_s_packsim_core; +static PyObject *__pyx_n_s_packsim; static PyObject *__pyx_n_s_pickle; static PyObject *__pyx_n_s_point_region; static PyObject *__pyx_n_s_points; @@ -3579,36 +3578,35 @@ static PyObject *__pyx_n_s_unique; static PyObject *__pyx_n_s_unpack; static PyObject *__pyx_n_s_update; static PyObject *__pyx_n_s_vertices; -static PyObject *__pyx_n_s_vor_data; static PyObject *__pyx_n_s_w; static PyObject *__pyx_n_s_zeros; -static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyObject *__pyx_v_site_arr); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8site_arr___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, PyObject *__pyx_v_add); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_step); /* proto */ -static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, double __pyx_v_d); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1n___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1w___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1h___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1r___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_6energy___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_10__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ -static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr); /* proto */ -static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_7minimum___get__(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ -static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr); /* proto */ -static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ -static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr); /* proto */ -static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ -static PyObject *__pyx_pf_12packsim_core_4Calc___reduce_cython__(struct __pyx_obj_12packsim_core_Calc *__pyx_v_self); /* proto */ -static PyObject *__pyx_pf_12packsim_core_4Calc_2__setstate_cython__(struct __pyx_obj_12packsim_core_Calc *__pyx_v_self, PyObject *__pyx_v___pyx_state); /* proto */ -static PyObject *__pyx_pf_12packsim_core___pyx_unpickle_Calc(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v___pyx_type, long __pyx_v___pyx_checksum, PyObject *__pyx_v___pyx_state); /* proto */ +static int __pyx_pf_8_packsim_16VoronoiContainer___init__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyObject *__pyx_v_site_arr); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8site_arr___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8vor_data___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8gradient___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_2add_sites(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, PyObject *__pyx_v_add); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_4iterate(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_step); /* proto */ +static PyArrayObject *__pyx_pf_8_packsim_16VoronoiContainer_6hessian(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, double __pyx_v_d); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1n___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1w___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1h___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1r___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_6energy___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_10__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ +static int __pyx_pf_8_packsim_10AreaEnergy___init__(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr); /* proto */ +static PyObject *__pyx_pf_8_packsim_10AreaEnergy_7minimum___get__(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_10AreaEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_10AreaEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ +static int __pyx_pf_8_packsim_14RadialALEnergy___init__(struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr); /* proto */ +static PyObject *__pyx_pf_8_packsim_14RadialALEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_14RadialALEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ +static int __pyx_pf_8_packsim_13RadialTEnergy___init__(struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr); /* proto */ +static PyObject *__pyx_pf_8_packsim_13RadialTEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_13RadialTEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ +static PyObject *__pyx_pf_8_packsim_4Calc___reduce_cython__(struct __pyx_obj_8_packsim_Calc *__pyx_v_self); /* proto */ +static PyObject *__pyx_pf_8_packsim_4Calc_2__setstate_cython__(struct __pyx_obj_8_packsim_Calc *__pyx_v_self, PyObject *__pyx_v___pyx_state); /* proto */ +static PyObject *__pyx_pf_8_packsim___pyx_unpickle_Calc(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v___pyx_type, long __pyx_v___pyx_checksum, PyObject *__pyx_v___pyx_state); /* proto */ static int __pyx_pf_7cpython_5array_5array___getbuffer__(arrayobject *__pyx_v_self, Py_buffer *__pyx_v_info, CYTHON_UNUSED int __pyx_v_flags); /* proto */ static void __pyx_pf_7cpython_5array_5array_2__releasebuffer__(CYTHON_UNUSED arrayobject *__pyx_v_self, Py_buffer *__pyx_v_info); /* proto */ static int __pyx_array___pyx_pf_15View_dot_MemoryView_5array___cinit__(struct __pyx_array_obj *__pyx_v_self, PyObject *__pyx_v_shape, Py_ssize_t __pyx_v_itemsize, PyObject *__pyx_v_format, PyObject *__pyx_v_mode, int __pyx_v_allocate_buffer); /* proto */ @@ -3653,11 +3651,11 @@ static PyObject *__pyx_pf_15View_dot_MemoryView_16_memoryviewslice_4base___get__ static PyObject *__pyx_pf___pyx_memoryviewslice___reduce_cython__(CYTHON_UNUSED struct __pyx_memoryviewslice_obj *__pyx_v_self); /* proto */ static PyObject *__pyx_pf___pyx_memoryviewslice_2__setstate_cython__(CYTHON_UNUSED struct __pyx_memoryviewslice_obj *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state); /* proto */ static PyObject *__pyx_pf_15View_dot_MemoryView___pyx_unpickle_Enum(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v___pyx_type, long __pyx_v___pyx_checksum, PyObject *__pyx_v___pyx_state); /* proto */ -static PyObject *__pyx_tp_new_12packsim_core_VoronoiContainer(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ -static PyObject *__pyx_tp_new_12packsim_core_AreaEnergy(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ -static PyObject *__pyx_tp_new_12packsim_core_RadialALEnergy(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ -static PyObject *__pyx_tp_new_12packsim_core_RadialTEnergy(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ -static PyObject *__pyx_tp_new_12packsim_core_Calc(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ +static PyObject *__pyx_tp_new_8_packsim_VoronoiContainer(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ +static PyObject *__pyx_tp_new_8_packsim_AreaEnergy(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ +static PyObject *__pyx_tp_new_8_packsim_RadialALEnergy(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ +static PyObject *__pyx_tp_new_8_packsim_RadialTEnergy(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ +static PyObject *__pyx_tp_new_8_packsim_Calc(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ static PyObject *__pyx_tp_new_array(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ static PyObject *__pyx_tp_new_Enum(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ static PyObject *__pyx_tp_new_memoryview(PyTypeObject *t, PyObject *a, PyObject *k); /*proto*/ @@ -3714,7 +3712,7 @@ static PyObject *__pyx_codeobj__32; static PyObject *__pyx_codeobj__39; /* Late includes */ -/* "core.pyx":61 +/* "src/core.pyx":61 * #### IArray Methods #### * * cdef inline IArray init_iarray(INT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -3722,13 +3720,13 @@ static PyObject *__pyx_codeobj__39; * iarray.arr, iarray.shape = arr, shape */ -static CYTHON_INLINE struct __pyx_t_12packsim_core_IArray __pyx_f_12packsim_core_init_iarray(__pyx_t_12packsim_core_INT_T *__pyx_v_arr, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_shape) { - struct __pyx_t_12packsim_core_IArray __pyx_v_iarray; - struct __pyx_t_12packsim_core_IArray __pyx_r; - __pyx_t_12packsim_core_INT_T *__pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; +static CYTHON_INLINE struct __pyx_t_8_packsim_IArray __pyx_f_8_packsim_init_iarray(__pyx_t_8_packsim_INT_T *__pyx_v_arr, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_shape) { + struct __pyx_t_8_packsim_IArray __pyx_v_iarray; + struct __pyx_t_8_packsim_IArray __pyx_r; + __pyx_t_8_packsim_INT_T *__pyx_t_1; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "core.pyx":63 + /* "src/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 # <<<<<<<<<<<<<< @@ -3740,25 +3738,25 @@ static CYTHON_INLINE struct __pyx_t_12packsim_core_IArray __pyx_f_12packsim_core __pyx_v_iarray.arr = __pyx_t_1; __pyx_v_iarray.shape = __pyx_t_2; - /* "core.pyx":65 + /* "src/core.pyx":65 * iarray.arr, iarray.shape = arr, shape * * iarray.get = iarray_get # <<<<<<<<<<<<<< * iarray.set = iarray_set * return iarray */ - __pyx_v_iarray.get = __pyx_f_12packsim_core_iarray_get; + __pyx_v_iarray.get = __pyx_f_8_packsim_iarray_get; - /* "core.pyx":66 + /* "src/core.pyx":66 * * iarray.get = iarray_get * iarray.set = iarray_set # <<<<<<<<<<<<<< * return iarray * */ - __pyx_v_iarray.set = __pyx_f_12packsim_core_iarray_set; + __pyx_v_iarray.set = __pyx_f_8_packsim_iarray_set; - /* "core.pyx":67 + /* "src/core.pyx":67 * iarray.get = iarray_get * iarray.set = iarray_set * return iarray # <<<<<<<<<<<<<< @@ -3768,7 +3766,7 @@ static CYTHON_INLINE struct __pyx_t_12packsim_core_IArray __pyx_f_12packsim_core __pyx_r = __pyx_v_iarray; goto __pyx_L0; - /* "core.pyx":61 + /* "src/core.pyx":61 * #### IArray Methods #### * * cdef inline IArray init_iarray(INT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -3781,7 +3779,7 @@ static CYTHON_INLINE struct __pyx_t_12packsim_core_IArray __pyx_f_12packsim_core return __pyx_r; } -/* "core.pyx":69 +/* "src/core.pyx":69 * return iarray * * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -3789,7 +3787,7 @@ static CYTHON_INLINE struct __pyx_t_12packsim_core_IArray __pyx_f_12packsim_core * with gil: */ -static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __pyx_t_12packsim_core_IArray *__pyx_v_self, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_index) { +static CYTHON_INLINE int __pyx_f_8_packsim_iarray_valid_indices(struct __pyx_t_8_packsim_IArray *__pyx_v_self, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_index) { int __pyx_r; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -3804,7 +3802,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py #endif __Pyx_RefNannySetupContext("iarray_valid_indices", 1); - /* "core.pyx":70 + /* "src/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]: # <<<<<<<<<<<<<< @@ -3823,7 +3821,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py __pyx_L7_bool_binop_done:; if (__pyx_t_1) { - /* "core.pyx":71 + /* "src/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: # <<<<<<<<<<<<<< @@ -3836,14 +3834,14 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py #endif /*try:*/ { - /* "core.pyx":72 + /* "src/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}") # <<<<<<<<<<<<<< * * cdef inline INT_T iarray_get(IArray* self, (INT_T, INT_T) index) nogil: */ - __pyx_t_3 = __pyx_convert__to_py___pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc(__pyx_v_self->shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 72, __pyx_L10_error) + __pyx_t_3 = __pyx_convert__to_py___pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc(__pyx_v_self->shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 72, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = __Pyx_PyObject_FormatSimple(__pyx_t_3, __pyx_empty_unicode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 72, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_4); @@ -3859,7 +3857,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py __PYX_ERR(0, 72, __pyx_L10_error) } - /* "core.pyx":71 + /* "src/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: # <<<<<<<<<<<<<< @@ -3876,7 +3874,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py } } - /* "core.pyx":70 + /* "src/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]: # <<<<<<<<<<<<<< @@ -3901,7 +3899,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py __pyx_L5:; } - /* "core.pyx":69 + /* "src/core.pyx":69 * return iarray * * cdef inline bint iarray_valid_indices(IArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -3915,7 +3913,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); - __Pyx_WriteUnraisable("packsim_core.iarray_valid_indices", __pyx_clineno, __pyx_lineno, __pyx_filename, 1, 1); + __Pyx_WriteUnraisable("_packsim.iarray_valid_indices", __pyx_clineno, __pyx_lineno, __pyx_filename, 1, 1); __pyx_r = 0; __pyx_L0:; #ifdef WITH_THREAD @@ -3924,7 +3922,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py return __pyx_r; } -/* "core.pyx":74 +/* "src/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: # <<<<<<<<<<<<<< @@ -3932,10 +3930,10 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_iarray_valid_indices(struct __py * return self.arr[index[0]*self.shape[1] + index[1]] */ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_iarray_get(struct __pyx_t_12packsim_core_IArray *__pyx_v_self, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_index) { - __pyx_t_12packsim_core_INT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_iarray_get(struct __pyx_t_8_packsim_IArray *__pyx_v_self, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_index) { + __pyx_t_8_packsim_INT_T __pyx_r; - /* "core.pyx":76 + /* "src/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]] # <<<<<<<<<<<<<< @@ -3945,7 +3943,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_iarray_ __pyx_r = (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]); goto __pyx_L0; - /* "core.pyx":74 + /* "src/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: # <<<<<<<<<<<<<< @@ -3958,7 +3956,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_iarray_ return __pyx_r; } -/* "core.pyx":78 +/* "src/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: # <<<<<<<<<<<<<< @@ -3966,9 +3964,9 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_iarray_ * self.arr[index[0]*self.shape[1] + index[1]] = val */ -static CYTHON_INLINE void __pyx_f_12packsim_core_iarray_set(struct __pyx_t_12packsim_core_IArray *__pyx_v_self, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_index, __pyx_t_12packsim_core_INT_T __pyx_v_val) { +static CYTHON_INLINE void __pyx_f_8_packsim_iarray_set(struct __pyx_t_8_packsim_IArray *__pyx_v_self, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_index, __pyx_t_8_packsim_INT_T __pyx_v_val) { - /* "core.pyx":80 + /* "src/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 # <<<<<<<<<<<<<< @@ -3977,7 +3975,7 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_iarray_set(struct __pyx_t_12pac */ (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]) = __pyx_v_val; - /* "core.pyx":78 + /* "src/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: # <<<<<<<<<<<<<< @@ -3988,7 +3986,7 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_iarray_set(struct __pyx_t_12pac /* function exit code */ } -/* "core.pyx":85 +/* "src/core.pyx":85 * #### FArray Methods #### * * cdef inline FArray init_farray(FLOAT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -3996,13 +3994,13 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_iarray_set(struct __pyx_t_12pac * farray.arr, farray.shape = arr, shape */ -static CYTHON_INLINE __pyx_t_12packsim_core_FArray __pyx_f_12packsim_core_init_farray(__pyx_t_12packsim_core_FLOAT_T *__pyx_v_arr, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_shape) { - __pyx_t_12packsim_core_FArray __pyx_v_farray; - __pyx_t_12packsim_core_FArray __pyx_r; - __pyx_t_12packsim_core_FLOAT_T *__pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; +static CYTHON_INLINE __pyx_t_8_packsim_FArray __pyx_f_8_packsim_init_farray(__pyx_t_8_packsim_FLOAT_T *__pyx_v_arr, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_shape) { + __pyx_t_8_packsim_FArray __pyx_v_farray; + __pyx_t_8_packsim_FArray __pyx_r; + __pyx_t_8_packsim_FLOAT_T *__pyx_t_1; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "core.pyx":87 + /* "src/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 # <<<<<<<<<<<<<< @@ -4014,25 +4012,25 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FArray __pyx_f_12packsim_core_init_f __pyx_v_farray.arr = __pyx_t_1; __pyx_v_farray.shape = __pyx_t_2; - /* "core.pyx":89 + /* "src/core.pyx":89 * farray.arr, farray.shape = arr, shape * * farray.get = farray_get # <<<<<<<<<<<<<< * farray.set = farray_set * return farray */ - __pyx_v_farray.get = __pyx_f_12packsim_core_farray_get; + __pyx_v_farray.get = __pyx_f_8_packsim_farray_get; - /* "core.pyx":90 + /* "src/core.pyx":90 * * farray.get = farray_get * farray.set = farray_set # <<<<<<<<<<<<<< * return farray * */ - __pyx_v_farray.set = __pyx_f_12packsim_core_farray_set; + __pyx_v_farray.set = __pyx_f_8_packsim_farray_set; - /* "core.pyx":91 + /* "src/core.pyx":91 * farray.get = farray_get * farray.set = farray_set * return farray # <<<<<<<<<<<<<< @@ -4042,7 +4040,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FArray __pyx_f_12packsim_core_init_f __pyx_r = __pyx_v_farray; goto __pyx_L0; - /* "core.pyx":85 + /* "src/core.pyx":85 * #### FArray Methods #### * * cdef inline FArray init_farray(FLOAT_T* arr, (INT_T, INT_T) shape) nogil: # <<<<<<<<<<<<<< @@ -4055,7 +4053,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FArray __pyx_f_12packsim_core_init_f return __pyx_r; } -/* "core.pyx":93 +/* "src/core.pyx":93 * return farray * * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -4063,7 +4061,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FArray __pyx_f_12packsim_core_init_f * with gil: */ -static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12packsim_core_FArray *__pyx_v_self, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_index) { +static CYTHON_INLINE int __pyx_f_8_packsim_farray_valid_indices(__pyx_t_8_packsim_FArray *__pyx_v_self, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_index) { int __pyx_r; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -4078,7 +4076,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p #endif __Pyx_RefNannySetupContext("farray_valid_indices", 1); - /* "core.pyx":94 + /* "src/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]: # <<<<<<<<<<<<<< @@ -4097,7 +4095,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p __pyx_L7_bool_binop_done:; if (__pyx_t_1) { - /* "core.pyx":95 + /* "src/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: # <<<<<<<<<<<<<< @@ -4110,14 +4108,14 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p #endif /*try:*/ { - /* "core.pyx":96 + /* "src/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}") # <<<<<<<<<<<<<< * * cdef inline FLOAT_T farray_get(FArray* self, (INT_T, INT_T) index) nogil: */ - __pyx_t_3 = __pyx_convert__to_py___pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc(__pyx_v_self->shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 96, __pyx_L10_error) + __pyx_t_3 = __pyx_convert__to_py___pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc(__pyx_v_self->shape); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 96, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = __Pyx_PyObject_FormatSimple(__pyx_t_3, __pyx_empty_unicode); if (unlikely(!__pyx_t_4)) __PYX_ERR(0, 96, __pyx_L10_error) __Pyx_GOTREF(__pyx_t_4); @@ -4133,7 +4131,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p __PYX_ERR(0, 96, __pyx_L10_error) } - /* "core.pyx":95 + /* "src/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: # <<<<<<<<<<<<<< @@ -4150,7 +4148,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p } } - /* "core.pyx":94 + /* "src/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]: # <<<<<<<<<<<<<< @@ -4175,7 +4173,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p __pyx_L5:; } - /* "core.pyx":93 + /* "src/core.pyx":93 * return farray * * cdef inline bint farray_valid_indices(FArray* self, (INT_T, INT_T) index) nogil: # <<<<<<<<<<<<<< @@ -4189,7 +4187,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); - __Pyx_WriteUnraisable("packsim_core.farray_valid_indices", __pyx_clineno, __pyx_lineno, __pyx_filename, 1, 1); + __Pyx_WriteUnraisable("_packsim.farray_valid_indices", __pyx_clineno, __pyx_lineno, __pyx_filename, 1, 1); __pyx_r = 0; __pyx_L0:; #ifdef WITH_THREAD @@ -4198,7 +4196,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p return __pyx_r; } -/* "core.pyx":98 +/* "src/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: # <<<<<<<<<<<<<< @@ -4206,10 +4204,10 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_farray_valid_indices(__pyx_t_12p * return self.arr[index[0]*self.shape[1] + index[1]] */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_farray_get(__pyx_t_12packsim_core_FArray *__pyx_v_self, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_index) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_farray_get(__pyx_t_8_packsim_FArray *__pyx_v_self, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_index) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; - /* "core.pyx":100 + /* "src/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]] # <<<<<<<<<<<<<< @@ -4219,7 +4217,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_farra __pyx_r = (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]); goto __pyx_L0; - /* "core.pyx":98 + /* "src/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: # <<<<<<<<<<<<<< @@ -4232,7 +4230,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_farra return __pyx_r; } -/* "core.pyx":102 +/* "src/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: # <<<<<<<<<<<<<< @@ -4240,9 +4238,9 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_farra * self.arr[index[0]*self.shape[1] + index[1]] = val */ -static CYTHON_INLINE void __pyx_f_12packsim_core_farray_set(__pyx_t_12packsim_core_FArray *__pyx_v_self, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_v_index, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { +static CYTHON_INLINE void __pyx_f_8_packsim_farray_set(__pyx_t_8_packsim_FArray *__pyx_v_self, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_v_index, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { - /* "core.pyx":104 + /* "src/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 # <<<<<<<<<<<<<< @@ -4251,7 +4249,7 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_farray_set(__pyx_t_12packsim_co */ (__pyx_v_self->arr[((__pyx_v_index.f0 * __pyx_v_self->shape.f1) + __pyx_v_index.f1)]) = __pyx_v_val; - /* "core.pyx":102 + /* "src/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: # <<<<<<<<<<<<<< @@ -4262,7 +4260,7 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_farray_set(__pyx_t_12packsim_co /* function exit code */ } -/* "core.pyx":132 +/* "src/core.pyx":132 * #### BitSet Methods #### * * cdef inline BitSet init_bitset(INT_T elements) nogil: # <<<<<<<<<<<<<< @@ -4270,34 +4268,34 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_farray_set(__pyx_t_12packsim_co * bitset.bits = calloc(((elements/sizeof(INT_T))+1), sizeof(INT_T)) */ -static CYTHON_INLINE __pyx_t_12packsim_core_BitSet __pyx_f_12packsim_core_init_bitset(__pyx_t_12packsim_core_INT_T __pyx_v_elements) { - __pyx_t_12packsim_core_BitSet __pyx_v_bitset; - __pyx_t_12packsim_core_BitSet __pyx_r; - int (*__pyx_t_1)(__pyx_t_12packsim_core_BitSet *, __pyx_t_12packsim_core_INT_T); - void (*__pyx_t_2)(__pyx_t_12packsim_core_BitSet *); +static CYTHON_INLINE __pyx_t_8_packsim_BitSet __pyx_f_8_packsim_init_bitset(__pyx_t_8_packsim_INT_T __pyx_v_elements) { + __pyx_t_8_packsim_BitSet __pyx_v_bitset; + __pyx_t_8_packsim_BitSet __pyx_r; + int (*__pyx_t_1)(__pyx_t_8_packsim_BitSet *, __pyx_t_8_packsim_INT_T); + void (*__pyx_t_2)(__pyx_t_8_packsim_BitSet *); - /* "core.pyx":134 + /* "src/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)) # <<<<<<<<<<<<<< * * bitset.add, bitset.free = bitset_add, bitset_free */ - __pyx_v_bitset.bits = ((__pyx_t_12packsim_core_INT_T *)calloc(((__pyx_v_elements / ((__pyx_t_12packsim_core_INT_T)(sizeof(__pyx_t_12packsim_core_INT_T)))) + 1), (sizeof(__pyx_t_12packsim_core_INT_T)))); + __pyx_v_bitset.bits = ((__pyx_t_8_packsim_INT_T *)calloc(((__pyx_v_elements / ((__pyx_t_8_packsim_INT_T)(sizeof(__pyx_t_8_packsim_INT_T)))) + 1), (sizeof(__pyx_t_8_packsim_INT_T)))); - /* "core.pyx":136 + /* "src/core.pyx":136 * bitset.bits = calloc(((elements/sizeof(INT_T))+1), sizeof(INT_T)) * * bitset.add, bitset.free = bitset_add, bitset_free # <<<<<<<<<<<<<< * return bitset * */ - __pyx_t_1 = __pyx_f_12packsim_core_bitset_add; - __pyx_t_2 = __pyx_f_12packsim_core_bitset_free; + __pyx_t_1 = __pyx_f_8_packsim_bitset_add; + __pyx_t_2 = __pyx_f_8_packsim_bitset_free; __pyx_v_bitset.add = __pyx_t_1; __pyx_v_bitset.free = __pyx_t_2; - /* "core.pyx":137 + /* "src/core.pyx":137 * * bitset.add, bitset.free = bitset_add, bitset_free * return bitset # <<<<<<<<<<<<<< @@ -4307,7 +4305,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_BitSet __pyx_f_12packsim_core_init_b __pyx_r = __pyx_v_bitset; goto __pyx_L0; - /* "core.pyx":132 + /* "src/core.pyx":132 * #### BitSet Methods #### * * cdef inline BitSet init_bitset(INT_T elements) nogil: # <<<<<<<<<<<<<< @@ -4320,7 +4318,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_BitSet __pyx_f_12packsim_core_init_b return __pyx_r; } -/* "core.pyx":139 +/* "src/core.pyx":139 * return bitset * * cdef inline bint bitset_add(BitSet* self, INT_T val) nogil: # <<<<<<<<<<<<<< @@ -4328,22 +4326,22 @@ static CYTHON_INLINE __pyx_t_12packsim_core_BitSet __pyx_f_12packsim_core_init_b * index = val/sizeof(INT_T) */ -static CYTHON_INLINE int __pyx_f_12packsim_core_bitset_add(__pyx_t_12packsim_core_BitSet *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_val) { - __pyx_t_12packsim_core_INT_T __pyx_v_index; - __pyx_t_12packsim_core_INT_T __pyx_v_rel_index; - __pyx_t_12packsim_core_INT_T __pyx_v_old; +static CYTHON_INLINE int __pyx_f_8_packsim_bitset_add(__pyx_t_8_packsim_BitSet *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_val) { + __pyx_t_8_packsim_INT_T __pyx_v_index; + __pyx_t_8_packsim_INT_T __pyx_v_rel_index; + __pyx_t_8_packsim_INT_T __pyx_v_old; int __pyx_r; - /* "core.pyx":141 + /* "src/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) # <<<<<<<<<<<<<< * old = self.bits[index] * rel_index = val - index*sizeof(INT_T) */ - __pyx_v_index = (__pyx_v_val / ((__pyx_t_12packsim_core_INT_T)(sizeof(__pyx_t_12packsim_core_INT_T)))); + __pyx_v_index = (__pyx_v_val / ((__pyx_t_8_packsim_INT_T)(sizeof(__pyx_t_8_packsim_INT_T)))); - /* "core.pyx":142 + /* "src/core.pyx":142 * cdef INT_T index, rel_index, old * index = val/sizeof(INT_T) * old = self.bits[index] # <<<<<<<<<<<<<< @@ -4352,16 +4350,16 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_bitset_add(__pyx_t_12packsim_cor */ __pyx_v_old = (__pyx_v_self->bits[__pyx_v_index]); - /* "core.pyx":143 + /* "src/core.pyx":143 * index = val/sizeof(INT_T) * old = self.bits[index] * rel_index = val - index*sizeof(INT_T) # <<<<<<<<<<<<<< * * self.bits[index] = (1 << rel_index) | old # New value. */ - __pyx_v_rel_index = (__pyx_v_val - (__pyx_v_index * (sizeof(__pyx_t_12packsim_core_INT_T)))); + __pyx_v_rel_index = (__pyx_v_val - (__pyx_v_index * (sizeof(__pyx_t_8_packsim_INT_T)))); - /* "core.pyx":145 + /* "src/core.pyx":145 * rel_index = val - index*sizeof(INT_T) * * self.bits[index] = (1 << rel_index) | old # New value. # <<<<<<<<<<<<<< @@ -4370,7 +4368,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_bitset_add(__pyx_t_12packsim_cor */ (__pyx_v_self->bits[__pyx_v_index]) = ((1 << __pyx_v_rel_index) | __pyx_v_old); - /* "core.pyx":147 + /* "src/core.pyx":147 * self.bits[index] = (1 << rel_index) | old # New value. * * return old == self.bits[index] # Means 1 was already there. # <<<<<<<<<<<<<< @@ -4380,7 +4378,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_bitset_add(__pyx_t_12packsim_cor __pyx_r = (__pyx_v_old == (__pyx_v_self->bits[__pyx_v_index])); goto __pyx_L0; - /* "core.pyx":139 + /* "src/core.pyx":139 * return bitset * * cdef inline bint bitset_add(BitSet* self, INT_T val) nogil: # <<<<<<<<<<<<<< @@ -4393,7 +4391,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_bitset_add(__pyx_t_12packsim_cor return __pyx_r; } -/* "core.pyx":149 +/* "src/core.pyx":149 * return old == self.bits[index] # Means 1 was already there. * * cdef inline void bitset_free(BitSet* self) nogil: # <<<<<<<<<<<<<< @@ -4401,9 +4399,9 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_bitset_add(__pyx_t_12packsim_cor * */ -static CYTHON_INLINE void __pyx_f_12packsim_core_bitset_free(__pyx_t_12packsim_core_BitSet *__pyx_v_self) { +static CYTHON_INLINE void __pyx_f_8_packsim_bitset_free(__pyx_t_8_packsim_BitSet *__pyx_v_self) { - /* "core.pyx":150 + /* "src/core.pyx":150 * * cdef inline void bitset_free(BitSet* self) nogil: * free(self.bits) # <<<<<<<<<<<<<< @@ -4412,7 +4410,7 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_bitset_free(__pyx_t_12packsim_c */ free(__pyx_v_self->bits); - /* "core.pyx":149 + /* "src/core.pyx":149 * return old == self.bits[index] # Means 1 was already there. * * cdef inline void bitset_free(BitSet* self) nogil: # <<<<<<<<<<<<<< @@ -4423,7 +4421,7 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_bitset_free(__pyx_t_12packsim_c /* function exit code */ } -/* "core.pyx":163 +/* "src/core.pyx":163 * """ * * cdef inline Vector2D init_vector2d(FLOAT_T x, FLOAT_T y) nogil: # <<<<<<<<<<<<<< @@ -4431,19 +4429,19 @@ static CYTHON_INLINE void __pyx_f_12packsim_core_bitset_free(__pyx_t_12packsim_c * vec.x, vec.y = x, y */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_init_vector2d(__pyx_t_12packsim_core_FLOAT_T __pyx_v_x, __pyx_t_12packsim_core_FLOAT_T __pyx_v_y) { - __pyx_t_12packsim_core_Vector2D __pyx_v_vec; - __pyx_t_12packsim_core_Vector2D __pyx_r; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_2; - __pyx_t_12packsim_core_VectorSelfOps __pyx_t_3; - __pyx_t_12packsim_core_VectorCopyOps __pyx_t_4; - int (*__pyx_t_5)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_6)(__pyx_t_12packsim_core_Vector2D *); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_7)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_8)(__pyx_t_12packsim_core_Vector2D *); +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_init_vector2d(__pyx_t_8_packsim_FLOAT_T __pyx_v_x, __pyx_t_8_packsim_FLOAT_T __pyx_v_y) { + __pyx_t_8_packsim_Vector2D __pyx_v_vec; + __pyx_t_8_packsim_Vector2D __pyx_r; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_2; + __pyx_t_8_packsim_VectorSelfOps __pyx_t_3; + __pyx_t_8_packsim_VectorCopyOps __pyx_t_4; + int (*__pyx_t_5)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_6)(__pyx_t_8_packsim_Vector2D *); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_7)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_8)(__pyx_t_8_packsim_Vector2D *); - /* "core.pyx":165 + /* "src/core.pyx":165 * cdef inline Vector2D init_vector2d(FLOAT_T x, FLOAT_T y) nogil: * cdef Vector2D vec * vec.x, vec.y = x, y # <<<<<<<<<<<<<< @@ -4455,35 +4453,35 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_init __pyx_v_vec.x = __pyx_t_1; __pyx_v_vec.y = __pyx_t_2; - /* "core.pyx":166 + /* "src/core.pyx":166 * cdef Vector2D vec * vec.x, vec.y = x, y * vec.self, vec.copy = VSO, VCO # <<<<<<<<<<<<<< * * vec.equals, vec.rot, vec.dot, vec.mag = v_equals, rot, dot, mag */ - __pyx_t_3 = __pyx_v_12packsim_core_VSO; - __pyx_t_4 = __pyx_v_12packsim_core_VCO; + __pyx_t_3 = __pyx_v_8_packsim_VSO; + __pyx_t_4 = __pyx_v_8_packsim_VCO; __pyx_v_vec.self = __pyx_t_3; __pyx_v_vec.copy = __pyx_t_4; - /* "core.pyx":168 + /* "src/core.pyx":168 * vec.self, vec.copy = VSO, VCO * * vec.equals, vec.rot, vec.dot, vec.mag = v_equals, rot, dot, mag # <<<<<<<<<<<<<< * * return vec */ - __pyx_t_5 = __pyx_f_12packsim_core_v_equals; - __pyx_t_6 = __pyx_f_12packsim_core_rot; - __pyx_t_7 = __pyx_f_12packsim_core_dot; - __pyx_t_8 = __pyx_f_12packsim_core_mag; + __pyx_t_5 = __pyx_f_8_packsim_v_equals; + __pyx_t_6 = __pyx_f_8_packsim_rot; + __pyx_t_7 = __pyx_f_8_packsim_dot; + __pyx_t_8 = __pyx_f_8_packsim_mag; __pyx_v_vec.equals = __pyx_t_5; __pyx_v_vec.rot = __pyx_t_6; __pyx_v_vec.dot = __pyx_t_7; __pyx_v_vec.mag = __pyx_t_8; - /* "core.pyx":170 + /* "src/core.pyx":170 * vec.equals, vec.rot, vec.dot, vec.mag = v_equals, rot, dot, mag * * return vec # <<<<<<<<<<<<<< @@ -4493,7 +4491,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_init __pyx_r = __pyx_v_vec; goto __pyx_L0; - /* "core.pyx":163 + /* "src/core.pyx":163 * """ * * cdef inline Vector2D init_vector2d(FLOAT_T x, FLOAT_T y) nogil: # <<<<<<<<<<<<<< @@ -4506,7 +4504,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_init return __pyx_r; } -/* "core.pyx":173 +/* "src/core.pyx":173 * * * cdef inline bint v_equals(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4514,12 +4512,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_init * */ -static CYTHON_INLINE int __pyx_f_12packsim_core_v_equals(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { +static CYTHON_INLINE int __pyx_f_8_packsim_v_equals(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { int __pyx_r; int __pyx_t_1; int __pyx_t_2; - /* "core.pyx":174 + /* "src/core.pyx":174 * * cdef inline bint v_equals(Vector2D* self, Vector2D w) nogil: * return ((self.x == w.x) and (self.y == w.y)) # <<<<<<<<<<<<<< @@ -4538,7 +4536,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_v_equals(__pyx_t_12packsim_core_ __pyx_r = __pyx_t_1; goto __pyx_L0; - /* "core.pyx":173 + /* "src/core.pyx":173 * * * cdef inline bint v_equals(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4551,7 +4549,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_v_equals(__pyx_t_12packsim_core_ return __pyx_r; } -/* "core.pyx":176 +/* "src/core.pyx":176 * return ((self.x == w.x) and (self.y == w.y)) * * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -4559,10 +4557,10 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_v_equals(__pyx_t_12packsim_core_ * self.y = -self.y */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_neg_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_neg_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":177 + /* "src/core.pyx":177 * * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: * self.x = -self.x # <<<<<<<<<<<<<< @@ -4571,7 +4569,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_n */ __pyx_v_self->x = (-__pyx_v_self->x); - /* "core.pyx":178 + /* "src/core.pyx":178 * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: * self.x = -self.x * self.y = -self.y # <<<<<<<<<<<<<< @@ -4580,7 +4578,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_n */ __pyx_v_self->y = (-__pyx_v_self->y); - /* "core.pyx":179 + /* "src/core.pyx":179 * self.x = -self.x * self.y = -self.y * return self # <<<<<<<<<<<<<< @@ -4590,7 +4588,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_n __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":176 + /* "src/core.pyx":176 * return ((self.x == w.x) and (self.y == w.y)) * * cdef inline Vector2D* v_neg_s(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -4603,7 +4601,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_n return __pyx_r; } -/* "core.pyx":181 +/* "src/core.pyx":181 * return self * * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4611,10 +4609,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_n * self.y += w.y */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vadd_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vadd_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":182 + /* "src/core.pyx":182 * * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: * self.x += w.x # <<<<<<<<<<<<<< @@ -4623,7 +4621,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->x = (__pyx_v_self->x + __pyx_v_w.x); - /* "core.pyx":183 + /* "src/core.pyx":183 * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: * self.x += w.x * self.y += w.y # <<<<<<<<<<<<<< @@ -4632,7 +4630,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->y = (__pyx_v_self->y + __pyx_v_w.y); - /* "core.pyx":184 + /* "src/core.pyx":184 * self.x += w.x * self.y += w.y * return self # <<<<<<<<<<<<<< @@ -4642,7 +4640,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":181 + /* "src/core.pyx":181 * return self * * cdef inline Vector2D* v_vadd_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4655,7 +4653,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v return __pyx_r; } -/* "core.pyx":186 +/* "src/core.pyx":186 * return self * * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4663,10 +4661,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v * self.y -= w.y */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vsub_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vsub_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":187 + /* "src/core.pyx":187 * * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: * self.x -= w.x # <<<<<<<<<<<<<< @@ -4675,7 +4673,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->x = (__pyx_v_self->x - __pyx_v_w.x); - /* "core.pyx":188 + /* "src/core.pyx":188 * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: * self.x -= w.x * self.y -= w.y # <<<<<<<<<<<<<< @@ -4684,7 +4682,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->y = (__pyx_v_self->y - __pyx_v_w.y); - /* "core.pyx":189 + /* "src/core.pyx":189 * self.x -= w.x * self.y -= w.y * return self # <<<<<<<<<<<<<< @@ -4694,7 +4692,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":186 + /* "src/core.pyx":186 * return self * * cdef inline Vector2D* v_vsub_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4707,7 +4705,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v return __pyx_r; } -/* "core.pyx":191 +/* "src/core.pyx":191 * return self * * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4715,10 +4713,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v * self.y *= w.y */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vmul_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vmul_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":192 + /* "src/core.pyx":192 * * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: * self.x *= w.x # <<<<<<<<<<<<<< @@ -4727,7 +4725,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->x = (__pyx_v_self->x * __pyx_v_w.x); - /* "core.pyx":193 + /* "src/core.pyx":193 * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: * self.x *= w.x * self.y *= w.y # <<<<<<<<<<<<<< @@ -4736,7 +4734,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->y = (__pyx_v_self->y * __pyx_v_w.y); - /* "core.pyx":194 + /* "src/core.pyx":194 * self.x *= w.x * self.y *= w.y * return self # <<<<<<<<<<<<<< @@ -4746,7 +4744,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":191 + /* "src/core.pyx":191 * return self * * cdef inline Vector2D* v_vmul_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4759,7 +4757,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v return __pyx_r; } -/* "core.pyx":196 +/* "src/core.pyx":196 * return self * * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4767,10 +4765,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v * self.y /= w.y */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_vdiv_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_vdiv_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":197 + /* "src/core.pyx":197 * * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: * self.x /= w.x # <<<<<<<<<<<<<< @@ -4779,7 +4777,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->x = (__pyx_v_self->x / __pyx_v_w.x); - /* "core.pyx":198 + /* "src/core.pyx":198 * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: * self.x /= w.x * self.y /= w.y # <<<<<<<<<<<<<< @@ -4788,7 +4786,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v */ __pyx_v_self->y = (__pyx_v_self->y / __pyx_v_w.y); - /* "core.pyx":199 + /* "src/core.pyx":199 * self.x /= w.x * self.y /= w.y * return self # <<<<<<<<<<<<<< @@ -4798,7 +4796,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":196 + /* "src/core.pyx":196 * return self * * cdef inline Vector2D* v_vdiv_s(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -4811,7 +4809,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v return __pyx_r; } -/* "core.pyx":201 +/* "src/core.pyx":201 * return self * * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4819,10 +4817,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_v * self.y += s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_sadd_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_sadd_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":202 + /* "src/core.pyx":202 * * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: * self.x += s # <<<<<<<<<<<<<< @@ -4831,7 +4829,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->x = (__pyx_v_self->x + __pyx_v_s); - /* "core.pyx":203 + /* "src/core.pyx":203 * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: * self.x += s * self.y += s # <<<<<<<<<<<<<< @@ -4840,7 +4838,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->y = (__pyx_v_self->y + __pyx_v_s); - /* "core.pyx":204 + /* "src/core.pyx":204 * self.x += s * self.y += s * return self # <<<<<<<<<<<<<< @@ -4850,7 +4848,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":201 + /* "src/core.pyx":201 * return self * * cdef inline Vector2D* v_sadd_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4863,7 +4861,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s return __pyx_r; } -/* "core.pyx":206 +/* "src/core.pyx":206 * return self * * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4871,10 +4869,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s * self.y -= s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_ssub_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_ssub_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":207 + /* "src/core.pyx":207 * * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: * self.x -= s # <<<<<<<<<<<<<< @@ -4883,7 +4881,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->x = (__pyx_v_self->x - __pyx_v_s); - /* "core.pyx":208 + /* "src/core.pyx":208 * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: * self.x -= s * self.y -= s # <<<<<<<<<<<<<< @@ -4892,7 +4890,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->y = (__pyx_v_self->y - __pyx_v_s); - /* "core.pyx":209 + /* "src/core.pyx":209 * self.x -= s * self.y -= s * return self # <<<<<<<<<<<<<< @@ -4902,7 +4900,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":206 + /* "src/core.pyx":206 * return self * * cdef inline Vector2D* v_ssub_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4915,7 +4913,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s return __pyx_r; } -/* "core.pyx":211 +/* "src/core.pyx":211 * return self * * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4923,10 +4921,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s * self.y *= s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_smul_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_smul_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":212 + /* "src/core.pyx":212 * * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: * self.x *= s # <<<<<<<<<<<<<< @@ -4935,7 +4933,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->x = (__pyx_v_self->x * __pyx_v_s); - /* "core.pyx":213 + /* "src/core.pyx":213 * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: * self.x *= s * self.y *= s # <<<<<<<<<<<<<< @@ -4944,7 +4942,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->y = (__pyx_v_self->y * __pyx_v_s); - /* "core.pyx":214 + /* "src/core.pyx":214 * self.x *= s * self.y *= s * return self # <<<<<<<<<<<<<< @@ -4954,7 +4952,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":211 + /* "src/core.pyx":211 * return self * * cdef inline Vector2D* v_smul_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4967,7 +4965,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s return __pyx_r; } -/* "core.pyx":216 +/* "src/core.pyx":216 * return self * * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -4975,10 +4973,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s * self.y /= s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_sdiv_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_sdiv_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D *__pyx_r; - /* "core.pyx":217 + /* "src/core.pyx":217 * * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: * self.x /= s # <<<<<<<<<<<<<< @@ -4987,7 +4985,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->x = (__pyx_v_self->x / __pyx_v_s); - /* "core.pyx":218 + /* "src/core.pyx":218 * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: * self.x /= s * self.y /= s # <<<<<<<<<<<<<< @@ -4996,7 +4994,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s */ __pyx_v_self->y = (__pyx_v_self->y / __pyx_v_s); - /* "core.pyx":219 + /* "src/core.pyx":219 * self.x /= s * self.y /= s * return self # <<<<<<<<<<<<<< @@ -5006,7 +5004,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":216 + /* "src/core.pyx":216 * return self * * cdef inline Vector2D* v_sdiv_s(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5019,7 +5017,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s return __pyx_r; } -/* "core.pyx":221 +/* "src/core.pyx":221 * return self * * cdef inline Vector2D* v_matmul_s(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5027,12 +5025,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_s * return self */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_matmul_s(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Vector2D *__pyx_r; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_2; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D *__pyx_f_8_packsim_v_matmul_s(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Vector2D *__pyx_r; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_2; - /* "core.pyx":222 + /* "src/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 # <<<<<<<<<<<<<< @@ -5044,7 +5042,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_m __pyx_v_self->x = __pyx_t_1; __pyx_v_self->y = __pyx_t_2; - /* "core.pyx":223 + /* "src/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 # <<<<<<<<<<<<<< @@ -5054,7 +5052,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_m __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":221 + /* "src/core.pyx":221 * return self * * cdef inline Vector2D* v_matmul_s(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5067,7 +5065,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_m return __pyx_r; } -/* "core.pyx":225 +/* "src/core.pyx":225 * return self * * cdef inline Vector2D v_neg_c(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5075,20 +5073,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D *__pyx_f_12packsim_core_v_m * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_neg_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_neg_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":226 + /* "src/core.pyx":226 * * cdef inline Vector2D v_neg_c(Vector2D* self) nogil: * return init.Vector2D(-self.x, -self.y) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_vadd_c(Vector2D* self, Vector2D w) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((-__pyx_v_self->x), (-__pyx_v_self->y)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((-__pyx_v_self->x), (-__pyx_v_self->y)); goto __pyx_L0; - /* "core.pyx":225 + /* "src/core.pyx":225 * return self * * cdef inline Vector2D v_neg_c(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5101,7 +5099,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ne return __pyx_r; } -/* "core.pyx":228 +/* "src/core.pyx":228 * return init.Vector2D(-self.x, -self.y) * * cdef inline Vector2D v_vadd_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5109,20 +5107,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ne * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vadd_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vadd_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":229 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_vsub_c(Vector2D* self, Vector2D w) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x + __pyx_v_w.x), (__pyx_v_self->y + __pyx_v_w.y)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x + __pyx_v_w.x), (__pyx_v_self->y + __pyx_v_w.y)); goto __pyx_L0; - /* "core.pyx":228 + /* "src/core.pyx":228 * return init.Vector2D(-self.x, -self.y) * * cdef inline Vector2D v_vadd_c(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5135,7 +5133,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_va return __pyx_r; } -/* "core.pyx":231 +/* "src/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: # <<<<<<<<<<<<<< @@ -5143,20 +5141,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_va * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vsub_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vsub_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":232 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_vmul_c(Vector2D* self, Vector2D w) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x - __pyx_v_w.x), (__pyx_v_self->y - __pyx_v_w.y)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x - __pyx_v_w.x), (__pyx_v_self->y - __pyx_v_w.y)); goto __pyx_L0; - /* "core.pyx":231 + /* "src/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: # <<<<<<<<<<<<<< @@ -5169,7 +5167,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vs return __pyx_r; } -/* "core.pyx":234 +/* "src/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: # <<<<<<<<<<<<<< @@ -5177,20 +5175,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vs * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vmul_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vmul_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":235 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_vdiv_c(Vector2D* self, Vector2D w) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x * __pyx_v_w.x), (__pyx_v_self->y * __pyx_v_w.y)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x * __pyx_v_w.x), (__pyx_v_self->y * __pyx_v_w.y)); goto __pyx_L0; - /* "core.pyx":234 + /* "src/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: # <<<<<<<<<<<<<< @@ -5203,7 +5201,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vm return __pyx_r; } -/* "core.pyx":237 +/* "src/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: # <<<<<<<<<<<<<< @@ -5211,20 +5209,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vm * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vdiv_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_vdiv_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":238 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_sadd_c(Vector2D* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x / __pyx_v_w.x), (__pyx_v_self->y / __pyx_v_w.y)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x / __pyx_v_w.x), (__pyx_v_self->y / __pyx_v_w.y)); goto __pyx_L0; - /* "core.pyx":237 + /* "src/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: # <<<<<<<<<<<<<< @@ -5237,7 +5235,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vd return __pyx_r; } -/* "core.pyx":240 +/* "src/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: # <<<<<<<<<<<<<< @@ -5245,20 +5243,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_vd * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sadd_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_sadd_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":241 + /* "src/core.pyx":241 * * cdef inline Vector2D v_sadd_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x + s, self.y + s) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_ssub_c(Vector2D* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x + __pyx_v_s), (__pyx_v_self->y + __pyx_v_s)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x + __pyx_v_s), (__pyx_v_self->y + __pyx_v_s)); goto __pyx_L0; - /* "core.pyx":240 + /* "src/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: # <<<<<<<<<<<<<< @@ -5271,7 +5269,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sa return __pyx_r; } -/* "core.pyx":243 +/* "src/core.pyx":243 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_ssub_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5279,20 +5277,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sa * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ssub_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_ssub_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":244 + /* "src/core.pyx":244 * * cdef inline Vector2D v_ssub_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x + s, self.y + s) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_smul_c(Vector2D* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x + __pyx_v_s), (__pyx_v_self->y + __pyx_v_s)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x + __pyx_v_s), (__pyx_v_self->y + __pyx_v_s)); goto __pyx_L0; - /* "core.pyx":243 + /* "src/core.pyx":243 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_ssub_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5305,7 +5303,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ss return __pyx_r; } -/* "core.pyx":246 +/* "src/core.pyx":246 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_smul_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5313,20 +5311,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ss * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_smul_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_smul_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":247 + /* "src/core.pyx":247 * * cdef inline Vector2D v_smul_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x * s, self.y * s) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_sdiv_c(Vector2D* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x * __pyx_v_s), (__pyx_v_self->y * __pyx_v_s)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x * __pyx_v_s), (__pyx_v_self->y * __pyx_v_s)); goto __pyx_L0; - /* "core.pyx":246 + /* "src/core.pyx":246 * return init.Vector2D(self.x + s, self.y + s) * * cdef inline Vector2D v_smul_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5339,7 +5337,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sm return __pyx_r; } -/* "core.pyx":249 +/* "src/core.pyx":249 * return init.Vector2D(self.x * s, self.y * s) * * cdef inline Vector2D v_sdiv_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5347,20 +5345,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sm * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sdiv_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_sdiv_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":250 + /* "src/core.pyx":250 * * cdef inline Vector2D v_sdiv_c(Vector2D* self, FLOAT_T s) nogil: * return init.Vector2D(self.x / s, self.y / s) # <<<<<<<<<<<<<< * * cdef inline Vector2D v_matmul_c(Vector2D* self, Matrix2x2 m) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((__pyx_v_self->x / __pyx_v_s), (__pyx_v_self->y / __pyx_v_s)); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((__pyx_v_self->x / __pyx_v_s), (__pyx_v_self->y / __pyx_v_s)); goto __pyx_L0; - /* "core.pyx":249 + /* "src/core.pyx":249 * return init.Vector2D(self.x * s, self.y * s) * * cdef inline Vector2D v_sdiv_c(Vector2D* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -5373,7 +5371,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sd return __pyx_r; } -/* "core.pyx":252 +/* "src/core.pyx":252 * return init.Vector2D(self.x / s, self.y / s) * * cdef inline Vector2D v_matmul_c(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5381,20 +5379,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_sd * self.x*m.a + self.y*m.c, self.x*m.b + self.y*m.d */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_matmul_c(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_v_matmul_c(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":253 + /* "src/core.pyx":253 * * cdef inline Vector2D v_matmul_c(Vector2D* self, Matrix2x2 m) nogil: * return init.Vector2D( # <<<<<<<<<<<<<< * self.x*m.a + self.y*m.c, self.x*m.b + self.y*m.d * ) */ - __pyx_r = __pyx_v_12packsim_core_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))); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":252 + /* "src/core.pyx":252 * return init.Vector2D(self.x / s, self.y / s) * * cdef inline Vector2D v_matmul_c(Vector2D* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5407,7 +5405,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ma return __pyx_r; } -/* "core.pyx":257 +/* "src/core.pyx":257 * ) * * cdef inline Vector2D rot(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5415,20 +5413,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_v_ma * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_rot(__pyx_t_12packsim_core_Vector2D *__pyx_v_self) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_rot(__pyx_t_8_packsim_Vector2D *__pyx_v_self) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":258 + /* "src/core.pyx":258 * * cdef inline Vector2D rot(Vector2D* self) nogil: * return init.Vector2D(-self.y, self.x) # <<<<<<<<<<<<<< * * cdef inline FLOAT_T dot(Vector2D* self, Vector2D w) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Vector2D((-__pyx_v_self->y), __pyx_v_self->x); + __pyx_r = __pyx_v_8_packsim_init.Vector2D((-__pyx_v_self->y), __pyx_v_self->x); goto __pyx_L0; - /* "core.pyx":257 + /* "src/core.pyx":257 * ) * * cdef inline Vector2D rot(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5441,7 +5439,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_rot( return __pyx_r; } -/* "core.pyx":260 +/* "src/core.pyx":260 * return init.Vector2D(-self.y, self.x) * * cdef inline FLOAT_T dot(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5449,10 +5447,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_rot( * */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_dot(__pyx_t_12packsim_core_Vector2D *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_w) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_dot(__pyx_t_8_packsim_Vector2D *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_w) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; - /* "core.pyx":261 + /* "src/core.pyx":261 * * cdef inline FLOAT_T dot(Vector2D* self, Vector2D w) nogil: * return self.x*w.x + self.y*w.y # <<<<<<<<<<<<<< @@ -5462,7 +5460,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_dot(_ __pyx_r = ((__pyx_v_self->x * __pyx_v_w.x) + (__pyx_v_self->y * __pyx_v_w.y)); goto __pyx_L0; - /* "core.pyx":260 + /* "src/core.pyx":260 * return init.Vector2D(-self.y, self.x) * * cdef inline FLOAT_T dot(Vector2D* self, Vector2D w) nogil: # <<<<<<<<<<<<<< @@ -5475,7 +5473,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_dot(_ return __pyx_r; } -/* "core.pyx":263 +/* "src/core.pyx":263 * return self.x*w.x + self.y*w.y * * cdef inline FLOAT_T mag(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5483,20 +5481,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_dot(_ * */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_mag(__pyx_t_12packsim_core_Vector2D *__pyx_v_self) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_mag(__pyx_t_8_packsim_Vector2D *__pyx_v_self) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; - /* "core.pyx":264 + /* "src/core.pyx":264 * * cdef inline FLOAT_T mag(Vector2D* self) nogil: * return sqrt((self.x*self.x + self.y*self.y)) # <<<<<<<<<<<<<< * * */ - __pyx_r = ((__pyx_t_12packsim_core_FLOAT_T)sqrt(((double)((__pyx_v_self->x * __pyx_v_self->x) + (__pyx_v_self->y * __pyx_v_self->y))))); + __pyx_r = ((__pyx_t_8_packsim_FLOAT_T)sqrt(((double)((__pyx_v_self->x * __pyx_v_self->x) + (__pyx_v_self->y * __pyx_v_self->y))))); goto __pyx_L0; - /* "core.pyx":263 + /* "src/core.pyx":263 * return self.x*w.x + self.y*w.y * * cdef inline FLOAT_T mag(Vector2D* self) nogil: # <<<<<<<<<<<<<< @@ -5509,7 +5507,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_mag(_ return __pyx_r; } -/* "core.pyx":269 +/* "src/core.pyx":269 * #### Matrix2x2 Methods #### * * cdef inline Matrix2x2 init_matrix2x2(FLOAT_T a, FLOAT_T b, FLOAT_T c, FLOAT_T d) nogil: # <<<<<<<<<<<<<< @@ -5517,19 +5515,19 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_mag(_ * matrix.a, matrix.b, matrix.c, matrix.d = a, b, c, d */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_init_matrix2x2(__pyx_t_12packsim_core_FLOAT_T __pyx_v_a, __pyx_t_12packsim_core_FLOAT_T __pyx_v_b, __pyx_t_12packsim_core_FLOAT_T __pyx_v_c, __pyx_t_12packsim_core_FLOAT_T __pyx_v_d) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_v_matrix; - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_2; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_3; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_4; - __pyx_t_12packsim_core_MatrixSelfOps __pyx_t_5; - __pyx_t_12packsim_core_MatrixCopyOps __pyx_t_6; - int (*__pyx_t_7)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_8)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Vector2D); +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_init_matrix2x2(__pyx_t_8_packsim_FLOAT_T __pyx_v_a, __pyx_t_8_packsim_FLOAT_T __pyx_v_b, __pyx_t_8_packsim_FLOAT_T __pyx_v_c, __pyx_t_8_packsim_FLOAT_T __pyx_v_d) { + __pyx_t_8_packsim_Matrix2x2 __pyx_v_matrix; + __pyx_t_8_packsim_Matrix2x2 __pyx_r; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_2; + __pyx_t_8_packsim_FLOAT_T __pyx_t_3; + __pyx_t_8_packsim_FLOAT_T __pyx_t_4; + __pyx_t_8_packsim_MatrixSelfOps __pyx_t_5; + __pyx_t_8_packsim_MatrixCopyOps __pyx_t_6; + int (*__pyx_t_7)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Vector2D (*__pyx_t_8)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Vector2D); - /* "core.pyx":271 + /* "src/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 # <<<<<<<<<<<<<< @@ -5545,31 +5543,31 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_ini __pyx_v_matrix.c = __pyx_t_3; __pyx_v_matrix.d = __pyx_t_4; - /* "core.pyx":272 + /* "src/core.pyx":272 * cdef Matrix2x2 matrix * matrix.a, matrix.b, matrix.c, matrix.d = a, b, c, d * matrix.self, matrix.copy = MSO, MCO # <<<<<<<<<<<<<< * * matrix.equals, matrix.vecmul = m_equals, m_vecmul */ - __pyx_t_5 = __pyx_v_12packsim_core_MSO; - __pyx_t_6 = __pyx_v_12packsim_core_MCO; + __pyx_t_5 = __pyx_v_8_packsim_MSO; + __pyx_t_6 = __pyx_v_8_packsim_MCO; __pyx_v_matrix.self = __pyx_t_5; __pyx_v_matrix.copy = __pyx_t_6; - /* "core.pyx":274 + /* "src/core.pyx":274 * matrix.self, matrix.copy = MSO, MCO * * matrix.equals, matrix.vecmul = m_equals, m_vecmul # <<<<<<<<<<<<<< * * return matrix */ - __pyx_t_7 = __pyx_f_12packsim_core_m_equals; - __pyx_t_8 = __pyx_f_12packsim_core_m_vecmul; + __pyx_t_7 = __pyx_f_8_packsim_m_equals; + __pyx_t_8 = __pyx_f_8_packsim_m_vecmul; __pyx_v_matrix.equals = __pyx_t_7; __pyx_v_matrix.vecmul = __pyx_t_8; - /* "core.pyx":276 + /* "src/core.pyx":276 * matrix.equals, matrix.vecmul = m_equals, m_vecmul * * return matrix # <<<<<<<<<<<<<< @@ -5579,7 +5577,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_ini __pyx_r = __pyx_v_matrix; goto __pyx_L0; - /* "core.pyx":269 + /* "src/core.pyx":269 * #### Matrix2x2 Methods #### * * cdef inline Matrix2x2 init_matrix2x2(FLOAT_T a, FLOAT_T b, FLOAT_T c, FLOAT_T d) nogil: # <<<<<<<<<<<<<< @@ -5592,7 +5590,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_ini return __pyx_r; } -/* "core.pyx":278 +/* "src/core.pyx":278 * return matrix * * cdef inline bint m_equals(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5600,12 +5598,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_ini * (self.a == m.a) and (self.b == m.b) and (self.c == m.c) and (self.d == m.d) */ -static CYTHON_INLINE int __pyx_f_12packsim_core_m_equals(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { +static CYTHON_INLINE int __pyx_f_8_packsim_m_equals(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { int __pyx_r; int __pyx_t_1; int __pyx_t_2; - /* "core.pyx":280 + /* "src/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) # <<<<<<<<<<<<<< @@ -5636,7 +5634,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_m_equals(__pyx_t_12packsim_core_ __pyx_r = __pyx_t_1; goto __pyx_L0; - /* "core.pyx":278 + /* "src/core.pyx":278 * return matrix * * cdef inline bint m_equals(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5649,7 +5647,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_m_equals(__pyx_t_12packsim_core_ return __pyx_r; } -/* "core.pyx":283 +/* "src/core.pyx":283 * ) * * cdef inline Vector2D m_vecmul(Matrix2x2* self, Vector2D v) nogil: # <<<<<<<<<<<<<< @@ -5657,20 +5655,20 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_m_equals(__pyx_t_12packsim_core_ * self.a*v.x + self.b*v.y, self.c*v.x + self.d*v.y */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_m_vecmul(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_v) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_m_vecmul(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_v) { + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "core.pyx":284 + /* "src/core.pyx":284 * * cdef inline Vector2D m_vecmul(Matrix2x2* self, Vector2D v) nogil: * return init.Vector2D( # <<<<<<<<<<<<<< * self.a*v.x + self.b*v.y, self.c*v.x + self.d*v.y * ) */ - __pyx_r = __pyx_v_12packsim_core_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))); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":283 + /* "src/core.pyx":283 * ) * * cdef inline Vector2D m_vecmul(Matrix2x2* self, Vector2D v) nogil: # <<<<<<<<<<<<<< @@ -5683,7 +5681,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_m_ve return __pyx_r; } -/* "core.pyx":288 +/* "src/core.pyx":288 * ) * * cdef inline Matrix2x2* m_neg_s(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -5691,14 +5689,14 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_m_ve * return self */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_neg_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_2; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_3; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_4; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_neg_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_2; + __pyx_t_8_packsim_FLOAT_T __pyx_t_3; + __pyx_t_8_packsim_FLOAT_T __pyx_t_4; - /* "core.pyx":289 + /* "src/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 # <<<<<<<<<<<<<< @@ -5714,7 +5712,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_v_self->c = __pyx_t_3; __pyx_v_self->d = __pyx_t_4; - /* "core.pyx":290 + /* "src/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 # <<<<<<<<<<<<<< @@ -5724,7 +5722,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":288 + /* "src/core.pyx":288 * ) * * cdef inline Matrix2x2* m_neg_s(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -5737,7 +5735,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":292 +/* "src/core.pyx":292 * return self * * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5745,10 +5743,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b += m.b */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_madd_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_madd_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":293 + /* "src/core.pyx":293 * * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a += m.a # <<<<<<<<<<<<<< @@ -5757,7 +5755,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a + __pyx_v_m.a); - /* "core.pyx":294 + /* "src/core.pyx":294 * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a += m.a * self.b += m.b # <<<<<<<<<<<<<< @@ -5766,7 +5764,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b + __pyx_v_m.b); - /* "core.pyx":295 + /* "src/core.pyx":295 * self.a += m.a * self.b += m.b * self.c += m.c # <<<<<<<<<<<<<< @@ -5775,7 +5773,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c + __pyx_v_m.c); - /* "core.pyx":296 + /* "src/core.pyx":296 * self.b += m.b * self.c += m.c * self.d += m.d # <<<<<<<<<<<<<< @@ -5784,7 +5782,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d + __pyx_v_m.d); - /* "core.pyx":297 + /* "src/core.pyx":297 * self.c += m.c * self.d += m.d * return self # <<<<<<<<<<<<<< @@ -5794,7 +5792,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":292 + /* "src/core.pyx":292 * return self * * cdef inline Matrix2x2* m_madd_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5807,7 +5805,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":299 +/* "src/core.pyx":299 * return self * * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5815,10 +5813,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b -= m.b */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_msub_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_msub_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":300 + /* "src/core.pyx":300 * * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a -= m.a # <<<<<<<<<<<<<< @@ -5827,7 +5825,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a - __pyx_v_m.a); - /* "core.pyx":301 + /* "src/core.pyx":301 * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a -= m.a * self.b -= m.b # <<<<<<<<<<<<<< @@ -5836,7 +5834,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b - __pyx_v_m.b); - /* "core.pyx":302 + /* "src/core.pyx":302 * self.a -= m.a * self.b -= m.b * self.c -= m.c # <<<<<<<<<<<<<< @@ -5845,7 +5843,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c - __pyx_v_m.c); - /* "core.pyx":303 + /* "src/core.pyx":303 * self.b -= m.b * self.c -= m.c * self.d -= m.d # <<<<<<<<<<<<<< @@ -5854,7 +5852,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d - __pyx_v_m.d); - /* "core.pyx":304 + /* "src/core.pyx":304 * self.c -= m.c * self.d -= m.d * return self # <<<<<<<<<<<<<< @@ -5864,7 +5862,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":299 + /* "src/core.pyx":299 * return self * * cdef inline Matrix2x2* m_msub_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5877,7 +5875,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":306 +/* "src/core.pyx":306 * return self * * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5885,10 +5883,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b *= m.b */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_mmul_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_mmul_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":307 + /* "src/core.pyx":307 * * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a *= m.a # <<<<<<<<<<<<<< @@ -5897,7 +5895,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a * __pyx_v_m.a); - /* "core.pyx":308 + /* "src/core.pyx":308 * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a *= m.a * self.b *= m.b # <<<<<<<<<<<<<< @@ -5906,7 +5904,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b * __pyx_v_m.b); - /* "core.pyx":309 + /* "src/core.pyx":309 * self.a *= m.a * self.b *= m.b * self.c *= m.c # <<<<<<<<<<<<<< @@ -5915,7 +5913,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c * __pyx_v_m.c); - /* "core.pyx":310 + /* "src/core.pyx":310 * self.b *= m.b * self.c *= m.c * self.d *= m.d # <<<<<<<<<<<<<< @@ -5924,7 +5922,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d * __pyx_v_m.d); - /* "core.pyx":311 + /* "src/core.pyx":311 * self.c *= m.c * self.d *= m.d * return self # <<<<<<<<<<<<<< @@ -5934,7 +5932,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":306 + /* "src/core.pyx":306 * return self * * cdef inline Matrix2x2* m_mmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5947,7 +5945,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":313 +/* "src/core.pyx":313 * return self * * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -5955,10 +5953,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b /= m.b */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_mdiv_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_mdiv_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":314 + /* "src/core.pyx":314 * * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a /= m.a # <<<<<<<<<<<<<< @@ -5967,7 +5965,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a / __pyx_v_m.a); - /* "core.pyx":315 + /* "src/core.pyx":315 * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a /= m.a * self.b /= m.b # <<<<<<<<<<<<<< @@ -5976,7 +5974,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b / __pyx_v_m.b); - /* "core.pyx":316 + /* "src/core.pyx":316 * self.a /= m.a * self.b /= m.b * self.c /= m.c # <<<<<<<<<<<<<< @@ -5985,7 +5983,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c / __pyx_v_m.c); - /* "core.pyx":317 + /* "src/core.pyx":317 * self.b /= m.b * self.c /= m.c * self.d /= m.d # <<<<<<<<<<<<<< @@ -5994,7 +5992,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d / __pyx_v_m.d); - /* "core.pyx":318 + /* "src/core.pyx":318 * self.c /= m.c * self.d /= m.d * return self # <<<<<<<<<<<<<< @@ -6004,7 +6002,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":313 + /* "src/core.pyx":313 * return self * * cdef inline Matrix2x2* m_mdiv_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6017,7 +6015,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":320 +/* "src/core.pyx":320 * return self * * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6025,10 +6023,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b += s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_sadd_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_sadd_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":321 + /* "src/core.pyx":321 * * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a += s # <<<<<<<<<<<<<< @@ -6037,7 +6035,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a + __pyx_v_s); - /* "core.pyx":322 + /* "src/core.pyx":322 * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a += s * self.b += s # <<<<<<<<<<<<<< @@ -6046,7 +6044,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b + __pyx_v_s); - /* "core.pyx":323 + /* "src/core.pyx":323 * self.a += s * self.b += s * self.c += s # <<<<<<<<<<<<<< @@ -6055,7 +6053,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c + __pyx_v_s); - /* "core.pyx":324 + /* "src/core.pyx":324 * self.b += s * self.c += s * self.d += s # <<<<<<<<<<<<<< @@ -6064,7 +6062,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d + __pyx_v_s); - /* "core.pyx":325 + /* "src/core.pyx":325 * self.c += s * self.d += s * return self # <<<<<<<<<<<<<< @@ -6074,7 +6072,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":320 + /* "src/core.pyx":320 * return self * * cdef inline Matrix2x2* m_sadd_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6087,7 +6085,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":327 +/* "src/core.pyx":327 * return self * * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6095,10 +6093,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b -= s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ssub_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_ssub_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":328 + /* "src/core.pyx":328 * * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a -= s # <<<<<<<<<<<<<< @@ -6107,7 +6105,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a - __pyx_v_s); - /* "core.pyx":329 + /* "src/core.pyx":329 * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a -= s * self.b -= s # <<<<<<<<<<<<<< @@ -6116,7 +6114,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b - __pyx_v_s); - /* "core.pyx":330 + /* "src/core.pyx":330 * self.a -= s * self.b -= s * self.c -= s # <<<<<<<<<<<<<< @@ -6125,7 +6123,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c - __pyx_v_s); - /* "core.pyx":331 + /* "src/core.pyx":331 * self.b -= s * self.c -= s * self.d -= s # <<<<<<<<<<<<<< @@ -6134,7 +6132,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d - __pyx_v_s); - /* "core.pyx":332 + /* "src/core.pyx":332 * self.c -= s * self.d -= s * return self # <<<<<<<<<<<<<< @@ -6144,7 +6142,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":327 + /* "src/core.pyx":327 * return self * * cdef inline Matrix2x2* m_ssub_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6157,7 +6155,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":334 +/* "src/core.pyx":334 * return self * * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6165,10 +6163,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b *= s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_smul_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_smul_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":335 + /* "src/core.pyx":335 * * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a *= s # <<<<<<<<<<<<<< @@ -6177,7 +6175,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a * __pyx_v_s); - /* "core.pyx":336 + /* "src/core.pyx":336 * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a *= s * self.b *= s # <<<<<<<<<<<<<< @@ -6186,7 +6184,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b * __pyx_v_s); - /* "core.pyx":337 + /* "src/core.pyx":337 * self.a *= s * self.b *= s * self.c *= s # <<<<<<<<<<<<<< @@ -6195,7 +6193,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c * __pyx_v_s); - /* "core.pyx":338 + /* "src/core.pyx":338 * self.b *= s * self.c *= s * self.d *= s # <<<<<<<<<<<<<< @@ -6204,7 +6202,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d * __pyx_v_s); - /* "core.pyx":339 + /* "src/core.pyx":339 * self.c *= s * self.d *= s * return self # <<<<<<<<<<<<<< @@ -6214,7 +6212,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":334 + /* "src/core.pyx":334 * return self * * cdef inline Matrix2x2* m_smul_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6227,7 +6225,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":341 +/* "src/core.pyx":341 * return self * * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6235,10 +6233,10 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.b /= s */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_sdiv_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_sdiv_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; - /* "core.pyx":342 + /* "src/core.pyx":342 * * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a /= s # <<<<<<<<<<<<<< @@ -6247,7 +6245,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->a = (__pyx_v_self->a / __pyx_v_s); - /* "core.pyx":343 + /* "src/core.pyx":343 * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: * self.a /= s * self.b /= s # <<<<<<<<<<<<<< @@ -6256,7 +6254,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->b = (__pyx_v_self->b / __pyx_v_s); - /* "core.pyx":344 + /* "src/core.pyx":344 * self.a /= s * self.b /= s * self.c /= s # <<<<<<<<<<<<<< @@ -6265,7 +6263,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->c = (__pyx_v_self->c / __pyx_v_s); - /* "core.pyx":345 + /* "src/core.pyx":345 * self.b /= s * self.c /= s * self.d /= s # <<<<<<<<<<<<<< @@ -6274,7 +6272,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ */ __pyx_v_self->d = (__pyx_v_self->d / __pyx_v_s); - /* "core.pyx":346 + /* "src/core.pyx":346 * self.c /= s * self.d /= s * return self # <<<<<<<<<<<<<< @@ -6284,7 +6282,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":341 + /* "src/core.pyx":341 * return self * * cdef inline Matrix2x2* m_sdiv_s(Matrix2x2* self, FLOAT_T s) nogil: # <<<<<<<<<<<<<< @@ -6297,7 +6295,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":348 +/* "src/core.pyx":348 * return self * * cdef inline Matrix2x2* m_matmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6305,14 +6303,14 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * self.a*m.a + self.b*m.c, self.a*m.b + self.b*m.d, \ */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_matmul_s(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 *__pyx_r; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_2; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_3; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_4; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 *__pyx_f_8_packsim_m_matmul_s(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 *__pyx_r; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_2; + __pyx_t_8_packsim_FLOAT_T __pyx_t_3; + __pyx_t_8_packsim_FLOAT_T __pyx_t_4; - /* "core.pyx":350 + /* "src/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, \ # <<<<<<<<<<<<<< @@ -6322,7 +6320,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __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)); - /* "core.pyx":351 + /* "src/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 # <<<<<<<<<<<<<< @@ -6332,7 +6330,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __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)); - /* "core.pyx":349 + /* "src/core.pyx":349 * * cdef inline Matrix2x2* m_matmul_s(Matrix2x2* self, Matrix2x2 m) nogil: * self.a, self.b, self.c, self.d = \ # <<<<<<<<<<<<<< @@ -6344,7 +6342,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_v_self->c = __pyx_t_3; __pyx_v_self->d = __pyx_t_4; - /* "core.pyx":352 + /* "src/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 # <<<<<<<<<<<<<< @@ -6354,7 +6352,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ __pyx_r = __pyx_v_self; goto __pyx_L0; - /* "core.pyx":348 + /* "src/core.pyx":348 * return self * * cdef inline Matrix2x2* m_matmul_s(Matrix2x2* self, Matrix2x2 m) nogil: # <<<<<<<<<<<<<< @@ -6367,7 +6365,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ return __pyx_r; } -/* "core.pyx":354 +/* "src/core.pyx":354 * return self * * cdef inline Matrix2x2 m_neg_c(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -6375,20 +6373,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 *__pyx_f_12packsim_core_m_ * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_neg_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_neg_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":355 + /* "src/core.pyx":355 * * cdef inline Matrix2x2 m_neg_c(Matrix2x2* self) nogil: * return init.Matrix2x2(-self.a, -self.b, -self.c, -self.d) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_madd_c(Matrix2x2* self, Matrix2x2 m) nogil: */ - __pyx_r = __pyx_v_12packsim_core_init.Matrix2x2((-__pyx_v_self->a), (-__pyx_v_self->b), (-__pyx_v_self->c), (-__pyx_v_self->d)); + __pyx_r = __pyx_v_8_packsim_init.Matrix2x2((-__pyx_v_self->a), (-__pyx_v_self->b), (-__pyx_v_self->c), (-__pyx_v_self->d)); goto __pyx_L0; - /* "core.pyx":354 + /* "src/core.pyx":354 * return self * * cdef inline Matrix2x2 m_neg_c(Matrix2x2* self) nogil: # <<<<<<<<<<<<<< @@ -6401,7 +6399,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_n return __pyx_r; } -/* "core.pyx":357 +/* "src/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: # <<<<<<<<<<<<<< @@ -6409,20 +6407,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_n * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_madd_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_madd_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":358 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_msub_c(Matrix2x2* self, Matrix2x2 m) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":357 + /* "src/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: # <<<<<<<<<<<<<< @@ -6435,7 +6433,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m return __pyx_r; } -/* "core.pyx":360 +/* "src/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: # <<<<<<<<<<<<<< @@ -6443,20 +6441,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_msub_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_msub_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":361 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_mmul_c(Matrix2x2* self, Matrix2x2 m) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":360 + /* "src/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: # <<<<<<<<<<<<<< @@ -6469,7 +6467,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m return __pyx_r; } -/* "core.pyx":363 +/* "src/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: # <<<<<<<<<<<<<< @@ -6477,20 +6475,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_mmul_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_mmul_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":364 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_mdiv_c(Matrix2x2* self, Matrix2x2 m) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":363 + /* "src/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: # <<<<<<<<<<<<<< @@ -6503,7 +6501,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m return __pyx_r; } -/* "core.pyx":366 +/* "src/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: # <<<<<<<<<<<<<< @@ -6511,20 +6509,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_mdiv_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_mdiv_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":367 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_sadd_c(Matrix2x2* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":366 + /* "src/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: # <<<<<<<<<<<<<< @@ -6537,7 +6535,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m return __pyx_r; } -/* "core.pyx":369 +/* "src/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: # <<<<<<<<<<<<<< @@ -6545,20 +6543,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_sadd_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_sadd_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":370 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_ssub_c(Matrix2x2* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":369 + /* "src/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: # <<<<<<<<<<<<<< @@ -6571,7 +6569,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s return __pyx_r; } -/* "core.pyx":372 +/* "src/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: # <<<<<<<<<<<<<< @@ -6579,20 +6577,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_ssub_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_ssub_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":373 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_smul_c(Matrix2x2* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":372 + /* "src/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: # <<<<<<<<<<<<<< @@ -6605,7 +6603,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s return __pyx_r; } -/* "core.pyx":375 +/* "src/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: # <<<<<<<<<<<<<< @@ -6613,20 +6611,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_smul_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_smul_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":376 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_sdiv_c(Matrix2x2* self, FLOAT_T s) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":375 + /* "src/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: # <<<<<<<<<<<<<< @@ -6639,7 +6637,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s return __pyx_r; } -/* "core.pyx":378 +/* "src/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: # <<<<<<<<<<<<<< @@ -6647,20 +6645,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s * */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_sdiv_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_s) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_sdiv_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_s) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":379 + /* "src/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) # <<<<<<<<<<<<<< * * cdef inline Matrix2x2 m_matmul_c(Matrix2x2* self, Matrix2x2 m) nogil: */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":378 + /* "src/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: # <<<<<<<<<<<<<< @@ -6673,7 +6671,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s return __pyx_r; } -/* "core.pyx":381 +/* "src/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: # <<<<<<<<<<<<<< @@ -6681,20 +6679,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_s * self.a*m.a + self.b*m.c, self.a*m.b + self.b*m.d, */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_matmul_c(__pyx_t_12packsim_core_Matrix2x2 *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_m) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_m_matmul_c(__pyx_t_8_packsim_Matrix2x2 *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_m) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; - /* "core.pyx":382 + /* "src/core.pyx":382 * * cdef inline Matrix2x2 m_matmul_c(Matrix2x2* self, Matrix2x2 m) nogil: * return init.Matrix2x2( # <<<<<<<<<<<<<< * 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 */ - __pyx_r = __pyx_v_12packsim_core_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))); + __pyx_r = __pyx_v_8_packsim_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; - /* "core.pyx":381 + /* "src/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: # <<<<<<<<<<<<<< @@ -6707,7 +6705,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m return __pyx_r; } -/* "voronoi_dcel.pyx":17 +/* "src/voronoi_dcel.pyx":17 * #### SiteCacheMap Methods #### * * cdef inline SiteCacheMap init_sitecachemap(INT_T iarea, INT_T iperim, INT_T iisoparam, # <<<<<<<<<<<<<< @@ -6715,21 +6713,21 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_m_m * cdef SiteCacheMap sc */ -static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_init_sitecachemap(__pyx_t_12packsim_core_INT_T __pyx_v_iarea, __pyx_t_12packsim_core_INT_T __pyx_v_iperim, __pyx_t_12packsim_core_INT_T __pyx_v_iisoparam, __pyx_t_12packsim_core_INT_T __pyx_v_ienergy, __pyx_t_12packsim_core_INT_T __pyx_v_iavg_radius) { - __pyx_t_12packsim_core_SiteCacheMap __pyx_v_sc; - __pyx_t_12packsim_core_SiteCacheMap __pyx_r; - __pyx_t_12packsim_core_INT_T __pyx_t_1; - __pyx_t_12packsim_core_INT_T __pyx_t_2; - __pyx_t_12packsim_core_INT_T __pyx_t_3; - __pyx_t_12packsim_core_INT_T __pyx_t_4; - __pyx_t_12packsim_core_INT_T __pyx_t_5; - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_6)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_7)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_8)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_9)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_10)(__pyx_t_12packsim_core_Site *, __pyx_t_12packsim_core_FLOAT_T); +static CYTHON_INLINE __pyx_t_8_packsim_SiteCacheMap __pyx_f_8_packsim_init_sitecachemap(__pyx_t_8_packsim_INT_T __pyx_v_iarea, __pyx_t_8_packsim_INT_T __pyx_v_iperim, __pyx_t_8_packsim_INT_T __pyx_v_iisoparam, __pyx_t_8_packsim_INT_T __pyx_v_ienergy, __pyx_t_8_packsim_INT_T __pyx_v_iavg_radius) { + __pyx_t_8_packsim_SiteCacheMap __pyx_v_sc; + __pyx_t_8_packsim_SiteCacheMap __pyx_r; + __pyx_t_8_packsim_INT_T __pyx_t_1; + __pyx_t_8_packsim_INT_T __pyx_t_2; + __pyx_t_8_packsim_INT_T __pyx_t_3; + __pyx_t_8_packsim_INT_T __pyx_t_4; + __pyx_t_8_packsim_INT_T __pyx_t_5; + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_6)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_7)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_8)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_9)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_10)(__pyx_t_8_packsim_Site *, __pyx_t_8_packsim_FLOAT_T); - /* "voronoi_dcel.pyx":21 + /* "src/voronoi_dcel.pyx":21 * cdef SiteCacheMap sc * sc.iarea, sc.iperim, sc.iisoparam, sc.ienergy, sc.iavg_radius = \ * iarea, iperim, iisoparam, ienergy, iavg_radius # <<<<<<<<<<<<<< @@ -6742,7 +6740,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_ __pyx_t_4 = __pyx_v_ienergy; __pyx_t_5 = __pyx_v_iavg_radius; - /* "voronoi_dcel.pyx":20 + /* "src/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 = \ # <<<<<<<<<<<<<< @@ -6755,20 +6753,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_ __pyx_v_sc.ienergy = __pyx_t_4; __pyx_v_sc.iavg_radius = __pyx_t_5; - /* "voronoi_dcel.pyx":24 + /* "src/voronoi_dcel.pyx":24 * * sc.area, sc.perim, sc.isoparam, sc.energy, sc.avg_radius = \ * area, perim, isoparam, energy, avg_radius # <<<<<<<<<<<<<< * * return sc */ - __pyx_t_6 = __pyx_f_12packsim_core_area; - __pyx_t_7 = __pyx_f_12packsim_core_perim; - __pyx_t_8 = __pyx_f_12packsim_core_isoparam; - __pyx_t_9 = __pyx_f_12packsim_core_energy; - __pyx_t_10 = __pyx_f_12packsim_core_avg_radius; + __pyx_t_6 = __pyx_f_8_packsim_area; + __pyx_t_7 = __pyx_f_8_packsim_perim; + __pyx_t_8 = __pyx_f_8_packsim_isoparam; + __pyx_t_9 = __pyx_f_8_packsim_energy; + __pyx_t_10 = __pyx_f_8_packsim_avg_radius; - /* "voronoi_dcel.pyx":23 + /* "src/voronoi_dcel.pyx":23 * iarea, iperim, iisoparam, ienergy, iavg_radius * * sc.area, sc.perim, sc.isoparam, sc.energy, sc.avg_radius = \ # <<<<<<<<<<<<<< @@ -6781,7 +6779,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_ __pyx_v_sc.energy = __pyx_t_9; __pyx_v_sc.avg_radius = __pyx_t_10; - /* "voronoi_dcel.pyx":26 + /* "src/voronoi_dcel.pyx":26 * area, perim, isoparam, energy, avg_radius * * return sc # <<<<<<<<<<<<<< @@ -6791,7 +6789,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_ __pyx_r = __pyx_v_sc; goto __pyx_L0; - /* "voronoi_dcel.pyx":17 + /* "src/voronoi_dcel.pyx":17 * #### SiteCacheMap Methods #### * * cdef inline SiteCacheMap init_sitecachemap(INT_T iarea, INT_T iperim, INT_T iisoparam, # <<<<<<<<<<<<<< @@ -6804,7 +6802,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_ return __pyx_r; } -/* "voronoi_dcel.pyx":29 +/* "src/voronoi_dcel.pyx":29 * * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -6812,12 +6810,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_SiteCacheMap __pyx_f_12packsim_core_ * return self.info.site_cache.get(&self.info.site_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area(__pyx_t_12packsim_core_Site *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_area(__pyx_t_8_packsim_Site *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":30 + /* "src/voronoi_dcel.pyx":30 * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6827,7 +6825,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":32 + /* "src/voronoi_dcel.pyx":32 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iarea) # <<<<<<<<<<<<<< @@ -6837,7 +6835,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iarea; - /* "voronoi_dcel.pyx":31 + /* "src/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, # <<<<<<<<<<<<<< @@ -6847,7 +6845,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":30 + /* "src/voronoi_dcel.pyx":30 * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6856,7 +6854,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( */ } - /* "voronoi_dcel.pyx":35 + /* "src/voronoi_dcel.pyx":35 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6865,7 +6863,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( */ /*else*/ { - /* "voronoi_dcel.pyx":36 + /* "src/voronoi_dcel.pyx":36 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iarea), val) # <<<<<<<<<<<<<< @@ -6875,7 +6873,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iarea; - /* "voronoi_dcel.pyx":35 + /* "src/voronoi_dcel.pyx":35 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6884,7 +6882,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":37 + /* "src/voronoi_dcel.pyx":37 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iarea), val) * return val # <<<<<<<<<<<<<< @@ -6895,7 +6893,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( goto __pyx_L0; } - /* "voronoi_dcel.pyx":29 + /* "src/voronoi_dcel.pyx":29 * * * cdef inline FLOAT_T area(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -6908,7 +6906,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( return __pyx_r; } -/* "voronoi_dcel.pyx":39 +/* "src/voronoi_dcel.pyx":39 * return val * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -6916,12 +6914,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_area( * return self.info.site_cache.get(&self.info.site_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim(__pyx_t_12packsim_core_Site *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_perim(__pyx_t_8_packsim_Site *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":40 + /* "src/voronoi_dcel.pyx":40 * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6931,7 +6929,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":42 + /* "src/voronoi_dcel.pyx":42 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iperim) # <<<<<<<<<<<<<< @@ -6941,7 +6939,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iperim; - /* "voronoi_dcel.pyx":41 + /* "src/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, # <<<<<<<<<<<<<< @@ -6951,7 +6949,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":40 + /* "src/voronoi_dcel.pyx":40 * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -6960,7 +6958,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim */ } - /* "voronoi_dcel.pyx":45 + /* "src/voronoi_dcel.pyx":45 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6969,7 +6967,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim */ /*else*/ { - /* "voronoi_dcel.pyx":46 + /* "src/voronoi_dcel.pyx":46 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iperim), val) # <<<<<<<<<<<<<< @@ -6979,7 +6977,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iperim; - /* "voronoi_dcel.pyx":45 + /* "src/voronoi_dcel.pyx":45 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -6988,7 +6986,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":47 + /* "src/voronoi_dcel.pyx":47 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iperim), val) * return val # <<<<<<<<<<<<<< @@ -6999,7 +6997,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim goto __pyx_L0; } - /* "voronoi_dcel.pyx":39 + /* "src/voronoi_dcel.pyx":39 * return val * * cdef inline FLOAT_T perim(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7012,7 +7010,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim return __pyx_r; } -/* "voronoi_dcel.pyx":49 +/* "src/voronoi_dcel.pyx":49 * return val * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7020,12 +7018,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_perim * return self.info.site_cache.get(&self.info.site_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isoparam(__pyx_t_12packsim_core_Site *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_isoparam(__pyx_t_8_packsim_Site *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":50 + /* "src/voronoi_dcel.pyx":50 * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7035,7 +7033,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":52 + /* "src/voronoi_dcel.pyx":52 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iisoparam) # <<<<<<<<<<<<<< @@ -7045,7 +7043,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iisoparam; - /* "voronoi_dcel.pyx":51 + /* "src/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, # <<<<<<<<<<<<<< @@ -7055,7 +7053,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":50 + /* "src/voronoi_dcel.pyx":50 * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7064,7 +7062,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa */ } - /* "voronoi_dcel.pyx":55 + /* "src/voronoi_dcel.pyx":55 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7073,7 +7071,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa */ /*else*/ { - /* "voronoi_dcel.pyx":56 + /* "src/voronoi_dcel.pyx":56 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iisoparam), val) # <<<<<<<<<<<<<< @@ -7083,7 +7081,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iisoparam; - /* "voronoi_dcel.pyx":55 + /* "src/voronoi_dcel.pyx":55 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7092,7 +7090,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":57 + /* "src/voronoi_dcel.pyx":57 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iisoparam), val) * return val # <<<<<<<<<<<<<< @@ -7103,7 +7101,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa goto __pyx_L0; } - /* "voronoi_dcel.pyx":49 + /* "src/voronoi_dcel.pyx":49 * return val * * cdef inline FLOAT_T isoparam(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7116,7 +7114,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa return __pyx_r; } -/* "voronoi_dcel.pyx":59 +/* "src/voronoi_dcel.pyx":59 * return val * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7124,12 +7122,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_isopa * return self.info.site_cache.get(&self.info.site_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energy(__pyx_t_12packsim_core_Site *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_energy(__pyx_t_8_packsim_Site *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":60 + /* "src/voronoi_dcel.pyx":60 * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7139,7 +7137,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":62 + /* "src/voronoi_dcel.pyx":62 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.ienergy) # <<<<<<<<<<<<<< @@ -7149,7 +7147,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ienergy; - /* "voronoi_dcel.pyx":61 + /* "src/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, # <<<<<<<<<<<<<< @@ -7159,7 +7157,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":60 + /* "src/voronoi_dcel.pyx":60 * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7168,7 +7166,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ */ } - /* "voronoi_dcel.pyx":65 + /* "src/voronoi_dcel.pyx":65 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7177,7 +7175,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ */ /*else*/ { - /* "voronoi_dcel.pyx":66 + /* "src/voronoi_dcel.pyx":66 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.ienergy), val) # <<<<<<<<<<<<<< @@ -7187,7 +7185,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ienergy; - /* "voronoi_dcel.pyx":65 + /* "src/voronoi_dcel.pyx":65 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7196,7 +7194,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":67 + /* "src/voronoi_dcel.pyx":67 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.ienergy), val) * return val # <<<<<<<<<<<<<< @@ -7207,7 +7205,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ goto __pyx_L0; } - /* "voronoi_dcel.pyx":59 + /* "src/voronoi_dcel.pyx":59 * return val * * cdef inline FLOAT_T energy(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7220,7 +7218,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ return __pyx_r; } -/* "voronoi_dcel.pyx":69 +/* "src/voronoi_dcel.pyx":69 * return val * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7228,12 +7226,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_energ * return self.info.site_cache.get(&self.info.site_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_radius(__pyx_t_12packsim_core_Site *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_avg_radius(__pyx_t_8_packsim_Site *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":70 + /* "src/voronoi_dcel.pyx":70 * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7243,7 +7241,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":72 + /* "src/voronoi_dcel.pyx":72 * if isnan(val): * return self.info.site_cache.get(&self.info.site_cache, * (self.arr_index, self.cache.iavg_radius) # <<<<<<<<<<<<<< @@ -7253,7 +7251,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iavg_radius; - /* "voronoi_dcel.pyx":71 + /* "src/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, # <<<<<<<<<<<<<< @@ -7263,7 +7261,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r __pyx_r = __pyx_v_self->info->site_cache.get((&__pyx_v_self->info->site_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":70 + /* "src/voronoi_dcel.pyx":70 * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -7272,7 +7270,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r */ } - /* "voronoi_dcel.pyx":75 + /* "src/voronoi_dcel.pyx":75 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7281,7 +7279,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r */ /*else*/ { - /* "voronoi_dcel.pyx":76 + /* "src/voronoi_dcel.pyx":76 * else: * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iavg_radius), val) # <<<<<<<<<<<<<< @@ -7291,7 +7289,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iavg_radius; - /* "voronoi_dcel.pyx":75 + /* "src/voronoi_dcel.pyx":75 * ) * else: * self.info.site_cache.set(&self.info.site_cache, # <<<<<<<<<<<<<< @@ -7300,7 +7298,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r */ __pyx_v_self->info->site_cache.set((&__pyx_v_self->info->site_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":77 + /* "src/voronoi_dcel.pyx":77 * self.info.site_cache.set(&self.info.site_cache, * (self.arr_index, self.cache.iavg_radius), val) * return val # <<<<<<<<<<<<<< @@ -7311,7 +7309,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r goto __pyx_L0; } - /* "voronoi_dcel.pyx":69 + /* "src/voronoi_dcel.pyx":69 * return val * * cdef inline FLOAT_T avg_radius(Site* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -7324,7 +7322,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r return __pyx_r; } -/* "voronoi_dcel.pyx":82 +/* "src/voronoi_dcel.pyx":82 * #### EdgeCacheMap Methods #### * * cdef inline EdgeCacheMap init_edgecachemap(INT_T iH, INT_T ila, INT_T ida, INT_T ixij, # <<<<<<<<<<<<<< @@ -7332,37 +7330,37 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_avg_r * INT_T iF, INT_T ilntan, INT_T icsc, INT_T size) nogil: */ -static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_init_edgecachemap(__pyx_t_12packsim_core_INT_T __pyx_v_iH, __pyx_t_12packsim_core_INT_T __pyx_v_ila, __pyx_t_12packsim_core_INT_T __pyx_v_ida, __pyx_t_12packsim_core_INT_T __pyx_v_ixij, __pyx_t_12packsim_core_INT_T __pyx_v_idVdv, __pyx_t_12packsim_core_INT_T __pyx_v_ii2p, __pyx_t_12packsim_core_INT_T __pyx_v_ila_mag, __pyx_t_12packsim_core_INT_T __pyx_v_ida_mag, __pyx_t_12packsim_core_INT_T __pyx_v_iphi, __pyx_t_12packsim_core_INT_T __pyx_v_iB, __pyx_t_12packsim_core_INT_T __pyx_v_iF, __pyx_t_12packsim_core_INT_T __pyx_v_ilntan, __pyx_t_12packsim_core_INT_T __pyx_v_icsc, __pyx_t_12packsim_core_INT_T __pyx_v_size) { - __pyx_t_12packsim_core_EdgeCacheMap __pyx_v_ec; - __pyx_t_12packsim_core_EdgeCacheMap __pyx_r; - __pyx_t_12packsim_core_INT_T __pyx_t_1; - __pyx_t_12packsim_core_INT_T __pyx_t_2; - __pyx_t_12packsim_core_INT_T __pyx_t_3; - __pyx_t_12packsim_core_INT_T __pyx_t_4; - __pyx_t_12packsim_core_INT_T __pyx_t_5; - __pyx_t_12packsim_core_INT_T __pyx_t_6; - __pyx_t_12packsim_core_INT_T __pyx_t_7; - __pyx_t_12packsim_core_INT_T __pyx_t_8; - __pyx_t_12packsim_core_INT_T __pyx_t_9; - __pyx_t_12packsim_core_INT_T __pyx_t_10; - __pyx_t_12packsim_core_INT_T __pyx_t_11; - __pyx_t_12packsim_core_INT_T __pyx_t_12; - __pyx_t_12packsim_core_INT_T __pyx_t_13; - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_14)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_15)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_16)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_17)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_18)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_19)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_20)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_21)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_22)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_23)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_24)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_25)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_FLOAT_T (*__pyx_t_26)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_FLOAT_T); +static CYTHON_INLINE __pyx_t_8_packsim_EdgeCacheMap __pyx_f_8_packsim_init_edgecachemap(__pyx_t_8_packsim_INT_T __pyx_v_iH, __pyx_t_8_packsim_INT_T __pyx_v_ila, __pyx_t_8_packsim_INT_T __pyx_v_ida, __pyx_t_8_packsim_INT_T __pyx_v_ixij, __pyx_t_8_packsim_INT_T __pyx_v_idVdv, __pyx_t_8_packsim_INT_T __pyx_v_ii2p, __pyx_t_8_packsim_INT_T __pyx_v_ila_mag, __pyx_t_8_packsim_INT_T __pyx_v_ida_mag, __pyx_t_8_packsim_INT_T __pyx_v_iphi, __pyx_t_8_packsim_INT_T __pyx_v_iB, __pyx_t_8_packsim_INT_T __pyx_v_iF, __pyx_t_8_packsim_INT_T __pyx_v_ilntan, __pyx_t_8_packsim_INT_T __pyx_v_icsc, __pyx_t_8_packsim_INT_T __pyx_v_size) { + __pyx_t_8_packsim_EdgeCacheMap __pyx_v_ec; + __pyx_t_8_packsim_EdgeCacheMap __pyx_r; + __pyx_t_8_packsim_INT_T __pyx_t_1; + __pyx_t_8_packsim_INT_T __pyx_t_2; + __pyx_t_8_packsim_INT_T __pyx_t_3; + __pyx_t_8_packsim_INT_T __pyx_t_4; + __pyx_t_8_packsim_INT_T __pyx_t_5; + __pyx_t_8_packsim_INT_T __pyx_t_6; + __pyx_t_8_packsim_INT_T __pyx_t_7; + __pyx_t_8_packsim_INT_T __pyx_t_8; + __pyx_t_8_packsim_INT_T __pyx_t_9; + __pyx_t_8_packsim_INT_T __pyx_t_10; + __pyx_t_8_packsim_INT_T __pyx_t_11; + __pyx_t_8_packsim_INT_T __pyx_t_12; + __pyx_t_8_packsim_INT_T __pyx_t_13; + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_14)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Vector2D (*__pyx_t_15)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_16)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_17)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_18)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_19)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_20)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_21)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_22)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_23)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_24)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_25)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_FLOAT_T (*__pyx_t_26)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_FLOAT_T); - /* "voronoi_dcel.pyx":87 + /* "src/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, \ # <<<<<<<<<<<<<< @@ -7376,7 +7374,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ __pyx_t_5 = __pyx_v_idVdv; __pyx_t_6 = __pyx_v_ii2p; - /* "voronoi_dcel.pyx":88 + /* "src/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 # <<<<<<<<<<<<<< @@ -7391,7 +7389,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ __pyx_t_12 = __pyx_v_ilntan; __pyx_t_13 = __pyx_v_icsc; - /* "voronoi_dcel.pyx":86 + /* "src/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, \ # <<<<<<<<<<<<<< @@ -7408,7 +7406,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ __pyx_v_ec.ida_mag = __pyx_t_8; __pyx_v_ec.iphi = __pyx_t_9; - /* "voronoi_dcel.pyx":87 + /* "src/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, \ # <<<<<<<<<<<<<< @@ -7420,7 +7418,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ __pyx_v_ec.ilntan = __pyx_t_12; __pyx_v_ec.icsc = __pyx_t_13; - /* "voronoi_dcel.pyx":89 + /* "src/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 # <<<<<<<<<<<<<< @@ -7429,28 +7427,28 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ */ __pyx_v_ec.size = __pyx_v_size; - /* "voronoi_dcel.pyx":92 + /* "src/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 # <<<<<<<<<<<<<< * * return ec */ - __pyx_t_14 = __pyx_f_12packsim_core_H; - __pyx_t_15 = __pyx_f_12packsim_core_la; - __pyx_t_16 = __pyx_f_12packsim_core_da; - __pyx_t_17 = __pyx_f_12packsim_core_xij; - __pyx_t_18 = __pyx_f_12packsim_core_dVdv; - __pyx_t_19 = __pyx_f_12packsim_core_i2p; - __pyx_t_20 = __pyx_f_12packsim_core_la_mag; - __pyx_t_21 = __pyx_f_12packsim_core_da_mag; - __pyx_t_22 = __pyx_f_12packsim_core_phi; - __pyx_t_23 = __pyx_f_12packsim_core_B; - __pyx_t_24 = __pyx_f_12packsim_core_F; - __pyx_t_25 = __pyx_f_12packsim_core_lntan; - __pyx_t_26 = __pyx_f_12packsim_core_csc; + __pyx_t_14 = __pyx_f_8_packsim_H; + __pyx_t_15 = __pyx_f_8_packsim_la; + __pyx_t_16 = __pyx_f_8_packsim_da; + __pyx_t_17 = __pyx_f_8_packsim_xij; + __pyx_t_18 = __pyx_f_8_packsim_dVdv; + __pyx_t_19 = __pyx_f_8_packsim_i2p; + __pyx_t_20 = __pyx_f_8_packsim_la_mag; + __pyx_t_21 = __pyx_f_8_packsim_da_mag; + __pyx_t_22 = __pyx_f_8_packsim_phi; + __pyx_t_23 = __pyx_f_8_packsim_B; + __pyx_t_24 = __pyx_f_8_packsim_F; + __pyx_t_25 = __pyx_f_8_packsim_lntan; + __pyx_t_26 = __pyx_f_8_packsim_csc; - /* "voronoi_dcel.pyx":91 + /* "src/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, \ # <<<<<<<<<<<<<< @@ -7469,7 +7467,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ __pyx_v_ec.B = __pyx_t_23; __pyx_v_ec.F = __pyx_t_24; - /* "voronoi_dcel.pyx":92 + /* "src/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 # <<<<<<<<<<<<<< @@ -7479,7 +7477,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ __pyx_v_ec.lntan = __pyx_t_25; __pyx_v_ec.csc = __pyx_t_26; - /* "voronoi_dcel.pyx":94 + /* "src/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 # <<<<<<<<<<<<<< @@ -7489,7 +7487,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ __pyx_r = __pyx_v_ec; goto __pyx_L0; - /* "voronoi_dcel.pyx":82 + /* "src/voronoi_dcel.pyx":82 * #### EdgeCacheMap Methods #### * * cdef inline EdgeCacheMap init_edgecachemap(INT_T iH, INT_T ila, INT_T ida, INT_T ixij, # <<<<<<<<<<<<<< @@ -7502,7 +7500,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ return __pyx_r; } -/* "voronoi_dcel.pyx":97 +/* "src/voronoi_dcel.pyx":97 * * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: # <<<<<<<<<<<<<< @@ -7510,15 +7508,15 @@ static CYTHON_INLINE __pyx_t_12packsim_core_EdgeCacheMap __pyx_f_12packsim_core_ * return init.Matrix2x2( */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_Matrix2x2 __pyx_v_val) { - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_H(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_Matrix2x2 __pyx_v_val) { + __pyx_t_8_packsim_Matrix2x2 __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_3; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_4; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_5; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_3; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_4; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_5; - /* "voronoi_dcel.pyx":98 + /* "src/voronoi_dcel.pyx":98 * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: * if isnan(val.a): # <<<<<<<<<<<<<< @@ -7528,7 +7526,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_1 = (isnan(((double)__pyx_v_val.a)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":101 + /* "src/voronoi_dcel.pyx":101 * return init.Matrix2x2( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH) # <<<<<<<<<<<<<< @@ -7538,7 +7536,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iH; - /* "voronoi_dcel.pyx":104 + /* "src/voronoi_dcel.pyx":104 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH+1) # <<<<<<<<<<<<<< @@ -7548,7 +7546,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->iH + 1); - /* "voronoi_dcel.pyx":107 + /* "src/voronoi_dcel.pyx":107 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH+2) # <<<<<<<<<<<<<< @@ -7558,7 +7556,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_4.f0 = __pyx_v_self->arr_index; __pyx_t_4.f1 = (__pyx_v_self->cache->iH + 2); - /* "voronoi_dcel.pyx":110 + /* "src/voronoi_dcel.pyx":110 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH+3) # <<<<<<<<<<<<<< @@ -7568,17 +7566,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 3); - /* "voronoi_dcel.pyx":99 + /* "src/voronoi_dcel.pyx":99 * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: * if isnan(val.a): * return init.Matrix2x2( # <<<<<<<<<<<<<< * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iH) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":98 + /* "src/voronoi_dcel.pyx":98 * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: * if isnan(val.a): # <<<<<<<<<<<<<< @@ -7587,7 +7585,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ */ } - /* "voronoi_dcel.pyx":114 + /* "src/voronoi_dcel.pyx":114 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7596,7 +7594,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ */ /*else*/ { - /* "voronoi_dcel.pyx":115 + /* "src/voronoi_dcel.pyx":115 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH), val.a) # <<<<<<<<<<<<<< @@ -7606,7 +7604,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = __pyx_v_self->cache->iH; - /* "voronoi_dcel.pyx":114 + /* "src/voronoi_dcel.pyx":114 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7615,7 +7613,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.a); - /* "voronoi_dcel.pyx":117 + /* "src/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) # <<<<<<<<<<<<<< @@ -7625,7 +7623,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 1); - /* "voronoi_dcel.pyx":116 + /* "src/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, # <<<<<<<<<<<<<< @@ -7634,7 +7632,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.b); - /* "voronoi_dcel.pyx":119 + /* "src/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) # <<<<<<<<<<<<<< @@ -7644,7 +7642,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 2); - /* "voronoi_dcel.pyx":118 + /* "src/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, # <<<<<<<<<<<<<< @@ -7653,7 +7651,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.c); - /* "voronoi_dcel.pyx":121 + /* "src/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) # <<<<<<<<<<<<<< @@ -7663,7 +7661,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ __pyx_t_5.f0 = __pyx_v_self->arr_index; __pyx_t_5.f1 = (__pyx_v_self->cache->iH + 3); - /* "voronoi_dcel.pyx":120 + /* "src/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, # <<<<<<<<<<<<<< @@ -7672,7 +7670,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_5, __pyx_v_val.d); - /* "voronoi_dcel.pyx":122 + /* "src/voronoi_dcel.pyx":122 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iH+3), val.d) * return val # <<<<<<<<<<<<<< @@ -7683,7 +7681,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ goto __pyx_L0; } - /* "voronoi_dcel.pyx":97 + /* "src/voronoi_dcel.pyx":97 * * * cdef inline Matrix2x2 H(HalfEdge* self, Matrix2x2 val) nogil: # <<<<<<<<<<<<<< @@ -7696,7 +7694,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ return __pyx_r; } -/* "voronoi_dcel.pyx":124 +/* "src/voronoi_dcel.pyx":124 * return val * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7704,13 +7702,13 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_H(_ * return init.Vector2D( */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_val) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_la(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_val) { + __pyx_t_8_packsim_Vector2D __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_3; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_3; - /* "voronoi_dcel.pyx":125 + /* "src/voronoi_dcel.pyx":125 * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7720,7 +7718,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":128 + /* "src/voronoi_dcel.pyx":128 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ila) # <<<<<<<<<<<<<< @@ -7730,7 +7728,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ila; - /* "voronoi_dcel.pyx":131 + /* "src/voronoi_dcel.pyx":131 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ila+1) # <<<<<<<<<<<<<< @@ -7740,17 +7738,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ila + 1); - /* "voronoi_dcel.pyx":126 + /* "src/voronoi_dcel.pyx":126 * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ila) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":125 + /* "src/voronoi_dcel.pyx":125 * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7759,7 +7757,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ */ } - /* "voronoi_dcel.pyx":135 + /* "src/voronoi_dcel.pyx":135 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7768,7 +7766,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ */ /*else*/ { - /* "voronoi_dcel.pyx":136 + /* "src/voronoi_dcel.pyx":136 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila), val.x) # <<<<<<<<<<<<<< @@ -7778,7 +7776,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ila; - /* "voronoi_dcel.pyx":135 + /* "src/voronoi_dcel.pyx":135 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7787,7 +7785,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "voronoi_dcel.pyx":138 + /* "src/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) # <<<<<<<<<<<<<< @@ -7797,7 +7795,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ila + 1); - /* "voronoi_dcel.pyx":137 + /* "src/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, # <<<<<<<<<<<<<< @@ -7806,7 +7804,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "voronoi_dcel.pyx":139 + /* "src/voronoi_dcel.pyx":139 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila+1), val.y) * return val # <<<<<<<<<<<<<< @@ -7817,7 +7815,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ goto __pyx_L0; } - /* "voronoi_dcel.pyx":124 + /* "src/voronoi_dcel.pyx":124 * return val * * cdef inline Vector2D la(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7830,7 +7828,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ return __pyx_r; } -/* "voronoi_dcel.pyx":141 +/* "src/voronoi_dcel.pyx":141 * return val * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7838,13 +7836,13 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_la(_ * return init.Vector2D( */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_val) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_da(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_val) { + __pyx_t_8_packsim_Vector2D __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_3; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_3; - /* "voronoi_dcel.pyx":142 + /* "src/voronoi_dcel.pyx":142 * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7854,7 +7852,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":145 + /* "src/voronoi_dcel.pyx":145 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ida) # <<<<<<<<<<<<<< @@ -7864,7 +7862,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ida; - /* "voronoi_dcel.pyx":148 + /* "src/voronoi_dcel.pyx":148 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ida+1) # <<<<<<<<<<<<<< @@ -7874,17 +7872,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ida + 1); - /* "voronoi_dcel.pyx":143 + /* "src/voronoi_dcel.pyx":143 * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ida) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":142 + /* "src/voronoi_dcel.pyx":142 * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7893,7 +7891,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ */ } - /* "voronoi_dcel.pyx":152 + /* "src/voronoi_dcel.pyx":152 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7902,7 +7900,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ */ /*else*/ { - /* "voronoi_dcel.pyx":153 + /* "src/voronoi_dcel.pyx":153 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida), val.x) # <<<<<<<<<<<<<< @@ -7912,7 +7910,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ida; - /* "voronoi_dcel.pyx":152 + /* "src/voronoi_dcel.pyx":152 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -7921,7 +7919,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "voronoi_dcel.pyx":155 + /* "src/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) # <<<<<<<<<<<<<< @@ -7931,7 +7929,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ida + 1); - /* "voronoi_dcel.pyx":154 + /* "src/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, # <<<<<<<<<<<<<< @@ -7940,7 +7938,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "voronoi_dcel.pyx":156 + /* "src/voronoi_dcel.pyx":156 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida+1), val.y) * return val # <<<<<<<<<<<<<< @@ -7951,7 +7949,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ goto __pyx_L0; } - /* "voronoi_dcel.pyx":141 + /* "src/voronoi_dcel.pyx":141 * return val * * cdef inline Vector2D da(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7964,7 +7962,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ return __pyx_r; } -/* "voronoi_dcel.pyx":158 +/* "src/voronoi_dcel.pyx":158 * return val * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -7972,13 +7970,13 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_da(_ * return init.Vector2D( */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_val) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_xij(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_val) { + __pyx_t_8_packsim_Vector2D __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_3; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_3; - /* "voronoi_dcel.pyx":159 + /* "src/voronoi_dcel.pyx":159 * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -7988,7 +7986,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":162 + /* "src/voronoi_dcel.pyx":162 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ixij) # <<<<<<<<<<<<<< @@ -7998,7 +7996,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ixij; - /* "voronoi_dcel.pyx":165 + /* "src/voronoi_dcel.pyx":165 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ixij+1) # <<<<<<<<<<<<<< @@ -8008,17 +8006,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ixij + 1); - /* "voronoi_dcel.pyx":160 + /* "src/voronoi_dcel.pyx":160 * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ixij) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":159 + /* "src/voronoi_dcel.pyx":159 * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8027,7 +8025,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( */ } - /* "voronoi_dcel.pyx":169 + /* "src/voronoi_dcel.pyx":169 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8036,7 +8034,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( */ /*else*/ { - /* "voronoi_dcel.pyx":170 + /* "src/voronoi_dcel.pyx":170 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ixij), val.x) # <<<<<<<<<<<<<< @@ -8046,7 +8044,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ixij; - /* "voronoi_dcel.pyx":169 + /* "src/voronoi_dcel.pyx":169 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8055,7 +8053,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "voronoi_dcel.pyx":172 + /* "src/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) # <<<<<<<<<<<<<< @@ -8065,7 +8063,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ixij + 1); - /* "voronoi_dcel.pyx":171 + /* "src/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, # <<<<<<<<<<<<<< @@ -8074,7 +8072,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "voronoi_dcel.pyx":173 + /* "src/voronoi_dcel.pyx":173 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ixij+1), val.y) * return val # <<<<<<<<<<<<<< @@ -8085,7 +8083,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( goto __pyx_L0; } - /* "voronoi_dcel.pyx":158 + /* "src/voronoi_dcel.pyx":158 * return val * * cdef inline Vector2D xij(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8098,7 +8096,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( return __pyx_r; } -/* "voronoi_dcel.pyx":175 +/* "src/voronoi_dcel.pyx":175 * return val * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8106,13 +8104,13 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_xij( * return init.Vector2D( */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_val) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_dVdv(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_val) { + __pyx_t_8_packsim_Vector2D __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_3; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_3; - /* "voronoi_dcel.pyx":176 + /* "src/voronoi_dcel.pyx":176 * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8122,7 +8120,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":179 + /* "src/voronoi_dcel.pyx":179 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv) # <<<<<<<<<<<<<< @@ -8132,7 +8130,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->idVdv; - /* "voronoi_dcel.pyx":182 + /* "src/voronoi_dcel.pyx":182 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv+1) # <<<<<<<<<<<<<< @@ -8142,17 +8140,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->idVdv + 1); - /* "voronoi_dcel.pyx":177 + /* "src/voronoi_dcel.pyx":177 * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":176 + /* "src/voronoi_dcel.pyx":176 * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8161,7 +8159,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv */ } - /* "voronoi_dcel.pyx":186 + /* "src/voronoi_dcel.pyx":186 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8170,7 +8168,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv */ /*else*/ { - /* "voronoi_dcel.pyx":187 + /* "src/voronoi_dcel.pyx":187 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv), val.x) # <<<<<<<<<<<<<< @@ -8180,7 +8178,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->idVdv; - /* "voronoi_dcel.pyx":186 + /* "src/voronoi_dcel.pyx":186 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8189,7 +8187,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "voronoi_dcel.pyx":189 + /* "src/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) # <<<<<<<<<<<<<< @@ -8199,7 +8197,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->idVdv + 1); - /* "voronoi_dcel.pyx":188 + /* "src/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, # <<<<<<<<<<<<<< @@ -8208,7 +8206,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "voronoi_dcel.pyx":190 + /* "src/voronoi_dcel.pyx":190 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.idVdv+1), val.y) * return val # <<<<<<<<<<<<<< @@ -8219,7 +8217,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv goto __pyx_L0; } - /* "voronoi_dcel.pyx":175 + /* "src/voronoi_dcel.pyx":175 * return val * * cdef inline Vector2D dVdv(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8232,7 +8230,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv return __pyx_r; } -/* "voronoi_dcel.pyx":192 +/* "src/voronoi_dcel.pyx":192 * return val * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8240,13 +8238,13 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_dVdv * return init.Vector2D( */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_Vector2D __pyx_v_val) { - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_i2p(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_Vector2D __pyx_v_val) { + __pyx_t_8_packsim_Vector2D __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_3; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_3; - /* "voronoi_dcel.pyx":193 + /* "src/voronoi_dcel.pyx":193 * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8256,7 +8254,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( __pyx_t_1 = (isnan(((double)__pyx_v_val.x)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":196 + /* "src/voronoi_dcel.pyx":196 * return init.Vector2D( * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p) # <<<<<<<<<<<<<< @@ -8266,7 +8264,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ii2p; - /* "voronoi_dcel.pyx":199 + /* "src/voronoi_dcel.pyx":199 * ), * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p+1) # <<<<<<<<<<<<<< @@ -8276,17 +8274,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ii2p + 1); - /* "voronoi_dcel.pyx":194 + /* "src/voronoi_dcel.pyx":194 * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): * return init.Vector2D( # <<<<<<<<<<<<<< * self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":193 + /* "src/voronoi_dcel.pyx":193 * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: * if isnan(val.x): # <<<<<<<<<<<<<< @@ -8295,7 +8293,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( */ } - /* "voronoi_dcel.pyx":203 + /* "src/voronoi_dcel.pyx":203 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8304,7 +8302,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( */ /*else*/ { - /* "voronoi_dcel.pyx":204 + /* "src/voronoi_dcel.pyx":204 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p), val.x) # <<<<<<<<<<<<<< @@ -8314,7 +8312,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = __pyx_v_self->cache->ii2p; - /* "voronoi_dcel.pyx":203 + /* "src/voronoi_dcel.pyx":203 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8323,7 +8321,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.x); - /* "voronoi_dcel.pyx":206 + /* "src/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) # <<<<<<<<<<<<<< @@ -8333,7 +8331,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( __pyx_t_3.f0 = __pyx_v_self->arr_index; __pyx_t_3.f1 = (__pyx_v_self->cache->ii2p + 1); - /* "voronoi_dcel.pyx":205 + /* "src/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, # <<<<<<<<<<<<<< @@ -8342,7 +8340,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_3, __pyx_v_val.y); - /* "voronoi_dcel.pyx":207 + /* "src/voronoi_dcel.pyx":207 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ii2p+1), val.y) * return val # <<<<<<<<<<<<<< @@ -8353,7 +8351,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( goto __pyx_L0; } - /* "voronoi_dcel.pyx":192 + /* "src/voronoi_dcel.pyx":192 * return val * * cdef inline Vector2D i2p(HalfEdge* self, Vector2D val) nogil: # <<<<<<<<<<<<<< @@ -8366,7 +8364,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( return __pyx_r; } -/* "voronoi_dcel.pyx":209 +/* "src/voronoi_dcel.pyx":209 * return val * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8374,12 +8372,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_i2p( * return self.info.edge_cache.get(&self.info.edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_mag(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_la_mag(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":210 + /* "src/voronoi_dcel.pyx":210 * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8389,7 +8387,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":212 + /* "src/voronoi_dcel.pyx":212 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ila_mag) # <<<<<<<<<<<<<< @@ -8399,7 +8397,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ila_mag; - /* "voronoi_dcel.pyx":211 + /* "src/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, # <<<<<<<<<<<<<< @@ -8409,7 +8407,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":210 + /* "src/voronoi_dcel.pyx":210 * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8418,7 +8416,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma */ } - /* "voronoi_dcel.pyx":215 + /* "src/voronoi_dcel.pyx":215 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8427,7 +8425,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma */ /*else*/ { - /* "voronoi_dcel.pyx":216 + /* "src/voronoi_dcel.pyx":216 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila_mag), val) # <<<<<<<<<<<<<< @@ -8437,7 +8435,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ila_mag; - /* "voronoi_dcel.pyx":215 + /* "src/voronoi_dcel.pyx":215 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8446,7 +8444,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":217 + /* "src/voronoi_dcel.pyx":217 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ila_mag), val) * return val # <<<<<<<<<<<<<< @@ -8457,7 +8455,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma goto __pyx_L0; } - /* "voronoi_dcel.pyx":209 + /* "src/voronoi_dcel.pyx":209 * return val * * cdef inline FLOAT_T la_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8470,7 +8468,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma return __pyx_r; } -/* "voronoi_dcel.pyx":219 +/* "src/voronoi_dcel.pyx":219 * return val * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8478,12 +8476,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_la_ma * return self.info.edge_cache.get(&self.info.edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_mag(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_da_mag(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":220 + /* "src/voronoi_dcel.pyx":220 * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8493,7 +8491,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":222 + /* "src/voronoi_dcel.pyx":222 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ida_mag) # <<<<<<<<<<<<<< @@ -8503,7 +8501,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ida_mag; - /* "voronoi_dcel.pyx":221 + /* "src/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, # <<<<<<<<<<<<<< @@ -8513,7 +8511,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":220 + /* "src/voronoi_dcel.pyx":220 * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8522,7 +8520,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma */ } - /* "voronoi_dcel.pyx":225 + /* "src/voronoi_dcel.pyx":225 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8531,7 +8529,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma */ /*else*/ { - /* "voronoi_dcel.pyx":226 + /* "src/voronoi_dcel.pyx":226 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida_mag), val) # <<<<<<<<<<<<<< @@ -8541,7 +8539,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ida_mag; - /* "voronoi_dcel.pyx":225 + /* "src/voronoi_dcel.pyx":225 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8550,7 +8548,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":227 + /* "src/voronoi_dcel.pyx":227 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ida_mag), val) * return val # <<<<<<<<<<<<<< @@ -8561,7 +8559,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma goto __pyx_L0; } - /* "voronoi_dcel.pyx":219 + /* "src/voronoi_dcel.pyx":219 * return val * * cdef inline FLOAT_T da_mag(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8574,7 +8572,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma return __pyx_r; } -/* "voronoi_dcel.pyx":229 +/* "src/voronoi_dcel.pyx":229 * return val * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8582,12 +8580,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_da_ma * return self.info.edge_cache.get(&self.info.edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_phi(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":230 + /* "src/voronoi_dcel.pyx":230 * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8597,7 +8595,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":232 + /* "src/voronoi_dcel.pyx":232 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iphi) # <<<<<<<<<<<<<< @@ -8607,7 +8605,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iphi; - /* "voronoi_dcel.pyx":231 + /* "src/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, # <<<<<<<<<<<<<< @@ -8617,7 +8615,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":230 + /* "src/voronoi_dcel.pyx":230 * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8626,7 +8624,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ */ } - /* "voronoi_dcel.pyx":235 + /* "src/voronoi_dcel.pyx":235 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8635,7 +8633,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ */ /*else*/ { - /* "voronoi_dcel.pyx":236 + /* "src/voronoi_dcel.pyx":236 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iphi), val) # <<<<<<<<<<<<<< @@ -8645,7 +8643,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iphi; - /* "voronoi_dcel.pyx":235 + /* "src/voronoi_dcel.pyx":235 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8654,7 +8652,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":237 + /* "src/voronoi_dcel.pyx":237 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iphi), val) * return val # <<<<<<<<<<<<<< @@ -8665,7 +8663,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ goto __pyx_L0; } - /* "voronoi_dcel.pyx":229 + /* "src/voronoi_dcel.pyx":229 * return val * * cdef inline FLOAT_T phi(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8678,7 +8676,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ return __pyx_r; } -/* "voronoi_dcel.pyx":239 +/* "src/voronoi_dcel.pyx":239 * return val * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8686,12 +8684,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_phi(_ * return self.info.edge_cache.get(&self.info.edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_B(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":240 + /* "src/voronoi_dcel.pyx":240 * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8701,7 +8699,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":242 + /* "src/voronoi_dcel.pyx":242 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iB) # <<<<<<<<<<<<<< @@ -8711,7 +8709,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iB; - /* "voronoi_dcel.pyx":241 + /* "src/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, # <<<<<<<<<<<<<< @@ -8721,7 +8719,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":240 + /* "src/voronoi_dcel.pyx":240 * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8730,7 +8728,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p */ } - /* "voronoi_dcel.pyx":245 + /* "src/voronoi_dcel.pyx":245 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8739,7 +8737,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p */ /*else*/ { - /* "voronoi_dcel.pyx":246 + /* "src/voronoi_dcel.pyx":246 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iB), val) # <<<<<<<<<<<<<< @@ -8749,7 +8747,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iB; - /* "voronoi_dcel.pyx":245 + /* "src/voronoi_dcel.pyx":245 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8758,7 +8756,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":247 + /* "src/voronoi_dcel.pyx":247 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iB), val) * return val # <<<<<<<<<<<<<< @@ -8769,7 +8767,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p goto __pyx_L0; } - /* "voronoi_dcel.pyx":239 + /* "src/voronoi_dcel.pyx":239 * return val * * cdef inline FLOAT_T B(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8782,7 +8780,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p return __pyx_r; } -/* "voronoi_dcel.pyx":249 +/* "src/voronoi_dcel.pyx":249 * return val * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8790,12 +8788,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_B(__p * return self.info.edge_cache.get(&self.info.edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_F(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":250 + /* "src/voronoi_dcel.pyx":250 * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8805,7 +8803,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":252 + /* "src/voronoi_dcel.pyx":252 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.iF) # <<<<<<<<<<<<<< @@ -8815,7 +8813,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iF; - /* "voronoi_dcel.pyx":251 + /* "src/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, # <<<<<<<<<<<<<< @@ -8825,7 +8823,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":250 + /* "src/voronoi_dcel.pyx":250 * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8834,7 +8832,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p */ } - /* "voronoi_dcel.pyx":255 + /* "src/voronoi_dcel.pyx":255 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8843,7 +8841,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p */ /*else*/ { - /* "voronoi_dcel.pyx":256 + /* "src/voronoi_dcel.pyx":256 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iF), val) # <<<<<<<<<<<<<< @@ -8853,7 +8851,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->iF; - /* "voronoi_dcel.pyx":255 + /* "src/voronoi_dcel.pyx":255 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8862,7 +8860,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":257 + /* "src/voronoi_dcel.pyx":257 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.iF), val) * return val # <<<<<<<<<<<<<< @@ -8873,7 +8871,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p goto __pyx_L0; } - /* "voronoi_dcel.pyx":249 + /* "src/voronoi_dcel.pyx":249 * return val * * cdef inline FLOAT_T F(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8886,7 +8884,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p return __pyx_r; } -/* "voronoi_dcel.pyx":259 +/* "src/voronoi_dcel.pyx":259 * return val * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8894,12 +8892,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_F(__p * return self.info.edge_cache.get(&self.info.edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_lntan(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":260 + /* "src/voronoi_dcel.pyx":260 * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8909,7 +8907,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":262 + /* "src/voronoi_dcel.pyx":262 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.ilntan) # <<<<<<<<<<<<<< @@ -8919,7 +8917,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ilntan; - /* "voronoi_dcel.pyx":261 + /* "src/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, # <<<<<<<<<<<<<< @@ -8929,7 +8927,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":260 + /* "src/voronoi_dcel.pyx":260 * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -8938,7 +8936,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan */ } - /* "voronoi_dcel.pyx":265 + /* "src/voronoi_dcel.pyx":265 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8947,7 +8945,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan */ /*else*/ { - /* "voronoi_dcel.pyx":266 + /* "src/voronoi_dcel.pyx":266 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ilntan), val) # <<<<<<<<<<<<<< @@ -8957,7 +8955,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->ilntan; - /* "voronoi_dcel.pyx":265 + /* "src/voronoi_dcel.pyx":265 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -8966,7 +8964,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":267 + /* "src/voronoi_dcel.pyx":267 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.ilntan), val) * return val # <<<<<<<<<<<<<< @@ -8977,7 +8975,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan goto __pyx_L0; } - /* "voronoi_dcel.pyx":259 + /* "src/voronoi_dcel.pyx":259 * return val * * cdef inline FLOAT_T lntan(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8990,7 +8988,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan return __pyx_r; } -/* "voronoi_dcel.pyx":269 +/* "src/voronoi_dcel.pyx":269 * return val * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -8998,12 +8996,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_lntan * return self.info.edge_cache.get(&self.info.edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_val) { - __pyx_t_12packsim_core_FLOAT_T __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_csc(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_val) { + __pyx_t_8_packsim_FLOAT_T __pyx_r; int __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":270 + /* "src/voronoi_dcel.pyx":270 * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -9013,7 +9011,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ __pyx_t_1 = (isnan(((double)__pyx_v_val)) != 0); if (__pyx_t_1) { - /* "voronoi_dcel.pyx":272 + /* "src/voronoi_dcel.pyx":272 * if isnan(val): * return self.info.edge_cache.get(&self.info.edge_cache, * (self.arr_index, self.cache.icsc) # <<<<<<<<<<<<<< @@ -9023,7 +9021,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->icsc; - /* "voronoi_dcel.pyx":271 + /* "src/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, # <<<<<<<<<<<<<< @@ -9033,7 +9031,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ __pyx_r = __pyx_v_self->info->edge_cache.get((&__pyx_v_self->info->edge_cache), __pyx_t_2); goto __pyx_L0; - /* "voronoi_dcel.pyx":270 + /* "src/voronoi_dcel.pyx":270 * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: * if isnan(val): # <<<<<<<<<<<<<< @@ -9042,7 +9040,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ */ } - /* "voronoi_dcel.pyx":275 + /* "src/voronoi_dcel.pyx":275 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -9051,7 +9049,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ */ /*else*/ { - /* "voronoi_dcel.pyx":276 + /* "src/voronoi_dcel.pyx":276 * else: * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.icsc), val) # <<<<<<<<<<<<<< @@ -9061,7 +9059,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ __pyx_t_2.f0 = __pyx_v_self->arr_index; __pyx_t_2.f1 = __pyx_v_self->cache->icsc; - /* "voronoi_dcel.pyx":275 + /* "src/voronoi_dcel.pyx":275 * ) * else: * self.info.edge_cache.set(&self.info.edge_cache, # <<<<<<<<<<<<<< @@ -9070,7 +9068,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ */ __pyx_v_self->info->edge_cache.set((&__pyx_v_self->info->edge_cache), __pyx_t_2, __pyx_v_val); - /* "voronoi_dcel.pyx":277 + /* "src/voronoi_dcel.pyx":277 * self.info.edge_cache.set(&self.info.edge_cache, * (self.arr_index, self.cache.icsc), val) * return val # <<<<<<<<<<<<<< @@ -9081,7 +9079,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ goto __pyx_L0; } - /* "voronoi_dcel.pyx":269 + /* "src/voronoi_dcel.pyx":269 * return val * * cdef inline FLOAT_T csc(HalfEdge* self, FLOAT_T val) nogil: # <<<<<<<<<<<<<< @@ -9094,7 +9092,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ return __pyx_r; } -/* "voronoi_dcel.pyx":282 +/* "src/voronoi_dcel.pyx":282 * #### VoronoiInfo Methods #### * * cdef inline VoronoiInfo init_voronoiinfo(INT_T [:, ::1] sites, INT_T [:, ::1] edges, # <<<<<<<<<<<<<< @@ -9102,14 +9100,14 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_csc(_ * FLOAT_T [:, ::1] site_cache, FLOAT_T [:, ::1] edge_cache, */ -static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_init_voronoiinfo(__Pyx_memviewslice __pyx_v_sites, __Pyx_memviewslice __pyx_v_edges, __Pyx_memviewslice __pyx_v_points, __Pyx_memviewslice __pyx_v_vertices, __Pyx_memviewslice __pyx_v_site_cache, __Pyx_memviewslice __pyx_v_edge_cache, __pyx_t_12packsim_core_EdgeCacheMap *__pyx_v_edge_cache_map) { - __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; - __pyx_t_12packsim_core_VoronoiInfo __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_VoronoiInfo __pyx_f_8_packsim_init_voronoiinfo(__Pyx_memviewslice __pyx_v_sites, __Pyx_memviewslice __pyx_v_edges, __Pyx_memviewslice __pyx_v_points, __Pyx_memviewslice __pyx_v_vertices, __Pyx_memviewslice __pyx_v_site_cache, __Pyx_memviewslice __pyx_v_edge_cache, __pyx_t_8_packsim_EdgeCacheMap *__pyx_v_edge_cache_map) { + __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; + __pyx_t_8_packsim_VoronoiInfo __pyx_r; Py_ssize_t __pyx_t_1; Py_ssize_t __pyx_t_2; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_3; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_3; - /* "voronoi_dcel.pyx":287 + /* "src/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])) # <<<<<<<<<<<<<< @@ -9118,11 +9116,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i */ __pyx_t_1 = 0; __pyx_t_2 = 0; - __pyx_t_3.f0 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_sites.shape[0])); - __pyx_t_3.f1 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_sites.shape[1])); - __pyx_v_info.sites = __pyx_f_12packsim_core_init_iarray((&(*((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_sites.data + __pyx_t_1 * __pyx_v_sites.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); + __pyx_t_3.f0 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_sites.shape[0])); + __pyx_t_3.f1 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_sites.shape[1])); + __pyx_v_info.sites = __pyx_f_8_packsim_init_iarray((&(*((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_sites.data + __pyx_t_1 * __pyx_v_sites.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); - /* "voronoi_dcel.pyx":288 + /* "src/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])) # <<<<<<<<<<<<<< @@ -9131,11 +9129,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i */ __pyx_t_2 = 0; __pyx_t_1 = 0; - __pyx_t_3.f0 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_edges.shape[0])); - __pyx_t_3.f1 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_edges.shape[1])); - __pyx_v_info.edges = __pyx_f_12packsim_core_init_iarray((&(*((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_edges.data + __pyx_t_2 * __pyx_v_edges.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); + __pyx_t_3.f0 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_edges.shape[0])); + __pyx_t_3.f1 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_edges.shape[1])); + __pyx_v_info.edges = __pyx_f_8_packsim_init_iarray((&(*((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_edges.data + __pyx_t_2 * __pyx_v_edges.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); - /* "voronoi_dcel.pyx":289 + /* "src/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])) # <<<<<<<<<<<<<< @@ -9144,11 +9142,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i */ __pyx_t_1 = 0; __pyx_t_2 = 0; - __pyx_t_3.f0 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_points.shape[0])); - __pyx_t_3.f1 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_points.shape[1])); - __pyx_v_info.points = __pyx_f_12packsim_core_init_farray((&(*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_points.data + __pyx_t_1 * __pyx_v_points.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); + __pyx_t_3.f0 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_points.shape[0])); + __pyx_t_3.f1 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_points.shape[1])); + __pyx_v_info.points = __pyx_f_8_packsim_init_farray((&(*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_points.data + __pyx_t_1 * __pyx_v_points.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); - /* "voronoi_dcel.pyx":290 + /* "src/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], # <<<<<<<<<<<<<< @@ -9158,26 +9156,26 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i __pyx_t_2 = 0; __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":291 + /* "src/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]) # <<<<<<<<<<<<<< * ) * info.site_cache = init_farray(&site_cache[0,0], */ - __pyx_t_3.f0 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_vertices.shape[0])); - __pyx_t_3.f1 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_vertices.shape[1])); + __pyx_t_3.f0 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_vertices.shape[0])); + __pyx_t_3.f1 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_vertices.shape[1])); - /* "voronoi_dcel.pyx":290 + /* "src/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], # <<<<<<<<<<<<<< * (vertices.shape[0], vertices.shape[1]) * ) */ - __pyx_v_info.vertices = __pyx_f_12packsim_core_init_farray((&(*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_vertices.data + __pyx_t_2 * __pyx_v_vertices.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); + __pyx_v_info.vertices = __pyx_f_8_packsim_init_farray((&(*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_vertices.data + __pyx_t_2 * __pyx_v_vertices.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); - /* "voronoi_dcel.pyx":293 + /* "src/voronoi_dcel.pyx":293 * (vertices.shape[0], vertices.shape[1]) * ) * info.site_cache = init_farray(&site_cache[0,0], # <<<<<<<<<<<<<< @@ -9187,26 +9185,26 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i __pyx_t_1 = 0; __pyx_t_2 = 0; - /* "voronoi_dcel.pyx":294 + /* "src/voronoi_dcel.pyx":294 * ) * info.site_cache = init_farray(&site_cache[0,0], * (site_cache.shape[0], site_cache.shape[1]) # <<<<<<<<<<<<<< * ) * info.edge_cache = init_farray(&edge_cache[0,0], */ - __pyx_t_3.f0 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_site_cache.shape[0])); - __pyx_t_3.f1 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_site_cache.shape[1])); + __pyx_t_3.f0 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_site_cache.shape[0])); + __pyx_t_3.f1 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_site_cache.shape[1])); - /* "voronoi_dcel.pyx":293 + /* "src/voronoi_dcel.pyx":293 * (vertices.shape[0], vertices.shape[1]) * ) * info.site_cache = init_farray(&site_cache[0,0], # <<<<<<<<<<<<<< * (site_cache.shape[0], site_cache.shape[1]) * ) */ - __pyx_v_info.site_cache = __pyx_f_12packsim_core_init_farray((&(*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_cache.data + __pyx_t_1 * __pyx_v_site_cache.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); + __pyx_v_info.site_cache = __pyx_f_8_packsim_init_farray((&(*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_cache.data + __pyx_t_1 * __pyx_v_site_cache.strides[0]) )) + __pyx_t_2)) )))), __pyx_t_3); - /* "voronoi_dcel.pyx":296 + /* "src/voronoi_dcel.pyx":296 * (site_cache.shape[0], site_cache.shape[1]) * ) * info.edge_cache = init_farray(&edge_cache[0,0], # <<<<<<<<<<<<<< @@ -9216,26 +9214,26 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i __pyx_t_2 = 0; __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":297 + /* "src/voronoi_dcel.pyx":297 * ) * info.edge_cache = init_farray(&edge_cache[0,0], * (edge_cache.shape[0], edge_cache.shape[1]) # <<<<<<<<<<<<<< * ) * info.edge_cache_map = edge_cache_map */ - __pyx_t_3.f0 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_edge_cache.shape[0])); - __pyx_t_3.f1 = ((__pyx_t_12packsim_core_INT_T)(__pyx_v_edge_cache.shape[1])); + __pyx_t_3.f0 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_edge_cache.shape[0])); + __pyx_t_3.f1 = ((__pyx_t_8_packsim_INT_T)(__pyx_v_edge_cache.shape[1])); - /* "voronoi_dcel.pyx":296 + /* "src/voronoi_dcel.pyx":296 * (site_cache.shape[0], site_cache.shape[1]) * ) * info.edge_cache = init_farray(&edge_cache[0,0], # <<<<<<<<<<<<<< * (edge_cache.shape[0], edge_cache.shape[1]) * ) */ - __pyx_v_info.edge_cache = __pyx_f_12packsim_core_init_farray((&(*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_edge_cache.data + __pyx_t_2 * __pyx_v_edge_cache.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); + __pyx_v_info.edge_cache = __pyx_f_8_packsim_init_farray((&(*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_edge_cache.data + __pyx_t_2 * __pyx_v_edge_cache.strides[0]) )) + __pyx_t_1)) )))), __pyx_t_3); - /* "voronoi_dcel.pyx":299 + /* "src/voronoi_dcel.pyx":299 * (edge_cache.shape[0], edge_cache.shape[1]) * ) * info.edge_cache_map = edge_cache_map # <<<<<<<<<<<<<< @@ -9244,7 +9242,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i */ __pyx_v_info.edge_cache_map = __pyx_v_edge_cache_map; - /* "voronoi_dcel.pyx":301 + /* "src/voronoi_dcel.pyx":301 * info.edge_cache_map = edge_cache_map * * return info # <<<<<<<<<<<<<< @@ -9254,7 +9252,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i __pyx_r = __pyx_v_info; goto __pyx_L0; - /* "voronoi_dcel.pyx":282 + /* "src/voronoi_dcel.pyx":282 * #### VoronoiInfo Methods #### * * cdef inline VoronoiInfo init_voronoiinfo(INT_T [:, ::1] sites, INT_T [:, ::1] edges, # <<<<<<<<<<<<<< @@ -9267,7 +9265,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i return __pyx_r; } -/* "voronoi_dcel.pyx":306 +/* "src/voronoi_dcel.pyx":306 * #### Site Methods #### * * cdef inline Site init_site(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9275,18 +9273,18 @@ static CYTHON_INLINE __pyx_t_12packsim_core_VoronoiInfo __pyx_f_12packsim_core_i * site.arr_index, site.info, site.cache = arr_index, info, &SITE_CACHE_MAP */ -static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_init_site(__pyx_t_12packsim_core_INT_T __pyx_v_arr_index, __pyx_t_12packsim_core_VoronoiInfo *__pyx_v_info) { - __pyx_t_12packsim_core_Site __pyx_v_site; - __pyx_t_12packsim_core_Site __pyx_r; - __pyx_t_12packsim_core_INT_T __pyx_t_1; - __pyx_t_12packsim_core_VoronoiInfo *__pyx_t_2; - __pyx_t_12packsim_core_SiteCacheMap *__pyx_t_3; - __pyx_t_12packsim_core_INT_T (*__pyx_t_4)(__pyx_t_12packsim_core_Site *); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_5)(__pyx_t_12packsim_core_Site *); - __pyx_t_12packsim_core_HalfEdge (*__pyx_t_6)(__pyx_t_12packsim_core_Site *); - __pyx_t_12packsim_core_INT_T (*__pyx_t_7)(__pyx_t_12packsim_core_Site *); +static CYTHON_INLINE __pyx_t_8_packsim_Site __pyx_f_8_packsim_init_site(__pyx_t_8_packsim_INT_T __pyx_v_arr_index, __pyx_t_8_packsim_VoronoiInfo *__pyx_v_info) { + __pyx_t_8_packsim_Site __pyx_v_site; + __pyx_t_8_packsim_Site __pyx_r; + __pyx_t_8_packsim_INT_T __pyx_t_1; + __pyx_t_8_packsim_VoronoiInfo *__pyx_t_2; + __pyx_t_8_packsim_SiteCacheMap *__pyx_t_3; + __pyx_t_8_packsim_INT_T (*__pyx_t_4)(__pyx_t_8_packsim_Site *); + __pyx_t_8_packsim_Vector2D (*__pyx_t_5)(__pyx_t_8_packsim_Site *); + __pyx_t_8_packsim_HalfEdge (*__pyx_t_6)(__pyx_t_8_packsim_Site *); + __pyx_t_8_packsim_INT_T (*__pyx_t_7)(__pyx_t_8_packsim_Site *); - /* "voronoi_dcel.pyx":308 + /* "src/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 # <<<<<<<<<<<<<< @@ -9295,28 +9293,28 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_init_sit */ __pyx_t_1 = __pyx_v_arr_index; __pyx_t_2 = __pyx_v_info; - __pyx_t_3 = (&__pyx_v_12packsim_core_SITE_CACHE_MAP); + __pyx_t_3 = (&__pyx_v_8_packsim_SITE_CACHE_MAP); __pyx_v_site.arr_index = __pyx_t_1; __pyx_v_site.info = __pyx_t_2; __pyx_v_site.cache = __pyx_t_3; - /* "voronoi_dcel.pyx":310 + /* "src/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 # <<<<<<<<<<<<<< * * return site */ - __pyx_t_4 = __pyx_f_12packsim_core_index; - __pyx_t_5 = __pyx_f_12packsim_core_vec; - __pyx_t_6 = __pyx_f_12packsim_core_edge; - __pyx_t_7 = __pyx_f_12packsim_core_edge_num; + __pyx_t_4 = __pyx_f_8_packsim_index; + __pyx_t_5 = __pyx_f_8_packsim_vec; + __pyx_t_6 = __pyx_f_8_packsim_edge; + __pyx_t_7 = __pyx_f_8_packsim_edge_num; __pyx_v_site.index = __pyx_t_4; __pyx_v_site.vec = __pyx_t_5; __pyx_v_site.edge = __pyx_t_6; __pyx_v_site.edge_num = __pyx_t_7; - /* "voronoi_dcel.pyx":312 + /* "src/voronoi_dcel.pyx":312 * site.index, site.vec, site.edge, site.edge_num = index, vec, edge, edge_num * * return site # <<<<<<<<<<<<<< @@ -9326,7 +9324,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_init_sit __pyx_r = __pyx_v_site; goto __pyx_L0; - /* "voronoi_dcel.pyx":306 + /* "src/voronoi_dcel.pyx":306 * #### Site Methods #### * * cdef inline Site init_site(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9339,7 +9337,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_init_sit return __pyx_r; } -/* "voronoi_dcel.pyx":315 +/* "src/voronoi_dcel.pyx":315 * * * cdef inline INT_T index(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9347,11 +9345,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_init_sit * */ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_index(__pyx_t_12packsim_core_Site *__pyx_v_self) { - __pyx_t_12packsim_core_INT_T __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_index(__pyx_t_8_packsim_Site *__pyx_v_self) { + __pyx_t_8_packsim_INT_T __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":316 + /* "src/voronoi_dcel.pyx":316 * * cdef inline INT_T index(Site* self) nogil: * return self.info.sites.get(&self.info.sites, (self.arr_index, 0)) # <<<<<<<<<<<<<< @@ -9363,7 +9361,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_index(_ __pyx_r = __pyx_v_self->info->sites.get((&__pyx_v_self->info->sites), __pyx_t_1); goto __pyx_L0; - /* "voronoi_dcel.pyx":315 + /* "src/voronoi_dcel.pyx":315 * * * cdef inline INT_T index(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9376,7 +9374,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_index(_ return __pyx_r; } -/* "voronoi_dcel.pyx":318 +/* "src/voronoi_dcel.pyx":318 * return self.info.sites.get(&self.info.sites, (self.arr_index, 0)) * * cdef inline Vector2D vec(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9384,12 +9382,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_index(_ * self.info.points.get(&self.info.points, (self.index(self), 0)), */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_vec(__pyx_t_12packsim_core_Site *__pyx_v_self) { - __pyx_t_12packsim_core_Vector2D __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_vec(__pyx_t_8_packsim_Site *__pyx_v_self) { + __pyx_t_8_packsim_Vector2D __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":320 + /* "src/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)), # <<<<<<<<<<<<<< @@ -9399,7 +9397,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_vec( __pyx_t_1.f0 = __pyx_v_self->index(__pyx_v_self); __pyx_t_1.f1 = 0; - /* "voronoi_dcel.pyx":321 + /* "src/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)) # <<<<<<<<<<<<<< @@ -9409,17 +9407,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_vec( __pyx_t_2.f0 = __pyx_v_self->index(__pyx_v_self); __pyx_t_2.f1 = 1; - /* "voronoi_dcel.pyx":319 + /* "src/voronoi_dcel.pyx":319 * * cdef inline Vector2D vec(Site* self) nogil: * 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)) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":318 + /* "src/voronoi_dcel.pyx":318 * return self.info.sites.get(&self.info.sites, (self.arr_index, 0)) * * cdef inline Vector2D vec(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9432,7 +9430,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_vec( return __pyx_r; } -/* "voronoi_dcel.pyx":324 +/* "src/voronoi_dcel.pyx":324 * ) * * cdef inline HalfEdge edge(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9440,11 +9438,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_vec( * self.info.sites.get(&self.info.sites, (self.arr_index, 1)), self.info */ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge(__pyx_t_12packsim_core_Site *__pyx_v_self) { - __pyx_t_12packsim_core_HalfEdge __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_edge(__pyx_t_8_packsim_Site *__pyx_v_self) { + __pyx_t_8_packsim_HalfEdge __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":326 + /* "src/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 # <<<<<<<<<<<<<< @@ -9454,17 +9452,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 1; - /* "voronoi_dcel.pyx":325 + /* "src/voronoi_dcel.pyx":325 * * cdef inline HalfEdge edge(Site* self) nogil: * return init.HalfEdge( # <<<<<<<<<<<<<< * self.info.sites.get(&self.info.sites, (self.arr_index, 1)), self.info * ) */ - __pyx_r = __pyx_v_12packsim_core_init.HalfEdge(__pyx_v_self->info->sites.get((&__pyx_v_self->info->sites), __pyx_t_1), __pyx_v_self->info); + __pyx_r = __pyx_v_8_packsim_init.HalfEdge(__pyx_v_self->info->sites.get((&__pyx_v_self->info->sites), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "voronoi_dcel.pyx":324 + /* "src/voronoi_dcel.pyx":324 * ) * * cdef inline HalfEdge edge(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9477,7 +9475,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge return __pyx_r; } -/* "voronoi_dcel.pyx":329 +/* "src/voronoi_dcel.pyx":329 * ) * * cdef inline INT_T edge_num(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9485,11 +9483,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge * */ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_edge_num(__pyx_t_12packsim_core_Site *__pyx_v_self) { - __pyx_t_12packsim_core_INT_T __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_edge_num(__pyx_t_8_packsim_Site *__pyx_v_self) { + __pyx_t_8_packsim_INT_T __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":330 + /* "src/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)) # <<<<<<<<<<<<<< @@ -9501,7 +9499,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_edge_nu __pyx_r = __pyx_v_self->info->sites.get((&__pyx_v_self->info->sites), __pyx_t_1); goto __pyx_L0; - /* "voronoi_dcel.pyx":329 + /* "src/voronoi_dcel.pyx":329 * ) * * cdef inline INT_T edge_num(Site* self) nogil: # <<<<<<<<<<<<<< @@ -9514,7 +9512,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_edge_nu return __pyx_r; } -/* "voronoi_dcel.pyx":335 +/* "src/voronoi_dcel.pyx":335 * #### HalfEdge Methods #### * * cdef inline HalfEdge init_halfedge(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9522,21 +9520,21 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_edge_nu * edge.arr_index, edge.info, edge.cache = arr_index, info, info.edge_cache_map */ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init_halfedge(__pyx_t_12packsim_core_INT_T __pyx_v_arr_index, __pyx_t_12packsim_core_VoronoiInfo *__pyx_v_info) { - __pyx_t_12packsim_core_HalfEdge __pyx_v_edge; - __pyx_t_12packsim_core_HalfEdge __pyx_r; - __pyx_t_12packsim_core_INT_T __pyx_t_1; - __pyx_t_12packsim_core_VoronoiInfo *__pyx_t_2; - __pyx_t_12packsim_core_EdgeCacheMap *__pyx_t_3; - __pyx_t_12packsim_core_INT_T (*__pyx_t_4)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_5)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_Site (*__pyx_t_6)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_HalfEdge (*__pyx_t_7)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_HalfEdge (*__pyx_t_8)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_HalfEdge (*__pyx_t_9)(__pyx_t_12packsim_core_HalfEdge *); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_10)(__pyx_t_12packsim_core_HalfEdge *, __pyx_t_12packsim_core_Site); +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_init_halfedge(__pyx_t_8_packsim_INT_T __pyx_v_arr_index, __pyx_t_8_packsim_VoronoiInfo *__pyx_v_info) { + __pyx_t_8_packsim_HalfEdge __pyx_v_edge; + __pyx_t_8_packsim_HalfEdge __pyx_r; + __pyx_t_8_packsim_INT_T __pyx_t_1; + __pyx_t_8_packsim_VoronoiInfo *__pyx_t_2; + __pyx_t_8_packsim_EdgeCacheMap *__pyx_t_3; + __pyx_t_8_packsim_INT_T (*__pyx_t_4)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_Vector2D (*__pyx_t_5)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_Site (*__pyx_t_6)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_HalfEdge (*__pyx_t_7)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_HalfEdge (*__pyx_t_8)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_HalfEdge (*__pyx_t_9)(__pyx_t_8_packsim_HalfEdge *); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_10)(__pyx_t_8_packsim_HalfEdge *, __pyx_t_8_packsim_Site); - /* "voronoi_dcel.pyx":337 + /* "src/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 # <<<<<<<<<<<<<< @@ -9550,7 +9548,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init __pyx_v_edge.info = __pyx_t_2; __pyx_v_edge.cache = __pyx_t_3; - /* "voronoi_dcel.pyx":338 + /* "src/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 # <<<<<<<<<<<<<< @@ -9559,22 +9557,22 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init */ __pyx_v_edge.orig_arr_index = __pyx_v_arr_index; - /* "voronoi_dcel.pyx":341 + /* "src/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 # <<<<<<<<<<<<<< * * return edge */ - __pyx_t_4 = __pyx_f_12packsim_core_origin_index; - __pyx_t_5 = __pyx_f_12packsim_core_origin; - __pyx_t_6 = __pyx_f_12packsim_core_face; - __pyx_t_7 = __pyx_f_12packsim_core_edge_next; - __pyx_t_8 = __pyx_f_12packsim_core_prev; - __pyx_t_9 = __pyx_f_12packsim_core_twin; - __pyx_t_10 = __pyx_f_12packsim_core_get_H; + __pyx_t_4 = __pyx_f_8_packsim_origin_index; + __pyx_t_5 = __pyx_f_8_packsim_origin; + __pyx_t_6 = __pyx_f_8_packsim_face; + __pyx_t_7 = __pyx_f_8_packsim_edge_next; + __pyx_t_8 = __pyx_f_8_packsim_prev; + __pyx_t_9 = __pyx_f_8_packsim_twin; + __pyx_t_10 = __pyx_f_8_packsim_get_H; - /* "voronoi_dcel.pyx":340 + /* "src/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 = \ # <<<<<<<<<<<<<< @@ -9589,7 +9587,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init __pyx_v_edge.twin = __pyx_t_9; __pyx_v_edge.get_H = __pyx_t_10; - /* "voronoi_dcel.pyx":343 + /* "src/voronoi_dcel.pyx":343 * origin_index, origin, face, edge_next, prev, twin, get_H * * return edge # <<<<<<<<<<<<<< @@ -9599,7 +9597,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init __pyx_r = __pyx_v_edge; goto __pyx_L0; - /* "voronoi_dcel.pyx":335 + /* "src/voronoi_dcel.pyx":335 * #### HalfEdge Methods #### * * cdef inline HalfEdge init_halfedge(INT_T arr_index, VoronoiInfo* info) nogil: # <<<<<<<<<<<<<< @@ -9612,7 +9610,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init return __pyx_r; } -/* "voronoi_dcel.pyx":346 +/* "src/voronoi_dcel.pyx":346 * * * cdef inline INT_T origin_index(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9620,11 +9618,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_init * */ -static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_origin_index(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self) { - __pyx_t_12packsim_core_INT_T __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_INT_T __pyx_f_8_packsim_origin_index(__pyx_t_8_packsim_HalfEdge *__pyx_v_self) { + __pyx_t_8_packsim_INT_T __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":347 + /* "src/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)) # <<<<<<<<<<<<<< @@ -9636,7 +9634,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_origin_ __pyx_r = __pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1); goto __pyx_L0; - /* "voronoi_dcel.pyx":346 + /* "src/voronoi_dcel.pyx":346 * * * cdef inline INT_T origin_index(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9649,7 +9647,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_origin_ return __pyx_r; } -/* "voronoi_dcel.pyx":349 +/* "src/voronoi_dcel.pyx":349 * return self.info.edges.get(&self.info.edges, (self.arr_index, 0)) * * cdef inline Vector2D origin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9657,12 +9655,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_INT_T __pyx_f_12packsim_core_origin_ * self.info.vertices.get(&self.info.vertices, (self.origin_index(self), 0)), */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_origin(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self) { - __pyx_t_12packsim_core_Vector2D __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_2; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_origin(__pyx_t_8_packsim_HalfEdge *__pyx_v_self) { + __pyx_t_8_packsim_Vector2D __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_2; - /* "voronoi_dcel.pyx":351 + /* "src/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)), # <<<<<<<<<<<<<< @@ -9672,7 +9670,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_orig __pyx_t_1.f0 = __pyx_v_self->origin_index(__pyx_v_self); __pyx_t_1.f1 = 0; - /* "voronoi_dcel.pyx":352 + /* "src/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)) # <<<<<<<<<<<<<< @@ -9682,17 +9680,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_orig __pyx_t_2.f0 = __pyx_v_self->origin_index(__pyx_v_self); __pyx_t_2.f1 = 1; - /* "voronoi_dcel.pyx":350 + /* "src/voronoi_dcel.pyx":350 * * cdef inline Vector2D origin(HalfEdge* self) nogil: * 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)) */ - __pyx_r = __pyx_v_12packsim_core_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)); + __pyx_r = __pyx_v_8_packsim_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; - /* "voronoi_dcel.pyx":349 + /* "src/voronoi_dcel.pyx":349 * return self.info.edges.get(&self.info.edges, (self.arr_index, 0)) * * cdef inline Vector2D origin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9705,7 +9703,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_orig return __pyx_r; } -/* "voronoi_dcel.pyx":355 +/* "src/voronoi_dcel.pyx":355 * ) * * cdef inline Site face(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9713,11 +9711,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_orig * self.info.edges.get(&self.info.edges, (self.arr_index, 1)), self.info */ -static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_face(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self) { - __pyx_t_12packsim_core_Site __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_Site __pyx_f_8_packsim_face(__pyx_t_8_packsim_HalfEdge *__pyx_v_self) { + __pyx_t_8_packsim_Site __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":357 + /* "src/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 # <<<<<<<<<<<<<< @@ -9727,17 +9725,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_face(__p __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 1; - /* "voronoi_dcel.pyx":356 + /* "src/voronoi_dcel.pyx":356 * * cdef inline Site face(HalfEdge* self) nogil: * return init.Site( # <<<<<<<<<<<<<< * self.info.edges.get(&self.info.edges, (self.arr_index, 1)), self.info * ) */ - __pyx_r = __pyx_v_12packsim_core_init.Site(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); + __pyx_r = __pyx_v_8_packsim_init.Site(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "voronoi_dcel.pyx":355 + /* "src/voronoi_dcel.pyx":355 * ) * * cdef inline Site face(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9750,7 +9748,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_face(__p return __pyx_r; } -/* "voronoi_dcel.pyx":360 +/* "src/voronoi_dcel.pyx":360 * ) * * cdef inline HalfEdge edge_next(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9758,11 +9756,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Site __pyx_f_12packsim_core_face(__p * return init.HalfEdge( */ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge_next(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self) { - __pyx_t_12packsim_core_HalfEdge __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_edge_next(__pyx_t_8_packsim_HalfEdge *__pyx_v_self) { + __pyx_t_8_packsim_HalfEdge __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":363 + /* "src/voronoi_dcel.pyx":363 * * return init.HalfEdge( * self.info.edges.get(&self.info.edges, (self.arr_index, 2)), self.info # <<<<<<<<<<<<<< @@ -9772,17 +9770,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 2; - /* "voronoi_dcel.pyx":362 + /* "src/voronoi_dcel.pyx":362 * cdef inline HalfEdge edge_next(HalfEdge* self) nogil: * * return init.HalfEdge( # <<<<<<<<<<<<<< * self.info.edges.get(&self.info.edges, (self.arr_index, 2)), self.info * ) */ - __pyx_r = __pyx_v_12packsim_core_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); + __pyx_r = __pyx_v_8_packsim_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "voronoi_dcel.pyx":360 + /* "src/voronoi_dcel.pyx":360 * ) * * cdef inline HalfEdge edge_next(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9795,7 +9793,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge return __pyx_r; } -/* "voronoi_dcel.pyx":366 +/* "src/voronoi_dcel.pyx":366 * ) * * cdef inline HalfEdge prev(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9803,11 +9801,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_edge * self.info.edges.get(&self.info.edges, (self.arr_index, 3)), self.info */ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_prev(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self) { - __pyx_t_12packsim_core_HalfEdge __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_prev(__pyx_t_8_packsim_HalfEdge *__pyx_v_self) { + __pyx_t_8_packsim_HalfEdge __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":368 + /* "src/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 # <<<<<<<<<<<<<< @@ -9817,17 +9815,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_prev __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 3; - /* "voronoi_dcel.pyx":367 + /* "src/voronoi_dcel.pyx":367 * * cdef inline HalfEdge prev(HalfEdge* self) nogil: * return init.HalfEdge( # <<<<<<<<<<<<<< * self.info.edges.get(&self.info.edges, (self.arr_index, 3)), self.info * ) */ - __pyx_r = __pyx_v_12packsim_core_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); + __pyx_r = __pyx_v_8_packsim_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "voronoi_dcel.pyx":366 + /* "src/voronoi_dcel.pyx":366 * ) * * cdef inline HalfEdge prev(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9840,7 +9838,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_prev return __pyx_r; } -/* "voronoi_dcel.pyx":371 +/* "src/voronoi_dcel.pyx":371 * ) * * cdef inline HalfEdge twin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9848,11 +9846,11 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_prev * self.info.edges.get(&self.info.edges, (self.arr_index, 4)), self.info */ -static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_twin(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self) { - __pyx_t_12packsim_core_HalfEdge __pyx_r; - __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_HalfEdge __pyx_f_8_packsim_twin(__pyx_t_8_packsim_HalfEdge *__pyx_v_self) { + __pyx_t_8_packsim_HalfEdge __pyx_r; + __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc __pyx_t_1; - /* "voronoi_dcel.pyx":373 + /* "src/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 # <<<<<<<<<<<<<< @@ -9862,17 +9860,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_twin __pyx_t_1.f0 = __pyx_v_self->arr_index; __pyx_t_1.f1 = 4; - /* "voronoi_dcel.pyx":372 + /* "src/voronoi_dcel.pyx":372 * * cdef inline HalfEdge twin(HalfEdge* self) nogil: * return init.HalfEdge( # <<<<<<<<<<<<<< * self.info.edges.get(&self.info.edges, (self.arr_index, 4)), self.info * ) */ - __pyx_r = __pyx_v_12packsim_core_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); + __pyx_r = __pyx_v_8_packsim_init.HalfEdge(__pyx_v_self->info->edges.get((&__pyx_v_self->info->edges), __pyx_t_1), __pyx_v_self->info); goto __pyx_L0; - /* "voronoi_dcel.pyx":371 + /* "src/voronoi_dcel.pyx":371 * ) * * cdef inline HalfEdge twin(HalfEdge* self) nogil: # <<<<<<<<<<<<<< @@ -9885,7 +9883,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_twin return __pyx_r; } -/* "voronoi_dcel.pyx":376 +/* "src/voronoi_dcel.pyx":376 * ) * * cdef inline Matrix2x2 get_H(HalfEdge* self, Site xi) nogil: # <<<<<<<<<<<<<< @@ -9893,17 +9891,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_HalfEdge __pyx_f_12packsim_core_twin * cdef HalfEdge s_e = xi.edge(&xi) */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get_H(__pyx_t_12packsim_core_HalfEdge *__pyx_v_self, __pyx_t_12packsim_core_Site __pyx_v_xi) { - __pyx_t_12packsim_core_INT_T __pyx_v_this_e; - __pyx_t_12packsim_core_HalfEdge __pyx_v_s_e; - CYTHON_UNUSED __pyx_t_12packsim_core_INT_T __pyx_v_i; - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; - __pyx_t_12packsim_core_INT_T __pyx_t_1; - __pyx_t_12packsim_core_INT_T __pyx_t_2; - __pyx_t_12packsim_core_INT_T __pyx_t_3; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_get_H(__pyx_t_8_packsim_HalfEdge *__pyx_v_self, __pyx_t_8_packsim_Site __pyx_v_xi) { + __pyx_t_8_packsim_INT_T __pyx_v_this_e; + __pyx_t_8_packsim_HalfEdge __pyx_v_s_e; + CYTHON_UNUSED __pyx_t_8_packsim_INT_T __pyx_v_i; + __pyx_t_8_packsim_Matrix2x2 __pyx_r; + __pyx_t_8_packsim_INT_T __pyx_t_1; + __pyx_t_8_packsim_INT_T __pyx_t_2; + __pyx_t_8_packsim_INT_T __pyx_t_3; int __pyx_t_4; - /* "voronoi_dcel.pyx":377 + /* "src/voronoi_dcel.pyx":377 * * cdef inline Matrix2x2 get_H(HalfEdge* self, Site xi) nogil: * cdef INT_T this_e = self.origin_index(self) # <<<<<<<<<<<<<< @@ -9912,7 +9910,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get */ __pyx_v_this_e = __pyx_v_self->origin_index(__pyx_v_self); - /* "voronoi_dcel.pyx":378 + /* "src/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) # <<<<<<<<<<<<<< @@ -9921,7 +9919,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get */ __pyx_v_s_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "voronoi_dcel.pyx":381 + /* "src/voronoi_dcel.pyx":381 * cdef INT_T i * * for i in range(xi.edge_num(&xi)): # <<<<<<<<<<<<<< @@ -9933,7 +9931,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get for (__pyx_t_3 = 0; __pyx_t_3 < __pyx_t_2; __pyx_t_3+=1) { __pyx_v_i = __pyx_t_3; - /* "voronoi_dcel.pyx":382 + /* "src/voronoi_dcel.pyx":382 * * for i in range(xi.edge_num(&xi)): * if s_e.origin_index(&s_e) == this_e: # <<<<<<<<<<<<<< @@ -9943,17 +9941,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get __pyx_t_4 = ((__pyx_v_s_e.origin_index((&__pyx_v_s_e)) == __pyx_v_this_e) != 0); if (__pyx_t_4) { - /* "voronoi_dcel.pyx":383 + /* "src/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) # <<<<<<<<<<<<<< * s_e = s_e.next(&s_e) * return init.Matrix2x2(0.0, 0.0, 0.0, 0.0) */ - __pyx_r = __pyx_v_s_e.cache->H((&__pyx_v_s_e), __pyx_v_12packsim_core_NAN_MATRIX); + __pyx_r = __pyx_v_s_e.cache->H((&__pyx_v_s_e), __pyx_v_8_packsim_NAN_MATRIX); goto __pyx_L0; - /* "voronoi_dcel.pyx":382 + /* "src/voronoi_dcel.pyx":382 * * for i in range(xi.edge_num(&xi)): * if s_e.origin_index(&s_e) == this_e: # <<<<<<<<<<<<<< @@ -9962,7 +9960,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get */ } - /* "voronoi_dcel.pyx":384 + /* "src/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) # <<<<<<<<<<<<<< @@ -9972,17 +9970,17 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get __pyx_v_s_e = __pyx_v_s_e.next((&__pyx_v_s_e)); } - /* "voronoi_dcel.pyx":385 + /* "src/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) # <<<<<<<<<<<<<< * * */ - __pyx_r = __pyx_v_12packsim_core_init.Matrix2x2(0.0, 0.0, 0.0, 0.0); + __pyx_r = __pyx_v_8_packsim_init.Matrix2x2(0.0, 0.0, 0.0, 0.0); goto __pyx_L0; - /* "voronoi_dcel.pyx":376 + /* "src/voronoi_dcel.pyx":376 * ) * * cdef inline Matrix2x2 get_H(HalfEdge* self, Site xi) nogil: # <<<<<<<<<<<<<< @@ -9995,7 +9993,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get return __pyx_r; } -/* "voronoi_dcel.pyx":398 +/* "src/voronoi_dcel.pyx":398 * """ * * def __init__(VoronoiContainer self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, object site_arr): # <<<<<<<<<<<<<< @@ -10004,12 +10002,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_get */ /* Python wrapper */ -static int __pyx_pw_12packsim_core_16VoronoiContainer_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static int __pyx_pw_12packsim_core_16VoronoiContainer_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - __pyx_t_12packsim_core_INT_T __pyx_v_n; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_w; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_h; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_r; +static int __pyx_pw_8_packsim_16VoronoiContainer_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static int __pyx_pw_8_packsim_16VoronoiContainer_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + __pyx_t_8_packsim_INT_T __pyx_v_n; + __pyx_t_8_packsim_FLOAT_T __pyx_v_w; + __pyx_t_8_packsim_FLOAT_T __pyx_v_h; + __pyx_t_8_packsim_FLOAT_T __pyx_v_r; PyObject *__pyx_v_site_arr = 0; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -10089,25 +10087,25 @@ static int __pyx_pw_12packsim_core_16VoronoiContainer_1__init__(PyObject *__pyx_ __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(1, 398, __pyx_L3_error) __pyx_L3_error:; - __Pyx_AddTraceback("packsim_core.VoronoiContainer.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return -1; __pyx_L4_argument_unpacking_done:; - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer___init__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer___init__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyObject *__pyx_v_site_arr) { +static int __pyx_pf_8_packsim_16VoronoiContainer___init__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyObject *__pyx_v_site_arr) { int __pyx_r; __Pyx_RefNannyDeclarations - __pyx_t_12packsim_core_INT_T __pyx_t_1; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_2; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_3; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_4; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_5[2]; + __pyx_t_8_packsim_INT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_2; + __pyx_t_8_packsim_FLOAT_T __pyx_t_3; + __pyx_t_8_packsim_FLOAT_T __pyx_t_4; + __pyx_t_8_packsim_FLOAT_T __pyx_t_5[2]; PyObject *__pyx_t_6 = NULL; PyObject *__pyx_t_7 = NULL; PyObject *__pyx_t_8 = NULL; @@ -10117,7 +10115,7 @@ static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__init__", 0); - /* "voronoi_dcel.pyx":399 + /* "src/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 # <<<<<<<<<<<<<< @@ -10133,7 +10131,7 @@ static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_ __pyx_v_self->h = __pyx_t_3; __pyx_v_self->r = __pyx_t_4; - /* "voronoi_dcel.pyx":400 + /* "src/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] # <<<<<<<<<<<<<< @@ -10144,7 +10142,7 @@ static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_ __pyx_t_5[1] = __pyx_v_h; memcpy(&(__pyx_v_self->dim[0]), __pyx_t_5, sizeof(__pyx_v_self->dim[0]) * (2)); - /* "voronoi_dcel.pyx":402 + /* "src/voronoi_dcel.pyx":402 * self.dim = [w, h] * * self.calculate_voronoi(site_arr.astype(FLOAT)) # <<<<<<<<<<<<<< @@ -10172,55 +10170,46 @@ static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_ __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; if (!(likely(((__pyx_t_6) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_6, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 402, __pyx_L1_error) - ((struct __pyx_vtabstruct_12packsim_core_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) + ((struct __pyx_vtabstruct_8_packsim_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; - /* "voronoi_dcel.pyx":403 + /* "src/voronoi_dcel.pyx":403 * * self.calculate_voronoi(site_arr.astype(FLOAT)) * self.generate_dcel() # <<<<<<<<<<<<<< * * self.common_cache() */ - ((struct __pyx_vtabstruct_12packsim_core_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->generate_dcel(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 403, __pyx_L1_error) + ((struct __pyx_vtabstruct_8_packsim_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->generate_dcel(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 403, __pyx_L1_error) - /* "voronoi_dcel.pyx":405 + /* "src/voronoi_dcel.pyx":405 * self.generate_dcel() * * self.common_cache() # <<<<<<<<<<<<<< * self.precompute() * self.calc_grad() */ - ((struct __pyx_vtabstruct_12packsim_core_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->common_cache(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 405, __pyx_L1_error) + ((struct __pyx_vtabstruct_8_packsim_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->common_cache(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 405, __pyx_L1_error) - /* "voronoi_dcel.pyx":406 + /* "src/voronoi_dcel.pyx":406 * * self.common_cache() * self.precompute() # <<<<<<<<<<<<<< * self.calc_grad() - * self.get_statistics() + * */ - ((struct __pyx_vtabstruct_12packsim_core_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->precompute(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 406, __pyx_L1_error) + ((struct __pyx_vtabstruct_8_packsim_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->precompute(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 406, __pyx_L1_error) - /* "voronoi_dcel.pyx":407 + /* "src/voronoi_dcel.pyx":407 * self.common_cache() * self.precompute() * self.calc_grad() # <<<<<<<<<<<<<< - * self.get_statistics() + * * */ - ((struct __pyx_vtabstruct_12packsim_core_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->calc_grad(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 407, __pyx_L1_error) + ((struct __pyx_vtabstruct_8_packsim_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->calc_grad(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 407, __pyx_L1_error) - /* "voronoi_dcel.pyx":408 - * self.precompute() - * self.calc_grad() - * self.get_statistics() # <<<<<<<<<<<<<< - * - * # #print(np.asarray(self.site_cache[0])) - */ - ((struct __pyx_vtabstruct_12packsim_core_VoronoiContainer *)__pyx_v_self->__pyx_vtab)->get_statistics(__pyx_v_self); if (unlikely(PyErr_Occurred())) __PYX_ERR(1, 408, __pyx_L1_error) - - /* "voronoi_dcel.pyx":398 + /* "src/voronoi_dcel.pyx":398 * """ * * def __init__(VoronoiContainer self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, object site_arr): # <<<<<<<<<<<<<< @@ -10236,14 +10225,14 @@ static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_ __Pyx_XDECREF(__pyx_t_7); __Pyx_XDECREF(__pyx_t_8); __Pyx_XDECREF(__pyx_t_9); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = -1; __pyx_L0:; __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "voronoi_dcel.pyx":416 +/* "src/voronoi_dcel.pyx":410 * * * cdef void calculate_voronoi(VoronoiContainer self, # <<<<<<<<<<<<<< @@ -10251,11 +10240,11 @@ static int __pyx_pf_12packsim_core_16VoronoiContainer___init__(struct __pyx_obj_ * """ */ -static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, PyArrayObject *__pyx_v_site_arr) { +static void __pyx_f_8_packsim_16VoronoiContainer_calculate_voronoi(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, PyArrayObject *__pyx_v_site_arr) { PyArrayObject *__pyx_v_symm = 0; PyArrayObject *__pyx_v_dim = 0; PyArrayObject *__pyx_v_full_site_arr = 0; - __pyx_t_12packsim_core_INT_T __pyx_v_i; + __pyx_t_8_packsim_INT_T __pyx_v_i; __Pyx_LocalBuf_ND __pyx_pybuffernd_dim; __Pyx_Buffer __pyx_pybuffer_dim; __Pyx_LocalBuf_ND __pyx_pybuffernd_full_site_arr; @@ -10272,9 +10261,9 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ PyArrayObject *__pyx_t_5 = NULL; PyArrayObject *__pyx_t_6 = NULL; PyArrayObject *__pyx_t_7 = NULL; - __pyx_t_12packsim_core_INT_T __pyx_t_8; + __pyx_t_8_packsim_INT_T __pyx_t_8; int __pyx_t_9; - __pyx_t_12packsim_core_INT_T __pyx_t_10; + __pyx_t_8_packsim_INT_T __pyx_t_10; __Pyx_memviewslice __pyx_t_11 = { 0, 0, { 0 }, { 0 }, { 0 } }; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -10298,23 +10287,23 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __pyx_pybuffernd_site_arr.rcbuffer = &__pyx_pybuffer_site_arr; { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(1, 416, __pyx_L1_error) + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(1, 410, __pyx_L1_error) } __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]; - /* "voronoi_dcel.pyx":423 + /* "src/voronoi_dcel.pyx":417 * """ * 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) * cdef np.ndarray[FLOAT_T, ndim=2] full_site_arr = np.empty((self.n*9+8, 2), dtype=FLOAT) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 423, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 417, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_asarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 423, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_asarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 417, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T(__pyx_v_12packsim_core_SYMM, 18); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 423, __pyx_L1_error) + __pyx_t_2 = __Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T(__pyx_v_8_packsim_SYMM, 18); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 417, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_3))) { @@ -10329,22 +10318,22 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_4, __pyx_t_2) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 423, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 417, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 423, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_reshape); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 417, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 423, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_tuple_, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 417, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 423, __pyx_L1_error) + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 417, __pyx_L1_error) __pyx_t_5 = ((PyArrayObject *)__pyx_t_1); { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_symm.rcbuffer->pybuffer, (PyObject*)__pyx_t_5, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_symm.rcbuffer->pybuffer, (PyObject*)__pyx_t_5, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) { __pyx_v_symm = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_symm.rcbuffer->pybuffer.buf = NULL; - __PYX_ERR(1, 423, __pyx_L1_error) + __PYX_ERR(1, 417, __pyx_L1_error) } else {__pyx_pybuffernd_symm.diminfo[0].strides = __pyx_pybuffernd_symm.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_symm.diminfo[0].shape = __pyx_pybuffernd_symm.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_symm.diminfo[1].strides = __pyx_pybuffernd_symm.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_symm.diminfo[1].shape = __pyx_pybuffernd_symm.rcbuffer->pybuffer.shape[1]; } } @@ -10352,19 +10341,19 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __pyx_v_symm = ((PyArrayObject *)__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":424 + /* "src/voronoi_dcel.pyx":418 * 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) # <<<<<<<<<<<<<< * cdef np.ndarray[FLOAT_T, ndim=2] full_site_arr = np.empty((self.n*9+8, 2), dtype=FLOAT) * */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 424, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 418, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 424, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 418, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T(__pyx_v_self->dim, 2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 424, __pyx_L1_error) + __pyx_t_3 = __Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T(__pyx_v_self->dim, 2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 418, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_2))) { @@ -10379,16 +10368,16 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_4, __pyx_t_3) : __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 424, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 418, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 424, __pyx_L1_error) + if (!(likely(((__pyx_t_1) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_1, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 418, __pyx_L1_error) __pyx_t_6 = ((PyArrayObject *)__pyx_t_1); { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_dim.rcbuffer->pybuffer, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_dim.rcbuffer->pybuffer, (PyObject*)__pyx_t_6, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { __pyx_v_dim = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_dim.rcbuffer->pybuffer.buf = NULL; - __PYX_ERR(1, 424, __pyx_L1_error) + __PYX_ERR(1, 418, __pyx_L1_error) } else {__pyx_pybuffernd_dim.diminfo[0].strides = __pyx_pybuffernd_dim.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_dim.diminfo[0].shape = __pyx_pybuffernd_dim.rcbuffer->pybuffer.shape[0]; } } @@ -10396,21 +10385,21 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __pyx_v_dim = ((PyArrayObject *)__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":425 + /* "src/voronoi_dcel.pyx":419 * 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) # <<<<<<<<<<<<<< * * # Generate periodic sites and sites that bound periodic sites. */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 425, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 425, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyInt_From_npy_int64(((__pyx_v_self->n * 9) + 8)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 425, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_From_npy_int64(((__pyx_v_self->n * 9) + 8)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 425, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); @@ -10418,29 +10407,29 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __Pyx_GIVEREF(__pyx_int_2); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_int_2); __pyx_t_1 = 0; - __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 425, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 425, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 425, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 425, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 425, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_1, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 419, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 425, __pyx_L1_error) + if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 419, __pyx_L1_error) __pyx_t_7 = ((PyArrayObject *)__pyx_t_4); { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_full_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_full_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_t_7, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) { __pyx_v_full_site_arr = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_full_site_arr.rcbuffer->pybuffer.buf = NULL; - __PYX_ERR(1, 425, __pyx_L1_error) + __PYX_ERR(1, 419, __pyx_L1_error) } else {__pyx_pybuffernd_full_site_arr.diminfo[0].strides = __pyx_pybuffernd_full_site_arr.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_full_site_arr.diminfo[0].shape = __pyx_pybuffernd_full_site_arr.rcbuffer->pybuffer.shape[0]; __pyx_pybuffernd_full_site_arr.diminfo[1].strides = __pyx_pybuffernd_full_site_arr.rcbuffer->pybuffer.strides[1]; __pyx_pybuffernd_full_site_arr.diminfo[1].shape = __pyx_pybuffernd_full_site_arr.rcbuffer->pybuffer.shape[1]; } } @@ -10448,7 +10437,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __pyx_v_full_site_arr = ((PyArrayObject *)__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":429 + /* "src/voronoi_dcel.pyx":423 * # Generate periodic sites and sites that bound periodic sites. * cdef INT_T i * for i in range(9): # <<<<<<<<<<<<<< @@ -10458,34 +10447,34 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ for (__pyx_t_8 = 0; __pyx_t_8 < 9; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "voronoi_dcel.pyx":430 + /* "src/voronoi_dcel.pyx":424 * cdef INT_T i * for i in range(9): * 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] */ - __pyx_t_4 = __Pyx_GetItemInt(((PyObject *)__pyx_v_symm), __pyx_v_i, __pyx_t_12packsim_core_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 430, __pyx_L1_error) + __pyx_t_4 = __Pyx_GetItemInt(((PyObject *)__pyx_v_symm), __pyx_v_i, __pyx_t_8_packsim_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyNumber_Multiply(__pyx_t_4, ((PyObject *)__pyx_v_dim)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 430, __pyx_L1_error) + __pyx_t_3 = PyNumber_Multiply(__pyx_t_4, ((PyObject *)__pyx_v_dim)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyNumber_Add(((PyObject *)__pyx_v_site_arr), __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 430, __pyx_L1_error) + __pyx_t_4 = PyNumber_Add(((PyObject *)__pyx_v_site_arr), __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n * __pyx_v_i)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 430, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n * __pyx_v_i)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n * (__pyx_v_i + 1))); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 430, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n * (__pyx_v_i + 1))); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PySlice_New(__pyx_t_3, __pyx_t_1, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 430, __pyx_L1_error) + __pyx_t_2 = PySlice_New(__pyx_t_3, __pyx_t_1, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 424, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(PyObject_SetItem(((PyObject *)__pyx_v_full_site_arr), __pyx_t_2, __pyx_t_4) < 0)) __PYX_ERR(1, 430, __pyx_L1_error) + if (unlikely(PyObject_SetItem(((PyObject *)__pyx_v_full_site_arr), __pyx_t_2, __pyx_t_4) < 0)) __PYX_ERR(1, 424, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":431 + /* "src/voronoi_dcel.pyx":425 * for i in range(9): * full_site_arr[self.n*i:self.n*(i+1)] = site_arr + symm[i]*dim * if i > 0: # <<<<<<<<<<<<<< @@ -10495,32 +10484,32 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __pyx_t_9 = ((__pyx_v_i > 0) != 0); if (__pyx_t_9) { - /* "voronoi_dcel.pyx":432 + /* "src/voronoi_dcel.pyx":426 * 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] # <<<<<<<<<<<<<< * * # Use SciPy to compute the Voronoi set. */ - __pyx_t_4 = __Pyx_PyNumber_Divide(((PyObject *)__pyx_v_dim), __pyx_int_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 432, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyNumber_Divide(((PyObject *)__pyx_v_dim), __pyx_int_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 426, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PyNumber_Multiply(__pyx_int_2, ((PyObject *)__pyx_v_dim)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 432, __pyx_L1_error) + __pyx_t_2 = PyNumber_Multiply(__pyx_int_2, ((PyObject *)__pyx_v_dim)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 426, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_symm), __pyx_v_i, __pyx_t_12packsim_core_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 432, __pyx_L1_error) + __pyx_t_1 = __Pyx_GetItemInt(((PyObject *)__pyx_v_symm), __pyx_v_i, __pyx_t_8_packsim_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 426, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyNumber_Multiply(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 432, __pyx_L1_error) + __pyx_t_3 = PyNumber_Multiply(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 426, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyNumber_Add(__pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 432, __pyx_L1_error) + __pyx_t_1 = PyNumber_Add(__pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 426, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_t_10 = (((9 * __pyx_v_self->n) + __pyx_v_i) - 1); - if (unlikely(__Pyx_SetItemInt(((PyObject *)__pyx_v_full_site_arr), __pyx_t_10, __pyx_t_1, __pyx_t_12packsim_core_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0) < 0)) __PYX_ERR(1, 432, __pyx_L1_error) + if (unlikely(__Pyx_SetItemInt(((PyObject *)__pyx_v_full_site_arr), __pyx_t_10, __pyx_t_1, __pyx_t_8_packsim_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0) < 0)) __PYX_ERR(1, 426, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":431 + /* "src/voronoi_dcel.pyx":425 * for i in range(9): * full_site_arr[self.n*i:self.n*(i+1)] = site_arr + symm[i]*dim * if i > 0: # <<<<<<<<<<<<<< @@ -10530,19 +10519,19 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ } } - /* "voronoi_dcel.pyx":435 + /* "src/voronoi_dcel.pyx":429 * * # Use SciPy to compute the Voronoi set. * self.scipy_vor = scipy.spatial.Voronoi(full_site_arr) # <<<<<<<<<<<<<< * self.points = self.scipy_vor.points * self.vertices = self.scipy_vor.vertices */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_scipy); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 435, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_scipy); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_spatial); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 435, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_spatial); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_Voronoi); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 435, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_Voronoi); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_4 = NULL; @@ -10557,51 +10546,51 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ } __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_4, ((PyObject *)__pyx_v_full_site_arr)) : __Pyx_PyObject_CallOneArg(__pyx_t_3, ((PyObject *)__pyx_v_full_site_arr)); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 435, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 429, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor, __pyx_t_1) < 0) __PYX_ERR(1, 435, __pyx_L1_error) + if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor, __pyx_t_1) < 0) __PYX_ERR(1, 429, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":436 + /* "src/voronoi_dcel.pyx":430 * # Use SciPy to compute the Voronoi set. * self.scipy_vor = scipy.spatial.Voronoi(full_site_arr) * self.points = self.scipy_vor.points # <<<<<<<<<<<<<< * self.vertices = self.scipy_vor.vertices * */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 436, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 430, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_points); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 436, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_points); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 430, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_3, PyBUF_WRITABLE); if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(1, 436, __pyx_L1_error) + __pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_3, PyBUF_WRITABLE); if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(1, 430, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __PYX_XDEC_MEMVIEW(&__pyx_v_self->points, 0); __pyx_v_self->points = __pyx_t_11; __pyx_t_11.memview = NULL; __pyx_t_11.data = NULL; - /* "voronoi_dcel.pyx":437 + /* "src/voronoi_dcel.pyx":431 * self.scipy_vor = scipy.spatial.Voronoi(full_site_arr) * self.points = self.scipy_vor.points * self.vertices = self.scipy_vor.vertices # <<<<<<<<<<<<<< * * */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 437, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 431, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_vertices); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 437, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_vertices); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 431, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(1, 437, __pyx_L1_error) + __pyx_t_11 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_11.memview)) __PYX_ERR(1, 431, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __PYX_XDEC_MEMVIEW(&__pyx_v_self->vertices, 0); __pyx_v_self->vertices = __pyx_t_11; __pyx_t_11.memview = NULL; __pyx_t_11.data = NULL; - /* "voronoi_dcel.pyx":416 + /* "src/voronoi_dcel.pyx":410 * * * cdef void calculate_voronoi(VoronoiContainer self, # <<<<<<<<<<<<<< @@ -10626,7 +10615,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer); __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_symm.rcbuffer->pybuffer); __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);} - __Pyx_AddTraceback("packsim_core.VoronoiContainer.calculate_voronoi", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.calculate_voronoi", __pyx_clineno, __pyx_lineno, __pyx_filename); goto __pyx_L2; __pyx_L0:; __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_dim.rcbuffer->pybuffer); @@ -10640,7 +10629,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ __Pyx_RefNannyFinishContext(); } -/* "voronoi_dcel.pyx":440 +/* "src/voronoi_dcel.pyx":434 * * * cdef void generate_dcel(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -10648,25 +10637,25 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi(struct _ * cdef array.array int_tmplt = array.array('q', []) */ -static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { - CYTHON_UNUSED __pyx_t_12packsim_core_INT_T __pyx_v_npoints; +static void __pyx_f_8_packsim_16VoronoiContainer_generate_dcel(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { + CYTHON_UNUSED __pyx_t_8_packsim_INT_T __pyx_v_npoints; arrayobject *__pyx_v_int_tmplt = 0; PyArrayObject *__pyx_v_offsets = 0; arrayobject *__pyx_v_vert_indices = 0; - __pyx_t_12packsim_core_INT_T __pyx_v_i; + __pyx_t_8_packsim_INT_T __pyx_v_i; PyObject *__pyx_v_verts = NULL; PyArrayObject *__pyx_v_vert_indices_np = 0; PyArrayObject *__pyx_v_border_sites = 0; - __pyx_t_12packsim_core_INT_T __pyx_v_border_num; - __pyx_t_12packsim_core_INT_T __pyx_v_edge_count; - __pyx_t_12packsim_core_INT_T __pyx_v_diff; + __pyx_t_8_packsim_INT_T __pyx_v_border_num; + __pyx_t_8_packsim_INT_T __pyx_v_edge_count; + __pyx_t_8_packsim_INT_T __pyx_v_diff; PyArrayObject *__pyx_v_site_verts = 0; - __pyx_t_12packsim_core_INT_T __pyx_v_j; - __pyx_t_12packsim_core_INT_T __pyx_v_site_i; - __pyx_t_12packsim_core_INT_T __pyx_v_edge_i; - __pyx_t_12packsim_core_INT_T __pyx_v_edge_offset; - __pyx_t_12packsim_core_INT_T __pyx_v_vert_num; - __pyx_t_12packsim_core_INT_T __pyx_v_twin_index; + __pyx_t_8_packsim_INT_T __pyx_v_j; + __pyx_t_8_packsim_INT_T __pyx_v_site_i; + __pyx_t_8_packsim_INT_T __pyx_v_edge_i; + __pyx_t_8_packsim_INT_T __pyx_v_edge_offset; + __pyx_t_8_packsim_INT_T __pyx_v_vert_num; + __pyx_t_8_packsim_INT_T __pyx_v_twin_index; PyObject *__pyx_v_edge_indices = NULL; __Pyx_LocalBuf_ND __pyx_pybuffernd_border_sites; __Pyx_Buffer __pyx_pybuffer_border_sites; @@ -10682,12 +10671,12 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; PyArrayObject *__pyx_t_5 = NULL; - __pyx_t_12packsim_core_INT_T __pyx_t_6; - __pyx_t_12packsim_core_INT_T __pyx_t_7; - __pyx_t_12packsim_core_INT_T __pyx_t_8; - __pyx_t_12packsim_core_INT_T __pyx_t_9; + __pyx_t_8_packsim_INT_T __pyx_t_6; + __pyx_t_8_packsim_INT_T __pyx_t_7; + __pyx_t_8_packsim_INT_T __pyx_t_8; + __pyx_t_8_packsim_INT_T __pyx_t_9; Py_ssize_t __pyx_t_10; - __pyx_t_12packsim_core_INT_T __pyx_t_11; + __pyx_t_8_packsim_INT_T __pyx_t_11; PyArrayObject *__pyx_t_12 = NULL; PyObject *__pyx_t_13 = NULL; PyObject *__pyx_t_14 = NULL; @@ -10703,9 +10692,9 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_memviewslice __pyx_t_24 = { 0, 0, { 0 }, { 0 }, { 0 } }; Py_ssize_t __pyx_t_25; Py_ssize_t __pyx_t_26; - __pyx_t_12packsim_core_INT_T __pyx_t_27; + __pyx_t_8_packsim_INT_T __pyx_t_27; Py_ssize_t __pyx_t_28; - __pyx_t_12packsim_core_INT_T __pyx_t_29; + __pyx_t_8_packsim_INT_T __pyx_t_29; int __pyx_t_30; PyArrayObject *__pyx_t_31 = NULL; PyObject *__pyx_t_32 = NULL; @@ -10714,7 +10703,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_memviewslice __pyx_t_35 = { 0, 0, { 0 }, { 0 }, { 0 } }; __Pyx_memviewslice __pyx_t_36 = { 0, 0, { 0 }, { 0 }, { 0 } }; __Pyx_memviewslice __pyx_t_37 = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_INT_T __pyx_t_38; + __pyx_t_8_packsim_INT_T __pyx_t_38; __Pyx_memviewslice __pyx_t_39 = { 0, 0, { 0 }, { 0 }, { 0 } }; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -10737,7 +10726,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_pybuffernd_site_verts.data = NULL; __pyx_pybuffernd_site_verts.rcbuffer = &__pyx_pybuffer_site_verts; - /* "voronoi_dcel.pyx":441 + /* "src/voronoi_dcel.pyx":435 * * cdef void generate_dcel(VoronoiContainer self) except *: * cdef INT_T npoints = self.n*9+8 # <<<<<<<<<<<<<< @@ -10746,16 +10735,16 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx */ __pyx_v_npoints = ((__pyx_v_self->n * 9) + 8); - /* "voronoi_dcel.pyx":442 + /* "src/voronoi_dcel.pyx":436 * cdef void generate_dcel(VoronoiContainer self) except *: * cdef INT_T npoints = self.n*9+8 * cdef array.array int_tmplt = array.array('q', []) # <<<<<<<<<<<<<< * * cdef np.ndarray[INT_T, ndim=1] offsets = np.zeros(self.n*9+1, dtype=INT) */ - __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 442, __pyx_L1_error) + __pyx_t_1 = PyList_New(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 436, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 442, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 436, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_INCREF(__pyx_n_u_q); __Pyx_GIVEREF(__pyx_n_u_q); @@ -10763,49 +10752,49 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_7cpython_5array_array), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 442, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_7cpython_5array_array), __pyx_t_2, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 436, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_int_tmplt = ((arrayobject *)__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":444 + /* "src/voronoi_dcel.pyx":438 * cdef array.array int_tmplt = array.array('q', []) * * 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) * */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 444, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_zeros); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 444, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_zeros); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyInt_From_npy_int64(((__pyx_v_self->n * 9) + 1)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 444, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_From_npy_int64(((__pyx_v_self->n * 9) + 1)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 444, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 444, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_INT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 444, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_INT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 444, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 444, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 438, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 444, __pyx_L1_error) + if (!(likely(((__pyx_t_4) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_4, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 438, __pyx_L1_error) __pyx_t_5 = ((PyArrayObject *)__pyx_t_4); { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_offsets.rcbuffer->pybuffer, (PyObject*)__pyx_t_5, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_offsets.rcbuffer->pybuffer, (PyObject*)__pyx_t_5, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, PyBUF_FORMAT| PyBUF_STRIDES| PyBUF_WRITABLE, 1, 0, __pyx_stack) == -1)) { __pyx_v_offsets = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf = NULL; - __PYX_ERR(1, 444, __pyx_L1_error) + __PYX_ERR(1, 438, __pyx_L1_error) } else {__pyx_pybuffernd_offsets.diminfo[0].strides = __pyx_pybuffernd_offsets.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_offsets.diminfo[0].shape = __pyx_pybuffernd_offsets.rcbuffer->pybuffer.shape[0]; } } @@ -10813,19 +10802,19 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_v_offsets = ((PyArrayObject *)__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":445 + /* "src/voronoi_dcel.pyx":439 * * 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) # <<<<<<<<<<<<<< * * # Flatten regions into array, so it can be used later. */ - __pyx_t_4 = ((PyObject *)__pyx_f_7cpython_5array_clone(__pyx_v_int_tmplt, 0, 0)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 445, __pyx_L1_error) + __pyx_t_4 = ((PyObject *)__pyx_f_7cpython_5array_clone(__pyx_v_int_tmplt, 0, 0)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 439, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_v_vert_indices = ((arrayobject *)__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":449 + /* "src/voronoi_dcel.pyx":443 * # Flatten regions into array, so it can be used later. * cdef INT_T i * for i in range(self.n*9): # <<<<<<<<<<<<<< @@ -10837,34 +10826,34 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "voronoi_dcel.pyx":450 + /* "src/voronoi_dcel.pyx":444 * cdef INT_T i * 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. * vert_indices.extend(array.array('q', verts)) # Flatten */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 450, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_regions); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 450, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_regions); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 450, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_point_region); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 450, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_point_region); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_i, __pyx_t_12packsim_core_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 450, __pyx_L1_error) + __pyx_t_4 = __Pyx_GetItemInt(__pyx_t_3, __pyx_v_i, __pyx_t_8_packsim_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetItem(__pyx_t_1, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 450, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetItem(__pyx_t_1, __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 444, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_XDECREF_SET(__pyx_v_verts, __pyx_t_3); __pyx_t_3 = 0; - /* "voronoi_dcel.pyx":451 + /* "src/voronoi_dcel.pyx":445 * 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. # <<<<<<<<<<<<<< @@ -10872,20 +10861,20 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx * */ __pyx_t_9 = __pyx_v_i; - __pyx_t_10 = PyObject_Length(__pyx_v_verts); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(1, 451, __pyx_L1_error) + __pyx_t_10 = PyObject_Length(__pyx_v_verts); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(1, 445, __pyx_L1_error) __pyx_t_11 = (__pyx_v_i + 1); - *__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_11, __pyx_pybuffernd_offsets.diminfo[0].strides) = ((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_offsets.diminfo[0].strides)) + __pyx_t_10); + *__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_11, __pyx_pybuffernd_offsets.diminfo[0].strides) = ((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_offsets.diminfo[0].strides)) + __pyx_t_10); - /* "voronoi_dcel.pyx":452 + /* "src/voronoi_dcel.pyx":446 * 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 # <<<<<<<<<<<<<< * * # Get vertices of original N sites. */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_vert_indices), __pyx_n_s_extend); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 452, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_vert_indices), __pyx_n_s_extend); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 446, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 452, __pyx_L1_error) + __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 446, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_INCREF(__pyx_n_u_q); __Pyx_GIVEREF(__pyx_n_u_q); @@ -10893,7 +10882,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_INCREF(__pyx_v_verts); __Pyx_GIVEREF(__pyx_v_verts); PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_verts); - __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_7cpython_5array_array), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 452, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(((PyObject *)__pyx_ptype_7cpython_5array_array), __pyx_t_1, NULL); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 446, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_t_1 = NULL; @@ -10909,22 +10898,22 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_t_3 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_1, __pyx_t_2) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_2); __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 452, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 446, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; } - /* "voronoi_dcel.pyx":455 + /* "src/voronoi_dcel.pyx":449 * * # 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( * np.asarray(offsets), # Check indices where below matches would be inserted */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 455, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 449, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 455, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 449, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_4 = NULL; @@ -10939,16 +10928,16 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx } __pyx_t_3 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_2, __pyx_t_4, ((PyObject *)__pyx_v_vert_indices)) : __Pyx_PyObject_CallOneArg(__pyx_t_2, ((PyObject *)__pyx_v_vert_indices)); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 455, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 449, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 455, __pyx_L1_error) + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 449, __pyx_L1_error) __pyx_t_12 = ((PyArrayObject *)__pyx_t_3); { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_vert_indices_np.rcbuffer->pybuffer, (PyObject*)__pyx_t_12, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_vert_indices_np.rcbuffer->pybuffer, (PyObject*)__pyx_t_12, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { __pyx_v_vert_indices_np = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_vert_indices_np.rcbuffer->pybuffer.buf = NULL; - __PYX_ERR(1, 455, __pyx_L1_error) + __PYX_ERR(1, 449, __pyx_L1_error) } else {__pyx_pybuffernd_vert_indices_np.diminfo[0].strides = __pyx_pybuffernd_vert_indices_np.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_vert_indices_np.diminfo[0].shape = __pyx_pybuffernd_vert_indices_np.rcbuffer->pybuffer.shape[0]; } } @@ -10956,50 +10945,50 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_v_vert_indices_np = ((PyArrayObject *)__pyx_t_3); __pyx_t_3 = 0; - /* "voronoi_dcel.pyx":456 + /* "src/voronoi_dcel.pyx":450 * # 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( # <<<<<<<<<<<<<< * np.asarray(offsets), # Check indices where below matches would be inserted * np.nonzero(np.isin( # Indices of other verts being in bound verts. */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 456, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 450, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_unique); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 456, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_unique); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 450, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "voronoi_dcel.pyx":463 + /* "src/voronoi_dcel.pyx":457 * ))[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. # <<<<<<<<<<<<<< * * cdef INT_T border_num = len(border_sites) */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 456, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 450, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - /* "voronoi_dcel.pyx":456 + /* "src/voronoi_dcel.pyx":450 * # 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( # <<<<<<<<<<<<<< * np.asarray(offsets), # Check indices where below matches would be inserted * np.nonzero(np.isin( # Indices of other verts being in bound verts. */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_searchsorted); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 456, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_searchsorted); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 450, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "voronoi_dcel.pyx":457 + /* "src/voronoi_dcel.pyx":451 * 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 # <<<<<<<<<<<<<< * np.nonzero(np.isin( # Indices of other verts being in bound verts. * vert_indices_np[offsets[self.n]:], # Rest of the verts to check. */ - __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_np); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 457, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_np); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 451, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_asarray); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 457, __pyx_L1_error) + __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_asarray); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 451, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __pyx_t_13 = NULL; @@ -11014,29 +11003,29 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx } __pyx_t_2 = (__pyx_t_13) ? __Pyx_PyObject_Call2Args(__pyx_t_14, __pyx_t_13, ((PyObject *)__pyx_v_offsets)) : __Pyx_PyObject_CallOneArg(__pyx_t_14, ((PyObject *)__pyx_v_offsets)); __Pyx_XDECREF(__pyx_t_13); __pyx_t_13 = 0; - if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 457, __pyx_L1_error) + if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 451, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - /* "voronoi_dcel.pyx":458 + /* "src/voronoi_dcel.pyx":452 * 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. # <<<<<<<<<<<<<< * vert_indices_np[offsets[self.n]:], # Rest of the verts to check. * np.unique(vert_indices_np[:offsets[self.n]]) # Bound verts */ - __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_np); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 458, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_np); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_nonzero); if (unlikely(!__pyx_t_15)) __PYX_ERR(1, 458, __pyx_L1_error) + __pyx_t_15 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_nonzero); if (unlikely(!__pyx_t_15)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_15); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_16, __pyx_n_s_np); if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 458, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_16, __pyx_n_s_np); if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_16); - __pyx_t_17 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_n_s_isin); if (unlikely(!__pyx_t_17)) __PYX_ERR(1, 458, __pyx_L1_error) + __pyx_t_17 = __Pyx_PyObject_GetAttrStr(__pyx_t_16, __pyx_n_s_isin); if (unlikely(!__pyx_t_17)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_17); __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0; - /* "voronoi_dcel.pyx":459 + /* "src/voronoi_dcel.pyx":453 * 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. # <<<<<<<<<<<<<< @@ -11044,34 +11033,34 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx * ))[0] + offsets[self.n], */ __pyx_t_6 = __pyx_v_self->n; - __pyx_t_16 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 459, __pyx_L1_error) + __pyx_t_16 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 453, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_16); - __pyx_t_18 = PySlice_New(__pyx_t_16, Py_None, Py_None); if (unlikely(!__pyx_t_18)) __PYX_ERR(1, 459, __pyx_L1_error) + __pyx_t_18 = PySlice_New(__pyx_t_16, Py_None, Py_None); if (unlikely(!__pyx_t_18)) __PYX_ERR(1, 453, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_18); __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0; - __pyx_t_16 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_vert_indices_np), __pyx_t_18); if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 459, __pyx_L1_error) + __pyx_t_16 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_vert_indices_np), __pyx_t_18); if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 453, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_16); __Pyx_DECREF(__pyx_t_18); __pyx_t_18 = 0; - /* "voronoi_dcel.pyx":460 + /* "src/voronoi_dcel.pyx":454 * 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 # <<<<<<<<<<<<<< * ))[0] + offsets[self.n], * side='right' # If on index == offset_number, should be part of the next site. */ - __Pyx_GetModuleGlobalName(__pyx_t_19, __pyx_n_s_np); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 460, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_19, __pyx_n_s_np); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 454, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_19); - __pyx_t_20 = __Pyx_PyObject_GetAttrStr(__pyx_t_19, __pyx_n_s_unique); if (unlikely(!__pyx_t_20)) __PYX_ERR(1, 460, __pyx_L1_error) + __pyx_t_20 = __Pyx_PyObject_GetAttrStr(__pyx_t_19, __pyx_n_s_unique); if (unlikely(!__pyx_t_20)) __PYX_ERR(1, 454, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_20); __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; __pyx_t_6 = __pyx_v_self->n; - __pyx_t_19 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 460, __pyx_L1_error) + __pyx_t_19 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 454, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_19); - __pyx_t_21 = PySlice_New(Py_None, __pyx_t_19, Py_None); if (unlikely(!__pyx_t_21)) __PYX_ERR(1, 460, __pyx_L1_error) + __pyx_t_21 = PySlice_New(Py_None, __pyx_t_19, Py_None); if (unlikely(!__pyx_t_21)) __PYX_ERR(1, 454, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_21); __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; - __pyx_t_19 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_vert_indices_np), __pyx_t_21); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 460, __pyx_L1_error) + __pyx_t_19 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_vert_indices_np), __pyx_t_21); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 454, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_19); __Pyx_DECREF(__pyx_t_21); __pyx_t_21 = 0; __pyx_t_21 = NULL; @@ -11087,7 +11076,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_t_18 = (__pyx_t_21) ? __Pyx_PyObject_Call2Args(__pyx_t_20, __pyx_t_21, __pyx_t_19) : __Pyx_PyObject_CallOneArg(__pyx_t_20, __pyx_t_19); __Pyx_XDECREF(__pyx_t_21); __pyx_t_21 = 0; __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; - if (unlikely(!__pyx_t_18)) __PYX_ERR(1, 460, __pyx_L1_error) + if (unlikely(!__pyx_t_18)) __PYX_ERR(1, 454, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_18); __Pyx_DECREF(__pyx_t_20); __pyx_t_20 = 0; __pyx_t_20 = NULL; @@ -11105,7 +11094,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_17)) { PyObject *__pyx_temp[3] = {__pyx_t_20, __pyx_t_16, __pyx_t_18}; - __pyx_t_13 = __Pyx_PyFunction_FastCall(__pyx_t_17, __pyx_temp+1-__pyx_t_22, 2+__pyx_t_22); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 458, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyFunction_FastCall(__pyx_t_17, __pyx_temp+1-__pyx_t_22, 2+__pyx_t_22); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_20); __pyx_t_20 = 0; __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0; @@ -11115,7 +11104,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_17)) { PyObject *__pyx_temp[3] = {__pyx_t_20, __pyx_t_16, __pyx_t_18}; - __pyx_t_13 = __Pyx_PyCFunction_FastCall(__pyx_t_17, __pyx_temp+1-__pyx_t_22, 2+__pyx_t_22); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 458, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyCFunction_FastCall(__pyx_t_17, __pyx_temp+1-__pyx_t_22, 2+__pyx_t_22); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_20); __pyx_t_20 = 0; __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_16); __pyx_t_16 = 0; @@ -11123,7 +11112,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx } else #endif { - __pyx_t_19 = PyTuple_New(2+__pyx_t_22); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 458, __pyx_L1_error) + __pyx_t_19 = PyTuple_New(2+__pyx_t_22); if (unlikely(!__pyx_t_19)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_19); if (__pyx_t_20) { __Pyx_GIVEREF(__pyx_t_20); PyTuple_SET_ITEM(__pyx_t_19, 0, __pyx_t_20); __pyx_t_20 = NULL; @@ -11134,7 +11123,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx PyTuple_SET_ITEM(__pyx_t_19, 1+__pyx_t_22, __pyx_t_18); __pyx_t_16 = 0; __pyx_t_18 = 0; - __pyx_t_13 = __Pyx_PyObject_Call(__pyx_t_17, __pyx_t_19, NULL); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 458, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyObject_Call(__pyx_t_17, __pyx_t_19, NULL); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_19); __pyx_t_19 = 0; } @@ -11152,36 +11141,36 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_t_14 = (__pyx_t_17) ? __Pyx_PyObject_Call2Args(__pyx_t_15, __pyx_t_17, __pyx_t_13) : __Pyx_PyObject_CallOneArg(__pyx_t_15, __pyx_t_13); __Pyx_XDECREF(__pyx_t_17); __pyx_t_17 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 458, __pyx_L1_error) + if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 452, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; - /* "voronoi_dcel.pyx":461 + /* "src/voronoi_dcel.pyx":455 * 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], # <<<<<<<<<<<<<< * side='right' # If on index == offset_number, should be part of the next site. * ) - 1) # Subtract by one to get actual site number. */ - __pyx_t_15 = __Pyx_GetItemInt(__pyx_t_14, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_15)) __PYX_ERR(1, 461, __pyx_L1_error) + __pyx_t_15 = __Pyx_GetItemInt(__pyx_t_14, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_15)) __PYX_ERR(1, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_15); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; __pyx_t_6 = __pyx_v_self->n; - __pyx_t_14 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 461, __pyx_L1_error) + __pyx_t_14 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); - __pyx_t_13 = PyNumber_Add(__pyx_t_15, __pyx_t_14); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 461, __pyx_L1_error) + __pyx_t_13 = PyNumber_Add(__pyx_t_15, __pyx_t_14); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 455, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_15); __pyx_t_15 = 0; __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - /* "voronoi_dcel.pyx":456 + /* "src/voronoi_dcel.pyx":450 * # 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( # <<<<<<<<<<<<<< * np.asarray(offsets), # Check indices where below matches would be inserted * np.nonzero(np.isin( # Indices of other verts being in bound verts. */ - __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 456, __pyx_L1_error) + __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 450, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_2); @@ -11190,38 +11179,38 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_t_2 = 0; __pyx_t_13 = 0; - /* "voronoi_dcel.pyx":462 + /* "src/voronoi_dcel.pyx":456 * 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. # <<<<<<<<<<<<<< * ) - 1) # Subtract by one to get actual site number. * */ - __pyx_t_13 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 462, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 456, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - if (PyDict_SetItem(__pyx_t_13, __pyx_n_s_side, __pyx_n_u_right) < 0) __PYX_ERR(1, 462, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_13, __pyx_n_s_side, __pyx_n_u_right) < 0) __PYX_ERR(1, 456, __pyx_L1_error) - /* "voronoi_dcel.pyx":456 + /* "src/voronoi_dcel.pyx":450 * # 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( # <<<<<<<<<<<<<< * np.asarray(offsets), # Check indices where below matches would be inserted * np.nonzero(np.isin( # Indices of other verts being in bound verts. */ - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_14, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 456, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_14, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 450, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - /* "voronoi_dcel.pyx":463 + /* "src/voronoi_dcel.pyx":457 * ))[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. # <<<<<<<<<<<<<< * * cdef INT_T border_num = len(border_sites) */ - __pyx_t_13 = __Pyx_PyInt_SubtractObjC(__pyx_t_2, __pyx_int_1, 1, 0, 0); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 463, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyInt_SubtractObjC(__pyx_t_2, __pyx_int_1, 1, 0, 0); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 457, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_t_2 = NULL; @@ -11237,24 +11226,24 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_t_3 = (__pyx_t_2) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_2, __pyx_t_13) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_13); __Pyx_XDECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 456, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 450, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":456 + /* "src/voronoi_dcel.pyx":450 * # 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( # <<<<<<<<<<<<<< * np.asarray(offsets), # Check indices where below matches would be inserted * np.nonzero(np.isin( # Indices of other verts being in bound verts. */ - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 456, __pyx_L1_error) + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 450, __pyx_L1_error) __pyx_t_23 = ((PyArrayObject *)__pyx_t_3); { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_border_sites.rcbuffer->pybuffer, (PyObject*)__pyx_t_23, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_border_sites.rcbuffer->pybuffer, (PyObject*)__pyx_t_23, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { __pyx_v_border_sites = ((PyArrayObject *)Py_None); __Pyx_INCREF(Py_None); __pyx_pybuffernd_border_sites.rcbuffer->pybuffer.buf = NULL; - __PYX_ERR(1, 456, __pyx_L1_error) + __PYX_ERR(1, 450, __pyx_L1_error) } else {__pyx_pybuffernd_border_sites.diminfo[0].strides = __pyx_pybuffernd_border_sites.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_border_sites.diminfo[0].shape = __pyx_pybuffernd_border_sites.rcbuffer->pybuffer.shape[0]; } } @@ -11262,31 +11251,31 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_v_border_sites = ((PyArrayObject *)__pyx_t_3); __pyx_t_3 = 0; - /* "voronoi_dcel.pyx":465 + /* "src/voronoi_dcel.pyx":459 * ) - 1) # Subtract by one to get actual site number. * * cdef INT_T border_num = len(border_sites) # <<<<<<<<<<<<<< * * # Build sites array. */ - __pyx_t_10 = PyObject_Length(((PyObject *)__pyx_v_border_sites)); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(1, 465, __pyx_L1_error) + __pyx_t_10 = PyObject_Length(((PyObject *)__pyx_v_border_sites)); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(1, 459, __pyx_L1_error) __pyx_v_border_num = __pyx_t_10; - /* "voronoi_dcel.pyx":469 + /* "src/voronoi_dcel.pyx":463 * # Build sites array. * # [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) * self.sites.base[self.n:, 0] = border_sites */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 469, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 469, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + __pyx_v_border_num)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 469, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + __pyx_v_border_num)); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 469, __pyx_L1_error) + __pyx_t_13 = PyTuple_New(2); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_3); @@ -11294,71 +11283,71 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_GIVEREF(__pyx_int_3); PyTuple_SET_ITEM(__pyx_t_13, 1, __pyx_int_3); __pyx_t_3 = 0; - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 469, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_13); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_13); __pyx_t_13 = 0; - __pyx_t_13 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 469, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_INT); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 469, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_INT); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_13, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(1, 469, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_13, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 469, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_3, __pyx_t_13); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - __pyx_t_24 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_INT_T(__pyx_t_2, PyBUF_WRITABLE); if (unlikely(!__pyx_t_24.memview)) __PYX_ERR(1, 469, __pyx_L1_error) + __pyx_t_24 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_INT_T(__pyx_t_2, PyBUF_WRITABLE); if (unlikely(!__pyx_t_24.memview)) __PYX_ERR(1, 463, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __PYX_XDEC_MEMVIEW(&__pyx_v_self->sites, 0); __pyx_v_self->sites = __pyx_t_24; __pyx_t_24.memview = NULL; __pyx_t_24.data = NULL; - /* "voronoi_dcel.pyx":470 + /* "src/voronoi_dcel.pyx":464 * # [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) # <<<<<<<<<<<<<< * self.sites.base[self.n:, 0] = border_sites * self.sites.base[:self.n+1, 1] = offsets[:self.n+1] */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 470, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_arange); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_arange); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_INT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 470, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_INT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 470, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_13, __pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_13, __pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 470, __pyx_L1_error)} - __pyx_t_2 = __pyx_memoryview_fromslice(__pyx_v_self->sites, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_INT_T, 0);; if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 470, __pyx_L1_error) + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 464, __pyx_L1_error)} + __pyx_t_2 = __pyx_memoryview_fromslice(__pyx_v_self->sites, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_INT_T, 0);; if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_base); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_base); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_13 = PySlice_New(Py_None, __pyx_t_2, Py_None); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_13 = PySlice_New(Py_None, __pyx_t_2, Py_None); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 470, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_13); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_13); @@ -11366,30 +11355,30 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_GIVEREF(__pyx_int_0); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_0); __pyx_t_13 = 0; - if (unlikely(PyObject_SetItem(__pyx_t_3, __pyx_t_2, __pyx_t_4) < 0)) __PYX_ERR(1, 470, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_3, __pyx_t_2, __pyx_t_4) < 0)) __PYX_ERR(1, 464, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":471 + /* "src/voronoi_dcel.pyx":465 * 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 # <<<<<<<<<<<<<< * self.sites.base[:self.n+1, 1] = offsets[:self.n+1] * for i in range(self.n): */ - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 471, __pyx_L1_error)} - __pyx_t_4 = __pyx_memoryview_fromslice(__pyx_v_self->sites, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_INT_T, 0);; if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 471, __pyx_L1_error) + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 465, __pyx_L1_error)} + __pyx_t_4 = __pyx_memoryview_fromslice(__pyx_v_self->sites, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_INT_T, 0);; if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 465, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_base); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 471, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_base); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 465, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 471, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 465, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PySlice_New(__pyx_t_4, Py_None, Py_None); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 471, __pyx_L1_error) + __pyx_t_3 = PySlice_New(__pyx_t_4, Py_None, Py_None); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 465, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 471, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 465, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); @@ -11397,37 +11386,37 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_GIVEREF(__pyx_int_0); PyTuple_SET_ITEM(__pyx_t_4, 1, __pyx_int_0); __pyx_t_3 = 0; - if (unlikely(PyObject_SetItem(__pyx_t_2, __pyx_t_4, ((PyObject *)__pyx_v_border_sites)) < 0)) __PYX_ERR(1, 471, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_2, __pyx_t_4, ((PyObject *)__pyx_v_border_sites)) < 0)) __PYX_ERR(1, 465, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":472 + /* "src/voronoi_dcel.pyx":466 * 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] # <<<<<<<<<<<<<< * for i in range(self.n): * self.sites[i, 2] = self.sites[i+1, 1] - self.sites[i, 1] */ - __pyx_t_4 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + 1)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 472, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + 1)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = PySlice_New(Py_None, __pyx_t_4, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 472, __pyx_L1_error) + __pyx_t_2 = PySlice_New(Py_None, __pyx_t_4, Py_None); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_offsets), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 472, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_offsets), __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 472, __pyx_L1_error)} - __pyx_t_2 = __pyx_memoryview_fromslice(__pyx_v_self->sites, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_INT_T, 0);; if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 472, __pyx_L1_error) + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 466, __pyx_L1_error)} + __pyx_t_2 = __pyx_memoryview_fromslice(__pyx_v_self->sites, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_INT_T, 0);; if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_base); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 472, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_base); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + 1)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 472, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + 1)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_13 = PySlice_New(Py_None, __pyx_t_2, Py_None); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 472, __pyx_L1_error) + __pyx_t_13 = PySlice_New(Py_None, __pyx_t_2, Py_None); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 472, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_13); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_13); @@ -11435,12 +11424,12 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_GIVEREF(__pyx_int_1); PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_int_1); __pyx_t_13 = 0; - if (unlikely(PyObject_SetItem(__pyx_t_3, __pyx_t_2, __pyx_t_4) < 0)) __PYX_ERR(1, 472, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_3, __pyx_t_2, __pyx_t_4) < 0)) __PYX_ERR(1, 466, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":473 + /* "src/voronoi_dcel.pyx":467 * 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): # <<<<<<<<<<<<<< @@ -11452,26 +11441,26 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "voronoi_dcel.pyx":474 + /* "src/voronoi_dcel.pyx":468 * 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] # <<<<<<<<<<<<<< * * cdef INT_T edge_count = offsets[self.n] */ - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 474, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 468, __pyx_L1_error)} __pyx_t_9 = (__pyx_v_i + 1); __pyx_t_25 = 1; - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 474, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 468, __pyx_L1_error)} __pyx_t_11 = __pyx_v_i; __pyx_t_26 = 1; - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 474, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 468, __pyx_L1_error)} __pyx_t_27 = __pyx_v_i; __pyx_t_28 = 2; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_28)) )) = ((*((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_9 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_25)) ))) - (*((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_11 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) )))); + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_28)) )) = ((*((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_9 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_25)) ))) - (*((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_11 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) )))); } - /* "voronoi_dcel.pyx":476 + /* "src/voronoi_dcel.pyx":470 * self.sites[i, 2] = self.sites[i+1, 1] - self.sites[i, 1] * * cdef INT_T edge_count = offsets[self.n] # <<<<<<<<<<<<<< @@ -11479,9 +11468,9 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx * for i in range(border_num): */ __pyx_t_6 = __pyx_v_self->n; - __pyx_v_edge_count = (*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides)); + __pyx_v_edge_count = (*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_6, __pyx_pybuffernd_offsets.diminfo[0].strides)); - /* "voronoi_dcel.pyx":478 + /* "src/voronoi_dcel.pyx":472 * cdef INT_T edge_count = offsets[self.n] * cdef INT_T diff * for i in range(border_num): # <<<<<<<<<<<<<< @@ -11493,7 +11482,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "voronoi_dcel.pyx":479 + /* "src/voronoi_dcel.pyx":473 * cdef INT_T diff * for i in range(border_num): * diff = offsets[border_sites[i]+1] - offsets[border_sites[i]] # <<<<<<<<<<<<<< @@ -11501,12 +11490,12 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx * self.sites[self.n+i, 2] = diff */ __pyx_t_11 = __pyx_v_i; - __pyx_t_9 = ((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_border_sites.rcbuffer->pybuffer.buf, __pyx_t_11, __pyx_pybuffernd_border_sites.diminfo[0].strides)) + 1); + __pyx_t_9 = ((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_border_sites.rcbuffer->pybuffer.buf, __pyx_t_11, __pyx_pybuffernd_border_sites.diminfo[0].strides)) + 1); __pyx_t_27 = __pyx_v_i; - __pyx_t_29 = (*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_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_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_offsets.diminfo[0].strides)) - (*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_29, __pyx_pybuffernd_offsets.diminfo[0].strides))); + __pyx_t_29 = (*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_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_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_offsets.diminfo[0].strides)) - (*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_29, __pyx_pybuffernd_offsets.diminfo[0].strides))); - /* "voronoi_dcel.pyx":480 + /* "src/voronoi_dcel.pyx":474 * for i in range(border_num): * diff = offsets[border_sites[i]+1] - offsets[border_sites[i]] * edge_count += diff # <<<<<<<<<<<<<< @@ -11515,19 +11504,19 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx */ __pyx_v_edge_count = (__pyx_v_edge_count + __pyx_v_diff); - /* "voronoi_dcel.pyx":481 + /* "src/voronoi_dcel.pyx":475 * diff = offsets[border_sites[i]+1] - offsets[border_sites[i]] * edge_count += diff * 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 */ - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 481, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 475, __pyx_L1_error)} __pyx_t_27 = (__pyx_v_self->n + __pyx_v_i); __pyx_t_26 = 2; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) )) = __pyx_v_diff; + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) )) = __pyx_v_diff; - /* "voronoi_dcel.pyx":482 + /* "src/voronoi_dcel.pyx":476 * edge_count += diff * self.sites[self.n+i, 2] = diff * if i < border_num - 1: # <<<<<<<<<<<<<< @@ -11537,22 +11526,22 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_t_30 = ((__pyx_v_i < (__pyx_v_border_num - 1)) != 0); if (__pyx_t_30) { - /* "voronoi_dcel.pyx":483 + /* "src/voronoi_dcel.pyx":477 * 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 # <<<<<<<<<<<<<< * * # Build edges array */ - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 483, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 477, __pyx_L1_error)} __pyx_t_27 = (__pyx_v_self->n + __pyx_v_i); __pyx_t_26 = 1; - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 483, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 477, __pyx_L1_error)} __pyx_t_29 = ((__pyx_v_self->n + __pyx_v_i) + 1); __pyx_t_25 = 1; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_29 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_25)) )) = ((*((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))) + __pyx_v_diff); + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_29 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_25)) )) = ((*((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))) + __pyx_v_diff); - /* "voronoi_dcel.pyx":482 + /* "src/voronoi_dcel.pyx":476 * edge_count += diff * self.sites[self.n+i, 2] = diff * if i < border_num - 1: # <<<<<<<<<<<<<< @@ -11562,21 +11551,21 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx } } - /* "voronoi_dcel.pyx":487 + /* "src/voronoi_dcel.pyx":481 * # Build edges array * # [Origin Index, Site Index, Next Index, Prev Index, Twin Index] * self.edges = np.empty((edge_count, 5), dtype=INT) # <<<<<<<<<<<<<< * cdef np.ndarray[INT_T, ndim=1] site_verts * cdef INT_T j, site_i, edge_i, edge_offset, vert_num, twin_index, prev_res */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 487, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 487, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_edge_count); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 487, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_edge_count); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 487, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4); @@ -11584,42 +11573,42 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __Pyx_GIVEREF(__pyx_int_5); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_int_5); __pyx_t_4 = 0; - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 487, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 487, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_INT); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 487, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_INT); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_13) < 0) __PYX_ERR(1, 487, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_13) < 0) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - __pyx_t_13 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 487, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_4, __pyx_t_3); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_24 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_INT_T(__pyx_t_13, PyBUF_WRITABLE); if (unlikely(!__pyx_t_24.memview)) __PYX_ERR(1, 487, __pyx_L1_error) + __pyx_t_24 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_INT_T(__pyx_t_13, PyBUF_WRITABLE); if (unlikely(!__pyx_t_24.memview)) __PYX_ERR(1, 481, __pyx_L1_error) __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __PYX_XDEC_MEMVIEW(&__pyx_v_self->edges, 0); __pyx_v_self->edges = __pyx_t_24; __pyx_t_24.memview = NULL; __pyx_t_24.data = NULL; - /* "voronoi_dcel.pyx":491 + /* "src/voronoi_dcel.pyx":485 * cdef INT_T j, site_i, edge_i, edge_offset, vert_num, twin_index, prev_res * * edge_indices = dict() # <<<<<<<<<<<<<< * * for i in range(self.n + border_num): */ - __pyx_t_13 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 491, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 485, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __pyx_v_edge_indices = ((PyObject*)__pyx_t_13); __pyx_t_13 = 0; - /* "voronoi_dcel.pyx":493 + /* "src/voronoi_dcel.pyx":487 * edge_indices = dict() * * for i in range(self.n + border_num): # <<<<<<<<<<<<<< @@ -11631,31 +11620,31 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_7; __pyx_t_8+=1) { __pyx_v_i = __pyx_t_8; - /* "voronoi_dcel.pyx":494 + /* "src/voronoi_dcel.pyx":488 * * for i in range(self.n + border_num): * site_i = self.sites[i, 0] # <<<<<<<<<<<<<< * edge_offset = self.sites[i, 1] * site_verts = vert_indices_np[offsets[site_i]:offsets[site_i+1]] */ - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 494, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 488, __pyx_L1_error)} __pyx_t_27 = __pyx_v_i; __pyx_t_26 = 0; - __pyx_v_site_i = (*((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))); + __pyx_v_site_i = (*((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))); - /* "voronoi_dcel.pyx":495 + /* "src/voronoi_dcel.pyx":489 * for i in range(self.n + border_num): * site_i = self.sites[i, 0] * edge_offset = self.sites[i, 1] # <<<<<<<<<<<<<< * site_verts = vert_indices_np[offsets[site_i]:offsets[site_i+1]] * */ - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 495, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 489, __pyx_L1_error)} __pyx_t_27 = __pyx_v_i; __pyx_t_26 = 1; - __pyx_v_edge_offset = (*((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))); + __pyx_v_edge_offset = (*((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->sites.data + __pyx_t_27 * __pyx_v_self->sites.strides[0]) )) + __pyx_t_26)) ))); - /* "voronoi_dcel.pyx":496 + /* "src/voronoi_dcel.pyx":490 * site_i = self.sites[i, 0] * edge_offset = self.sites[i, 1] * site_verts = vert_indices_np[offsets[site_i]:offsets[site_i+1]] # <<<<<<<<<<<<<< @@ -11663,27 +11652,27 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx * # Scipy outputs sorted vertices, but reverse if not counterclockwise. */ __pyx_t_27 = __pyx_v_site_i; - __pyx_t_13 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 496, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 490, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __pyx_t_27 = (__pyx_v_site_i + 1); - __pyx_t_3 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 496, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_offsets.diminfo[0].strides))); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 490, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PySlice_New(__pyx_t_13, __pyx_t_3, Py_None); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 496, __pyx_L1_error) + __pyx_t_4 = PySlice_New(__pyx_t_13, __pyx_t_3, Py_None); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 490, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_vert_indices_np), __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 496, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetItem(((PyObject *)__pyx_v_vert_indices_np), __pyx_t_4); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 490, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 496, __pyx_L1_error) + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 490, __pyx_L1_error) __pyx_t_31 = ((PyArrayObject *)__pyx_t_3); { __Pyx_BufFmt_StackElem __pyx_stack[1]; __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer); - __pyx_t_22 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_t_31, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack); + __pyx_t_22 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_t_31, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack); if (unlikely(__pyx_t_22 < 0)) { PyErr_Fetch(&__pyx_t_32, &__pyx_t_33, &__pyx_t_34); - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_verts, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_verts, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { Py_XDECREF(__pyx_t_32); Py_XDECREF(__pyx_t_33); Py_XDECREF(__pyx_t_34); __Pyx_RaiseBufferFallbackError(); } else { @@ -11692,20 +11681,20 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_generate_dcel(struct __pyx __pyx_t_32 = __pyx_t_33 = __pyx_t_34 = 0; } __pyx_pybuffernd_site_verts.diminfo[0].strides = __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_site_verts.diminfo[0].shape = __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.shape[0]; - if (unlikely(__pyx_t_22 < 0)) __PYX_ERR(1, 496, __pyx_L1_error) + if (unlikely(__pyx_t_22 < 0)) __PYX_ERR(1, 490, __pyx_L1_error) } __pyx_t_31 = 0; __Pyx_XDECREF_SET(__pyx_v_site_verts, ((PyArrayObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "voronoi_dcel.pyx":499 + /* "src/voronoi_dcel.pyx":493 * * # 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]]): * site_verts = np.flip(site_verts) */ - if (unlikely(!__pyx_v_self->points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 499, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 493, __pyx_L1_error)} __pyx_t_35.data = __pyx_v_self->points.data; __pyx_t_35.memview = __pyx_v_self->points.memview; __PYX_INC_MEMVIEW(&__pyx_t_35, 0); @@ -11719,9 +11708,9 @@ __pyx_t_35.shape[0] = __pyx_v_self->points.shape[1]; __pyx_t_35.strides[0] = __pyx_v_self->points.strides[1]; __pyx_t_35.suboffsets[0] = -1; -if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 500, __pyx_L1_error)} +if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 494, __pyx_L1_error)} - /* "voronoi_dcel.pyx":500 + /* "src/voronoi_dcel.pyx":494 * # 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]]): # <<<<<<<<<<<<<< @@ -11733,7 +11722,7 @@ if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeE __pyx_t_36.memview = __pyx_v_self->vertices.memview; __PYX_INC_MEMVIEW(&__pyx_t_36, 0); { - Py_ssize_t __pyx_tmp_idx = (*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_26, __pyx_pybuffernd_site_verts.diminfo[0].strides)); + Py_ssize_t __pyx_tmp_idx = (*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_26, __pyx_pybuffernd_site_verts.diminfo[0].strides)); Py_ssize_t __pyx_tmp_stride = __pyx_v_self->vertices.strides[0]; __pyx_t_36.data += __pyx_tmp_idx * __pyx_tmp_stride; } @@ -11742,13 +11731,13 @@ __pyx_t_36.shape[0] = __pyx_v_self->vertices.shape[1]; __pyx_t_36.strides[0] = __pyx_v_self->vertices.strides[1]; __pyx_t_36.suboffsets[0] = -1; -if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 500, __pyx_L1_error)} +if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 494, __pyx_L1_error)} __pyx_t_26 = 1; __pyx_t_37.data = __pyx_v_self->vertices.data; __pyx_t_37.memview = __pyx_v_self->vertices.memview; __PYX_INC_MEMVIEW(&__pyx_t_37, 0); { - Py_ssize_t __pyx_tmp_idx = (*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_26, __pyx_pybuffernd_site_verts.diminfo[0].strides)); + Py_ssize_t __pyx_tmp_idx = (*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_26, __pyx_pybuffernd_site_verts.diminfo[0].strides)); Py_ssize_t __pyx_tmp_stride = __pyx_v_self->vertices.strides[0]; __pyx_t_37.data += __pyx_tmp_idx * __pyx_tmp_stride; } @@ -11757,9 +11746,9 @@ __pyx_t_37.shape[0] = __pyx_v_self->vertices.shape[1]; __pyx_t_37.strides[0] = __pyx_v_self->vertices.strides[1]; __pyx_t_37.suboffsets[0] = -1; -__pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36, __pyx_t_37) != 0)) != 0); +__pyx_t_30 = ((!(__pyx_f_8_packsim_16VoronoiContainer_sign(__pyx_t_35, __pyx_t_36, __pyx_t_37) != 0)) != 0); - /* "voronoi_dcel.pyx":499 + /* "src/voronoi_dcel.pyx":493 * * # Scipy outputs sorted vertices, but reverse if not counterclockwise. * if not VoronoiContainer.sign(self.points[site_i], # <<<<<<<<<<<<<< @@ -11777,16 +11766,16 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py __pyx_t_37.data = NULL; if (__pyx_t_30) { - /* "voronoi_dcel.pyx":501 + /* "src/voronoi_dcel.pyx":495 * if not VoronoiContainer.sign(self.points[site_i], * self.vertices[site_verts[0]], self.vertices[site_verts[1]]): * site_verts = np.flip(site_verts) # <<<<<<<<<<<<<< * * vert_num = offsets[site_i+1] - offsets[site_i] */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 501, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_flip); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 501, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_flip); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_t_4 = NULL; @@ -11801,18 +11790,18 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py } __pyx_t_3 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_13, __pyx_t_4, ((PyObject *)__pyx_v_site_verts)) : __Pyx_PyObject_CallOneArg(__pyx_t_13, ((PyObject *)__pyx_v_site_verts)); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 501, __pyx_L1_error) + if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 495, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 501, __pyx_L1_error) + if (!(likely(((__pyx_t_3) == Py_None) || likely(__Pyx_TypeTest(__pyx_t_3, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 495, __pyx_L1_error) __pyx_t_31 = ((PyArrayObject *)__pyx_t_3); { __Pyx_BufFmt_StackElem __pyx_stack[1]; __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer); - __pyx_t_22 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_t_31, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack); + __pyx_t_22 = __Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_t_31, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack); if (unlikely(__pyx_t_22 < 0)) { PyErr_Fetch(&__pyx_t_34, &__pyx_t_33, &__pyx_t_32); - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_verts, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_verts, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, PyBUF_FORMAT| PyBUF_STRIDES, 1, 0, __pyx_stack) == -1)) { Py_XDECREF(__pyx_t_34); Py_XDECREF(__pyx_t_33); Py_XDECREF(__pyx_t_32); __Pyx_RaiseBufferFallbackError(); } else { @@ -11821,13 +11810,13 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py __pyx_t_34 = __pyx_t_33 = __pyx_t_32 = 0; } __pyx_pybuffernd_site_verts.diminfo[0].strides = __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.strides[0]; __pyx_pybuffernd_site_verts.diminfo[0].shape = __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.shape[0]; - if (unlikely(__pyx_t_22 < 0)) __PYX_ERR(1, 501, __pyx_L1_error) + if (unlikely(__pyx_t_22 < 0)) __PYX_ERR(1, 495, __pyx_L1_error) } __pyx_t_31 = 0; __Pyx_DECREF_SET(__pyx_v_site_verts, ((PyArrayObject *)__pyx_t_3)); __pyx_t_3 = 0; - /* "voronoi_dcel.pyx":499 + /* "src/voronoi_dcel.pyx":493 * * # Scipy outputs sorted vertices, but reverse if not counterclockwise. * if not VoronoiContainer.sign(self.points[site_i], # <<<<<<<<<<<<<< @@ -11836,7 +11825,7 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py */ } - /* "voronoi_dcel.pyx":503 + /* "src/voronoi_dcel.pyx":497 * site_verts = np.flip(site_verts) * * vert_num = offsets[site_i+1] - offsets[site_i] # <<<<<<<<<<<<<< @@ -11845,9 +11834,9 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py */ __pyx_t_27 = (__pyx_v_site_i + 1); __pyx_t_29 = __pyx_v_site_i; - __pyx_v_vert_num = ((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_offsets.diminfo[0].strides)) - (*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_29, __pyx_pybuffernd_offsets.diminfo[0].strides))); + __pyx_v_vert_num = ((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_27, __pyx_pybuffernd_offsets.diminfo[0].strides)) - (*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_offsets.rcbuffer->pybuffer.buf, __pyx_t_29, __pyx_pybuffernd_offsets.diminfo[0].strides))); - /* "voronoi_dcel.pyx":505 + /* "src/voronoi_dcel.pyx":499 * vert_num = offsets[site_i+1] - offsets[site_i] * * for j in range(vert_num): # <<<<<<<<<<<<<< @@ -11859,7 +11848,7 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_27; __pyx_t_11+=1) { __pyx_v_j = __pyx_t_11; - /* "voronoi_dcel.pyx":506 + /* "src/voronoi_dcel.pyx":500 * * for j in range(vert_num): * edge_i = edge_offset+j # <<<<<<<<<<<<<< @@ -11868,7 +11857,7 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py */ __pyx_v_edge_i = (__pyx_v_edge_offset + __pyx_v_j); - /* "voronoi_dcel.pyx":507 + /* "src/voronoi_dcel.pyx":501 * for j in range(vert_num): * edge_i = edge_offset+j * self.edges[edge_i, 0] = site_verts[j] # <<<<<<<<<<<<<< @@ -11876,48 +11865,48 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py * # Add vert_num because of C modulo to get always positive. */ __pyx_t_9 = __pyx_v_j; - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 507, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 501, __pyx_L1_error)} __pyx_t_38 = __pyx_v_edge_i; __pyx_t_26 = 0; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_12packsim_core_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides)); + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_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_8_packsim_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides)); - /* "voronoi_dcel.pyx":508 + /* "src/voronoi_dcel.pyx":502 * edge_i = edge_offset+j * self.edges[edge_i, 0] = site_verts[j] * 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 */ - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 508, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 502, __pyx_L1_error)} __pyx_t_9 = __pyx_v_edge_i; __pyx_t_26 = 1; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_INT_T *) ( /* dim=0 */ (__pyx_v_self->edges.data + __pyx_t_9 * __pyx_v_self->edges.strides[0]) )) + __pyx_t_26)) )) = __pyx_v_i; + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_INT_T *) ( /* dim=0 */ (__pyx_v_self->edges.data + __pyx_t_9 * __pyx_v_self->edges.strides[0]) )) + __pyx_t_26)) )) = __pyx_v_i; - /* "voronoi_dcel.pyx":510 + /* "src/voronoi_dcel.pyx":504 * 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 # <<<<<<<<<<<<<< * self.edges[edge_i, 3] = (j+vert_num-1) % vert_num + edge_offset * */ - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 510, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 504, __pyx_L1_error)} __pyx_t_9 = __pyx_v_edge_i; __pyx_t_26 = 2; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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); + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_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); - /* "voronoi_dcel.pyx":511 + /* "src/voronoi_dcel.pyx":505 * # 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 # <<<<<<<<<<<<<< * * # Get reversed tuple to theck for twin. */ - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 511, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 505, __pyx_L1_error)} __pyx_t_9 = __pyx_v_edge_i; __pyx_t_26 = 3; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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); + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_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); - /* "voronoi_dcel.pyx":515 + /* "src/voronoi_dcel.pyx":509 * # Get reversed tuple to theck for twin. * twin_index = edge_indices.get( * (site_verts[(j+1) % vert_num], site_verts[j] # <<<<<<<<<<<<<< @@ -11925,12 +11914,12 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py * */ __pyx_t_9 = ((__pyx_v_j + 1) % __pyx_v_vert_num); - __pyx_t_3 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 515, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 509, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_9 = __pyx_v_j; - __pyx_t_13 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 515, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 509, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 515, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 509, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_3); @@ -11939,33 +11928,33 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py __pyx_t_3 = 0; __pyx_t_13 = 0; - /* "voronoi_dcel.pyx":514 + /* "src/voronoi_dcel.pyx":508 * * # Get reversed tuple to theck for twin. * twin_index = edge_indices.get( # <<<<<<<<<<<<<< * (site_verts[(j+1) % vert_num], site_verts[j] * ), -1) */ - __pyx_t_13 = __Pyx_PyDict_GetItemDefault(__pyx_v_edge_indices, __pyx_t_4, __pyx_int_neg_1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 514, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyDict_GetItemDefault(__pyx_v_edge_indices, __pyx_t_4, __pyx_int_neg_1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 508, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_9 = __Pyx_PyInt_As_npy_int64(__pyx_t_13); if (unlikely((__pyx_t_9 == ((npy_int64)-1)) && PyErr_Occurred())) __PYX_ERR(1, 514, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyInt_As_npy_int64(__pyx_t_13); if (unlikely((__pyx_t_9 == ((npy_int64)-1)) && PyErr_Occurred())) __PYX_ERR(1, 508, __pyx_L1_error) __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __pyx_v_twin_index = __pyx_t_9; - /* "voronoi_dcel.pyx":518 + /* "src/voronoi_dcel.pyx":512 * ), -1) * * self.edges[edge_i, 4] = twin_index # <<<<<<<<<<<<<< * if twin_index == -1: * edge_indices[(site_verts[j], site_verts[(j+1) % vert_num])] = \ */ - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 518, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 512, __pyx_L1_error)} __pyx_t_9 = __pyx_v_edge_i; __pyx_t_26 = 4; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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; + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_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; - /* "voronoi_dcel.pyx":519 + /* "src/voronoi_dcel.pyx":513 * * self.edges[edge_i, 4] = twin_index * if twin_index == -1: # <<<<<<<<<<<<<< @@ -11975,17 +11964,17 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py __pyx_t_30 = ((__pyx_v_twin_index == -1LL) != 0); if (__pyx_t_30) { - /* "voronoi_dcel.pyx":521 + /* "src/voronoi_dcel.pyx":515 * if twin_index == -1: * edge_indices[(site_verts[j], site_verts[(j+1) % vert_num])] = \ * j + edge_offset # <<<<<<<<<<<<<< * else: * self.edges[twin_index, 4] = j + edge_offset */ - __pyx_t_13 = __Pyx_PyInt_From_npy_int64((__pyx_v_j + __pyx_v_edge_offset)); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 521, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyInt_From_npy_int64((__pyx_v_j + __pyx_v_edge_offset)); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 515, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - /* "voronoi_dcel.pyx":520 + /* "src/voronoi_dcel.pyx":514 * self.edges[edge_i, 4] = twin_index * if twin_index == -1: * edge_indices[(site_verts[j], site_verts[(j+1) % vert_num])] = \ # <<<<<<<<<<<<<< @@ -11993,12 +11982,12 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py * else: */ __pyx_t_9 = __pyx_v_j; - __pyx_t_4 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 520, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 514, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_9 = ((__pyx_v_j + 1) % __pyx_v_vert_num); - __pyx_t_3 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_12packsim_core_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 520, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_npy_int64((*__Pyx_BufPtrStrided1d(__pyx_t_8_packsim_INT_T *, __pyx_pybuffernd_site_verts.rcbuffer->pybuffer.buf, __pyx_t_9, __pyx_pybuffernd_site_verts.diminfo[0].strides))); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 514, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 520, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 514, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); @@ -12006,11 +11995,11 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_3); __pyx_t_4 = 0; __pyx_t_3 = 0; - if (unlikely(PyDict_SetItem(__pyx_v_edge_indices, __pyx_t_2, __pyx_t_13) < 0)) __PYX_ERR(1, 520, __pyx_L1_error) + if (unlikely(PyDict_SetItem(__pyx_v_edge_indices, __pyx_t_2, __pyx_t_13) < 0)) __PYX_ERR(1, 514, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - /* "voronoi_dcel.pyx":519 + /* "src/voronoi_dcel.pyx":513 * * self.edges[edge_i, 4] = twin_index * if twin_index == -1: # <<<<<<<<<<<<<< @@ -12020,7 +12009,7 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py goto __pyx_L15; } - /* "voronoi_dcel.pyx":523 + /* "src/voronoi_dcel.pyx":517 * j + edge_offset * else: * self.edges[twin_index, 4] = j + edge_offset # <<<<<<<<<<<<<< @@ -12028,30 +12017,30 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py * self.site_cache = np.empty((self.n + border_num, 5), dtype=FLOAT) */ /*else*/ { - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 523, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 517, __pyx_L1_error)} __pyx_t_9 = __pyx_v_twin_index; __pyx_t_26 = 4; - *((__pyx_t_12packsim_core_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_edge_offset); + *((__pyx_t_8_packsim_INT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_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_edge_offset); } __pyx_L15:; } } - /* "voronoi_dcel.pyx":525 + /* "src/voronoi_dcel.pyx":519 * self.edges[twin_index, 4] = j + edge_offset * * 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) * */ - __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_np); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 525, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_13, __pyx_n_s_np); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 525, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_13, __pyx_n_s_empty); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; - __pyx_t_13 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + __pyx_v_border_num)); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 525, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyInt_From_npy_int64((__pyx_v_self->n + __pyx_v_border_num)); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 525, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(2); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_13); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_13); @@ -12059,46 +12048,46 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py __Pyx_GIVEREF(__pyx_int_5); PyTuple_SET_ITEM(__pyx_t_3, 1, __pyx_int_5); __pyx_t_13 = 0; - __pyx_t_13 = PyTuple_New(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 525, __pyx_L1_error) + __pyx_t_13 = PyTuple_New(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 525, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 525, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 525, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_3, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_13, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 525, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_13, __pyx_t_3); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_39 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_39.memview)) __PYX_ERR(1, 525, __pyx_L1_error) + __pyx_t_39 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_39.memview)) __PYX_ERR(1, 519, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __PYX_XDEC_MEMVIEW(&__pyx_v_self->site_cache, 0); __pyx_v_self->site_cache = __pyx_t_39; __pyx_t_39.memview = NULL; __pyx_t_39.data = NULL; - /* "voronoi_dcel.pyx":526 + /* "src/voronoi_dcel.pyx":520 * * 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) # <<<<<<<<<<<<<< * * */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 526, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_empty); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_edge_count); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_edge_count); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_13 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->edge_cache_map->size); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_13 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->edge_cache_map->size); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); - __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_2, 0, __pyx_t_4); @@ -12106,30 +12095,30 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py PyTuple_SET_ITEM(__pyx_t_2, 1, __pyx_t_13); __pyx_t_4 = 0; __pyx_t_13 = 0; - __pyx_t_13 = PyTuple_New(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_13 = PyTuple_New(1); if (unlikely(!__pyx_t_13)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_13); __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_13, 0, __pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 526, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 526, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_2, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_13, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_13, __pyx_t_2); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_13); __pyx_t_13 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_39 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_39.memview)) __PYX_ERR(1, 526, __pyx_L1_error) + __pyx_t_39 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_39.memview)) __PYX_ERR(1, 520, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __PYX_XDEC_MEMVIEW(&__pyx_v_self->edge_cache, 0); __pyx_v_self->edge_cache = __pyx_t_39; __pyx_t_39.memview = NULL; __pyx_t_39.data = NULL; - /* "voronoi_dcel.pyx":440 + /* "src/voronoi_dcel.pyx":434 * * * cdef void generate_dcel(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -12167,7 +12156,7 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_site_verts.rcbuffer->pybuffer); __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_vert_indices_np.rcbuffer->pybuffer); __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);} - __Pyx_AddTraceback("packsim_core.VoronoiContainer.generate_dcel", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.generate_dcel", __pyx_clineno, __pyx_lineno, __pyx_filename); goto __pyx_L2; __pyx_L0:; __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_border_sites.rcbuffer->pybuffer); @@ -12186,7 +12175,7 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py __Pyx_RefNannyFinishContext(); } -/* "voronoi_dcel.pyx":529 +/* "src/voronoi_dcel.pyx":523 * * * cdef void common_cache(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -12194,22 +12183,22 @@ __pyx_t_30 = ((!(__pyx_f_12packsim_core_16VoronoiContainer_sign(__pyx_t_35, __py * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) */ -static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { - __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; - __pyx_t_12packsim_core_Site __pyx_v_xi; - __pyx_t_12packsim_core_HalfEdge __pyx_v_em; - __pyx_t_12packsim_core_HalfEdge __pyx_v_ep; - __pyx_t_12packsim_core_Vector2D __pyx_v_p; - __pyx_t_12packsim_core_Vector2D __pyx_v_q; - __pyx_t_12packsim_core_Vector2D __pyx_v_la; - __pyx_t_12packsim_core_Vector2D __pyx_v_da; - __pyx_t_12packsim_core_Vector2D __pyx_v_Rla; +static void __pyx_f_8_packsim_16VoronoiContainer_common_cache(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { + __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; + __pyx_t_8_packsim_Site __pyx_v_xi; + __pyx_t_8_packsim_HalfEdge __pyx_v_em; + __pyx_t_8_packsim_HalfEdge __pyx_v_ep; + __pyx_t_8_packsim_Vector2D __pyx_v_p; + __pyx_t_8_packsim_Vector2D __pyx_v_q; + __pyx_t_8_packsim_Vector2D __pyx_v_la; + __pyx_t_8_packsim_Vector2D __pyx_v_da; + __pyx_t_8_packsim_Vector2D __pyx_v_Rla; __Pyx_memviewslice __pyx_v_area = { 0, 0, { 0 }, { 0 }, { 0 } }; __Pyx_memviewslice __pyx_v_perim = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_INT_T __pyx_v_i; - CYTHON_UNUSED __pyx_t_12packsim_core_INT_T __pyx_v_j; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_e_area; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_la_mag; + __pyx_t_8_packsim_INT_T __pyx_v_i; + CYTHON_UNUSED __pyx_t_8_packsim_INT_T __pyx_v_j; + __pyx_t_8_packsim_FLOAT_T __pyx_v_e_area; + __pyx_t_8_packsim_FLOAT_T __pyx_v_la_mag; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; @@ -12217,126 +12206,126 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ PyObject *__pyx_t_4 = NULL; __Pyx_memviewslice __pyx_t_5 = { 0, 0, { 0 }, { 0 }, { 0 } }; Py_ssize_t __pyx_t_6; - __pyx_t_12packsim_core_INT_T __pyx_t_7; - __pyx_t_12packsim_core_INT_T __pyx_t_8; - __pyx_t_12packsim_core_INT_T __pyx_t_9; - __pyx_t_12packsim_core_INT_T __pyx_t_10; - __pyx_t_12packsim_core_INT_T __pyx_t_11; - __pyx_t_12packsim_core_Vector2D __pyx_t_12; - __pyx_t_12packsim_core_Vector2D __pyx_t_13; + __pyx_t_8_packsim_INT_T __pyx_t_7; + __pyx_t_8_packsim_INT_T __pyx_t_8; + __pyx_t_8_packsim_INT_T __pyx_t_9; + __pyx_t_8_packsim_INT_T __pyx_t_10; + __pyx_t_8_packsim_INT_T __pyx_t_11; + __pyx_t_8_packsim_Vector2D __pyx_t_12; + __pyx_t_8_packsim_Vector2D __pyx_t_13; int __pyx_t_14; - __pyx_t_12packsim_core_INT_T __pyx_t_15; + __pyx_t_8_packsim_INT_T __pyx_t_15; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("common_cache", 0); - /* "voronoi_dcel.pyx":530 + /* "src/voronoi_dcel.pyx":524 * * 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) * */ - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 530, __pyx_L1_error)} - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 530, __pyx_L1_error)} - if (unlikely(!__pyx_v_self->points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 530, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 524, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 524, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 524, __pyx_L1_error)} - /* "voronoi_dcel.pyx":531 + /* "src/voronoi_dcel.pyx":525 * 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) # <<<<<<<<<<<<<< * * cdef Site xi */ - if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 531, __pyx_L1_error)} - if (unlikely(!__pyx_v_self->site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 531, __pyx_L1_error)} - if (unlikely(!__pyx_v_self->edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 531, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->vertices.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 525, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 525, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 525, __pyx_L1_error)} - /* "voronoi_dcel.pyx":530 + /* "src/voronoi_dcel.pyx":524 * * 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) * */ - __pyx_v_info = __pyx_v_12packsim_core_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); + __pyx_v_info = __pyx_v_8_packsim_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); - /* "voronoi_dcel.pyx":537 + /* "src/voronoi_dcel.pyx":531 * cdef Vector2D p, q, la, da, Rla * * cdef FLOAT_T [:] area = np.zeros(self.sites.shape[0], dtype=FLOAT) # <<<<<<<<<<<<<< * cdef FLOAT_T [:] perim = np.zeros(self.sites.shape[0], dtype=FLOAT) * */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 537, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_zeros); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 537, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_zeros); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 537, __pyx_L1_error)} - __pyx_t_1 = PyInt_FromSsize_t((__pyx_v_self->sites.shape[0])); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 537, __pyx_L1_error) + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 531, __pyx_L1_error)} + __pyx_t_1 = PyInt_FromSsize_t((__pyx_v_self->sites.shape[0])); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 537, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 537, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 537, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 537, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 537, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(1, 537, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(1, 531, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_v_area = __pyx_t_5; __pyx_t_5.memview = NULL; __pyx_t_5.data = NULL; - /* "voronoi_dcel.pyx":538 + /* "src/voronoi_dcel.pyx":532 * * cdef FLOAT_T [:] area = np.zeros(self.sites.shape[0], dtype=FLOAT) * cdef FLOAT_T [:] perim = np.zeros(self.sites.shape[0], dtype=FLOAT) # <<<<<<<<<<<<<< * * cdef INT_T i, j */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 538, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_zeros); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 538, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_zeros); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 538, __pyx_L1_error)} - __pyx_t_4 = PyInt_FromSsize_t((__pyx_v_self->sites.shape[0])); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 538, __pyx_L1_error) + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 532, __pyx_L1_error)} + __pyx_t_4 = PyInt_FromSsize_t((__pyx_v_self->sites.shape[0])); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 538, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 538, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 538, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(1, 538, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_4, __pyx_n_s_dtype, __pyx_t_2) < 0) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 538, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_Call(__pyx_t_1, __pyx_t_3, __pyx_t_4); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_2, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(1, 538, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_2, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(1, 532, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __pyx_v_perim = __pyx_t_5; __pyx_t_5.memview = NULL; __pyx_t_5.data = NULL; - /* "voronoi_dcel.pyx":542 + /* "src/voronoi_dcel.pyx":536 * cdef INT_T i, j * cdef FLOAT_T e_area, la_mag * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -12350,7 +12339,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ __Pyx_FastGIL_Remember(); #endif /*try:*/ { - if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 542, __pyx_L4_error)} + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 536, __pyx_L4_error)} __pyx_t_6 = (__pyx_v_self->sites.shape[0]); if ((1 == 0)) abort(); { @@ -12372,22 +12361,22 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ #endif /* _OPENMP */ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_8; __pyx_t_7++){ { - __pyx_v_i = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_7); + __pyx_v_i = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_7); /* Initialize private variables to invalid values */ - __pyx_v_e_area = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_j = ((__pyx_t_12packsim_core_INT_T)0xbad0bad0); - __pyx_v_la_mag = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); + __pyx_v_e_area = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_j = ((__pyx_t_8_packsim_INT_T)0xbad0bad0); + __pyx_v_la_mag = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); - /* "voronoi_dcel.pyx":543 + /* "src/voronoi_dcel.pyx":537 * 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)): */ - __pyx_v_xi = __pyx_v_12packsim_core_init.Site(__pyx_v_i, (&__pyx_v_info)); + __pyx_v_xi = __pyx_v_8_packsim_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "voronoi_dcel.pyx":544 + /* "src/voronoi_dcel.pyx":538 * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) * em = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -12396,7 +12385,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ __pyx_v_em = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "voronoi_dcel.pyx":545 + /* "src/voronoi_dcel.pyx":539 * xi = init.Site(i, &info) * em = xi.edge(&xi) * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< @@ -12418,12 +12407,12 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ #endif /* _OPENMP */ for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_11; __pyx_t_10++){ { - __pyx_v_j = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_10); + __pyx_v_j = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_10); /* Initialize private variables to invalid values */ - __pyx_v_e_area = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_la_mag = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); + __pyx_v_e_area = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_la_mag = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); - /* "voronoi_dcel.pyx":546 + /* "src/voronoi_dcel.pyx":540 * em = xi.edge(&xi) * for j in prange(xi.edge_num(&xi)): * ep = em.next(&em) # <<<<<<<<<<<<<< @@ -12432,7 +12421,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ __pyx_v_ep = __pyx_v_em.next((&__pyx_v_em)); - /* "voronoi_dcel.pyx":547 + /* "src/voronoi_dcel.pyx":541 * for j in prange(xi.edge_num(&xi)): * ep = em.next(&em) * p, q = em.origin(&em), ep.origin(&ep) # <<<<<<<<<<<<<< @@ -12444,7 +12433,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ __pyx_v_p = __pyx_t_12; __pyx_v_q = __pyx_t_13; - /* "voronoi_dcel.pyx":548 + /* "src/voronoi_dcel.pyx":542 * 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 # <<<<<<<<<<<<<< @@ -12456,7 +12445,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ __pyx_v_la = __pyx_t_13; __pyx_v_da = __pyx_t_12; - /* "voronoi_dcel.pyx":550 + /* "src/voronoi_dcel.pyx":544 * la, da = q.copy.vsub(&q, p), p.copy.vsub(&p, xi.vec(&xi)) # vp - vm, vm - xi * * la_mag = la.mag(&la) # <<<<<<<<<<<<<< @@ -12465,7 +12454,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ __pyx_v_la_mag = __pyx_v_la.mag((&__pyx_v_la)); - /* "voronoi_dcel.pyx":551 + /* "src/voronoi_dcel.pyx":545 * * la_mag = la.mag(&la) * e_area = la.dot(&la, da.rot(&da)) # <<<<<<<<<<<<<< @@ -12474,7 +12463,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ __pyx_v_e_area = __pyx_v_la.dot((&__pyx_v_la), __pyx_v_da.rot((&__pyx_v_da))); - /* "voronoi_dcel.pyx":552 + /* "src/voronoi_dcel.pyx":546 * la_mag = la.mag(&la) * e_area = la.dot(&la, da.rot(&da)) * Rla = la.rot(&la) # <<<<<<<<<<<<<< @@ -12483,7 +12472,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ __pyx_v_Rla = __pyx_v_la.rot((&__pyx_v_la)); - /* "voronoi_dcel.pyx":554 + /* "src/voronoi_dcel.pyx":548 * Rla = la.rot(&la) * * em.cache.la(&em, la) # <<<<<<<<<<<<<< @@ -12492,7 +12481,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ (void)(__pyx_v_em.cache->la((&__pyx_v_em), __pyx_v_la)); - /* "voronoi_dcel.pyx":555 + /* "src/voronoi_dcel.pyx":549 * * em.cache.la(&em, la) * em.cache.la_mag(&em, la_mag) # <<<<<<<<<<<<<< @@ -12501,7 +12490,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ (void)(__pyx_v_em.cache->la_mag((&__pyx_v_em), __pyx_v_la_mag)); - /* "voronoi_dcel.pyx":556 + /* "src/voronoi_dcel.pyx":550 * em.cache.la(&em, la) * em.cache.la_mag(&em, la_mag) * em.cache.da(&em, da) # <<<<<<<<<<<<<< @@ -12510,7 +12499,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ (void)(__pyx_v_em.cache->da((&__pyx_v_em), __pyx_v_da)); - /* "voronoi_dcel.pyx":557 + /* "src/voronoi_dcel.pyx":551 * em.cache.la_mag(&em, la_mag) * em.cache.da(&em, da) * em.cache.da_mag(&em, da.mag(&da)) # <<<<<<<<<<<<<< @@ -12519,7 +12508,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ (void)(__pyx_v_em.cache->da_mag((&__pyx_v_em), __pyx_v_da.mag((&__pyx_v_da)))); - /* "voronoi_dcel.pyx":558 + /* "src/voronoi_dcel.pyx":552 * 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))) # <<<<<<<<<<<<<< @@ -12528,7 +12517,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ (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))))); - /* "voronoi_dcel.pyx":560 + /* "src/voronoi_dcel.pyx":554 * em.cache.xij(&em, Rla.copy.smul(&Rla, -e_area/la.dot(&la, la))) * * if info.edge_cache_map.iF != -1: # <<<<<<<<<<<<<< @@ -12538,7 +12527,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ __pyx_t_14 = ((__pyx_v_info.edge_cache_map->iF != -1LL) != 0); if (__pyx_t_14) { - /* "voronoi_dcel.pyx":561 + /* "src/voronoi_dcel.pyx":555 * * if info.edge_cache_map.iF != -1: * em.cache.F(&em, e_area) # <<<<<<<<<<<<<< @@ -12547,7 +12536,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ (void)(__pyx_v_em.cache->F((&__pyx_v_em), __pyx_v_e_area)); - /* "voronoi_dcel.pyx":560 + /* "src/voronoi_dcel.pyx":554 * em.cache.xij(&em, Rla.copy.smul(&Rla, -e_area/la.dot(&la, la))) * * if info.edge_cache_map.iF != -1: # <<<<<<<<<<<<<< @@ -12556,7 +12545,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ */ } - /* "voronoi_dcel.pyx":563 + /* "src/voronoi_dcel.pyx":557 * em.cache.F(&em, e_area) * * area[i] += e_area # <<<<<<<<<<<<<< @@ -12564,9 +12553,9 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ * */ __pyx_t_15 = __pyx_v_i; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_15 * __pyx_v_area.strides[0]) )) += __pyx_v_e_area; + *((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_15 * __pyx_v_area.strides[0]) )) += __pyx_v_e_area; - /* "voronoi_dcel.pyx":564 + /* "src/voronoi_dcel.pyx":558 * * area[i] += e_area * perim[i] += la_mag # <<<<<<<<<<<<<< @@ -12574,9 +12563,9 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ * em = em.next(&em) */ __pyx_t_15 = __pyx_v_i; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_15 * __pyx_v_perim.strides[0]) )) += __pyx_v_la_mag; + *((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_15 * __pyx_v_perim.strides[0]) )) += __pyx_v_la_mag; - /* "voronoi_dcel.pyx":566 + /* "src/voronoi_dcel.pyx":560 * perim[i] += la_mag * * em = em.next(&em) # <<<<<<<<<<<<<< @@ -12590,7 +12579,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ } } - /* "voronoi_dcel.pyx":568 + /* "src/voronoi_dcel.pyx":562 * em = em.next(&em) * * xi.cache.area(&xi, area[i]/2) # <<<<<<<<<<<<<< @@ -12598,9 +12587,9 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ * 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_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_11 * __pyx_v_area.strides[0]) ))) / 2.0))); + (void)(__pyx_v_xi.cache->area((&__pyx_v_xi), ((*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_11 * __pyx_v_area.strides[0]) ))) / 2.0))); - /* "voronoi_dcel.pyx":569 + /* "src/voronoi_dcel.pyx":563 * * xi.cache.area(&xi, area[i]/2) * xi.cache.perim(&xi, perim[i]) # <<<<<<<<<<<<<< @@ -12608,9 +12597,9 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ * */ __pyx_t_11 = __pyx_v_i; - (void)(__pyx_v_xi.cache->perim((&__pyx_v_xi), (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_11 * __pyx_v_perim.strides[0]) ))))); + (void)(__pyx_v_xi.cache->perim((&__pyx_v_xi), (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_11 * __pyx_v_perim.strides[0]) ))))); - /* "voronoi_dcel.pyx":570 + /* "src/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])) # <<<<<<<<<<<<<< @@ -12620,7 +12609,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ __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_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_11 * __pyx_v_area.strides[0]) )))) / ((*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_10 * __pyx_v_perim.strides[0]) ))) * (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_9 * __pyx_v_perim.strides[0]) ))))))); + (void)(__pyx_v_xi.cache->isoparam((&__pyx_v_xi), (((2.0 * M_PI) * (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_area.data + __pyx_t_11 * __pyx_v_area.strides[0]) )))) / ((*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_10 * __pyx_v_perim.strides[0]) ))) * (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_perim.data + __pyx_t_9 * __pyx_v_perim.strides[0]) ))))))); } } } @@ -12634,7 +12623,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ #endif } - /* "voronoi_dcel.pyx":542 + /* "src/voronoi_dcel.pyx":536 * cdef INT_T i, j * cdef FLOAT_T e_area, la_mag * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -12660,7 +12649,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ } } - /* "voronoi_dcel.pyx":529 + /* "src/voronoi_dcel.pyx":523 * * * cdef void common_cache(VoronoiContainer self) except *: # <<<<<<<<<<<<<< @@ -12676,14 +12665,14 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __PYX_XDEC_MEMVIEW(&__pyx_t_5, 1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.common_cache", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.common_cache", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __PYX_XDEC_MEMVIEW(&__pyx_v_area, 1); __PYX_XDEC_MEMVIEW(&__pyx_v_perim, 1); __Pyx_RefNannyFinishContext(); } -/* "voronoi_dcel.pyx":574 +/* "src/voronoi_dcel.pyx":568 * * @staticmethod * cdef inline Matrix2x2 calc_H(HalfEdge em, HalfEdge ep) nogil: # <<<<<<<<<<<<<< @@ -12691,37 +12680,37 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_common_cache(struct __pyx_ * cdef Matrix2x2 h */ -static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16VoronoiContainer_calc_H(__pyx_t_12packsim_core_HalfEdge __pyx_v_em, __pyx_t_12packsim_core_HalfEdge __pyx_v_ep) { - __pyx_t_12packsim_core_Vector2D __pyx_v_xmv; - __pyx_t_12packsim_core_Vector2D __pyx_v_xpv; - __pyx_t_12packsim_core_Vector2D __pyx_v_im; - __pyx_t_12packsim_core_Vector2D __pyx_v_mp; - __pyx_t_12packsim_core_Vector2D __pyx_v_right; - __pyx_t_12packsim_core_Vector2D __pyx_v_Rpm; - __pyx_t_12packsim_core_Vector2D __pyx_v_Rim; - __pyx_t_12packsim_core_Vector2D __pyx_v_f; - __pyx_t_12packsim_core_Matrix2x2 __pyx_v_h; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_im2; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_mp2; - __pyx_t_12packsim_core_Matrix2x2 __pyx_r; - __pyx_t_12packsim_core_Vector2D __pyx_t_1; - __pyx_t_12packsim_core_Vector2D __pyx_t_2; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_3; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_4; +static CYTHON_INLINE __pyx_t_8_packsim_Matrix2x2 __pyx_f_8_packsim_16VoronoiContainer_calc_H(__pyx_t_8_packsim_HalfEdge __pyx_v_em, __pyx_t_8_packsim_HalfEdge __pyx_v_ep) { + __pyx_t_8_packsim_Vector2D __pyx_v_xmv; + __pyx_t_8_packsim_Vector2D __pyx_v_xpv; + __pyx_t_8_packsim_Vector2D __pyx_v_im; + __pyx_t_8_packsim_Vector2D __pyx_v_mp; + __pyx_t_8_packsim_Vector2D __pyx_v_right; + __pyx_t_8_packsim_Vector2D __pyx_v_Rpm; + __pyx_t_8_packsim_Vector2D __pyx_v_Rim; + __pyx_t_8_packsim_Vector2D __pyx_v_f; + __pyx_t_8_packsim_Matrix2x2 __pyx_v_h; + __pyx_t_8_packsim_FLOAT_T __pyx_v_im2; + __pyx_t_8_packsim_FLOAT_T __pyx_v_mp2; + __pyx_t_8_packsim_Matrix2x2 __pyx_r; + __pyx_t_8_packsim_Vector2D __pyx_t_1; + __pyx_t_8_packsim_Vector2D __pyx_t_2; + __pyx_t_8_packsim_FLOAT_T __pyx_t_3; + __pyx_t_8_packsim_FLOAT_T __pyx_t_4; - /* "voronoi_dcel.pyx":580 + /* "src/voronoi_dcel.pyx":574 * * # 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 * im2, mp2 = -(xmv.dot(&xmv, xmv)), xmv.dot(&xmv, xmv) - xpv.dot(&xpv, xpv) */ - __pyx_t_1 = __pyx_v_em.cache->xij((&__pyx_v_em), __pyx_v_12packsim_core_NAN_VECTOR); - __pyx_t_2 = __pyx_v_ep.cache->xij((&__pyx_v_ep), __pyx_v_12packsim_core_NAN_VECTOR); + __pyx_t_1 = __pyx_v_em.cache->xij((&__pyx_v_em), __pyx_v_8_packsim_NAN_VECTOR); + __pyx_t_2 = __pyx_v_ep.cache->xij((&__pyx_v_ep), __pyx_v_8_packsim_NAN_VECTOR); __pyx_v_xmv = __pyx_t_1; __pyx_v_xpv = __pyx_t_2; - /* "voronoi_dcel.pyx":581 + /* "src/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) * im, mp = xmv.copy.neg(&xmv), xmv.copy.vsub(&xmv, xpv) # -xmv, xmv - xpv # <<<<<<<<<<<<<< @@ -12733,7 +12722,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16V __pyx_v_im = __pyx_t_2; __pyx_v_mp = __pyx_t_1; - /* "voronoi_dcel.pyx":582 + /* "src/voronoi_dcel.pyx":576 * 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) # <<<<<<<<<<<<<< @@ -12745,37 +12734,37 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16V __pyx_v_im2 = __pyx_t_3; __pyx_v_mp2 = __pyx_t_4; - /* "voronoi_dcel.pyx":584 + /* "src/voronoi_dcel.pyx":578 * 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) # <<<<<<<<<<<<<< * Rpm, Rim = R.vecmul(&R, mp.copy.neg(&mp)), im.rot(&im) # R*-mp, R*im * */ - __pyx_v_right = __pyx_v_12packsim_core_init.Vector2D(__pyx_v_im2, __pyx_v_mp2); + __pyx_v_right = __pyx_v_8_packsim_init.Vector2D(__pyx_v_im2, __pyx_v_mp2); - /* "voronoi_dcel.pyx":585 + /* "src/voronoi_dcel.pyx":579 * # (-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 # <<<<<<<<<<<<<< * * h = init.Matrix2x2(Rpm.x, Rim.x, Rpm.y, Rim.y) # [Rpm | Rim], h is temporary. */ - __pyx_t_1 = __pyx_v_12packsim_core_R.vecmul((&__pyx_v_12packsim_core_R), __pyx_v_mp.copy.neg((&__pyx_v_mp))); + __pyx_t_1 = __pyx_v_8_packsim_R.vecmul((&__pyx_v_8_packsim_R), __pyx_v_mp.copy.neg((&__pyx_v_mp))); __pyx_t_2 = __pyx_v_im.rot((&__pyx_v_im)); __pyx_v_Rpm = __pyx_t_1; __pyx_v_Rim = __pyx_t_2; - /* "voronoi_dcel.pyx":587 + /* "src/voronoi_dcel.pyx":581 * 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. # <<<<<<<<<<<<<< * 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. */ - __pyx_v_h = __pyx_v_12packsim_core_init.Matrix2x2(__pyx_v_Rpm.x, __pyx_v_Rim.x, __pyx_v_Rpm.y, __pyx_v_Rim.y); + __pyx_v_h = __pyx_v_8_packsim_init.Matrix2x2(__pyx_v_Rpm.x, __pyx_v_Rim.x, __pyx_v_Rpm.y, __pyx_v_Rim.y); - /* "voronoi_dcel.pyx":588 + /* "src/voronoi_dcel.pyx":582 * * h = init.Matrix2x2(Rpm.x, Rim.x, Rpm.y, Rim.y) # [Rpm | Rim], h is temporary. * f = h.vecmul(&h, right) # [Rpm | Rim]*right # <<<<<<<<<<<<<< @@ -12784,25 +12773,25 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16V */ __pyx_v_f = __pyx_v_h.vecmul((&__pyx_v_h), __pyx_v_right); - /* "voronoi_dcel.pyx":589 + /* "src/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 * 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( */ - __pyx_v_h = __pyx_v_12packsim_core_R.copy.smul((&__pyx_v_12packsim_core_R), (__pyx_v_mp2 * (2.0 * __pyx_v_mp.dot((&__pyx_v_mp), __pyx_v_Rim)))); + __pyx_v_h = __pyx_v_8_packsim_R.copy.smul((&__pyx_v_8_packsim_R), (__pyx_v_mp2 * (2.0 * __pyx_v_mp.dot((&__pyx_v_mp), __pyx_v_Rim)))); - /* "voronoi_dcel.pyx":591 + /* "src/voronoi_dcel.pyx":585 * 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( # <<<<<<<<<<<<<< * f.x*2*Rpm.x, f.x*2*Rpm.y, f.y*2*Rpm.x, f.y*2*Rpm.y * )) */ - (void)(__pyx_v_h.self.msub((&__pyx_v_h), __pyx_v_12packsim_core_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)))); + (void)(__pyx_v_h.self.msub((&__pyx_v_h), __pyx_v_8_packsim_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)))); - /* "voronoi_dcel.pyx":594 + /* "src/voronoi_dcel.pyx":588 * 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) # <<<<<<<<<<<<<< @@ -12811,7 +12800,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16V */ (void)(__pyx_v_h.self.sdiv((&__pyx_v_h), pow((2.0 * __pyx_v_mp.dot((&__pyx_v_mp), __pyx_v_Rim)), 2.0))); - /* "voronoi_dcel.pyx":596 + /* "src/voronoi_dcel.pyx":590 * h.self.sdiv(&h, (2*mp.dot(&mp, Rim))**2) * * return h # <<<<<<<<<<<<<< @@ -12821,7 +12810,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16V __pyx_r = __pyx_v_h; goto __pyx_L0; - /* "voronoi_dcel.pyx":574 + /* "src/voronoi_dcel.pyx":568 * * @staticmethod * cdef inline Matrix2x2 calc_H(HalfEdge em, HalfEdge ep) nogil: # <<<<<<<<<<<<<< @@ -12834,7 +12823,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16V return __pyx_r; } -/* "voronoi_dcel.pyx":600 +/* "src/voronoi_dcel.pyx":594 * * @staticmethod * cdef inline bint sign(FLOAT_T [::1] ref, FLOAT_T [::1] p, FLOAT_T [::1] q): # <<<<<<<<<<<<<< @@ -12842,7 +12831,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Matrix2x2 __pyx_f_12packsim_core_16V * Outputs if p2 - self is counterclockwise of p1 - self. */ -static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_memviewslice __pyx_v_ref, __Pyx_memviewslice __pyx_v_p, __Pyx_memviewslice __pyx_v_q) { +static CYTHON_INLINE int __pyx_f_8_packsim_16VoronoiContainer_sign(__Pyx_memviewslice __pyx_v_ref, __Pyx_memviewslice __pyx_v_p, __Pyx_memviewslice __pyx_v_q) { int __pyx_r; __Pyx_RefNannyDeclarations Py_ssize_t __pyx_t_1; @@ -12855,7 +12844,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_me Py_ssize_t __pyx_t_8; __Pyx_RefNannySetupContext("sign", 0); - /* "voronoi_dcel.pyx":607 + /* "src/voronoi_dcel.pyx":601 * :return: [bool] returns if counterclockwise. * """ * return ((q[0] - ref[0])*-(p[1] - ref[1]) + \ # <<<<<<<<<<<<<< @@ -12867,7 +12856,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_me __pyx_t_3 = 1; __pyx_t_4 = 1; - /* "voronoi_dcel.pyx":608 + /* "src/voronoi_dcel.pyx":602 * """ * return ((q[0] - ref[0])*-(p[1] - ref[1]) + \ * (q[1] - ref[1])*(p[0] - ref[0])) >= 0 # <<<<<<<<<<<<<< @@ -12879,17 +12868,17 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_me __pyx_t_7 = 0; __pyx_t_8 = 0; - /* "voronoi_dcel.pyx":607 + /* "src/voronoi_dcel.pyx":601 * :return: [bool] returns if counterclockwise. * """ * return ((q[0] - ref[0])*-(p[1] - ref[1]) + \ # <<<<<<<<<<<<<< * (q[1] - ref[1])*(p[0] - ref[0])) >= 0 * */ - __pyx_r = (((((*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_q.data) + __pyx_t_1)) ))) - (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_2)) )))) * (-((*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_p.data) + __pyx_t_3)) ))) - (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_4)) )))))) + (((*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_q.data) + __pyx_t_5)) ))) - (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_6)) )))) * ((*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_p.data) + __pyx_t_7)) ))) - (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_12packsim_core_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_8)) )))))) >= 0.0); + __pyx_r = (((((*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_q.data) + __pyx_t_1)) ))) - (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_2)) )))) * (-((*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_p.data) + __pyx_t_3)) ))) - (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_4)) )))))) + (((*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_q.data) + __pyx_t_5)) ))) - (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_6)) )))) * ((*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_p.data) + __pyx_t_7)) ))) - (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) __pyx_v_ref.data) + __pyx_t_8)) )))))) >= 0.0); goto __pyx_L0; - /* "voronoi_dcel.pyx":600 + /* "src/voronoi_dcel.pyx":594 * * @staticmethod * cdef inline bint sign(FLOAT_T [::1] ref, FLOAT_T [::1] p, FLOAT_T [::1] q): # <<<<<<<<<<<<<< @@ -12903,7 +12892,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_me return __pyx_r; } -/* "voronoi_dcel.pyx":614 +/* "src/voronoi_dcel.pyx":608 * # return (q - ref).dot(rot.dot(p - ref)) >= 0 * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -12911,7 +12900,7 @@ static CYTHON_INLINE int __pyx_f_12packsim_core_16VoronoiContainer_sign(__Pyx_me * */ -static void __pyx_f_12packsim_core_16VoronoiContainer_precompute(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static void __pyx_f_8_packsim_16VoronoiContainer_precompute(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("precompute", 0); @@ -12919,7 +12908,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_precompute(CYTHON_UNUSED s __Pyx_RefNannyFinishContext(); } -/* "voronoi_dcel.pyx":617 +/* "src/voronoi_dcel.pyx":611 * pass * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -12927,7 +12916,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_precompute(CYTHON_UNUSED s * */ -static void __pyx_f_12packsim_core_16VoronoiContainer_calc_grad(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static void __pyx_f_8_packsim_16VoronoiContainer_calc_grad(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("calc_grad", 0); @@ -12935,7 +12924,7 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calc_grad(CYTHON_UNUSED st __Pyx_RefNannyFinishContext(); } -/* "voronoi_dcel.pyx":620 +/* "src/voronoi_dcel.pyx":614 * pass * * cdef void get_statistics(self) except *: # <<<<<<<<<<<<<< @@ -12943,10 +12932,8 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_calc_grad(CYTHON_UNUSED st * cache = self.site_cache[:self.n, :] */ -static void __pyx_f_12packsim_core_16VoronoiContainer_get_statistics(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static void __pyx_f_8_packsim_16VoronoiContainer_get_statistics(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_v_cache = NULL; - PyObject *__pyx_v_edge_count = NULL; - __pyx_t_12packsim_core_INT_T __pyx_v_i; PyObject *__pyx_v_edges = NULL; PyObject *__pyx_v_mask = NULL; PyObject *__pyx_v_all_edges = NULL; @@ -12959,35 +12946,32 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_get_statistics(struct __py PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; PyObject *__pyx_t_6 = NULL; - __pyx_t_12packsim_core_INT_T __pyx_t_7; - __pyx_t_12packsim_core_INT_T __pyx_t_8; - __pyx_t_12packsim_core_INT_T __pyx_t_9; - Py_ssize_t __pyx_t_10; + __Pyx_memviewslice __pyx_t_7 = { 0, 0, { 0 }, { 0 }, { 0 } }; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("get_statistics", 0); - /* "voronoi_dcel.pyx":621 + /* "src/voronoi_dcel.pyx":615 * * cdef void get_statistics(self) except *: * self.stats = {} # <<<<<<<<<<<<<< * cache = self.site_cache[:self.n, :] * */ - __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 621, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 615, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats, __pyx_t_1) < 0) __PYX_ERR(1, 621, __pyx_L1_error) + if (__Pyx_PyObject_SetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats, __pyx_t_1) < 0) __PYX_ERR(1, 615, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":622 + /* "src/voronoi_dcel.pyx":616 * cdef void get_statistics(self) except *: * self.stats = {} * cache = self.site_cache[:self.n, :] # <<<<<<<<<<<<<< * * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) */ - if (unlikely(!__pyx_v_self->site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 622, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 616, __pyx_L1_error)} __pyx_t_2.data = __pyx_v_self->site_cache.data; __pyx_t_2.memview = __pyx_v_self->site_cache.memview; __PYX_INC_MEMVIEW(&__pyx_t_2, 0); @@ -13006,14 +12990,14 @@ static void __pyx_f_12packsim_core_16VoronoiContainer_get_statistics(struct __py 0, 1) < 0)) { - __PYX_ERR(1, 622, __pyx_L1_error) + __PYX_ERR(1, 616, __pyx_L1_error) } __pyx_t_2.shape[1] = __pyx_v_self->site_cache.shape[1]; __pyx_t_2.strides[1] = __pyx_v_self->site_cache.strides[1]; __pyx_t_2.suboffsets[1] = -1; -__pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_FLOAT_T, 0);; if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 622, __pyx_L1_error) +__pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_FLOAT_T, 0);; if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 616, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __PYX_XDEC_MEMVIEW(&__pyx_t_2, 1); __pyx_t_2.memview = NULL; @@ -13021,21 +13005,21 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __pyx_v_cache = __pyx_t_1; __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":624 + /* "src/voronoi_dcel.pyx":618 * cache = self.site_cache[:self.n, :] * * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) # <<<<<<<<<<<<<< - * edge_count = np.empty((self.n,)) - * for i in range(self.n): + * self.stats["site_edge_count"] = np.asarray(self.sites[:self.n, 2]) + * */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 624, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_asarray); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 624, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_asarray); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_12packsim_core_SITE_CACHE_MAP.iarea); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 624, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_8_packsim_SITE_CACHE_MAP.iarea); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 624, __pyx_L1_error) + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_INCREF(__pyx_slice__2); __Pyx_GIVEREF(__pyx_slice__2); @@ -13043,7 +13027,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __Pyx_GIVEREF(__pyx_t_4); PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 624, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; __pyx_t_6 = NULL; @@ -13059,317 +13043,60 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_6, __pyx_t_4) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_4); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 624, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 624, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - if (unlikely(PyObject_SetItem(__pyx_t_5, __pyx_n_u_site_areas, __pyx_t_1) < 0)) __PYX_ERR(1, 624, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_5, __pyx_n_u_site_areas, __pyx_t_1) < 0)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":625 + /* "src/voronoi_dcel.pyx":619 * * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) - * edge_count = np.empty((self.n,)) # <<<<<<<<<<<<<< - * for i in range(self.n): - * edge_count[i] = len(self.vor_data.regions[self.vor_data.point_region[i]]) - */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 625, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_empty); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 625, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 625, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = PyTuple_New(1); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 625, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __Pyx_GIVEREF(__pyx_t_5); - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_t_5); - __pyx_t_5 = 0; - __pyx_t_5 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); - if (likely(__pyx_t_5)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); - __Pyx_INCREF(__pyx_t_5); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_4, function); - } - } - __pyx_t_1 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_t_6) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_6); - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 625, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_v_edge_count = __pyx_t_1; - __pyx_t_1 = 0; - - /* "voronoi_dcel.pyx":626 - * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) - * edge_count = np.empty((self.n,)) - * for i in range(self.n): # <<<<<<<<<<<<<< - * edge_count[i] = len(self.vor_data.regions[self.vor_data.point_region[i]]) - * self.stats["site_edge_count"] = edge_count - */ - __pyx_t_7 = __pyx_v_self->n; - __pyx_t_8 = __pyx_t_7; - for (__pyx_t_9 = 0; __pyx_t_9 < __pyx_t_8; __pyx_t_9+=1) { - __pyx_v_i = __pyx_t_9; - - /* "voronoi_dcel.pyx":627 - * edge_count = np.empty((self.n,)) - * for i in range(self.n): - * edge_count[i] = len(self.vor_data.regions[self.vor_data.point_region[i]]) # <<<<<<<<<<<<<< - * self.stats["site_edge_count"] = edge_count - * - */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_vor_data); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_regions); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_vor_data); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_point_region); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_GetItemInt(__pyx_t_6, __pyx_v_i, __pyx_t_12packsim_core_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_PyObject_GetItem(__pyx_t_4, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_10 = PyObject_Length(__pyx_t_6); if (unlikely(__pyx_t_10 == ((Py_ssize_t)-1))) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = PyInt_FromSsize_t(__pyx_t_10); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - if (unlikely(__Pyx_SetItemInt(__pyx_v_edge_count, __pyx_v_i, __pyx_t_6, __pyx_t_12packsim_core_INT_T, 1, __Pyx_PyInt_From_npy_int64, 0, 0, 0) < 0)) __PYX_ERR(1, 627, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - } - - /* "voronoi_dcel.pyx":628 - * for i in range(self.n): - * edge_count[i] = len(self.vor_data.regions[self.vor_data.point_region[i]]) - * self.stats["site_edge_count"] = edge_count # <<<<<<<<<<<<<< + * self.stats["site_edge_count"] = np.asarray(self.sites[:self.n, 2]) # <<<<<<<<<<<<<< * * self.stats["site_isos"] = np.asarray(cache[:, SITE_CACHE_MAP.iisoparam]) */ - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 628, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - if (unlikely(PyObject_SetItem(__pyx_t_6, __pyx_n_u_site_edge_count, __pyx_v_edge_count) < 0)) __PYX_ERR(1, 628, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - - /* "voronoi_dcel.pyx":630 - * self.stats["site_edge_count"] = edge_count - * - * 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]) - */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 630, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 630, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyInt_From_npy_int64(__pyx_v_12packsim_core_SITE_CACHE_MAP.iisoparam); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 630, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 630, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 619, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __Pyx_INCREF(__pyx_slice__2); - __Pyx_GIVEREF(__pyx_slice__2); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_slice__2); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 630, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); - if (likely(__pyx_t_5)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); - __Pyx_INCREF(__pyx_t_5); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_4, function); - } - } - __pyx_t_6 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_t_1) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_1); - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 630, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 630, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - if (unlikely(PyObject_SetItem(__pyx_t_4, __pyx_n_u_site_isos, __pyx_t_6) < 0)) __PYX_ERR(1, 630, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - - /* "voronoi_dcel.pyx":631 - * - * 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]) - * - */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 631, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_asarray); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 631, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_12packsim_core_SITE_CACHE_MAP.ienergy); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 631, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 631, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __Pyx_INCREF(__pyx_slice__2); - __Pyx_GIVEREF(__pyx_slice__2); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_slice__2); - __Pyx_GIVEREF(__pyx_t_4); - PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_4); - __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 631, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 619, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_1); - if (likely(__pyx_t_5)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); - __Pyx_INCREF(__pyx_t_5); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_1, function); - } - } - __pyx_t_6 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_t_4) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_4); - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 631, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 631, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - if (unlikely(PyObject_SetItem(__pyx_t_1, __pyx_n_u_site_energies, __pyx_t_6) < 0)) __PYX_ERR(1, 631, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + if (unlikely(!__pyx_v_self->sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 619, __pyx_L1_error)} + __pyx_t_7.data = __pyx_v_self->sites.data; + __pyx_t_7.memview = __pyx_v_self->sites.memview; + __PYX_INC_MEMVIEW(&__pyx_t_7, 0); + __pyx_t_3 = -1; + if (unlikely(__pyx_memoryview_slice_memviewslice( + &__pyx_t_7, + __pyx_v_self->sites.shape[0], __pyx_v_self->sites.strides[0], __pyx_v_self->sites.suboffsets[0], + 0, + 0, + &__pyx_t_3, + 0, + __pyx_v_self->n, + 0, + 0, + 1, + 0, + 1) < 0)) +{ + __PYX_ERR(1, 619, __pyx_L1_error) +} - /* "voronoi_dcel.pyx":632 - * 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]) # <<<<<<<<<<<<<< - * - * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ - */ - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyInt_From_npy_int64(__pyx_v_12packsim_core_SITE_CACHE_MAP.iavg_radius); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __Pyx_INCREF(__pyx_slice__2); - __Pyx_GIVEREF(__pyx_slice__2); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_slice__2); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) { - __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_4); - if (likely(__pyx_t_5)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); - __Pyx_INCREF(__pyx_t_5); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_4, function); - } - } - __pyx_t_6 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_5, __pyx_t_1) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_1); - __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - if (unlikely(PyObject_SetItem(__pyx_t_4, __pyx_n_u_avg_radius, __pyx_t_6) < 0)) __PYX_ERR(1, 632, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; +{ + Py_ssize_t __pyx_tmp_idx = 2; + Py_ssize_t __pyx_tmp_stride = __pyx_v_self->sites.strides[1]; + __pyx_t_7.data += __pyx_tmp_idx * __pyx_tmp_stride; +} - /* "voronoi_dcel.pyx":634 - * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) - * - * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ # <<<<<<<<<<<<<< - * (PI*self.stats["avg_radius"]**2) - * - */ - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 634, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __pyx_t_4 = __Pyx_PyObject_Dict_GetItem(__pyx_t_6, __pyx_n_u_site_areas); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 634, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - - /* "voronoi_dcel.pyx":635 - * - * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ - * (PI*self.stats["avg_radius"]**2) # <<<<<<<<<<<<<< - * - * edges = np.asarray(self.edges) - */ - __pyx_t_6 = PyFloat_FromDouble(M_PI); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 635, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 635, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_Dict_GetItem(__pyx_t_1, __pyx_n_u_avg_radius); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 635, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyNumber_Power(__pyx_t_5, __pyx_int_2, Py_None); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 635, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyNumber_Multiply(__pyx_t_6, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 635, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - - /* "voronoi_dcel.pyx":634 - * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) - * - * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ # <<<<<<<<<<<<<< - * (PI*self.stats["avg_radius"]**2) - * - */ - __pyx_t_1 = __Pyx_PyNumber_Divide(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 634, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 634, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - if (unlikely(PyObject_SetItem(__pyx_t_5, __pyx_n_u_isoparam_avg, __pyx_t_1) < 0)) __PYX_ERR(1, 634, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - - /* "voronoi_dcel.pyx":637 - * (PI*self.stats["avg_radius"]**2) - * - * edges = np.asarray(self.edges) # <<<<<<<<<<<<<< - * - * mask = np.nonzero(edges[:, 0] != -1)[0] - */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 637, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 637, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 637, __pyx_L1_error)} - __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_v_self->edges, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_INT_T, 0);; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 637, __pyx_L1_error) +__pyx_t_5 = __pyx_memoryview_fromslice(__pyx_t_7, 1, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_INT_T, 0);; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 619, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); + __PYX_XDEC_MEMVIEW(&__pyx_t_7, 1); + __pyx_t_7.memview = NULL; + __pyx_t_7.data = NULL; __pyx_t_6 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) { __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); @@ -13383,151 +13110,381 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_6, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5); __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 637, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 619, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_v_edges = __pyx_t_1; - __pyx_t_1 = 0; + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 619, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + if (unlikely(PyObject_SetItem(__pyx_t_4, __pyx_n_u_site_edge_count, __pyx_t_1) < 0)) __PYX_ERR(1, 619, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":639 + /* "src/voronoi_dcel.pyx":621 + * self.stats["site_edge_count"] = np.asarray(self.sites[:self.n, 2]) + * + * 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]) + */ + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_asarray); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_8_packsim_SITE_CACHE_MAP.iisoparam); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_INCREF(__pyx_slice__2); + __Pyx_GIVEREF(__pyx_slice__2); + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_slice__2); + __Pyx_GIVEREF(__pyx_t_4); + PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_4); + __pyx_t_4 = 0; + __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_6 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); + __Pyx_INCREF(__pyx_t_6); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_5, function); + } + } + __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_6, __pyx_t_4) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_4); + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (unlikely(PyObject_SetItem(__pyx_t_5, __pyx_n_u_site_isos, __pyx_t_1) < 0)) __PYX_ERR(1, 621, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "src/voronoi_dcel.pyx":622 + * + * 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]) + * + */ + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_asarray); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_5 = __Pyx_PyInt_From_npy_int64(__pyx_v_8_packsim_SITE_CACHE_MAP.ienergy); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_INCREF(__pyx_slice__2); + __Pyx_GIVEREF(__pyx_slice__2); + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_slice__2); + __Pyx_GIVEREF(__pyx_t_5); + PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_5); + __pyx_t_5 = 0; + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_6); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_6 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_4))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_4); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_4); + __Pyx_INCREF(__pyx_t_6); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_4, function); + } + } + __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_4, __pyx_t_6, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_4, __pyx_t_5); + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + if (unlikely(PyObject_SetItem(__pyx_t_4, __pyx_n_u_site_energies, __pyx_t_1) < 0)) __PYX_ERR(1, 622, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "src/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]) + * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) # <<<<<<<<<<<<<< + * + * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ + */ + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_asarray); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_8_packsim_SITE_CACHE_MAP.iavg_radius); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_INCREF(__pyx_slice__2); + __Pyx_GIVEREF(__pyx_slice__2); + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_slice__2); + __Pyx_GIVEREF(__pyx_t_4); + PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_4); + __pyx_t_4 = 0; + __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_cache, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_6 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) { + __pyx_t_6 = PyMethod_GET_SELF(__pyx_t_5); + if (likely(__pyx_t_6)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); + __Pyx_INCREF(__pyx_t_6); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_5, function); + } + } + __pyx_t_1 = (__pyx_t_6) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_6, __pyx_t_4) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_4); + __Pyx_XDECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + if (unlikely(PyObject_SetItem(__pyx_t_5, __pyx_n_u_avg_radius, __pyx_t_1) < 0)) __PYX_ERR(1, 623, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "src/voronoi_dcel.pyx":625 + * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) + * + * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ # <<<<<<<<<<<<<< + * (PI*self.stats["avg_radius"]**2) + * + */ + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 625, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_5 = __Pyx_PyObject_Dict_GetItem(__pyx_t_1, __pyx_n_u_site_areas); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 625, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + + /* "src/voronoi_dcel.pyx":626 + * + * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ + * (PI*self.stats["avg_radius"]**2) # <<<<<<<<<<<<<< + * + * edges = np.asarray(self.edges) + */ + __pyx_t_1 = PyFloat_FromDouble(M_PI); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 626, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 626, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_6 = __Pyx_PyObject_Dict_GetItem(__pyx_t_4, __pyx_n_u_avg_radius); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 626, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_t_4 = PyNumber_Power(__pyx_t_6, __pyx_int_2, Py_None); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 626, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_6 = PyNumber_Multiply(__pyx_t_1, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 626, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + + /* "src/voronoi_dcel.pyx":625 + * self.stats["avg_radius"] = np.asarray(cache[:, SITE_CACHE_MAP.iavg_radius]) + * + * self.stats["isoparam_avg"] = self.stats["site_areas"] / \ # <<<<<<<<<<<<<< + * (PI*self.stats["avg_radius"]**2) + * + */ + __pyx_t_4 = __Pyx_PyNumber_Divide(__pyx_t_5, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 625, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 625, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + if (unlikely(PyObject_SetItem(__pyx_t_6, __pyx_n_u_isoparam_avg, __pyx_t_4) < 0)) __PYX_ERR(1, 625, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + + /* "src/voronoi_dcel.pyx":628 + * (PI*self.stats["avg_radius"]**2) + * + * edges = np.asarray(self.edges) # <<<<<<<<<<<<<< + * + * mask = np.nonzero(edges[:, 0] != -1)[0] + */ + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 628, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_asarray); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 628, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + if (unlikely(!__pyx_v_self->edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 628, __pyx_L1_error)} + __pyx_t_6 = __pyx_memoryview_fromslice(__pyx_v_self->edges, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_INT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_INT_T, 0);; if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 628, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_1 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) { + __pyx_t_1 = PyMethod_GET_SELF(__pyx_t_5); + if (likely(__pyx_t_1)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); + __Pyx_INCREF(__pyx_t_1); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_5, function); + } + } + __pyx_t_4 = (__pyx_t_1) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_1, __pyx_t_6) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); + __Pyx_XDECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 628, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_v_edges = __pyx_t_4; + __pyx_t_4 = 0; + + /* "src/voronoi_dcel.pyx":630 * edges = np.asarray(self.edges) * * mask = np.nonzero(edges[:, 0] != -1)[0] # <<<<<<<<<<<<<< * all_edges = mask[(mask % 2 == 0)] * caches = edges[all_edges, 4] */ - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_np); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 639, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_4, __pyx_n_s_nonzero); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 639, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 630, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_edges, __pyx_tuple__3); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 639, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __pyx_t_6 = __Pyx_PyInt_NeObjC(__pyx_t_4, __pyx_int_neg_1, -1L, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 639, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_nonzero); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 630, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) { - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_5); - if (likely(__pyx_t_4)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_5); - __Pyx_INCREF(__pyx_t_4); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_5, function); - } - } - __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_4, __pyx_t_6) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_6); - __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 639, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_edges, __pyx_tuple__3); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 630, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_5); + __pyx_t_1 = __Pyx_PyInt_NeObjC(__pyx_t_5, __pyx_int_neg_1, -1L, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 630, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_GetItemInt(__pyx_t_1, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 639, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_5 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_6))) { + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_6); + if (likely(__pyx_t_5)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); + __Pyx_INCREF(__pyx_t_5); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_6, function); + } + } + __pyx_t_4 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_6, __pyx_t_5, __pyx_t_1) : __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_1); + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_mask = __pyx_t_5; - __pyx_t_5 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 630, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_6 = __Pyx_GetItemInt(__pyx_t_4, 0, long, 1, __Pyx_PyInt_From_long, 0, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 630, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_v_mask = __pyx_t_6; + __pyx_t_6 = 0; - /* "voronoi_dcel.pyx":640 + /* "src/voronoi_dcel.pyx":631 * * mask = np.nonzero(edges[:, 0] != -1)[0] * all_edges = mask[(mask % 2 == 0)] # <<<<<<<<<<<<<< * caches = edges[all_edges, 4] * */ - __pyx_t_5 = __Pyx_PyInt_RemainderObjC(__pyx_v_mask, __pyx_int_2, 2, 0, 0); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 640, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_1 = __Pyx_PyInt_EqObjC(__pyx_t_5, __pyx_int_0, 0, 0); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 640, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_mask, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 640, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_v_all_edges = __pyx_t_5; - __pyx_t_5 = 0; + __pyx_t_6 = __Pyx_PyInt_RemainderObjC(__pyx_v_mask, __pyx_int_2, 2, 0, 0); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 631, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_4 = __Pyx_PyInt_EqObjC(__pyx_t_6, __pyx_int_0, 0, 0); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 631, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_t_6 = __Pyx_PyObject_GetItem(__pyx_v_mask, __pyx_t_4); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 631, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; + __pyx_v_all_edges = __pyx_t_6; + __pyx_t_6 = 0; - /* "voronoi_dcel.pyx":641 + /* "src/voronoi_dcel.pyx":632 * mask = np.nonzero(edges[:, 0] != -1)[0] * all_edges = mask[(mask % 2 == 0)] * caches = edges[all_edges, 4] # <<<<<<<<<<<<<< * * edge_cache = np.asarray(self.edge_cache) */ - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 641, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); + __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 632, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); __Pyx_INCREF(__pyx_v_all_edges); __Pyx_GIVEREF(__pyx_v_all_edges); - PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_v_all_edges); + PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_all_edges); __Pyx_INCREF(__pyx_int_4); __Pyx_GIVEREF(__pyx_int_4); - PyTuple_SET_ITEM(__pyx_t_5, 1, __pyx_int_4); - __pyx_t_1 = __Pyx_PyObject_GetItem(__pyx_v_edges, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 641, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_v_caches = __pyx_t_1; - __pyx_t_1 = 0; + PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_int_4); + __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_edges, __pyx_t_6); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 632, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + __pyx_v_caches = __pyx_t_4; + __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":643 + /* "src/voronoi_dcel.pyx":634 * caches = edges[all_edges, 4] * * edge_cache = np.asarray(self.edge_cache) # <<<<<<<<<<<<<< * * self.stats["edge_lengths"] = edge_cache[caches, self.edge_cache_map.ila_mag] */ - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_np); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 643, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(__pyx_t_5, __pyx_n_s_asarray); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 643, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_np); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 634, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_v_self->edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 643, __pyx_L1_error)} - __pyx_t_5 = __pyx_memoryview_fromslice(__pyx_v_self->edge_cache, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_FLOAT_T, 0);; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 643, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = NULL; - if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_6))) { - __pyx_t_4 = PyMethod_GET_SELF(__pyx_t_6); - if (likely(__pyx_t_4)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_6); - __Pyx_INCREF(__pyx_t_4); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_6, function); - } - } - __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_6, __pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_6, __pyx_t_5); - __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 643, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(__pyx_t_6, __pyx_n_s_asarray); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 634, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_v_edge_cache = __pyx_t_1; - __pyx_t_1 = 0; + if (unlikely(!__pyx_v_self->edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 634, __pyx_L1_error)} + __pyx_t_6 = __pyx_memoryview_fromslice(__pyx_v_self->edge_cache, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_FLOAT_T, 0);; if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 634, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_6); + __pyx_t_5 = NULL; + if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_1))) { + __pyx_t_5 = PyMethod_GET_SELF(__pyx_t_1); + if (likely(__pyx_t_5)) { + PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_1); + __Pyx_INCREF(__pyx_t_5); + __Pyx_INCREF(function); + __Pyx_DECREF_SET(__pyx_t_1, function); + } + } + __pyx_t_4 = (__pyx_t_5) ? __Pyx_PyObject_Call2Args(__pyx_t_1, __pyx_t_5, __pyx_t_6) : __Pyx_PyObject_CallOneArg(__pyx_t_1, __pyx_t_6); + __Pyx_XDECREF(__pyx_t_5); __pyx_t_5 = 0; + __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 634, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_v_edge_cache = __pyx_t_4; + __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":645 + /* "src/voronoi_dcel.pyx":636 * edge_cache = np.asarray(self.edge_cache) * * self.stats["edge_lengths"] = edge_cache[caches, self.edge_cache_map.ila_mag] # <<<<<<<<<<<<<< * * @property */ - __pyx_t_1 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->edge_cache_map->ila_mag); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 645, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->edge_cache_map->ila_mag); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 636, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); + __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 636, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_6 = PyTuple_New(2); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 645, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); __Pyx_INCREF(__pyx_v_caches); __Pyx_GIVEREF(__pyx_v_caches); - PyTuple_SET_ITEM(__pyx_t_6, 0, __pyx_v_caches); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_6, 1, __pyx_t_1); - __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyObject_GetItem(__pyx_v_edge_cache, __pyx_t_6); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 645, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 645, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - if (unlikely(PyObject_SetItem(__pyx_t_6, __pyx_n_u_edge_lengths, __pyx_t_1) < 0)) __PYX_ERR(1, 645, __pyx_L1_error) - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; + PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_v_caches); + __Pyx_GIVEREF(__pyx_t_4); + PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_t_4); + __pyx_t_4 = 0; + __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_edge_cache, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 636, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_stats); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 636, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + if (unlikely(PyObject_SetItem(__pyx_t_1, __pyx_n_u_edge_lengths, __pyx_t_4) < 0)) __PYX_ERR(1, 636, __pyx_L1_error) + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - /* "voronoi_dcel.pyx":620 + /* "src/voronoi_dcel.pyx":614 * pass * * cdef void get_statistics(self) except *: # <<<<<<<<<<<<<< @@ -13543,10 +13500,10 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __Pyx_XDECREF(__pyx_t_6); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.get_statistics", __pyx_clineno, __pyx_lineno, __pyx_filename); + __PYX_XDEC_MEMVIEW(&__pyx_t_7, 1); + __Pyx_AddTraceback("_packsim.VoronoiContainer.get_statistics", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __Pyx_XDECREF(__pyx_v_cache); - __Pyx_XDECREF(__pyx_v_edge_count); __Pyx_XDECREF(__pyx_v_edges); __Pyx_XDECREF(__pyx_v_mask); __Pyx_XDECREF(__pyx_v_all_edges); @@ -13555,7 +13512,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p __Pyx_RefNannyFinishContext(); } -/* "voronoi_dcel.pyx":648 +/* "src/voronoi_dcel.pyx":639 * * @property * def site_arr(self): # <<<<<<<<<<<<<< @@ -13564,19 +13521,19 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_2, 2, (PyObject *(*)(char *)) __p */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_8site_arr_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_8site_arr_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_8site_arr_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_8site_arr_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_8site_arr___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_8site_arr___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8site_arr___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8site_arr___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -13590,7 +13547,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8site_arr___get__(st int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 0); - /* "voronoi_dcel.pyx":649 + /* "src/voronoi_dcel.pyx":640 * @property * def site_arr(self): * return np.asarray(self.points[:self.n], dtype=FLOAT) # <<<<<<<<<<<<<< @@ -13598,12 +13555,12 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8site_arr___get__(st * @property */ __Pyx_XDECREF(__pyx_r); - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 649, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 649, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_v_self->points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 649, __pyx_L1_error)} + if (unlikely(!__pyx_v_self->points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 640, __pyx_L1_error)} __pyx_t_3.data = __pyx_v_self->points.data; __pyx_t_3.memview = __pyx_v_self->points.memview; __PYX_INC_MEMVIEW(&__pyx_t_3, 0); @@ -13622,30 +13579,30 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8site_arr___get__(st 0, 1) < 0)) { - __PYX_ERR(1, 649, __pyx_L1_error) + __PYX_ERR(1, 640, __pyx_L1_error) } __pyx_t_3.shape[1] = __pyx_v_self->points.shape[1]; __pyx_t_3.strides[1] = __pyx_v_self->points.strides[1]; __pyx_t_3.suboffsets[1] = -1; -__pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_FLOAT_T, 0);; if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 649, __pyx_L1_error) +__pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_FLOAT_T, 0);; if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __PYX_XDEC_MEMVIEW(&__pyx_t_3, 1); __pyx_t_3.memview = NULL; __pyx_t_3.data = NULL; - __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 649, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 649, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 649, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_6, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(1, 649, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_6) < 0) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 649, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_5, __pyx_t_1); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 640, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -13654,7 +13611,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __p __pyx_t_6 = 0; goto __pyx_L0; - /* "voronoi_dcel.pyx":648 + /* "src/voronoi_dcel.pyx":639 * * @property * def site_arr(self): # <<<<<<<<<<<<<< @@ -13669,7 +13626,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __p __PYX_XDEC_MEMVIEW(&__pyx_t_3, 1); __Pyx_XDECREF(__pyx_t_5); __Pyx_XDECREF(__pyx_t_6); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.site_arr.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.site_arr.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -13677,7 +13634,7 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __p return __pyx_r; } -/* "voronoi_dcel.pyx":652 +/* "src/voronoi_dcel.pyx":643 * * @property * def vor_data(self): # <<<<<<<<<<<<<< @@ -13686,19 +13643,19 @@ __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_t_3, 2, (PyObject *(*)(char *)) __p */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_8vor_data_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_8vor_data_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_8vor_data_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_8vor_data_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_8vor_data___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8vor_data___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -13707,7 +13664,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(st int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 0); - /* "voronoi_dcel.pyx":653 + /* "src/voronoi_dcel.pyx":644 * @property * def vor_data(self): * return self.scipy_vor # <<<<<<<<<<<<<< @@ -13715,13 +13672,13 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(st * @property */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 653, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_scipy_vor); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 644, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_r = __pyx_t_1; __pyx_t_1 = 0; goto __pyx_L0; - /* "voronoi_dcel.pyx":652 + /* "src/voronoi_dcel.pyx":643 * * @property * def vor_data(self): # <<<<<<<<<<<<<< @@ -13732,7 +13689,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(st /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.vor_data.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.vor_data.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -13740,7 +13697,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(st return __pyx_r; } -/* "voronoi_dcel.pyx":656 +/* "src/voronoi_dcel.pyx":647 * * @property * def gradient(self): # <<<<<<<<<<<<<< @@ -13749,19 +13706,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8vor_data___get__(st */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_8gradient_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_8gradient_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_8gradient_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_8gradient_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_8gradient___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8gradient___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -13773,7 +13730,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(st int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__get__", 0); - /* "voronoi_dcel.pyx":657 + /* "src/voronoi_dcel.pyx":648 * @property * def gradient(self): * return np.asarray(self.grad, dtype=FLOAT) # <<<<<<<<<<<<<< @@ -13781,26 +13738,26 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(st * def add_sites(self, add): */ __Pyx_XDECREF(__pyx_r); - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 657, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 657, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - if (unlikely(!__pyx_v_self->grad.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 657, __pyx_L1_error)} - __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_v_self->grad, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_12packsim_core_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_12packsim_core_FLOAT_T, 0);; if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 657, __pyx_L1_error) + if (unlikely(!__pyx_v_self->grad.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(1, 648, __pyx_L1_error)} + __pyx_t_1 = __pyx_memoryview_fromslice(__pyx_v_self->grad, 2, (PyObject *(*)(char *)) __pyx_memview_get_nn___pyx_t_8_packsim_FLOAT_T, (int (*)(char *, PyObject *)) __pyx_memview_set_nn___pyx_t_8_packsim_FLOAT_T, 0);; if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 657, __pyx_L1_error) + __pyx_t_3 = PyTuple_New(1); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_3, 0, __pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 657, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 657, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_4, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 657, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_4) < 0) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 657, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_3, __pyx_t_1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 648, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -13809,7 +13766,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(st __pyx_t_4 = 0; goto __pyx_L0; - /* "voronoi_dcel.pyx":656 + /* "src/voronoi_dcel.pyx":647 * * @property * def gradient(self): # <<<<<<<<<<<<<< @@ -13823,7 +13780,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(st __Pyx_XDECREF(__pyx_t_2); __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.gradient.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.gradient.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -13831,7 +13788,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(st return __pyx_r; } -/* "voronoi_dcel.pyx":659 +/* "src/voronoi_dcel.pyx":650 * return np.asarray(self.grad, dtype=FLOAT) * * def add_sites(self, add): # <<<<<<<<<<<<<< @@ -13840,19 +13797,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8gradient___get__(st */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_3add_sites(PyObject *__pyx_v_self, PyObject *__pyx_v_add); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_3add_sites(PyObject *__pyx_v_self, PyObject *__pyx_v_add) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_3add_sites(PyObject *__pyx_v_self, PyObject *__pyx_v_add); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_3add_sites(PyObject *__pyx_v_self, PyObject *__pyx_v_add) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("add_sites (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self), ((PyObject *)__pyx_v_add)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_2add_sites(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self), ((PyObject *)__pyx_v_add)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, PyObject *__pyx_v_add) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_2add_sites(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, PyObject *__pyx_v_add) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -13865,7 +13822,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(struct __ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("add_sites", 0); - /* "voronoi_dcel.pyx":660 + /* "src/voronoi_dcel.pyx":651 * * def add_sites(self, add): * return (self.site_arr + add) % np.asarray(self.dim, dtype=FLOAT) # <<<<<<<<<<<<<< @@ -13873,35 +13830,35 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(struct __ * def iterate(self, FLOAT_T step): */ __Pyx_XDECREF(__pyx_r); - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_site_arr); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_site_arr); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_2 = PyNumber_Add(__pyx_t_1, __pyx_v_add); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_2 = PyNumber_Add(__pyx_t_1, __pyx_v_add); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 660, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_1, __pyx_n_s_np); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_asarray); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T(__pyx_v_self->dim, 2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_1 = __Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T(__pyx_v_self->dim, 2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_4 = PyTuple_New(1); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_GIVEREF(__pyx_t_1); PyTuple_SET_ITEM(__pyx_t_4, 0, __pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyDict_NewPresized(1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 660, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_5, __pyx_n_s_FLOAT); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(1, 660, __pyx_L1_error) + if (PyDict_SetItem(__pyx_t_1, __pyx_n_s_dtype, __pyx_t_5) < 0) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_3, __pyx_t_4, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __pyx_t_1 = PyNumber_Remainder(__pyx_t_2, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 660, __pyx_L1_error) + __pyx_t_1 = PyNumber_Remainder(__pyx_t_2, __pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 651, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; @@ -13909,7 +13866,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(struct __ __pyx_t_1 = 0; goto __pyx_L0; - /* "voronoi_dcel.pyx":659 + /* "src/voronoi_dcel.pyx":650 * return np.asarray(self.grad, dtype=FLOAT) * * def add_sites(self, add): # <<<<<<<<<<<<<< @@ -13924,7 +13881,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(struct __ __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.add_sites", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.add_sites", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -13932,18 +13889,18 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_2add_sites(struct __ return __pyx_r; } -/* "voronoi_dcel.pyx":662 +/* "src/voronoi_dcel.pyx":653 * return (self.site_arr + add) % np.asarray(self.dim, dtype=FLOAT) * * def iterate(self, FLOAT_T step): # <<<<<<<<<<<<<< * k1 = self.gradient - * + * k2 = self.__class__(self.n, self.w, self.h, self.r, */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_5iterate(PyObject *__pyx_v_self, PyObject *__pyx_arg_step); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_5iterate(PyObject *__pyx_v_self, PyObject *__pyx_arg_step) { - __pyx_t_12packsim_core_FLOAT_T __pyx_v_step; +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_5iterate(PyObject *__pyx_v_self, PyObject *__pyx_arg_step); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_5iterate(PyObject *__pyx_v_self, PyObject *__pyx_arg_step) { + __pyx_t_8_packsim_FLOAT_T __pyx_v_step; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; @@ -13951,27 +13908,24 @@ static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_5iterate(PyObject *_ __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("iterate (wrapper)", 0); assert(__pyx_arg_step); { - __pyx_v_step = __pyx_PyFloat_AsDouble(__pyx_arg_step); if (unlikely((__pyx_v_step == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(1, 662, __pyx_L3_error) + __pyx_v_step = __pyx_PyFloat_AsDouble(__pyx_arg_step); if (unlikely((__pyx_v_step == ((npy_float64)-1)) && PyErr_Occurred())) __PYX_ERR(1, 653, __pyx_L3_error) } goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; - __Pyx_AddTraceback("packsim_core.VoronoiContainer.iterate", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.iterate", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_4iterate(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self), ((__pyx_t_12packsim_core_FLOAT_T)__pyx_v_step)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_4iterate(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self), ((__pyx_t_8_packsim_FLOAT_T)__pyx_v_step)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, __pyx_t_12packsim_core_FLOAT_T __pyx_v_step) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_4iterate(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, __pyx_t_8_packsim_FLOAT_T __pyx_v_step) { PyObject *__pyx_v_k1 = NULL; PyObject *__pyx_v_k2 = NULL; - PyObject *__pyx_v_lower = NULL; - PyObject *__pyx_v_k3 = NULL; - PyObject *__pyx_v_higher = NULL; PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -13990,67 +13944,64 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __py int __pyx_clineno = 0; __Pyx_RefNannySetupContext("iterate", 0); - /* "voronoi_dcel.pyx":663 + /* "src/voronoi_dcel.pyx":654 * * def iterate(self, FLOAT_T step): * k1 = self.gradient # <<<<<<<<<<<<<< - * * k2 = self.__class__(self.n, self.w, self.h, self.r, + * self.add_sites(step*k1) */ - __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_gradient); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 663, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_gradient); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 654, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __pyx_v_k1 = __pyx_t_1; __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":665 + /* "src/voronoi_dcel.pyx":655 + * def iterate(self, FLOAT_T step): * k1 = self.gradient - * * k2 = self.__class__(self.n, self.w, self.h, self.r, # <<<<<<<<<<<<<< - * self.add_sites(step*k1/2) + * self.add_sites(step*k1) * ).gradient */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_4 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_4 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_5 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_6 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_6 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_6); - /* "voronoi_dcel.pyx":666 - * + /* "src/voronoi_dcel.pyx":656 + * k1 = self.gradient * k2 = self.__class__(self.n, self.w, self.h, self.r, - * self.add_sites(step*k1/2) # <<<<<<<<<<<<<< + * self.add_sites(step*k1) # <<<<<<<<<<<<<< * ).gradient * */ - __pyx_t_8 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_add_sites); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 666, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_add_sites); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_8); - __pyx_t_9 = PyFloat_FromDouble(__pyx_v_step); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 666, __pyx_L1_error) + __pyx_t_9 = PyFloat_FromDouble(__pyx_v_step); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_9); - __pyx_t_10 = PyNumber_Multiply(__pyx_t_9, __pyx_v_k1); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 666, __pyx_L1_error) + __pyx_t_10 = PyNumber_Multiply(__pyx_t_9, __pyx_v_k1); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - __pyx_t_9 = __Pyx_PyInt_TrueDivideObjC(__pyx_t_10, __pyx_int_2, 2, 0, 0); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 666, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; - __pyx_t_10 = NULL; + __pyx_t_9 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_8))) { - __pyx_t_10 = PyMethod_GET_SELF(__pyx_t_8); - if (likely(__pyx_t_10)) { + __pyx_t_9 = PyMethod_GET_SELF(__pyx_t_8); + if (likely(__pyx_t_9)) { PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_8); - __Pyx_INCREF(__pyx_t_10); + __Pyx_INCREF(__pyx_t_9); __Pyx_INCREF(function); __Pyx_DECREF_SET(__pyx_t_8, function); } } - __pyx_t_7 = (__pyx_t_10) ? __Pyx_PyObject_Call2Args(__pyx_t_8, __pyx_t_10, __pyx_t_9) : __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_9); - __Pyx_XDECREF(__pyx_t_10); __pyx_t_10 = 0; - __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 666, __pyx_L1_error) + __pyx_t_7 = (__pyx_t_9) ? __Pyx_PyObject_Call2Args(__pyx_t_8, __pyx_t_9, __pyx_t_10) : __Pyx_PyObject_CallOneArg(__pyx_t_8, __pyx_t_10); + __Pyx_XDECREF(__pyx_t_9); __pyx_t_9 = 0; + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; + if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 656, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_7); __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; __pyx_t_8 = NULL; @@ -14068,7 +14019,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __py #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[6] = {__pyx_t_8, __pyx_t_3, __pyx_t_4, __pyx_t_5, __pyx_t_6, __pyx_t_7}; - __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_11, 5+__pyx_t_11); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_11, 5+__pyx_t_11); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -14081,7 +14032,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __py #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_2)) { PyObject *__pyx_temp[6] = {__pyx_t_8, __pyx_t_3, __pyx_t_4, __pyx_t_5, __pyx_t_6, __pyx_t_7}; - __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_11, 5+__pyx_t_11); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyCFunction_FastCall(__pyx_t_2, __pyx_temp+1-__pyx_t_11, 5+__pyx_t_11); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -14092,239 +14043,79 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __py } else #endif { - __pyx_t_9 = PyTuple_New(5+__pyx_t_11); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 665, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_9); + __pyx_t_10 = PyTuple_New(5+__pyx_t_11); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 655, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_10); if (__pyx_t_8) { - __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_9, 0, __pyx_t_8); __pyx_t_8 = NULL; + __Pyx_GIVEREF(__pyx_t_8); PyTuple_SET_ITEM(__pyx_t_10, 0, __pyx_t_8); __pyx_t_8 = NULL; } __Pyx_GIVEREF(__pyx_t_3); - PyTuple_SET_ITEM(__pyx_t_9, 0+__pyx_t_11, __pyx_t_3); + PyTuple_SET_ITEM(__pyx_t_10, 0+__pyx_t_11, __pyx_t_3); __Pyx_GIVEREF(__pyx_t_4); - PyTuple_SET_ITEM(__pyx_t_9, 1+__pyx_t_11, __pyx_t_4); + PyTuple_SET_ITEM(__pyx_t_10, 1+__pyx_t_11, __pyx_t_4); __Pyx_GIVEREF(__pyx_t_5); - PyTuple_SET_ITEM(__pyx_t_9, 2+__pyx_t_11, __pyx_t_5); + PyTuple_SET_ITEM(__pyx_t_10, 2+__pyx_t_11, __pyx_t_5); __Pyx_GIVEREF(__pyx_t_6); - PyTuple_SET_ITEM(__pyx_t_9, 3+__pyx_t_11, __pyx_t_6); + PyTuple_SET_ITEM(__pyx_t_10, 3+__pyx_t_11, __pyx_t_6); __Pyx_GIVEREF(__pyx_t_7); - PyTuple_SET_ITEM(__pyx_t_9, 4+__pyx_t_11, __pyx_t_7); + PyTuple_SET_ITEM(__pyx_t_10, 4+__pyx_t_11, __pyx_t_7); __pyx_t_3 = 0; __pyx_t_4 = 0; __pyx_t_5 = 0; __pyx_t_6 = 0; __pyx_t_7 = 0; - __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_9, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 665, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyObject_Call(__pyx_t_2, __pyx_t_10, NULL); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 655, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; + __Pyx_DECREF(__pyx_t_10); __pyx_t_10 = 0; } __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "voronoi_dcel.pyx":667 + /* "src/voronoi_dcel.pyx":657 * k2 = self.__class__(self.n, self.w, self.h, self.r, - * self.add_sites(step*k1/2) + * self.add_sites(step*k1) * ).gradient # <<<<<<<<<<<<<< * - * lower = step*(-k1+ 2*k2) + * return (step/2)*(k1+k2), k1 */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_gradient); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 667, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(__pyx_t_1, __pyx_n_s_gradient); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 657, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_k2 = __pyx_t_2; __pyx_t_2 = 0; - /* "voronoi_dcel.pyx":669 + /* "src/voronoi_dcel.pyx":659 * ).gradient * - * lower = step*(-k1+ 2*k2) # <<<<<<<<<<<<<< - * k3 = self.__class__(self.n, self.w, self.h, self.r, - * self.add_sites(lower) - */ - __pyx_t_2 = PyFloat_FromDouble(__pyx_v_step); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 669, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyNumber_Negative(__pyx_v_k1); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 669, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_9 = PyNumber_Multiply(__pyx_int_2, __pyx_v_k2); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 669, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_9); - __pyx_t_7 = PyNumber_Add(__pyx_t_1, __pyx_t_9); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 669, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_7); - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - __pyx_t_9 = PyNumber_Multiply(__pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 669, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __pyx_v_lower = __pyx_t_9; - __pyx_t_9 = 0; - - /* "voronoi_dcel.pyx":670 + * return (step/2)*(k1+k2), k1 # <<<<<<<<<<<<<< + * # k1 = self.gradient * - * lower = step*(-k1+ 2*k2) - * k3 = self.__class__(self.n, self.w, self.h, self.r, # <<<<<<<<<<<<<< - * self.add_sites(lower) - * ).gradient - */ - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_7); - __pyx_t_2 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_2); - __pyx_t_1 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_1); - __pyx_t_6 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_6)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_6); - __pyx_t_5 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_5); - - /* "voronoi_dcel.pyx":671 - * lower = step*(-k1+ 2*k2) - * k3 = self.__class__(self.n, self.w, self.h, self.r, - * self.add_sites(lower) # <<<<<<<<<<<<<< - * ).gradient - * - */ - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_add_sites); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 671, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_3); - __pyx_t_8 = NULL; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_3))) { - __pyx_t_8 = PyMethod_GET_SELF(__pyx_t_3); - if (likely(__pyx_t_8)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_3); - __Pyx_INCREF(__pyx_t_8); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_3, function); - } - } - __pyx_t_4 = (__pyx_t_8) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_8, __pyx_v_lower) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_v_lower); - __Pyx_XDECREF(__pyx_t_8); __pyx_t_8 = 0; - if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 671, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_4); - __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = NULL; - __pyx_t_11 = 0; - if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_7))) { - __pyx_t_3 = PyMethod_GET_SELF(__pyx_t_7); - if (likely(__pyx_t_3)) { - PyObject* function = PyMethod_GET_FUNCTION(__pyx_t_7); - __Pyx_INCREF(__pyx_t_3); - __Pyx_INCREF(function); - __Pyx_DECREF_SET(__pyx_t_7, function); - __pyx_t_11 = 1; - } - } - #if CYTHON_FAST_PYCALL - if (PyFunction_Check(__pyx_t_7)) { - PyObject *__pyx_temp[6] = {__pyx_t_3, __pyx_t_2, __pyx_t_1, __pyx_t_6, __pyx_t_5, __pyx_t_4}; - __pyx_t_9 = __Pyx_PyFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_11, 5+__pyx_t_11); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - } else - #endif - #if CYTHON_FAST_PYCCALL - if (__Pyx_PyFastCFunction_Check(__pyx_t_7)) { - PyObject *__pyx_temp[6] = {__pyx_t_3, __pyx_t_2, __pyx_t_1, __pyx_t_6, __pyx_t_5, __pyx_t_4}; - __pyx_t_9 = __Pyx_PyCFunction_FastCall(__pyx_t_7, __pyx_temp+1-__pyx_t_11, 5+__pyx_t_11); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; - __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - __Pyx_DECREF(__pyx_t_6); __pyx_t_6 = 0; - __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - } else - #endif - { - __pyx_t_8 = PyTuple_New(5+__pyx_t_11); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_8); - if (__pyx_t_3) { - __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_t_3); __pyx_t_3 = NULL; - } - __Pyx_GIVEREF(__pyx_t_2); - PyTuple_SET_ITEM(__pyx_t_8, 0+__pyx_t_11, __pyx_t_2); - __Pyx_GIVEREF(__pyx_t_1); - PyTuple_SET_ITEM(__pyx_t_8, 1+__pyx_t_11, __pyx_t_1); - __Pyx_GIVEREF(__pyx_t_6); - PyTuple_SET_ITEM(__pyx_t_8, 2+__pyx_t_11, __pyx_t_6); - __Pyx_GIVEREF(__pyx_t_5); - PyTuple_SET_ITEM(__pyx_t_8, 3+__pyx_t_11, __pyx_t_5); - __Pyx_GIVEREF(__pyx_t_4); - PyTuple_SET_ITEM(__pyx_t_8, 4+__pyx_t_11, __pyx_t_4); - __pyx_t_2 = 0; - __pyx_t_1 = 0; - __pyx_t_6 = 0; - __pyx_t_5 = 0; - __pyx_t_4 = 0; - __pyx_t_9 = __Pyx_PyObject_Call(__pyx_t_7, __pyx_t_8, NULL); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 670, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - } - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - - /* "voronoi_dcel.pyx":672 - * k3 = self.__class__(self.n, self.w, self.h, self.r, - * self.add_sites(lower) - * ).gradient # <<<<<<<<<<<<<< - * - * higher = (step/6)*(k1+2*k2+k3) - */ - __pyx_t_7 = __Pyx_PyObject_GetAttrStr(__pyx_t_9, __pyx_n_s_gradient); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 672, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_7); - __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - __pyx_v_k3 = __pyx_t_7; - __pyx_t_7 = 0; - - /* "voronoi_dcel.pyx":674 - * ).gradient - * - * higher = (step/6)*(k1+2*k2+k3) # <<<<<<<<<<<<<< - * #new_sites = self.add_sites(higher) - * #error = higher - lower - */ - __pyx_t_7 = PyFloat_FromDouble((__pyx_v_step / 6.0)); if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 674, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_7); - __pyx_t_9 = PyNumber_Multiply(__pyx_int_2, __pyx_v_k2); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 674, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_9); - __pyx_t_8 = PyNumber_Add(__pyx_v_k1, __pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 674, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_8); - __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - __pyx_t_9 = PyNumber_Add(__pyx_t_8, __pyx_v_k3); if (unlikely(!__pyx_t_9)) __PYX_ERR(1, 674, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_9); - __Pyx_DECREF(__pyx_t_8); __pyx_t_8 = 0; - __pyx_t_8 = PyNumber_Multiply(__pyx_t_7, __pyx_t_9); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 674, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_8); - __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __Pyx_DECREF(__pyx_t_9); __pyx_t_9 = 0; - __pyx_v_higher = __pyx_t_8; - __pyx_t_8 = 0; - - /* "voronoi_dcel.pyx":678 - * #error = higher - lower - * - * return higher, k1 # <<<<<<<<<<<<<< - * - * def hessian(self, d: float) -> np.ndarray: */ __Pyx_XDECREF(__pyx_r); - __pyx_t_8 = PyTuple_New(2); if (unlikely(!__pyx_t_8)) __PYX_ERR(1, 678, __pyx_L1_error) - __Pyx_GOTREF(__pyx_t_8); - __Pyx_INCREF(__pyx_v_higher); - __Pyx_GIVEREF(__pyx_v_higher); - PyTuple_SET_ITEM(__pyx_t_8, 0, __pyx_v_higher); + __pyx_t_2 = PyFloat_FromDouble((__pyx_v_step / 2.0)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 659, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_2); + __pyx_t_1 = PyNumber_Add(__pyx_v_k1, __pyx_v_k2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 659, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __pyx_t_10 = PyNumber_Multiply(__pyx_t_2, __pyx_t_1); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 659, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_10); + __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; + __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; + __pyx_t_1 = PyTuple_New(2); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 659, __pyx_L1_error) + __Pyx_GOTREF(__pyx_t_1); + __Pyx_GIVEREF(__pyx_t_10); + PyTuple_SET_ITEM(__pyx_t_1, 0, __pyx_t_10); __Pyx_INCREF(__pyx_v_k1); __Pyx_GIVEREF(__pyx_v_k1); - PyTuple_SET_ITEM(__pyx_t_8, 1, __pyx_v_k1); - __pyx_r = __pyx_t_8; - __pyx_t_8 = 0; + PyTuple_SET_ITEM(__pyx_t_1, 1, __pyx_v_k1); + __pyx_t_10 = 0; + __pyx_r = __pyx_t_1; + __pyx_t_1 = 0; goto __pyx_L0; - /* "voronoi_dcel.pyx":662 + /* "src/voronoi_dcel.pyx":653 * return (self.site_arr + add) % np.asarray(self.dim, dtype=FLOAT) * * def iterate(self, FLOAT_T step): # <<<<<<<<<<<<<< * k1 = self.gradient - * + * k2 = self.__class__(self.n, self.w, self.h, self.r, */ /* function exit code */ @@ -14339,21 +14130,18 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __py __Pyx_XDECREF(__pyx_t_8); __Pyx_XDECREF(__pyx_t_9); __Pyx_XDECREF(__pyx_t_10); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.iterate", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.iterate", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XDECREF(__pyx_v_k1); __Pyx_XDECREF(__pyx_v_k2); - __Pyx_XDECREF(__pyx_v_lower); - __Pyx_XDECREF(__pyx_v_k3); - __Pyx_XDECREF(__pyx_v_higher); __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "voronoi_dcel.pyx":680 - * return higher, k1 +/* "src/voronoi_dcel.pyx":679 + * #return higher, k1 * * def hessian(self, d: float) -> np.ndarray: # <<<<<<<<<<<<<< * """ @@ -14361,9 +14149,9 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_4iterate(struct __py */ /* Python wrapper */ -static PyArrayObject *__pyx_pw_12packsim_core_16VoronoiContainer_7hessian(PyObject *__pyx_v_self, PyObject *__pyx_arg_d); /*proto*/ -static char __pyx_doc_12packsim_core_16VoronoiContainer_6hessian[] = "\n\t\tObtains the approximate Hessian.\n\t\t:param d: [float] small d for approximation.\n\t\t:return: 2Nx2N array that represents Hessian.\n\t\t"; -static PyArrayObject *__pyx_pw_12packsim_core_16VoronoiContainer_7hessian(PyObject *__pyx_v_self, PyObject *__pyx_arg_d) { +static PyArrayObject *__pyx_pw_8_packsim_16VoronoiContainer_7hessian(PyObject *__pyx_v_self, PyObject *__pyx_arg_d); /*proto*/ +static char __pyx_doc_8_packsim_16VoronoiContainer_6hessian[] = "\n\t\tObtains the approximate Hessian.\n\t\t:param d: [float] small d for approximation.\n\t\t:return: 2Nx2N array that represents Hessian.\n\t\t"; +static PyArrayObject *__pyx_pw_8_packsim_16VoronoiContainer_7hessian(PyObject *__pyx_v_self, PyObject *__pyx_arg_d) { double __pyx_v_d; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -14372,22 +14160,22 @@ static PyArrayObject *__pyx_pw_12packsim_core_16VoronoiContainer_7hessian(PyObje __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("hessian (wrapper)", 0); assert(__pyx_arg_d); { - __pyx_v_d = __pyx_PyFloat_AsDouble(__pyx_arg_d); if (unlikely((__pyx_v_d == (double)-1) && PyErr_Occurred())) __PYX_ERR(1, 680, __pyx_L3_error) + __pyx_v_d = __pyx_PyFloat_AsDouble(__pyx_arg_d); if (unlikely((__pyx_v_d == (double)-1) && PyErr_Occurred())) __PYX_ERR(1, 679, __pyx_L3_error) } goto __pyx_L4_argument_unpacking_done; __pyx_L3_error:; - __Pyx_AddTraceback("packsim_core.VoronoiContainer.hessian", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.hessian", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_6hessian(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self), ((double)__pyx_v_d)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_6hessian(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self), ((double)__pyx_v_d)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, double __pyx_v_d) { +static PyArrayObject *__pyx_pf_8_packsim_16VoronoiContainer_6hessian(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, double __pyx_v_d) { PyObject *__pyx_v_HE = NULL; PyObject *__pyx_v_new_sites = NULL; PyObject *__pyx_v_i = NULL; @@ -14418,23 +14206,23 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct int __pyx_clineno = 0; __Pyx_RefNannySetupContext("hessian", 0); - /* "voronoi_dcel.pyx":686 + /* "src/voronoi_dcel.pyx":685 * :return: 2Nx2N array that represents Hessian. * """ * 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): */ - __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 686, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_np); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 685, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_zeros); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 686, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(__pyx_t_2, __pyx_n_s_zeros); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 685, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 686, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 685, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 686, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 685, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 686, __pyx_L1_error) + __pyx_t_5 = PyTuple_New(2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 685, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_GIVEREF(__pyx_t_2); PyTuple_SET_ITEM(__pyx_t_5, 0, __pyx_t_2); @@ -14455,25 +14243,25 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_3, __pyx_t_4, __pyx_t_5) : __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_5); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 686, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 685, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __pyx_v_HE = __pyx_t_1; __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":687 + /* "src/voronoi_dcel.pyx":686 * """ * 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): * for j in range(2): */ - __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 687, __pyx_L1_error) + __Pyx_GetModuleGlobalName(__pyx_t_3, __pyx_n_s_np); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 686, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_copy); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 687, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetAttrStr(__pyx_t_3, __pyx_n_s_copy); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 686, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_site_arr); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 687, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_site_arr); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 686, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && unlikely(PyMethod_Check(__pyx_t_5))) { @@ -14488,31 +14276,31 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __pyx_t_1 = (__pyx_t_4) ? __Pyx_PyObject_Call2Args(__pyx_t_5, __pyx_t_4, __pyx_t_3) : __Pyx_PyObject_CallOneArg(__pyx_t_5, __pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 687, __pyx_L1_error) + if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 686, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_new_sites = __pyx_t_1; __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":688 + /* "src/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. * for i in range(self.n): # <<<<<<<<<<<<<< * for j in range(2): * mod = self.w if j == 0 else self.h */ - __pyx_t_1 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 687, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 687, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (likely(PyList_CheckExact(__pyx_t_5)) || PyTuple_CheckExact(__pyx_t_5)) { __pyx_t_1 = __pyx_t_5; __Pyx_INCREF(__pyx_t_1); __pyx_t_6 = 0; __pyx_t_7 = NULL; } else { - __pyx_t_6 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_6 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 687, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 687, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; for (;;) { @@ -14520,17 +14308,17 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct if (likely(PyList_CheckExact(__pyx_t_1))) { if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_1)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_5 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 687, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 687, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } else { if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_1)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 687, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 688, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 687, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } @@ -14540,7 +14328,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(1, 688, __pyx_L1_error) + else __PYX_ERR(1, 687, __pyx_L1_error) } break; } @@ -14549,7 +14337,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":689 + /* "src/voronoi_dcel.pyx":688 * new_sites = np.copy(self.site_arr) # Maintain one copy for speed. * for i in range(self.n): * for j in range(2): # <<<<<<<<<<<<<< @@ -14557,29 +14345,29 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct * new_sites[i][j] = (new_sites[i][j] + d) % mod */ for (__pyx_t_8 = 0; __pyx_t_8 < 2; __pyx_t_8+=1) { - __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 689, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyInt_From_long(__pyx_t_8); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 688, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_XDECREF_SET(__pyx_v_j, __pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":690 + /* "src/voronoi_dcel.pyx":689 * for i in range(self.n): * for j in range(2): * 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) */ - __pyx_t_3 = __Pyx_PyInt_EqObjC(__pyx_v_j, __pyx_int_0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 690, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_EqObjC(__pyx_v_j, __pyx_int_0, 0, 0); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 689, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(1, 690, __pyx_L1_error) + __pyx_t_9 = __Pyx_PyObject_IsTrue(__pyx_t_3); if (unlikely(__pyx_t_9 < 0)) __PYX_ERR(1, 689, __pyx_L1_error) __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; if (__pyx_t_9) { - __pyx_t_3 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 690, __pyx_L1_error) + __pyx_t_3 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 689, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_5 = __pyx_t_3; __pyx_t_3 = 0; } else { - __pyx_t_3 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 690, __pyx_L1_error) + __pyx_t_3 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 689, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __pyx_t_5 = __pyx_t_3; __pyx_t_3 = 0; @@ -14587,49 +14375,49 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_XDECREF_SET(__pyx_v_mod, __pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":691 + /* "src/voronoi_dcel.pyx":690 * for j in range(2): * 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) * new_sites[i][j] = (new_sites[i][j] - 2*d) % mod */ - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 691, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 690, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_3 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 691, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 690, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyFloat_FromDouble(__pyx_v_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 691, __pyx_L1_error) + __pyx_t_5 = PyFloat_FromDouble(__pyx_v_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 690, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 691, __pyx_L1_error) + __pyx_t_4 = PyNumber_Add(__pyx_t_3, __pyx_t_5); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 690, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyNumber_Remainder(__pyx_t_4, __pyx_v_mod); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 691, __pyx_L1_error) + __pyx_t_5 = PyNumber_Remainder(__pyx_t_4, __pyx_v_mod); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 690, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 691, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 690, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - if (unlikely(PyObject_SetItem(__pyx_t_4, __pyx_v_j, __pyx_t_5) < 0)) __PYX_ERR(1, 691, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_4, __pyx_v_j, __pyx_t_5) < 0)) __PYX_ERR(1, 690, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":692 + /* "src/voronoi_dcel.pyx":691 * 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) # <<<<<<<<<<<<<< * new_sites[i][j] = (new_sites[i][j] - 2*d) % mod * Em = self.__class__(self.n, self.w, self.h, self.r, new_sites) */ - __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_3 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_3 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_3)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); - __pyx_t_2 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_2 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_10 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_10 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); - __pyx_t_11 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_11 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); __pyx_t_12 = NULL; __pyx_t_13 = 0; @@ -14646,7 +14434,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[6] = {__pyx_t_12, __pyx_t_3, __pyx_t_2, __pyx_t_10, __pyx_t_11, __pyx_v_new_sites}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -14658,7 +14446,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_4)) { PyObject *__pyx_temp[6] = {__pyx_t_12, __pyx_t_3, __pyx_t_2, __pyx_t_10, __pyx_t_11, __pyx_v_new_sites}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_4, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -14668,7 +14456,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct } else #endif { - __pyx_t_14 = PyTuple_New(5+__pyx_t_13); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_14 = PyTuple_New(5+__pyx_t_13); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); if (__pyx_t_12) { __Pyx_GIVEREF(__pyx_t_12); PyTuple_SET_ITEM(__pyx_t_14, 0, __pyx_t_12); __pyx_t_12 = NULL; @@ -14688,7 +14476,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __pyx_t_2 = 0; __pyx_t_10 = 0; __pyx_t_11 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_14, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 692, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_4, __pyx_t_14, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 691, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; } @@ -14696,49 +14484,49 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_XDECREF_SET(__pyx_v_Ep, __pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":693 + /* "src/voronoi_dcel.pyx":692 * 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 # <<<<<<<<<<<<<< * Em = self.__class__(self.n, self.w, self.h, self.r, new_sites) * new_sites[i][j] = (new_sites[i][j] + d) % mod */ - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 693, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 692, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 693, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 692, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyFloat_FromDouble((2.0 * __pyx_v_d)); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 693, __pyx_L1_error) + __pyx_t_5 = PyFloat_FromDouble((2.0 * __pyx_v_d)); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 692, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_14 = PyNumber_Subtract(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 693, __pyx_L1_error) + __pyx_t_14 = PyNumber_Subtract(__pyx_t_4, __pyx_t_5); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 692, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyNumber_Remainder(__pyx_t_14, __pyx_v_mod); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 693, __pyx_L1_error) + __pyx_t_5 = PyNumber_Remainder(__pyx_t_14, __pyx_v_mod); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 692, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - __pyx_t_14 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 693, __pyx_L1_error) + __pyx_t_14 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 692, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); - if (unlikely(PyObject_SetItem(__pyx_t_14, __pyx_v_j, __pyx_t_5) < 0)) __PYX_ERR(1, 693, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_14, __pyx_v_j, __pyx_t_5) < 0)) __PYX_ERR(1, 692, __pyx_L1_error) __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":694 + /* "src/voronoi_dcel.pyx":693 * 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) # <<<<<<<<<<<<<< * new_sites[i][j] = (new_sites[i][j] + d) % mod * */ - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_14 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_v_self), __pyx_n_s_class); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); - __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_4 = __Pyx_PyInt_From_npy_int64(__pyx_v_self->n); if (unlikely(!__pyx_t_4)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); - __pyx_t_11 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_11 = PyFloat_FromDouble(__pyx_v_self->w); if (unlikely(!__pyx_t_11)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_11); - __pyx_t_10 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_10 = PyFloat_FromDouble(__pyx_v_self->h); if (unlikely(!__pyx_t_10)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_10); - __pyx_t_2 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_2 = PyFloat_FromDouble(__pyx_v_self->r); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_3 = NULL; __pyx_t_13 = 0; @@ -14755,7 +14543,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct #if CYTHON_FAST_PYCALL if (PyFunction_Check(__pyx_t_14)) { PyObject *__pyx_temp[6] = {__pyx_t_3, __pyx_t_4, __pyx_t_11, __pyx_t_10, __pyx_t_2, __pyx_v_new_sites}; - __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_14, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyFunction_FastCall(__pyx_t_14, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -14767,7 +14555,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct #if CYTHON_FAST_PYCCALL if (__Pyx_PyFastCFunction_Check(__pyx_t_14)) { PyObject *__pyx_temp[6] = {__pyx_t_3, __pyx_t_4, __pyx_t_11, __pyx_t_10, __pyx_t_2, __pyx_v_new_sites}; - __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_14, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyCFunction_FastCall(__pyx_t_14, __pyx_temp+1-__pyx_t_13, 5+__pyx_t_13); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_XDECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; @@ -14777,7 +14565,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct } else #endif { - __pyx_t_12 = PyTuple_New(5+__pyx_t_13); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_12 = PyTuple_New(5+__pyx_t_13); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); if (__pyx_t_3) { __Pyx_GIVEREF(__pyx_t_3); PyTuple_SET_ITEM(__pyx_t_12, 0, __pyx_t_3); __pyx_t_3 = NULL; @@ -14797,7 +14585,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __pyx_t_11 = 0; __pyx_t_10 = 0; __pyx_t_2 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_14, __pyx_t_12, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 694, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_t_14, __pyx_t_12, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 693, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; } @@ -14805,55 +14593,55 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_XDECREF_SET(__pyx_v_Em, __pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":695 + /* "src/voronoi_dcel.pyx":694 * 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 # <<<<<<<<<<<<<< * * HE[:, 2*i+j] = ((Ep.gradient - Em.gradient)/(2*d)).flatten() */ - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 695, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 694, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_14 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 695, __pyx_L1_error) + __pyx_t_14 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 694, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyFloat_FromDouble(__pyx_v_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 695, __pyx_L1_error) + __pyx_t_5 = PyFloat_FromDouble(__pyx_v_d); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 694, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_12 = PyNumber_Add(__pyx_t_14, __pyx_t_5); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 695, __pyx_L1_error) + __pyx_t_12 = PyNumber_Add(__pyx_t_14, __pyx_t_5); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 694, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyNumber_Remainder(__pyx_t_12, __pyx_v_mod); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 695, __pyx_L1_error) + __pyx_t_5 = PyNumber_Remainder(__pyx_t_12, __pyx_v_mod); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 694, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; - __pyx_t_12 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 695, __pyx_L1_error) + __pyx_t_12 = __Pyx_PyObject_GetItem(__pyx_v_new_sites, __pyx_v_i); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 694, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - if (unlikely(PyObject_SetItem(__pyx_t_12, __pyx_v_j, __pyx_t_5) < 0)) __PYX_ERR(1, 695, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_12, __pyx_v_j, __pyx_t_5) < 0)) __PYX_ERR(1, 694, __pyx_L1_error) __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":697 + /* "src/voronoi_dcel.pyx":696 * new_sites[i][j] = (new_sites[i][j] + d) % mod * * HE[:, 2*i+j] = ((Ep.gradient - Em.gradient)/(2*d)).flatten() # <<<<<<<<<<<<<< * * # Average out discrepencies, since it should be symmetric. */ - __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_v_Ep, __pyx_n_s_gradient); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_12 = __Pyx_PyObject_GetAttrStr(__pyx_v_Ep, __pyx_n_s_gradient); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_v_Em, __pyx_n_s_gradient); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_v_Em, __pyx_n_s_gradient); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); - __pyx_t_2 = PyNumber_Subtract(__pyx_t_12, __pyx_t_14); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_2 = PyNumber_Subtract(__pyx_t_12, __pyx_t_14); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - __pyx_t_14 = PyFloat_FromDouble((2.0 * __pyx_v_d)); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_14 = PyFloat_FromDouble((2.0 * __pyx_v_d)); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); - __pyx_t_12 = __Pyx_PyNumber_Divide(__pyx_t_2, __pyx_t_14); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_12 = __Pyx_PyNumber_Divide(__pyx_t_2, __pyx_t_14); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_n_s_flatten); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_14 = __Pyx_PyObject_GetAttrStr(__pyx_t_12, __pyx_n_s_flatten); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __pyx_t_12 = NULL; @@ -14868,15 +14656,15 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct } __pyx_t_5 = (__pyx_t_12) ? __Pyx_PyObject_CallOneArg(__pyx_t_14, __pyx_t_12) : __Pyx_PyObject_CallNoArg(__pyx_t_14); __Pyx_XDECREF(__pyx_t_12); __pyx_t_12 = 0; - if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 697, __pyx_L1_error) + if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - __pyx_t_14 = PyNumber_Multiply(__pyx_int_2, __pyx_v_i); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_14 = PyNumber_Multiply(__pyx_int_2, __pyx_v_i); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); - __pyx_t_12 = PyNumber_Add(__pyx_t_14, __pyx_v_j); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_12 = PyNumber_Add(__pyx_t_14, __pyx_v_j); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 697, __pyx_L1_error) + __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_INCREF(__pyx_slice__2); __Pyx_GIVEREF(__pyx_slice__2); @@ -14884,12 +14672,12 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_GIVEREF(__pyx_t_12); PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_t_12); __pyx_t_12 = 0; - if (unlikely(PyObject_SetItem(__pyx_v_HE, __pyx_t_14, __pyx_t_5) < 0)) __PYX_ERR(1, 697, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_v_HE, __pyx_t_14, __pyx_t_5) < 0)) __PYX_ERR(1, 696, __pyx_L1_error) __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; } - /* "voronoi_dcel.pyx":688 + /* "src/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. * for i in range(self.n): # <<<<<<<<<<<<<< @@ -14899,25 +14687,25 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":700 + /* "src/voronoi_dcel.pyx":699 * * # Average out discrepencies, since it should be symmetric. * 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 */ - __pyx_t_1 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_1 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 699, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_CallOneArg(__pyx_builtin_range, __pyx_t_1); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 699, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; if (likely(PyList_CheckExact(__pyx_t_5)) || PyTuple_CheckExact(__pyx_t_5)) { __pyx_t_1 = __pyx_t_5; __Pyx_INCREF(__pyx_t_1); __pyx_t_6 = 0; __pyx_t_7 = NULL; } else { - __pyx_t_6 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_6 = -1; __pyx_t_1 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 699, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); - __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_7 = Py_TYPE(__pyx_t_1)->tp_iternext; if (unlikely(!__pyx_t_7)) __PYX_ERR(1, 699, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; for (;;) { @@ -14925,17 +14713,17 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct if (likely(PyList_CheckExact(__pyx_t_1))) { if (__pyx_t_6 >= PyList_GET_SIZE(__pyx_t_1)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_5 = PyList_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 699, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 699, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } else { if (__pyx_t_6 >= PyTuple_GET_SIZE(__pyx_t_1)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_1, __pyx_t_6); __Pyx_INCREF(__pyx_t_5); __pyx_t_6++; if (unlikely(0 < 0)) __PYX_ERR(1, 699, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 700, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_1, __pyx_t_6); __pyx_t_6++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 699, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } @@ -14945,7 +14733,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(1, 700, __pyx_L1_error) + else __PYX_ERR(1, 699, __pyx_L1_error) } break; } @@ -14954,16 +14742,16 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_XDECREF_SET(__pyx_v_i, __pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":701 + /* "src/voronoi_dcel.pyx":700 * # Average out discrepencies, since it should be symmetric. * 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 * HE[j][i] = HE[i][j] */ - __pyx_t_5 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyInt_From_npy_int64((2 * __pyx_v_self->n)); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 700, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_14 = PyTuple_New(2); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 700, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); __Pyx_INCREF(__pyx_v_i); __Pyx_GIVEREF(__pyx_v_i); @@ -14971,16 +14759,16 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_GIVEREF(__pyx_t_5); PyTuple_SET_ITEM(__pyx_t_14, 1, __pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_14, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_Call(__pyx_builtin_range, __pyx_t_14, NULL); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 700, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; if (likely(PyList_CheckExact(__pyx_t_5)) || PyTuple_CheckExact(__pyx_t_5)) { __pyx_t_14 = __pyx_t_5; __Pyx_INCREF(__pyx_t_14); __pyx_t_15 = 0; __pyx_t_16 = NULL; } else { - __pyx_t_15 = -1; __pyx_t_14 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_15 = -1; __pyx_t_14 = PyObject_GetIter(__pyx_t_5); if (unlikely(!__pyx_t_14)) __PYX_ERR(1, 700, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_14); - __pyx_t_16 = Py_TYPE(__pyx_t_14)->tp_iternext; if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_16 = Py_TYPE(__pyx_t_14)->tp_iternext; if (unlikely(!__pyx_t_16)) __PYX_ERR(1, 700, __pyx_L1_error) } __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; for (;;) { @@ -14988,17 +14776,17 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct if (likely(PyList_CheckExact(__pyx_t_14))) { if (__pyx_t_15 >= PyList_GET_SIZE(__pyx_t_14)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyList_GET_ITEM(__pyx_t_14, __pyx_t_15); __Pyx_INCREF(__pyx_t_5); __pyx_t_15++; if (unlikely(0 < 0)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_5 = PyList_GET_ITEM(__pyx_t_14, __pyx_t_15); __Pyx_INCREF(__pyx_t_5); __pyx_t_15++; if (unlikely(0 < 0)) __PYX_ERR(1, 700, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_14, __pyx_t_15); __pyx_t_15++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_14, __pyx_t_15); __pyx_t_15++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 700, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } else { if (__pyx_t_15 >= PyTuple_GET_SIZE(__pyx_t_14)) break; #if CYTHON_ASSUME_SAFE_MACROS && !CYTHON_AVOID_BORROWED_REFS - __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_14, __pyx_t_15); __Pyx_INCREF(__pyx_t_5); __pyx_t_15++; if (unlikely(0 < 0)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_5 = PyTuple_GET_ITEM(__pyx_t_14, __pyx_t_15); __Pyx_INCREF(__pyx_t_5); __pyx_t_15++; if (unlikely(0 < 0)) __PYX_ERR(1, 700, __pyx_L1_error) #else - __pyx_t_5 = PySequence_ITEM(__pyx_t_14, __pyx_t_15); __pyx_t_15++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) + __pyx_t_5 = PySequence_ITEM(__pyx_t_14, __pyx_t_15); __pyx_t_15++; if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 700, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); #endif } @@ -15008,7 +14796,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct PyObject* exc_type = PyErr_Occurred(); if (exc_type) { if (likely(__Pyx_PyErr_GivenExceptionMatches(exc_type, PyExc_StopIteration))) PyErr_Clear(); - else __PYX_ERR(1, 701, __pyx_L1_error) + else __PYX_ERR(1, 700, __pyx_L1_error) } break; } @@ -15017,55 +14805,55 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_XDECREF_SET(__pyx_v_j, __pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":702 + /* "src/voronoi_dcel.pyx":701 * 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 # <<<<<<<<<<<<<< * HE[j][i] = HE[i][j] * */ - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 702, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_12 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 702, __pyx_L1_error) + __pyx_t_12 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_j); if (unlikely(!__pyx_t_12)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_12); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_j); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 702, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_j); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 702, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_t_5, __pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = PyNumber_Add(__pyx_t_12, __pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 702, __pyx_L1_error) + __pyx_t_5 = PyNumber_Add(__pyx_t_12, __pyx_t_2); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_12); __pyx_t_12 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyInt_TrueDivideObjC(__pyx_t_5, __pyx_int_2, 2, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 702, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyInt_TrueDivideObjC(__pyx_t_5, __pyx_int_2, 2, 0, 0); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 702, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_i); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); - if (unlikely(PyObject_SetItem(__pyx_t_5, __pyx_v_j, __pyx_t_2) < 0)) __PYX_ERR(1, 702, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_5, __pyx_v_j, __pyx_t_2) < 0)) __PYX_ERR(1, 701, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - /* "voronoi_dcel.pyx":703 + /* "src/voronoi_dcel.pyx":702 * for j in range(i, 2*self.n): * HE[i][j] = (HE[i][j] + HE[j][i])/2 * HE[j][i] = HE[i][j] # <<<<<<<<<<<<<< * * return HE */ - __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 703, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_i); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 702, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_t_2, __pyx_v_j); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 703, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_GetItem(__pyx_t_2, __pyx_v_j); if (unlikely(!__pyx_t_5)) __PYX_ERR(1, 702, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_5); __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; - __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 703, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetItem(__pyx_v_HE, __pyx_v_j); if (unlikely(!__pyx_t_2)) __PYX_ERR(1, 702, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - if (unlikely(PyObject_SetItem(__pyx_t_2, __pyx_v_i, __pyx_t_5) < 0)) __PYX_ERR(1, 703, __pyx_L1_error) + if (unlikely(PyObject_SetItem(__pyx_t_2, __pyx_v_i, __pyx_t_5) < 0)) __PYX_ERR(1, 702, __pyx_L1_error) __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; - /* "voronoi_dcel.pyx":701 + /* "src/voronoi_dcel.pyx":700 * # Average out discrepencies, since it should be symmetric. * for i in range(2*self.n): * for j in range(i, 2*self.n): # <<<<<<<<<<<<<< @@ -15075,7 +14863,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct } __Pyx_DECREF(__pyx_t_14); __pyx_t_14 = 0; - /* "voronoi_dcel.pyx":700 + /* "src/voronoi_dcel.pyx":699 * * # Average out discrepencies, since it should be symmetric. * for i in range(2*self.n): # <<<<<<<<<<<<<< @@ -15085,20 +14873,20 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct } __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "voronoi_dcel.pyx":705 + /* "src/voronoi_dcel.pyx":704 * HE[j][i] = HE[i][j] * * return HE # <<<<<<<<<<<<<< * */ __Pyx_XDECREF(((PyObject *)__pyx_r)); - if (!(likely(((__pyx_v_HE) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_HE, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 705, __pyx_L1_error) + if (!(likely(((__pyx_v_HE) == Py_None) || likely(__Pyx_TypeTest(__pyx_v_HE, __pyx_ptype_5numpy_ndarray))))) __PYX_ERR(1, 704, __pyx_L1_error) __Pyx_INCREF(__pyx_v_HE); __pyx_r = ((PyArrayObject *)__pyx_v_HE); goto __pyx_L0; - /* "voronoi_dcel.pyx":680 - * return higher, k1 + /* "src/voronoi_dcel.pyx":679 + * #return higher, k1 * * def hessian(self, d: float) -> np.ndarray: # <<<<<<<<<<<<<< * """ @@ -15116,7 +14904,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct __Pyx_XDECREF(__pyx_t_11); __Pyx_XDECREF(__pyx_t_12); __Pyx_XDECREF(__pyx_t_14); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.hessian", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.hessian", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XDECREF(__pyx_v_HE); @@ -15131,7 +14919,7 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct return __pyx_r; } -/* "packsim_core.pxd":210 +/* "_packsim.pxd":210 * * cdef class VoronoiContainer: * cdef readonly INT_T n # <<<<<<<<<<<<<< @@ -15140,19 +14928,19 @@ static PyArrayObject *__pyx_pf_12packsim_core_16VoronoiContainer_6hessian(struct */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1n_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1n_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1n_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1n_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_1n___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_1n___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1n___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1n___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -15170,7 +14958,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1n___get__(struct __ /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.n.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.n.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -15178,7 +14966,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1n___get__(struct __ return __pyx_r; } -/* "packsim_core.pxd":211 +/* "_packsim.pxd":211 * cdef class VoronoiContainer: * cdef readonly INT_T n * cdef readonly FLOAT_T w, h, r, energy # <<<<<<<<<<<<<< @@ -15187,19 +14975,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1n___get__(struct __ */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1w_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1w_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1w_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1w_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_1w___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_1w___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1w___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1w___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -15217,7 +15005,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1w___get__(struct __ /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.w.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.w.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -15226,19 +15014,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1w___get__(struct __ } /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1h_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1h_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1h_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1h_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_1h___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_1h___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1h___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1h___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -15256,7 +15044,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1h___get__(struct __ /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.h.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.h.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -15265,19 +15053,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1h___get__(struct __ } /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1r_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_1r_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1r_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_1r_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_1r___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_1r___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1r___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_1r___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -15295,7 +15083,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1r___get__(struct __ /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.r.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.r.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -15304,19 +15092,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_1r___get__(struct __ } /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_6energy_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_6energy_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_6energy_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_6energy_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_6energy___get__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_6energy___get__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_6energy___get__(struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_6energy___get__(struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -15334,7 +15122,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_6energy___get__(stru /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.energy.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.energy.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -15349,19 +15137,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_6energy___get__(stru */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_9__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_9__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_9__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_9__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__reduce_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_8__reduce_cython__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_8__reduce_cython__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_8__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -15391,7 +15179,7 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8__reduce_cython__(C /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); @@ -15406,19 +15194,19 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_8__reduce_cython__(C */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_11__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_16VoronoiContainer_11__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_11__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ +static PyObject *__pyx_pw_8_packsim_16VoronoiContainer_11__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__setstate_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_16VoronoiContainer_10__setstate_cython__(((struct __pyx_obj_12packsim_core_VoronoiContainer *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); + __pyx_r = __pyx_pf_8_packsim_16VoronoiContainer_10__setstate_cython__(((struct __pyx_obj_8_packsim_VoronoiContainer *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_10__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_VoronoiContainer *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pf_8_packsim_16VoronoiContainer_10__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_VoronoiContainer *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -15448,14 +15236,14 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_10__setstate_cython_ /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.VoronoiContainer.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.VoronoiContainer.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "energy.pyx":10 +/* "src/energy.pyx":10 * :param sites: [np.ndarray] collection of sites. * """ * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -15464,12 +15252,12 @@ static PyObject *__pyx_pf_12packsim_core_16VoronoiContainer_10__setstate_cython_ */ /* Python wrapper */ -static int __pyx_pw_12packsim_core_10AreaEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static int __pyx_pw_12packsim_core_10AreaEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - __pyx_t_12packsim_core_INT_T __pyx_v_n; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_w; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_h; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_r; +static int __pyx_pw_8_packsim_10AreaEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static int __pyx_pw_8_packsim_10AreaEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + __pyx_t_8_packsim_INT_T __pyx_v_n; + __pyx_t_8_packsim_FLOAT_T __pyx_v_w; + __pyx_t_8_packsim_FLOAT_T __pyx_v_h; + __pyx_t_8_packsim_FLOAT_T __pyx_v_r; PyArrayObject *__pyx_v_site_arr = 0; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -15549,12 +15337,12 @@ static int __pyx_pw_12packsim_core_10AreaEnergy_1__init__(PyObject *__pyx_v_self __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(3, 10, __pyx_L3_error) __pyx_L3_error:; - __Pyx_AddTraceback("packsim_core.AreaEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.AreaEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return -1; __pyx_L4_argument_unpacking_done:; if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_site_arr), __pyx_ptype_5numpy_ndarray, 1, "site_arr", 0))) __PYX_ERR(3, 11, __pyx_L1_error) - __pyx_r = __pyx_pf_12packsim_core_10AreaEnergy___init__(((struct __pyx_obj_12packsim_core_AreaEnergy *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); + __pyx_r = __pyx_pf_8_packsim_10AreaEnergy___init__(((struct __pyx_obj_8_packsim_AreaEnergy *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); /* function exit code */ goto __pyx_L0; @@ -15565,7 +15353,7 @@ static int __pyx_pw_12packsim_core_10AreaEnergy_1__init__(PyObject *__pyx_v_self return __pyx_r; } -static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr) { +static int __pyx_pf_8_packsim_10AreaEnergy___init__(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr) { __Pyx_LocalBuf_ND __pyx_pybuffernd_site_arr; __Pyx_Buffer __pyx_pybuffer_site_arr; int __pyx_r; @@ -15589,20 +15377,20 @@ static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12pack __pyx_pybuffernd_site_arr.rcbuffer = &__pyx_pybuffer_site_arr; { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(3, 10, __pyx_L1_error) + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(3, 10, __pyx_L1_error) } __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]; - /* "energy.pyx":12 + /* "src/energy.pyx":12 * 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 # <<<<<<<<<<<<<< * self.energy = 0.0 * */ - __pyx_v_self->__pyx_base.edge_cache_map = (&__pyx_v_12packsim_core_AREA_EDGE_CACHE_MAP); + __pyx_v_self->__pyx_base.edge_cache_map = (&__pyx_v_8_packsim_AREA_EDGE_CACHE_MAP); - /* "energy.pyx":13 + /* "src/energy.pyx":13 * np.ndarray[FLOAT_T, ndim=2] site_arr): * self.edge_cache_map = &AREA_EDGE_CACHE_MAP * self.energy = 0.0 # <<<<<<<<<<<<<< @@ -15611,7 +15399,7 @@ static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12pack */ __pyx_v_self->__pyx_base.energy = 0.0; - /* "energy.pyx":15 + /* "src/energy.pyx":15 * self.energy = 0.0 * * super().__init__(n, w, h, r, site_arr) # <<<<<<<<<<<<<< @@ -15620,9 +15408,9 @@ static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12pack */ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 15, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_ptype_12packsim_core_AreaEnergy)); - __Pyx_GIVEREF(((PyObject *)__pyx_ptype_12packsim_core_AreaEnergy)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_ptype_12packsim_core_AreaEnergy)); + __Pyx_INCREF(((PyObject *)__pyx_ptype_8_packsim_AreaEnergy)); + __Pyx_GIVEREF(((PyObject *)__pyx_ptype_8_packsim_AreaEnergy)); + PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_ptype_8_packsim_AreaEnergy)); __Pyx_INCREF(((PyObject *)__pyx_v_self)); __Pyx_GIVEREF(((PyObject *)__pyx_v_self)); PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self)); @@ -15704,16 +15492,16 @@ static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12pack __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "energy.pyx":16 + /* "src/energy.pyx":16 * * super().__init__(n, w, h, r, site_arr) * self.minimum = (n)*(w*h/(n)-PI*r**2)**2 # <<<<<<<<<<<<<< * * */ - __pyx_v_self->minimum = (((__pyx_t_12packsim_core_FLOAT_T)__pyx_v_n) * pow((((__pyx_v_w * __pyx_v_h) / ((__pyx_t_12packsim_core_FLOAT_T)__pyx_v_n)) - (M_PI * pow(__pyx_v_r, 2.0))), 2.0)); + __pyx_v_self->minimum = (((__pyx_t_8_packsim_FLOAT_T)__pyx_v_n) * pow((((__pyx_v_w * __pyx_v_h) / ((__pyx_t_8_packsim_FLOAT_T)__pyx_v_n)) - (M_PI * pow(__pyx_v_r, 2.0))), 2.0)); - /* "energy.pyx":10 + /* "src/energy.pyx":10 * :param sites: [np.ndarray] collection of sites. * """ * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -15739,7 +15527,7 @@ static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12pack __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb); __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer); __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);} - __Pyx_AddTraceback("packsim_core.AreaEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.AreaEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = -1; goto __pyx_L2; __pyx_L0:; @@ -15749,7 +15537,7 @@ static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12pack return __pyx_r; } -/* "energy.pyx":19 +/* "src/energy.pyx":19 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -15757,33 +15545,33 @@ static int __pyx_pf_12packsim_core_10AreaEnergy___init__(struct __pyx_obj_12pack * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) */ -static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self) { - __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; - __pyx_t_12packsim_core_Site __pyx_v_xi; - __pyx_t_12packsim_core_HalfEdge __pyx_v_em; - __pyx_t_12packsim_core_HalfEdge __pyx_v_e; - __pyx_t_12packsim_core_HalfEdge __pyx_v_ep; - __pyx_t_12packsim_core_Vector2D __pyx_v_vdiff; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_A; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_energy; - __pyx_t_12packsim_core_INT_T __pyx_v_i; - CYTHON_UNUSED __pyx_t_12packsim_core_INT_T __pyx_v_j; +static void __pyx_f_8_packsim_10AreaEnergy_precompute(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self) { + __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; + __pyx_t_8_packsim_Site __pyx_v_xi; + __pyx_t_8_packsim_HalfEdge __pyx_v_em; + __pyx_t_8_packsim_HalfEdge __pyx_v_e; + __pyx_t_8_packsim_HalfEdge __pyx_v_ep; + __pyx_t_8_packsim_Vector2D __pyx_v_vdiff; + __pyx_t_8_packsim_FLOAT_T __pyx_v_A; + __pyx_t_8_packsim_FLOAT_T __pyx_v_energy; + __pyx_t_8_packsim_INT_T __pyx_v_i; + CYTHON_UNUSED __pyx_t_8_packsim_INT_T __pyx_v_j; __Pyx_RefNannyDeclarations Py_ssize_t __pyx_t_1; - __pyx_t_12packsim_core_INT_T __pyx_t_2; - __pyx_t_12packsim_core_INT_T __pyx_t_3; + __pyx_t_8_packsim_INT_T __pyx_t_2; + __pyx_t_8_packsim_INT_T __pyx_t_3; int __pyx_t_4; - __pyx_t_12packsim_core_INT_T __pyx_t_5; - __pyx_t_12packsim_core_INT_T __pyx_t_6; - __pyx_t_12packsim_core_INT_T __pyx_t_7; - __pyx_t_12packsim_core_HalfEdge __pyx_t_8; - __pyx_t_12packsim_core_HalfEdge __pyx_t_9; + __pyx_t_8_packsim_INT_T __pyx_t_5; + __pyx_t_8_packsim_INT_T __pyx_t_6; + __pyx_t_8_packsim_INT_T __pyx_t_7; + __pyx_t_8_packsim_HalfEdge __pyx_t_8; + __pyx_t_8_packsim_HalfEdge __pyx_t_9; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("precompute", 0); - /* "energy.pyx":20 + /* "src/energy.pyx":20 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -15794,7 +15582,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 20, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 20, __pyx_L1_error)} - /* "energy.pyx":21 + /* "src/energy.pyx":21 * 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) # <<<<<<<<<<<<<< @@ -15805,16 +15593,16 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 21, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 21, __pyx_L1_error)} - /* "energy.pyx":20 + /* "src/energy.pyx":20 * * 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) * */ - __pyx_v_info = __pyx_v_12packsim_core_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); + __pyx_v_info = __pyx_v_8_packsim_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); - /* "energy.pyx":26 + /* "src/energy.pyx":26 * cdef HalfEdge em, e, ep * cdef Vector2D vdiff * cdef FLOAT_T A = PI*self.r**2 # <<<<<<<<<<<<<< @@ -15823,7 +15611,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ __pyx_v_A = (M_PI * pow(__pyx_v_self->__pyx_base.r, 2.0)); - /* "energy.pyx":27 + /* "src/energy.pyx":27 * cdef Vector2D vdiff * cdef FLOAT_T A = PI*self.r**2 * cdef FLOAT_T energy = 0 # <<<<<<<<<<<<<< @@ -15832,7 +15620,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ __pyx_v_energy = 0.0; - /* "energy.pyx":30 + /* "src/energy.pyx":30 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -15868,20 +15656,20 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa #endif /* _OPENMP */ for (__pyx_t_2 = 0; __pyx_t_2 < __pyx_t_3; __pyx_t_2++){ { - __pyx_v_i = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_2); + __pyx_v_i = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_2); /* Initialize private variables to invalid values */ - __pyx_v_j = ((__pyx_t_12packsim_core_INT_T)0xbad0bad0); + __pyx_v_j = ((__pyx_t_8_packsim_INT_T)0xbad0bad0); - /* "energy.pyx":31 + /* "src/energy.pyx":31 * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< * e = xi.edge(&xi) * xi.cache.energy(&xi, */ - __pyx_v_xi = __pyx_v_12packsim_core_init.Site(__pyx_v_i, (&__pyx_v_info)); + __pyx_v_xi = __pyx_v_8_packsim_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "energy.pyx":32 + /* "src/energy.pyx":32 * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -15890,7 +15678,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "energy.pyx":33 + /* "src/energy.pyx":33 * xi = init.Site(i, &info) * e = xi.edge(&xi) * xi.cache.energy(&xi, # <<<<<<<<<<<<<< @@ -15899,7 +15687,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ (void)(__pyx_v_xi.cache->energy((&__pyx_v_xi), pow((__pyx_v_xi.cache->area((&__pyx_v_xi), NAN) - __pyx_v_A), 2.0))); - /* "energy.pyx":36 + /* "src/energy.pyx":36 * (xi.cache.area(&xi, NAN) - A)**2 * ) * if i < self.n: # <<<<<<<<<<<<<< @@ -15909,7 +15697,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa __pyx_t_4 = ((__pyx_v_i < __pyx_v_self->__pyx_base.n) != 0); if (__pyx_t_4) { - /* "energy.pyx":37 + /* "src/energy.pyx":37 * ) * if i < self.n: * energy += xi.cache.energy(&xi, NAN) # <<<<<<<<<<<<<< @@ -15918,7 +15706,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ __pyx_v_energy = (__pyx_v_energy + __pyx_v_xi.cache->energy((&__pyx_v_xi), NAN)); - /* "energy.pyx":36 + /* "src/energy.pyx":36 * (xi.cache.area(&xi, NAN) - A)**2 * ) * if i < self.n: # <<<<<<<<<<<<<< @@ -15927,7 +15715,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ } - /* "energy.pyx":39 + /* "src/energy.pyx":39 * energy += xi.cache.energy(&xi, NAN) * * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< @@ -15949,9 +15737,9 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa #endif /* _OPENMP */ for (__pyx_t_6 = 0; __pyx_t_6 < __pyx_t_7; __pyx_t_6++){ { - __pyx_v_j = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_6); + __pyx_v_j = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_6); - /* "energy.pyx":40 + /* "src/energy.pyx":40 * * for j in prange(xi.edge_num(&xi)): * em, ep = e.prev(&e), e.next(&e) # <<<<<<<<<<<<<< @@ -15963,7 +15751,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa __pyx_v_em = __pyx_t_8; __pyx_v_ep = __pyx_t_9; - /* "energy.pyx":41 + /* "src/energy.pyx":41 * for j in prange(xi.edge_num(&xi)): * em, ep = e.prev(&e), e.next(&e) * vdiff = em.origin(&em) # <<<<<<<<<<<<<< @@ -15972,7 +15760,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ __pyx_v_vdiff = __pyx_v_em.origin((&__pyx_v_em)); - /* "energy.pyx":42 + /* "src/energy.pyx":42 * em, ep = e.prev(&e), e.next(&e) * vdiff = em.origin(&em) * vdiff.self.vsub(&vdiff, ep.origin(&ep)) # <<<<<<<<<<<<<< @@ -15981,25 +15769,25 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ (void)(__pyx_v_vdiff.self.vsub((&__pyx_v_vdiff), __pyx_v_ep.origin((&__pyx_v_ep)))); - /* "energy.pyx":43 + /* "src/energy.pyx":43 * 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_12packsim_core_R.vecmul((&__pyx_v_12packsim_core_R), __pyx_v_vdiff))); + (void)(__pyx_v_e.cache->dVdv((&__pyx_v_e), __pyx_v_8_packsim_R.vecmul((&__pyx_v_8_packsim_R), __pyx_v_vdiff))); - /* "energy.pyx":44 + /* "src/energy.pyx":44 * 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_12packsim_core_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); + (void)(__pyx_v_e.cache->H((&__pyx_v_e), __pyx_f_8_packsim_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); - /* "energy.pyx":46 + /* "src/energy.pyx":46 * e.cache.H(&e, VoronoiContainer.calc_H(em, e)) * * e = e.next(&e) # <<<<<<<<<<<<<< @@ -16025,7 +15813,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa #endif } - /* "energy.pyx":30 + /* "src/energy.pyx":30 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -16051,7 +15839,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa } } - /* "energy.pyx":48 + /* "src/energy.pyx":48 * e = e.next(&e) * * self.energy = energy # <<<<<<<<<<<<<< @@ -16060,7 +15848,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa */ __pyx_v_self->__pyx_base.energy = __pyx_v_energy; - /* "energy.pyx":19 + /* "src/energy.pyx":19 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -16071,12 +15859,12 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa /* function exit code */ goto __pyx_L0; __pyx_L1_error:; - __Pyx_AddTraceback("packsim_core.AreaEnergy.precompute", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.AreaEnergy.precompute", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __Pyx_RefNannyFinishContext(); } -/* "energy.pyx":51 +/* "src/energy.pyx":51 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -16084,40 +15872,40 @@ static void __pyx_f_12packsim_core_10AreaEnergy_precompute(struct __pyx_obj_12pa * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) */ -static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self) { - __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; - __pyx_t_12packsim_core_Site __pyx_v_xi; - __pyx_t_12packsim_core_Site __pyx_v_xf; - __pyx_t_12packsim_core_HalfEdge __pyx_v_e; - __pyx_t_12packsim_core_HalfEdge __pyx_v_f; - __pyx_t_12packsim_core_Vector2D __pyx_v_dedxi_p; - __pyx_t_12packsim_core_BitSet __pyx_v_edge_set; - __pyx_t_12packsim_core_INT_T __pyx_v_num_edges; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_A; +static void __pyx_f_8_packsim_10AreaEnergy_calc_grad(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self) { + __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; + __pyx_t_8_packsim_Site __pyx_v_xi; + __pyx_t_8_packsim_Site __pyx_v_xf; + __pyx_t_8_packsim_HalfEdge __pyx_v_e; + __pyx_t_8_packsim_HalfEdge __pyx_v_f; + __pyx_t_8_packsim_Vector2D __pyx_v_dedxi_p; + __pyx_t_8_packsim_BitSet __pyx_v_edge_set; + __pyx_t_8_packsim_INT_T __pyx_v_num_edges; + __pyx_t_8_packsim_FLOAT_T __pyx_v_A; __Pyx_memviewslice __pyx_v_dedx = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_INT_T __pyx_v_i; - CYTHON_UNUSED __pyx_t_12packsim_core_INT_T __pyx_v_j; + __pyx_t_8_packsim_INT_T __pyx_v_i; + CYTHON_UNUSED __pyx_t_8_packsim_INT_T __pyx_v_j; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; __Pyx_memviewslice __pyx_t_5 = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_INT_T __pyx_t_6; - __pyx_t_12packsim_core_INT_T __pyx_t_7; - __pyx_t_12packsim_core_INT_T __pyx_t_8; - __pyx_t_12packsim_core_INT_T __pyx_t_9; - __pyx_t_12packsim_core_INT_T __pyx_t_10; - __pyx_t_12packsim_core_INT_T __pyx_t_11; + __pyx_t_8_packsim_INT_T __pyx_t_6; + __pyx_t_8_packsim_INT_T __pyx_t_7; + __pyx_t_8_packsim_INT_T __pyx_t_8; + __pyx_t_8_packsim_INT_T __pyx_t_9; + __pyx_t_8_packsim_INT_T __pyx_t_10; + __pyx_t_8_packsim_INT_T __pyx_t_11; int __pyx_t_12; - __pyx_t_12packsim_core_INT_T __pyx_t_13; + __pyx_t_8_packsim_INT_T __pyx_t_13; Py_ssize_t __pyx_t_14; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("calc_grad", 0); - /* "energy.pyx":52 + /* "src/energy.pyx":52 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -16128,7 +15916,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 52, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 52, __pyx_L1_error)} - /* "energy.pyx":53 + /* "src/energy.pyx":53 * 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) # <<<<<<<<<<<<<< @@ -16139,16 +15927,16 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 53, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 53, __pyx_L1_error)} - /* "energy.pyx":52 + /* "src/energy.pyx":52 * * 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) * */ - __pyx_v_info = __pyx_v_12packsim_core_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); + __pyx_v_info = __pyx_v_8_packsim_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); - /* "energy.pyx":60 + /* "src/energy.pyx":60 * cdef BitSet edge_set * * cdef INT_T num_edges = self.edges.shape[0] # <<<<<<<<<<<<<< @@ -16158,7 +15946,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 60, __pyx_L1_error)} __pyx_v_num_edges = (__pyx_v_self->__pyx_base.edges.shape[0]); - /* "energy.pyx":61 + /* "src/energy.pyx":61 * * cdef INT_T num_edges = self.edges.shape[0] * cdef FLOAT_T A = PI*self.r**2 # <<<<<<<<<<<<<< @@ -16167,7 +15955,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_v_A = (M_PI * pow(__pyx_v_self->__pyx_base.r, 2.0)); - /* "energy.pyx":63 + /* "src/energy.pyx":63 * cdef FLOAT_T A = PI*self.r**2 * * cdef FLOAT_T [:, ::1] dedx = np.zeros((self.n, 2), dtype=FLOAT) # <<<<<<<<<<<<<< @@ -16205,13 +15993,13 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(3, 63, __pyx_L1_error) + __pyx_t_5 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_4, PyBUF_WRITABLE); if (unlikely(!__pyx_t_5.memview)) __PYX_ERR(3, 63, __pyx_L1_error) __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; __pyx_v_dedx = __pyx_t_5; __pyx_t_5.memview = NULL; __pyx_t_5.data = NULL; - /* "energy.pyx":66 + /* "src/energy.pyx":66 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -16246,20 +16034,20 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac #endif /* _OPENMP */ for (__pyx_t_7 = 0; __pyx_t_7 < __pyx_t_8; __pyx_t_7++){ { - __pyx_v_i = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_7); + __pyx_v_i = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_7); /* Initialize private variables to invalid values */ - __pyx_v_j = ((__pyx_t_12packsim_core_INT_T)0xbad0bad0); + __pyx_v_j = ((__pyx_t_8_packsim_INT_T)0xbad0bad0); - /* "energy.pyx":67 + /* "src/energy.pyx":67 * cdef INT_T i, j * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< * e = xi.edge(&xi) * edge_set = init.BitSet(num_edges) */ - __pyx_v_xi = __pyx_v_12packsim_core_init.Site(__pyx_v_i, (&__pyx_v_info)); + __pyx_v_xi = __pyx_v_8_packsim_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "energy.pyx":68 + /* "src/energy.pyx":68 * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -16268,16 +16056,16 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "energy.pyx":69 + /* "src/energy.pyx":69 * 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. * f = e */ - __pyx_v_edge_set = __pyx_v_12packsim_core_init.BitSet(__pyx_v_num_edges); + __pyx_v_edge_set = __pyx_v_8_packsim_init.BitSet(__pyx_v_num_edges); - /* "energy.pyx":70 + /* "src/energy.pyx":70 * e = xi.edge(&xi) * edge_set = init.BitSet(num_edges) * for j in prange(xi.edge_num(&xi)): # Looping through site edges. # <<<<<<<<<<<<<< @@ -16299,9 +16087,9 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac #endif /* _OPENMP */ for (__pyx_t_10 = 0; __pyx_t_10 < __pyx_t_11; __pyx_t_10++){ { - __pyx_v_j = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_10); + __pyx_v_j = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_10); - /* "energy.pyx":71 + /* "src/energy.pyx":71 * edge_set = init.BitSet(num_edges) * for j in prange(xi.edge_num(&xi)): # Looping through site edges. * f = e # <<<<<<<<<<<<<< @@ -16310,7 +16098,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_v_f = __pyx_v_e; - /* "energy.pyx":72 + /* "src/energy.pyx":72 * for j in prange(xi.edge_num(&xi)): # Looping through site edges. * f = e * while True: # Circling this vertex. # <<<<<<<<<<<<<< @@ -16319,7 +16107,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ while (1) { - /* "energy.pyx":73 + /* "src/energy.pyx":73 * f = e * while True: # Circling this vertex. * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< @@ -16329,7 +16117,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac __pyx_t_12 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_f.arr_index) != 0)) != 0); if (__pyx_t_12) { - /* "energy.pyx":74 + /* "src/energy.pyx":74 * while True: # Circling this vertex. * if not edge_set.add(&edge_set, f.arr_index): * xf = f.face(&f) # <<<<<<<<<<<<<< @@ -16338,16 +16126,16 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_v_xf = __pyx_v_f.face((&__pyx_v_f)); - /* "energy.pyx":75 + /* "src/energy.pyx":75 * 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_12packsim_core_NAN_VECTOR); + __pyx_v_dedxi_p = __pyx_v_f.cache->dVdv((&__pyx_v_f), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":76 + /* "src/energy.pyx":76 * 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) # <<<<<<<<<<<<<< @@ -16356,16 +16144,16 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ (void)(__pyx_v_dedxi_p.self.smul((&__pyx_v_dedxi_p), (__pyx_v_xf.cache->area((&__pyx_v_xf), NAN) - __pyx_v_A))); - /* "energy.pyx":77 + /* "src/energy.pyx":77 * 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_12packsim_core_NAN_MATRIX))); + (void)(__pyx_v_dedxi_p.self.matmul((&__pyx_v_dedxi_p), __pyx_v_e.cache->H((&__pyx_v_e), __pyx_v_8_packsim_NAN_MATRIX))); - /* "energy.pyx":78 + /* "src/energy.pyx":78 * 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 # <<<<<<<<<<<<<< @@ -16374,9 +16162,9 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_t_13 = __pyx_v_i; __pyx_t_14 = 0; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_13 * __pyx_v_dedx.strides[0]) )) + __pyx_t_14)) )) -= __pyx_v_dedxi_p.x; - /* "energy.pyx":79 + /* "src/energy.pyx":79 * dedxi_p.self.matmul(&dedxi_p, e.cache.H(&e, NAN_MATRIX)) * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y # <<<<<<<<<<<<<< @@ -16385,9 +16173,9 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_t_13 = __pyx_v_i; __pyx_t_14 = 1; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_13 * __pyx_v_dedx.strides[0]) )) + __pyx_t_14)) )) -= __pyx_v_dedxi_p.y; - /* "energy.pyx":73 + /* "src/energy.pyx":73 * f = e * while True: # Circling this vertex. * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< @@ -16396,7 +16184,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ } - /* "energy.pyx":81 + /* "src/energy.pyx":81 * dedx[i][1] -= dedxi_p.y * * f = f.twin(&f) # <<<<<<<<<<<<<< @@ -16405,7 +16193,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_v_f = __pyx_v_f.twin((&__pyx_v_f)); - /* "energy.pyx":82 + /* "src/energy.pyx":82 * * f = f.twin(&f) * f = f.next(&f) # <<<<<<<<<<<<<< @@ -16414,7 +16202,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ __pyx_v_f = __pyx_v_f.next((&__pyx_v_f)); - /* "energy.pyx":83 + /* "src/energy.pyx":83 * f = f.twin(&f) * f = f.next(&f) * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< @@ -16424,7 +16212,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac __pyx_t_12 = ((__pyx_v_f.arr_index == __pyx_v_e.arr_index) != 0); if (__pyx_t_12) { - /* "energy.pyx":84 + /* "src/energy.pyx":84 * f = f.next(&f) * if f.arr_index == e.arr_index: * break # <<<<<<<<<<<<<< @@ -16433,7 +16221,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ goto __pyx_L15_break; - /* "energy.pyx":83 + /* "src/energy.pyx":83 * f = f.twin(&f) * f = f.next(&f) * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< @@ -16444,7 +16232,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac } __pyx_L15_break:; - /* "energy.pyx":86 + /* "src/energy.pyx":86 * break * * e = e.next(&e) # <<<<<<<<<<<<<< @@ -16458,7 +16246,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac } } - /* "energy.pyx":87 + /* "src/energy.pyx":87 * * e = e.next(&e) * edge_set.free(&edge_set) # <<<<<<<<<<<<<< @@ -16479,7 +16267,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac #endif } - /* "energy.pyx":66 + /* "src/energy.pyx":66 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -16498,7 +16286,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac } } - /* "energy.pyx":88 + /* "src/energy.pyx":88 * e = e.next(&e) * edge_set.free(&edge_set) * self.grad = dedx # <<<<<<<<<<<<<< @@ -16509,7 +16297,7 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac __PYX_INC_MEMVIEW(&__pyx_v_dedx, 0); __pyx_v_self->__pyx_base.grad = __pyx_v_dedx; - /* "energy.pyx":51 + /* "src/energy.pyx":51 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -16525,13 +16313,13 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __PYX_XDEC_MEMVIEW(&__pyx_t_5, 1); - __Pyx_AddTraceback("packsim_core.AreaEnergy.calc_grad", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.AreaEnergy.calc_grad", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __PYX_XDEC_MEMVIEW(&__pyx_v_dedx, 1); __Pyx_RefNannyFinishContext(); } -/* "packsim_core.pxd":233 +/* "_packsim.pxd":233 * * cdef class AreaEnergy(VoronoiContainer): * cdef readonly FLOAT_T minimum # <<<<<<<<<<<<<< @@ -16540,19 +16328,19 @@ static void __pyx_f_12packsim_core_10AreaEnergy_calc_grad(struct __pyx_obj_12pac */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_10AreaEnergy_7minimum_1__get__(PyObject *__pyx_v_self); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_10AreaEnergy_7minimum_1__get__(PyObject *__pyx_v_self) { +static PyObject *__pyx_pw_8_packsim_10AreaEnergy_7minimum_1__get__(PyObject *__pyx_v_self); /*proto*/ +static PyObject *__pyx_pw_8_packsim_10AreaEnergy_7minimum_1__get__(PyObject *__pyx_v_self) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__get__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_10AreaEnergy_7minimum___get__(((struct __pyx_obj_12packsim_core_AreaEnergy *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_10AreaEnergy_7minimum___get__(((struct __pyx_obj_8_packsim_AreaEnergy *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_7minimum___get__(struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_10AreaEnergy_7minimum___get__(struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -16570,7 +16358,7 @@ static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_7minimum___get__(struct __ /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.AreaEnergy.minimum.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.AreaEnergy.minimum.__get__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -16585,19 +16373,19 @@ static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_7minimum___get__(struct __ */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_10AreaEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_10AreaEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { +static PyObject *__pyx_pw_8_packsim_10AreaEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyObject *__pyx_pw_8_packsim_10AreaEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__reduce_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_10AreaEnergy_2__reduce_cython__(((struct __pyx_obj_12packsim_core_AreaEnergy *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_10AreaEnergy_2__reduce_cython__(((struct __pyx_obj_8_packsim_AreaEnergy *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_10AreaEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -16627,7 +16415,7 @@ static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_2__reduce_cython__(CYTHON_ /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.AreaEnergy.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.AreaEnergy.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); @@ -16642,19 +16430,19 @@ static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_2__reduce_cython__(CYTHON_ */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_10AreaEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_10AreaEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pw_8_packsim_10AreaEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ +static PyObject *__pyx_pw_8_packsim_10AreaEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__setstate_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_10AreaEnergy_4__setstate_cython__(((struct __pyx_obj_12packsim_core_AreaEnergy *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); + __pyx_r = __pyx_pf_8_packsim_10AreaEnergy_4__setstate_cython__(((struct __pyx_obj_8_packsim_AreaEnergy *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_AreaEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pf_8_packsim_10AreaEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_AreaEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -16684,14 +16472,14 @@ static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_4__setstate_cython__(CYTHO /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.AreaEnergy.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.AreaEnergy.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "energy.pyx":100 +/* "src/energy.pyx":100 * :param sites: [np.ndarray] collection of sites. * """ * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -16700,12 +16488,12 @@ static PyObject *__pyx_pf_12packsim_core_10AreaEnergy_4__setstate_cython__(CYTHO */ /* Python wrapper */ -static int __pyx_pw_12packsim_core_14RadialALEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static int __pyx_pw_12packsim_core_14RadialALEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - __pyx_t_12packsim_core_INT_T __pyx_v_n; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_w; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_h; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_r; +static int __pyx_pw_8_packsim_14RadialALEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static int __pyx_pw_8_packsim_14RadialALEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + __pyx_t_8_packsim_INT_T __pyx_v_n; + __pyx_t_8_packsim_FLOAT_T __pyx_v_w; + __pyx_t_8_packsim_FLOAT_T __pyx_v_h; + __pyx_t_8_packsim_FLOAT_T __pyx_v_r; PyArrayObject *__pyx_v_site_arr = 0; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -16785,12 +16573,12 @@ static int __pyx_pw_12packsim_core_14RadialALEnergy_1__init__(PyObject *__pyx_v_ __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(3, 100, __pyx_L3_error) __pyx_L3_error:; - __Pyx_AddTraceback("packsim_core.RadialALEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialALEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return -1; __pyx_L4_argument_unpacking_done:; if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_site_arr), __pyx_ptype_5numpy_ndarray, 1, "site_arr", 0))) __PYX_ERR(3, 101, __pyx_L1_error) - __pyx_r = __pyx_pf_12packsim_core_14RadialALEnergy___init__(((struct __pyx_obj_12packsim_core_RadialALEnergy *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); + __pyx_r = __pyx_pf_8_packsim_14RadialALEnergy___init__(((struct __pyx_obj_8_packsim_RadialALEnergy *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); /* function exit code */ goto __pyx_L0; @@ -16801,7 +16589,7 @@ static int __pyx_pw_12packsim_core_14RadialALEnergy_1__init__(PyObject *__pyx_v_ return __pyx_r; } -static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr) { +static int __pyx_pf_8_packsim_14RadialALEnergy___init__(struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr) { __Pyx_LocalBuf_ND __pyx_pybuffernd_site_arr; __Pyx_Buffer __pyx_pybuffer_site_arr; int __pyx_r; @@ -16825,11 +16613,11 @@ static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12 __pyx_pybuffernd_site_arr.rcbuffer = &__pyx_pybuffer_site_arr; { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(3, 100, __pyx_L1_error) + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(3, 100, __pyx_L1_error) } __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]; - /* "energy.pyx":103 + /* "src/energy.pyx":103 * np.ndarray[FLOAT_T, ndim=2] site_arr): * #self.edge_cache_map = &AREA_EDGE_CACHE_MAP * self.energy = 0.0 # <<<<<<<<<<<<<< @@ -16838,7 +16626,7 @@ static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12 */ __pyx_v_self->__pyx_base.energy = 0.0; - /* "energy.pyx":105 + /* "src/energy.pyx":105 * self.energy = 0.0 * * super().__init__(n, w, h, r, site_arr) # <<<<<<<<<<<<<< @@ -16847,9 +16635,9 @@ static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12 */ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 105, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_ptype_12packsim_core_RadialALEnergy)); - __Pyx_GIVEREF(((PyObject *)__pyx_ptype_12packsim_core_RadialALEnergy)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_ptype_12packsim_core_RadialALEnergy)); + __Pyx_INCREF(((PyObject *)__pyx_ptype_8_packsim_RadialALEnergy)); + __Pyx_GIVEREF(((PyObject *)__pyx_ptype_8_packsim_RadialALEnergy)); + PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_ptype_8_packsim_RadialALEnergy)); __Pyx_INCREF(((PyObject *)__pyx_v_self)); __Pyx_GIVEREF(((PyObject *)__pyx_v_self)); PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self)); @@ -16931,7 +16719,7 @@ static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12 __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "energy.pyx":100 + /* "src/energy.pyx":100 * :param sites: [np.ndarray] collection of sites. * """ * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -16957,7 +16745,7 @@ static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12 __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb); __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer); __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);} - __Pyx_AddTraceback("packsim_core.RadialALEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialALEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = -1; goto __pyx_L2; __pyx_L0:; @@ -16967,7 +16755,7 @@ static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12 return __pyx_r; } -/* "energy.pyx":108 +/* "src/energy.pyx":108 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -16975,15 +16763,15 @@ static int __pyx_pf_12packsim_core_14RadialALEnergy___init__(struct __pyx_obj_12 * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) */ -static void __pyx_f_12packsim_core_14RadialALEnergy_precompute(struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self) { - CYTHON_UNUSED __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; +static void __pyx_f_8_packsim_14RadialALEnergy_precompute(struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self) { + CYTHON_UNUSED __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; __Pyx_RefNannyDeclarations int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("precompute", 0); - /* "energy.pyx":109 + /* "src/energy.pyx":109 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -16994,7 +16782,7 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_precompute(struct __pyx_obj_ if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 109, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 109, __pyx_L1_error)} - /* "energy.pyx":110 + /* "src/energy.pyx":110 * 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) # <<<<<<<<<<<<<< @@ -17005,16 +16793,16 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_precompute(struct __pyx_obj_ if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 110, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 110, __pyx_L1_error)} - /* "energy.pyx":109 + /* "src/energy.pyx":109 * * 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) * */ - __pyx_v_info = __pyx_v_12packsim_core_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); + __pyx_v_info = __pyx_v_8_packsim_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); - /* "energy.pyx":108 + /* "src/energy.pyx":108 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -17025,12 +16813,12 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_precompute(struct __pyx_obj_ /* function exit code */ goto __pyx_L0; __pyx_L1_error:; - __Pyx_AddTraceback("packsim_core.RadialALEnergy.precompute", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialALEnergy.precompute", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __Pyx_RefNannyFinishContext(); } -/* "energy.pyx":115 +/* "src/energy.pyx":115 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -17038,15 +16826,15 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_precompute(struct __pyx_obj_ * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) */ -static void __pyx_f_12packsim_core_14RadialALEnergy_calc_grad(struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self) { - CYTHON_UNUSED __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; +static void __pyx_f_8_packsim_14RadialALEnergy_calc_grad(struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self) { + CYTHON_UNUSED __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; __Pyx_RefNannyDeclarations int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("calc_grad", 0); - /* "energy.pyx":116 + /* "src/energy.pyx":116 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -17057,7 +16845,7 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_calc_grad(struct __pyx_obj_1 if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 116, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 116, __pyx_L1_error)} - /* "energy.pyx":117 + /* "src/energy.pyx":117 * 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) # <<<<<<<<<<<<<< @@ -17068,16 +16856,16 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_calc_grad(struct __pyx_obj_1 if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 117, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 117, __pyx_L1_error)} - /* "energy.pyx":116 + /* "src/energy.pyx":116 * * 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) * */ - __pyx_v_info = __pyx_v_12packsim_core_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); + __pyx_v_info = __pyx_v_8_packsim_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); - /* "energy.pyx":115 + /* "src/energy.pyx":115 * * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -17088,7 +16876,7 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_calc_grad(struct __pyx_obj_1 /* function exit code */ goto __pyx_L0; __pyx_L1_error:; - __Pyx_AddTraceback("packsim_core.RadialALEnergy.calc_grad", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialALEnergy.calc_grad", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __Pyx_RefNannyFinishContext(); } @@ -17100,19 +16888,19 @@ static void __pyx_f_12packsim_core_14RadialALEnergy_calc_grad(struct __pyx_obj_1 */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_14RadialALEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_14RadialALEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { +static PyObject *__pyx_pw_8_packsim_14RadialALEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyObject *__pyx_pw_8_packsim_14RadialALEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__reduce_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_14RadialALEnergy_2__reduce_cython__(((struct __pyx_obj_12packsim_core_RadialALEnergy *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_14RadialALEnergy_2__reduce_cython__(((struct __pyx_obj_8_packsim_RadialALEnergy *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_14RadialALEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -17142,7 +16930,7 @@ static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_2__reduce_cython__(CYT /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.RadialALEnergy.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialALEnergy.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); @@ -17157,19 +16945,19 @@ static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_2__reduce_cython__(CYT */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_14RadialALEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_14RadialALEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pw_8_packsim_14RadialALEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ +static PyObject *__pyx_pw_8_packsim_14RadialALEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__setstate_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_14RadialALEnergy_4__setstate_cython__(((struct __pyx_obj_12packsim_core_RadialALEnergy *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); + __pyx_r = __pyx_pf_8_packsim_14RadialALEnergy_4__setstate_cython__(((struct __pyx_obj_8_packsim_RadialALEnergy *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialALEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pf_8_packsim_14RadialALEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialALEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -17199,14 +16987,14 @@ static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_4__setstate_cython__(C /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.RadialALEnergy.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialALEnergy.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "energy.pyx":131 +/* "src/energy.pyx":131 * :param sites: [np.ndarray] collection of sites. * """ * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -17215,12 +17003,12 @@ static PyObject *__pyx_pf_12packsim_core_14RadialALEnergy_4__setstate_cython__(C */ /* Python wrapper */ -static int __pyx_pw_12packsim_core_13RadialTEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static int __pyx_pw_12packsim_core_13RadialTEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { - __pyx_t_12packsim_core_INT_T __pyx_v_n; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_w; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_h; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_r; +static int __pyx_pw_8_packsim_13RadialTEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static int __pyx_pw_8_packsim_13RadialTEnergy_1__init__(PyObject *__pyx_v_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { + __pyx_t_8_packsim_INT_T __pyx_v_n; + __pyx_t_8_packsim_FLOAT_T __pyx_v_w; + __pyx_t_8_packsim_FLOAT_T __pyx_v_h; + __pyx_t_8_packsim_FLOAT_T __pyx_v_r; PyArrayObject *__pyx_v_site_arr = 0; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -17300,12 +17088,12 @@ static int __pyx_pw_12packsim_core_13RadialTEnergy_1__init__(PyObject *__pyx_v_s __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("__init__", 1, 5, 5, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(3, 131, __pyx_L3_error) __pyx_L3_error:; - __Pyx_AddTraceback("packsim_core.RadialTEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialTEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return -1; __pyx_L4_argument_unpacking_done:; if (unlikely(!__Pyx_ArgTypeTest(((PyObject *)__pyx_v_site_arr), __pyx_ptype_5numpy_ndarray, 1, "site_arr", 0))) __PYX_ERR(3, 132, __pyx_L1_error) - __pyx_r = __pyx_pf_12packsim_core_13RadialTEnergy___init__(((struct __pyx_obj_12packsim_core_RadialTEnergy *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); + __pyx_r = __pyx_pf_8_packsim_13RadialTEnergy___init__(((struct __pyx_obj_8_packsim_RadialTEnergy *)__pyx_v_self), __pyx_v_n, __pyx_v_w, __pyx_v_h, __pyx_v_r, __pyx_v_site_arr); /* function exit code */ goto __pyx_L0; @@ -17316,7 +17104,7 @@ static int __pyx_pw_12packsim_core_13RadialTEnergy_1__init__(PyObject *__pyx_v_s return __pyx_r; } -static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self, __pyx_t_12packsim_core_INT_T __pyx_v_n, __pyx_t_12packsim_core_FLOAT_T __pyx_v_w, __pyx_t_12packsim_core_FLOAT_T __pyx_v_h, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr) { +static int __pyx_pf_8_packsim_13RadialTEnergy___init__(struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self, __pyx_t_8_packsim_INT_T __pyx_v_n, __pyx_t_8_packsim_FLOAT_T __pyx_v_w, __pyx_t_8_packsim_FLOAT_T __pyx_v_h, __pyx_t_8_packsim_FLOAT_T __pyx_v_r, PyArrayObject *__pyx_v_site_arr) { __Pyx_LocalBuf_ND __pyx_pybuffernd_site_arr; __Pyx_Buffer __pyx_pybuffer_site_arr; int __pyx_r; @@ -17340,20 +17128,20 @@ static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12p __pyx_pybuffernd_site_arr.rcbuffer = &__pyx_pybuffer_site_arr; { __Pyx_BufFmt_StackElem __pyx_stack[1]; - if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(3, 131, __pyx_L1_error) + if (unlikely(__Pyx_GetBufferAndValidate(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer, (PyObject*)__pyx_v_site_arr, &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, PyBUF_FORMAT| PyBUF_STRIDES, 2, 0, __pyx_stack) == -1)) __PYX_ERR(3, 131, __pyx_L1_error) } __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]; - /* "energy.pyx":133 + /* "src/energy.pyx":133 * 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 # <<<<<<<<<<<<<< * self.energy = 0.0 * */ - __pyx_v_self->__pyx_base.edge_cache_map = (&__pyx_v_12packsim_core_RADIALT_EDGE_CACHE_MAP); + __pyx_v_self->__pyx_base.edge_cache_map = (&__pyx_v_8_packsim_RADIALT_EDGE_CACHE_MAP); - /* "energy.pyx":134 + /* "src/energy.pyx":134 * np.ndarray[FLOAT_T, ndim=2] site_arr): * self.edge_cache_map = &RADIALT_EDGE_CACHE_MAP * self.energy = 0.0 # <<<<<<<<<<<<<< @@ -17362,7 +17150,7 @@ static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12p */ __pyx_v_self->__pyx_base.energy = 0.0; - /* "energy.pyx":136 + /* "src/energy.pyx":136 * self.energy = 0.0 * * super().__init__(n, w, h, r, site_arr) # <<<<<<<<<<<<<< @@ -17371,9 +17159,9 @@ static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12p */ __pyx_t_2 = PyTuple_New(2); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 136, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __Pyx_INCREF(((PyObject *)__pyx_ptype_12packsim_core_RadialTEnergy)); - __Pyx_GIVEREF(((PyObject *)__pyx_ptype_12packsim_core_RadialTEnergy)); - PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_ptype_12packsim_core_RadialTEnergy)); + __Pyx_INCREF(((PyObject *)__pyx_ptype_8_packsim_RadialTEnergy)); + __Pyx_GIVEREF(((PyObject *)__pyx_ptype_8_packsim_RadialTEnergy)); + PyTuple_SET_ITEM(__pyx_t_2, 0, ((PyObject *)__pyx_ptype_8_packsim_RadialTEnergy)); __Pyx_INCREF(((PyObject *)__pyx_v_self)); __Pyx_GIVEREF(((PyObject *)__pyx_v_self)); PyTuple_SET_ITEM(__pyx_t_2, 1, ((PyObject *)__pyx_v_self)); @@ -17455,7 +17243,7 @@ static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12p __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "energy.pyx":131 + /* "src/energy.pyx":131 * :param sites: [np.ndarray] collection of sites. * """ * def __init__(AreaEnergy self, INT_T n, FLOAT_T w, FLOAT_T h, FLOAT_T r, # <<<<<<<<<<<<<< @@ -17481,7 +17269,7 @@ static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12p __Pyx_ErrFetch(&__pyx_type, &__pyx_value, &__pyx_tb); __Pyx_SafeReleaseBuffer(&__pyx_pybuffernd_site_arr.rcbuffer->pybuffer); __Pyx_ErrRestore(__pyx_type, __pyx_value, __pyx_tb);} - __Pyx_AddTraceback("packsim_core.RadialTEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialTEnergy.__init__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = -1; goto __pyx_L2; __pyx_L0:; @@ -17491,7 +17279,7 @@ static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12p return __pyx_r; } -/* "energy.pyx":139 +/* "src/energy.pyx":139 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -17499,23 +17287,23 @@ static int __pyx_pf_12packsim_core_13RadialTEnergy___init__(struct __pyx_obj_12p * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) */ -static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self) { - __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; - __pyx_t_12packsim_core_Site __pyx_v_xi; - __pyx_t_12packsim_core_HalfEdge __pyx_v_em; - __pyx_t_12packsim_core_HalfEdge __pyx_v_e; - __pyx_t_12packsim_core_Vector2D __pyx_v_Rnla; +static void __pyx_f_8_packsim_13RadialTEnergy_precompute(struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self) { + __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; + __pyx_t_8_packsim_Site __pyx_v_xi; + __pyx_t_8_packsim_HalfEdge __pyx_v_em; + __pyx_t_8_packsim_HalfEdge __pyx_v_e; + __pyx_t_8_packsim_Vector2D __pyx_v_Rnla; __Pyx_memviewslice __pyx_v_site_energy = { 0, 0, { 0 }, { 0 }, { 0 } }; __Pyx_memviewslice __pyx_v_avg_radii = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_energy; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_r0; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_t; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_tp; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_B; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_lntan; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_csc; - __pyx_t_12packsim_core_INT_T __pyx_v_i; - CYTHON_UNUSED __pyx_t_12packsim_core_INT_T __pyx_v_j; + __pyx_t_8_packsim_FLOAT_T __pyx_v_energy; + __pyx_t_8_packsim_FLOAT_T __pyx_v_r0; + __pyx_t_8_packsim_FLOAT_T __pyx_v_t; + __pyx_t_8_packsim_FLOAT_T __pyx_v_tp; + __pyx_t_8_packsim_FLOAT_T __pyx_v_B; + __pyx_t_8_packsim_FLOAT_T __pyx_v_lntan; + __pyx_t_8_packsim_FLOAT_T __pyx_v_csc; + __pyx_t_8_packsim_INT_T __pyx_v_i; + CYTHON_UNUSED __pyx_t_8_packsim_INT_T __pyx_v_j; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; @@ -17525,22 +17313,22 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 int __pyx_t_6; PyObject *__pyx_t_7 = NULL; __Pyx_memviewslice __pyx_t_8 = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_9; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_10; + __pyx_t_8_packsim_FLOAT_T __pyx_t_9; + __pyx_t_8_packsim_FLOAT_T __pyx_t_10; Py_ssize_t __pyx_t_11; - __pyx_t_12packsim_core_INT_T __pyx_t_12; - __pyx_t_12packsim_core_INT_T __pyx_t_13; - __pyx_t_12packsim_core_INT_T __pyx_t_14; - __pyx_t_12packsim_core_INT_T __pyx_t_15; - __pyx_t_12packsim_core_INT_T __pyx_t_16; + __pyx_t_8_packsim_INT_T __pyx_t_12; + __pyx_t_8_packsim_INT_T __pyx_t_13; + __pyx_t_8_packsim_INT_T __pyx_t_14; + __pyx_t_8_packsim_INT_T __pyx_t_15; + __pyx_t_8_packsim_INT_T __pyx_t_16; int __pyx_t_17; - __pyx_t_12packsim_core_INT_T __pyx_t_18; + __pyx_t_8_packsim_INT_T __pyx_t_18; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("precompute", 0); - /* "energy.pyx":140 + /* "src/energy.pyx":140 * * cdef void precompute(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -17551,7 +17339,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 140, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 140, __pyx_L1_error)} - /* "energy.pyx":141 + /* "src/energy.pyx":141 * 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) # <<<<<<<<<<<<<< @@ -17562,16 +17350,16 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 141, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 141, __pyx_L1_error)} - /* "energy.pyx":140 + /* "src/energy.pyx":140 * * 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) * */ - __pyx_v_info = __pyx_v_12packsim_core_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); + __pyx_v_info = __pyx_v_8_packsim_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); - /* "energy.pyx":148 + /* "src/energy.pyx":148 * * # All energy has a 2pir_0 term. * cdef FLOAT_T [:] site_energy = np.full(self.sites.shape[0], TAU*self.r**2) # <<<<<<<<<<<<<< @@ -17586,7 +17374,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 if (unlikely(!__pyx_v_self->__pyx_base.sites.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 148, __pyx_L1_error)} __pyx_t_2 = PyInt_FromSsize_t((__pyx_v_self->__pyx_base.sites.shape[0])); if (unlikely(!__pyx_t_2)) __PYX_ERR(3, 148, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); - __pyx_t_4 = PyFloat_FromDouble((__pyx_v_12packsim_core_TAU * pow(__pyx_v_self->__pyx_base.r, 2.0))); if (unlikely(!__pyx_t_4)) __PYX_ERR(3, 148, __pyx_L1_error) + __pyx_t_4 = PyFloat_FromDouble((__pyx_v_8_packsim_TAU * pow(__pyx_v_self->__pyx_base.r, 2.0))); if (unlikely(!__pyx_t_4)) __PYX_ERR(3, 148, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_4); __pyx_t_5 = NULL; __pyx_t_6 = 0; @@ -17637,13 +17425,13 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; } __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; - __pyx_t_8 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_8.memview)) __PYX_ERR(3, 148, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_8.memview)) __PYX_ERR(3, 148, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_site_energy = __pyx_t_8; __pyx_t_8.memview = NULL; __pyx_t_8.data = NULL; - /* "energy.pyx":149 + /* "src/energy.pyx":149 * # 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]) # <<<<<<<<<<<<<< @@ -17674,13 +17462,13 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 if (unlikely(!__pyx_t_1)) __PYX_ERR(3, 149, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0; - __pyx_t_8 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_8.memview)) __PYX_ERR(3, 149, __pyx_L1_error) + __pyx_t_8 = __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_1, PyBUF_WRITABLE); if (unlikely(!__pyx_t_8.memview)) __PYX_ERR(3, 149, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; __pyx_v_avg_radii = __pyx_t_8; __pyx_t_8.memview = NULL; __pyx_t_8.data = NULL; - /* "energy.pyx":151 + /* "src/energy.pyx":151 * 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 # <<<<<<<<<<<<<< @@ -17692,7 +17480,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 __pyx_v_energy = __pyx_t_9; __pyx_v_r0 = __pyx_t_10; - /* "energy.pyx":154 + /* "src/energy.pyx":154 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -17728,25 +17516,25 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 #endif /* _OPENMP */ for (__pyx_t_12 = 0; __pyx_t_12 < __pyx_t_13; __pyx_t_12++){ { - __pyx_v_i = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_12); + __pyx_v_i = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_12); /* Initialize private variables to invalid values */ - __pyx_v_B = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_csc = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_j = ((__pyx_t_12packsim_core_INT_T)0xbad0bad0); - __pyx_v_lntan = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_t = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_tp = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); + __pyx_v_B = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_csc = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_j = ((__pyx_t_8_packsim_INT_T)0xbad0bad0); + __pyx_v_lntan = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_t = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_tp = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); - /* "energy.pyx":155 + /* "src/energy.pyx":155 * 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)): */ - __pyx_v_xi = __pyx_v_12packsim_core_init.Site(__pyx_v_i, (&__pyx_v_info)); + __pyx_v_xi = __pyx_v_8_packsim_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "energy.pyx":156 + /* "src/energy.pyx":156 * for i in prange(self.sites.shape[0], nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -17755,7 +17543,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "energy.pyx":157 + /* "src/energy.pyx":157 * xi = init.Site(i, &info) * e = xi.edge(&xi) * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< @@ -17777,11 +17565,11 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 #endif /* _OPENMP */ for (__pyx_t_15 = 0; __pyx_t_15 < __pyx_t_16; __pyx_t_15++){ { - __pyx_v_j = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_15); + __pyx_v_j = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_15); /* Initialize private variables to invalid values */ - __pyx_v_t = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); + __pyx_v_t = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); - /* "energy.pyx":158 + /* "src/energy.pyx":158 * e = xi.edge(&xi) * for j in prange(xi.edge_num(&xi)): * em = e.prev(&e) # <<<<<<<<<<<<<< @@ -17790,25 +17578,25 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_v_em = __pyx_v_e.prev((&__pyx_v_e)); - /* "energy.pyx":159 + /* "src/energy.pyx":159 * for j in prange(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_12packsim_core_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); + (void)(__pyx_v_e.cache->H((&__pyx_v_e), __pyx_f_8_packsim_16VoronoiContainer_calc_H(__pyx_v_em, __pyx_v_e))); - /* "energy.pyx":160 + /* "src/energy.pyx":160 * 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_12packsim_core_4Calc_phi(__pyx_v_e); + __pyx_v_t = __pyx_f_8_packsim_4Calc_phi(__pyx_v_e); - /* "energy.pyx":162 + /* "src/energy.pyx":162 * t = Calc.phi(e) * * e.cache.phi(&e, t) # <<<<<<<<<<<<<< @@ -17817,16 +17605,16 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ (void)(__pyx_v_e.cache->phi((&__pyx_v_e), __pyx_v_t)); - /* "energy.pyx":163 + /* "src/energy.pyx":163 * * 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_12packsim_core_NAN_VECTOR); + __pyx_v_Rnla = __pyx_v_e.cache->la((&__pyx_v_e), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":164 + /* "src/energy.pyx":164 * e.cache.phi(&e, t) * Rnla = e.cache.la(&e, NAN_VECTOR) * Rnla.self.neg(&Rnla) # <<<<<<<<<<<<<< @@ -17835,7 +17623,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ (void)(__pyx_v_Rnla.self.neg((&__pyx_v_Rnla))); - /* "energy.pyx":165 + /* "src/energy.pyx":165 * Rnla = e.cache.la(&e, NAN_VECTOR) * Rnla.self.neg(&Rnla) * Rnla = Rnla.rot(&Rnla) # <<<<<<<<<<<<<< @@ -17844,7 +17632,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_v_Rnla = __pyx_v_Rnla.rot((&__pyx_v_Rnla)); - /* "energy.pyx":167 + /* "src/energy.pyx":167 * Rnla = Rnla.rot(&Rnla) * * if Rnla.x < 0: # <<<<<<<<<<<<<< @@ -17854,16 +17642,16 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 __pyx_t_17 = ((__pyx_v_Rnla.x < 0.0) != 0); if (__pyx_t_17) { - /* "energy.pyx":168 + /* "src/energy.pyx":168 * * 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_12packsim_core_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_8_packsim_FLOAT_T)acos(((double)(__pyx_v_Rnla.y / __pyx_v_e.cache->la_mag((&__pyx_v_e), NAN)))))))); - /* "energy.pyx":167 + /* "src/energy.pyx":167 * Rnla = Rnla.rot(&Rnla) * * if Rnla.x < 0: # <<<<<<<<<<<<<< @@ -17873,7 +17661,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 goto __pyx_L14; } - /* "energy.pyx":170 + /* "src/energy.pyx":170 * 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)))) # <<<<<<<<<<<<<< @@ -17881,20 +17669,20 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 * e.cache.i2p(&e, Calc.I2(e, r0, t)) */ /*else*/ { - (void)(__pyx_v_e.cache->B((&__pyx_v_e), ((__pyx_t_12packsim_core_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_8_packsim_FLOAT_T)acos(((double)(__pyx_v_Rnla.y / __pyx_v_e.cache->la_mag((&__pyx_v_e), NAN))))))); } __pyx_L14:; - /* "energy.pyx":172 + /* "src/energy.pyx":172 * 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_12packsim_core_4Calc_I2(__pyx_v_e, __pyx_v_r0, __pyx_v_t))); + (void)(__pyx_v_e.cache->i2p((&__pyx_v_e), __pyx_f_8_packsim_4Calc_I2(__pyx_v_e, __pyx_v_r0, __pyx_v_t))); - /* "energy.pyx":173 + /* "src/energy.pyx":173 * * e.cache.i2p(&e, Calc.I2(e, r0, t)) * e = e.next(&e) # <<<<<<<<<<<<<< @@ -17908,7 +17696,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 } } - /* "energy.pyx":176 + /* "src/energy.pyx":176 * * # For looping again to calculate integrals. * em = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -17917,7 +17705,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_v_em = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "energy.pyx":177 + /* "src/energy.pyx":177 * # For looping again to calculate integrals. * em = xi.edge(&xi) * for j in prange(xi.edge_num(&xi)): # <<<<<<<<<<<<<< @@ -17939,15 +17727,15 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 #endif /* _OPENMP */ for (__pyx_t_15 = 0; __pyx_t_15 < __pyx_t_14; __pyx_t_15++){ { - __pyx_v_j = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_15); + __pyx_v_j = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_15); /* Initialize private variables to invalid values */ - __pyx_v_B = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_csc = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_lntan = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_t = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); - __pyx_v_tp = ((__pyx_t_12packsim_core_FLOAT_T)__PYX_NAN()); + __pyx_v_B = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_csc = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_lntan = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_t = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); + __pyx_v_tp = ((__pyx_t_8_packsim_FLOAT_T)__PYX_NAN()); - /* "energy.pyx":178 + /* "src/energy.pyx":178 * em = xi.edge(&xi) * for j in prange(xi.edge_num(&xi)): * e = em.next(&em) # <<<<<<<<<<<<<< @@ -17956,7 +17744,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_v_e = __pyx_v_em.next((&__pyx_v_em)); - /* "energy.pyx":179 + /* "src/energy.pyx":179 * for j in prange(xi.edge_num(&xi)): * e = em.next(&em) * B = em.cache.B(&em, NAN) # <<<<<<<<<<<<<< @@ -17965,7 +17753,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_v_B = __pyx_v_em.cache->B((&__pyx_v_em), NAN); - /* "energy.pyx":180 + /* "src/energy.pyx":180 * e = em.next(&em) * B = em.cache.B(&em, NAN) * t, tp = em.cache.phi(&em, NAN), e.cache.phi(&e, NAN) # <<<<<<<<<<<<<< @@ -17977,25 +17765,25 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 __pyx_v_t = __pyx_t_10; __pyx_v_tp = __pyx_t_9; - /* "energy.pyx":182 + /* "src/energy.pyx":182 * 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_12packsim_core_FLOAT_T)log(fabs(tan(((double)((__pyx_v_tp + __pyx_v_B) / 2.0)))))) - ((__pyx_t_12packsim_core_FLOAT_T)log(fabs(tan(((double)((__pyx_v_t + __pyx_v_B) / 2.0))))))); + __pyx_v_lntan = (((__pyx_t_8_packsim_FLOAT_T)log(fabs(tan(((double)((__pyx_v_tp + __pyx_v_B) / 2.0)))))) - ((__pyx_t_8_packsim_FLOAT_T)log(fabs(tan(((double)((__pyx_v_t + __pyx_v_B) / 2.0))))))); - /* "energy.pyx":185 + /* "src/energy.pyx":185 * (log(fabs(tan(((t+B)/2))))) * * csc = 1/((sin((tp+B)))) - \ # <<<<<<<<<<<<<< * 1/((sin((t+B)))) * */ - __pyx_v_csc = ((1.0 / ((__pyx_t_12packsim_core_FLOAT_T)sin(((double)(__pyx_v_tp + __pyx_v_B))))) - (1.0 / ((__pyx_t_12packsim_core_FLOAT_T)sin(((double)(__pyx_v_t + __pyx_v_B)))))); + __pyx_v_csc = ((1.0 / ((__pyx_t_8_packsim_FLOAT_T)sin(((double)(__pyx_v_tp + __pyx_v_B))))) - (1.0 / ((__pyx_t_8_packsim_FLOAT_T)sin(((double)(__pyx_v_t + __pyx_v_B)))))); - /* "energy.pyx":188 + /* "src/energy.pyx":188 * 1/((sin((t+B)))) * * em.cache.lntan(&em, lntan) # <<<<<<<<<<<<<< @@ -18004,7 +17792,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ (void)(__pyx_v_em.cache->lntan((&__pyx_v_em), __pyx_v_lntan)); - /* "energy.pyx":189 + /* "src/energy.pyx":189 * * em.cache.lntan(&em, lntan) * em.cache.csc(&em, csc) # <<<<<<<<<<<<<< @@ -18013,7 +17801,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ (void)(__pyx_v_em.cache->csc((&__pyx_v_em), __pyx_v_csc)); - /* "energy.pyx":191 + /* "src/energy.pyx":191 * em.cache.csc(&em, csc) * * avg_radii[i] += (em.cache.F(&em, NAN)/em.cache.la_mag(&em, NAN))*lntan # <<<<<<<<<<<<<< @@ -18021,9 +17809,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 * em = em.next(&em) */ __pyx_t_18 = __pyx_v_i; - *((__pyx_t_12packsim_core_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_8_packsim_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); - /* "energy.pyx":193 + /* "src/energy.pyx":193 * avg_radii[i] += (em.cache.F(&em, NAN)/em.cache.la_mag(&em, NAN))*lntan * * em = em.next(&em) # <<<<<<<<<<<<<< @@ -18037,7 +17825,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 } } - /* "energy.pyx":195 + /* "src/energy.pyx":195 * em = em.next(&em) * * site_energy[i] += 2*(xi.cache.area(&xi, NAN) - r0*avg_radii[i]) # <<<<<<<<<<<<<< @@ -18046,9 +17834,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_t_14 = __pyx_v_i; __pyx_t_15 = __pyx_v_i; - *((__pyx_t_12packsim_core_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_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_14 * __pyx_v_avg_radii.strides[0]) )))))); + *((__pyx_t_8_packsim_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_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_14 * __pyx_v_avg_radii.strides[0]) )))))); - /* "energy.pyx":197 + /* "src/energy.pyx":197 * site_energy[i] += 2*(xi.cache.area(&xi, NAN) - r0*avg_radii[i]) * * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) # <<<<<<<<<<<<<< @@ -18056,9 +17844,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 * if i < self.n: */ __pyx_t_14 = __pyx_v_i; - (void)(__pyx_v_xi.cache->avg_radius((&__pyx_v_xi), ((*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_14 * __pyx_v_avg_radii.strides[0]) ))) / __pyx_v_12packsim_core_TAU))); + (void)(__pyx_v_xi.cache->avg_radius((&__pyx_v_xi), ((*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_avg_radii.data + __pyx_t_14 * __pyx_v_avg_radii.strides[0]) ))) / __pyx_v_8_packsim_TAU))); - /* "energy.pyx":198 + /* "src/energy.pyx":198 * * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) * xi.cache.energy(&xi, site_energy[i]) # <<<<<<<<<<<<<< @@ -18066,9 +17854,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 * energy += site_energy[i] */ __pyx_t_14 = __pyx_v_i; - (void)(__pyx_v_xi.cache->energy((&__pyx_v_xi), (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_energy.data + __pyx_t_14 * __pyx_v_site_energy.strides[0]) ))))); + (void)(__pyx_v_xi.cache->energy((&__pyx_v_xi), (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_energy.data + __pyx_t_14 * __pyx_v_site_energy.strides[0]) ))))); - /* "energy.pyx":199 + /* "src/energy.pyx":199 * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) * xi.cache.energy(&xi, site_energy[i]) * if i < self.n: # <<<<<<<<<<<<<< @@ -18078,7 +17866,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 __pyx_t_17 = ((__pyx_v_i < __pyx_v_self->__pyx_base.n) != 0); if (__pyx_t_17) { - /* "energy.pyx":200 + /* "src/energy.pyx":200 * xi.cache.energy(&xi, site_energy[i]) * if i < self.n: * energy += site_energy[i] # <<<<<<<<<<<<<< @@ -18086,9 +17874,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 * self.energy = energy */ __pyx_t_14 = __pyx_v_i; - __pyx_v_energy = (__pyx_v_energy + (*((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_energy.data + __pyx_t_14 * __pyx_v_site_energy.strides[0]) )))); + __pyx_v_energy = (__pyx_v_energy + (*((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_site_energy.data + __pyx_t_14 * __pyx_v_site_energy.strides[0]) )))); - /* "energy.pyx":199 + /* "src/energy.pyx":199 * xi.cache.avg_radius(&xi, avg_radii[i]/TAU) * xi.cache.energy(&xi, site_energy[i]) * if i < self.n: # <<<<<<<<<<<<<< @@ -18109,7 +17897,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 #endif } - /* "energy.pyx":154 + /* "src/energy.pyx":154 * * cdef INT_T i, j * for i in prange(self.sites.shape[0], nogil=True): # <<<<<<<<<<<<<< @@ -18135,7 +17923,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 } } - /* "energy.pyx":202 + /* "src/energy.pyx":202 * energy += site_energy[i] * * self.energy = energy # <<<<<<<<<<<<<< @@ -18144,7 +17932,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 */ __pyx_v_self->__pyx_base.energy = __pyx_v_energy; - /* "energy.pyx":139 + /* "src/energy.pyx":139 * * * cdef void precompute(self) except *: # <<<<<<<<<<<<<< @@ -18162,14 +17950,14 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 __Pyx_XDECREF(__pyx_t_5); __Pyx_XDECREF(__pyx_t_7); __PYX_XDEC_MEMVIEW(&__pyx_t_8, 1); - __Pyx_AddTraceback("packsim_core.RadialTEnergy.precompute", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialTEnergy.precompute", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __PYX_XDEC_MEMVIEW(&__pyx_v_site_energy, 1); __PYX_XDEC_MEMVIEW(&__pyx_v_avg_radii, 1); __Pyx_RefNannyFinishContext(); } -/* "energy.pyx":204 +/* "src/energy.pyx":204 * self.energy = energy * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -18177,41 +17965,41 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_precompute(struct __pyx_obj_1 * self.vertices, self.site_cache, self.edge_cache, self.edge_cache_map) */ -static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self) { - __pyx_t_12packsim_core_VoronoiInfo __pyx_v_info; - __pyx_t_12packsim_core_Site __pyx_v_xi; - __pyx_t_12packsim_core_HalfEdge __pyx_v_e; - __pyx_t_12packsim_core_HalfEdge __pyx_v_fm; - __pyx_t_12packsim_core_HalfEdge __pyx_v_f; - __pyx_t_12packsim_core_Vector2D __pyx_v_dedxi_p; - __pyx_t_12packsim_core_BitSet __pyx_v_edge_set; - __pyx_t_12packsim_core_INT_T __pyx_v_num_edges; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_r0; +static void __pyx_f_8_packsim_13RadialTEnergy_calc_grad(struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self) { + __pyx_t_8_packsim_VoronoiInfo __pyx_v_info; + __pyx_t_8_packsim_Site __pyx_v_xi; + __pyx_t_8_packsim_HalfEdge __pyx_v_e; + __pyx_t_8_packsim_HalfEdge __pyx_v_fm; + __pyx_t_8_packsim_HalfEdge __pyx_v_f; + __pyx_t_8_packsim_Vector2D __pyx_v_dedxi_p; + __pyx_t_8_packsim_BitSet __pyx_v_edge_set; + __pyx_t_8_packsim_INT_T __pyx_v_num_edges; + __pyx_t_8_packsim_FLOAT_T __pyx_v_r0; __Pyx_memviewslice __pyx_v_dedx = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_INT_T __pyx_v_i; - CYTHON_UNUSED __pyx_t_12packsim_core_INT_T __pyx_v_j; + __pyx_t_8_packsim_INT_T __pyx_v_i; + CYTHON_UNUSED __pyx_t_8_packsim_INT_T __pyx_v_j; __Pyx_RefNannyDeclarations - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; PyObject *__pyx_t_2 = NULL; PyObject *__pyx_t_3 = NULL; PyObject *__pyx_t_4 = NULL; PyObject *__pyx_t_5 = NULL; __Pyx_memviewslice __pyx_t_6 = { 0, 0, { 0 }, { 0 }, { 0 } }; - __pyx_t_12packsim_core_INT_T __pyx_t_7; - __pyx_t_12packsim_core_INT_T __pyx_t_8; - __pyx_t_12packsim_core_INT_T __pyx_t_9; - __pyx_t_12packsim_core_INT_T __pyx_t_10; - __pyx_t_12packsim_core_INT_T __pyx_t_11; - __pyx_t_12packsim_core_INT_T __pyx_t_12; + __pyx_t_8_packsim_INT_T __pyx_t_7; + __pyx_t_8_packsim_INT_T __pyx_t_8; + __pyx_t_8_packsim_INT_T __pyx_t_9; + __pyx_t_8_packsim_INT_T __pyx_t_10; + __pyx_t_8_packsim_INT_T __pyx_t_11; + __pyx_t_8_packsim_INT_T __pyx_t_12; int __pyx_t_13; - __pyx_t_12packsim_core_INT_T __pyx_t_14; + __pyx_t_8_packsim_INT_T __pyx_t_14; Py_ssize_t __pyx_t_15; int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; __Pyx_RefNannySetupContext("calc_grad", 0); - /* "energy.pyx":205 + /* "src/energy.pyx":205 * * cdef void calc_grad(self) except *: * cdef VoronoiInfo info = init.VoronoiInfo(self.sites, self.edges, self.points, # <<<<<<<<<<<<<< @@ -18222,7 +18010,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 205, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.points.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 205, __pyx_L1_error)} - /* "energy.pyx":206 + /* "src/energy.pyx":206 * 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) # <<<<<<<<<<<<<< @@ -18233,16 +18021,16 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 if (unlikely(!__pyx_v_self->__pyx_base.site_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 206, __pyx_L1_error)} if (unlikely(!__pyx_v_self->__pyx_base.edge_cache.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 206, __pyx_L1_error)} - /* "energy.pyx":205 + /* "src/energy.pyx":205 * * 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) * */ - __pyx_v_info = __pyx_v_12packsim_core_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); + __pyx_v_info = __pyx_v_8_packsim_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); - /* "energy.pyx":213 + /* "src/energy.pyx":213 * cdef BitSet edge_set * * cdef INT_T num_edges = self.edges.shape[0] # <<<<<<<<<<<<<< @@ -18252,7 +18040,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 if (unlikely(!__pyx_v_self->__pyx_base.edges.memview)) {PyErr_SetString(PyExc_AttributeError,"Memoryview is not initialized");__PYX_ERR(3, 213, __pyx_L1_error)} __pyx_v_num_edges = (__pyx_v_self->__pyx_base.edges.shape[0]); - /* "energy.pyx":214 + /* "src/energy.pyx":214 * * cdef INT_T num_edges = self.edges.shape[0] * cdef FLOAT_T r0 = self.r # <<<<<<<<<<<<<< @@ -18262,7 +18050,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 __pyx_t_1 = __pyx_v_self->__pyx_base.r; __pyx_v_r0 = __pyx_t_1; - /* "energy.pyx":216 + /* "src/energy.pyx":216 * cdef FLOAT_T r0 = self.r * * cdef FLOAT_T [:, ::1] dedx = np.zeros((self.n, 2), dtype=FLOAT) # <<<<<<<<<<<<<< @@ -18300,13 +18088,13 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; __Pyx_DECREF(__pyx_t_2); __pyx_t_2 = 0; __Pyx_DECREF(__pyx_t_4); __pyx_t_4 = 0; - __pyx_t_6 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(__pyx_t_5, PyBUF_WRITABLE); if (unlikely(!__pyx_t_6.memview)) __PYX_ERR(3, 216, __pyx_L1_error) + __pyx_t_6 = __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(__pyx_t_5, PyBUF_WRITABLE); if (unlikely(!__pyx_t_6.memview)) __PYX_ERR(3, 216, __pyx_L1_error) __Pyx_DECREF(__pyx_t_5); __pyx_t_5 = 0; __pyx_v_dedx = __pyx_t_6; __pyx_t_6.memview = NULL; __pyx_t_6.data = NULL; - /* "energy.pyx":219 + /* "src/energy.pyx":219 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -18341,20 +18129,20 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 #endif /* _OPENMP */ for (__pyx_t_8 = 0; __pyx_t_8 < __pyx_t_9; __pyx_t_8++){ { - __pyx_v_i = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_8); + __pyx_v_i = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_8); /* Initialize private variables to invalid values */ - __pyx_v_j = ((__pyx_t_12packsim_core_INT_T)0xbad0bad0); + __pyx_v_j = ((__pyx_t_8_packsim_INT_T)0xbad0bad0); - /* "energy.pyx":220 + /* "src/energy.pyx":220 * cdef INT_T i, j * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) # <<<<<<<<<<<<<< * e = xi.edge(&xi) * edge_set = init.BitSet(num_edges) */ - __pyx_v_xi = __pyx_v_12packsim_core_init.Site(__pyx_v_i, (&__pyx_v_info)); + __pyx_v_xi = __pyx_v_8_packsim_init.Site(__pyx_v_i, (&__pyx_v_info)); - /* "energy.pyx":221 + /* "src/energy.pyx":221 * for i in prange(self.n, nogil=True): * xi = init.Site(i, &info) * e = xi.edge(&xi) # <<<<<<<<<<<<<< @@ -18363,16 +18151,16 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_v_e = __pyx_v_xi.edge((&__pyx_v_xi)); - /* "energy.pyx":222 + /* "src/energy.pyx":222 * 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. */ - __pyx_v_edge_set = __pyx_v_12packsim_core_init.BitSet(__pyx_v_num_edges); + __pyx_v_edge_set = __pyx_v_8_packsim_init.BitSet(__pyx_v_num_edges); - /* "energy.pyx":224 + /* "src/energy.pyx":224 * edge_set = init.BitSet(num_edges) * * for j in prange(xi.edge_num(&xi)): # Looping through site edges. # <<<<<<<<<<<<<< @@ -18394,9 +18182,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 #endif /* _OPENMP */ for (__pyx_t_11 = 0; __pyx_t_11 < __pyx_t_12; __pyx_t_11++){ { - __pyx_v_j = (__pyx_t_12packsim_core_INT_T)(0 + 1 * __pyx_t_11); + __pyx_v_j = (__pyx_t_8_packsim_INT_T)(0 + 1 * __pyx_t_11); - /* "energy.pyx":225 + /* "src/energy.pyx":225 * * for j in prange(xi.edge_num(&xi)): # Looping through site edges. * f = e # <<<<<<<<<<<<<< @@ -18405,7 +18193,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_v_f = __pyx_v_e; - /* "energy.pyx":226 + /* "src/energy.pyx":226 * for j in prange(xi.edge_num(&xi)): # Looping through site edges. * f = e * while True: # Circling this vertex. # <<<<<<<<<<<<<< @@ -18414,7 +18202,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ while (1) { - /* "energy.pyx":227 + /* "src/energy.pyx":227 * f = e * while True: # Circling this vertex. * fm = f.prev(&f) # <<<<<<<<<<<<<< @@ -18423,7 +18211,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_v_fm = __pyx_v_f.prev((&__pyx_v_f)); - /* "energy.pyx":228 + /* "src/energy.pyx":228 * while True: # Circling this vertex. * fm = f.prev(&f) * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< @@ -18433,16 +18221,16 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 __pyx_t_13 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_f.arr_index) != 0)) != 0); if (__pyx_t_13) { - /* "energy.pyx":229 + /* "src/energy.pyx":229 * 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_12packsim_core_4Calc_radialt_edge_grad(__pyx_v_f, __pyx_v_xi, __pyx_v_r0); + __pyx_v_dedxi_p = __pyx_f_8_packsim_4Calc_radialt_edge_grad(__pyx_v_f, __pyx_v_xi, __pyx_v_r0); - /* "energy.pyx":230 + /* "src/energy.pyx":230 * 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 # <<<<<<<<<<<<<< @@ -18451,9 +18239,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_t_14 = __pyx_v_i; __pyx_t_15 = 0; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.x; - /* "energy.pyx":231 + /* "src/energy.pyx":231 * dedxi_p = Calc.radialt_edge_grad(f, xi, r0) * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y # <<<<<<<<<<<<<< @@ -18462,9 +18250,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_t_14 = __pyx_v_i; __pyx_t_15 = 1; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.y; - /* "energy.pyx":228 + /* "src/energy.pyx":228 * while True: # Circling this vertex. * fm = f.prev(&f) * if not edge_set.add(&edge_set, f.arr_index): # <<<<<<<<<<<<<< @@ -18473,7 +18261,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ } - /* "energy.pyx":233 + /* "src/energy.pyx":233 * dedx[i][1] -= dedxi_p.y * * if not edge_set.add(&edge_set, fm.arr_index): # <<<<<<<<<<<<<< @@ -18483,16 +18271,16 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 __pyx_t_13 = ((!(__pyx_v_edge_set.add((&__pyx_v_edge_set), __pyx_v_fm.arr_index) != 0)) != 0); if (__pyx_t_13) { - /* "energy.pyx":234 + /* "src/energy.pyx":234 * * 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_12packsim_core_4Calc_radialt_edge_grad(__pyx_v_fm, __pyx_v_xi, __pyx_v_r0); + __pyx_v_dedxi_p = __pyx_f_8_packsim_4Calc_radialt_edge_grad(__pyx_v_fm, __pyx_v_xi, __pyx_v_r0); - /* "energy.pyx":235 + /* "src/energy.pyx":235 * 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 # <<<<<<<<<<<<<< @@ -18501,9 +18289,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_t_14 = __pyx_v_i; __pyx_t_15 = 0; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.x; - /* "energy.pyx":236 + /* "src/energy.pyx":236 * dedxi_p = Calc.radialt_edge_grad(fm, xi, r0) * dedx[i][0] -= dedxi_p.x * dedx[i][1] -= dedxi_p.y # <<<<<<<<<<<<<< @@ -18512,9 +18300,9 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_t_14 = __pyx_v_i; __pyx_t_15 = 1; - *((__pyx_t_12packsim_core_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_12packsim_core_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_8_packsim_FLOAT_T *) ( /* dim=1 */ ((char *) (((__pyx_t_8_packsim_FLOAT_T *) ( /* dim=0 */ (__pyx_v_dedx.data + __pyx_t_14 * __pyx_v_dedx.strides[0]) )) + __pyx_t_15)) )) -= __pyx_v_dedxi_p.y; - /* "energy.pyx":233 + /* "src/energy.pyx":233 * dedx[i][1] -= dedxi_p.y * * if not edge_set.add(&edge_set, fm.arr_index): # <<<<<<<<<<<<<< @@ -18523,7 +18311,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ } - /* "energy.pyx":239 + /* "src/energy.pyx":239 * * * f = f.twin(&f) # <<<<<<<<<<<<<< @@ -18532,7 +18320,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_v_f = __pyx_v_f.twin((&__pyx_v_f)); - /* "energy.pyx":240 + /* "src/energy.pyx":240 * * f = f.twin(&f) * f = f.next(&f) # <<<<<<<<<<<<<< @@ -18541,7 +18329,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ __pyx_v_f = __pyx_v_f.next((&__pyx_v_f)); - /* "energy.pyx":242 + /* "src/energy.pyx":242 * f = f.next(&f) * * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< @@ -18551,7 +18339,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 __pyx_t_13 = ((__pyx_v_f.arr_index == __pyx_v_e.arr_index) != 0); if (__pyx_t_13) { - /* "energy.pyx":243 + /* "src/energy.pyx":243 * * if f.arr_index == e.arr_index: * break # <<<<<<<<<<<<<< @@ -18560,7 +18348,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ goto __pyx_L15_break; - /* "energy.pyx":242 + /* "src/energy.pyx":242 * f = f.next(&f) * * if f.arr_index == e.arr_index: # <<<<<<<<<<<<<< @@ -18571,7 +18359,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 } __pyx_L15_break:; - /* "energy.pyx":245 + /* "src/energy.pyx":245 * break * * e = e.next(&e) # <<<<<<<<<<<<<< @@ -18585,7 +18373,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 } } - /* "energy.pyx":246 + /* "src/energy.pyx":246 * * e = e.next(&e) * edge_set.free(&edge_set) # <<<<<<<<<<<<<< @@ -18606,7 +18394,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 #endif } - /* "energy.pyx":219 + /* "src/energy.pyx":219 * * cdef INT_T i, j * for i in prange(self.n, nogil=True): # <<<<<<<<<<<<<< @@ -18625,7 +18413,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 } } - /* "energy.pyx":247 + /* "src/energy.pyx":247 * e = e.next(&e) * edge_set.free(&edge_set) * self.grad = dedx # <<<<<<<<<<<<<< @@ -18636,7 +18424,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 __PYX_INC_MEMVIEW(&__pyx_v_dedx, 0); __pyx_v_self->__pyx_base.grad = __pyx_v_dedx; - /* "energy.pyx":204 + /* "src/energy.pyx":204 * self.energy = energy * * cdef void calc_grad(self) except *: # <<<<<<<<<<<<<< @@ -18652,7 +18440,7 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); __PYX_XDEC_MEMVIEW(&__pyx_t_6, 1); - __Pyx_AddTraceback("packsim_core.RadialTEnergy.calc_grad", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialTEnergy.calc_grad", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_L0:; __PYX_XDEC_MEMVIEW(&__pyx_v_dedx, 1); __Pyx_RefNannyFinishContext(); @@ -18665,19 +18453,19 @@ static void __pyx_f_12packsim_core_13RadialTEnergy_calc_grad(struct __pyx_obj_12 */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_13RadialTEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_13RadialTEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { +static PyObject *__pyx_pw_8_packsim_13RadialTEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyObject *__pyx_pw_8_packsim_13RadialTEnergy_3__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__reduce_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_13RadialTEnergy_2__reduce_cython__(((struct __pyx_obj_12packsim_core_RadialTEnergy *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_13RadialTEnergy_2__reduce_cython__(((struct __pyx_obj_8_packsim_RadialTEnergy *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_13RadialTEnergy_2__reduce_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -18707,7 +18495,7 @@ static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_2__reduce_cython__(CYTH /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.RadialTEnergy.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialTEnergy.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); @@ -18722,19 +18510,19 @@ static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_2__reduce_cython__(CYTH */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_13RadialTEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_13RadialTEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pw_8_packsim_13RadialTEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ +static PyObject *__pyx_pw_8_packsim_13RadialTEnergy_5__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__setstate_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_13RadialTEnergy_4__setstate_cython__(((struct __pyx_obj_12packsim_core_RadialTEnergy *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); + __pyx_r = __pyx_pf_8_packsim_13RadialTEnergy_4__setstate_cython__(((struct __pyx_obj_8_packsim_RadialTEnergy *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_12packsim_core_RadialTEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pf_8_packsim_13RadialTEnergy_4__setstate_cython__(CYTHON_UNUSED struct __pyx_obj_8_packsim_RadialTEnergy *__pyx_v_self, CYTHON_UNUSED PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -18764,14 +18552,14 @@ static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_4__setstate_cython__(CY /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.RadialTEnergy.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.RadialTEnergy.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __Pyx_XGIVEREF(__pyx_r); __Pyx_RefNannyFinishContext(); return __pyx_r; } -/* "energy.pyx":252 +/* "src/energy.pyx":252 * cdef class Calc: * @staticmethod * cdef inline FLOAT_T phi(HalfEdge e) nogil: # <<<<<<<<<<<<<< @@ -18779,31 +18567,31 @@ static PyObject *__pyx_pf_12packsim_core_13RadialTEnergy_4__setstate_cython__(CY * cdef FLOAT_T angle = acos((da.x/e.cache.da_mag(&e, NAN))) */ -static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_4Calc_phi(__pyx_t_12packsim_core_HalfEdge __pyx_v_e) { - __pyx_t_12packsim_core_Vector2D __pyx_v_da; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_angle; - __pyx_t_12packsim_core_FLOAT_T __pyx_r; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; +static CYTHON_INLINE __pyx_t_8_packsim_FLOAT_T __pyx_f_8_packsim_4Calc_phi(__pyx_t_8_packsim_HalfEdge __pyx_v_e) { + __pyx_t_8_packsim_Vector2D __pyx_v_da; + __pyx_t_8_packsim_FLOAT_T __pyx_v_angle; + __pyx_t_8_packsim_FLOAT_T __pyx_r; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; - /* "energy.pyx":253 + /* "src/energy.pyx":253 * @staticmethod * 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))) * return angle if da.y >= 0 else TAU - angle */ - __pyx_v_da = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_12packsim_core_NAN_VECTOR); + __pyx_v_da = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":254 + /* "src/energy.pyx":254 * 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))) # <<<<<<<<<<<<<< * return angle if da.y >= 0 else TAU - angle * */ - __pyx_v_angle = ((__pyx_t_12packsim_core_FLOAT_T)acos(((double)(__pyx_v_da.x / __pyx_v_e.cache->da_mag((&__pyx_v_e), NAN))))); + __pyx_v_angle = ((__pyx_t_8_packsim_FLOAT_T)acos(((double)(__pyx_v_da.x / __pyx_v_e.cache->da_mag((&__pyx_v_e), NAN))))); - /* "energy.pyx":255 + /* "src/energy.pyx":255 * 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 # <<<<<<<<<<<<<< @@ -18813,12 +18601,12 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_4Calc if (((__pyx_v_da.y >= 0.0) != 0)) { __pyx_t_1 = __pyx_v_angle; } else { - __pyx_t_1 = (__pyx_v_12packsim_core_TAU - __pyx_v_angle); + __pyx_t_1 = (__pyx_v_8_packsim_TAU - __pyx_v_angle); } __pyx_r = __pyx_t_1; goto __pyx_L0; - /* "energy.pyx":252 + /* "src/energy.pyx":252 * cdef class Calc: * @staticmethod * cdef inline FLOAT_T phi(HalfEdge e) nogil: # <<<<<<<<<<<<<< @@ -18831,7 +18619,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_4Calc return __pyx_r; } -/* "energy.pyx":258 +/* "src/energy.pyx":258 * * @staticmethod * cdef inline Vector2D I2(HalfEdge e, FLOAT_T r0, FLOAT_T t) nogil: # <<<<<<<<<<<<<< @@ -18839,20 +18627,20 @@ static CYTHON_INLINE __pyx_t_12packsim_core_FLOAT_T __pyx_f_12packsim_core_4Calc * Rda = Rda.rot(&Rda) */ -static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_I2(__pyx_t_12packsim_core_HalfEdge __pyx_v_e, CYTHON_UNUSED __pyx_t_12packsim_core_FLOAT_T __pyx_v_r0, CYTHON_UNUSED __pyx_t_12packsim_core_FLOAT_T __pyx_v_t) { - __pyx_t_12packsim_core_Vector2D __pyx_v_Rda; - __pyx_t_12packsim_core_Vector2D __pyx_r; +static CYTHON_INLINE __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_4Calc_I2(__pyx_t_8_packsim_HalfEdge __pyx_v_e, CYTHON_UNUSED __pyx_t_8_packsim_FLOAT_T __pyx_v_r0, CYTHON_UNUSED __pyx_t_8_packsim_FLOAT_T __pyx_v_t) { + __pyx_t_8_packsim_Vector2D __pyx_v_Rda; + __pyx_t_8_packsim_Vector2D __pyx_r; - /* "energy.pyx":259 + /* "src/energy.pyx":259 * @staticmethod * 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) * Rda.self.sdiv(&Rda, e.cache.da_mag(&e, NAN)) */ - __pyx_v_Rda = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_12packsim_core_NAN_VECTOR); + __pyx_v_Rda = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":260 + /* "src/energy.pyx":260 * 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) # <<<<<<<<<<<<<< @@ -18861,7 +18649,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Cal */ __pyx_v_Rda = __pyx_v_Rda.rot((&__pyx_v_Rda)); - /* "energy.pyx":261 + /* "src/energy.pyx":261 * cdef Vector2D Rda = e.cache.da(&e, NAN_VECTOR) * Rda = Rda.rot(&Rda) * Rda.self.sdiv(&Rda, e.cache.da_mag(&e, NAN)) # <<<<<<<<<<<<<< @@ -18870,7 +18658,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Cal */ (void)(__pyx_v_Rda.self.sdiv((&__pyx_v_Rda), __pyx_v_e.cache->da_mag((&__pyx_v_e), NAN))); - /* "energy.pyx":263 + /* "src/energy.pyx":263 * Rda.self.sdiv(&Rda, e.cache.da_mag(&e, NAN)) * * return Rda # <<<<<<<<<<<<<< @@ -18880,7 +18668,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Cal __pyx_r = __pyx_v_Rda; goto __pyx_L0; - /* "energy.pyx":258 + /* "src/energy.pyx":258 * * @staticmethod * cdef inline Vector2D I2(HalfEdge e, FLOAT_T r0, FLOAT_T t) nogil: # <<<<<<<<<<<<<< @@ -18893,7 +18681,7 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Cal return __pyx_r; } -/* "energy.pyx":266 +/* "src/energy.pyx":266 * * @staticmethod * cdef Vector2D radialt_edge_grad(HalfEdge e, Site xi, FLOAT_T r0) nogil: # <<<<<<<<<<<<<< @@ -18901,37 +18689,37 @@ static CYTHON_INLINE __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Cal * cdef HalfEdge ep */ -static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge_grad(__pyx_t_12packsim_core_HalfEdge __pyx_v_e, __pyx_t_12packsim_core_Site __pyx_v_xi, __pyx_t_12packsim_core_FLOAT_T __pyx_v_r0) { - __pyx_t_12packsim_core_Site __pyx_v_xe; - __pyx_t_12packsim_core_HalfEdge __pyx_v_ep; - __pyx_t_12packsim_core_Vector2D __pyx_v_Rda; - __pyx_t_12packsim_core_Vector2D __pyx_v_i2ps; - __pyx_t_12packsim_core_Vector2D __pyx_v_fp; - __pyx_t_12packsim_core_Vector2D __pyx_v_gterms; - __pyx_t_12packsim_core_Vector2D __pyx_v_q; - __pyx_t_12packsim_core_Matrix2x2 __pyx_v_ha; - __pyx_t_12packsim_core_Matrix2x2 __pyx_v_hap; - __pyx_t_12packsim_core_Matrix2x2 __pyx_v_hdiff; - CYTHON_UNUSED __pyx_t_12packsim_core_FLOAT_T __pyx_v_t1; - CYTHON_UNUSED __pyx_t_12packsim_core_FLOAT_T __pyx_v_t2; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_lntan; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_csc; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_sinB; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_cosB; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_sinBp; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_cosBp; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_F; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_A; - __pyx_t_12packsim_core_FLOAT_T __pyx_v_B; - __pyx_t_12packsim_core_Vector2D __pyx_r; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_1; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_2; - __pyx_t_12packsim_core_FLOAT_T __pyx_t_3; - __pyx_t_12packsim_core_Matrix2x2 __pyx_t_4; - __pyx_t_12packsim_core_Matrix2x2 __pyx_t_5; +static __pyx_t_8_packsim_Vector2D __pyx_f_8_packsim_4Calc_radialt_edge_grad(__pyx_t_8_packsim_HalfEdge __pyx_v_e, __pyx_t_8_packsim_Site __pyx_v_xi, __pyx_t_8_packsim_FLOAT_T __pyx_v_r0) { + __pyx_t_8_packsim_Site __pyx_v_xe; + __pyx_t_8_packsim_HalfEdge __pyx_v_ep; + __pyx_t_8_packsim_Vector2D __pyx_v_Rda; + __pyx_t_8_packsim_Vector2D __pyx_v_i2ps; + __pyx_t_8_packsim_Vector2D __pyx_v_fp; + __pyx_t_8_packsim_Vector2D __pyx_v_gterms; + __pyx_t_8_packsim_Vector2D __pyx_v_q; + __pyx_t_8_packsim_Matrix2x2 __pyx_v_ha; + __pyx_t_8_packsim_Matrix2x2 __pyx_v_hap; + __pyx_t_8_packsim_Matrix2x2 __pyx_v_hdiff; + CYTHON_UNUSED __pyx_t_8_packsim_FLOAT_T __pyx_v_t1; + CYTHON_UNUSED __pyx_t_8_packsim_FLOAT_T __pyx_v_t2; + __pyx_t_8_packsim_FLOAT_T __pyx_v_lntan; + __pyx_t_8_packsim_FLOAT_T __pyx_v_csc; + __pyx_t_8_packsim_FLOAT_T __pyx_v_sinB; + __pyx_t_8_packsim_FLOAT_T __pyx_v_cosB; + __pyx_t_8_packsim_FLOAT_T __pyx_v_sinBp; + __pyx_t_8_packsim_FLOAT_T __pyx_v_cosBp; + __pyx_t_8_packsim_FLOAT_T __pyx_v_F; + __pyx_t_8_packsim_FLOAT_T __pyx_v_A; + __pyx_t_8_packsim_FLOAT_T __pyx_v_B; + __pyx_t_8_packsim_Vector2D __pyx_r; + __pyx_t_8_packsim_FLOAT_T __pyx_t_1; + __pyx_t_8_packsim_FLOAT_T __pyx_t_2; + __pyx_t_8_packsim_FLOAT_T __pyx_t_3; + __pyx_t_8_packsim_Matrix2x2 __pyx_t_4; + __pyx_t_8_packsim_Matrix2x2 __pyx_t_5; int __pyx_t_6; - /* "energy.pyx":274 + /* "src/energy.pyx":274 * cdef FLOAT_T t1, t2, lntan, csc, sinB, cosB, sinBp, cosBp, F, A, B * * xe = e.face(&e) # <<<<<<<<<<<<<< @@ -18940,7 +18728,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ __pyx_v_xe = __pyx_v_e.face((&__pyx_v_e)); - /* "energy.pyx":275 + /* "src/energy.pyx":275 * * xe = e.face(&e) * ep = e.next(&e) # <<<<<<<<<<<<<< @@ -18949,7 +18737,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ __pyx_v_ep = __pyx_v_e.next((&__pyx_v_e)); - /* "energy.pyx":276 + /* "src/energy.pyx":276 * 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) # <<<<<<<<<<<<<< @@ -18963,7 +18751,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge __pyx_v_A = __pyx_t_2; __pyx_v_B = __pyx_t_3; - /* "energy.pyx":277 + /* "src/energy.pyx":277 * 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) # <<<<<<<<<<<<<< @@ -18975,7 +18763,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge __pyx_v_t1 = __pyx_t_3; __pyx_v_t2 = __pyx_t_2; - /* "energy.pyx":279 + /* "src/energy.pyx":279 * t1, t2 = e.cache.phi(&e, NAN), ep.cache.phi(&ep, NAN) * * lntan, csc = e.cache.lntan(&e, NAN), e.cache.csc(&e, NAN) # <<<<<<<<<<<<<< @@ -18987,39 +18775,39 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge __pyx_v_lntan = __pyx_t_2; __pyx_v_csc = __pyx_t_3; - /* "energy.pyx":281 + /* "src/energy.pyx":281 * lntan, csc = e.cache.lntan(&e, NAN), e.cache.csc(&e, NAN) * * sinB, cosB = (sin((B))), (cos((B))) # <<<<<<<<<<<<<< * sinBp, cosBp = (sin((B-PI_2))), \ * (cos((B-PI_2))) */ - __pyx_t_3 = ((__pyx_t_12packsim_core_FLOAT_T)sin(((double)__pyx_v_B))); - __pyx_t_2 = ((__pyx_t_12packsim_core_FLOAT_T)cos(((double)__pyx_v_B))); + __pyx_t_3 = ((__pyx_t_8_packsim_FLOAT_T)sin(((double)__pyx_v_B))); + __pyx_t_2 = ((__pyx_t_8_packsim_FLOAT_T)cos(((double)__pyx_v_B))); __pyx_v_sinB = __pyx_t_3; __pyx_v_cosB = __pyx_t_2; - /* "energy.pyx":282 + /* "src/energy.pyx":282 * * sinB, cosB = (sin((B))), (cos((B))) * sinBp, cosBp = (sin((B-PI_2))), \ # <<<<<<<<<<<<<< * (cos((B-PI_2))) * */ - __pyx_t_2 = ((__pyx_t_12packsim_core_FLOAT_T)sin(((double)(__pyx_v_B - M_PI_2)))); + __pyx_t_2 = ((__pyx_t_8_packsim_FLOAT_T)sin(((double)(__pyx_v_B - M_PI_2)))); - /* "energy.pyx":283 + /* "src/energy.pyx":283 * sinB, cosB = (sin((B))), (cos((B))) * sinBp, cosBp = (sin((B-PI_2))), \ * (cos((B-PI_2))) # <<<<<<<<<<<<<< * * */ - __pyx_t_3 = ((__pyx_t_12packsim_core_FLOAT_T)cos(((double)(__pyx_v_B - M_PI_2)))); + __pyx_t_3 = ((__pyx_t_8_packsim_FLOAT_T)cos(((double)(__pyx_v_B - M_PI_2)))); __pyx_v_sinBp = __pyx_t_2; __pyx_v_cosBp = __pyx_t_3; - /* "energy.pyx":286 + /* "src/energy.pyx":286 * * * ha, hap = e.get_H(&e, xi), ep.get_H(&ep, xi) # <<<<<<<<<<<<<< @@ -19031,7 +18819,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge __pyx_v_ha = __pyx_t_4; __pyx_v_hap = __pyx_t_5; - /* "energy.pyx":287 + /* "src/energy.pyx":287 * * ha, hap = e.get_H(&e, xi), ep.get_H(&ep, xi) * hdiff = hap.copy.msub(&hap, ha) # <<<<<<<<<<<<<< @@ -19040,7 +18828,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ __pyx_v_hdiff = __pyx_v_hap.copy.msub((&__pyx_v_hap), __pyx_v_ha); - /* "energy.pyx":289 + /* "src/energy.pyx":289 * hdiff = hap.copy.msub(&hap, ha) * # If edge is part of differentiated site. * if xe.index(&xe) == xi.index(&xi): # <<<<<<<<<<<<<< @@ -19050,25 +18838,25 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge __pyx_t_6 = ((__pyx_v_xe.index((&__pyx_v_xe)) == __pyx_v_xi.index((&__pyx_v_xi))) != 0); if (__pyx_t_6) { - /* "energy.pyx":290 + /* "src/energy.pyx":290 * # 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)) # <<<<<<<<<<<<<< * hap.self.msub(&hap, init.Matrix2x2(1.0, 0.0, 0.0, 1.0)) * */ - (void)(__pyx_v_ha.self.msub((&__pyx_v_ha), __pyx_v_12packsim_core_init.Matrix2x2(1.0, 0.0, 0.0, 1.0))); + (void)(__pyx_v_ha.self.msub((&__pyx_v_ha), __pyx_v_8_packsim_init.Matrix2x2(1.0, 0.0, 0.0, 1.0))); - /* "energy.pyx":291 + /* "src/energy.pyx":291 * 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)) # <<<<<<<<<<<<<< * * i2ps = ep.cache.i2p(&ep, NAN_VECTOR) */ - (void)(__pyx_v_hap.self.msub((&__pyx_v_hap), __pyx_v_12packsim_core_init.Matrix2x2(1.0, 0.0, 0.0, 1.0))); + (void)(__pyx_v_hap.self.msub((&__pyx_v_hap), __pyx_v_8_packsim_init.Matrix2x2(1.0, 0.0, 0.0, 1.0))); - /* "energy.pyx":289 + /* "src/energy.pyx":289 * hdiff = hap.copy.msub(&hap, ha) * # If edge is part of differentiated site. * if xe.index(&xe) == xi.index(&xi): # <<<<<<<<<<<<<< @@ -19077,16 +18865,16 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ } - /* "energy.pyx":293 + /* "src/energy.pyx":293 * hap.self.msub(&hap, init.Matrix2x2(1.0, 0.0, 0.0, 1.0)) * * i2ps = ep.cache.i2p(&ep, NAN_VECTOR) # <<<<<<<<<<<<<< * i2ps.self.matmul(&i2ps, hap) * */ - __pyx_v_i2ps = __pyx_v_ep.cache->i2p((&__pyx_v_ep), __pyx_v_12packsim_core_NAN_VECTOR); + __pyx_v_i2ps = __pyx_v_ep.cache->i2p((&__pyx_v_ep), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":294 + /* "src/energy.pyx":294 * * i2ps = ep.cache.i2p(&ep, NAN_VECTOR) * i2ps.self.matmul(&i2ps, hap) # <<<<<<<<<<<<<< @@ -19095,16 +18883,16 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_i2ps.self.matmul((&__pyx_v_i2ps), __pyx_v_hap)); - /* "energy.pyx":296 + /* "src/energy.pyx":296 * i2ps.self.matmul(&i2ps, hap) * * q = e.cache.i2p(&e, NAN_VECTOR) # <<<<<<<<<<<<<< * q.self.matmul(&q, ha) * */ - __pyx_v_q = __pyx_v_e.cache->i2p((&__pyx_v_e), __pyx_v_12packsim_core_NAN_VECTOR); + __pyx_v_q = __pyx_v_e.cache->i2p((&__pyx_v_e), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":297 + /* "src/energy.pyx":297 * * q = e.cache.i2p(&e, NAN_VECTOR) * q.self.matmul(&q, ha) # <<<<<<<<<<<<<< @@ -19113,7 +18901,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_q.self.matmul((&__pyx_v_q), __pyx_v_ha)); - /* "energy.pyx":299 + /* "src/energy.pyx":299 * q.self.matmul(&q, ha) * * i2ps.self.vsub(&i2ps, q) # <<<<<<<<<<<<<< @@ -19122,16 +18910,16 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_i2ps.self.vsub((&__pyx_v_i2ps), __pyx_v_q)); - /* "energy.pyx":301 + /* "src/energy.pyx":301 * i2ps.self.vsub(&i2ps, q) * * Rda = e.cache.da(&e, NAN_VECTOR) # <<<<<<<<<<<<<< * Rda = Rda.rot(&Rda) * */ - __pyx_v_Rda = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_12packsim_core_NAN_VECTOR); + __pyx_v_Rda = __pyx_v_e.cache->da((&__pyx_v_e), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":302 + /* "src/energy.pyx":302 * * Rda = e.cache.da(&e, NAN_VECTOR) * Rda = Rda.rot(&Rda) # <<<<<<<<<<<<<< @@ -19140,25 +18928,25 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ __pyx_v_Rda = __pyx_v_Rda.rot((&__pyx_v_Rda)); - /* "energy.pyx":304 + /* "src/energy.pyx":304 * Rda = Rda.rot(&Rda) * * 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)) */ - __pyx_v_fp = __pyx_v_e.cache->la((&__pyx_v_e), __pyx_v_12packsim_core_NAN_VECTOR); + __pyx_v_fp = __pyx_v_e.cache->la((&__pyx_v_e), __pyx_v_8_packsim_NAN_VECTOR); - /* "energy.pyx":305 + /* "src/energy.pyx":305 * * 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)) * fp.self.smul(&fp, lntan/A) */ - (void)(__pyx_v_fp.self.matmul((&__pyx_v_fp), __pyx_v_12packsim_core_R.copy.matmul((&__pyx_v_12packsim_core_R), __pyx_v_ha))); + (void)(__pyx_v_fp.self.matmul((&__pyx_v_fp), __pyx_v_8_packsim_R.copy.matmul((&__pyx_v_8_packsim_R), __pyx_v_ha))); - /* "energy.pyx":306 + /* "src/energy.pyx":306 * 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)) # <<<<<<<<<<<<<< @@ -19167,7 +18955,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_fp.self.vadd((&__pyx_v_fp), __pyx_v_Rda.copy.matmul((&__pyx_v_Rda), __pyx_v_hdiff))); - /* "energy.pyx":307 + /* "src/energy.pyx":307 * fp.self.matmul(&fp, R.copy.matmul(&R, ha)) * fp.self.vadd(&fp, Rda.copy.matmul(&Rda, hdiff)) * fp.self.smul(&fp, lntan/A) # <<<<<<<<<<<<<< @@ -19176,16 +18964,16 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_fp.self.smul((&__pyx_v_fp), (__pyx_v_lntan / __pyx_v_A))); - /* "energy.pyx":309 + /* "src/energy.pyx":309 * fp.self.smul(&fp, lntan/A) * * gterms = init.Vector2D( # <<<<<<<<<<<<<< * cosBp*lntan + sinBp*csc, * cosB*lntan + sinB*csc */ - __pyx_v_gterms = __pyx_v_12packsim_core_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))); + __pyx_v_gterms = __pyx_v_8_packsim_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))); - /* "energy.pyx":313 + /* "src/energy.pyx":313 * cosB*lntan + sinB*csc * ) * gterms.self.smul(>erms, -F/A**2) # <<<<<<<<<<<<<< @@ -19194,7 +18982,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_gterms.self.smul((&__pyx_v_gterms), ((-__pyx_v_F) / pow(__pyx_v_A, 2.0)))); - /* "energy.pyx":315 + /* "src/energy.pyx":315 * gterms.self.smul(>erms, -F/A**2) * * gterms = gterms.rot(>erms) # <<<<<<<<<<<<<< @@ -19203,7 +18991,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ __pyx_v_gterms = __pyx_v_gterms.rot((&__pyx_v_gterms)); - /* "energy.pyx":316 + /* "src/energy.pyx":316 * * gterms = gterms.rot(>erms) * gterms.self.matmul(>erms, hdiff) # <<<<<<<<<<<<<< @@ -19212,7 +19000,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_gterms.self.matmul((&__pyx_v_gterms), __pyx_v_hdiff)); - /* "energy.pyx":318 + /* "src/energy.pyx":318 * gterms.self.matmul(>erms, hdiff) * * fp.self.vadd(&fp, gterms) # <<<<<<<<<<<<<< @@ -19221,7 +19009,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_fp.self.vadd((&__pyx_v_fp), __pyx_v_gterms)); - /* "energy.pyx":320 + /* "src/energy.pyx":320 * fp.self.vadd(&fp, gterms) * * i2ps.self.vadd(&i2ps, fp) # <<<<<<<<<<<<<< @@ -19230,7 +19018,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_i2ps.self.vadd((&__pyx_v_i2ps), __pyx_v_fp)); - /* "energy.pyx":321 + /* "src/energy.pyx":321 * * i2ps.self.vadd(&i2ps, fp) * i2ps.self.smul(&i2ps, -2*r0) # <<<<<<<<<<<<<< @@ -19239,7 +19027,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ (void)(__pyx_v_i2ps.self.smul((&__pyx_v_i2ps), (-2.0 * __pyx_v_r0))); - /* "energy.pyx":323 + /* "src/energy.pyx":323 * i2ps.self.smul(&i2ps, -2*r0) * * return i2ps # <<<<<<<<<<<<<< @@ -19247,7 +19035,7 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge __pyx_r = __pyx_v_i2ps; goto __pyx_L0; - /* "energy.pyx":266 + /* "src/energy.pyx":266 * * @staticmethod * cdef Vector2D radialt_edge_grad(HalfEdge e, Site xi, FLOAT_T r0) nogil: # <<<<<<<<<<<<<< @@ -19267,19 +19055,19 @@ static __pyx_t_12packsim_core_Vector2D __pyx_f_12packsim_core_4Calc_radialt_edge */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_4Calc_1__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_4Calc_1__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { +static PyObject *__pyx_pw_8_packsim_4Calc_1__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused); /*proto*/ +static PyObject *__pyx_pw_8_packsim_4Calc_1__reduce_cython__(PyObject *__pyx_v_self, CYTHON_UNUSED PyObject *unused) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__reduce_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_4Calc___reduce_cython__(((struct __pyx_obj_12packsim_core_Calc *)__pyx_v_self)); + __pyx_r = __pyx_pf_8_packsim_4Calc___reduce_cython__(((struct __pyx_obj_8_packsim_Calc *)__pyx_v_self)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_4Calc___reduce_cython__(struct __pyx_obj_12packsim_core_Calc *__pyx_v_self) { +static PyObject *__pyx_pf_8_packsim_4Calc___reduce_cython__(struct __pyx_obj_8_packsim_Calc *__pyx_v_self) { PyObject *__pyx_v_state = 0; PyObject *__pyx_v__dict = 0; int __pyx_v_use_setstate; @@ -19478,7 +19266,7 @@ static PyObject *__pyx_pf_12packsim_core_4Calc___reduce_cython__(struct __pyx_ob __Pyx_XDECREF(__pyx_t_1); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); - __Pyx_AddTraceback("packsim_core.Calc.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.Calc.__reduce_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XDECREF(__pyx_v_state); @@ -19496,19 +19284,19 @@ static PyObject *__pyx_pf_12packsim_core_4Calc___reduce_cython__(struct __pyx_ob */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_4Calc_3__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ -static PyObject *__pyx_pw_12packsim_core_4Calc_3__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pw_8_packsim_4Calc_3__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state); /*proto*/ +static PyObject *__pyx_pw_8_packsim_4Calc_3__setstate_cython__(PyObject *__pyx_v_self, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = 0; __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__setstate_cython__ (wrapper)", 0); - __pyx_r = __pyx_pf_12packsim_core_4Calc_2__setstate_cython__(((struct __pyx_obj_12packsim_core_Calc *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); + __pyx_r = __pyx_pf_8_packsim_4Calc_2__setstate_cython__(((struct __pyx_obj_8_packsim_Calc *)__pyx_v_self), ((PyObject *)__pyx_v___pyx_state)); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core_4Calc_2__setstate_cython__(struct __pyx_obj_12packsim_core_Calc *__pyx_v_self, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pf_8_packsim_4Calc_2__setstate_cython__(struct __pyx_obj_8_packsim_Calc *__pyx_v_self, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations PyObject *__pyx_t_1 = NULL; @@ -19523,7 +19311,7 @@ static PyObject *__pyx_pf_12packsim_core_4Calc_2__setstate_cython__(struct __pyx * __pyx_unpickle_Calc__set_state(self, __pyx_state) # <<<<<<<<<<<<<< */ if (!(likely(PyTuple_CheckExact(__pyx_v___pyx_state))||((__pyx_v___pyx_state) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "tuple", Py_TYPE(__pyx_v___pyx_state)->tp_name), 0))) __PYX_ERR(2, 17, __pyx_L1_error) - __pyx_t_1 = __pyx_f_12packsim_core___pyx_unpickle_Calc__set_state(__pyx_v_self, ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 17, __pyx_L1_error) + __pyx_t_1 = __pyx_f_8_packsim___pyx_unpickle_Calc__set_state(__pyx_v_self, ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 17, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; @@ -19539,7 +19327,7 @@ static PyObject *__pyx_pf_12packsim_core_4Calc_2__setstate_cython__(struct __pyx goto __pyx_L0; __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("packsim_core.Calc.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.Calc.__setstate_cython__", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -19554,9 +19342,9 @@ static PyObject *__pyx_pf_12packsim_core_4Calc_2__setstate_cython__(struct __pyx */ /* Python wrapper */ -static PyObject *__pyx_pw_12packsim_core_1__pyx_unpickle_Calc(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ -static PyMethodDef __pyx_mdef_12packsim_core_1__pyx_unpickle_Calc = {"__pyx_unpickle_Calc", (PyCFunction)(void*)(PyCFunctionWithKeywords)__pyx_pw_12packsim_core_1__pyx_unpickle_Calc, METH_VARARGS|METH_KEYWORDS, 0}; -static PyObject *__pyx_pw_12packsim_core_1__pyx_unpickle_Calc(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { +static PyObject *__pyx_pw_8_packsim_1__pyx_unpickle_Calc(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds); /*proto*/ +static PyMethodDef __pyx_mdef_8_packsim_1__pyx_unpickle_Calc = {"__pyx_unpickle_Calc", (PyCFunction)(void*)(PyCFunctionWithKeywords)__pyx_pw_8_packsim_1__pyx_unpickle_Calc, METH_VARARGS|METH_KEYWORDS, 0}; +static PyObject *__pyx_pw_8_packsim_1__pyx_unpickle_Calc(PyObject *__pyx_self, PyObject *__pyx_args, PyObject *__pyx_kwds) { PyObject *__pyx_v___pyx_type = 0; long __pyx_v___pyx_checksum; PyObject *__pyx_v___pyx_state = 0; @@ -19618,18 +19406,18 @@ static PyObject *__pyx_pw_12packsim_core_1__pyx_unpickle_Calc(PyObject *__pyx_se __pyx_L5_argtuple_error:; __Pyx_RaiseArgtupleInvalid("__pyx_unpickle_Calc", 1, 3, 3, PyTuple_GET_SIZE(__pyx_args)); __PYX_ERR(2, 1, __pyx_L3_error) __pyx_L3_error:; - __Pyx_AddTraceback("packsim_core.__pyx_unpickle_Calc", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.__pyx_unpickle_Calc", __pyx_clineno, __pyx_lineno, __pyx_filename); __Pyx_RefNannyFinishContext(); return NULL; __pyx_L4_argument_unpacking_done:; - __pyx_r = __pyx_pf_12packsim_core___pyx_unpickle_Calc(__pyx_self, __pyx_v___pyx_type, __pyx_v___pyx_checksum, __pyx_v___pyx_state); + __pyx_r = __pyx_pf_8_packsim___pyx_unpickle_Calc(__pyx_self, __pyx_v___pyx_type, __pyx_v___pyx_checksum, __pyx_v___pyx_state); /* function exit code */ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static PyObject *__pyx_pf_12packsim_core___pyx_unpickle_Calc(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v___pyx_type, long __pyx_v___pyx_checksum, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_pf_8_packsim___pyx_unpickle_Calc(CYTHON_UNUSED PyObject *__pyx_self, PyObject *__pyx_v___pyx_type, long __pyx_v___pyx_checksum, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_v___pyx_PickleError = 0; PyObject *__pyx_v___pyx_result = 0; PyObject *__pyx_r = NULL; @@ -19726,7 +19514,7 @@ static PyObject *__pyx_pf_12packsim_core___pyx_unpickle_Calc(CYTHON_UNUSED PyObj * if __pyx_state is not None: * __pyx_unpickle_Calc__set_state( __pyx_result, __pyx_state) */ - __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_12packsim_core_Calc), __pyx_n_s_new); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 7, __pyx_L1_error) + __pyx_t_2 = __Pyx_PyObject_GetAttrStr(((PyObject *)__pyx_ptype_8_packsim_Calc), __pyx_n_s_new); if (unlikely(!__pyx_t_2)) __PYX_ERR(2, 7, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_2); __pyx_t_4 = NULL; if (CYTHON_UNPACK_METHODS && likely(PyMethod_Check(__pyx_t_2))) { @@ -19765,7 +19553,7 @@ static PyObject *__pyx_pf_12packsim_core___pyx_unpickle_Calc(CYTHON_UNUSED PyObj * cdef __pyx_unpickle_Calc__set_state(Calc __pyx_result, tuple __pyx_state): */ if (!(likely(PyTuple_CheckExact(__pyx_v___pyx_state))||((__pyx_v___pyx_state) == Py_None)||(PyErr_Format(PyExc_TypeError, "Expected %.16s, got %.200s", "tuple", Py_TYPE(__pyx_v___pyx_state)->tp_name), 0))) __PYX_ERR(2, 9, __pyx_L1_error) - __pyx_t_3 = __pyx_f_12packsim_core___pyx_unpickle_Calc__set_state(((struct __pyx_obj_12packsim_core_Calc *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(2, 9, __pyx_L1_error) + __pyx_t_3 = __pyx_f_8_packsim___pyx_unpickle_Calc__set_state(((struct __pyx_obj_8_packsim_Calc *)__pyx_v___pyx_result), ((PyObject*)__pyx_v___pyx_state)); if (unlikely(!__pyx_t_3)) __PYX_ERR(2, 9, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_3); __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0; @@ -19802,7 +19590,7 @@ static PyObject *__pyx_pf_12packsim_core___pyx_unpickle_Calc(CYTHON_UNUSED PyObj __Pyx_XDECREF(__pyx_t_3); __Pyx_XDECREF(__pyx_t_4); __Pyx_XDECREF(__pyx_t_5); - __Pyx_AddTraceback("packsim_core.__pyx_unpickle_Calc", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.__pyx_unpickle_Calc", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = NULL; __pyx_L0:; __Pyx_XDECREF(__pyx_v___pyx_PickleError); @@ -19820,7 +19608,7 @@ static PyObject *__pyx_pf_12packsim_core___pyx_unpickle_Calc(CYTHON_UNUSED PyObj * __pyx_result.__dict__.update(__pyx_state[0]) */ -static PyObject *__pyx_f_12packsim_core___pyx_unpickle_Calc__set_state(struct __pyx_obj_12packsim_core_Calc *__pyx_v___pyx_result, PyObject *__pyx_v___pyx_state) { +static PyObject *__pyx_f_8_packsim___pyx_unpickle_Calc__set_state(struct __pyx_obj_8_packsim_Calc *__pyx_v___pyx_result, PyObject *__pyx_v___pyx_state) { PyObject *__pyx_r = NULL; __Pyx_RefNannyDeclarations int __pyx_t_1; @@ -19912,7 +19700,7 @@ static PyObject *__pyx_f_12packsim_core___pyx_unpickle_Calc__set_state(struct __ __Pyx_XDECREF(__pyx_t_5); __Pyx_XDECREF(__pyx_t_6); __Pyx_XDECREF(__pyx_t_7); - __Pyx_AddTraceback("packsim_core.__pyx_unpickle_Calc__set_state", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("_packsim.__pyx_unpickle_Calc__set_state", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = 0; __pyx_L0:; __Pyx_XGIVEREF(__pyx_r); @@ -19920,7 +19708,7 @@ static PyObject *__pyx_f_12packsim_core___pyx_unpickle_Calc__set_state(struct __ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":735 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":735 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -19937,7 +19725,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew1", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":736 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":736 * * cdef inline object PyArray_MultiIterNew1(a): * return PyArray_MultiIterNew(1, a) # <<<<<<<<<<<<<< @@ -19951,7 +19739,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":735 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":735 * ctypedef npy_cdouble complex_t * * cdef inline object PyArray_MultiIterNew1(a): # <<<<<<<<<<<<<< @@ -19970,7 +19758,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew1(PyObject *__ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":738 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":738 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -19987,7 +19775,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew2", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":739 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":739 * * cdef inline object PyArray_MultiIterNew2(a, b): * return PyArray_MultiIterNew(2, a, b) # <<<<<<<<<<<<<< @@ -20001,7 +19789,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":738 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":738 * return PyArray_MultiIterNew(1, a) * * cdef inline object PyArray_MultiIterNew2(a, b): # <<<<<<<<<<<<<< @@ -20020,7 +19808,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew2(PyObject *__ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":741 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":741 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -20037,7 +19825,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew3", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":742 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":742 * * cdef inline object PyArray_MultiIterNew3(a, b, c): * return PyArray_MultiIterNew(3, a, b, c) # <<<<<<<<<<<<<< @@ -20051,7 +19839,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":741 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":741 * return PyArray_MultiIterNew(2, a, b) * * cdef inline object PyArray_MultiIterNew3(a, b, c): # <<<<<<<<<<<<<< @@ -20070,7 +19858,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew3(PyObject *__ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":744 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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): # <<<<<<<<<<<<<< @@ -20087,7 +19875,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew4", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":745 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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) # <<<<<<<<<<<<<< @@ -20101,7 +19889,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":744 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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): # <<<<<<<<<<<<<< @@ -20120,7 +19908,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew4(PyObject *__ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":747 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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): # <<<<<<<<<<<<<< @@ -20137,7 +19925,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ int __pyx_clineno = 0; __Pyx_RefNannySetupContext("PyArray_MultiIterNew5", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":748 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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) # <<<<<<<<<<<<<< @@ -20151,7 +19939,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ __pyx_t_1 = 0; goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":747 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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): # <<<<<<<<<<<<<< @@ -20170,7 +19958,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyArray_MultiIterNew5(PyObject *__ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":750 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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): # <<<<<<<<<<<<<< @@ -20184,7 +19972,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ int __pyx_t_1; __Pyx_RefNannySetupContext("PyDataType_SHAPE", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":751 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":751 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -20194,7 +19982,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) { - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":752 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":752 * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): * return d.subarray.shape # <<<<<<<<<<<<<< @@ -20206,7 +19994,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ __pyx_r = ((PyObject*)__pyx_v_d->subarray->shape); goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":751 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":751 * * cdef inline tuple PyDataType_SHAPE(dtype d): * if PyDataType_HASSUBARRAY(d): # <<<<<<<<<<<<<< @@ -20215,7 +20003,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ */ } - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":754 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":754 * return d.subarray.shape * else: * return () # <<<<<<<<<<<<<< @@ -20229,7 +20017,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ goto __pyx_L0; } - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":750 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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): # <<<<<<<<<<<<<< @@ -20244,7 +20032,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_PyDataType_SHAPE(PyArray_Descr *__ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":929 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":929 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -20256,7 +20044,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("set_array_base", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":930 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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! # <<<<<<<<<<<<<< @@ -20265,7 +20053,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ Py_INCREF(__pyx_v_base); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":931 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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) # <<<<<<<<<<<<<< @@ -20274,7 +20062,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a */ (void)(PyArray_SetBaseObject(__pyx_v_arr, __pyx_v_base)); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":929 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":929 * int _import_umath() except -1 * * cdef inline void set_array_base(ndarray arr, object base): # <<<<<<<<<<<<<< @@ -20286,7 +20074,7 @@ static CYTHON_INLINE void __pyx_f_5numpy_set_array_base(PyArrayObject *__pyx_v_a __Pyx_RefNannyFinishContext(); } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":933 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":933 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -20301,7 +20089,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py int __pyx_t_1; __Pyx_RefNannySetupContext("get_array_base", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":934 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":934 * * cdef inline object get_array_base(ndarray arr): * base = PyArray_BASE(arr) # <<<<<<<<<<<<<< @@ -20310,7 +20098,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ __pyx_v_base = PyArray_BASE(__pyx_v_arr); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":935 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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: # <<<<<<<<<<<<<< @@ -20320,7 +20108,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) { - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":936 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":936 * base = PyArray_BASE(arr) * if base is NULL: * return None # <<<<<<<<<<<<<< @@ -20331,7 +20119,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = Py_None; __Pyx_INCREF(Py_None); goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":935 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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: # <<<<<<<<<<<<<< @@ -20340,7 +20128,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py */ } - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":937 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":937 * if base is NULL: * return None * return base # <<<<<<<<<<<<<< @@ -20352,7 +20140,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py __pyx_r = ((PyObject *)__pyx_v_base); goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":933 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":933 * PyArray_SetBaseObject(arr, base) * * cdef inline object get_array_base(ndarray arr): # <<<<<<<<<<<<<< @@ -20367,7 +20155,7 @@ static CYTHON_INLINE PyObject *__pyx_f_5numpy_get_array_base(PyArrayObject *__py return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":941 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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: # <<<<<<<<<<<<<< @@ -20391,7 +20179,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_array", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -20407,7 +20195,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":943 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":943 * cdef inline int import_array() except -1: * try: * __pyx_import_array() # <<<<<<<<<<<<<< @@ -20416,7 +20204,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) - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -20430,7 +20218,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":944 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":944 * try: * __pyx_import_array() * except Exception: # <<<<<<<<<<<<<< @@ -20445,7 +20233,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":945 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":945 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -20461,7 +20249,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":942 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":942 * # Cython code. * cdef inline int import_array() except -1: * try: # <<<<<<<<<<<<<< @@ -20476,7 +20264,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { __pyx_L8_try_end:; } - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":941 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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: # <<<<<<<<<<<<<< @@ -20499,7 +20287,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_array(void) { return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":947 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":947 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -20523,7 +20311,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_umath", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -20539,7 +20327,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":949 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":949 * cdef inline int import_umath() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -20548,7 +20336,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) - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -20562,7 +20350,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":950 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":950 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -20577,7 +20365,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":951 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":951 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -20593,7 +20381,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":948 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":948 * * cdef inline int import_umath() except -1: * try: # <<<<<<<<<<<<<< @@ -20608,7 +20396,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { __pyx_L8_try_end:; } - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":947 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":947 * raise ImportError("numpy.core.multiarray failed to import") * * cdef inline int import_umath() except -1: # <<<<<<<<<<<<<< @@ -20631,7 +20419,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_umath(void) { return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":953 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":953 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -20655,7 +20443,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("import_ufunc", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -20671,7 +20459,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_XGOTREF(__pyx_t_3); /*try:*/ { - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":955 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":955 * cdef inline int import_ufunc() except -1: * try: * _import_umath() # <<<<<<<<<<<<<< @@ -20680,7 +20468,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) - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -20694,7 +20482,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L8_try_end; __pyx_L3_error:; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":956 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":956 * try: * _import_umath() * except Exception: # <<<<<<<<<<<<<< @@ -20709,7 +20497,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __Pyx_GOTREF(__pyx_t_6); __Pyx_GOTREF(__pyx_t_7); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":957 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":957 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -20725,7 +20513,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { goto __pyx_L5_except_error; __pyx_L5_except_error:; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":954 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":954 * * cdef inline int import_ufunc() except -1: * try: # <<<<<<<<<<<<<< @@ -20740,7 +20528,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { __pyx_L8_try_end:; } - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":953 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":953 * raise ImportError("numpy.core.umath failed to import") * * cdef inline int import_ufunc() except -1: # <<<<<<<<<<<<<< @@ -20763,7 +20551,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_import_ufunc(void) { return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":967 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":967 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -20776,7 +20564,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("is_timedelta64_object", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":979 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":979 * bool * """ * return PyObject_TypeCheck(obj, &PyTimedeltaArrType_Type) # <<<<<<<<<<<<<< @@ -20786,7 +20574,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; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":967 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":967 * * * cdef inline bint is_timedelta64_object(object obj): # <<<<<<<<<<<<<< @@ -20800,7 +20588,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_timedelta64_object(PyObject *__pyx_v_ return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":982 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":982 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -20813,7 +20601,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("is_datetime64_object", 0); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":994 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":994 * bool * """ * return PyObject_TypeCheck(obj, &PyDatetimeArrType_Type) # <<<<<<<<<<<<<< @@ -20823,7 +20611,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; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":982 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":982 * * * cdef inline bint is_datetime64_object(object obj): # <<<<<<<<<<<<<< @@ -20837,7 +20625,7 @@ static CYTHON_INLINE int __pyx_f_5numpy_is_datetime64_object(PyObject *__pyx_v_o return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":997 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":997 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20848,7 +20636,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; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":1004 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1004 * also needed. That can be found using `get_datetime64_unit`. * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -20858,7 +20646,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * __pyx_r = ((PyDatetimeScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":997 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":997 * * * cdef inline npy_datetime get_datetime64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20871,7 +20659,7 @@ static CYTHON_INLINE npy_datetime __pyx_f_5numpy_get_datetime64_value(PyObject * return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":1007 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1007 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20882,7 +20670,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; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":1011 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1011 * returns the int64 value underlying scalar numpy timedelta64 object * """ * return (obj).obval # <<<<<<<<<<<<<< @@ -20892,7 +20680,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject __pyx_r = ((PyTimedeltaScalarObject *)__pyx_v_obj)->obval; goto __pyx_L0; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":1007 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1007 * * * cdef inline npy_timedelta get_timedelta64_value(object obj) nogil: # <<<<<<<<<<<<<< @@ -20905,7 +20693,7 @@ static CYTHON_INLINE npy_timedelta __pyx_f_5numpy_get_timedelta64_value(PyObject return __pyx_r; } -/* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":1014 +/* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1014 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -20916,7 +20704,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; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":1018 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/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 # <<<<<<<<<<<<<< @@ -20924,7 +20712,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; - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":1014 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":1014 * * * cdef inline NPY_DATETIMEUNIT get_datetime64_unit(object obj) nogil: # <<<<<<<<<<<<<< @@ -21591,13 +21379,13 @@ static CYTHON_INLINE void __pyx_f_7cpython_5array_zero(arrayobject *__pyx_v_self /* "carray.to_py":112 * - * @cname("__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T") - * cdef inline list __Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< + * @cname("__Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T") + * cdef inline list __Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< * cdef size_t i * cdef object value */ -static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T(__pyx_t_12packsim_core_FLOAT_T *__pyx_v_v, Py_ssize_t __pyx_v_length) { +static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T(__pyx_t_8_packsim_FLOAT_T *__pyx_v_v, Py_ssize_t __pyx_v_length) { size_t __pyx_v_i; PyObject *__pyx_v_value = 0; PyObject *__pyx_v_l = NULL; @@ -21610,7 +21398,7 @@ static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; - __Pyx_RefNannySetupContext("__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T", 0); + __Pyx_RefNannySetupContext("__Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T", 0); /* "carray.to_py":115 * cdef size_t i @@ -21681,8 +21469,8 @@ static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T /* "carray.to_py":112 * - * @cname("__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T") - * cdef inline list __Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< + * @cname("__Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T") + * cdef inline list __Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< * cdef size_t i * cdef object value */ @@ -21690,7 +21478,7 @@ static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("carray.to_py.__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("carray.to_py.__Pyx_carray_to_py___pyx_t_8_packsim_FLOAT_T", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = 0; __pyx_L0:; __Pyx_XDECREF(__pyx_v_value); @@ -21702,13 +21490,13 @@ static CYTHON_INLINE PyObject *__Pyx_carray_to_py___pyx_t_12packsim_core_FLOAT_T /* "carray.to_py":124 * - * @cname("__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T") - * cdef inline tuple __Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< + * @cname("__Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T") + * cdef inline tuple __Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< * cdef size_t i * cdef object value */ -static CYTHON_INLINE PyObject *__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T(__pyx_t_12packsim_core_FLOAT_T *__pyx_v_v, Py_ssize_t __pyx_v_length) { +static CYTHON_INLINE PyObject *__Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T(__pyx_t_8_packsim_FLOAT_T *__pyx_v_v, Py_ssize_t __pyx_v_length) { size_t __pyx_v_i; PyObject *__pyx_v_value = 0; PyObject *__pyx_v_t = NULL; @@ -21721,7 +21509,7 @@ static CYTHON_INLINE PyObject *__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOA int __pyx_lineno = 0; const char *__pyx_filename = NULL; int __pyx_clineno = 0; - __Pyx_RefNannySetupContext("__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T", 0); + __Pyx_RefNannySetupContext("__Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T", 0); /* "carray.to_py":127 * cdef size_t i @@ -21789,8 +21577,8 @@ static CYTHON_INLINE PyObject *__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOA /* "carray.to_py":124 * - * @cname("__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T") - * cdef inline tuple __Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< + * @cname("__Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T") + * cdef inline tuple __Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T(base_type *v, Py_ssize_t length): # <<<<<<<<<<<<<< * cdef size_t i * cdef object value */ @@ -21798,7 +21586,7 @@ static CYTHON_INLINE PyObject *__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOA /* function exit code */ __pyx_L1_error:; __Pyx_XDECREF(__pyx_t_1); - __Pyx_AddTraceback("carray.to_py.__Pyx_carray_to_tuple___pyx_t_12packsim_core_FLOAT_T", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("carray.to_py.__Pyx_carray_to_tuple___pyx_t_8_packsim_FLOAT_T", __pyx_clineno, __pyx_lineno, __pyx_filename); __pyx_r = 0; __pyx_L0:; __Pyx_XDECREF(__pyx_v_value); @@ -34825,10 +34613,10 @@ static PyObject *__pyx_unpickle_Enum__set_state(struct __pyx_MemviewEnum_obj *__ __Pyx_RefNannyFinishContext(); return __pyx_r; } -static struct __pyx_vtabstruct_12packsim_core_VoronoiContainer __pyx_vtable_12packsim_core_VoronoiContainer; +static struct __pyx_vtabstruct_8_packsim_VoronoiContainer __pyx_vtable_8_packsim_VoronoiContainer; -static PyObject *__pyx_tp_new_12packsim_core_VoronoiContainer(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { - struct __pyx_obj_12packsim_core_VoronoiContainer *p; +static PyObject *__pyx_tp_new_8_packsim_VoronoiContainer(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { + struct __pyx_obj_8_packsim_VoronoiContainer *p; PyObject *o; if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) { o = (*t->tp_alloc)(t, 0); @@ -34836,8 +34624,8 @@ static PyObject *__pyx_tp_new_12packsim_core_VoronoiContainer(PyTypeObject *t, C o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0); } if (unlikely(!o)) return 0; - p = ((struct __pyx_obj_12packsim_core_VoronoiContainer *)o); - p->__pyx_vtab = __pyx_vtabptr_12packsim_core_VoronoiContainer; + p = ((struct __pyx_obj_8_packsim_VoronoiContainer *)o); + p->__pyx_vtab = __pyx_vtabptr_8_packsim_VoronoiContainer; p->__dict__ = PyDict_New(); if (unlikely(!p->__dict__)) goto bad;p->points.data = NULL; p->points.memview = NULL; p->vertices.data = NULL; @@ -34858,8 +34646,8 @@ static PyObject *__pyx_tp_new_12packsim_core_VoronoiContainer(PyTypeObject *t, C return NULL; } -static void __pyx_tp_dealloc_12packsim_core_VoronoiContainer(PyObject *o) { - struct __pyx_obj_12packsim_core_VoronoiContainer *p = (struct __pyx_obj_12packsim_core_VoronoiContainer *)o; +static void __pyx_tp_dealloc_8_packsim_VoronoiContainer(PyObject *o) { + struct __pyx_obj_8_packsim_VoronoiContainer *p = (struct __pyx_obj_8_packsim_VoronoiContainer *)o; #if CYTHON_USE_TP_FINALIZE if (unlikely(PyType_HasFeature(Py_TYPE(o), Py_TPFLAGS_HAVE_FINALIZE) && Py_TYPE(o)->tp_finalize) && !_PyGC_FINALIZED(o)) { if (PyObject_CallFinalizerFromDealloc(o)) return; @@ -34878,26 +34666,26 @@ static void __pyx_tp_dealloc_12packsim_core_VoronoiContainer(PyObject *o) { (*Py_TYPE(o)->tp_free)(o); } -static int __pyx_tp_traverse_12packsim_core_VoronoiContainer(PyObject *o, visitproc v, void *a) { +static int __pyx_tp_traverse_8_packsim_VoronoiContainer(PyObject *o, visitproc v, void *a) { int e; - struct __pyx_obj_12packsim_core_VoronoiContainer *p = (struct __pyx_obj_12packsim_core_VoronoiContainer *)o; + struct __pyx_obj_8_packsim_VoronoiContainer *p = (struct __pyx_obj_8_packsim_VoronoiContainer *)o; if (p->__dict__) { e = (*v)(p->__dict__, a); if (e) return e; } return 0; } -static int __pyx_tp_clear_12packsim_core_VoronoiContainer(PyObject *o) { +static int __pyx_tp_clear_8_packsim_VoronoiContainer(PyObject *o) { PyObject* tmp; - struct __pyx_obj_12packsim_core_VoronoiContainer *p = (struct __pyx_obj_12packsim_core_VoronoiContainer *)o; + struct __pyx_obj_8_packsim_VoronoiContainer *p = (struct __pyx_obj_8_packsim_VoronoiContainer *)o; tmp = ((PyObject*)p->__dict__); p->__dict__ = ((PyObject*)Py_None); Py_INCREF(Py_None); Py_XDECREF(tmp); return 0; } -static PyObject *__pyx___dict__getter_12packsim_core_VoronoiContainer(PyObject *o, CYTHON_UNUSED void *x) { - struct __pyx_obj_12packsim_core_VoronoiContainer *p = (struct __pyx_obj_12packsim_core_VoronoiContainer *)o; +static PyObject *__pyx___dict__getter_8_packsim_VoronoiContainer(PyObject *o, CYTHON_UNUSED void *x) { + struct __pyx_obj_8_packsim_VoronoiContainer *p = (struct __pyx_obj_8_packsim_VoronoiContainer *)o; if (unlikely(!p->__dict__)){ p->__dict__ = PyDict_New(); } @@ -34905,66 +34693,66 @@ static PyObject *__pyx___dict__getter_12packsim_core_VoronoiContainer(PyObject * return p->__dict__; } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_site_arr(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_8site_arr_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_site_arr(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_8site_arr_1__get__(o); } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_vor_data(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_8vor_data_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_vor_data(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_8vor_data_1__get__(o); } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_gradient(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_8gradient_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_gradient(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_8gradient_1__get__(o); } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_n(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_1n_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_n(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_1n_1__get__(o); } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_w(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_1w_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_w(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_1w_1__get__(o); } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_h(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_1h_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_h(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_1h_1__get__(o); } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_r(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_1r_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_r(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_1r_1__get__(o); } -static PyObject *__pyx_getprop_12packsim_core_16VoronoiContainer_energy(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_16VoronoiContainer_6energy_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_16VoronoiContainer_energy(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_16VoronoiContainer_6energy_1__get__(o); } -static PyMethodDef __pyx_methods_12packsim_core_VoronoiContainer[] = { - {"add_sites", (PyCFunction)__pyx_pw_12packsim_core_16VoronoiContainer_3add_sites, METH_O, 0}, - {"iterate", (PyCFunction)__pyx_pw_12packsim_core_16VoronoiContainer_5iterate, METH_O, 0}, - {"hessian", (PyCFunction)__pyx_pw_12packsim_core_16VoronoiContainer_7hessian, METH_O, __pyx_doc_12packsim_core_16VoronoiContainer_6hessian}, - {"__reduce_cython__", (PyCFunction)__pyx_pw_12packsim_core_16VoronoiContainer_9__reduce_cython__, METH_NOARGS, 0}, - {"__setstate_cython__", (PyCFunction)__pyx_pw_12packsim_core_16VoronoiContainer_11__setstate_cython__, METH_O, 0}, +static PyMethodDef __pyx_methods_8_packsim_VoronoiContainer[] = { + {"add_sites", (PyCFunction)__pyx_pw_8_packsim_16VoronoiContainer_3add_sites, METH_O, 0}, + {"iterate", (PyCFunction)__pyx_pw_8_packsim_16VoronoiContainer_5iterate, METH_O, 0}, + {"hessian", (PyCFunction)__pyx_pw_8_packsim_16VoronoiContainer_7hessian, METH_O, __pyx_doc_8_packsim_16VoronoiContainer_6hessian}, + {"__reduce_cython__", (PyCFunction)__pyx_pw_8_packsim_16VoronoiContainer_9__reduce_cython__, METH_NOARGS, 0}, + {"__setstate_cython__", (PyCFunction)__pyx_pw_8_packsim_16VoronoiContainer_11__setstate_cython__, METH_O, 0}, {0, 0, 0, 0} }; -static struct PyGetSetDef __pyx_getsets_12packsim_core_VoronoiContainer[] = { - {(char *)"__dict__", __pyx___dict__getter_12packsim_core_VoronoiContainer, 0, (char *)0, 0}, - {(char *)"site_arr", __pyx_getprop_12packsim_core_16VoronoiContainer_site_arr, 0, (char *)0, 0}, - {(char *)"vor_data", __pyx_getprop_12packsim_core_16VoronoiContainer_vor_data, 0, (char *)0, 0}, - {(char *)"gradient", __pyx_getprop_12packsim_core_16VoronoiContainer_gradient, 0, (char *)0, 0}, - {(char *)"n", __pyx_getprop_12packsim_core_16VoronoiContainer_n, 0, (char *)0, 0}, - {(char *)"w", __pyx_getprop_12packsim_core_16VoronoiContainer_w, 0, (char *)0, 0}, - {(char *)"h", __pyx_getprop_12packsim_core_16VoronoiContainer_h, 0, (char *)0, 0}, - {(char *)"r", __pyx_getprop_12packsim_core_16VoronoiContainer_r, 0, (char *)0, 0}, - {(char *)"energy", __pyx_getprop_12packsim_core_16VoronoiContainer_energy, 0, (char *)0, 0}, +static struct PyGetSetDef __pyx_getsets_8_packsim_VoronoiContainer[] = { + {(char *)"__dict__", __pyx___dict__getter_8_packsim_VoronoiContainer, 0, (char *)0, 0}, + {(char *)"site_arr", __pyx_getprop_8_packsim_16VoronoiContainer_site_arr, 0, (char *)0, 0}, + {(char *)"vor_data", __pyx_getprop_8_packsim_16VoronoiContainer_vor_data, 0, (char *)0, 0}, + {(char *)"gradient", __pyx_getprop_8_packsim_16VoronoiContainer_gradient, 0, (char *)0, 0}, + {(char *)"n", __pyx_getprop_8_packsim_16VoronoiContainer_n, 0, (char *)0, 0}, + {(char *)"w", __pyx_getprop_8_packsim_16VoronoiContainer_w, 0, (char *)0, 0}, + {(char *)"h", __pyx_getprop_8_packsim_16VoronoiContainer_h, 0, (char *)0, 0}, + {(char *)"r", __pyx_getprop_8_packsim_16VoronoiContainer_r, 0, (char *)0, 0}, + {(char *)"energy", __pyx_getprop_8_packsim_16VoronoiContainer_energy, 0, (char *)0, 0}, {0, 0, 0, 0, 0} }; -static PyTypeObject __pyx_type_12packsim_core_VoronoiContainer = { +static PyTypeObject __pyx_type_8_packsim_VoronoiContainer = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.VoronoiContainer", /*tp_name*/ - sizeof(struct __pyx_obj_12packsim_core_VoronoiContainer), /*tp_basicsize*/ + "_packsim.VoronoiContainer", /*tp_name*/ + sizeof(struct __pyx_obj_8_packsim_VoronoiContainer), /*tp_basicsize*/ 0, /*tp_itemsize*/ - __pyx_tp_dealloc_12packsim_core_VoronoiContainer, /*tp_dealloc*/ + __pyx_tp_dealloc_8_packsim_VoronoiContainer, /*tp_dealloc*/ #if PY_VERSION_HEX < 0x030800b4 0, /*tp_print*/ #endif @@ -34991,23 +34779,23 @@ static PyTypeObject __pyx_type_12packsim_core_VoronoiContainer = { 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ "\n\tClass for Voronoi diagrams, stored in a modified DCEL.\n\t:param n: [int] how many sites to generate.\n\t:param w: [float] width of the bounding domain.\n\t:param h: [float] height of the bounding domain.\n\t:param r: [float] radius of zero energy circle.\n\t:param sites: np.ndarray collection of sites.\n\t", /*tp_doc*/ - __pyx_tp_traverse_12packsim_core_VoronoiContainer, /*tp_traverse*/ - __pyx_tp_clear_12packsim_core_VoronoiContainer, /*tp_clear*/ + __pyx_tp_traverse_8_packsim_VoronoiContainer, /*tp_traverse*/ + __pyx_tp_clear_8_packsim_VoronoiContainer, /*tp_clear*/ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ 0, /*tp_iternext*/ - __pyx_methods_12packsim_core_VoronoiContainer, /*tp_methods*/ + __pyx_methods_8_packsim_VoronoiContainer, /*tp_methods*/ 0, /*tp_members*/ - __pyx_getsets_12packsim_core_VoronoiContainer, /*tp_getset*/ + __pyx_getsets_8_packsim_VoronoiContainer, /*tp_getset*/ 0, /*tp_base*/ 0, /*tp_dict*/ 0, /*tp_descr_get*/ 0, /*tp_descr_set*/ - offsetof(struct __pyx_obj_12packsim_core_VoronoiContainer, __dict__), /*tp_dictoffset*/ - __pyx_pw_12packsim_core_16VoronoiContainer_1__init__, /*tp_init*/ + offsetof(struct __pyx_obj_8_packsim_VoronoiContainer, __dict__), /*tp_dictoffset*/ + __pyx_pw_8_packsim_16VoronoiContainer_1__init__, /*tp_init*/ 0, /*tp_alloc*/ - __pyx_tp_new_12packsim_core_VoronoiContainer, /*tp_new*/ + __pyx_tp_new_8_packsim_VoronoiContainer, /*tp_new*/ 0, /*tp_free*/ 0, /*tp_is_gc*/ 0, /*tp_bases*/ @@ -35027,19 +34815,19 @@ static PyTypeObject __pyx_type_12packsim_core_VoronoiContainer = { 0, /*tp_print*/ #endif }; -static struct __pyx_vtabstruct_12packsim_core_AreaEnergy __pyx_vtable_12packsim_core_AreaEnergy; +static struct __pyx_vtabstruct_8_packsim_AreaEnergy __pyx_vtable_8_packsim_AreaEnergy; -static PyObject *__pyx_tp_new_12packsim_core_AreaEnergy(PyTypeObject *t, PyObject *a, PyObject *k) { - struct __pyx_obj_12packsim_core_AreaEnergy *p; - PyObject *o = __pyx_tp_new_12packsim_core_VoronoiContainer(t, a, k); +static PyObject *__pyx_tp_new_8_packsim_AreaEnergy(PyTypeObject *t, PyObject *a, PyObject *k) { + struct __pyx_obj_8_packsim_AreaEnergy *p; + PyObject *o = __pyx_tp_new_8_packsim_VoronoiContainer(t, a, k); if (unlikely(!o)) return 0; - p = ((struct __pyx_obj_12packsim_core_AreaEnergy *)o); - p->__pyx_base.__pyx_vtab = (struct __pyx_vtabstruct_12packsim_core_VoronoiContainer*)__pyx_vtabptr_12packsim_core_AreaEnergy; + p = ((struct __pyx_obj_8_packsim_AreaEnergy *)o); + p->__pyx_base.__pyx_vtab = (struct __pyx_vtabstruct_8_packsim_VoronoiContainer*)__pyx_vtabptr_8_packsim_AreaEnergy; return o; } -static PyObject *__pyx___dict__getter_12packsim_core_AreaEnergy(PyObject *o, CYTHON_UNUSED void *x) { - struct __pyx_obj_12packsim_core_AreaEnergy *p = (struct __pyx_obj_12packsim_core_AreaEnergy *)o; +static PyObject *__pyx___dict__getter_8_packsim_AreaEnergy(PyObject *o, CYTHON_UNUSED void *x) { + struct __pyx_obj_8_packsim_AreaEnergy *p = (struct __pyx_obj_8_packsim_AreaEnergy *)o; if (unlikely(!p->__pyx_base.__dict__)){ p->__pyx_base.__dict__ = PyDict_New(); } @@ -35047,28 +34835,28 @@ static PyObject *__pyx___dict__getter_12packsim_core_AreaEnergy(PyObject *o, CYT return p->__pyx_base.__dict__; } -static PyObject *__pyx_getprop_12packsim_core_10AreaEnergy_minimum(PyObject *o, CYTHON_UNUSED void *x) { - return __pyx_pw_12packsim_core_10AreaEnergy_7minimum_1__get__(o); +static PyObject *__pyx_getprop_8_packsim_10AreaEnergy_minimum(PyObject *o, CYTHON_UNUSED void *x) { + return __pyx_pw_8_packsim_10AreaEnergy_7minimum_1__get__(o); } -static PyMethodDef __pyx_methods_12packsim_core_AreaEnergy[] = { - {"__reduce_cython__", (PyCFunction)__pyx_pw_12packsim_core_10AreaEnergy_3__reduce_cython__, METH_NOARGS, 0}, - {"__setstate_cython__", (PyCFunction)__pyx_pw_12packsim_core_10AreaEnergy_5__setstate_cython__, METH_O, 0}, +static PyMethodDef __pyx_methods_8_packsim_AreaEnergy[] = { + {"__reduce_cython__", (PyCFunction)__pyx_pw_8_packsim_10AreaEnergy_3__reduce_cython__, METH_NOARGS, 0}, + {"__setstate_cython__", (PyCFunction)__pyx_pw_8_packsim_10AreaEnergy_5__setstate_cython__, METH_O, 0}, {0, 0, 0, 0} }; -static struct PyGetSetDef __pyx_getsets_12packsim_core_AreaEnergy[] = { - {(char *)"__dict__", __pyx___dict__getter_12packsim_core_AreaEnergy, 0, (char *)0, 0}, - {(char *)"minimum", __pyx_getprop_12packsim_core_10AreaEnergy_minimum, 0, (char *)0, 0}, +static struct PyGetSetDef __pyx_getsets_8_packsim_AreaEnergy[] = { + {(char *)"__dict__", __pyx___dict__getter_8_packsim_AreaEnergy, 0, (char *)0, 0}, + {(char *)"minimum", __pyx_getprop_8_packsim_10AreaEnergy_minimum, 0, (char *)0, 0}, {0, 0, 0, 0, 0} }; -static PyTypeObject __pyx_type_12packsim_core_AreaEnergy = { +static PyTypeObject __pyx_type_8_packsim_AreaEnergy = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.AreaEnergy", /*tp_name*/ - sizeof(struct __pyx_obj_12packsim_core_AreaEnergy), /*tp_basicsize*/ + "_packsim.AreaEnergy", /*tp_name*/ + sizeof(struct __pyx_obj_8_packsim_AreaEnergy), /*tp_basicsize*/ 0, /*tp_itemsize*/ - __pyx_tp_dealloc_12packsim_core_VoronoiContainer, /*tp_dealloc*/ + __pyx_tp_dealloc_8_packsim_VoronoiContainer, /*tp_dealloc*/ #if PY_VERSION_HEX < 0x030800b4 0, /*tp_print*/ #endif @@ -35095,23 +34883,23 @@ static PyTypeObject __pyx_type_12packsim_core_AreaEnergy = { 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ "\n\tClass for formulas relevant to the Area energy.\n\t:param n: [int] how many sites to generate.\n\t:param w: [float] width of the bounding domain.\n\t:param h: [float] height of the bounding domain.\n\t:param r: [float] radius of zero energy circle.\n\t:param sites: [np.ndarray] collection of sites.\n\t", /*tp_doc*/ - __pyx_tp_traverse_12packsim_core_VoronoiContainer, /*tp_traverse*/ - __pyx_tp_clear_12packsim_core_VoronoiContainer, /*tp_clear*/ + __pyx_tp_traverse_8_packsim_VoronoiContainer, /*tp_traverse*/ + __pyx_tp_clear_8_packsim_VoronoiContainer, /*tp_clear*/ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ 0, /*tp_iternext*/ - __pyx_methods_12packsim_core_AreaEnergy, /*tp_methods*/ + __pyx_methods_8_packsim_AreaEnergy, /*tp_methods*/ 0, /*tp_members*/ - __pyx_getsets_12packsim_core_AreaEnergy, /*tp_getset*/ + __pyx_getsets_8_packsim_AreaEnergy, /*tp_getset*/ 0, /*tp_base*/ 0, /*tp_dict*/ 0, /*tp_descr_get*/ 0, /*tp_descr_set*/ - offsetof(struct __pyx_obj_12packsim_core_AreaEnergy, __pyx_base.__dict__), /*tp_dictoffset*/ - __pyx_pw_12packsim_core_10AreaEnergy_1__init__, /*tp_init*/ + offsetof(struct __pyx_obj_8_packsim_AreaEnergy, __pyx_base.__dict__), /*tp_dictoffset*/ + __pyx_pw_8_packsim_10AreaEnergy_1__init__, /*tp_init*/ 0, /*tp_alloc*/ - __pyx_tp_new_12packsim_core_AreaEnergy, /*tp_new*/ + __pyx_tp_new_8_packsim_AreaEnergy, /*tp_new*/ 0, /*tp_free*/ 0, /*tp_is_gc*/ 0, /*tp_bases*/ @@ -35131,19 +34919,19 @@ static PyTypeObject __pyx_type_12packsim_core_AreaEnergy = { 0, /*tp_print*/ #endif }; -static struct __pyx_vtabstruct_12packsim_core_RadialALEnergy __pyx_vtable_12packsim_core_RadialALEnergy; +static struct __pyx_vtabstruct_8_packsim_RadialALEnergy __pyx_vtable_8_packsim_RadialALEnergy; -static PyObject *__pyx_tp_new_12packsim_core_RadialALEnergy(PyTypeObject *t, PyObject *a, PyObject *k) { - struct __pyx_obj_12packsim_core_RadialALEnergy *p; - PyObject *o = __pyx_tp_new_12packsim_core_VoronoiContainer(t, a, k); +static PyObject *__pyx_tp_new_8_packsim_RadialALEnergy(PyTypeObject *t, PyObject *a, PyObject *k) { + struct __pyx_obj_8_packsim_RadialALEnergy *p; + PyObject *o = __pyx_tp_new_8_packsim_VoronoiContainer(t, a, k); if (unlikely(!o)) return 0; - p = ((struct __pyx_obj_12packsim_core_RadialALEnergy *)o); - p->__pyx_base.__pyx_vtab = (struct __pyx_vtabstruct_12packsim_core_VoronoiContainer*)__pyx_vtabptr_12packsim_core_RadialALEnergy; + p = ((struct __pyx_obj_8_packsim_RadialALEnergy *)o); + p->__pyx_base.__pyx_vtab = (struct __pyx_vtabstruct_8_packsim_VoronoiContainer*)__pyx_vtabptr_8_packsim_RadialALEnergy; return o; } -static PyObject *__pyx___dict__getter_12packsim_core_RadialALEnergy(PyObject *o, CYTHON_UNUSED void *x) { - struct __pyx_obj_12packsim_core_RadialALEnergy *p = (struct __pyx_obj_12packsim_core_RadialALEnergy *)o; +static PyObject *__pyx___dict__getter_8_packsim_RadialALEnergy(PyObject *o, CYTHON_UNUSED void *x) { + struct __pyx_obj_8_packsim_RadialALEnergy *p = (struct __pyx_obj_8_packsim_RadialALEnergy *)o; if (unlikely(!p->__pyx_base.__dict__)){ p->__pyx_base.__dict__ = PyDict_New(); } @@ -35151,23 +34939,23 @@ static PyObject *__pyx___dict__getter_12packsim_core_RadialALEnergy(PyObject *o, return p->__pyx_base.__dict__; } -static PyMethodDef __pyx_methods_12packsim_core_RadialALEnergy[] = { - {"__reduce_cython__", (PyCFunction)__pyx_pw_12packsim_core_14RadialALEnergy_3__reduce_cython__, METH_NOARGS, 0}, - {"__setstate_cython__", (PyCFunction)__pyx_pw_12packsim_core_14RadialALEnergy_5__setstate_cython__, METH_O, 0}, +static PyMethodDef __pyx_methods_8_packsim_RadialALEnergy[] = { + {"__reduce_cython__", (PyCFunction)__pyx_pw_8_packsim_14RadialALEnergy_3__reduce_cython__, METH_NOARGS, 0}, + {"__setstate_cython__", (PyCFunction)__pyx_pw_8_packsim_14RadialALEnergy_5__setstate_cython__, METH_O, 0}, {0, 0, 0, 0} }; -static struct PyGetSetDef __pyx_getsets_12packsim_core_RadialALEnergy[] = { - {(char *)"__dict__", __pyx___dict__getter_12packsim_core_RadialALEnergy, 0, (char *)0, 0}, +static struct PyGetSetDef __pyx_getsets_8_packsim_RadialALEnergy[] = { + {(char *)"__dict__", __pyx___dict__getter_8_packsim_RadialALEnergy, 0, (char *)0, 0}, {0, 0, 0, 0, 0} }; -static PyTypeObject __pyx_type_12packsim_core_RadialALEnergy = { +static PyTypeObject __pyx_type_8_packsim_RadialALEnergy = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.RadialALEnergy", /*tp_name*/ - sizeof(struct __pyx_obj_12packsim_core_RadialALEnergy), /*tp_basicsize*/ + "_packsim.RadialALEnergy", /*tp_name*/ + sizeof(struct __pyx_obj_8_packsim_RadialALEnergy), /*tp_basicsize*/ 0, /*tp_itemsize*/ - __pyx_tp_dealloc_12packsim_core_VoronoiContainer, /*tp_dealloc*/ + __pyx_tp_dealloc_8_packsim_VoronoiContainer, /*tp_dealloc*/ #if PY_VERSION_HEX < 0x030800b4 0, /*tp_print*/ #endif @@ -35194,23 +34982,23 @@ static PyTypeObject __pyx_type_12packsim_core_RadialALEnergy = { 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ "\n\tClass for formulas relevant to the Area energy.\n\t:param n: [int] how many sites to generate.\n\t:param w: [float] width of the bounding domain.\n\t:param h: [float] height of the bounding domain.\n\t:param r: [float] radius of zero energy circle.\n\t:param sites: [np.ndarray] collection of sites.\n\t", /*tp_doc*/ - __pyx_tp_traverse_12packsim_core_VoronoiContainer, /*tp_traverse*/ - __pyx_tp_clear_12packsim_core_VoronoiContainer, /*tp_clear*/ + __pyx_tp_traverse_8_packsim_VoronoiContainer, /*tp_traverse*/ + __pyx_tp_clear_8_packsim_VoronoiContainer, /*tp_clear*/ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ 0, /*tp_iternext*/ - __pyx_methods_12packsim_core_RadialALEnergy, /*tp_methods*/ + __pyx_methods_8_packsim_RadialALEnergy, /*tp_methods*/ 0, /*tp_members*/ - __pyx_getsets_12packsim_core_RadialALEnergy, /*tp_getset*/ + __pyx_getsets_8_packsim_RadialALEnergy, /*tp_getset*/ 0, /*tp_base*/ 0, /*tp_dict*/ 0, /*tp_descr_get*/ 0, /*tp_descr_set*/ - offsetof(struct __pyx_obj_12packsim_core_RadialALEnergy, __pyx_base.__dict__), /*tp_dictoffset*/ - __pyx_pw_12packsim_core_14RadialALEnergy_1__init__, /*tp_init*/ + offsetof(struct __pyx_obj_8_packsim_RadialALEnergy, __pyx_base.__dict__), /*tp_dictoffset*/ + __pyx_pw_8_packsim_14RadialALEnergy_1__init__, /*tp_init*/ 0, /*tp_alloc*/ - __pyx_tp_new_12packsim_core_RadialALEnergy, /*tp_new*/ + __pyx_tp_new_8_packsim_RadialALEnergy, /*tp_new*/ 0, /*tp_free*/ 0, /*tp_is_gc*/ 0, /*tp_bases*/ @@ -35230,19 +35018,19 @@ static PyTypeObject __pyx_type_12packsim_core_RadialALEnergy = { 0, /*tp_print*/ #endif }; -static struct __pyx_vtabstruct_12packsim_core_RadialTEnergy __pyx_vtable_12packsim_core_RadialTEnergy; +static struct __pyx_vtabstruct_8_packsim_RadialTEnergy __pyx_vtable_8_packsim_RadialTEnergy; -static PyObject *__pyx_tp_new_12packsim_core_RadialTEnergy(PyTypeObject *t, PyObject *a, PyObject *k) { - struct __pyx_obj_12packsim_core_RadialTEnergy *p; - PyObject *o = __pyx_tp_new_12packsim_core_VoronoiContainer(t, a, k); +static PyObject *__pyx_tp_new_8_packsim_RadialTEnergy(PyTypeObject *t, PyObject *a, PyObject *k) { + struct __pyx_obj_8_packsim_RadialTEnergy *p; + PyObject *o = __pyx_tp_new_8_packsim_VoronoiContainer(t, a, k); if (unlikely(!o)) return 0; - p = ((struct __pyx_obj_12packsim_core_RadialTEnergy *)o); - p->__pyx_base.__pyx_vtab = (struct __pyx_vtabstruct_12packsim_core_VoronoiContainer*)__pyx_vtabptr_12packsim_core_RadialTEnergy; + p = ((struct __pyx_obj_8_packsim_RadialTEnergy *)o); + p->__pyx_base.__pyx_vtab = (struct __pyx_vtabstruct_8_packsim_VoronoiContainer*)__pyx_vtabptr_8_packsim_RadialTEnergy; return o; } -static PyObject *__pyx___dict__getter_12packsim_core_RadialTEnergy(PyObject *o, CYTHON_UNUSED void *x) { - struct __pyx_obj_12packsim_core_RadialTEnergy *p = (struct __pyx_obj_12packsim_core_RadialTEnergy *)o; +static PyObject *__pyx___dict__getter_8_packsim_RadialTEnergy(PyObject *o, CYTHON_UNUSED void *x) { + struct __pyx_obj_8_packsim_RadialTEnergy *p = (struct __pyx_obj_8_packsim_RadialTEnergy *)o; if (unlikely(!p->__pyx_base.__dict__)){ p->__pyx_base.__dict__ = PyDict_New(); } @@ -35250,23 +35038,23 @@ static PyObject *__pyx___dict__getter_12packsim_core_RadialTEnergy(PyObject *o, return p->__pyx_base.__dict__; } -static PyMethodDef __pyx_methods_12packsim_core_RadialTEnergy[] = { - {"__reduce_cython__", (PyCFunction)__pyx_pw_12packsim_core_13RadialTEnergy_3__reduce_cython__, METH_NOARGS, 0}, - {"__setstate_cython__", (PyCFunction)__pyx_pw_12packsim_core_13RadialTEnergy_5__setstate_cython__, METH_O, 0}, +static PyMethodDef __pyx_methods_8_packsim_RadialTEnergy[] = { + {"__reduce_cython__", (PyCFunction)__pyx_pw_8_packsim_13RadialTEnergy_3__reduce_cython__, METH_NOARGS, 0}, + {"__setstate_cython__", (PyCFunction)__pyx_pw_8_packsim_13RadialTEnergy_5__setstate_cython__, METH_O, 0}, {0, 0, 0, 0} }; -static struct PyGetSetDef __pyx_getsets_12packsim_core_RadialTEnergy[] = { - {(char *)"__dict__", __pyx___dict__getter_12packsim_core_RadialTEnergy, 0, (char *)0, 0}, +static struct PyGetSetDef __pyx_getsets_8_packsim_RadialTEnergy[] = { + {(char *)"__dict__", __pyx___dict__getter_8_packsim_RadialTEnergy, 0, (char *)0, 0}, {0, 0, 0, 0, 0} }; -static PyTypeObject __pyx_type_12packsim_core_RadialTEnergy = { +static PyTypeObject __pyx_type_8_packsim_RadialTEnergy = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.RadialTEnergy", /*tp_name*/ - sizeof(struct __pyx_obj_12packsim_core_RadialTEnergy), /*tp_basicsize*/ + "_packsim.RadialTEnergy", /*tp_name*/ + sizeof(struct __pyx_obj_8_packsim_RadialTEnergy), /*tp_basicsize*/ 0, /*tp_itemsize*/ - __pyx_tp_dealloc_12packsim_core_VoronoiContainer, /*tp_dealloc*/ + __pyx_tp_dealloc_8_packsim_VoronoiContainer, /*tp_dealloc*/ #if PY_VERSION_HEX < 0x030800b4 0, /*tp_print*/ #endif @@ -35293,23 +35081,23 @@ static PyTypeObject __pyx_type_12packsim_core_RadialTEnergy = { 0, /*tp_as_buffer*/ Py_TPFLAGS_DEFAULT|Py_TPFLAGS_HAVE_VERSION_TAG|Py_TPFLAGS_CHECKTYPES|Py_TPFLAGS_HAVE_NEWBUFFER|Py_TPFLAGS_BASETYPE|Py_TPFLAGS_HAVE_GC, /*tp_flags*/ "\n\tClass for formulas relevant to the Area energy.\n\t:param n: [int] how many sites to generate.\n\t:param w: [float] width of the bounding domain.\n\t:param h: [float] height of the bounding domain.\n\t:param r: [float] radius of zero energy circle.\n\t:param sites: [np.ndarray] collection of sites.\n\t", /*tp_doc*/ - __pyx_tp_traverse_12packsim_core_VoronoiContainer, /*tp_traverse*/ - __pyx_tp_clear_12packsim_core_VoronoiContainer, /*tp_clear*/ + __pyx_tp_traverse_8_packsim_VoronoiContainer, /*tp_traverse*/ + __pyx_tp_clear_8_packsim_VoronoiContainer, /*tp_clear*/ 0, /*tp_richcompare*/ 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ 0, /*tp_iternext*/ - __pyx_methods_12packsim_core_RadialTEnergy, /*tp_methods*/ + __pyx_methods_8_packsim_RadialTEnergy, /*tp_methods*/ 0, /*tp_members*/ - __pyx_getsets_12packsim_core_RadialTEnergy, /*tp_getset*/ + __pyx_getsets_8_packsim_RadialTEnergy, /*tp_getset*/ 0, /*tp_base*/ 0, /*tp_dict*/ 0, /*tp_descr_get*/ 0, /*tp_descr_set*/ - offsetof(struct __pyx_obj_12packsim_core_RadialTEnergy, __pyx_base.__dict__), /*tp_dictoffset*/ - __pyx_pw_12packsim_core_13RadialTEnergy_1__init__, /*tp_init*/ + offsetof(struct __pyx_obj_8_packsim_RadialTEnergy, __pyx_base.__dict__), /*tp_dictoffset*/ + __pyx_pw_8_packsim_13RadialTEnergy_1__init__, /*tp_init*/ 0, /*tp_alloc*/ - __pyx_tp_new_12packsim_core_RadialTEnergy, /*tp_new*/ + __pyx_tp_new_8_packsim_RadialTEnergy, /*tp_new*/ 0, /*tp_free*/ 0, /*tp_is_gc*/ 0, /*tp_bases*/ @@ -35329,10 +35117,10 @@ static PyTypeObject __pyx_type_12packsim_core_RadialTEnergy = { 0, /*tp_print*/ #endif }; -static struct __pyx_vtabstruct_12packsim_core_Calc __pyx_vtable_12packsim_core_Calc; +static struct __pyx_vtabstruct_8_packsim_Calc __pyx_vtable_8_packsim_Calc; -static PyObject *__pyx_tp_new_12packsim_core_Calc(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { - struct __pyx_obj_12packsim_core_Calc *p; +static PyObject *__pyx_tp_new_8_packsim_Calc(PyTypeObject *t, CYTHON_UNUSED PyObject *a, CYTHON_UNUSED PyObject *k) { + struct __pyx_obj_8_packsim_Calc *p; PyObject *o; if (likely((t->tp_flags & Py_TPFLAGS_IS_ABSTRACT) == 0)) { o = (*t->tp_alloc)(t, 0); @@ -35340,12 +35128,12 @@ static PyObject *__pyx_tp_new_12packsim_core_Calc(PyTypeObject *t, CYTHON_UNUSED o = (PyObject *) PyBaseObject_Type.tp_new(t, __pyx_empty_tuple, 0); } if (unlikely(!o)) return 0; - p = ((struct __pyx_obj_12packsim_core_Calc *)o); - p->__pyx_vtab = __pyx_vtabptr_12packsim_core_Calc; + p = ((struct __pyx_obj_8_packsim_Calc *)o); + p->__pyx_vtab = __pyx_vtabptr_8_packsim_Calc; return o; } -static void __pyx_tp_dealloc_12packsim_core_Calc(PyObject *o) { +static void __pyx_tp_dealloc_8_packsim_Calc(PyObject *o) { #if CYTHON_USE_TP_FINALIZE if (unlikely(PyType_HasFeature(Py_TYPE(o), Py_TPFLAGS_HAVE_FINALIZE) && Py_TYPE(o)->tp_finalize) && (!PyType_IS_GC(Py_TYPE(o)) || !_PyGC_FINALIZED(o))) { if (PyObject_CallFinalizerFromDealloc(o)) return; @@ -35354,18 +35142,18 @@ static void __pyx_tp_dealloc_12packsim_core_Calc(PyObject *o) { (*Py_TYPE(o)->tp_free)(o); } -static PyMethodDef __pyx_methods_12packsim_core_Calc[] = { - {"__reduce_cython__", (PyCFunction)__pyx_pw_12packsim_core_4Calc_1__reduce_cython__, METH_NOARGS, 0}, - {"__setstate_cython__", (PyCFunction)__pyx_pw_12packsim_core_4Calc_3__setstate_cython__, METH_O, 0}, +static PyMethodDef __pyx_methods_8_packsim_Calc[] = { + {"__reduce_cython__", (PyCFunction)__pyx_pw_8_packsim_4Calc_1__reduce_cython__, METH_NOARGS, 0}, + {"__setstate_cython__", (PyCFunction)__pyx_pw_8_packsim_4Calc_3__setstate_cython__, METH_O, 0}, {0, 0, 0, 0} }; -static PyTypeObject __pyx_type_12packsim_core_Calc = { +static PyTypeObject __pyx_type_8_packsim_Calc = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.Calc", /*tp_name*/ - sizeof(struct __pyx_obj_12packsim_core_Calc), /*tp_basicsize*/ + "_packsim.Calc", /*tp_name*/ + sizeof(struct __pyx_obj_8_packsim_Calc), /*tp_basicsize*/ 0, /*tp_itemsize*/ - __pyx_tp_dealloc_12packsim_core_Calc, /*tp_dealloc*/ + __pyx_tp_dealloc_8_packsim_Calc, /*tp_dealloc*/ #if PY_VERSION_HEX < 0x030800b4 0, /*tp_print*/ #endif @@ -35398,7 +35186,7 @@ static PyTypeObject __pyx_type_12packsim_core_Calc = { 0, /*tp_weaklistoffset*/ 0, /*tp_iter*/ 0, /*tp_iternext*/ - __pyx_methods_12packsim_core_Calc, /*tp_methods*/ + __pyx_methods_8_packsim_Calc, /*tp_methods*/ 0, /*tp_members*/ 0, /*tp_getset*/ 0, /*tp_base*/ @@ -35408,7 +35196,7 @@ static PyTypeObject __pyx_type_12packsim_core_Calc = { 0, /*tp_dictoffset*/ 0, /*tp_init*/ 0, /*tp_alloc*/ - __pyx_tp_new_12packsim_core_Calc, /*tp_new*/ + __pyx_tp_new_8_packsim_Calc, /*tp_new*/ 0, /*tp_free*/ 0, /*tp_is_gc*/ 0, /*tp_bases*/ @@ -35551,7 +35339,7 @@ static PyBufferProcs __pyx_tp_as_buffer_array = { static PyTypeObject __pyx_type___pyx_array = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.array", /*tp_name*/ + "_packsim.array", /*tp_name*/ sizeof(struct __pyx_array_obj), /*tp_basicsize*/ 0, /*tp_itemsize*/ __pyx_tp_dealloc_array, /*tp_dealloc*/ @@ -35670,7 +35458,7 @@ static PyMethodDef __pyx_methods_Enum[] = { static PyTypeObject __pyx_type___pyx_MemviewEnum = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.Enum", /*tp_name*/ + "_packsim.Enum", /*tp_name*/ sizeof(struct __pyx_MemviewEnum_obj), /*tp_basicsize*/ 0, /*tp_itemsize*/ __pyx_tp_dealloc_Enum, /*tp_dealloc*/ @@ -35931,7 +35719,7 @@ static PyBufferProcs __pyx_tp_as_buffer_memoryview = { static PyTypeObject __pyx_type___pyx_memoryview = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core.memoryview", /*tp_name*/ + "_packsim.memoryview", /*tp_name*/ sizeof(struct __pyx_memoryview_obj), /*tp_basicsize*/ 0, /*tp_itemsize*/ __pyx_tp_dealloc_memoryview, /*tp_dealloc*/ @@ -36069,7 +35857,7 @@ static struct PyGetSetDef __pyx_getsets__memoryviewslice[] = { static PyTypeObject __pyx_type___pyx_memoryviewslice = { PyVarObject_HEAD_INIT(0, 0) - "packsim_core._memoryviewslice", /*tp_name*/ + "_packsim._memoryviewslice", /*tp_name*/ sizeof(struct __pyx_memoryviewslice_obj), /*tp_basicsize*/ 0, /*tp_itemsize*/ __pyx_tp_dealloc__memoryviewslice, /*tp_dealloc*/ @@ -36151,17 +35939,17 @@ static PyMethodDef __pyx_methods[] = { #if PY_MAJOR_VERSION >= 3 #if CYTHON_PEP489_MULTI_PHASE_INIT static PyObject* __pyx_pymod_create(PyObject *spec, PyModuleDef *def); /*proto*/ -static int __pyx_pymod_exec_packsim_core(PyObject* module); /*proto*/ +static int __pyx_pymod_exec__packsim(PyObject* module); /*proto*/ static PyModuleDef_Slot __pyx_moduledef_slots[] = { {Py_mod_create, (void*)__pyx_pymod_create}, - {Py_mod_exec, (void*)__pyx_pymod_exec_packsim_core}, + {Py_mod_exec, (void*)__pyx_pymod_exec__packsim}, {0, NULL} }; #endif static struct PyModuleDef __pyx_moduledef = { PyModuleDef_HEAD_INIT, - "packsim_core", + "_packsim", 0, /* m_doc */ #if CYTHON_PEP489_MULTI_PHASE_INIT 0, /* m_size */ @@ -36286,7 +36074,7 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_kp_u_numpy_core_umath_failed_to_impor, __pyx_k_numpy_core_umath_failed_to_impor, sizeof(__pyx_k_numpy_core_umath_failed_to_impor), 0, 1, 0, 0}, {&__pyx_n_s_obj, __pyx_k_obj, sizeof(__pyx_k_obj), 0, 0, 1, 1}, {&__pyx_n_s_pack, __pyx_k_pack, sizeof(__pyx_k_pack), 0, 0, 1, 1}, - {&__pyx_n_s_packsim_core, __pyx_k_packsim_core, sizeof(__pyx_k_packsim_core), 0, 0, 1, 1}, + {&__pyx_n_s_packsim, __pyx_k_packsim, sizeof(__pyx_k_packsim), 0, 0, 1, 1}, {&__pyx_n_s_pickle, __pyx_k_pickle, sizeof(__pyx_k_pickle), 0, 0, 1, 1}, {&__pyx_n_s_point_region, __pyx_k_point_region, sizeof(__pyx_k_point_region), 0, 0, 1, 1}, {&__pyx_n_s_points, __pyx_k_points, sizeof(__pyx_k_points), 0, 0, 1, 1}, @@ -36341,7 +36129,6 @@ static __Pyx_StringTabEntry __pyx_string_tab[] = { {&__pyx_n_s_unpack, __pyx_k_unpack, sizeof(__pyx_k_unpack), 0, 0, 1, 1}, {&__pyx_n_s_update, __pyx_k_update, sizeof(__pyx_k_update), 0, 0, 1, 1}, {&__pyx_n_s_vertices, __pyx_k_vertices, sizeof(__pyx_k_vertices), 0, 0, 1, 1}, - {&__pyx_n_s_vor_data, __pyx_k_vor_data, sizeof(__pyx_k_vor_data), 0, 0, 1, 1}, {&__pyx_n_s_w, __pyx_k_w, sizeof(__pyx_k_w), 0, 0, 1, 1}, {&__pyx_n_s_zeros, __pyx_k_zeros, sizeof(__pyx_k_zeros), 0, 0, 1, 1}, {0, 0, 0, 0, 0, 0, 0} @@ -36366,36 +36153,36 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_RefNannyDeclarations __Pyx_RefNannySetupContext("__Pyx_InitCachedConstants", 0); - /* "voronoi_dcel.pyx":423 + /* "src/voronoi_dcel.pyx":417 * """ * 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) * cdef np.ndarray[FLOAT_T, ndim=2] full_site_arr = np.empty((self.n*9+8, 2), dtype=FLOAT) */ - __pyx_tuple_ = PyTuple_Pack(2, __pyx_int_9, __pyx_int_2); if (unlikely(!__pyx_tuple_)) __PYX_ERR(1, 423, __pyx_L1_error) + __pyx_tuple_ = PyTuple_Pack(2, __pyx_int_9, __pyx_int_2); if (unlikely(!__pyx_tuple_)) __PYX_ERR(1, 417, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple_); __Pyx_GIVEREF(__pyx_tuple_); - /* "voronoi_dcel.pyx":624 + /* "src/voronoi_dcel.pyx":618 * cache = self.site_cache[:self.n, :] * * self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) # <<<<<<<<<<<<<< - * edge_count = np.empty((self.n,)) - * for i in range(self.n): + * self.stats["site_edge_count"] = np.asarray(self.sites[:self.n, 2]) + * */ - __pyx_slice__2 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_slice__2)) __PYX_ERR(1, 624, __pyx_L1_error) + __pyx_slice__2 = PySlice_New(Py_None, Py_None, Py_None); if (unlikely(!__pyx_slice__2)) __PYX_ERR(1, 618, __pyx_L1_error) __Pyx_GOTREF(__pyx_slice__2); __Pyx_GIVEREF(__pyx_slice__2); - /* "voronoi_dcel.pyx":639 + /* "src/voronoi_dcel.pyx":630 * edges = np.asarray(self.edges) * * mask = np.nonzero(edges[:, 0] != -1)[0] # <<<<<<<<<<<<<< * all_edges = mask[(mask % 2 == 0)] * caches = edges[all_edges, 4] */ - __pyx_tuple__3 = PyTuple_Pack(2, __pyx_slice__2, __pyx_int_0); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(1, 639, __pyx_L1_error) + __pyx_tuple__3 = PyTuple_Pack(2, __pyx_slice__2, __pyx_int_0); if (unlikely(!__pyx_tuple__3)) __PYX_ERR(1, 630, __pyx_L1_error) __Pyx_GOTREF(__pyx_tuple__3); __Pyx_GIVEREF(__pyx_tuple__3); @@ -36475,7 +36262,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple__11); __Pyx_GIVEREF(__pyx_tuple__11); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":945 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":945 * __pyx_import_array() * except Exception: * raise ImportError("numpy.core.multiarray failed to import") # <<<<<<<<<<<<<< @@ -36486,7 +36273,7 @@ static CYTHON_SMALL_CODE int __Pyx_InitCachedConstants(void) { __Pyx_GOTREF(__pyx_tuple__12); __Pyx_GIVEREF(__pyx_tuple__12); - /* "../../../../../../.local/lib/python3.8/site-packages/numpy/__init__.pxd":951 + /* "../../../../../../../tmp/pip-build-env-kyt_fe3n/overlay/lib/python3.8/site-packages/numpy/__init__.pxd":951 * _import_umath() * except Exception: * raise ImportError("numpy.core.umath failed to import") # <<<<<<<<<<<<<< @@ -36828,77 +36615,77 @@ static int __Pyx_modinit_type_init_code(void) { int __pyx_clineno = 0; __Pyx_RefNannySetupContext("__Pyx_modinit_type_init_code", 0); /*--- Type init code ---*/ - __pyx_vtabptr_12packsim_core_VoronoiContainer = &__pyx_vtable_12packsim_core_VoronoiContainer; - __pyx_vtable_12packsim_core_VoronoiContainer.calculate_voronoi = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *, PyArrayObject *))__pyx_f_12packsim_core_16VoronoiContainer_calculate_voronoi; - __pyx_vtable_12packsim_core_VoronoiContainer.generate_dcel = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_16VoronoiContainer_generate_dcel; - __pyx_vtable_12packsim_core_VoronoiContainer.common_cache = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_16VoronoiContainer_common_cache; - __pyx_vtable_12packsim_core_VoronoiContainer.precompute = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_16VoronoiContainer_precompute; - __pyx_vtable_12packsim_core_VoronoiContainer.calc_grad = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_16VoronoiContainer_calc_grad; - __pyx_vtable_12packsim_core_VoronoiContainer.get_statistics = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_16VoronoiContainer_get_statistics; - __pyx_vtable_12packsim_core_VoronoiContainer.calc_H = (__pyx_t_12packsim_core_Matrix2x2 (*)(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_HalfEdge))__pyx_f_12packsim_core_16VoronoiContainer_calc_H; - __pyx_vtable_12packsim_core_VoronoiContainer.sign = (int (*)(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice))__pyx_f_12packsim_core_16VoronoiContainer_sign; - if (PyType_Ready(&__pyx_type_12packsim_core_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) + __pyx_vtabptr_8_packsim_VoronoiContainer = &__pyx_vtable_8_packsim_VoronoiContainer; + __pyx_vtable_8_packsim_VoronoiContainer.calculate_voronoi = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *, PyArrayObject *))__pyx_f_8_packsim_16VoronoiContainer_calculate_voronoi; + __pyx_vtable_8_packsim_VoronoiContainer.generate_dcel = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_16VoronoiContainer_generate_dcel; + __pyx_vtable_8_packsim_VoronoiContainer.common_cache = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_16VoronoiContainer_common_cache; + __pyx_vtable_8_packsim_VoronoiContainer.precompute = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_16VoronoiContainer_precompute; + __pyx_vtable_8_packsim_VoronoiContainer.calc_grad = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_16VoronoiContainer_calc_grad; + __pyx_vtable_8_packsim_VoronoiContainer.get_statistics = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_16VoronoiContainer_get_statistics; + __pyx_vtable_8_packsim_VoronoiContainer.calc_H = (__pyx_t_8_packsim_Matrix2x2 (*)(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_HalfEdge))__pyx_f_8_packsim_16VoronoiContainer_calc_H; + __pyx_vtable_8_packsim_VoronoiContainer.sign = (int (*)(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice))__pyx_f_8_packsim_16VoronoiContainer_sign; + if (PyType_Ready(&__pyx_type_8_packsim_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 - __pyx_type_12packsim_core_VoronoiContainer.tp_print = 0; + __pyx_type_8_packsim_VoronoiContainer.tp_print = 0; #endif - if (__Pyx_SetVtable(__pyx_type_12packsim_core_VoronoiContainer.tp_dict, __pyx_vtabptr_12packsim_core_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_VoronoiContainer, (PyObject *)&__pyx_type_12packsim_core_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject*)&__pyx_type_12packsim_core_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) - __pyx_ptype_12packsim_core_VoronoiContainer = &__pyx_type_12packsim_core_VoronoiContainer; - __pyx_vtabptr_12packsim_core_AreaEnergy = &__pyx_vtable_12packsim_core_AreaEnergy; - __pyx_vtable_12packsim_core_AreaEnergy.__pyx_base = *__pyx_vtabptr_12packsim_core_VoronoiContainer; - __pyx_vtable_12packsim_core_AreaEnergy.__pyx_base.precompute = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_10AreaEnergy_precompute; - __pyx_vtable_12packsim_core_AreaEnergy.__pyx_base.calc_grad = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_10AreaEnergy_calc_grad; - __pyx_type_12packsim_core_AreaEnergy.tp_base = __pyx_ptype_12packsim_core_VoronoiContainer; - if (PyType_Ready(&__pyx_type_12packsim_core_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_type_8_packsim_VoronoiContainer.tp_dict, __pyx_vtabptr_8_packsim_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_VoronoiContainer, (PyObject *)&__pyx_type_8_packsim_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject*)&__pyx_type_8_packsim_VoronoiContainer) < 0) __PYX_ERR(1, 388, __pyx_L1_error) + __pyx_ptype_8_packsim_VoronoiContainer = &__pyx_type_8_packsim_VoronoiContainer; + __pyx_vtabptr_8_packsim_AreaEnergy = &__pyx_vtable_8_packsim_AreaEnergy; + __pyx_vtable_8_packsim_AreaEnergy.__pyx_base = *__pyx_vtabptr_8_packsim_VoronoiContainer; + __pyx_vtable_8_packsim_AreaEnergy.__pyx_base.precompute = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_10AreaEnergy_precompute; + __pyx_vtable_8_packsim_AreaEnergy.__pyx_base.calc_grad = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_10AreaEnergy_calc_grad; + __pyx_type_8_packsim_AreaEnergy.tp_base = __pyx_ptype_8_packsim_VoronoiContainer; + if (PyType_Ready(&__pyx_type_8_packsim_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 - __pyx_type_12packsim_core_AreaEnergy.tp_print = 0; + __pyx_type_8_packsim_AreaEnergy.tp_print = 0; #endif - if (__Pyx_SetVtable(__pyx_type_12packsim_core_AreaEnergy.tp_dict, __pyx_vtabptr_12packsim_core_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_AreaEnergy, (PyObject *)&__pyx_type_12packsim_core_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject*)&__pyx_type_12packsim_core_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) - __pyx_ptype_12packsim_core_AreaEnergy = &__pyx_type_12packsim_core_AreaEnergy; - __pyx_vtabptr_12packsim_core_RadialALEnergy = &__pyx_vtable_12packsim_core_RadialALEnergy; - __pyx_vtable_12packsim_core_RadialALEnergy.__pyx_base = *__pyx_vtabptr_12packsim_core_VoronoiContainer; - __pyx_vtable_12packsim_core_RadialALEnergy.__pyx_base.precompute = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_14RadialALEnergy_precompute; - __pyx_vtable_12packsim_core_RadialALEnergy.__pyx_base.calc_grad = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_14RadialALEnergy_calc_grad; - __pyx_type_12packsim_core_RadialALEnergy.tp_base = __pyx_ptype_12packsim_core_VoronoiContainer; - if (PyType_Ready(&__pyx_type_12packsim_core_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_type_8_packsim_AreaEnergy.tp_dict, __pyx_vtabptr_8_packsim_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_AreaEnergy, (PyObject *)&__pyx_type_8_packsim_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject*)&__pyx_type_8_packsim_AreaEnergy) < 0) __PYX_ERR(3, 1, __pyx_L1_error) + __pyx_ptype_8_packsim_AreaEnergy = &__pyx_type_8_packsim_AreaEnergy; + __pyx_vtabptr_8_packsim_RadialALEnergy = &__pyx_vtable_8_packsim_RadialALEnergy; + __pyx_vtable_8_packsim_RadialALEnergy.__pyx_base = *__pyx_vtabptr_8_packsim_VoronoiContainer; + __pyx_vtable_8_packsim_RadialALEnergy.__pyx_base.precompute = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_14RadialALEnergy_precompute; + __pyx_vtable_8_packsim_RadialALEnergy.__pyx_base.calc_grad = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_14RadialALEnergy_calc_grad; + __pyx_type_8_packsim_RadialALEnergy.tp_base = __pyx_ptype_8_packsim_VoronoiContainer; + if (PyType_Ready(&__pyx_type_8_packsim_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 - __pyx_type_12packsim_core_RadialALEnergy.tp_print = 0; + __pyx_type_8_packsim_RadialALEnergy.tp_print = 0; #endif - if (__Pyx_SetVtable(__pyx_type_12packsim_core_RadialALEnergy.tp_dict, __pyx_vtabptr_12packsim_core_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RadialALEnergy, (PyObject *)&__pyx_type_12packsim_core_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject*)&__pyx_type_12packsim_core_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) - __pyx_ptype_12packsim_core_RadialALEnergy = &__pyx_type_12packsim_core_RadialALEnergy; - __pyx_vtabptr_12packsim_core_RadialTEnergy = &__pyx_vtable_12packsim_core_RadialTEnergy; - __pyx_vtable_12packsim_core_RadialTEnergy.__pyx_base = *__pyx_vtabptr_12packsim_core_VoronoiContainer; - __pyx_vtable_12packsim_core_RadialTEnergy.__pyx_base.precompute = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_13RadialTEnergy_precompute; - __pyx_vtable_12packsim_core_RadialTEnergy.__pyx_base.calc_grad = (void (*)(struct __pyx_obj_12packsim_core_VoronoiContainer *))__pyx_f_12packsim_core_13RadialTEnergy_calc_grad; - __pyx_type_12packsim_core_RadialTEnergy.tp_base = __pyx_ptype_12packsim_core_VoronoiContainer; - if (PyType_Ready(&__pyx_type_12packsim_core_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_type_8_packsim_RadialALEnergy.tp_dict, __pyx_vtabptr_8_packsim_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RadialALEnergy, (PyObject *)&__pyx_type_8_packsim_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject*)&__pyx_type_8_packsim_RadialALEnergy) < 0) __PYX_ERR(3, 91, __pyx_L1_error) + __pyx_ptype_8_packsim_RadialALEnergy = &__pyx_type_8_packsim_RadialALEnergy; + __pyx_vtabptr_8_packsim_RadialTEnergy = &__pyx_vtable_8_packsim_RadialTEnergy; + __pyx_vtable_8_packsim_RadialTEnergy.__pyx_base = *__pyx_vtabptr_8_packsim_VoronoiContainer; + __pyx_vtable_8_packsim_RadialTEnergy.__pyx_base.precompute = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_13RadialTEnergy_precompute; + __pyx_vtable_8_packsim_RadialTEnergy.__pyx_base.calc_grad = (void (*)(struct __pyx_obj_8_packsim_VoronoiContainer *))__pyx_f_8_packsim_13RadialTEnergy_calc_grad; + __pyx_type_8_packsim_RadialTEnergy.tp_base = __pyx_ptype_8_packsim_VoronoiContainer; + if (PyType_Ready(&__pyx_type_8_packsim_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 - __pyx_type_12packsim_core_RadialTEnergy.tp_print = 0; + __pyx_type_8_packsim_RadialTEnergy.tp_print = 0; #endif - if (__Pyx_SetVtable(__pyx_type_12packsim_core_RadialTEnergy.tp_dict, __pyx_vtabptr_12packsim_core_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RadialTEnergy, (PyObject *)&__pyx_type_12packsim_core_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject*)&__pyx_type_12packsim_core_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) - __pyx_ptype_12packsim_core_RadialTEnergy = &__pyx_type_12packsim_core_RadialTEnergy; - __pyx_vtabptr_12packsim_core_Calc = &__pyx_vtable_12packsim_core_Calc; - __pyx_vtable_12packsim_core_Calc.phi = (__pyx_t_12packsim_core_FLOAT_T (*)(__pyx_t_12packsim_core_HalfEdge))__pyx_f_12packsim_core_4Calc_phi; - __pyx_vtable_12packsim_core_Calc.I2 = (__pyx_t_12packsim_core_Vector2D (*)(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T))__pyx_f_12packsim_core_4Calc_I2; - __pyx_vtable_12packsim_core_Calc.radialt_edge_grad = (__pyx_t_12packsim_core_Vector2D (*)(__pyx_t_12packsim_core_HalfEdge, __pyx_t_12packsim_core_Site, __pyx_t_12packsim_core_FLOAT_T))__pyx_f_12packsim_core_4Calc_radialt_edge_grad; - if (PyType_Ready(&__pyx_type_12packsim_core_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) + if (__Pyx_SetVtable(__pyx_type_8_packsim_RadialTEnergy.tp_dict, __pyx_vtabptr_8_packsim_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_RadialTEnergy, (PyObject *)&__pyx_type_8_packsim_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject*)&__pyx_type_8_packsim_RadialTEnergy) < 0) __PYX_ERR(3, 122, __pyx_L1_error) + __pyx_ptype_8_packsim_RadialTEnergy = &__pyx_type_8_packsim_RadialTEnergy; + __pyx_vtabptr_8_packsim_Calc = &__pyx_vtable_8_packsim_Calc; + __pyx_vtable_8_packsim_Calc.phi = (__pyx_t_8_packsim_FLOAT_T (*)(__pyx_t_8_packsim_HalfEdge))__pyx_f_8_packsim_4Calc_phi; + __pyx_vtable_8_packsim_Calc.I2 = (__pyx_t_8_packsim_Vector2D (*)(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T))__pyx_f_8_packsim_4Calc_I2; + __pyx_vtable_8_packsim_Calc.radialt_edge_grad = (__pyx_t_8_packsim_Vector2D (*)(__pyx_t_8_packsim_HalfEdge, __pyx_t_8_packsim_Site, __pyx_t_8_packsim_FLOAT_T))__pyx_f_8_packsim_4Calc_radialt_edge_grad; + if (PyType_Ready(&__pyx_type_8_packsim_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) #if PY_VERSION_HEX < 0x030800B1 - __pyx_type_12packsim_core_Calc.tp_print = 0; + __pyx_type_8_packsim_Calc.tp_print = 0; #endif - if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_type_12packsim_core_Calc.tp_dictoffset && __pyx_type_12packsim_core_Calc.tp_getattro == PyObject_GenericGetAttr)) { - __pyx_type_12packsim_core_Calc.tp_getattro = __Pyx_PyObject_GenericGetAttr; + if ((CYTHON_USE_TYPE_SLOTS && CYTHON_USE_PYTYPE_LOOKUP) && likely(!__pyx_type_8_packsim_Calc.tp_dictoffset && __pyx_type_8_packsim_Calc.tp_getattro == PyObject_GenericGetAttr)) { + __pyx_type_8_packsim_Calc.tp_getattro = __Pyx_PyObject_GenericGetAttr; } - if (__Pyx_SetVtable(__pyx_type_12packsim_core_Calc.tp_dict, __pyx_vtabptr_12packsim_core_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) - if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Calc, (PyObject *)&__pyx_type_12packsim_core_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) - if (__Pyx_setup_reduce((PyObject*)&__pyx_type_12packsim_core_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) - __pyx_ptype_12packsim_core_Calc = &__pyx_type_12packsim_core_Calc; + if (__Pyx_SetVtable(__pyx_type_8_packsim_Calc.tp_dict, __pyx_vtabptr_8_packsim_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) + if (PyObject_SetAttr(__pyx_m, __pyx_n_s_Calc, (PyObject *)&__pyx_type_8_packsim_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) + if (__Pyx_setup_reduce((PyObject*)&__pyx_type_8_packsim_Calc) < 0) __PYX_ERR(3, 250, __pyx_L1_error) + __pyx_ptype_8_packsim_Calc = &__pyx_type_8_packsim_Calc; __pyx_vtabptr_array = &__pyx_vtable_array; __pyx_vtable_array.get_memview = (PyObject *(*)(struct __pyx_array_obj *))__pyx_array_get_memview; if (PyType_Ready(&__pyx_type___pyx_array) < 0) __PYX_ERR(2, 105, __pyx_L1_error) @@ -37067,11 +36854,11 @@ static int __Pyx_modinit_function_import_code(void) { #if PY_MAJOR_VERSION < 3 -__Pyx_PyMODINIT_FUNC initpacksim_core(void) CYTHON_SMALL_CODE; /*proto*/ -__Pyx_PyMODINIT_FUNC initpacksim_core(void) +__Pyx_PyMODINIT_FUNC init_packsim(void) CYTHON_SMALL_CODE; /*proto*/ +__Pyx_PyMODINIT_FUNC init_packsim(void) #else -__Pyx_PyMODINIT_FUNC PyInit_packsim_core(void) CYTHON_SMALL_CODE; /*proto*/ -__Pyx_PyMODINIT_FUNC PyInit_packsim_core(void) +__Pyx_PyMODINIT_FUNC PyInit__packsim(void) CYTHON_SMALL_CODE; /*proto*/ +__Pyx_PyMODINIT_FUNC PyInit__packsim(void) #if CYTHON_PEP489_MULTI_PHASE_INIT { return PyModuleDef_Init(&__pyx_moduledef); @@ -37138,59 +36925,59 @@ bad: } -static CYTHON_SMALL_CODE int __pyx_pymod_exec_packsim_core(PyObject *__pyx_pyinit_module) +static CYTHON_SMALL_CODE int __pyx_pymod_exec__packsim(PyObject *__pyx_pyinit_module) #endif #endif { PyObject *__pyx_t_1 = NULL; PyObject *__pyx_t_2 = NULL; - struct __pyx_t_12packsim_core_IArray (*__pyx_t_3)(__pyx_t_12packsim_core_INT_T *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); - __pyx_t_12packsim_core_FArray (*__pyx_t_4)(__pyx_t_12packsim_core_FLOAT_T *, __pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc); - __pyx_t_12packsim_core_BitSet (*__pyx_t_5)(__pyx_t_12packsim_core_INT_T); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_6)(__pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_7)(__pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_8)(__pyx_t_12packsim_core_Vector2D *); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_9)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_10)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_11)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_12)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_13)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_14)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_15)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D *(*__pyx_t_16)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_17)(__pyx_t_12packsim_core_Vector2D *); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_18)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_19)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_20)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_21)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_Vector2D); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_22)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_23)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_24)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Vector2D (*__pyx_t_25)(__pyx_t_12packsim_core_Vector2D *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_26)(__pyx_t_12packsim_core_Matrix2x2 *); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_27)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_28)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_29)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_30)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_31)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_32)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_33)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 *(*__pyx_t_34)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_35)(__pyx_t_12packsim_core_Matrix2x2 *); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_36)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_37)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_38)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_39)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_Matrix2x2); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_40)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_41)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_42)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - __pyx_t_12packsim_core_Matrix2x2 (*__pyx_t_43)(__pyx_t_12packsim_core_Matrix2x2 *, __pyx_t_12packsim_core_FLOAT_T); - static __pyx_t_12packsim_core_FLOAT_T __pyx_t_44[18]; - __pyx_t_12packsim_core_SiteCacheMap (*__pyx_t_45)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T); - __pyx_t_12packsim_core_EdgeCacheMap (*__pyx_t_46)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_INT_T); - __pyx_t_12packsim_core_VoronoiInfo (*__pyx_t_47)(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __pyx_t_12packsim_core_EdgeCacheMap *); - __pyx_t_12packsim_core_Site (*__pyx_t_48)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_VoronoiInfo *); - __pyx_t_12packsim_core_HalfEdge (*__pyx_t_49)(__pyx_t_12packsim_core_INT_T, __pyx_t_12packsim_core_VoronoiInfo *); + struct __pyx_t_8_packsim_IArray (*__pyx_t_3)(__pyx_t_8_packsim_INT_T *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); + __pyx_t_8_packsim_FArray (*__pyx_t_4)(__pyx_t_8_packsim_FLOAT_T *, __pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc); + __pyx_t_8_packsim_BitSet (*__pyx_t_5)(__pyx_t_8_packsim_INT_T); + __pyx_t_8_packsim_Vector2D (*__pyx_t_6)(__pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_7)(__pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_8)(__pyx_t_8_packsim_Vector2D *); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_9)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_10)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_11)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_12)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_13)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_14)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_15)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D *(*__pyx_t_16)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D (*__pyx_t_17)(__pyx_t_8_packsim_Vector2D *); + __pyx_t_8_packsim_Vector2D (*__pyx_t_18)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_19)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_20)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_21)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_Vector2D); + __pyx_t_8_packsim_Vector2D (*__pyx_t_22)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D (*__pyx_t_23)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D (*__pyx_t_24)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Vector2D (*__pyx_t_25)(__pyx_t_8_packsim_Vector2D *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_26)(__pyx_t_8_packsim_Matrix2x2 *); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_27)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_28)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_29)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_30)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_31)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_32)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_33)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 *(*__pyx_t_34)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_35)(__pyx_t_8_packsim_Matrix2x2 *); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_36)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_37)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_38)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_39)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_Matrix2x2); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_40)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_41)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_42)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + __pyx_t_8_packsim_Matrix2x2 (*__pyx_t_43)(__pyx_t_8_packsim_Matrix2x2 *, __pyx_t_8_packsim_FLOAT_T); + static __pyx_t_8_packsim_FLOAT_T __pyx_t_44[18]; + __pyx_t_8_packsim_SiteCacheMap (*__pyx_t_45)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T); + __pyx_t_8_packsim_EdgeCacheMap (*__pyx_t_46)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_INT_T); + __pyx_t_8_packsim_VoronoiInfo (*__pyx_t_47)(__Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __Pyx_memviewslice, __pyx_t_8_packsim_EdgeCacheMap *); + __pyx_t_8_packsim_Site (*__pyx_t_48)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_VoronoiInfo *); + __pyx_t_8_packsim_HalfEdge (*__pyx_t_49)(__pyx_t_8_packsim_INT_T, __pyx_t_8_packsim_VoronoiInfo *); static PyThread_type_lock __pyx_t_50[8]; int __pyx_lineno = 0; const char *__pyx_filename = NULL; @@ -37199,7 +36986,7 @@ static CYTHON_SMALL_CODE int __pyx_pymod_exec_packsim_core(PyObject *__pyx_pyini #if CYTHON_PEP489_MULTI_PHASE_INIT if (__pyx_m) { if (__pyx_m == __pyx_pyinit_module) return 0; - PyErr_SetString(PyExc_RuntimeError, "Module 'packsim_core' has already been imported. Re-initialisation is not supported."); + PyErr_SetString(PyExc_RuntimeError, "Module '_packsim' has already been imported. Re-initialisation is not supported."); return -1; } #elif PY_MAJOR_VERSION >= 3 @@ -37214,7 +37001,7 @@ if (!__Pyx_RefNanny) { Py_FatalError("failed to import 'refnanny' module"); } #endif - __Pyx_RefNannySetupContext("__Pyx_PyMODINIT_FUNC PyInit_packsim_core(void)", 0); + __Pyx_RefNannySetupContext("__Pyx_PyMODINIT_FUNC PyInit__packsim(void)", 0); if (__Pyx_check_binary_version() < 0) __PYX_ERR(7, 1, __pyx_L1_error) #ifdef __Pxy_PyFrame_Initialize_Offsets __Pxy_PyFrame_Initialize_Offsets(); @@ -37251,7 +37038,7 @@ if (!__Pyx_RefNanny) { Py_INCREF(__pyx_m); #else #if PY_MAJOR_VERSION < 3 - __pyx_m = Py_InitModule4("packsim_core", __pyx_methods, 0, 0, PYTHON_API_VERSION); Py_XINCREF(__pyx_m); + __pyx_m = Py_InitModule4("_packsim", __pyx_methods, 0, 0, PYTHON_API_VERSION); Py_XINCREF(__pyx_m); #else __pyx_m = PyModule_Create(&__pyx_moduledef); #endif @@ -37269,14 +37056,14 @@ if (!__Pyx_RefNanny) { #if PY_MAJOR_VERSION < 3 && (__PYX_DEFAULT_STRING_ENCODING_IS_ASCII || __PYX_DEFAULT_STRING_ENCODING_IS_DEFAULT) if (__Pyx_init_sys_getdefaultencoding_params() < 0) __PYX_ERR(7, 1, __pyx_L1_error) #endif - if (__pyx_module_is_main_packsim_core) { + if (__pyx_module_is_main__packsim) { if (PyObject_SetAttr(__pyx_m, __pyx_n_s_name_2, __pyx_n_s_main) < 0) __PYX_ERR(7, 1, __pyx_L1_error) } #if PY_MAJOR_VERSION >= 3 { PyObject *modules = PyImport_GetModuleDict(); if (unlikely(!modules)) __PYX_ERR(7, 1, __pyx_L1_error) - if (!PyDict_GetItemString(modules, "packsim_core")) { - if (unlikely(PyDict_SetItemString(modules, "packsim_core", __pyx_m) < 0)) __PYX_ERR(7, 1, __pyx_L1_error) + if (!PyDict_GetItemString(modules, "_packsim")) { + if (unlikely(PyDict_SetItemString(modules, "_packsim", __pyx_m) < 0)) __PYX_ERR(7, 1, __pyx_L1_error) } } #endif @@ -37297,7 +37084,7 @@ if (!__Pyx_RefNanny) { if (__Pyx_patch_abc() < 0) __PYX_ERR(7, 1, __pyx_L1_error) #endif - /* "core.pyx":1 + /* "src/core.pyx":1 * import array, scipy.spatial, numpy as np # <<<<<<<<<<<<<< * from cython.parallel import parallel, prange * @@ -37315,7 +37102,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; - /* "core.pyx":15 + /* "src/core.pyx":15 * #### Constants #### * * INT = np.int64 # <<<<<<<<<<<<<< @@ -37330,7 +37117,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; - /* "core.pyx":16 + /* "src/core.pyx":16 * * INT = np.int64 * FLOAT = np.float64 # <<<<<<<<<<<<<< @@ -37345,241 +37132,241 @@ 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; - /* "core.pyx":18 + /* "src/core.pyx":18 * FLOAT = np.float64 * * cdef FLOAT_T TAU = 2*PI # <<<<<<<<<<<<<< * # In most cases, the amount of edges relevant to a gradient will * # not exceed this number. However, we assign a growth rate of 8 edges, */ - __pyx_v_12packsim_core_TAU = (2.0 * M_PI); + __pyx_v_8_packsim_TAU = (2.0 * M_PI); - /* "core.pyx":22 + /* "src/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 # <<<<<<<<<<<<<< * * cdef Init init */ - __pyx_v_12packsim_core_EDGE_ARR_SIZE = 32; + __pyx_v_8_packsim_EDGE_ARR_SIZE = 32; - /* "core.pyx":26 + /* "src/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 # <<<<<<<<<<<<<< * * cdef VectorSelfOps VSO */ - __pyx_t_3 = __pyx_f_12packsim_core_init_iarray; - __pyx_t_4 = __pyx_f_12packsim_core_init_farray; - __pyx_t_5 = __pyx_f_12packsim_core_init_bitset; - __pyx_t_6 = __pyx_f_12packsim_core_init_vector2d; - __pyx_t_7 = __pyx_f_12packsim_core_init_matrix2x2; + __pyx_t_3 = __pyx_f_8_packsim_init_iarray; + __pyx_t_4 = __pyx_f_8_packsim_init_farray; + __pyx_t_5 = __pyx_f_8_packsim_init_bitset; + __pyx_t_6 = __pyx_f_8_packsim_init_vector2d; + __pyx_t_7 = __pyx_f_8_packsim_init_matrix2x2; - /* "core.pyx":25 + /* "src/core.pyx":25 * * cdef Init init * init.IArray, init.FArray, init.BitSet, init.Vector2D, init.Matrix2x2 = \ # <<<<<<<<<<<<<< * init_iarray, init_farray, init_bitset, init_vector2d, init_matrix2x2 * */ - __pyx_v_12packsim_core_init.IArray = __pyx_t_3; - __pyx_v_12packsim_core_init.FArray = __pyx_t_4; - __pyx_v_12packsim_core_init.BitSet = __pyx_t_5; - __pyx_v_12packsim_core_init.Vector2D = __pyx_t_6; - __pyx_v_12packsim_core_init.Matrix2x2 = __pyx_t_7; + __pyx_v_8_packsim_init.IArray = __pyx_t_3; + __pyx_v_8_packsim_init.FArray = __pyx_t_4; + __pyx_v_8_packsim_init.BitSet = __pyx_t_5; + __pyx_v_8_packsim_init.Vector2D = __pyx_t_6; + __pyx_v_8_packsim_init.Matrix2x2 = __pyx_t_7; - /* "core.pyx":34 + /* "src/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 # <<<<<<<<<<<<<< * VSO.matmul = v_matmul_s * */ - __pyx_t_8 = __pyx_f_12packsim_core_v_neg_s; - __pyx_t_9 = __pyx_f_12packsim_core_v_vadd_s; - __pyx_t_10 = __pyx_f_12packsim_core_v_vsub_s; - __pyx_t_11 = __pyx_f_12packsim_core_v_vmul_s; - __pyx_t_12 = __pyx_f_12packsim_core_v_vdiv_s; - __pyx_t_13 = __pyx_f_12packsim_core_v_sadd_s; - __pyx_t_14 = __pyx_f_12packsim_core_v_ssub_s; - __pyx_t_15 = __pyx_f_12packsim_core_v_smul_s; - __pyx_t_16 = __pyx_f_12packsim_core_v_sdiv_s; + __pyx_t_8 = __pyx_f_8_packsim_v_neg_s; + __pyx_t_9 = __pyx_f_8_packsim_v_vadd_s; + __pyx_t_10 = __pyx_f_8_packsim_v_vsub_s; + __pyx_t_11 = __pyx_f_8_packsim_v_vmul_s; + __pyx_t_12 = __pyx_f_8_packsim_v_vdiv_s; + __pyx_t_13 = __pyx_f_8_packsim_v_sadd_s; + __pyx_t_14 = __pyx_f_8_packsim_v_ssub_s; + __pyx_t_15 = __pyx_f_8_packsim_v_smul_s; + __pyx_t_16 = __pyx_f_8_packsim_v_sdiv_s; - /* "core.pyx":33 + /* "src/core.pyx":33 * cdef MatrixCopyOps MCO * * 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 */ - __pyx_v_12packsim_core_VSO.neg = __pyx_t_8; - __pyx_v_12packsim_core_VSO.vadd = __pyx_t_9; - __pyx_v_12packsim_core_VSO.vsub = __pyx_t_10; - __pyx_v_12packsim_core_VSO.vmul = __pyx_t_11; - __pyx_v_12packsim_core_VSO.vdiv = __pyx_t_12; - __pyx_v_12packsim_core_VSO.sadd = __pyx_t_13; - __pyx_v_12packsim_core_VSO.ssub = __pyx_t_14; - __pyx_v_12packsim_core_VSO.smul = __pyx_t_15; - __pyx_v_12packsim_core_VSO.sdiv = __pyx_t_16; + __pyx_v_8_packsim_VSO.neg = __pyx_t_8; + __pyx_v_8_packsim_VSO.vadd = __pyx_t_9; + __pyx_v_8_packsim_VSO.vsub = __pyx_t_10; + __pyx_v_8_packsim_VSO.vmul = __pyx_t_11; + __pyx_v_8_packsim_VSO.vdiv = __pyx_t_12; + __pyx_v_8_packsim_VSO.sadd = __pyx_t_13; + __pyx_v_8_packsim_VSO.ssub = __pyx_t_14; + __pyx_v_8_packsim_VSO.smul = __pyx_t_15; + __pyx_v_8_packsim_VSO.sdiv = __pyx_t_16; - /* "core.pyx":35 + /* "src/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 # <<<<<<<<<<<<<< * * VCO.neg, VCO.vadd, VCO.vsub, VCO.vmul, VCO.vdiv, VCO.sadd, VCO.ssub, VCO.smul, VCO.sdiv = \ */ - __pyx_v_12packsim_core_VSO.matmul = __pyx_f_12packsim_core_v_matmul_s; + __pyx_v_8_packsim_VSO.matmul = __pyx_f_8_packsim_v_matmul_s; - /* "core.pyx":38 + /* "src/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 # <<<<<<<<<<<<<< * VCO.matmul = v_matmul_c * */ - __pyx_t_17 = __pyx_f_12packsim_core_v_neg_c; - __pyx_t_18 = __pyx_f_12packsim_core_v_vadd_c; - __pyx_t_19 = __pyx_f_12packsim_core_v_vsub_c; - __pyx_t_20 = __pyx_f_12packsim_core_v_vmul_c; - __pyx_t_21 = __pyx_f_12packsim_core_v_vdiv_c; - __pyx_t_22 = __pyx_f_12packsim_core_v_sadd_c; - __pyx_t_23 = __pyx_f_12packsim_core_v_ssub_c; - __pyx_t_24 = __pyx_f_12packsim_core_v_smul_c; - __pyx_t_25 = __pyx_f_12packsim_core_v_sdiv_c; + __pyx_t_17 = __pyx_f_8_packsim_v_neg_c; + __pyx_t_18 = __pyx_f_8_packsim_v_vadd_c; + __pyx_t_19 = __pyx_f_8_packsim_v_vsub_c; + __pyx_t_20 = __pyx_f_8_packsim_v_vmul_c; + __pyx_t_21 = __pyx_f_8_packsim_v_vdiv_c; + __pyx_t_22 = __pyx_f_8_packsim_v_sadd_c; + __pyx_t_23 = __pyx_f_8_packsim_v_ssub_c; + __pyx_t_24 = __pyx_f_8_packsim_v_smul_c; + __pyx_t_25 = __pyx_f_8_packsim_v_sdiv_c; - /* "core.pyx":37 + /* "src/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 = \ # <<<<<<<<<<<<<< * 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 */ - __pyx_v_12packsim_core_VCO.neg = __pyx_t_17; - __pyx_v_12packsim_core_VCO.vadd = __pyx_t_18; - __pyx_v_12packsim_core_VCO.vsub = __pyx_t_19; - __pyx_v_12packsim_core_VCO.vmul = __pyx_t_20; - __pyx_v_12packsim_core_VCO.vdiv = __pyx_t_21; - __pyx_v_12packsim_core_VCO.sadd = __pyx_t_22; - __pyx_v_12packsim_core_VCO.ssub = __pyx_t_23; - __pyx_v_12packsim_core_VCO.smul = __pyx_t_24; - __pyx_v_12packsim_core_VCO.sdiv = __pyx_t_25; + __pyx_v_8_packsim_VCO.neg = __pyx_t_17; + __pyx_v_8_packsim_VCO.vadd = __pyx_t_18; + __pyx_v_8_packsim_VCO.vsub = __pyx_t_19; + __pyx_v_8_packsim_VCO.vmul = __pyx_t_20; + __pyx_v_8_packsim_VCO.vdiv = __pyx_t_21; + __pyx_v_8_packsim_VCO.sadd = __pyx_t_22; + __pyx_v_8_packsim_VCO.ssub = __pyx_t_23; + __pyx_v_8_packsim_VCO.smul = __pyx_t_24; + __pyx_v_8_packsim_VCO.sdiv = __pyx_t_25; - /* "core.pyx":39 + /* "src/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 # <<<<<<<<<<<<<< * * MSO.neg, MSO.madd, MSO.msub, MSO.mmul, MSO.mdiv, MSO.sadd, MSO.ssub, MSO.smul, MSO.sdiv = \ */ - __pyx_v_12packsim_core_VCO.matmul = __pyx_f_12packsim_core_v_matmul_c; + __pyx_v_8_packsim_VCO.matmul = __pyx_f_8_packsim_v_matmul_c; - /* "core.pyx":42 + /* "src/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 # <<<<<<<<<<<<<< * MSO.matmul = m_matmul_s * */ - __pyx_t_26 = __pyx_f_12packsim_core_m_neg_s; - __pyx_t_27 = __pyx_f_12packsim_core_m_madd_s; - __pyx_t_28 = __pyx_f_12packsim_core_m_msub_s; - __pyx_t_29 = __pyx_f_12packsim_core_m_mmul_s; - __pyx_t_30 = __pyx_f_12packsim_core_m_mdiv_s; - __pyx_t_31 = __pyx_f_12packsim_core_m_sadd_s; - __pyx_t_32 = __pyx_f_12packsim_core_m_ssub_s; - __pyx_t_33 = __pyx_f_12packsim_core_m_smul_s; - __pyx_t_34 = __pyx_f_12packsim_core_m_sdiv_s; + __pyx_t_26 = __pyx_f_8_packsim_m_neg_s; + __pyx_t_27 = __pyx_f_8_packsim_m_madd_s; + __pyx_t_28 = __pyx_f_8_packsim_m_msub_s; + __pyx_t_29 = __pyx_f_8_packsim_m_mmul_s; + __pyx_t_30 = __pyx_f_8_packsim_m_mdiv_s; + __pyx_t_31 = __pyx_f_8_packsim_m_sadd_s; + __pyx_t_32 = __pyx_f_8_packsim_m_ssub_s; + __pyx_t_33 = __pyx_f_8_packsim_m_smul_s; + __pyx_t_34 = __pyx_f_8_packsim_m_sdiv_s; - /* "core.pyx":41 + /* "src/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 = \ # <<<<<<<<<<<<<< * 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 */ - __pyx_v_12packsim_core_MSO.neg = __pyx_t_26; - __pyx_v_12packsim_core_MSO.madd = __pyx_t_27; - __pyx_v_12packsim_core_MSO.msub = __pyx_t_28; - __pyx_v_12packsim_core_MSO.mmul = __pyx_t_29; - __pyx_v_12packsim_core_MSO.mdiv = __pyx_t_30; - __pyx_v_12packsim_core_MSO.sadd = __pyx_t_31; - __pyx_v_12packsim_core_MSO.ssub = __pyx_t_32; - __pyx_v_12packsim_core_MSO.smul = __pyx_t_33; - __pyx_v_12packsim_core_MSO.sdiv = __pyx_t_34; + __pyx_v_8_packsim_MSO.neg = __pyx_t_26; + __pyx_v_8_packsim_MSO.madd = __pyx_t_27; + __pyx_v_8_packsim_MSO.msub = __pyx_t_28; + __pyx_v_8_packsim_MSO.mmul = __pyx_t_29; + __pyx_v_8_packsim_MSO.mdiv = __pyx_t_30; + __pyx_v_8_packsim_MSO.sadd = __pyx_t_31; + __pyx_v_8_packsim_MSO.ssub = __pyx_t_32; + __pyx_v_8_packsim_MSO.smul = __pyx_t_33; + __pyx_v_8_packsim_MSO.sdiv = __pyx_t_34; - /* "core.pyx":43 + /* "src/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 # <<<<<<<<<<<<<< * * MCO.neg, MCO.madd, MCO.msub, MCO.mmul, MCO.mdiv, MCO.sadd, MCO.ssub, MCO.smul, MCO.sdiv = \ */ - __pyx_v_12packsim_core_MSO.matmul = __pyx_f_12packsim_core_m_matmul_s; + __pyx_v_8_packsim_MSO.matmul = __pyx_f_8_packsim_m_matmul_s; - /* "core.pyx":46 + /* "src/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 # <<<<<<<<<<<<<< * MCO.matmul = m_matmul_c * */ - __pyx_t_35 = __pyx_f_12packsim_core_m_neg_c; - __pyx_t_36 = __pyx_f_12packsim_core_m_madd_c; - __pyx_t_37 = __pyx_f_12packsim_core_m_msub_c; - __pyx_t_38 = __pyx_f_12packsim_core_m_mmul_c; - __pyx_t_39 = __pyx_f_12packsim_core_m_mdiv_c; - __pyx_t_40 = __pyx_f_12packsim_core_m_sadd_c; - __pyx_t_41 = __pyx_f_12packsim_core_m_ssub_c; - __pyx_t_42 = __pyx_f_12packsim_core_m_smul_c; - __pyx_t_43 = __pyx_f_12packsim_core_m_sdiv_c; + __pyx_t_35 = __pyx_f_8_packsim_m_neg_c; + __pyx_t_36 = __pyx_f_8_packsim_m_madd_c; + __pyx_t_37 = __pyx_f_8_packsim_m_msub_c; + __pyx_t_38 = __pyx_f_8_packsim_m_mmul_c; + __pyx_t_39 = __pyx_f_8_packsim_m_mdiv_c; + __pyx_t_40 = __pyx_f_8_packsim_m_sadd_c; + __pyx_t_41 = __pyx_f_8_packsim_m_ssub_c; + __pyx_t_42 = __pyx_f_8_packsim_m_smul_c; + __pyx_t_43 = __pyx_f_8_packsim_m_sdiv_c; - /* "core.pyx":45 + /* "src/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 = \ # <<<<<<<<<<<<<< * 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 */ - __pyx_v_12packsim_core_MCO.neg = __pyx_t_35; - __pyx_v_12packsim_core_MCO.madd = __pyx_t_36; - __pyx_v_12packsim_core_MCO.msub = __pyx_t_37; - __pyx_v_12packsim_core_MCO.mmul = __pyx_t_38; - __pyx_v_12packsim_core_MCO.mdiv = __pyx_t_39; - __pyx_v_12packsim_core_MCO.sadd = __pyx_t_40; - __pyx_v_12packsim_core_MCO.ssub = __pyx_t_41; - __pyx_v_12packsim_core_MCO.smul = __pyx_t_42; - __pyx_v_12packsim_core_MCO.sdiv = __pyx_t_43; + __pyx_v_8_packsim_MCO.neg = __pyx_t_35; + __pyx_v_8_packsim_MCO.madd = __pyx_t_36; + __pyx_v_8_packsim_MCO.msub = __pyx_t_37; + __pyx_v_8_packsim_MCO.mmul = __pyx_t_38; + __pyx_v_8_packsim_MCO.mdiv = __pyx_t_39; + __pyx_v_8_packsim_MCO.sadd = __pyx_t_40; + __pyx_v_8_packsim_MCO.ssub = __pyx_t_41; + __pyx_v_8_packsim_MCO.smul = __pyx_t_42; + __pyx_v_8_packsim_MCO.sdiv = __pyx_t_43; - /* "core.pyx":47 + /* "src/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 # <<<<<<<<<<<<<< * * cdef Vector2D NAN_VECTOR = init.Vector2D(NAN, NAN) */ - __pyx_v_12packsim_core_MCO.matmul = __pyx_f_12packsim_core_m_matmul_c; + __pyx_v_8_packsim_MCO.matmul = __pyx_f_8_packsim_m_matmul_c; - /* "core.pyx":49 + /* "src/core.pyx":49 * MCO.matmul = m_matmul_c * * cdef Vector2D NAN_VECTOR = init.Vector2D(NAN, NAN) # <<<<<<<<<<<<<< * cdef Matrix2x2 NAN_MATRIX = init.Matrix2x2(NAN, NAN, NAN, NAN) * */ - __pyx_v_12packsim_core_NAN_VECTOR = __pyx_v_12packsim_core_init.Vector2D(NAN, NAN); + __pyx_v_8_packsim_NAN_VECTOR = __pyx_v_8_packsim_init.Vector2D(NAN, NAN); - /* "core.pyx":50 + /* "src/core.pyx":50 * * cdef Vector2D NAN_VECTOR = init.Vector2D(NAN, NAN) * 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] */ - __pyx_v_12packsim_core_NAN_MATRIX = __pyx_v_12packsim_core_init.Matrix2x2(NAN, NAN, NAN, NAN); + __pyx_v_8_packsim_NAN_MATRIX = __pyx_v_8_packsim_init.Matrix2x2(NAN, NAN, NAN, NAN); - /* "core.pyx":52 + /* "src/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] # <<<<<<<<<<<<<< @@ -37604,81 +37391,81 @@ if (!__Pyx_RefNanny) { __pyx_t_44[15] = -1.0; __pyx_t_44[16] = 1.0; __pyx_t_44[17] = -1.0; - memcpy(&(__pyx_v_12packsim_core_SYMM[0]), __pyx_t_44, sizeof(__pyx_v_12packsim_core_SYMM[0]) * (18)); + memcpy(&(__pyx_v_8_packsim_SYMM[0]), __pyx_t_44, sizeof(__pyx_v_8_packsim_SYMM[0]) * (18)); - /* "core.pyx":53 + /* "src/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) # <<<<<<<<<<<<<< * * """ */ - __pyx_v_12packsim_core_R = __pyx_v_12packsim_core_init.Matrix2x2(0.0, -1.0, 1.0, 0.0); + __pyx_v_8_packsim_R = __pyx_v_8_packsim_init.Matrix2x2(0.0, -1.0, 1.0, 0.0); - /* "voronoi_dcel.pyx":6 + /* "src/voronoi_dcel.pyx":6 * * init.SiteCacheMap, init.EdgeCacheMap, init.VoronoiInfo, init.Site, init.HalfEdge = \ * init_sitecachemap, init_edgecachemap, init_voronoiinfo, init_site, init_halfedge # <<<<<<<<<<<<<< * * cdef SiteCacheMap SITE_CACHE_MAP = init.SiteCacheMap(0, 1, 2, 3, 4) */ - __pyx_t_45 = __pyx_f_12packsim_core_init_sitecachemap; - __pyx_t_46 = __pyx_f_12packsim_core_init_edgecachemap; - __pyx_t_47 = __pyx_f_12packsim_core_init_voronoiinfo; - __pyx_t_48 = __pyx_f_12packsim_core_init_site; - __pyx_t_49 = __pyx_f_12packsim_core_init_halfedge; + __pyx_t_45 = __pyx_f_8_packsim_init_sitecachemap; + __pyx_t_46 = __pyx_f_8_packsim_init_edgecachemap; + __pyx_t_47 = __pyx_f_8_packsim_init_voronoiinfo; + __pyx_t_48 = __pyx_f_8_packsim_init_site; + __pyx_t_49 = __pyx_f_8_packsim_init_halfedge; - /* "voronoi_dcel.pyx":5 + /* "src/voronoi_dcel.pyx":5 * #### Constants #### * * init.SiteCacheMap, init.EdgeCacheMap, init.VoronoiInfo, init.Site, init.HalfEdge = \ # <<<<<<<<<<<<<< * init_sitecachemap, init_edgecachemap, init_voronoiinfo, init_site, init_halfedge * */ - __pyx_v_12packsim_core_init.SiteCacheMap = __pyx_t_45; - __pyx_v_12packsim_core_init.EdgeCacheMap = __pyx_t_46; - __pyx_v_12packsim_core_init.VoronoiInfo = __pyx_t_47; - __pyx_v_12packsim_core_init.Site = __pyx_t_48; - __pyx_v_12packsim_core_init.HalfEdge = __pyx_t_49; + __pyx_v_8_packsim_init.SiteCacheMap = __pyx_t_45; + __pyx_v_8_packsim_init.EdgeCacheMap = __pyx_t_46; + __pyx_v_8_packsim_init.VoronoiInfo = __pyx_t_47; + __pyx_v_8_packsim_init.Site = __pyx_t_48; + __pyx_v_8_packsim_init.HalfEdge = __pyx_t_49; - /* "voronoi_dcel.pyx":8 + /* "src/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) # <<<<<<<<<<<<<< * * cdef EdgeCacheMap AREA_EDGE_CACHE_MAP = init.EdgeCacheMap(0, 4, 6, 8, 10, -1, 12, 13, */ - __pyx_v_12packsim_core_SITE_CACHE_MAP = __pyx_v_12packsim_core_init.SiteCacheMap(0, 1, 2, 3, 4); + __pyx_v_8_packsim_SITE_CACHE_MAP = __pyx_v_8_packsim_init.SiteCacheMap(0, 1, 2, 3, 4); - /* "voronoi_dcel.pyx":10 + /* "src/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, # <<<<<<<<<<<<<< * -1, -1, -1, -1, -1, 14) * cdef EdgeCacheMap RADIALT_EDGE_CACHE_MAP = init.EdgeCacheMap(0, 4, 6, 8, -1, 10, 12, 13, */ - __pyx_v_12packsim_core_AREA_EDGE_CACHE_MAP = __pyx_v_12packsim_core_init.EdgeCacheMap(0, 4, 6, 8, 10, -1LL, 12, 13, -1LL, -1LL, -1LL, -1LL, -1LL, 14); + __pyx_v_8_packsim_AREA_EDGE_CACHE_MAP = __pyx_v_8_packsim_init.EdgeCacheMap(0, 4, 6, 8, 10, -1LL, 12, 13, -1LL, -1LL, -1LL, -1LL, -1LL, 14); - /* "voronoi_dcel.pyx":12 + /* "src/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, # <<<<<<<<<<<<<< * 14, 15, 16, 17, 18, 19) * */ - __pyx_v_12packsim_core_RADIALT_EDGE_CACHE_MAP = __pyx_v_12packsim_core_init.EdgeCacheMap(0, 4, 6, 8, -1LL, 10, 12, 13, 14, 15, 16, 17, 18, 19); + __pyx_v_8_packsim_RADIALT_EDGE_CACHE_MAP = __pyx_v_8_packsim_init.EdgeCacheMap(0, 4, 6, 8, -1LL, 10, 12, 13, 14, 15, 16, 17, 18, 19); /* "(tree fragment)":1 * def __pyx_unpickle_Calc(__pyx_type, long __pyx_checksum, __pyx_state): # <<<<<<<<<<<<<< * cdef object __pyx_PickleError * cdef object __pyx_result */ - __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_12packsim_core_1__pyx_unpickle_Calc, NULL, __pyx_n_s_packsim_core); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 1, __pyx_L1_error) + __pyx_t_1 = PyCFunction_NewEx(&__pyx_mdef_8_packsim_1__pyx_unpickle_Calc, NULL, __pyx_n_s_packsim); if (unlikely(!__pyx_t_1)) __PYX_ERR(2, 1, __pyx_L1_error) __Pyx_GOTREF(__pyx_t_1); if (PyDict_SetItem(__pyx_d, __pyx_n_s_pyx_unpickle_Calc, __pyx_t_1) < 0) __PYX_ERR(2, 1, __pyx_L1_error) __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0; - /* "packsim_core.pyx":1 + /* "_packsim.pyx":1 * include "core.pyx" # <<<<<<<<<<<<<< * include "voronoi_dcel.pyx" * include "energy.pyx" @@ -37849,11 +37636,11 @@ if (!__Pyx_RefNanny) { __Pyx_XDECREF(__pyx_t_2); if (__pyx_m) { if (__pyx_d) { - __Pyx_AddTraceback("init packsim_core", __pyx_clineno, __pyx_lineno, __pyx_filename); + __Pyx_AddTraceback("init _packsim", __pyx_clineno, __pyx_lineno, __pyx_filename); } Py_CLEAR(__pyx_m); } else if (!PyErr_Occurred()) { - PyErr_SetString(PyExc_ImportError, "init packsim_core"); + PyErr_SetString(PyExc_ImportError, "init _packsim"); } __pyx_L0:; __Pyx_RefNannyFinishContext(); @@ -40046,6 +39833,28 @@ static PyObject* __Pyx_PyInt_RemainderObjC(PyObject *op1, PyObject *op2, CYTHON_ } #endif +/* PyObjectCallNoArg */ + #if CYTHON_COMPILING_IN_CPYTHON +static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) { +#if CYTHON_FAST_PYCALL + if (PyFunction_Check(func)) { + return __Pyx_PyFunction_FastCall(func, NULL, 0); + } +#endif +#ifdef __Pyx_CyFunction_USED + if (likely(PyCFunction_Check(func) || __Pyx_CyFunction_Check(func))) +#else + if (likely(PyCFunction_Check(func))) +#endif + { + if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) { + return __Pyx_PyObject_CallMethO(func, NULL); + } + } + return __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL); +} +#endif + /* PyIntBinop */ #if !CYTHON_COMPILING_IN_PYPY #if PY_MAJOR_VERSION < 3 || CYTHON_USE_PYLONG_INTERNALS @@ -40146,28 +39955,6 @@ static PyObject* __Pyx_PyInt_TrueDivideObjC(PyObject *op1, PyObject *op2, CYTHON } #endif -/* PyObjectCallNoArg */ - #if CYTHON_COMPILING_IN_CPYTHON -static CYTHON_INLINE PyObject* __Pyx_PyObject_CallNoArg(PyObject *func) { -#if CYTHON_FAST_PYCALL - if (PyFunction_Check(func)) { - return __Pyx_PyFunction_FastCall(func, NULL, 0); - } -#endif -#ifdef __Pyx_CyFunction_USED - if (likely(PyCFunction_Check(func) || __Pyx_CyFunction_Check(func))) -#else - if (likely(PyCFunction_Check(func))) -#endif - { - if (likely(PyCFunction_GET_FLAGS(func) & METH_NOARGS)) { - return __Pyx_PyObject_CallMethO(func, NULL); - } - } - return __Pyx_PyObject_Call(func, __pyx_empty_tuple, NULL); -} -#endif - /* ArgTypeTest */ static int __Pyx__ArgTypeTest(PyObject *obj, PyTypeObject *type, const char *name, int exact) { @@ -41493,7 +41280,7 @@ __pyx_capsule_create(void *p, CYTHON_UNUSED const char *sig) } /* ToPyCTupleUtility */ - static PyObject* __pyx_convert__to_py___pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc(__pyx_ctuple_78a842____dunderpyx_t_12packsim_core_INT_T__and___dunderpyx_t_12packsim_core_INT_T__etc value) { + static PyObject* __pyx_convert__to_py___pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc(__pyx_ctuple_d8c54b____dunderpyx_t_8_packsim_INT_T__and___dunderpyx_t_8_packsim_INT_T__etc value) { PyObject* item = NULL; PyObject* result = PyTuple_New(2); if (!result) goto bad; @@ -41733,7 +41520,7 @@ no_fail: } /* ObjectToMemviewSlice */ - static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_FLOAT_T(PyObject *obj, int writable_flag) { + static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_FLOAT_T(PyObject *obj, int writable_flag) { __Pyx_memviewslice result = { 0, 0, { 0 }, { 0 }, { 0 } }; __Pyx_BufFmt_StackElem stack[1]; int axes_specs[] = { (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_FOLLOW), (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_CONTIG) }; @@ -41744,7 +41531,7 @@ no_fail: } retcode = __Pyx_ValidateAndInit_memviewslice(axes_specs, __Pyx_IS_C_CONTIG, (PyBUF_C_CONTIGUOUS | PyBUF_FORMAT) | writable_flag, 2, - &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, stack, + &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, stack, &result, obj); if (unlikely(retcode == -1)) goto __pyx_fail; @@ -41756,7 +41543,7 @@ __pyx_fail: } /* ObjectToMemviewSlice */ - static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_12packsim_core_INT_T(PyObject *obj, int writable_flag) { + static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_d_dc_nn___pyx_t_8_packsim_INT_T(PyObject *obj, int writable_flag) { __Pyx_memviewslice result = { 0, 0, { 0 }, { 0 }, { 0 } }; __Pyx_BufFmt_StackElem stack[1]; int axes_specs[] = { (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_FOLLOW), (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_CONTIG) }; @@ -41767,7 +41554,7 @@ __pyx_fail: } retcode = __Pyx_ValidateAndInit_memviewslice(axes_specs, __Pyx_IS_C_CONTIG, (PyBUF_C_CONTIGUOUS | PyBUF_FORMAT) | writable_flag, 2, - &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_INT_T, stack, + &__Pyx_TypeInfo_nn___pyx_t_8_packsim_INT_T, stack, &result, obj); if (unlikely(retcode == -1)) goto __pyx_fail; @@ -41779,19 +41566,19 @@ __pyx_fail: } /* MemviewDtypeToObject */ - static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_12packsim_core_INT_T(const char *itemp) { - return (PyObject *) __Pyx_PyInt_From_npy_int64(*(__pyx_t_12packsim_core_INT_T *) itemp); + static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_8_packsim_INT_T(const char *itemp) { + return (PyObject *) __Pyx_PyInt_From_npy_int64(*(__pyx_t_8_packsim_INT_T *) itemp); } -static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_12packsim_core_INT_T(const char *itemp, PyObject *obj) { - __pyx_t_12packsim_core_INT_T value = __Pyx_PyInt_As_npy_int64(obj); +static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_8_packsim_INT_T(const char *itemp, PyObject *obj) { + __pyx_t_8_packsim_INT_T value = __Pyx_PyInt_As_npy_int64(obj); if ((value == ((npy_int64)-1)) && PyErr_Occurred()) return 0; - *(__pyx_t_12packsim_core_INT_T *) itemp = value; + *(__pyx_t_8_packsim_INT_T *) itemp = value; return 1; } /* ObjectToMemviewSlice */ - static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_12packsim_core_FLOAT_T(PyObject *obj, int writable_flag) { + static CYTHON_INLINE __Pyx_memviewslice __Pyx_PyObject_to_MemoryviewSlice_ds_nn___pyx_t_8_packsim_FLOAT_T(PyObject *obj, int writable_flag) { __Pyx_memviewslice result = { 0, 0, { 0 }, { 0 }, { 0 } }; __Pyx_BufFmt_StackElem stack[1]; int axes_specs[] = { (__Pyx_MEMVIEW_DIRECT | __Pyx_MEMVIEW_STRIDED) }; @@ -41802,7 +41589,7 @@ static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_12packsim_core_INT_T(const } retcode = __Pyx_ValidateAndInit_memviewslice(axes_specs, 0, PyBUF_RECORDS_RO | writable_flag, 1, - &__Pyx_TypeInfo_nn___pyx_t_12packsim_core_FLOAT_T, stack, + &__Pyx_TypeInfo_nn___pyx_t_8_packsim_FLOAT_T, stack, &result, obj); if (unlikely(retcode == -1)) goto __pyx_fail; @@ -41814,14 +41601,14 @@ __pyx_fail: } /* MemviewDtypeToObject */ - static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_12packsim_core_FLOAT_T(const char *itemp) { - return (PyObject *) PyFloat_FromDouble(*(__pyx_t_12packsim_core_FLOAT_T *) itemp); + static CYTHON_INLINE PyObject *__pyx_memview_get_nn___pyx_t_8_packsim_FLOAT_T(const char *itemp) { + return (PyObject *) PyFloat_FromDouble(*(__pyx_t_8_packsim_FLOAT_T *) itemp); } -static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_12packsim_core_FLOAT_T(const char *itemp, PyObject *obj) { - __pyx_t_12packsim_core_FLOAT_T value = __pyx_PyFloat_AsDouble(obj); +static CYTHON_INLINE int __pyx_memview_set_nn___pyx_t_8_packsim_FLOAT_T(const char *itemp, PyObject *obj) { + __pyx_t_8_packsim_FLOAT_T value = __pyx_PyFloat_AsDouble(obj); if ((value == ((npy_float64)-1)) && PyErr_Occurred()) return 0; - *(__pyx_t_12packsim_core_FLOAT_T *) itemp = value; + *(__pyx_t_8_packsim_FLOAT_T *) itemp = value; return 1; } diff --git a/src/packsim_core.pxd b/src/_packsim.pxd similarity index 100% rename from src/packsim_core.pxd rename to src/_packsim.pxd diff --git a/src/packsim_core.pyx b/src/_packsim.pyx similarity index 100% rename from src/packsim_core.pyx rename to src/_packsim.pyx diff --git a/src/core.pyx b/src/core.pyx index 4ade12f..b36a03e 100644 --- a/src/core.pyx +++ b/src/core.pyx @@ -6,7 +6,7 @@ from cpython cimport array from libc.stdlib cimport malloc, realloc, calloc, free from libc.math cimport isnan, NAN, pi as PI, M_PI_2 as PI_2, \ sqrt, log, sin, cos, tan, acos, fabs -from packsim_core cimport INT_T, FLOAT_T, Init, IArray, FArray, BitSet, Vector2D, Matrix2x2, \ +from _packsim cimport INT_T, FLOAT_T, Init, IArray, FArray, BitSet, Vector2D, Matrix2x2, \ VectorSelfOps, VectorCopyOps, MatrixSelfOps, MatrixCopyOps, \ SiteCacheMap, EdgeCacheMap, VoronoiInfo, Site, HalfEdge diff --git a/src/voronoi_dcel.pyx b/src/voronoi_dcel.pyx index 09281e0..2f04024 100644 --- a/src/voronoi_dcel.pyx +++ b/src/voronoi_dcel.pyx @@ -1,4 +1,4 @@ -from packsim_core cimport SiteCacheMap, EdgeCacheMap, VoronoiInfo, Site, HalfEdge +from _packsim cimport SiteCacheMap, EdgeCacheMap, VoronoiInfo, Site, HalfEdge #### Constants #### @@ -405,12 +405,6 @@ cdef class VoronoiContainer: self.common_cache() self.precompute() self.calc_grad() - self.get_statistics() - - # #print(np.asarray(self.site_cache[0])) - # print(np.asarray(self.edges[:6])) - # #print(np.asarray(self.edge_cache[:6])) - # print(self.gradient) cdef void calculate_voronoi(VoronoiContainer self, @@ -622,10 +616,7 @@ cdef class VoronoiContainer: cache = self.site_cache[:self.n, :] self.stats["site_areas"] = np.asarray(cache[:, SITE_CACHE_MAP.iarea]) - #edge_count = self.sites[:, 2]np.empty((self.n,)) - # for i in range(self.n): - # edge_count[i] = len(self.vor_data.regions[self.vor_data.point_region[i]]) - self.stats["site_edge_count"] = self.sites[:self.n, 2] + self.stats["site_edge_count"] = np.asarray(self.sites[:self.n, 2]) self.stats["site_isos"] = np.asarray(cache[:, SITE_CACHE_MAP.iisoparam]) self.stats["site_energies"] = np.asarray(cache[:, SITE_CACHE_MAP.ienergy]) @@ -661,21 +652,29 @@ cdef class VoronoiContainer: def iterate(self, FLOAT_T step): k1 = self.gradient - - k2 = self.__class__(self.n, self.w, self.h, self.r, - self.add_sites(step*k1/2) + k2 = self.__class__(self.n, self.w, self.h, self.r, + self.add_sites(step*k1) ).gradient - lower = step*(-k1+ 2*k2) - k3 = self.__class__(self.n, self.w, self.h, self.r, - self.add_sites(lower) - ).gradient + return (step/2)*(k1+k2), k1 + # k1 = self.gradient + + # k2 = self.__class__(self.n, self.w, self.h, self.r, + # self.add_sites(step*k1/2) + # ).gradient + + # lower = step*(-k1+ 2*k2) + # k3 = self.__class__(self.n, self.w, self.h, self.r, + # self.add_sites(lower) + # ).gradient + + # higher = (step/6)*(k1+2*k2+k3) + - higher = (step/6)*(k1+2*k2+k3) #new_sites = self.add_sites(higher) #error = higher - lower - return higher, k1 + #return higher, k1 def hessian(self, d: float) -> np.ndarray: """ diff --git a/test_sim.json b/test_sim.json deleted file mode 100644 index 8ca3fb0..0000000 --- a/test_sim.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "domain": { - "n_objects": 100, - "width": 10.0, - "height": 10.0, - "natural_radius": 4.0, - "energy": "radial-t" - }, - "simulation": { - "mode": "flow", - "step_size": 0.05, - "threshold": 0.00001, - "save_sim": true - }, - "diagram": { - "filetype": "mp4", - "figures": "energy" - } -} \ No newline at end of file