Repository navigation
Conversation
There was a typo in the area definition name - `GG_nonPDA` is defined as growth geography areas that are NOT also PDAs - but the code had selected PPAs instead of PDAs.
…urcing for jurisdiction names
…area_urbansim into fbp_mod_updates
As an arms length process running separately and focused on generic summarization of mostly CSVs, we can use a more up to date pandas version.
…oningmodcat, not more general parcels_geography_cols
…area_urbansim into fbp_mod_updates
main_dev is based on fbp_mod_updates, which contains the PBA50plus-era core simulation with updated growth geographies. This merge integrates usability enhancements from main while preserving core simulation logic. Key additions from main: - Modular slack/debug modules (baus/slack.py, baus/debug.py) - Configurable simulation years support - 2020-based run support - Enhanced CLI options and logging - yaml.safe_load() for security - Code quality improvements Conflicts resolved manually to maintain compatibility between fbp_mod_updates core and main enhancements.
Replaced merged baus.py with main branch version to get all B1 enhancements (modular slack, configurable years, enhanced CLI) cleanly without conflicts.
…ch of bayareametro/urbansim
parcel_id is the standard parcel identifier
… avoid always-on status
This branch has not been deployed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This pull request is mainly a bridge between separate branch development efforts - one branch (main) focused on runtime enhancements, while the other (fbp_mod_updates) was focused on model application refinements. Together, they blend several enhancements and debugging improvements across the codebase, primarily focused on increased logging, more robust data handling, and improved reproducibility for model runs, capturing development work up to Plan Bay Area 2050 Plus Final Blueprint Phase.
Note that the (main_dev) branch was a short term stepping stone branch for merging and testing before folding
fbp_mod_updatesinto main.The changes impact the documentation deployment workflow, environment setup, and multiple modeling steps. The most important changes are summarized below:
Documentation and Environment Setup:
.github/workflows/push-docs.yml) to automate building and deploying documentation to thegh-pagesbranch usingmikeandmkdocs.baus-env-2023.ymlto pin dependencies, addpip, and installurbansimandurbansim_defaultsdirectly from GitHub, improving reproducibility and flexibility.Debugging and Logging Enhancements:
baus/models.pyandbaus/subsidies.py, including random seed checks, relocation rate summaries, feasibility and limits diagnostics, and preservation accounting. This will help with tracking model state and debugging during simulation runs.Model Logic and Data Handling Improvements:
alt_feasibilityand developer steps to better handle configuration overrides and provide more transparent feasibility diagnostics.preserve_affordablestep to useorca.merge_tablesfor joining multiple sources, switched to a set for tracking preserved units to avoid duplicates, and added detailed accounting and output for preserved units.Bug Fixes and Minor Adjustments:
elcm_simulate_ec5) to only skip simulation for years before 2030 (was previously <=2030).local_poisaccessibility step.Thanks to @lmz , @jdahren , @yuqiww