Repository navigation

Branch blending - merging `main` and `fbp_mod_update` genealogies - #397

Open

akselx wants to merge 172 commits into

mainfrom

main_dev

Commits on Jul 30, 2024
- Fix GG_non_PDA definition
  akselx
  authored
  8a8161b
Commits on Nov 19, 2024
- Merge branch 'main' into metrics_fixes
  yuqiww
  committed
  056004a
Commits on Dec 21, 2024
- add both vintages of EPC
  yuqiww
  committed
  5963d56
Commits on Jan 31, 2025
- adding notebook for FBP zoning mods based on new GGs
  akselx
  committed
  27c459b
Commits on Feb 4, 2025
- add a few comments
  akselx
  committed
  4b3a340
- adapted to consume updated growth geography schema, with alternate sourcing for jurisdiction names
  akselx
  committed
  c374e0e
Commits on Feb 5, 2025
- Add info on zoningmodcat join success to log. Minor formating cleanup as well.
  akselx
  committed
  baa03bc
- fix comma bug
  akselx
  committed
  db38df8
- fixed incorrect join between index and column
  akselx
  committed
  f3d8e77
Commits on Feb 6, 2025
- removing reporting on urbanized in core_summaries.new_buildings_summary
  akselx
  committed
  a97a502
Commits on Feb 7, 2025
- ensure consistent zoningmodcat generation with strategy building notebook
  akselx
  committed
  725c115
Commits on Feb 11, 2025
- add script for generalizing zoning mods from yaml criteria
  akselx
  committed
  b2fb287
Commits on Feb 12, 2025
- Handle Final Blueprint - use DBP controls
  
  lmz
  authored and
  akselx
  committed
  dcc0db3
- Moving to Final Blueprint metrics
  
  lmz
  authored and
  akselx
  committed
  540d80d
Commits on Feb 14, 2025
- Update SLR sourcing to january 2025 version and minor SLR refactoring
  akselx
  committed
  9bce7cf
- disambiguate epc column name to denote appropriate tract vintage
  akselx
  committed
  8e9a47a
Commits on Feb 21, 2025
- changed preservation checks to not require four tiers
  akselx
  committed
  b52091b
- Merge branch 'fbp_mod_updates' of https://github.com/BayAreaMetro/bayarea_urbansim into fbp_mod_updates
  akselx
  committed
  c66a671
Commits on Feb 24, 2025
- Moved path building logic out of the yaml file
  akselx
  committed
  9f6f3f0
- added more recent bart station file for pandana use
  akselx
  committed
  9b7f51b
- add validation check on parcels-to-strategy zoning merge
  akselx
  committed
  9532527
Commits on Feb 26, 2025
- Add separate metrics yaml environment
  akselx
  authored
  df099fd
Commits on Mar 4, 2025
- Remove standard library dependencies
  jdahren
  committed
  4ad202f
Commits on Mar 7, 2025
- changed parcel geography loader to use zoningmodcat_cols to produce zoningmodcat, not more general parcels_geography_cols
  akselx
  committed
  6a124e6
- Added more debug messages and clarified variable names in effective_max_dua
  akselx
  committed
  e433067
Commits on Mar 9, 2025
- removed vs code history files from search
  akselx
  committed
  1da4032
Commits on Mar 10, 2025
- corrected filter criterion for dua_down outside UGBs
  akselx
  committed
  c63c534
- add inclusionary yaml development to zoning mods process
  akselx
  committed
  24e7f92
Commits on Mar 13, 2025
- Assign Box dir to E: for Joe
  jdahren
  committed
  0347b1a
Commits on Mar 14, 2025
- Incorporate TOC service tiers into load_data_for_runs()
  jdahren
  committed
  6d9a4a8
- Make service_tier categorical and add TOC to filter
  jdahren
  committed
  3fd2771
- Crosscheck zoning mods with H3, EC4, and EC6 modeling parameters
  jdahren
  committed
  97d1e83
- Crosscheck zoning mods with H3, EC4, and EC6 modeling params
  jdahren
  committed
  f6b97f4
- added categories and responded to Commit 97d1e834
  akselx
  committed
  6a8215a
Commits on Mar 15, 2025
- removed distinctions in TRA6 for HRA status
  akselx
  committed
  1a44c10
Commits on Mar 17, 2025
- add additional debug info for subsidies module
  akselx
  committed
  3f34549
