Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update OBR forecast #837

Closed
wants to merge 12 commits into from
Closed

Update OBR forecast #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
386aa4b
Add receipt of State Pension to SP age formula
nikhilwoodruff Mar 8, 2024
6980477
Fix NANs in 2026-27
nikhilwoodruff Mar 11, 2024
a57cfdc
Versioning and calibration improvements
nikhilwoodruff Mar 11, 2024
1cfba18
Merge branch 'master' of https://github.com/PolicyEngine/openfisca-uk…
nikhilwoodruff Mar 11, 2024
48943b0
Add basic SPI progress for later
nikhilwoodruff Mar 17, 2024
efc21fd
Add OBR forecast update (start)
nikhilwoodruff Mar 18, 2024
f9d9a1c
Update documentation and start adding targets
nikhilwoodruff Mar 19, 2024
c293ced
Add progress
nikhilwoodruff Mar 21, 2024
662cdc9
Add forecast updates and fix bugs
nikhilwoodruff Mar 21, 2024
8d21c95
Add changes
nikhilwoodruff Mar 28, 2024
72c4d60
Format
nikhilwoodruff Mar 28, 2024
b543a9b
Update calibration routine
nikhilwoodruff Apr 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,5 @@ policyengine_uk/calibration/*.h5
**/*.log
**/ukmod.json
*.ipynb

**.tfevents*
11 changes: 11 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,14 @@ changelog:
bump-version changelog.yaml setup.py
rm changelog_entry.yaml || true
touch changelog_entry.yaml

imputations:
python policyengine_uk/data/datasets/frs/imputations/consumption.py
python policyengine_uk/data/datasets/frs/imputations/wealth.py
python policyengine_uk/data/datasets/frs/imputations/income.py

dashboard-data:
python policyengine_uk/data/datasets/frs/calibration/dashboard/update_dashboard.py

dashboard:
cd policyengine_uk/data/datasets/frs/calibration/dashboard && streamlit run app.py
3 changes: 3 additions & 0 deletions calibrate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from policyengine_uk.data import CalibratedSPIEnhancedPooledFRS_2019_21

CalibratedSPIEnhancedPooledFRS_2019_21().generate()
8 changes: 5 additions & 3 deletions changelog_entry.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
- bump: minor
changes:
added:
- Add test cases for housing benefit
changes:
fixed:
- Bugs in carbon tax modules for 2026-27 causing NANs.
added:
- Calibration dashboard.
23 changes: 7 additions & 16 deletions policyengine_uk/data/datasets/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,27 @@
FRS_2020_21,
FRS_2021_22,
RawFRS_2021_22,
PooledFRS_2018_20,
PooledFRS_2019_21,
SPIEnhancedFRS_2019_20,
SPIEnhancedPooledFRS_2018_20,
SPIEnhancedPooledFRS_2019_21,
CalibratedFRS_2019_20,
CalibratedFRS_2019_21,
CalibratedSPIEnhancedFRS_2019_20,
CalibratedSPIEnhancedPooledFRS_2018_20,
CalibratedSPIEnhancedPooledFRS_2019_21,
ImputationExtendedFRS_2019_21,
EnhancedFRS,
UKMOD_FRS_2018,
UpratedFRS_2021,
)

from .spi import RawSPI_2019, SPI_2019

DATASETS = [
FRS_2018_19,
FRS_2019_20,
FRS_2020_21,
FRS_2021_22,
UpratedFRS_2021,
RawFRS_2021_22,
PooledFRS_2018_20,
PooledFRS_2019_21,
SPIEnhancedFRS_2019_20,
SPIEnhancedPooledFRS_2018_20,
SPIEnhancedPooledFRS_2019_21,
CalibratedFRS_2019_20,
CalibratedFRS_2019_21,
CalibratedSPIEnhancedFRS_2019_20,
CalibratedSPIEnhancedPooledFRS_2018_20,
CalibratedSPIEnhancedPooledFRS_2019_21,
ImputationExtendedFRS_2019_21,
EnhancedFRS,
UKMOD_FRS_2018,
SPI_2019,
]
14 changes: 4 additions & 10 deletions policyengine_uk/data/datasets/frs/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,12 @@
from .frs import FRS, FRS_2018_19, FRS_2019_20, FRS_2020_21, FRS_2021_22
from .spi_enhanced_frs import (
SPIEnhancedFRS,
SPIEnhancedFRS_2019_20,
SPIEnhancedPooledFRS_2018_20,
SPIEnhancedPooledFRS_2019_21,
)
from .calibration.calibrated_frs import (
CalibratedFRS,
CalibratedFRS_2019_20,
CalibratedFRS_2019_21,
CalibratedSPIEnhancedFRS_2019_20,
CalibratedSPIEnhancedPooledFRS_2018_20,
CalibratedSPIEnhancedPooledFRS_2019_21,
EnhancedFRS,
)
from .stacked_frs import StackedFRS, PooledFRS_2018_20, PooledFRS_2019_21
from .enhanced_frs import EnhancedFRS
from .stacked_frs import StackedFRS, PooledFRS_2019_21
from .imputation_extended_frs import ImputationExtendedFRS_2019_21
from .ukmod import UKMOD_FRS_2018
from .uprated_frs import UpratedFRS_2021
Loading
Loading