v2.3.0 numpy based algorithms

jannikmi · Aug 18, 2022 · 322871e · 322871e
2 parents 80c7184 + 6c5c5d5
commit 322871e
Show file tree

Hide file tree

Showing 17 changed files with 1,694 additions and 1,807 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -44,8 +44,10 @@ repos:
     hooks:
       - id: flake8
         exclude: ^(docs|scripts|tests)/
+        # E203 whitespace before ':'
         args:
           - --max-line-length=120
+          - --ignore=E203
         additional_dependencies:
           - flake8-bugbear
           - flake8-comprehensions
@@ -59,7 +61,7 @@ repos:
         additional_dependencies: [ numpy, poetry==1.1.11 ]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.36.0
+    rev: v2.37.3
     hooks:
       - id: pyupgrade
 

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,6 +1,24 @@
 Changelog
 =========
 
+
+TODO pending major release: remove separate prepare step?! initialise in one step during initialisation
+TODO Numba JIT compilation of utils. line speed profiling for highest impact of refactoring
+TODO improve A* implementation (away from OOP)
+
+
+2.3.0 (2022-08-18)
+-------------------
+
+* major overhaul of all functionality from OOP to functional programming/numpy based
+
+internal:
+
+* added test cases
+
+
+
+
 2.2.3 (2022-10-11)
 -------------------
 

diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ hook:
 	@pre-commit install
 	@pre-commit run --all-files
 
-hookupdate:
+hook2:
 	@pre-commit autoupdate
 
 clean:

diff --git a/docs/conf.py b/docs/conf.py
@@ -110,7 +110,7 @@
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ["_static"]
 
-# TODO https://github.com/adamchainz/django-mysql/blob/master/docs/conf.py
+# https://github.com/adamchainz/django-mysql/blob/master/docs/conf.py
 # -- Options for LaTeX output ------------------------------------------
 
 # -- Options for manual page output ------------------------------------

diff --git a/extremitypathfinder/command_line.py b/extremitypathfinder/command_line.py
@@ -1,7 +1,7 @@
 import argparse
 
 from extremitypathfinder import PolygonEnvironment
-from extremitypathfinder.global_settings import BOUNDARY_JSON_KEY, HOLES_JSON_KEY
+from extremitypathfinder.configs import BOUNDARY_JSON_KEY, HOLES_JSON_KEY
 from extremitypathfinder.helper_fcts import read_json
 
 JSON_HELP_MSG = (

diff --git a/extremitypathfinder/global_settings.py → extremitypathfinder/configs.py b/extremitypathfinder/global_settings.py → extremitypathfinder/configs.py
@@ -6,8 +6,8 @@
 PATH_TYPE = List[COORDINATE_TYPE]
 LENGTH_TYPE = Optional[float]
 INPUT_NUMERICAL_TYPE = Union[float, int]
-INPUT_COORD_TYPE = Tuple[INPUT_NUMERICAL_TYPE, INPUT_NUMERICAL_TYPE]
-OBSTACLE_ITER_TYPE = Iterable[INPUT_COORD_TYPE]
+InputCoords = Tuple[INPUT_NUMERICAL_TYPE, INPUT_NUMERICAL_TYPE]
+OBSTACLE_ITER_TYPE = Iterable[InputCoords]
 INPUT_COORD_LIST_TYPE = Union[np.ndarray, List]
 DEFAULT_PICKLE_NAME = "environment.pickle"