Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f4e7ce9
Add OBR-grounded TPI charts and fix transition path mapping
nikhilwoodruff Mar 4, 2026
e81f37f
Backfill pre-2008-09 history in charts from ONS calendar-year series
nikhilwoodruff Mar 4, 2026
14dbadb
Fix reform line: assign fy_labels to pct Series index before building…
nikhilwoodruff Mar 4, 2026
aa2af22
Cut T from 160 to 60 to reduce TPI runtime
nikhilwoodruff Mar 4, 2026
37bc986
Use df-sane solver and all CPUs for Dask workers
nikhilwoodruff Mar 4, 2026
59c274a
Revert df-sane solver: diverges on OLG system, keep hybr
nikhilwoodruff Mar 4, 2026
f8f5279
Add CT +1pp case study: scripts, calibration fix, and outputs
nikhilwoodruff Mar 5, 2026
df43418
Fix MTR calculation to use hbai_household_net_income
nikhilwoodruff Mar 6, 2026
54937fe
Remove CT policy experiment scripts and fix lint errors
nikhilwoodruff Mar 10, 2026
6da9413
Apply ruff formatting
nikhilwoodruff Mar 10, 2026
a619ecd
Pin jupyter-book<2 to fix docs build (v2 broke old CLI)
nikhilwoodruff Mar 10, 2026
1704689
Fix docs build: use jb CLI instead of python -m jupyter_book
nikhilwoodruff Mar 10, 2026
3aad82c
Add SKILL.md: Claude Code guide for running OG-UK policy scores
nikhilwoodruff Mar 10, 2026
f8eed2a
Add param_overrides to run_transition_path() and productivity headroo…
nikhilwoodruff Mar 10, 2026
f606f56
Add 8-sector industry calibration (M=8, SIC-based)
nikhilwoodruff Mar 11, 2026
0b932a6
Fix ruff lint errors: sort imports and rename ambiguous variable
nikhilwoodruff Mar 11, 2026
a3f0598
Apply ruff formatting to industry_params.py
nikhilwoodruff Mar 11, 2026
a25d819
Remove CT charts HTML and productivity headroom script from PR
nikhilwoodruff Mar 11, 2026
20453f8
Add sector heterogeneity: CES elasticities, Solow-residual TFP, and I…
vahid-ahmadi Mar 17, 2026
637a449
Apply ruff formatting to industry_params.py
vahid-ahmadi Mar 17, 2026
3d31f38
Tune sector heterogeneity for TPI stability and fix chart alignment bug
vahid-ahmadi Mar 19, 2026
a314659
Add per-industry TPI impacts with historical outturn charts
vahid-ahmadi Mar 19, 2026
403fdc5
Fix ruff lint: move import, rename ambiguous vars, split statement
vahid-ahmadi Mar 19, 2026
61fa286
Apply ruff formatting to tpi_charts_plotly.py
vahid-ahmadi Mar 19, 2026
7452eef
Move Manufacturing to 8th (last) sector — capital good producer
vahid-ahmadi Mar 19, 2026
f5b1eab
Remove generated tpi_results.xlsx and tpi_charts.html from tracking
vahid-ahmadi Mar 19, 2026
1ad60ee
Revert .gitignore changes and remove SKILL.md from tracking
vahid-ahmadi Mar 19, 2026
12f856b
Revert examples/run_oguk.py to main branch version
vahid-ahmadi Mar 19, 2026
c1b6a23
Revert "Revert examples/run_oguk.py to main branch version"
vahid-ahmadi Mar 19, 2026
60757d9
Bump version to 0.3.1 and update CHANGELOG
nikhilwoodruff Mar 20, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/deploy_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:

- name: Build Jupyter Book
run: |
pip install jupyter-book>=0.11.3 sphinxcontrib-bibtex>=2.0.0
pip install "jupyter-book>=0.11.3,<2" sphinxcontrib-bibtex>=2.0.0
cd docs
python -m jupyter_book build ./book
jb build ./book

- name: Deploy
uses: JamesIves/github-pages-deploy-action@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:

- name: Build Jupyter Book
run: |
pip install jupyter-book>=0.11.3 sphinxcontrib-bibtex>=2.0.0
pip install "jupyter-book>=0.11.3,<2" sphinxcontrib-bibtex>=2.0.0
cd docs
python -m jupyter_book build ./book
jb build ./book
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0).

## [0.3.1] - 2026-03-20

### Added

* Extended calibration to an 8-sector multi-industry model: Energy, Manufacturing, Construction, Trade & Transport, Information & Finance, Real Estate, Business Services, and Public & Other.
* Added `oguk/industry_params.py` with `get_industry_params()` returning sector-specific capital shares, TFP, and production parameters calibrated from ONS data.
* Computed sector-level TFP as Solow residuals using ONS capital stocks by industry (CAPSTK) and workforce jobs by SIC (JOBS02), normalised so GVA-weighted mean equals 1.0.
* Added `run_tpi_and_export.py` to extract and export per-industry TPI results (`Y_m`, `K_m`, `L_m`, `p_m`) to `tpi_results.xlsx`.
* Added `tpi_charts_plotly.py` with sector-level transition path charts anchored to ONS historical outturn (GVA, capital stocks, workforce jobs from 2000) and projected forward using OBR nominal GDP growth.

## [0.3.0] - 2026-02-24

### Changed
Expand Down
2 changes: 1 addition & 1 deletion examples/run_oguk.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def run_tpi():

for i in indices:
print(
f"{int(impact.years[i]):<8}"
f"{str(impact.years[i]):<8}"
f" {impact.gdp_change[i]:>+7.1f}"
f" {impact.consumption_change[i]:>+7.1f}"
f" {impact.investment_change[i]:>+7.1f}"
Expand Down
16 changes: 15 additions & 1 deletion oguk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,30 @@
run_transition_path,
solve_steady_state,
)
from oguk.industry_params import (
ENERGY,
ENERGY_COST_SHARES,
SECTOR_NAMES,
SECTOR_SIC_SECTIONS,
M,
get_industry_params,
)

__version__ = "0.3.0"
__version__ = "0.3.1"
__all__ = [
"AGE_BRACKETS",
"CalibrationResult",
"ENERGY",
"ENERGY_COST_SHARES",
"M",
"MacroImpact",
"SECTOR_NAMES",
"SECTOR_SIC_SECTIONS",
"SteadyStateResult",
"TransitionMacroImpact",
"TransitionPathResult",
"calibrate",
"get_industry_params",
"map_to_real_world",
"map_transition_to_real_world",
"run_transition_path",
Expand Down
Loading
Loading