Commits on Mar 18, 2025
- added additional logging for preserve_affordable()
  akselx
  committed
  166c4fb
Commits on Mar 19, 2025
Commits on Mar 21, 2025
- add more debug info on H1 household relocation rates, and reenable parameterized elcm file for EC5
  akselx
  committed
  e6d591d
- cleaner accounting of target vs actual, plus writing of output to outputs_dir
  akselx
  committed
  10a6f74
Commits on Mar 22, 2025
- First cut of backing out UBI
  jdahren
  committed
  a343dc1
Commits on Mar 24, 2025
- Skip UBI adjustment for NP
  jdahren
  committed
  43c4245
- Merge pull request #392 from BayAreaMetro/metrics_ubi
  jdahren
  authored
  9c96ba6
Commits on Mar 25, 2025
- fixed ec5 specification path
  akselx
  committed
  6d00c4d
- Migrated EC5 to the 03/2025 version
  akselx
  committed
  a2d4b4c
Commits on Mar 26, 2025
- changed elcm ec5 to start in 2030 instead of the first year after 2030
  akselx
  committed
  8e4e220
Commits on Mar 28, 2025
- make box output dir arg optional to work on model servers w/o box
  akselx
  committed
  3ed6544
Commits on Apr 1, 2025
- swap to FBP version of GGs but keep legacy version for a few residual columns
  akselx
  committed
  67cc721
Commits on Apr 3, 2025
- omitted tra_6 from domain list for TRA summaries
  akselx
  committed
  40a4aa5
Commits on Apr 4, 2025
Commits on Apr 8, 2025
- Update BAUS update run setup.ipynb
  akselx
  authored
  88d4ce7
Commits on Apr 10, 2025
- Update BAUS update run setup.ipynb
  akselx
  authored
  f4215d2
Commits on Apr 11, 2025
- documentation on strategy inputs and coding
  yuqiww
  committed
  ec85eb3
- more strategy input/coding documentation
  yuqiww
  committed
  7af9c48
- more documentation
  yuqiww
  committed
  0338b43
Commits on Apr 14, 2025
- updated definitions with ec1, added auto-describebased on chosen settings
  akselx
  committed
  8c15b9e
- Fix unmerged path
  jdahren
  committed
  c2b0b5e
Commits on Apr 15, 2025
- removed inactive remainder filter for 15% group
  akselx
  committed
  ad4d11b
Commits on Apr 22, 2025
Commits on Apr 23, 2025
Commits on Apr 24, 2025
Commits on Apr 25, 2025
- get a log entry if forms dict is malformed
  akselx
  committed
  6ae98c8
- Merge branch 'fbp_mod_updates' of https://github.com/BayAreaMetro/bayarea_urbansim into fbp_mod_updates
  akselx
  committed
  f79c0fb
- Create script for summarizing urban park acreage by County and area type
  jdahren
  committed
  143ffbf
- Update current stop universe for 2023
  jdahren
  committed
  75855f6
- Update parcel crosswalk file with latest GG and parcel transit service file
  jdahren
  committed
  c4a3cca
- Add pyarrow and pyogrio to metrics dependencies
  jdahren
  committed
  a218b3a
- Fix baseyear processing handle
  jdahren
  committed
  53821fe
- Updates through v6 sequence
  akselx
  authored
  b7718e5
Commits on Apr 26, 2025
Commits on Apr 27, 2025
- add pathlib to namespace for temp accounts output
  akselx
  committed
  419dba4
Commits on Apr 30, 2025
- Create script for geoprocessing and summarizing urban park acres.
  jdahren
  committed
  ae239bb
- Add function to generate park acreage from new residential development (EN6).
  jdahren
  committed
  a76038d
Commits on May 1, 2025
Commits on May 2, 2025
- Remove renamed script
  jdahren
  committed
  99d7994
- updated non-greenfield metric to use UGB instead of urban area - more consistent with name
  akselx
  committed
  d05fe43
Commits on May 3, 2025
- added FBP scenario for housing cost estimates
  akselx
  authored
  8b3ea51
- Fix for propagating UBI adjustment
  jdahren
  committed
  aca38fd
- Merge branch 'metrics_fixes' of https://github.com/BayAreaMetro/bayarea_urbansim into metrics_fixes
  jdahren
  committed
  51bb13f
- Add matching quote
  jdahren
  committed
  614c310
