For latest release

.flake8

@@ -3,4 +3,4 @@ max-line-length = 120
 ignore = E203, E266, E501, W503, F403, F401, C901, W605
 max-complexity = 20
 select = B,C,E,F,W,T4,B9
-exclude = .idea,.git,__pycache__,sphinx,.venv,venv,docs/*,benchmarks/*
+exclude = .idea,.git,__pycache__,sphinx,.venv*,.venv,venv,docs/*,benchmarks/*

.github/workflows/build_linux.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Build manylinux Python wheels
       uses: RalfG/python-wheels-manylinux-build@v0.7.1
       with:
-        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311'
+        python-versions: 'cp37-cp37m cp38-cp38 cp39-cp39 cp310-cp310 cp311-cp311 cp312-cp312'
         pip-wheel-args: '--no-deps'
 
     - name: Moves wheels
@@ -38,7 +38,7 @@ jobs:
     - name: Build manylinux Python wheels
       uses: RalfG/python-wheels-manylinux-build@v0.7.1
       with:
-        python-versions: 'cp38-cp38 cp39-cp39 cp310-cp310'
+        python-versions: 'cp39-cp39'
         pip-wheel-args: '--no-deps'
 
     - name: Moves wheels

.github/workflows/build_mac.yml

@@ -14,8 +14,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11']
-
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
     steps:
     - uses: actions/checkout@v3
     - name: Set Python environment
@@ -51,8 +50,8 @@ jobs:
         twine upload dist/*.whl
 
     - name: Publish tar files
-      if: ${{ (github.event_name == 'release') && (env.HAS_SECRETS == 'true') && (matrix.python-version == '3.9') }}
+      if: ${{ (github.event_name == 'release') && (env.HAS_SECRETS == 'true') && (matrix.python-version == '3.11') }}
       env:
         TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
         TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
-      run: twine upload dist/*.gz
+      run: twine upload dist/*.gz

.github/workflows/build_windows.yml

@@ -10,7 +10,7 @@ jobs:
     continue-on-error: true
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         architecture: ['x64']
     steps:
     - uses: actions/checkout@v3

.github/workflows/unit_tests.yml

@@ -31,7 +31,7 @@ jobs:
     runs-on: ${{ matrix.os}}
     strategy:
       matrix:
-        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11']
+        python-version: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
         os: [windows-latest, ubuntu-latest]
 
       max-parallel: 20

__version__.py

@@ -1,5 +1,5 @@
 version = 0.9
-minor_version = "4"
+minor_version = "5"
 release_name = "Queluz"
 
 release_version = f"{version}.{minor_version}"

aequilibrae/parameters.yml

@@ -42,6 +42,30 @@ network:
           description: name
           osm_source: name
           type: text
+      - cycleway:
+          description: cycleway, both way
+          osm_source: cycleway
+          type: text
+      - cycleway_right:
+          description: cycleway, right
+          osm_source: cycleway:right
+          type: text
+      - cycleway_left:
+          description: cycleway, left
+          osm_source: cycleway:left
+          type: text
+      - busway:
+          description: busway
+          osm_source: busway
+          type: text
+      - busway_right:
+          description: busway, right
+          osm_source: busway:right
+          type: text
+      - busway_left:
+          description: busway, left
+          osm_source: busway:left
+          type: text            
       two-way:
       - lanes:
           description: lanes
@@ -128,6 +152,14 @@ network:
     modes:
       bicycle:
         link_types:
+        - primary
+        - primary_link
+        - secondary
+        - secondary_link
+        - tertiary
+        - tertiary_link
+        - living_street
+        - residential
         - cycleway
         - corridor
         - pedestrian
@@ -313,7 +345,7 @@ network:
           required: false
         lanes:
           description: Number of lanes in the direction of travel
-          type: inetger
+          type: integer
           required: false
         bike_facility:
           description: Type of bicycle accommodation

aequilibrae/paths/AoN.pyx

@@ -114,6 +114,7 @@ def one_to_all(origin, matrix, graph, result, aux_result, curr_thread):
                                     original_b_nodes_view)
 
         w = path_finding(origin_index,
+                         -1,  # destination index to disable early exit
                          g_view,
                          b_nodes_view,
                          graph_fs_view,
@@ -178,6 +179,7 @@ def path_computation(origin, destination, graph, results):
     """
     cdef ITYPE_t nodes, orig, dest, p, b, origin_index, dest_index, connector, zones
     cdef long i, j, skims, a, block_flows_through_centroids
+    cdef bint early_exit_bint = results.early_exit
 
     results.origin = origin
     results.destination = destination
@@ -216,6 +218,18 @@ def path_computation(origin, destination, graph, results):
     new_b_nodes = graph.graph.b_node.values.copy()
     cdef long long [:] b_nodes_view = new_b_nodes
 
+    cdef bint a_star_bint = results.a_star
+    cdef double [:] lat_view
+    cdef double [:] lon_view
+    cdef long long [:] nodes_to_indices_view
+    cdef Heuristic heuristic
+    if results.a_star:
+        lat_view = graph.lonlat_index.lat.values
+        lon_view = graph.lonlat_index.lon.values
+        nodes_to_indices_view = graph.nodes_to_indices
+        heuristic = HEURISTIC_MAP[results._heuristic]
+
+
     #Now we do all procedures with NO GIL
     with nogil:
         if block_flows_through_centroids: # Unblocks the centroid if that is the case
@@ -227,14 +241,31 @@ def path_computation(origin, destination, graph, results):
                                     b_nodes_view,
                                     original_b_nodes_view)
 
-        w = path_finding(origin_index,
-                         g_view,
-                         b_nodes_view,
-                         graph_fs_view,
-                         predecessors_view,
-                         ids_graph_view,
-                         conn_view,
-                         reached_first_view)
+        if a_star_bint:
+            w = path_finding_a_star(origin_index,
+                                    dest_index,
+                                    g_view,
+                                    b_nodes_view,
+                                    graph_fs_view,
+                                    nodes_to_indices_view,
+                                    lat_view,
+                                    lon_view,
+                                    predecessors_view,
+                                    ids_graph_view,
+                                    conn_view,
+                                    reached_first_view,
+                                    heuristic)
+        else:
+            w = path_finding(origin_index,
+                             dest_index if early_exit_bint else -1,
+                             g_view,
+                             b_nodes_view,
+                             graph_fs_view,
+                             predecessors_view,
+                             ids_graph_view,
+                             conn_view,
+                             reached_first_view)
+
 
         if skims > 0:
             skim_single_path(origin_index,
@@ -280,14 +311,22 @@ def path_computation(origin, destination, graph, results):
             del all_nodes
             del all_connectors
             del mileposts
-
+    else:
+        results.path = None
+        results.path_nodes = None
+        results.path_link_directions = None
+        results.milepost = None
 
 def update_path_trace(results, destination, graph):
     # type: (PathResults, int, Graph) -> (None)
     """
+    If `results.early_exit` is `True`, early exit will be enabled if the path is to be recomputed.
+    If `results.a_star` is `True`, A* will be used if the path is to be recomputed.
+
     :param graph: AequilibraE graph. Needs to have been set with number of centroids and list of skims (if any)
     :param results: AequilibraE Matrix properly set for computation using matrix.computational_view([matrix list])
     :param skimming: if we will skim for all nodes or not
+    :param early_exit: Exit Dijkstra's once the destination has been found if the shortest path tree must be reconstructed.
     """
     cdef p, origin_index, dest_index, connector
 
@@ -298,9 +337,20 @@ def update_path_trace(results, destination, graph):
     else:
         dest_index = graph.nodes_to_indices[destination]
         origin_index = graph.nodes_to_indices[results.origin]
-
         results.milepost = None
         results.path_nodes = None
+
+        # If the predecessor is -1 and early exit was enabled we cannot differentiate between
+        # an unreachable node and one we just didn't see yet. We need to recompute the tree with the new destination
+        # If `a_star` was enabled then the stored tree has no guarantees and may not be useful due to the heuristic used
+        # TODO: revisit with heuristic specific reuse logic
+        if results.predecessors[dest_index] == -1 and results._early_exit or results._a_star:
+            results.compute_path(results.origin, destination, early_exit=results.early_exit, a_star=results.a_star)
+
+        # By the invariant hypothesis presented at https://en.wikipedia.org/wiki/Dijkstra%27s_algorithm#Proof_of_correctness
+        # Dijkstra's algorithm produces the shortest path tree for all scanned nodes. That is if a node was scanned,
+        # its shortest path has been found, even if we exited early. As the un-scanned nodes are marked as unreachable this
+        # invariant holds.
         if results.predecessors[dest_index] >= 0:
             all_connectors = []
             link_directions = []
@@ -321,6 +371,12 @@ def update_path_trace(results, destination, graph):
                 results.path_nodes = graph.all_nodes[np.asarray(all_nodes, graph.default_types('int'))][::-1]
                 mileposts.append(0)
                 results.milepost = np.cumsum(mileposts[::-1])
+        else:
+            results.path = None
+            results.path_nodes = None
+            results.path_link_directions = None
+            results.milepost = None
+
 
 def skimming_single_origin(origin, graph, result, aux_result, curr_thread):
     """
@@ -384,6 +440,7 @@ def skimming_single_origin(origin, graph, result, aux_result, curr_thread):
                                     b_nodes_view,
                                     original_b_nodes_view)
         w = path_finding(origin_index,
+                         -1,  # destination index to disable early exit
                          g_view,
                          b_nodes_view,
                          graph_fs_view,