Merge pull request #50 from mapmanager/jtle00-j-dev

Merging in numba changes

Author: jtle00

.github/workflows/publish_test_pypi.yml.old

@@ -0,0 +1,34 @@
+name: Publish brightest to test PyPi (johnson)
+
+on:
+  release:
+    types: [published] # Runs when a new GitHub release is published
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source (johnson)
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0  # needed so setuptools_scm can get tags
+
+      - name: Set up Python (johnson)
+        uses: actions/setup-python@v4
+        with:
+          python-version: "3.x"
+
+      - name: Install dependencies (johnson)
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U setuptools wheel twine build
+          pip install -U .
+
+      - name: Build and publish (johnson)
+        env:
+          TWINE_USERNAME: __token__
+          TWINE_PASSWORD: ${{ secrets.TEST_PYPI_TOKEN }}
+        run: |
+          git tag
+          python -m build .
+          twine upload --repository testpypi dist/*

brightest_path_lib/algorithm/__init__.py

@@ -1,2 +1,9 @@
 from .astar import AStarSearch
-from .nbastar import NBAStarSearch
+
+# Try to import the numba-optimized version first, fall back to non-numba version
+try:
+    import numba
+    from .numba_nbastar import NBAStarSearch as NBAStarSearch
+except (ModuleNotFoundError, ImportError):
+    # numba not available, use the non-numba version
+    from .nbastar import NBAStarSearch as NBAStarSearch

brightest_path_lib/algorithm/astar.py

@@ -31,8 +31,8 @@
 import numpy as np
 from queue import PriorityQueue, Queue
 from typing import List, Tuple
-from brightest_path_lib.cost import ReciprocalTransonic
-from brightest_path_lib.heuristic import EuclideanTransonic
+from brightest_path_lib.cost import Reciprocal
+from brightest_path_lib.heuristic import Euclidean
 from brightest_path_lib.image import ImageStats
 from brightest_path_lib.input import CostFunction, HeuristicFunction
 from brightest_path_lib.node import Node
@@ -124,12 +124,12 @@ def __init__(
         self.open_nodes = open_nodes
 
         if cost_function == CostFunction.RECIPROCAL:
-            self.cost_function = ReciprocalTransonic(
+            self.cost_function = Reciprocal(
                 min_intensity=self.image_stats.min_intensity, 
                 max_intensity=self.image_stats.max_intensity)
 
         if heuristic_function == HeuristicFunction.EUCLIDEAN:
-            self.heuristic_function = EuclideanTransonic(scale=self.scale)
+            self.heuristic_function = Euclidean(scale=self.scale)
 
         self.is_canceled = False
         self.found_path = False

brightest_path_lib/algorithm/nbastar.py

@@ -1,6 +1,8 @@
 # algorithm/nbastar.py
 
-"""The New Bidirectional A* Search Algorithm is an improvement over the
+""" 
+
+The New Bidirectional A* Search Algorithm is an improvement over the
 original Bidirectional A* Search algorithm, which is a variation of the
 A* Search algorithm that searches from both the start and goal nodes 
 simultaneously in order to find the shortest path more efficiently.
@@ -49,7 +51,6 @@
 from brightest_path_lib.input import CostFunction, HeuristicFunction
 from brightest_path_lib.node import Node, BidirectionalNode
 
-
 class NBAStarSearch:
     """NBA* Implementation