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

Transit Improvements and Acceptance Criteria Summaries #135

Merged
merged 117 commits into from
Feb 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
73a86af
Update feature template
e-lo Mar 16, 2022
b5f9103
Add issue creation for release plan
e-lo Mar 18, 2022
e7e168c
Merge pull request #38 from BayAreaMetro/add-issue-creation-workflow
e-lo Mar 22, 2022
80daaea
Update feature_request.md
e-lo Mar 28, 2022
295081e
Add badges
e-lo Apr 20, 2022
12c745d
Fix docs build fail - lots of dependencies fixing (#51)
e-lo Apr 20, 2022
4950f28
Update issue templates
e-lo Apr 28, 2022
4232bc5
Update issue templates
e-lo Apr 28, 2022
e92681e
Resolve merge conflict
e-lo May 3, 2022
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
0542bcd
get the model mechanically working
yueshuaing May 8, 2023
86fc3d6
update fare calculation
yueshuaing May 9, 2023
2b8ca32
add extra parameters to configs
yueshuaing May 10, 2023
49706c0
prepare transit network, add necessary attributes
yueshuaing May 11, 2023
3662a76
update demand tables and assignment specs, add mix-mode journey files
yueshuaing May 18, 2023
4886fbc
add PNR parking penalties, update bus time calculation
yueshuaing May 19, 2023
dacf7b9
fix current summary report, output_stop_usage and export_boardings_by…
yueshuaing May 23, 2023
597d149
fix zero_matrix function
yueshuaing May 23, 2023
15e8d71
remove "prepare_network_transit" from global iteration
yueshuaing May 23, 2023
250bf65
add customized segment congestion function and congested transit assi…
yueshuaing May 23, 2023
2041a2c
peaking factors
yueshuaing May 23, 2023
7e49e07
refactor PeMS, add Caltrans
DavidOry May 24, 2023
9c3289a
add summary reports
yueshuaing May 24, 2023
4c9124b
add warmstart feature for transit
yueshuaing May 25, 2023
482cafc
transit skimming updates
yueshuaing May 26, 2023
28e4ba9
add skim calculations, fix matrix calculation issue
yueshuaing May 27, 2023
13c3269
fix presentation error with caltrans
DavidOry May 30, 2023
17e05a6
update transit to survey crosswalk
DavidOry Jul 11, 2023
fa97443
Merge branch 'develop' of https://github.com/wsp-sag/tm2py into wsp-s…
AshishKuls Jul 17, 2023
73c1248
Merge branch 'wsp-sag-develop' into bart_transit_improvements
AshishKuls Jul 17, 2023
c46659e
fix geojson i/o, bridge transactions
DavidOry Jul 25, 2023
bbb6480
bringing the updated code
AshishKuls Jul 26, 2023
9d52c06
updates to the attribute used for drive toll
AshishKuls Jul 26, 2023
2c5d4c9
change fare difference parameter to 2.0
AshishKuls Jul 26, 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
18286bd
Update transit_skim.py
arashasadabadi Oct 2, 2023
e909653
Update transit_assign.py
arashasadabadi Oct 2, 2023
8429ab1
Update household.py
arashasadabadi Oct 2, 2023
714afab
Update config.py
arashasadabadi Oct 2, 2023
07c9a24
Update matrix.py
arashasadabadi Oct 2, 2023
651c36a
Update prepare_demand.py
arashasadabadi Oct 2, 2023
e6487ef
Update model_config.toml
arashasadabadi Oct 2, 2023
5e0fda8
Update scenario_config.toml
arashasadabadi Oct 2, 2023
47db8e8
Update observed.py
vamerlynck Oct 12, 2023
58dc3a7
Update simulated.py
vamerlynck Oct 12, 2023
4b9e5a9
add library for tm2py
arashasadabadi Oct 12, 2023
531427e
Update transit_skim.py
arashasadabadi Oct 12, 2023
c8721fa
Update transit_assign.py
arashasadabadi 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
6c1744e
Merge pull request #126 from BayAreaMetro/bart_transit_improvements_aa
DavidOry Dec 18, 2023
afde37e
update configuration files
arashasadabadi Dec 18, 2023
a638b9c
Merge branch 'bart_transit_improvements' into acceptance-criteria-int…
AshishKuls Jan 8, 2024
b4ffbfe
minor updates
AshishKuls Jan 26, 2024
4249850
updates to acceptance criteria scripts
AshishKuls Jan 26, 2024
36b8066
remove root_dir and update path for scenario network files
AshishKuls Jan 29, 2024
38d3b1b
only am period for transit district to district summary
AshishKuls Feb 2, 2024
aa5303f
Updates to Criterion 19 summaries to focus on shares
DavidOry Feb 7, 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
22 changes: 14 additions & 8 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
---
name: Bug report
name: 🐛 Bug report
about: Create a report to help us improve
title: "[BUG] Description of problem"
title: "🐛 Bug: "
labels: bug
assignees: ''

---

## Describe the bug

A clear and concise description of what the bug is or the error code you got. e.g.

```python
<!--A clear and concise description of what the bug is or the error code you got. e.g.
```python
KeyError: 'Passing list-likes to .loc or [] with any missing labels is no longer supported, see https://pandas.pydata.org/pandas-docs/stable/user_guide/indexing.html#deprecate-loc-reindex-listlike'
```
-->

Progress:

- [ ] Sufficient information provided
- [ ] Cause identified/found
- [ ] Test developed/identified
- [ ] Approach determined
- [ ] Test passes

## To Reproduce

Expand All @@ -27,7 +33,7 @@ Steps to reproduce the behavior:
### Failing tests

- [ ] No applicable test failed, need to create.
- [ ]
- [ ] other...specify

### Triggering line of code

Expand Down
18 changes: 18 additions & 0 deletions .github/ISSUE_TEMPLATE/chore_issue.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: 🧹 Chore
about: Something that isn't a feature or a bug
title: "🧹 Chore: "
labels: chore
assignees: ''
---

<!--Short Description-->

Progress:

- [ ] Sufficiently defined
- [ ] Approach decided
- [ ] Implemented

## Considerations
<!--Short Description-->
38 changes: 22 additions & 16 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -1,37 +1,43 @@
---
name: Feature request
about: Suggest an idea for this project
title: "[FEATURE]"
name: 🚀 Feature request
about: Suggest an enhancement
title: "🚀 Feature:"
labels: enhancement
assignees: ''

---

### User Story

*As a ...insert type of user... I'd like to ...insert desired feature or behavior...*

### Priority
Progress:

- [ ] Sufficiently defined
- [ ] Approach determined
- [ ] Tests developed
- [ ] User story satisfied
- [ ] Doc strings
- [ ] General documentation
- [ ] Passing tests

### Priority

### Level of Effort

### Resolution Ideas

### Project

*Is there a funder or project associated with this feature?*
<!--Is there a funder or project associated with this feature?-->

### Who should be involved?

Implementer:
Commenters:
Users:
Reviewers:
Users:
Reviewers:

### Risk

*Will this potentially break anything?*
<!--Will this potentially break anything?-->

#### Tests
<!--What are relevant tests or what tests need to be created in order to determine that this issue is complete?-->

- [ ] Test for...


*What are relevant tests or what tests need to be created in order to determine that this issue is complete?*
20 changes: 20 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Publish docs
on:
workflow_dispatch:
push:
branches:
- develop

jobs:
mkdocs:
name: Publish docs
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Deploy docs
uses: mhausenblas/mkdocs-deploy-gh-pages@master
env:
REQUIREMENTS: docs/requirements.txt
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
32 changes: 32 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# This workflow will upload a Python Package using Twine when a release is created
# For more information see: https://help.github.com/en/actions/language-and-framework-guides/using-python-with-github-actions#publishing-to-package-registries

name: Upload Python Package

on:
release:
types: [created]

jobs:

deploy:

runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Set up Python
uses: actions/setup-python@v2
with:
python-version: '3.7'
- name: Install dependencies
run: |
python -m pip install --upgrade pip
pip install setuptools wheel twine
- name: Build and publish
env:
TWINE_USERNAME: ${{ secrets.PYPI_USERNAME }}
TWINE_PASSWORD: ${{ secrets.PYPI_PASSWORD }}
run: |
python setup.py sdist bdist_wheel
twine upload dist/*
15 changes: 8 additions & 7 deletions .github/workflows/push.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.8]
Expand Down Expand Up @@ -41,10 +42,10 @@ jobs:
- name: Test with pytest
run: |
pytest -s -m "not skipci"
- name: Configure Git user
run: |
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
- name: Build docs
run: |
mike deploy --push --rebase ${{ github.ref_name }}
- name: Test documentation build
uses: Tiryoh/actions-mkdocs@v0
with:
mkdocs_version: 'latest'
requirements: 'docs/requirements.txt'
configfile: 'mkdocs.yml'

33 changes: 33 additions & 0 deletions .github/workflows/release_plan.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Release Planning Milestone

on:
milestone:
types:
- created

jobs:
create_issue:
name: Create Full Test with Emme Issue
runs-on: ubuntu-latest
permissions:
issues: write
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MILESTONE: ${{ github.event.milestone.number }}
steps:
- name: Create Full Test with Emme Issue
uses: imjohnbo/issue-bot@3daae12aa54d38685d7ff8459fc8a2aee8cea98b
with:
assignees: "flaviatsang"
labels: "test-run"
title: "Run Full Emme Tests for $MILESTONE"
body: |
### Checklist

- [ ] Run full tests with Emme environment installed
- [ ] Generate bug issues for any failing tests
- [ ] Update any relevant EmmeMock output
milestone: $MILESTONE
pinned: false
close-previous: false

21 changes: 19 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ dist/
downloads/
eggs/
.eggs/
lib/
#lib/
lib64/
parts/
sdist/
Expand Down Expand Up @@ -63,6 +63,7 @@ scratch/*
*.bak
.cache
.hubstorinfo
examples/temp_acceptance/*

# Unit test / coverage reports
htmlcov/
Expand All @@ -85,6 +86,9 @@ coverage.xml
# mkdocs documentation
site/*

# mkdocs documentation
site/*

# Jupyter
.ipynb_checkpoints
profile_default/
Expand Down Expand Up @@ -128,4 +132,17 @@ dmypy.json

# Pyre type checker
.pyre/
*.log

# 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
7 changes: 7 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ In troubleshooting, sometimes DLL load failure errors would occur which may be r

At load time, the EMME API will always load the geos_c co-located with the EMME API, unless it was already loaded from some other location, which is the case when you import GDAL first. EMME API seems to be compatible with the newer GDAL/geos_c (reminder: not tested!). But this does not appear to be the case the other way around (newer GDAL is not compatible with older geos_c).

Copy and unzip [example_union_test_highway.zip](https://mtcdrive.box.com/s/3entr016e9teq2wt46x1os3fjqylfoge) to a local
drive and from within that directory run:

```sh
get_test_data <location>
tm2py -s scenario.toml -m model.toml
```

See [starting out](http://bayareametro.github.com/tm2py) section of documentation for more details.

Expand Down
2 changes: 1 addition & 1 deletion bin/get_test_data.bat
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ECHO "Retreiving %TEST_DATA_NAME% data from %TEST_DATA_LOCATION%

SET OUTDIR=%1
if "%OUTDIR%"=="" SET OUTDIR=DEFAULT_DIRECTORY
if not exist %OUTDIR% mkdir %OUTDIR%
if not exist %OUTDIR% mkdir %OUTDIR%
CD %OUTDIR%
ECHO "Writing to %CD%"

Expand Down
Loading
Loading