Conversation
Update for PlanBayArea2050+
…ed; and updated output_dir
Starting with No Project
Since the disk filled up during that run which may have messed it up
This will be useful for implementation of means-based policies that rely on poverty definition
…nsim.py rename and seed PUMA fix
…, update all references
…2_config.py
tm2_config.py:
- pums_current: TM1 -> PUMS_2021_5Year_Crosswalked, TM2 -> PUMS_2023_5Year_Crosswalked
- pums_households/pums_persons: TM1 -> 2017_2021 filenames, TM2 -> 2019_2023
- geo_crosswalk_base: TM1 -> geo_cross_walk_tm1.csv (no _maz suffix), TM2 unchanged
create_seed_population.py:
- main(): argparse --model_type {TM1,TM2} default TM2; reinit global config and
tm2_config.config so SeedPopulationConfig.__post_init__ sees correct paths
- _create_income_fields(): TM1 branch produces hh_income_2021 then hh_income_2000
(CPI-U 2021->2000: 172.2/258.8); TM2 retains existing hh_income_2023/hh_income_2010
- _finalize_household_data(): income_fields includes hh_income_2000 and hh_income_2021
guarded by 'if field in df.columns' so TM2 runs unchanged
docs/TM1_TM2_DUAL_MODE_PLAN.md: mark G10 done, Phase 0 ready-to-merge, Phase 4 partial
- Compress G1/G2/G3 gap sections: remove 'Status: Missing / Action: Copy' prose (done) - Compress G4: replace Options A/B/C deliberation with one-line decision (Option A chosen) - Update TM1 seed requirements table to reflect --model_type TM1 (commit aece8f1) - Update 'Key finding' box: gap is resolved, not pending - Replace 3-bullet Options section with 'Decision: Option A' one-liner - Remove Phase 0 pre-merge blocker table (G9/G10 both fixed) - Compress Phase 1/2 sections: remove Dependency notes and verbose steps (done) - Compress Phase 3: replace three-options deliberation with one-line summary - Mark Phase 4e done (create_seed_population.py --model_type TM1) - Remove §10.11 Files Examined (internal analysis notes, no longer needed) Net: -167 lines
Copied from master, one line changed:
Before: python create_seed_population.py
After: python create_seed_population.py --model_type !MODELTYPE!
Without this, MODELTYPE=TM1 in the BAT would create seed with TM2 settings
(2023 PUMS, 2020-vintage PUMAs) — mismatched with geo_cross_walk_tm1.csv.
All four BAT-called scripts now support both MODELTYPE=TM1 and MODELTYPE=TM2:
create_seed_population.py --model_type {TM1,TM2} (commit aece8f1)
add_hhgq_combined_controls.py --model_type {TM1,TM2} (commit fd124cd)
run_populationsim.py --config hh_gq/configs_{TM1,TM2} (commit 9205914)
postprocess_recode.py --model_type {TM1,TM2} (pre-existing)
Conflict: bay_area/run_populationsim.bat Resolution: keep tm2 version (has --model_type !MODELTYPE! on create_seed_population.py call) Master's BAT would have silently created seed with TM2 settings when MODELTYPE=TM1.
…hen merge to master, then modernize TM1
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
5 participants
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.
We'll fill in more for this, but this PR is to see what the diffs are