Speed up pathfinding by introducing Cython

.github/workflows/python-package.yml

@@ -32,6 +32,18 @@ jobs:
         run: |
           # now run configured options
           ruff check --preview PyRoute
+      - name: Run non-cython tests
+        run: |
+          pytest -k testAstarOverSubsector
+      - name: Set up cython build
+        run: |
+          cd $LD_LIBRARY_PATH/python3.9/site-packages/numpy/
+          ls -al
+          cp __init__.cython-30.pxd numpy.pxd
+      - name: Build cython modules
+        run: |
+          cd PyRoute/Pathfinding
+          python3 setup.py build_ext --inplace
       - name: Test with pytest
         run: |
           pytest

.gitignore

@@ -40,4 +40,8 @@ venv2/
 sectors/
 maps/
 diffs/
-test_data/
+test_data/
+PyRoute/Pathfinding/*.c
+PyRoute/Pathfinding/*.cpp
+PyRoute/Pathfinding/*.cpython*
+PyRoute/Pathfinding/*.html

PyRoute/AllyGen.py

@@ -166,6 +166,7 @@ def is_client_state(alg):
         return alg.code[0:2] == 'Cs'
 
     @staticmethod
+    @functools.cache
     def same_align(alg):
         for sameAlg in AllyGen.sameAligned:
             if alg in sameAlg:

PyRoute/AreaItems/Allegiance.py

@@ -43,12 +43,12 @@ def allegiance_name(name, code, base):
         name = name.strip()
         if '' == name:
             raise ValueError("Name must not be empty string")
-        if code.startswith('As'):
+        if code.startswith('As') or "As" == AllyGen.same_align(code):
             if 5 < name.count(','):
-                raise ValueError("Name must have at most five commas")
+                raise ValueError("Name " + name + ", must have at most five commas")
         else:
             if 1 < name.count(','):
-                raise ValueError("Name must have at most one comma")
+                raise ValueError("Name " + name + ", must have at most one comma")
         namelen = 0
         while namelen != len(name):
             namelen = len(name)
@@ -78,7 +78,7 @@ def set_wiki_name(name, code, base):
         if ',' == name:
             raise ValueError("Name must not be pair of empty strings")
         if '[' in name or ']' in name:
-            raise ValueError("Name must not contain square brackets")
+            raise ValueError("Name must not contain square brackets - received " + name)
 
         names = name.split(',') if ',' in name else [name, '']
         names[0] = names[0].strip()
@@ -120,10 +120,10 @@ def is_well_formed(self):
             msg = "Allegiance name should not be empty"
             return False, msg
         if '  ' in self.name:
-            msg = "Should not have successive spaces in allegiance name"
+            msg = "Should not have successive spaces in allegiance name, " + self.name
             return False, msg
         if 1 < self.name.count(','):
-            msg = "Should be at most one comma in allegiance name"
+            msg = "Should be at most one comma in allegiance name, " + self.name
             return False, msg
 
         return True, msg

PyRoute/AreaItems/Galaxy.py

@@ -47,7 +47,6 @@ def __init__(self, min_btn, max_jump=4):
         self.output_path = 'maps'
         self.max_jump_range = max_jump
         self.min_btn = min_btn
-        self.landmarks = dict()
         self.historic_costs = None
         self.big_component = None
         self.star_mapping = dict()
@@ -68,7 +67,7 @@ def __getstate__(self):
     # def read_sectors(self, sectors, pop_code, ru_calc,
     #                 route_reuse, trade_choice, route_btn, mp_threads, debug_flag, fix_pop=False):
     def read_sectors(self, options):
-        assert isinstance(options, ReadSectorOptions)
+        assert isinstance(options, ReadSectorOptions), "options parm not ReadSectorOptions, is " + type(options).__name__
         route_reuse = options.route_reuse
         trade_choice = options.trade_choice
         route_btn = options.route_btn
@@ -170,7 +169,7 @@ def add_star_to_galaxy(self, star: Star, star_counter: int, sec: Sector):
         star.is_well_formed()
         return star_counter + 1
 
-    def set_area_alg(self, star, area, algs):
+    def set_area_alg(self, star, area, algs: dict):
         full_alg = algs.get(star.alg_code, Allegiance(star.alg_code, 'Unknown Allegiance', base=False))
         base_alg = algs.get(star.alg_base_code, Allegiance(star.alg_base_code, 'Unknown Allegiance', base=True))
 
@@ -393,8 +392,9 @@ def is_well_formed(self):
             star = self.star_mapping[item]
             star.is_well_formed()
 
-    def heuristic_distance_bulk(self, active_nodes, target):
-        raw = self.trade.shortest_path_tree.lower_bound_bulk(active_nodes, target)
+    def heuristic_distance_bulk(self, target):
+        active_nodes = self.stars.nodes.values()
+        raw = self.trade.shortest_path_tree.lower_bound_bulk(target)
         distances = self.trade.star_graph.distances_from_target(active_nodes, target)
         # Case-wise maximum of 2 or more admissible heuristics (approx-SP bound, existing route distances) is itself
         # admissible

PyRoute/Calculation/CommCalculation.py

@@ -3,14 +3,22 @@
 
 @author: CyberiaResurrection
 """
-import copy
-
 import networkx as nx
 
 from PyRoute.AllyGen import AllyGen
 from PyRoute.Calculation.RouteCalculation import RouteCalculation
-from PyRoute.Pathfinding.ApproximateShortestPathForestUnified import ApproximateShortestPathForestUnified
-from PyRoute.Pathfinding.astar_numpy import astar_path_numpy
+try:
+    from PyRoute.Pathfinding.ApproximateShortestPathForestUnified import ApproximateShortestPathForestUnified
+except ModuleNotFoundError:
+    from PyRoute.Pathfinding.ApproximateShortestPathForestUnifiedFallback import ApproximateShortestPathForestUnified
+except ImportError:
+    from PyRoute.Pathfinding.ApproximateShortestPathForestUnifiedFallback import ApproximateShortestPathForestUnified
+try:
+    from PyRoute.Pathfinding.astar_numpy import astar_path_numpy
+except ModuleNotFoundError:
+    from PyRoute.Pathfinding.astar_numpy_fallback import astar_path_numpy
+except ImportError:
+    from PyRoute.Pathfinding.astar_numpy_fallback import astar_path_numpy
 
 
 class CommCalculation(RouteCalculation):
@@ -201,10 +209,9 @@ def lesser_importance(self, star, neighbor):
 
     def get_route_between(self, star, target):
         try:
-            mincost = copy.deepcopy(self.star_graph._min_cost)
-            upbound = self.shortest_path_tree.triangle_upbound(star, target) * 1.005
+            upbound = self.shortest_path_tree.triangle_upbound(star.index, target.index) * 1.005
             route, _ = astar_path_numpy(self.star_graph, star.index, target.index,
-                                           self.galaxy.heuristic_distance_bulk, min_cost=mincost, upbound=upbound)
+                                           self.galaxy.heuristic_distance_bulk, upbound=upbound)
         except nx.NetworkXNoPath:
             return