Commits on May 5, 2025
- Fix for recovering original pre-UBI Q1 and Q2 HH totals
  jdahren
  committed
  39836e2
Commits on May 6, 2025
- Sample from parcels with Q2 households for UBI adjustment
  jdahren
  committed
  a9d76c3
Commits on May 8, 2025
Commits on May 12, 2025
- Call updated version of SLR protection metric
  jdahren
  committed
  8f1a7b0
Commits on May 14, 2025
- Add EIR alternative to scenario mapping
  jdahren
  committed
  2c79cbd
- Use FBP SLR inundation file for EIR alternative
  jdahren
  committed
  3dc8032
- Revert accidental modification to 2021 SLR inundation file
  jdahren
  committed
  b5ebc9f
- Remove spaces (Alt2 instead of Alt 2) and handle Alt1
  lmz
  committed
  7198966
Commits on May 16, 2025
- add EC5-specific elcm config with alts_predict_filters set for ec5 target areas
  akselx
  committed
  fe4eb80
- draft script to summarize res and non res growth by blg type of county
  yuqiww
  committed
  6126eb6
Commits on May 19, 2025
- adding logging with custom log levels and improved command-line control
  akselx
  committed
  287ad62
Commits on May 20, 2025
- Ensure modifications are applied to deep copy of modelrun_data
  jdahren
  committed
  c65410c
- Merge branch 'metrics_fixes' of https://github.com/BayAreaMetro/bayarea_urbansim into metrics_fixes
  jdahren
  committed
  7a1a967
Commits on May 21, 2025
- Refactor expand_urban_greening to append scenario-specific populations
  jdahren
  committed
  ba45fba
- Remove EIR Alt2 variant from mapping
  jdahren
  committed
  d075c85
- Use append_output arg for expand_urban_greening
  jdahren
  committed
  74bfdbc
- add QAQC steps
  yuqiww
  committed
  676846c
Commits on May 22, 2025
- merge metrics_fixes into fbp_mod_updates, leaving superseded changes to baus.py behind
  akselx
  committed
  86e1480
Commits on May 23, 2025
Commits on Jun 25, 2025
- Add PBA50+ input documentation
  jdahren
  committed
  9f604cf
- Copy Yuqi's input notes into doc
  jdahren
  committed
  0141db7
Commits on Jun 27, 2025
- Write tables needed for TM summary in 2030/2040 to interim dir
  jdahren
  committed
  3cb1be7
Commits on Jun 30, 2025
- Add alt TM summaries for 2030/2040
  jdahren
  committed
  f8e90f0
Commits on Jul 1, 2025
- Call alt TM summaries in baus.py after run_models()
  jdahren
  committed
  a4a8c98
Commits on Jul 4, 2025
- Explicitly set index to summarize by
  jdahren
  committed
  957bedc
Commits on Jul 8, 2025
- Add PBA50+ to docs nav bar
  jdahren
  committed
  4b04bf3
- Add GitHub action workflow to push gh-pages
  jdahren
  committed
  b68f7d6
- GitHub action test
  jdahren
  committed
  0d39f85
Commits on Jul 10, 2025
- Add docstrings through interim years hack
  jdahren
  committed
  62f6bb7
Commits on Jul 14, 2025
- Merge pull request #395 from BayAreaMetro/fbp_mod_updates_debug
  akselx
  authored
  502d76c
Commits on Jul 18, 2025
Commits on Aug 14, 2025
- Add county-level option for DR affordable metric
  jdahren
  committed
  54f30cb
Commits on Aug 20, 2025
- Add county-level output for growth patterns by geo
  jdahren
  committed
  36339c7
- Add county-level output for new dev in UGB
  jdahren
  committed
  0059fb2
Commits on Aug 28, 2025
- Added detail to log file; lower casing of zoningmod columns for more consistent and safer treatment; more flexible defaults set in yaml
  akselx
  committed
  d44f10a
- add "horizon_year" arg to allow calculating growth patterns for a given future year, e.g. 2035
  yuqiww
  committed
  27cdae9
Commits on Oct 10, 2025
Commits on Oct 24, 2025
- Helper script for exploring H5 baseyear data
  jdahren
  committed
  f25c138
- Add docstring to limits_settings()
  jdahren
  committed
  4ffd216
Commits on Nov 14, 2025
- Update to May version of TOC parcel assignment
  jdahren
  committed
  6c8b8a2
