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

Acceptance Criteria summaries #97

Closed
wants to merge 73 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
fb91639
Start on acceptance framework
DavidOry Dec 20, 2022
8e1f134
additional outlining
DavidOry Dec 22, 2022
1147aff
Move to dev environment, sketch out observed toml, add notebook to help
DavidOry Dec 28, 2022
c69d03f
add on-board survey reductions
DavidOry Dec 28, 2022
98fb0f0
add model config, bit more progress on transit
DavidOry Dec 29, 2022
282f60a
progress on transit, add temp data
DavidOry Jan 3, 2023
c8da026
Progress on transit acceptance
DavidOry Jan 5, 2023
966cd9a
Progress on transit acceptance
DavidOry Jan 6, 2023
b56c93f
suppress time of day
DavidOry Jan 13, 2023
e07db9d
Minor fixes, update notebook
DavidOry Jan 17, 2023
7cb09df
clean up transit, start on other
DavidOry Jan 20, 2023
5ee0b67
add CTPP comparisons
DavidOry Jan 25, 2023
bfe46ae
add congested transit
DavidOry Jan 27, 2023
33ed6e7
add automobile ownership
DavidOry Jan 31, 2023
fc23f15
clean up notebook
DavidOry Jan 31, 2023
1ba6d9e
Replace simulated households with observed hhs
DavidOry Jan 31, 2023
ec38b74
add AM and direction to transit, skip ci
DavidOry Feb 6, 2023
53ce247
add BART observed, some clean up
DavidOry Feb 8, 2023
8f6ec61
bart station-to-station flows
DavidOry Feb 21, 2023
c498812
Add summaries by access mode
DavidOry Mar 9, 2023
914fdc2
Fix station access, reorg code
DavidOry Mar 14, 2023
9b821a7
Complete code reorg
DavidOry Mar 15, 2023
c462563
i-j node bug fix for access
DavidOry Mar 16, 2023
944f449
add transit district to district
DavidOry Mar 31, 2023
1ca0cf4
Create ACS 2013-2017 Zero-Vehicle Households to MAZs.R
shimonisrael Mar 31, 2023
46cfca9
Merge branch 'acceptance-criteria' of https://github.com/BayAreaMetro…
shimonisrael Mar 31, 2023
f58a8b3
Create ACS 2013-2017 MAZ Zero-Vehicle Households.csv
shimonisrael Mar 31, 2023
4c80ac2
Round data and output csv
shimonisrael Mar 31, 2023
40dfc06
Fix input names
shimonisrael Apr 1, 2023
b387a19
clean up transit district
DavidOry Apr 12, 2023
cb85581
Merge branch 'acceptance-criteria' of https://github.com/BayAreaMetro…
DavidOry Apr 12, 2023
66e42f5
highway
vamerlynck Apr 19, 2023
48645ec
highway
vamerlynck Apr 19, 2023
7cecc38
Update observed_temp.py
vamerlynck Apr 19, 2023
18787d8
Update simulated_temp.py
vamerlynck Apr 19, 2023
977d5ee
black, add transit routes
DavidOry Apr 19, 2023
f5c8591
Bring in roadway work for Canonical
DavidOry Apr 19, 2023
4647db7
Bring in virginie's observed
DavidOry Apr 20, 2023
23ee009
Bring in virginie's simulated roadway
DavidOry Apr 21, 2023
4ae664a
Progress on roadway, start on Tableau
DavidOry May 3, 2023
a982784
Progress on Tableau
DavidOry May 9, 2023
cee98e7
Updates with some temp commenting out of non-roadway methods
DavidOry May 10, 2023
c11d1e4
pems station corrections
vamerlynck May 10, 2023
cef6de6
Beta version of roadway validation
DavidOry May 11, 2023
14c8ec3
Merge branch 'acceptance-criteria' of https://github.com/BayAreaMetro…
DavidOry May 11, 2023
80fb238
fixes to daily roadway
DavidOry May 16, 2023
7e49e07
refactor PeMS, add Caltrans
DavidOry May 24, 2023
13c3269
fix presentation error with caltrans
DavidOry May 30, 2023
17e05a6
update transit to survey crosswalk
DavidOry Jul 11, 2023
c46659e
fix geojson i/o, bridge transactions
DavidOry Jul 25, 2023
f1ae96b
update crosswalk from shimon's work
DavidOry Aug 7, 2023
b3976c8
Fix Caltrain counts in Tableau
DavidOry Aug 7, 2023
f637126
fix caltrans bug, tableau clean up, write reduced clean up
DavidOry Aug 8, 2023
d07fc03
Add helper R scripts
DavidOry Sep 29, 2023
c6b694c
add journey level tableau
DavidOry Sep 29, 2023
47db8e8
Update observed.py
vamerlynck Oct 12, 2023
58dc3a7
Update simulated.py
vamerlynck Oct 12, 2023
0ecfd64
Update simulated.py
vamerlynck Oct 20, 2023
64dd108
Update simulated.py
vamerlynck Oct 20, 2023
5eaebcb
Update simulated.py
vamerlynck Oct 20, 2023
a72eb07
Update simulated.py
vamerlynck Oct 20, 2023
7c897d3
Update canonical_crosswalk.toml
vamerlynck Oct 20, 2023
e90a75d
clean up examples\temp_acceptance
vamerlynck Oct 20, 2023
d2dd451
Update canonical.py
vamerlynck Oct 22, 2023
588c5d8
Update simulated.py
vamerlynck Oct 23, 2023
2e42548
Update canonical.py
vamerlynck Oct 24, 2023
5b3a55a
Minor updates to Tableau workbooks
DavidOry Oct 26, 2023
32e0ca8
tableau updates
DavidOry Nov 8, 2023
6ce8500
add caltrans count table to roadway tableau
DavidOry Nov 9, 2023
0898497
Update canonical.py
vamerlynck Jan 11, 2024
b61c151
Update observed.py
vamerlynck Jan 11, 2024
07614a5
Update simulated.py
vamerlynck Jan 12, 2024
a6de6fd
Update acceptance.py
vamerlynck Jan 12, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ jobs:
build:

