From 1403741e9af49b84f1b6cd7dce8861d5be6ccf74 Mon Sep 17 00:00:00 2001 From: bstabler Date: Mon, 16 Nov 2020 17:47:22 -0800 Subject: [PATCH 1/2] update example settings to align with tm1 --- activitysim/examples/example_mtc/configs/settings.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/activitysim/examples/example_mtc/configs/settings.yaml b/activitysim/examples/example_mtc/configs/settings.yaml index 211239f9af..6b92e462fa 100644 --- a/activitysim/examples/example_mtc/configs/settings.yaml +++ b/activitysim/examples/example_mtc/configs/settings.yaml @@ -159,15 +159,10 @@ urban_threshold: 4 cbd_threshold: 2 rural_threshold: 6 -# upperEA Upper limit on time of day for the Early morning time period 5 -# upperAM Upper limit on time of day for the AM peak time period 10 -# upperMD Upper limit on time of day for the Midday time period 15 -# upperPM Upper limit on time of day for the PM time peak period 19 - skim_time_periods: time_window: 1440 period_minutes: 60 - periods: [0, 6, 11, 16, 20, 24] + periods: [0, 5, 9, 14, 18, 24] # 5=5:00-5:59, 9=9:00-9:59, 14=2:00-2:59, 18=6:00-6:59 labels: ['EA', 'AM', 'MD', 'PM', 'EV'] # - value of time From 6a1087544b3f9dd336e9496c4a0e142a8d4d8c8f Mon Sep 17 00:00:00 2001 From: bstabler Date: Tue, 8 Dec 2020 16:43:33 -0800 Subject: [PATCH 2/2] correct home_is_rural coding since tm1 was incorrect --- .../examples/example_mtc/configs/annotate_households.csv | 2 +- activitysim/examples/example_mtc/configs/settings.yaml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/activitysim/examples/example_mtc/configs/annotate_households.csv b/activitysim/examples/example_mtc/configs/annotate_households.csv index 72be0eeb0f..2293b38cdf 100644 --- a/activitysim/examples/example_mtc/configs/annotate_households.csv +++ b/activitysim/examples/example_mtc/configs/annotate_households.csv @@ -28,6 +28,6 @@ num_young_adults,num_young_adults,"_PERSON_COUNT('25 <= age <= 34', persons, hou non_family,non_family,households.HHT.isin(HHT_NONFAMILY) family,family,households.HHT.isin(HHT_FAMILY) home_is_urban,home_is_urban,"reindex(land_use.area_type, households.home_zone_id) < setting('urban_threshold')" -home_is_rural,home_is_rural,"reindex(land_use.area_type, households.home_zone_id) > setting('rural_threshold')" +home_is_rural,home_is_rural,"reindex(land_use.area_type, households.home_zone_id) > setting('urban_threshold')" diff --git a/activitysim/examples/example_mtc/configs/settings.yaml b/activitysim/examples/example_mtc/configs/settings.yaml index 6b92e462fa..71e757632e 100644 --- a/activitysim/examples/example_mtc/configs/settings.yaml +++ b/activitysim/examples/example_mtc/configs/settings.yaml @@ -157,7 +157,6 @@ output_tables: # area_types less than this are considered urban urban_threshold: 4 cbd_threshold: 2 -rural_threshold: 6 skim_time_periods: time_window: 1440