Dev accessibilities

activitysim/abm/models/__init__.py

@@ -1,7 +1,9 @@
 # ActivitySim
 # See full license in LICENSE.txt.
+
 from . import (
     accessibility,
+    disaggregate_accessibility,
     atwork_subtour_destination,
     atwork_subtour_frequency,
     atwork_subtour_mode_choice,

activitysim/abm/models/initialize.py

@@ -6,7 +6,7 @@
 
 import pandas as pd
 
-from activitysim.abm.tables import shadow_pricing
+from activitysim.abm.tables import shadow_pricing, disaggregate_accessibility
 from activitysim.core import chunk, config, expressions, inject, mem, pipeline, tracing
 from activitysim.core.steps.output import (
     track_skim_usage,
@@ -141,7 +141,8 @@ def initialize_households():
         add_size_tables = model_settings.get("add_size_tables", True)
         if add_size_tables:
             # warnings.warn(f"Calling add_size_tables from initialize will be removed in the future.", FutureWarning)
-            shadow_pricing.add_size_tables()
+            suffixes = inject.get_injectable("disaggregate_suffixes")
+            shadow_pricing.add_size_tables(suffixes)
 
         # - preload person_windows
         person_windows = inject.get_table("person_windows").to_frame()

activitysim/abm/models/location_choice.py

@@ -524,6 +524,7 @@ def run_location_simulate(
     chunk_size,
     chunk_tag,
     trace_label,
+    skip_choice=False,
 ):
     """
     run location model on location_sample annotated with mode_choice logsum
@@ -594,6 +595,7 @@ def run_location_simulate(
         trace_label=trace_label,
         trace_choice_name=model_settings["DEST_CHOICE_COLUMN_NAME"],
         estimator=estimator,
+        skip_choice=skip_choice,
     )
 
     if not want_logsums:
@@ -618,6 +620,7 @@ def run_location_choice(
     chunk_tag,
     trace_hh_id,
     trace_label,
+    skip_choice=False,
 ):
     """
     Run the three-part location choice algorithm to generate a location choice for each chooser
@@ -716,6 +719,7 @@ def run_location_choice(
             trace_label=tracing.extend_trace_label(
                 trace_label, "simulate.%s" % segment_name
             ),
+            skip_choice=skip_choice,
         )
 
         if estimator:

activitysim/abm/models/util/tour_destination.py

@@ -119,9 +119,12 @@ def _destination_sample(
         trace_label=trace_label,
     )
 
+    # if special person id is passed
+    chooser_id_column = model_settings.get("CHOOSER_ID_COLUMN", "person_id")
+
     # remember person_id in chosen alts so we can merge with persons in subsequent steps
     # (broadcasts person_id onto all alternatives sharing the same tour_id index value)
-    choices["person_id"] = choosers.person_id
+    choices[chooser_id_column] = choosers[chooser_id_column]
 
     return choices
 
@@ -519,14 +522,18 @@ def run_destination_sample(
 
     # FIXME - MEMORY HACK - only include columns actually used in spec (omit them pre-merge)
     chooser_columns = model_settings["SIMULATE_CHOOSER_COLUMNS"]
+
+    # if special person id is passed
+    chooser_id_column = model_settings.get("CHOOSER_ID_COLUMN", "person_id")
+
     persons_merged = persons_merged[
         [c for c in persons_merged.columns if c in chooser_columns]
     ]
     tours = tours[
-        [c for c in tours.columns if c in chooser_columns or c == "person_id"]
+        [c for c in tours.columns if c in chooser_columns or c == chooser_id_column]
     ]
     choosers = pd.merge(
-        tours, persons_merged, left_on="person_id", right_index=True, how="left"
+        tours, persons_merged, left_on=chooser_id_column, right_index=True, how="left"
     )
 
     # interaction_sample requires that choosers.index.is_monotonic_increasing
@@ -576,7 +583,7 @@ def run_destination_sample(
 
     # remember person_id in chosen alts so we can merge with persons in subsequent steps
     # (broadcasts person_id onto all alternatives sharing the same tour_id index value)
-    choices["person_id"] = tours.person_id
+    choices[chooser_id_column] = tours[chooser_id_column]
 
     return choices
 
@@ -612,6 +619,8 @@ def run_destination_logsums(
     """
 
     logsum_settings = config.read_model_settings(model_settings["LOGSUM_SETTINGS"])
+    # if special person id is passed
+    chooser_id_column = model_settings.get("CHOOSER_ID_COLUMN", "person_id")
 
     chunk_tag = "tour_destination.logsums"
 
@@ -624,7 +633,7 @@ def run_destination_logsums(
     choosers = pd.merge(
         destination_sample,
         persons_merged,
-        left_on="person_id",
+        left_on=chooser_id_column,
         right_index=True,
         how="left",
     )
@@ -662,6 +671,7 @@ def run_destination_simulate(
     estimator,
     chunk_size,
     trace_label,
+    skip_choice=False,
 ):
     """
     run destination_simulate on tour_destination_sample
@@ -678,14 +688,18 @@ def run_destination_simulate(
 
     # FIXME - MEMORY HACK - only include columns actually used in spec (omit them pre-merge)
     chooser_columns = model_settings["SIMULATE_CHOOSER_COLUMNS"]
+
+    # if special person id is passed
+    chooser_id_column = model_settings.get("CHOOSER_ID_COLUMN", "person_id")
+
     persons_merged = persons_merged[
         [c for c in persons_merged.columns if c in chooser_columns]
     ]
     tours = tours[
-        [c for c in tours.columns if c in chooser_columns or c == "person_id"]
+        [c for c in tours.columns if c in chooser_columns or c == chooser_id_column]
     ]
     choosers = pd.merge(
-        tours, persons_merged, left_on="person_id", right_index=True, how="left"
+        tours, persons_merged, left_on=chooser_id_column, right_index=True, how="left"
     )
 
     # interaction_sample requires that choosers.index.is_monotonic_increasing
@@ -743,6 +757,7 @@ def run_destination_simulate(
         trace_label=trace_label,
         trace_choice_name="destination",
         estimator=estimator,
+        skip_choice=skip_choice,
     )
 
     if not want_logsums:
@@ -764,6 +779,7 @@ def run_tour_destination(
     chunk_size,
     trace_hh_id,
     trace_label,
+    skip_choice=False,
 ):
 
     size_term_calculator = SizeTermCalculator(model_settings["SIZE_TERM_SELECTOR"])
@@ -839,6 +855,7 @@ def run_tour_destination(
             estimator=estimator,
             chunk_size=chunk_size,
             trace_label=tracing.extend_trace_label(segment_trace_label, "simulate"),
+            skip_choice=skip_choice,
         )
 
         choices_list.append(choices)

activitysim/abm/tables/__init__.py

@@ -2,6 +2,7 @@
 # See full license in LICENSE.txt.
 from . import (
     accessibility,
+    disaggregate_accessibility,
     households,
     landuse,
     persons,