Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ jobs:
HUGGING_FACE_TOKEN: ${{ secrets.HUGGING_FACE_TOKEN }}
- name: Build datasets
run: make data
env:
TESTING: "1"
- name: Save calibration log (constituencies)
uses: actions/upload-artifact@v4
with:
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/push.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ jobs:
HUGGING_FACE_TOKEN: ${{ secrets.HUGGING_FACE_TOKEN }}
- name: Build datasets
run: make data
env:
TESTING: "1"
- name: Save calibration log (constituencies)
uses: actions/upload-artifact@v4
with:
Expand Down
8 changes: 7 additions & 1 deletion policyengine_uk_data/datasets/create_datasets.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from policyengine_uk_data.datasets.frs import create_frs
from policyengine_uk_data.storage import STORAGE_FOLDER
import logging
import os
from policyengine_uk.data import UKSingleYearDataset
from policyengine_uk_data.utils.uprating import uprate_dataset
from policyengine_uk_data.utils.progress import (
Expand All @@ -15,6 +16,10 @@
def main():
"""Create enhanced FRS dataset with rich progress tracking."""
try:
# Use reduced epochs and fidelity for testing
is_testing = os.environ.get("TESTING", "0") == "1"
epochs = 32 if is_testing else 512

progress_tracker = ProcessingProgress()

# Define dataset creation steps
Expand Down Expand Up @@ -123,6 +128,7 @@ def main():
# Run calibration with verbose progress
frs_calibrated_constituencies = calibrate_local_areas(
dataset=frs,
epochs=epochs,
matrix_fn=create_constituency_target_matrix,
national_matrix_fn=create_national_target_matrix,
area_count=650,
Expand All @@ -145,7 +151,7 @@ def main():
# Run calibration with verbose progress
frs_calibrated_las = calibrate_local_areas(
dataset=frs,
epochs=512,
epochs=epochs,
matrix_fn=create_local_authority_target_matrix,
national_matrix_fn=create_national_target_matrix,
area_count=360,
Expand Down
6 changes: 6 additions & 0 deletions policyengine_uk_data/datasets/imputations/wealth.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
"non_residential_property_value",
"savings",
"num_vehicles",
"student_loan_balance",
]


Expand Down Expand Up @@ -109,6 +110,8 @@ def generate_was_table(was: pd.DataFrame):
"DVTotinc_bhcR7": "household_net_income",
"DVSaValR7_aggr": "savings",
"vcarnr7": "num_vehicles",
"Tot_LosR7_aggr": "total_loans",
"Tot_los_exc_SLCR7_aggr": "total_loans_exc_slc",
}

RENAMES = {x.lower(): y for x, y in RENAMES.items()}
Expand Down Expand Up @@ -146,6 +149,9 @@ def generate_was_table(was: pd.DataFrame):
"unit_investment_trusts",
]
].sum(axis=1)
was["student_loan_balance"] = (
was["total_loans"] - was["total_loans_exc_slc"]
)
was["region"] = was["region"].map(REGIONS)
return was

Expand Down
Loading