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.

Sign up for GitHub

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

Revise travel day #82

Closed
wants to merge 30 commits into from
Closed

Revise travel day #82

Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
84a9273
adjusted distances
Hussein-Mahfouz Dec 13, 2024
a588c67
update _adjust_distance
Hussein-Mahfouz Dec 13, 2024
9fa6b0f
undo update _adjust_distance
Hussein-Mahfouz Dec 13, 2024
40d2e2f
edit intrazone
Hussein-Mahfouz Dec 13, 2024
7411e46
Merge remote-tracking branch 'origin/79-checking-and-validating-trave…
sgreenbury Jan 7, 2025
3e521ea
Fix missing function args
sgreenbury Jan 7, 2025
5b6cfbb
config for reference
Hussein-Mahfouz Jan 10, 2025
489e085
Merge remote-tracking branch 'origin/79-checking-and-validating-trave…
sgreenbury Jan 14, 2025
0e06e29
Update config
sgreenbury Jan 14, 2025
9c0003a
Fix test
sgreenbury Jan 14, 2025
6164a28
Adjust matching to account for common travel day
sgreenbury Jan 7, 2025
0cea61f
Add 'DayID' to outputs
sgreenbury Jan 8, 2025
88f4911
Fix missing subset of nts_trips
sgreenbury Jan 8, 2025
e0fc2f9
Add interim output with chosen random day for households
sgreenbury Jan 8, 2025
ed45b92
Add todo
sgreenbury Jan 9, 2025
ce5a261
Handle missing data and revise test for common trav days
sgreenbury Jan 14, 2025
ced648d
Fix test
sgreenbury Jan 14, 2025
5f17c56
Add chosen travel day modelling using pwkstat
sgreenbury Jan 15, 2025
4b6db8c
Revise subsetting of households given trav day config
sgreenbury Jan 15, 2025
1f5e0b9
Fix test
sgreenbury Jan 15, 2025
4ce4b1a
Add logging for NTS filtering
sgreenbury Jan 15, 2025
46946d1
Fix merge columns
sgreenbury Jan 15, 2025
4301493
Add matching for remaining individuals
sgreenbury Jan 15, 2025
be2eb6b
Revise region variable to 'PSUStatsReg_B01ID'
sgreenbury Jan 15, 2025
748260a
Fix logging
sgreenbury Jan 15, 2025
5105dab
Remove obsolete comment
sgreenbury Jan 16, 2025
32dfe63
Uncomment code
sgreenbury Jan 16, 2025
6ebd5be
Limit the number of processes to proportion of cpu_count()
sgreenbury Jan 16, 2025
1dd281b
Only consider working not from home
sgreenbury Jan 20, 2025
a07c035
Add scaling
sgreenbury Jan 22, 2025
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
Prev Previous commit
Next Next commit
Add todo
  • Loading branch information
@sgreenbury
sgreenbury committed Jan 14, 2025
commit ed45b922b3de2294b9971b4d10ae0a2fb3e32058
1 change: 1 addition & 0 deletions scripts/2_match_households_and_individuals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,7 @@ def get_interim_path(

regions = config.parameters.nts_regions

# TODO: Currently this only seems to work for 2019, check this
nts_individuals = nts_filter_by_region(nts_individuals, psu, regions)
nts_households = nts_filter_by_region(nts_households, psu, regions)
nts_trips = nts_filter_by_region(nts_trips, psu, regions)
Expand Down