refactor(eeio): remove waste_disagg and use_E_data_year gating#292
Draft
briantobin-99 wants to merge 1 commit intobtobin__cleanup-schema-gatingfrom
Draft
refactor(eeio): remove waste_disagg and use_E_data_year gating#292briantobin-99 wants to merge 1 commit intobtobin__cleanup-schema-gatingfrom
briantobin-99 wants to merge 1 commit intobtobin__cleanup-schema-gatingfrom
Conversation
Simplify derived_cornerstone.py: always compute waste disagg weights (no None guard), always use E data year for x in B. Remove get_waste_disagg_weights() returning None when disabled, remove 'weights is not None' guards from V, U, Ytot, VA, Aq functions. Simplify cornerstone_bea_intermediates.py B calculation. Delete TestFeatureOffRegression class and test_returns_none_when_disabled from waste disagg tests.
This was referenced Mar 20, 2026
Contributor
Author
Stack
|
This was referenced Mar 20, 2026
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
1 participant
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.
cc:
Closes:
What changed? Why?
Simplify
derived_cornerstone.py:get_waste_disagg_weights()now always returnsWasteDisaggWeights(removed| Nonereturn type and theif not cfg.implement_waste_disaggregation: return Noneguard). Removedif weights is not None:guards fromderive_cornerstone_V(),derive_cornerstone_U_with_negatives(),_derive_cornerstone_Ytot_with_trade(), andderive_cornerstone_VA(). Simplifiedderive_cornerstone_B_non_finetuned()andderive_cornerstone_Aq(). Updatedcornerstone_bea_intermediates.pyto unconditionally useusa_ghg_data_year. DeletedTestFeatureOffRegressionclass andtest_returns_none_when_disabledfrom waste disagg integration tests.Stack: 3/5 — depends on #2 (schema gating removal).
Testing
Simplified
test_waste_disagg_pipeline_integration.pyto remove disabled-feature regression tests. Existing EEIO tests pass.Made with Cursor