Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TM1.6.1: Use updated data, etc. #75

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions model-files/Readme.md

This file was deleted.

Binary file modified model-files/model/ModeChoice.xls
Binary file not shown.
Binary file modified model-files/model/TripModeChoice.xls
Binary file not shown.
219 changes: 110 additions & 109 deletions model-files/runtime/mtcTourBased.properties
Original file line number Diff line number Diff line change
Expand Up @@ -148,134 +148,135 @@ Model_Year = set_by_RuntimeConfiguration.py

#-- The following parameters define the simple CDAP WFH model, which is a logarithmic model based on employment
# industry. See MtcCoordinatedDailyActivityPatternDMU.java
# Source: PUMS2021_WFH_by_industry_HHincome.xlsx https://mtcdrive.box.com/s/0vux1bzeinjz7gtvazn0wzb57p7zqpt7
# Asana Task: WFH model adjustment & validation https://app.asana.com/0/0/1205369234942623/f
# Source: PUMS2022_WFH_by_industry_HHincome.xlsx https://mtcdrive.box.com/s/paf9rvbj7f0cvtmsow28n9n7gypk3lv1
# Asana Task: Update WFH model to use PUMS 2022 https://app.asana.com/0/1182463234225195/1207249557658801/f

# 1=San Francisco
CDAP.WFH.County1.agremp.M= 0.1893
CDAP.WFH.County1.agremp.B=-1.7594
CDAP.WFH.County1.fpsemp.M= 0.1112
CDAP.WFH.County1.fpsemp.B=-0.7813
CDAP.WFH.County1.heremp.M= 0.0804
CDAP.WFH.County1.heremp.B=-0.6664
CDAP.WFH.County1.mwtemp.M= 0.1996
CDAP.WFH.County1.mwtemp.B=-1.9058
CDAP.WFH.County1.othemp.M= 0.1363
CDAP.WFH.County1.othemp.B=-1.1023
CDAP.WFH.County1.retemp.M= 0.1355
CDAP.WFH.County1.retemp.B=-1.2384
CDAP.WFH.County1.agremp.M=-0.0794
CDAP.WFH.County1.agremp.B= 1.2065
CDAP.WFH.County1.fpsemp.M= 0.0358
CDAP.WFH.County1.fpsemp.B= 0.0217
CDAP.WFH.County1.heremp.M= 0.0899
CDAP.WFH.County1.heremp.B=-0.8001
CDAP.WFH.County1.mwtemp.M= 0.1519
CDAP.WFH.County1.mwtemp.B=-1.4395
CDAP.WFH.County1.othemp.M= 0.1238
CDAP.WFH.County1.othemp.B=-1.0625
CDAP.WFH.County1.retemp.M= 0.1067
CDAP.WFH.County1.retemp.B=-0.9116


# 2=San Mateo
CDAP.WFH.County2.agremp.M= 0.1486
CDAP.WFH.County2.agremp.B=-1.2566
CDAP.WFH.County2.fpsemp.M= 0.1719
CDAP.WFH.County2.fpsemp.B=-1.5521
CDAP.WFH.County2.heremp.M= 0.0332
CDAP.WFH.County2.heremp.B=-0.2304
CDAP.WFH.County2.mwtemp.M= 0.1103
CDAP.WFH.County2.mwtemp.B=-0.9792
CDAP.WFH.County2.othemp.M= 0.0980
CDAP.WFH.County2.othemp.B=-0.7853
CDAP.WFH.County2.retemp.M= 0.1435
CDAP.WFH.County2.retemp.B=-1.4138
CDAP.WFH.County2.agremp.M=-0.0042
CDAP.WFH.County2.agremp.B= 0.1772
CDAP.WFH.County2.fpsemp.M= 0.0798
CDAP.WFH.County2.fpsemp.B=-0.5039
CDAP.WFH.County2.heremp.M= 0.0380
CDAP.WFH.County2.heremp.B=-0.2792
CDAP.WFH.County2.mwtemp.M= 0.1129
CDAP.WFH.County2.mwtemp.B=-1.0508
CDAP.WFH.County2.othemp.M= 0.1665
CDAP.WFH.County2.othemp.B=-1.5933
CDAP.WFH.County2.retemp.M= 0.1182
CDAP.WFH.County2.retemp.B=-1.1305