Commits on Jan 29, 2026
- Check in map layer script for pba50 plus modeling report
  jdahren
  committed
  ffe378c
- Add caching for parcel geometries
  jdahren
  committed
  22a61fb
Commits on Jan 30, 2026
- Add readme for map production/storage
  jdahren
  committed
  f2208e4
- Update readme
  jdahren
  committed
  643f0b4
- Fix for UGB np/plan discrepancy
  jdahren
  committed
  65377e7
- Clean up imports
  jdahren
  committed
  711537e
Commits on Feb 27, 2026
- minor fix
  yuqiww
  committed
  9188533
- script to summarize metrics for CARB SCS data reporting
  yuqiww
  committed
  9aa9289
Commits on Mar 13, 2026
- create parcels10 crosswalk for 2035 high-quality transit stops/stations
  yuqiww
  committed
  93eb0ee
- add 2035 high-quality transit stop summary
  yuqiww
  committed
  f32ade0
- add horizon year to output file name
  yuqiww
  committed
  db1c03f
Commits on Apr 29, 2026
- Merge main enhancements into fbp_mod_updates (via main_dev)
  akselx
  committed
  9473f90
- Use main version of baus.py
  akselx
  committed
  ade729c
- reconciled leftover conflict in travel_model_summaries
  akselx
  committed
  297df48
- updated requiremetns to BAM fork of urbansim_defaults, per PR #384
  akselx
  committed
  275d023
Commits on Apr 30, 2026
- updated env to include bayareametro fork of urbansim library - See #384 for deets
  akselx
  committed
  a3cf621
Commits on May 1, 2026
- Pin pip urbansim install to master branch
  akselx
  committed
  37313cb
- removed conflicting conda version of urbansim - now using master branch of bayareametro/urbansim
  akselx
  committed
  f463c08
Commits on May 2, 2026
- Restore core_summaries.py to main version
  akselx
  committed
  92815dd
Commits on May 4, 2026
- added random seed to log for debugging
  akselx
  committed
  9164888
Commits on May 7, 2026
- Specify static parcels using parcel_id, not geom_id
  
  lmz
  authored and
  akselx
  committed
  61ad245
- adding back legion of honor, additional fars to run feasibility for, per #304af74
  akselx
  committed
  bed3067
Commits on Jun 20, 2026
- minor refactoring of interim_zone_output to also have interim_tract_output
  akselx
  committed
  8c04eb8
Commits on Jun 26, 2026
- adding back timestamp to logging config
  akselx
  committed
  5988879
Commits on Aug 21, 2026
- Fix Slack flag using bitwise inversion instead of boolean negation to avoid always-on status
  akselx
  committed
  b5bd8ce

Commits

Commits on Jul 30, 2024

Commits on Nov 19, 2024

Commits on Dec 21, 2024

Commits on Jan 31, 2025

Commits on Feb 4, 2025

Commits on Feb 5, 2025

Commits on Feb 6, 2025

Commits on Feb 7, 2025

Commits on Feb 11, 2025

Commits on Feb 12, 2025

Commits on Feb 14, 2025

Commits on Feb 21, 2025

Commits on Feb 24, 2025

Commits on Feb 26, 2025

Commits on Mar 4, 2025

Commits on Mar 7, 2025

Commits on Mar 9, 2025

Commits on Mar 10, 2025

Commits on Mar 13, 2025

Commits on Mar 14, 2025

Commits on Mar 15, 2025

Commits on Mar 17, 2025

Commits on Mar 18, 2025

Commits on Mar 19, 2025

Commits on Mar 21, 2025

Commits on Mar 22, 2025

Commits on Mar 24, 2025

Commits on Mar 25, 2025

Commits on Mar 26, 2025

Commits on Mar 28, 2025

Commits on Apr 1, 2025

Commits on Apr 3, 2025

Commits on Apr 4, 2025

Commits on Apr 8, 2025

Commits on Apr 10, 2025

Commits on Apr 11, 2025

Commits on Apr 14, 2025

Commits on Apr 15, 2025

Commits on Apr 22, 2025

Commits on Apr 23, 2025

Commits on Apr 24, 2025

Commits on Apr 25, 2025

Commits on Apr 26, 2025

Commits on Apr 27, 2025

Commits on Apr 30, 2025

Commits on May 1, 2025

Commits on May 2, 2025

Commits on May 3, 2025