runs-on: ubuntu-latest
if: "!contains(github.event.head_commit.message, 'skip ci')"
strategy:
matrix:
python-version: [3.7, 3.8]
Expand Down
17 changes: 16 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ scratch/*
*.bak
.cache
.hubstorinfo
examples/temp_acceptance/*

# Unit test / coverage reports
htmlcov/
Expand All @@ -78,7 +79,7 @@ site/*
# mkdocs documentation
site/*

# Jupyter
# Jupyter
.ipynb_checkpoints
profile_default/
ipython_config.py
Expand Down Expand Up @@ -121,3 +122,17 @@ dmypy.json

# Pyre type checker
.pyre/

# Acceptance Criteria temps
examples/temp_acceptance/boardings_by_line_am.csv
notebooks/acceptance-transit-network.geojson
notebooks/boardings_by_segment_am.geojson
notebooks/tl_2010_06_bg10.*
notebooks/*.twbx

# Interim data
data/interim/*

# R Scripts
scripts/.Rproj.user/*
scripts/.Rhistory
18 changes: 11 additions & 7 deletions environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ channels:
dependencies:
- affine=2.3.0=py_0
- appnope=0.1.2=py37hf985489_2
- argh=0.26.2=pyh9f0ad1d_1002
- argon2-cffi=21.3.0=pyhd8ed1ab_0
- argon2-cffi-bindings=21.2.0=py37h271585c_1
- attrs=21.4.0=pyhd8ed1ab_0
Expand All @@ -21,7 +22,7 @@ dependencies:
- c-ares=1.18.1=h0d85af4_0
- ca-certificates=2021.10.8=h033912b_0
- cairo=1.16.0=he43a7df_1008
- certifi=2021.10.8=py37hf985489_1
- certifi=2021.10.8=py37hf985489_2
- cffi=1.15.0=py37h446072c_0
- cfitsio=3.470=h01dc385_7
- chardet=4.0.0=py37hf985489_2
Expand All @@ -40,7 +41,7 @@ dependencies:
- fiona=1.8.20=py37h687fd47_1
- flit-core=3.7.1=pyhd8ed1ab_0
- folium=0.12.0=pyhd8ed1ab_1
- fontconfig=2.13.96=h676cef8_1
- fontconfig=2.13.94=h10f422b_0
- fonttools=4.30.0=py37h69ee0a8_0
- freetype=2.10.4=h4cff582_1
- freexl=1.0.6=h0d85af4_0
Expand All @@ -52,11 +53,13 @@ dependencies:
- geos=3.9.1=he49afe7_2
- geotiff=1.6.0=h26421ea_6
- gettext=0.19.8.1=hd1a6beb_1008
- ghp-import=2.0.2=pyhd8ed1ab_0
- giflib=5.2.1=hbcb3906_2
- hdf4=4.2.15=hefd3b78_3
- hdf5=1.12.1=nompi_ha60fbc9_104
- icu=68.2=he49afe7_0
- idna=3.3=pyhd8ed1ab_0
- importlib-metadata=4.11.3=py37hf985489_1
- ipykernel=6.9.1=py37h4c52d7d_0
- ipython=7.32.0=py37hf985489_0
- ipython_genutils=0.2.0=py_1
Expand Down Expand Up @@ -131,6 +134,8 @@ dependencies:
- markupsafe=2.1.0=py37h69ee0a8_1
- matplotlib-base=3.5.1=py37h3147e9e_0
- matplotlib-inline=0.1.3=pyhd8ed1ab_0
- mergedeep=1.3.4=pyhd8ed1ab_0
- mike=1.1.2=pyhd8ed1ab_0
- mistune=0.8.4=py37h271585c_1005
- munch=2.5.0=py_0
- munkres=1.1.4=pyh9f0ad1d_0
Expand Down Expand Up @@ -168,6 +173,7 @@ dependencies:
- prompt_toolkit=3.0.27=hd8ed1ab_0
- pthread-stubs=0.4=hc929b4f_1001
- ptyprocess=0.7.0=pyhd3deb0d_0
- pyaml=21.10.1=pyhd8ed1ab_0
- pycparser=2.21=pyhd8ed1ab_0
- pydantic=1.9.0=py37h271585c_0
- pygments=2.11.2=pyhd8ed1ab_0
Expand All @@ -186,6 +192,7 @@ dependencies:
- python_abi=3.7=2_cp37m
- pytz=2021.1=pyhd8ed1ab_0
- pyyaml=5.4.1=py37h271585c_1
- pyyaml-env-tag=0.1=pyhd8ed1ab_0
- pyzmq=22.3.0=py37h8f778e5_1
- qt=5.12.9=h126340a_4
- qtconsole=5.2.2=pyhd8ed1ab_1
Expand Down Expand Up @@ -216,6 +223,7 @@ dependencies:
- tzdata=2021e=he74cb21_0
- unicodedata2=14.0.0=py37h271585c_0
- urllib3=1.26.8=pyhd8ed1ab_1
- verspec=0.1.0=pyhd8ed1ab_0
- wcwidth=0.2.5=pyh9f0ad1d_2
- webencodings=0.5.1=py_1
- wheel=0.37.1=pyhd8ed1ab_0
Expand Down Expand Up @@ -246,15 +254,12 @@ dependencies:
- filelock==3.6.0
- flake8==4.0.1
- fontawesome-markdown==0.2.6
- ghp-import==2.0.2
- identify==2.4.11
- imagesize==1.3.0
- importlib-metadata==4.2.0
- iniconfig==1.1.1
- jsbeautifier==1.14.0
- markdown==3.3.4
- mccabe==0.6.1
- mergedeep==1.3.4
- mkdocs==1.2.3
- mkdocs-autorefs==0.4.1
- mkdocs-awesome-pages-plugin==2.7.0
Expand All @@ -279,8 +284,8 @@ dependencies:
- pyflakes==2.4.0
- pymdown-extensions==9.2
- pytest==7.0.1
- pytest-mock==3.7.0
- pytkdocs==0.16.1
- pyyaml-env-tag==0.1
- recommonmark==0.7.1
- snowballstemmer==2.2.0
- soupsieve==2.3.1
Expand All @@ -299,4 +304,3 @@ dependencies:
- virtualenv==20.13.3
- watchdog==2.1.6
- wcmatch==8.3
prefix: /Users/elizabeth/opt/miniconda3/envs/tm2py
19 changes: 19 additions & 0 deletions examples/canonical_crosswalk.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
####################################
# CANONICAL & CROSSWALKS #
####################################

[remote_io]
#crosswalk_folder_root = "/Users/wsp/Documents/GitHub/tm2py/examples/temp_acceptance/"
crosswalk_folder_root = "/Users/USVA682771/GitHub/tm2py/examples/temp_acceptance/"

[crosswalks]
crosswalk_standard_survey_file = "transit-standard-2015-to-survey-crosswalk.csv"
standard_to_tm2_modes_file = "gtfs_to_tm2_mode_crosswalk.csv"
standard_to_emme_transit_file = "emme_taz_transit_network_node_id_crosswalk.csv"
canonical_agency_names_file = "canonical-agency-names.csv"
canonical_station_names_file = "canonical-station-names.csv"
block_group_to_maz_url = "https://raw.githubusercontent.com/BayAreaMetro/travel-model-two/master/maz_taz/crosswalks/Census%202010%20hhs%20maz%20share%20of%20blockgroups_ACS2017.csv"
taz_to_district_file = "taz-district-crosswalk.csv"
pems_station_to_tm2_links_file = "pems_station_to_TM2_links_crosswalk.csv"
standard_to_emme_nodes_file = "emme_drive_network_node_id_crosswalk.csv"

26 changes: 26 additions & 0 deletions examples/observed_data.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
####################################
# OBSERVED DATA CONFIGURATION #
####################################

[remote_io]
obs_folder_root = "/Users/wsp/Box Sync/"
[transit]
on_board_survey_file = "Survey_Database_122717/onboard-survey-trip-list.feather"
reduced_summaries_file = "Survey_Database_122717/acceptance-criteria-reductions.csv"
reduced_access_summary_file = "Survey_Database_122717/acceptance-criteria-access-summaries-year-2015.csv"
reduced_flow_summary_file = "Survey_Database_122717/acceptance-criteria-spatial-flows-year-2015.csv"
bart_boardings_file = "bart-typical-weekday/BART Through Time Typical Weekday.csv"
[census]
ctpp_2012_2016_file = "CTPP20122016/A302100 - Total Workers (1) (Workers 16 years and over).csv"
vehicles_by_block_group_file = "Census/ACSDT5Y2017.B08201-Data.csv"
census_geographies_shapefile = "Census/tl_2010_06_bg10.shp"
census_geographies_pickle = "Census/tl_2010_06_bg10.pickle"
census_tract_centroids_geojson = "Census/tl_2010_tract_centroids.geojson"
[roadway]
pems_traffic_count_file = "PeMS/pems_period.csv"
pems_truck_count_file = "PeMS/pems_truck_period.csv"
caltrans_count_file = "Travel Model Two Conversion/Link21 Roadway Counts/CaltransandAlameda/Link21EMME_Caltrans_AADT_Traffic_and_Truck_alsowithAlamadaCounts.csv"
reduced_pems_summaries_file = "PeMS/acceptance-criteria-reduced-traffic-counts.pickle"
bridge_transactions_file = "bridge-transactions/Typical Weekday Transactions Statistics.csv"
reduced_transactions_file = "bridge-transactions/acceptance-criteria-reduced_transactions.pickle"

2 changes: 2 additions & 0 deletions examples/scenario_config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
####################################

[scenario]
name = "Example scenario"
year = 2015
verify = false
maz_landuse_file = "inputs\\landuse\\maz_data.csv"
root_dir = "/Users/wsp/Documents/GitHub/tm2py/examples/temp_acceptance/"

[run]
start_component = ""
Expand Down
Loading
Loading