# 3=Santa Clara
CDAP.WFH.County3.agremp.M= 0.0000
CDAP.WFH.County3.agremp.B= 0.0000
CDAP.WFH.County3.fpsemp.M= 0.1580
CDAP.WFH.County3.fpsemp.B=-1.3734
CDAP.WFH.County3.heremp.M= 0.0393
CDAP.WFH.County3.heremp.B=-0.2844
CDAP.WFH.County3.mwtemp.M= 0.1651
CDAP.WFH.County3.mwtemp.B=-1.5818
CDAP.WFH.County3.othemp.M= 0.1785
CDAP.WFH.County3.othemp.B=-1.7022
CDAP.WFH.County3.retemp.M= 0.1184
CDAP.WFH.County3.retemp.B=-1.1419
CDAP.WFH.County3.agremp.M= 0.0162
CDAP.WFH.County3.agremp.B=-0.0091
CDAP.WFH.County3.fpsemp.M= 0.0820
CDAP.WFH.County3.fpsemp.B=-0.5648
CDAP.WFH.County3.heremp.M= 0.0425
CDAP.WFH.County3.heremp.B=-0.3464
CDAP.WFH.County3.mwtemp.M= 0.0712
CDAP.WFH.County3.mwtemp.B=-0.5875
CDAP.WFH.County3.othemp.M= 0.0820
CDAP.WFH.County3.othemp.B=-0.6779
CDAP.WFH.County3.retemp.M= 0.0711
CDAP.WFH.County3.retemp.B=-0.6092

# 4=Alameda
CDAP.WFH.County4.agremp.M= 0.1949
CDAP.WFH.County4.agremp.B=-1.9324
CDAP.WFH.County4.fpsemp.M= 0.1764
CDAP.WFH.County4.fpsemp.B=-1.5460
CDAP.WFH.County4.heremp.M= 0.0370
CDAP.WFH.County4.heremp.B=-0.2003
CDAP.WFH.County4.mwtemp.M= 0.1555
CDAP.WFH.County4.mwtemp.B=-1.4582
CDAP.WFH.County4.othemp.M= 0.1602
CDAP.WFH.County4.othemp.B=-1.4920
CDAP.WFH.County4.retemp.M= 0.1061
CDAP.WFH.County4.retemp.B=-0.9802
CDAP.WFH.County4.agremp.M= 0.1081
CDAP.WFH.County4.agremp.B=-0.9948
CDAP.WFH.County4.fpsemp.M= 0.0822
CDAP.WFH.County4.fpsemp.B=-0.4949
CDAP.WFH.County4.heremp.M= 0.0378
CDAP.WFH.County4.heremp.B=-0.2057
CDAP.WFH.County4.mwtemp.M= 0.1366
CDAP.WFH.County4.mwtemp.B=-1.2748
CDAP.WFH.County4.othemp.M= 0.1126
CDAP.WFH.County4.othemp.B=-1.0124
CDAP.WFH.County4.retemp.M= 0.1011
CDAP.WFH.County4.retemp.B=-0.8744

# 5=Contra Costa
CDAP.WFH.County5.agremp.M= 0.2345
CDAP.WFH.County5.agremp.B=-2.3776
CDAP.WFH.County5.fpsemp.M= 0.1269
CDAP.WFH.County5.fpsemp.B=-1.0519
CDAP.WFH.County5.heremp.M= 0.0532
CDAP.WFH.County5.heremp.B=-0.4328
CDAP.WFH.County5.mwtemp.M= 0.1772
CDAP.WFH.County5.mwtemp.B=-1.7341
CDAP.WFH.County5.othemp.M= 0.1607
CDAP.WFH.County5.othemp.B=-1.5963
CDAP.WFH.County5.retemp.M= 0.1053
CDAP.WFH.County5.retemp.B=-1.0286
CDAP.WFH.County5.agremp.M= 0.1237
CDAP.WFH.County5.agremp.B=-1.0754
CDAP.WFH.County5.fpsemp.M= 0.0362
CDAP.WFH.County5.fpsemp.B=-0.0031
CDAP.WFH.County5.heremp.M= 0.0672
CDAP.WFH.County5.heremp.B=-0.5972
CDAP.WFH.County5.mwtemp.M= 0.1789
CDAP.WFH.County5.mwtemp.B=-1.7840
CDAP.WFH.County5.othemp.M= 0.0723
CDAP.WFH.County5.othemp.B=-0.6051
CDAP.WFH.County5.retemp.M= 0.1076
CDAP.WFH.County5.retemp.B=-1.0435

