rename file path

AequilibraE · Aug 7, 2024 · 140f53a · 140f53a
1 parent e2faa53
commit 140f53a
Show file tree

Hide file tree

Showing 19 changed files with 35 additions and 24 deletions.
diff --git a/aequilibrae/__init__.py b/aequilibrae/__init__.py
@@ -11,7 +11,7 @@
 from aequilibrae import project
 
 try:
-    from aequilibrae.paths.AoN import path_computation
+    from aequilibrae.paths.cython.AoN import path_computation
 except Exception as e:
     global_logger.warning(f"Failed to import compiled modules. {e.args}")
     raise

diff --git a/aequilibrae/paths/__init__.py b/aequilibrae/paths/__init__.py
@@ -9,14 +9,14 @@
 from aequilibrae.paths.vdf import VDF
 from aequilibrae.paths.graph import Graph, TransitGraph
 from aequilibrae.paths.optimal_strategies import OptimalStrategies
-from aequilibrae.paths.public_transport import HyperpathGenerating
+from aequilibrae.paths.cython.public_transport import HyperpathGenerating
 from aequilibrae.paths.route_choice import RouteChoice
 
 from aequilibrae import global_logger
 
 
 try:
-    from aequilibrae.paths.AoN import (
+    from aequilibrae.paths.cython.AoN import (
         one_to_all,
         skimming_single_origin,
         path_computation,

diff --git a/aequilibrae/paths/all_or_nothing.py b/aequilibrae/paths/all_or_nothing.py
@@ -8,7 +8,7 @@
 from .multi_threaded_aon import MultiThreadedAoN
 
 try:
-    from aequilibrae.paths.AoN import one_to_all, assign_link_loads
+    from aequilibrae.paths.cython.AoN import one_to_all, assign_link_loads
 except ImportError as ie:
     global_logger.warning(f"Could not import procedures from the binary. {ie.args}")
 

diff --git a/aequilibrae/paths/graph.py b/aequilibrae/paths/graph.py
@@ -8,7 +8,7 @@
 
 import numpy as np
 import pandas as pd
-from aequilibrae.paths.graph_building import build_compressed_graph, create_compressed_link_network_mapping
+from aequilibrae.paths.cython.graph_building import build_compressed_graph, create_compressed_link_network_mapping
 
 from aequilibrae.context import get_logger
 

diff --git a/aequilibrae/paths/linear_approximation.py b/aequilibrae/paths/linear_approximation.py
@@ -6,10 +6,10 @@
 from typing import List, Dict
 
 import numpy as np
-from aequilibrae.paths.AoN import copy_two_dimensions, copy_three_dimensions
-from aequilibrae.paths.AoN import linear_combination, linear_combination_skims, aggregate_link_costs
-from aequilibrae.paths.AoN import sum_a_times_b_minus_c, linear_combination_1d
-from aequilibrae.paths.AoN import triple_linear_combination, triple_linear_combination_skims
+from aequilibrae.paths.cython.AoN import copy_two_dimensions, copy_three_dimensions
+from aequilibrae.paths.cython.AoN import linear_combination, linear_combination_skims, aggregate_link_costs
+from aequilibrae.paths.cython.AoN import sum_a_times_b_minus_c, linear_combination_1d
+from aequilibrae.paths.cython.AoN import triple_linear_combination, triple_linear_combination_skims
 from scipy.optimize import root_scalar
 
 from aequilibrae.paths.all_or_nothing import allOrNothing

diff --git a/aequilibrae/paths/network_skimming.py b/aequilibrae/paths/network_skimming.py
@@ -11,7 +11,7 @@
 from aequilibrae.paths.results.skim_results import SkimResults
 
 try:
-    from aequilibrae.paths.AoN import skimming_single_origin
+    from aequilibrae.paths.cython.AoN import skimming_single_origin
 except ImportError as ie:
     global_logger.warning(f"Could not import procedures from the binary. {ie.args}")
 

diff --git a/aequilibrae/paths/optimal_strategies.py b/aequilibrae/paths/optimal_strategies.py
@@ -1,7 +1,7 @@
 import logging
 from scipy import sparse
 import numpy as np
-from aequilibrae.paths.public_transport import HyperpathGenerating
+from aequilibrae.paths.cython.public_transport import HyperpathGenerating
 
 
 class OptimalStrategies:

diff --git a/aequilibrae/paths/results/assignment_results.py b/aequilibrae/paths/results/assignment_results.py
@@ -9,7 +9,7 @@
 from pathlib import Path
 
 try:
-    from aequilibrae.paths.AoN import sum_axis1, assign_link_loads
+    from aequilibrae.paths.cython.AoN import sum_axis1, assign_link_loads
 except ImportError as ie:
     global_logger.warning(f"Could not import procedures from the binary. {ie.args}")
 

diff --git a/aequilibrae/paths/results/path_results.py b/aequilibrae/paths/results/path_results.py
@@ -5,7 +5,7 @@
 from typing import Union, List
 
 try:
-    from aequilibrae.paths.AoN import update_path_trace, path_computation, HEURISTIC_MAP
+    from aequilibrae.paths.cython.AoN import update_path_trace, path_computation, HEURISTIC_MAP
 except ImportError as ie:
     global_logger.warning(f"Could not import procedures from the binary. {ie.args}")
 

diff --git a/aequilibrae/paths/setup_assignment.py b/aequilibrae/paths/setup_assignment.py
@@ -3,6 +3,7 @@
 # Make sure to keep this up to date with that file
 
 import platform
+from os.path import join
 import numpy as np
 import pyarrow as pa
 from Cython.Build import cythonize
@@ -20,8 +21,8 @@
 
 ext_modules = [
     Extension(
-        "AoN",
-        ["AoN.pyx"],
+        "cython.AoN",
+        [join("cython", "AoN.pyx")],
         extra_compile_args=[f"{prefix}openmp", cpp_std],  # do we want -Ofast?
         extra_link_args=[f"{prefix}openmp"],
         define_macros=[("NPY_NO_DEPRECATED_API", "NPY_1_7_API_VERSION")],

diff --git a/aequilibrae/paths/vdf.py b/aequilibrae/paths/vdf.py
@@ -1,7 +1,16 @@
 from aequilibrae import global_logger
 
 try:
-    from aequilibrae.paths.AoN import bpr, delta_bpr, bpr2, delta_bpr2, conical, delta_conical, inrets, delta_inrets
+    from aequilibrae.paths.cython.AoN import (
+        bpr,
+        delta_bpr,
+        bpr2,
+        delta_bpr2,
+        conical,
+        delta_conical,
+        inrets,
+        delta_inrets,
+    )
 except ImportError as ie:
     global_logger.warning(f"Could not import procedures from the binary. {ie.args}")
 

diff --git a/docs/source/modeling_with_aequilibrae/route_choice.rst b/docs/source/modeling_with_aequilibrae/route_choice.rst
@@ -41,7 +41,7 @@ Imports
 
 .. code:: python
 
-   from aequilibrae.paths.route_choice_set import RouteChoiceSet
+   from aequilibrae.paths.cython.route_choice_set import RouteChoiceSet
    from aequilibrae import Project
 
    proj = Project()

diff --git a/docs/source/modeling_with_aequilibrae/route_choice/choice_set_generation.rst b/docs/source/modeling_with_aequilibrae/route_choice/choice_set_generation.rst
@@ -89,7 +89,7 @@ Code example
    from tempfile import gettempdir
    from os.path import join
    from aequilibrae.utils.create_example import create_example
-   from aequilibrae.paths.route_choice_set import RouteChoiceSet
+   from aequilibrae.paths.cython.route_choice_set import RouteChoiceSet
 
    fldr = join(gettempdir(), uuid4().hex)
    project = create_example(fldr, "coquimbo")

diff --git a/docs/source/modeling_with_aequilibrae/transit_assignment/hyperpath_routing.rst b/docs/source/modeling_with_aequilibrae/transit_assignment/hyperpath_routing.rst
@@ -46,7 +46,7 @@ Imports
    import networkx as nx
    import numpy as np
    import pandas as pd
-   from aequilibrae.paths.public_transport import HyperpathGenerating
+   from aequilibrae.paths.cython.public_transport import HyperpathGenerating
    from numba import jit
 
    RS = 124  # random seed

diff --git a/setup.py b/setup.py
@@ -109,6 +109,7 @@
         "database_specification/network/triggers/*.*",
         "database_specification/transit/tables/*.*",
         "database_specification/transit/triggers/*.*",
+        "network/network.yml",
     ],
 }
 

diff --git a/tests/aequilibrae/paths/test_conical.py b/tests/aequilibrae/paths/test_conical.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from aequilibrae.paths.AoN import conical, delta_conical
+from aequilibrae.paths.cython.AoN import conical, delta_conical
 from multiprocessing import cpu_count
 import numpy as np
 

diff --git a/tests/aequilibrae/paths/test_hyperpath.py b/tests/aequilibrae/paths/test_hyperpath.py
@@ -10,7 +10,7 @@
 import numpy as np
 import pandas as pd
 from unittest import TestCase
-from aequilibrae.paths.public_transport import HyperpathGenerating
+from aequilibrae.paths.cython.public_transport import HyperpathGenerating
 
 
 def create_vertices(n):

diff --git a/tests/aequilibrae/paths/test_inrets.py b/tests/aequilibrae/paths/test_inrets.py
@@ -1,5 +1,5 @@
 from unittest import TestCase
-from aequilibrae.paths.AoN import inrets, delta_inrets
+from aequilibrae.paths.cython.AoN import inrets, delta_inrets
 from multiprocessing import cpu_count
 import numpy as np
 

diff --git a/tests/aequilibrae/paths/test_parallel_numpy.py b/tests/aequilibrae/paths/test_parallel_numpy.py
@@ -1,7 +1,7 @@
 import unittest
 import numpy as np
-from aequilibrae.paths.AoN import copy_one_dimension, sum_axis1, linear_combination, linear_combination_skims
-from aequilibrae.paths.AoN import copy_two_dimensions, copy_three_dimensions
+from aequilibrae.paths.cython.AoN import copy_one_dimension, sum_axis1, linear_combination, linear_combination_skims
+from aequilibrae.paths.cython.AoN import copy_two_dimensions, copy_three_dimensions
 
 
 class TestParallel(unittest.TestCase):