Skip to content

Commit 5de1d23

Browse files
author
Jan Zill
committed
compute settings in disaggreagte accessibility w/o hack
1 parent 28142cd commit 5de1d23

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

activitysim/abm/models/disaggregate_accessibility.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from activitysim.abm.models.util import tour_destination
1616
from activitysim.abm.tables import shadow_pricing
1717
from activitysim.core import estimation, los, tracing, util, workflow
18-
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable
18+
from activitysim.core.configuration.base import PreprocessorSettings, PydanticReadable, ComputeSettings
1919
from activitysim.core.configuration.logit import TourLocationComponentSettings
2020
from activitysim.core.expressions import assign_columns
2121

@@ -75,8 +75,7 @@ class DisaggregateAccessibilityAnnotateSettings(PydanticReadable, extra="forbid"
7575
annotate: PreprocessorSettings
7676

7777

78-
# TODO-EET: add eet override for SOA MC sampling
79-
class DisaggregateAccessibilitySettings(PydanticReadable): # , extra="forbid")
78+
class DisaggregateAccessibilitySettings(PydanticReadable, extra="forbid"):
8079
suffixes: DisaggregateAccessibilitySuffixes = DisaggregateAccessibilitySuffixes()
8180
ORIGIN_SAMPLE_SIZE: float | int = 0
8281
"""
@@ -185,6 +184,8 @@ class DisaggregateAccessibilitySettings(PydanticReadable): # , extra="forbid")
185184
If not supplied or None, will default to the chunk size in the location choice model settings.
186185
"""
187186

187+
compute_settings: ComputeSettings | None = None
188+
188189

189190
def read_disaggregate_accessibility_yaml(
190191
state: workflow.State, file_name
@@ -770,6 +771,11 @@ def get_disaggregate_logsums(
770771
if disagg_model_settings.explicit_chunk is not None:
771772
model_settings.explicit_chunk = disagg_model_settings.explicit_chunk
772773

774+
# Can set compute settings for disaggregate accessibility
775+
# Otherwise this will be set to whatever is in the location model settings
776+
if disagg_model_settings.compute_settings is not None:
777+
model_settings.compute_settings = disagg_model_settings.compute_settings
778+
773779
# Include the suffix tags to pass onto downstream logsum models (e.g., tour mode choice)
774780
if model_settings.LOGSUM_SETTINGS:
775781
suffixes = util.concat_suffix_dict(disagg_model_settings.suffixes)

0 commit comments

Comments
 (0)