# 6=Solano
CDAP.WFH.County6.agremp.M= 0.0000
CDAP.WFH.County6.agremp.B= 0.0000
CDAP.WFH.County6.fpsemp.M= 0.0675
CDAP.WFH.County6.fpsemp.B=-0.5897
CDAP.WFH.County6.heremp.M= 0.0000
CDAP.WFH.County6.heremp.B= 0.0000
CDAP.WFH.County6.mwtemp.M= 0.0966
CDAP.WFH.County6.mwtemp.B=-0.9459
CDAP.WFH.County6.othemp.M= 0.0713
CDAP.WFH.County6.othemp.B=-0.6988
CDAP.WFH.County6.retemp.M= 0.0994
CDAP.WFH.County6.retemp.B=-1.0190
CDAP.WFH.County6.agremp.M=-0.0789
CDAP.WFH.County6.agremp.B= 1.0436
CDAP.WFH.County6.fpsemp.M=-0.0626
CDAP.WFH.County6.fpsemp.B= 0.9547
CDAP.WFH.County6.heremp.M=-0.0244
CDAP.WFH.County6.heremp.B= 0.3634
CDAP.WFH.County6.mwtemp.M= 0.0613
CDAP.WFH.County6.mwtemp.B=-0.5838
CDAP.WFH.County6.othemp.M= 0.0526
CDAP.WFH.County6.othemp.B=-0.4643
CDAP.WFH.County6.retemp.M= 0.0171
CDAP.WFH.County6.retemp.B=-0.0563

# 7= Napa
CDAP.WFH.County7.agremp.M= 0.0690
CDAP.WFH.County7.agremp.B=-0.6729
CDAP.WFH.County7.fpsemp.M= 0.0979
CDAP.WFH.County7.fpsemp.B=-0.7067
CDAP.WFH.County7.heremp.M= 0.0753
CDAP.WFH.County7.heremp.B=-0.6942
CDAP.WFH.County7.mwtemp.M= 0.0854
CDAP.WFH.County7.mwtemp.B=-0.8520
CDAP.WFH.County7.othemp.M= 0.0000
CDAP.WFH.County7.othemp.B= 0.0000
CDAP.WFH.County7.retemp.M= 0.0939
CDAP.WFH.County7.retemp.B=-0.9227
CDAP.WFH.County7.agremp.M= 0.1357
CDAP.WFH.County7.agremp.B=-1.3397
CDAP.WFH.County7.fpsemp.M= 0.0806
CDAP.WFH.County7.fpsemp.B=-0.5718
CDAP.WFH.County7.heremp.M=-0.0174
CDAP.WFH.County7.heremp.B= 0.2433
CDAP.WFH.County7.mwtemp.M= 0.0247
CDAP.WFH.County7.mwtemp.B=-0.1952
CDAP.WFH.County7.othemp.M= 0.0549
CDAP.WFH.County7.othemp.B=-0.4791
CDAP.WFH.County7.retemp.M= 0.0139
CDAP.WFH.County7.retemp.B=-0.0552

# 8=Sonoma
CDAP.WFH.County8.agremp.M= 0.0021
CDAP.WFH.County8.agremp.B= 0.0634
CDAP.WFH.County8.fpsemp.M= 0.1915
CDAP.WFH.County8.fpsemp.B=-1.7930
CDAP.WFH.County8.heremp.M= 0.0259
CDAP.WFH.County8.heremp.B=-0.1471
CDAP.WFH.County8.mwtemp.M= 0.1901
CDAP.WFH.County8.mwtemp.B=-1.8926
CDAP.WFH.County8.othemp.M= 0.0751
CDAP.WFH.County8.othemp.B=-0.6874
CDAP.WFH.County8.retemp.M= 0.0396
CDAP.WFH.County8.retemp.B=-0.3328
CDAP.WFH.County8.agremp.M= 0.1927
CDAP.WFH.County8.agremp.B=-2.0366
CDAP.WFH.County8.fpsemp.M= 0.0188
CDAP.WFH.County8.fpsemp.B= 0.0825
CDAP.WFH.County8.heremp.M= 0.0513
CDAP.WFH.County8.heremp.B=-0.4372
CDAP.WFH.County8.mwtemp.M= 0.1251
CDAP.WFH.County8.mwtemp.B=-1.2448
CDAP.WFH.County8.othemp.M= 0.1100
CDAP.WFH.County8.othemp.B=-1.0939
CDAP.WFH.County8.retemp.M= 0.0128
CDAP.WFH.County8.retemp.B=-0.0610

