From e6c1a6937abdfec9f3195def0b7307f39865e383 Mon Sep 17 00:00:00 2001 From: Jeff Newman Date: Fri, 10 Nov 2023 09:46:07 -0600 Subject: [PATCH] various fixing --- activitysim/abm/models/trip_scheduling.py | 1 - activitysim/abm/models/work_from_home.py | 2 +- .../prototype_sandag_xborder/configs/write_trip_matrices.yaml | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/activitysim/abm/models/trip_scheduling.py b/activitysim/abm/models/trip_scheduling.py index 28bb796ab..3dddd5e2b 100644 --- a/activitysim/abm/models/trip_scheduling.py +++ b/activitysim/abm/models/trip_scheduling.py @@ -567,7 +567,6 @@ def trip_scheduling( pd.Series(list(range(len(tours))), tours.index), trips_df.tour_id ) - assert model_settings.DEPART_ALT_BASE failfix = model_settings.FAILFIX max_iterations = model_settings.MAX_ITERATIONS diff --git a/activitysim/abm/models/work_from_home.py b/activitysim/abm/models/work_from_home.py index 29c13aa1e..234302b70 100755 --- a/activitysim/abm/models/work_from_home.py +++ b/activitysim/abm/models/work_from_home.py @@ -32,7 +32,7 @@ class WorkFromHomeSettings(LogitComponentSettings, extra="forbid"): WORK_FROM_HOME_ALT: int """Value that specify if the person is working from home""" # TODO - WORK_FROM_HOME_ITERATIONS: int | None = None + WORK_FROM_HOME_ITERATIONS: int = 1 """Setting to specify the number of iterations.""" CHOOSER_FILTER_COLUMN_NAME: str = "is_worker" diff --git a/activitysim/examples/prototype_sandag_xborder/configs/write_trip_matrices.yaml b/activitysim/examples/prototype_sandag_xborder/configs/write_trip_matrices.yaml index 37c6849ac..dce35ce76 100644 --- a/activitysim/examples/prototype_sandag_xborder/configs/write_trip_matrices.yaml +++ b/activitysim/examples/prototype_sandag_xborder/configs/write_trip_matrices.yaml @@ -104,5 +104,3 @@ MATRICES: data_field: TNC_SINGLE_EV - name: TNC_SHARED_EV data_field: TNC_SHARED_EV - -CONSTANTS: