Merged
Conversation
…sector level in target naics
…ate/county data in prop attribution
…uppressed data up to the target sector level in FBS method
…ing suppressed data
# Conflicts: # flowsa/data_source_scripts/EPA_GHGI.py # flowsa/methods/flowbyactivitymethods/EPA_GHGI.yaml
…e sectors that exist in the flowbyactivity and those that most closely map to the target sectors
…ivities are sector-like
…activities to sectors
…th rather than string length for hosuehold and gov codes
…ctor-like to use the Activity column data
fix mapping subset when applied to parent-incompleteChild
Replaces derived use tables with benchmark year
Merged
|
The ghg_2025 branch has been updated. Somehow that will need to be merged in. |
Contributor
Author
Ghg 2025
…ore returning df in convert_naics_year() so allocation proceeds correctly
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.
Major changes:
adjust_dqi_reliability_collection_scores()to modify data reliability and data collection based on source and target sector levelsassign_temporal_correlation()assigns temporal DQ based on difference between year of data and target year of FBSassign_geographical_correlation()assigns DQ for geoscale based on data geoscale vs target FBS geoscaleassign_technological_correlation()assigns DQ scores based on difference between source and target sectors- Technological scores
- Modify data reliability and data collection scores after mapping
- Pull all NAICS6 and determine mapping changes for child naics to parent naics in generate_naics_crosswalk_conversion_ratios()
- For example, if we are converting NAICS4 across years, we identify all child NAICS6 and determine how those NAICS6 map between years. If there are 4 child NAICS6 and one child NAICS6 maps to a different parent NAICS4 in the target year, than ¼ of the original NAICS4 parent value is mapped to a different NAICS4 in the target year
• Conversion is not based on numeric values within the FBS because we might only have NAICS4 values, not NAICS6 and therefore do not have the data to create proportional conversions
- We previously mapped all activities to NAICS6+, then converted, then aggregated - problematic when assigning DQ scores
- Subsets sector key to return industry that most closely maps activity/source sectors to target sectors – drops parent sectors within crosswalk and assigns tech corr scoring, modifies datareliability and datacollection scores based on mapping
- Revised this function to check for the closest NAICS year to the target year and use that year to map to target NAICS
Minor changes:
FBA changes
FBS changes
Includes PR:
#441
#456