# 9=Marin
CDAP.WFH.County9.agremp.M= 0.0000
CDAP.WFH.County9.agremp.B= 0.0000
CDAP.WFH.County9.fpsemp.M= 0.1236
CDAP.WFH.County9.fpsemp.B=-0.9726
CDAP.WFH.County9.heremp.M= 0.0367
CDAP.WFH.County9.heremp.B=-0.2384
CDAP.WFH.County9.mwtemp.M= 0.1288
CDAP.WFH.County9.mwtemp.B=-1.1434
CDAP.WFH.County9.othemp.M= 0.1895
CDAP.WFH.County9.othemp.B=-1.8451
CDAP.WFH.County9.retemp.M= 0.1489
CDAP.WFH.County9.retemp.B=-1.3901
CDAP.WFH.County9.fpsemp.M= 0.0101
CDAP.WFH.County9.fpsemp.B= 0.4020
CDAP.WFH.County9.heremp.M= 0.0625
CDAP.WFH.County9.heremp.B=-0.4483
CDAP.WFH.County9.mwtemp.M= 0.1468
CDAP.WFH.County9.mwtemp.B=-1.2938
CDAP.WFH.County9.othemp.M= 0.1293
CDAP.WFH.County9.othemp.B=-1.0975
CDAP.WFH.County9.retemp.M= 0.1019
CDAP.WFH.County9.retemp.B=-1.0164

# --- Additional factors to scale WFH for full-time and part-time workers
CDAP.WFH.FullTimeWorker.Factor = 1.0
Expand Down Expand Up @@ -336,7 +337,7 @@ CDAP.WFH.EN7.Superdistrict34=0.0
Bike_Infra_C_IVT_Multiplier = set_by_RuntimeConfiguration.py
Work_Transit_Hesitance = set_by_RuntimeConfiguration.py
NonWork_Transit_Hesitance = set_by_RuntimeConfiguration.py
BART_Transit_Hesitance = set_by_RuntimeConfiguration.py
Rail_Transit_Hesitance = set_by_RuntimeConfiguration.py

