Merge pull request #483 from djfrancesco/feature_PuT_assignment

feature PuT assignment
AequilibraE · Dec 12, 2023 · 892b2b1 · 892b2b1
2 parents a616220 + 8715d29
commit 892b2b1
Show file tree

Hide file tree

Showing 14 changed files with 549 additions and 1 deletion.
diff --git a/aequilibrae/paths/__init__.py b/aequilibrae/paths/__init__.py
@@ -8,6 +8,7 @@
 from aequilibrae.paths.traffic_assignment import TrafficAssignment
 from aequilibrae.paths.vdf import VDF
 from aequilibrae.paths.graph import Graph
+from aequilibrae.paths.public_transport import HyperpathGenerating
 
 from aequilibrae import global_logger
 

diff --git a/aequilibrae/paths/public_transport.pyx b/aequilibrae/paths/public_transport.pyx
@@ -19,6 +19,23 @@ include 'hyperpath.pyx'
 
 
 class HyperpathGenerating:
+    """A class for hyperpath generation.
+
+    :Arguments:
+        **edges** (:obj:`pandas.DataFrame`): The edges of the graph.
+
+        **tail** (:obj:`str`): The column name for the tail of the edge (optional, default is "tail").
+
+        **head** (:obj:`str`): The column name for the head of the edge (optional, default is "head").
+
+        **trav_time** (:obj:`str`): The column name for the travel time of the edge (optional, default is "trav_time").
+
+        **freq** (:obj:`str`): The column name for the frequency of the edge (optional, default is "freq").
+
+        **check_edges** (:obj:`bool`): If True, check the validity of the edges (optional, default is False).
+    """
+
+
     def __init__(self, edges, tail="tail", head="head", trav_time="trav_time", freq="freq", check_edges=False):
         # load the edges
         if check_edges:
@@ -154,6 +171,22 @@ class HyperpathGenerating:
         check_demand=False,
         threads=0
     ):
+        """Assigns demand to the edges of the graph.
+
+        :Arguments:
+            **demand** (:obj:`pandas.DataFrame`): The demand information.
+
+            **origin_column** (:obj:`str`): The column name for the origin vertices (optional, default is "orig_vert_idx").
+
+            **destination_column** (:obj:`str`): The column name for the destination vertices (optional, default is "dest_vert_idx").
+
+            **demand_column** (:obj:`str`): The column name for the demand values (optional, default is "demand").
+
+            **check_demand** (:obj:`bool`): If True, check the validity of the demand data (optional, default is False).
+
+            **threads** (:obj:`int`):The number of threads to use for computation (optional, default is 0, using all available threads).
+        """
+
         # check the input demand paramater
         if check_demand:
             self._check_demand(demand, origin_column, destination_column, demand_column)

diff --git a/docs/source/api.rst b/docs/source/api.rst
@@ -106,6 +106,7 @@ Paths
     VDF
     TrafficClass
     TrafficAssignment
+    HyperpathGenerating
 
 Transit
 -------

diff --git a/docs/source/images/hyperpath_bell_edge_base_delay.png b/docs/source/images/hyperpath_bell_edge_base_delay.png
diff --git a/docs/source/images/hyperpath_bell_edge_travel_time.png b/docs/source/images/hyperpath_bell_edge_travel_time.png
diff --git a/docs/source/images/hyperpath_bell_n_10_alpha_0d0.png b/docs/source/images/hyperpath_bell_n_10_alpha_0d0.png
diff --git a/docs/source/images/hyperpath_bell_n_10_alpha_0d5.png b/docs/source/images/hyperpath_bell_n_10_alpha_0d5.png
diff --git a/docs/source/images/hyperpath_bell_n_10_alpha_100d0.png b/docs/source/images/hyperpath_bell_n_10_alpha_100d0.png
diff --git a/docs/source/images/hyperpath_bell_n_10_alpha_1d0.png b/docs/source/images/hyperpath_bell_n_10_alpha_1d0.png
diff --git a/docs/source/images/hyperpath_bell_n_10_shartest_path.png b/docs/source/images/hyperpath_bell_n_10_shartest_path.png
diff --git a/docs/source/images/hyperpath_bell_s_network.png b/docs/source/images/hyperpath_bell_s_network.png
diff --git a/docs/source/modeling_with_aequilibrae/transit_assignment.rst b/docs/source/modeling_with_aequilibrae/transit_assignment.rst
@@ -7,4 +7,5 @@ Transit assignment
 .. toctree::
     :maxdepth: 1
 
+    transit_assignment/hyperpath_routing.rst
     transit_assignment/transit_graph.rst
-Original file line number
+Diff line change
@@ Expand Up / @@ -106,6 +106,7 @@ Paths @@
         VDF
         TrafficClass
         TrafficAssignment
+        HyperpathGenerating
     Transit
     -------
@@ Expand Down @@