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

Update paths used in pipeline #71

Merged
merged 59 commits into from
Jan 30, 2025
Merged

Update paths used in pipeline #71

merged 59 commits into from
Jan 30, 2025

Conversation

sgreenbury
Copy link
Collaborator

@sgreenbury sgreenbury commented Nov 19, 2024

Closes #53.

The following changes are included in this PR:

  • Revise the filepath structure for pipeline outputs, include @property methods within the config providing the paths and refactor scripts to use these
  • Add a Population class for reading pipeline outputs
  • Fallback download option when pyrosm fails (e.g. for West Yorkshire)
  • Configurable time tolerance
  • Rewrite of the run pipeline script with Python
  • Multiprocessing for script 3.3

Remaining tasks:

  • Add config to override paths
  • Update path for logs
  • Run with MSOA with travel_times = false
  • Merge 56 write output to matsim format #57
  • Check determinism from a given seed. Update: fixed input data produces deterministic outputs for a given seed but note that the osmox output can change regularly and this can lead to different downstream AcBM outputs.
  • Run pipeline for:
    • Leeds (5000 households)
    • Leeds (all households)
    • Greater London (5000 households)
    • Greater London (all households): currently script 3.2.2_assign_primary_zone_work.py is not progressing, consider alternative parameters for the optimization updating optimization for only total deviation and adding multiprocessing for 3.3 enables pipeline to completely run.

@sgreenbury sgreenbury marked this pull request as ready for review November 28, 2024 16:39
config.init_rng()
os.makedirs(acbm.root_path / "data/interim/osmox", exist_ok=True)
fp = get_data(config.region, directory=acbm.root_path / "data/interim/osmox")
config = load_and_setup_config(config_file)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fallback for when pyrosm fails

scripts/0.1_run_osmox.py Outdated Show resolved Hide resolved
src/acbm/logger_config.py Outdated Show resolved Hide resolved
tests/test_config.py Outdated Show resolved Hide resolved
@Hussein-Mahfouz
Copy link
Collaborator

This looks great to me! Happy to merge it

Only one minor comment on logging: It seems some src code is using the old logging setup. Would this conflict with your new imlementation? e.g.

logger = logging.getLogger("assigning_primary_feasible")

@sgreenbury
Copy link
Collaborator Author

Thanks @Hussein-Mahfouz - merging now with comments addressed or opened as new issues.

@sgreenbury sgreenbury merged commit cdb1389 into main Jan 30, 2025
4 checks passed
@sgreenbury sgreenbury deleted the 53-paths branch January 30, 2025 18:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Revise output directory for pipeline outputs
3 participants