Means_Based_Tolling_Q1Factor = set_by_RuntimeConfiguration.py
Means_Based_Tolling_Q2Factor = set_by_RuntimeConfiguration.py
Expand Down
4 changes: 2 additions & 2 deletions model-files/scripts/preprocess/RuntimeConfiguration.py
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ def config_mobility_params(params_filename, params_contents, for_logsums, replac

WorkTransitHesitance = float(get_property(params_filename, params_contents, "Work_Transit_Hesitance"))
NonWorkTransitHesitance = float(get_property(params_filename, params_contents, "NonWork_Transit_Hesitance"))
BARTTransitHesitance = float(get_property(params_filename, params_contents, "BART_Transit_Hesitance"))
RailTransitHesitance = float(get_property(params_filename, params_contents, "Rail_Transit_Hesitance"))

MeansBasedTollsQ1Factor = float(get_property(params_filename, params_contents, "Means_Based_Tolling_Q1Factor"))
MeansBasedTollsQ2Factor = float(get_property(params_filename, params_contents, "Means_Based_Tolling_Q2Factor"))
Expand Down Expand Up @@ -307,7 +307,7 @@ def config_mobility_params(params_filename, params_contents, for_logsums, replac

replacements[filepath]["(\nWork_Transit_Hesitance[ \t]*=[ \t]*)(\S*)"] = r"\g<1>%.2f" % WorkTransitHesitance
replacements[filepath]["(\nNonWork_Transit_Hesitance[ \t]*=[ \t]*)(\S*)"] = r"\g<1>%.2f" % NonWorkTransitHesitance
replacements[filepath]["(\nBART_Transit_Hesitance[ \t]*=[ \t]*)(\S*)"] = r"\g<1>%.2f" % BARTTransitHesitance
replacements[filepath]["(\nRail_Transit_Hesitance[ \t]*=[ \t]*)(\S*)"] = r"\g<1>%.2f" % RailTransitHesitance

replacements[filepath]["(\nMeans_Based_Tolling_Q1Factor[ \t]*=[ \t]*)(\S*)"] = r"\g<1>%.2f" % MeansBasedTollsQ1Factor
replacements[filepath]["(\nMeans_Based_Tolling_Q2Factor[ \t]*=[ \t]*)(\S*)"] = r"\g<1>%.2f" % MeansBasedTollsQ2Factor
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ Bike_Infra_C_IVT_Multiplier = -28.1
# use values from 2023_TM160_IPA_42
Work_Transit_Hesitance = 100.0
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 75.0
Rail_Transit_Hesitance = 75.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
2 changes: 1 addition & 1 deletion utilities/RTP/config_RTP2025/params_2005.properties
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Bike_Infra_C_IVT_Multiplier = 0
# A factor of 0 means no change
Work_Transit_Hesitance = 0.0
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 0.0
Rail_Transit_Hesitance = 0.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
6 changes: 3 additions & 3 deletions utilities/RTP/config_RTP2025/params_2015.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ TRUCK_DISTRIB_LOS_TOLL_PART = 0.50
# It is specified as a logarithmic model wfh_rate = m * ln(household income) + b
# The formula is segmented and weighted by industry at the workplace TAZ
# These factors are applied on top of that by getting passed through to mtcTourBased.properties
WFH_FullTimeWorker_Factor = 0.323
WFH_PartTimeWorker_Factor = 0.831
WFH_FullTimeWorker_Factor = 0.34
WFH_PartTimeWorker_Factor = 0.84

# An additional constant in bike mode, to represent improvement in bike infrastructure
# Expressed in terms of "in-vehicle travel time equivalent"
Expand All @@ -36,7 +36,7 @@ Bike_Infra_C_IVT_Multiplier = 0
# A factor of 0 means no change
Work_Transit_Hesitance = 0.0
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 0.0
Rail_Transit_Hesitance = 0.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
8 changes: 4 additions & 4 deletions utilities/RTP/config_RTP2025/params_2023.properties
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ TRUCK_DISTRIB_LOS_TOLL_PART = 0.5
# It is specified as a logarithmic model wfh_rate = m * ln(household income) + b
# The formula is segmented and weighted by industry at the workplace TAZ
# These factors are applied on top of that by getting passed through to mtcTourBased.properties
WFH_FullTimeWorker_Factor = 1.04
WFH_PartTimeWorker_Factor = 0.94
WFH_FullTimeWorker_Factor = 0.88
WFH_PartTimeWorker_Factor = 0.77

# An additional constant in bike mode, to represent improvement in bike infrastructure
# Expressed in terms of "in-vehicle travel time equivalent"
Expand All @@ -34,9 +34,9 @@ Bike_Infra_C_IVT_Multiplier = 0
# E.g. A factor of -2 means 2 minutes of in-vehicle travel time is deducted from the utility, making transit more attractive
# E.g. A factor of 2 means an extra 2 minutes of in-vehicle travel time is added to the utility, making transit less attractive
# A factor of 0 means no change
Work_Transit_Hesitance = 83.3
Work_Transit_Hesitance = 50.0
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 72.0
Rail_Transit_Hesitance = 72.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Bike_Infra_C_IVT_Multiplier = -38.6
# use values from 2023_TM160_IPA_55
Work_Transit_Hesitance = 83.3
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 72.0
Rail_Transit_Hesitance = 72.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
2 changes: 1 addition & 1 deletion utilities/RTP/config_RTP2025/params_2035_IPA.properties
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Bike_Infra_C_IVT_Multiplier = -28.1
# use values from 2023_TM160_IPA_42
Work_Transit_Hesitance = 100.0
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 75.0
Rail_Transit_Hesitance = 75.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Bike_Infra_C_IVT_Multiplier = 0
# use values from 2023_TM160_IPA_55
Work_Transit_Hesitance = 83.3
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 72.0
Rail_Transit_Hesitance = 72.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Bike_Infra_C_IVT_Multiplier = -64.5
# use values from 2023_TM160_IPA_55
Work_Transit_Hesitance = 83.3
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 72.0
Rail_Transit_Hesitance = 72.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Bike_Infra_C_IVT_Multiplier = 0
# use values from 2023_TM160_IPA_55
Work_Transit_Hesitance = 83.3
NonWork_Transit_Hesitance = 0.0
BART_Transit_Hesitance = 72.0
Rail_Transit_Hesitance = 72.0

# TNC availability adjustment
# An adjustment to the modal constant, expressed in terms of "in-vehicle travel time equivalent"
Expand Down
Loading