Skip to content

Commit ee14a00

Browse files
committed
version bump
1 parent 5268d7c commit ee14a00

4 files changed

Lines changed: 18 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88

9+
## [0.14.12] - 2025-11-07 12:00:00
10+
11+
### Bug Fix
12+
13+
- Use data for pre-time path population distribution (rather than inferring it) ((PR #1071)[https://github.com/PSLmodels/OG-Core/pull/1071])
14+
915
## [0.14.11] - 2025-11-07 12:00:00
1016

1117
### Added
1218

13-
- Adds Ethiopia demographic data mapping ((PR #1054)[https://github.com/PSLmodels/OG-Core/pull/1063])
19+
- Adds Ethiopia demographic data mapping ((PR #1063)[https://github.com/PSLmodels/OG-Core/pull/1063])
1420
-
1521
## [0.14.10] - 2025-09-11 12:00:00
1622

ogcore/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@
2020
from ogcore.txfunc import *
2121
from ogcore.utils import *
2222

23-
__version__ = "0.14.11"
23+
__version__ = "0.14.12"

ogcore/demographics.py

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1046,7 +1046,6 @@ def get_pop_objs(
10461046
# print("Max diff = ", np.abs(pop_2D[0, :] - initial_pop_counter).max())
10471047
# # assert np.allclose(initial_pop_counter, pop_2D[0, :])
10481048

1049-
10501049
"""
10511050
NEW CODE - use the actual UN historical data instead of solving backwards
10521051
"""
@@ -1061,26 +1060,23 @@ def get_pop_objs(
10611060
initial_pop_counter = np.zeros(E + S)
10621061
newborns = (fert_rates[0, :] * pre_pop_EpS[:]).sum()
10631062
initial_pop_counter[0] = (
1064-
1 - infmort_rates[0]
1063+
1 - infmort_rates[0]
10651064
) * newborns + imm_rates_orig[0, 0] * pre_pop_EpS[0]
10661065
initial_pop_counter[1:] = (
1067-
pre_pop_EpS[:-1] * (1 - mort_rates[0, :-1])
1068-
+ pre_pop_EpS[1:] * imm_rates_orig[0, 1:]
1066+
pre_pop_EpS[:-1] * (1 - mort_rates[0, :-1])
1067+
+ pre_pop_EpS[1:] * imm_rates_orig[0, 1:]
10691068
)
10701069

10711070
max_diff = np.abs(pop_2D[0, :] - initial_pop_counter).max()
1072-
print(
1073-
"Pre-period population verification: Max diff = ",
1074-
max_diff
1075-
)
1071+
print("Pre-period population verification: Max diff = ", max_diff)
10761072

10771073
if max_diff > 100_000:
10781074
print(
1079-
"WARNING: Large difference between UN pre-period population "
1080-
+ "and period 0 population ({:.2f}). ".format(max_diff)
1081-
+ "This may indicate inconsistencies in the data or "
1082-
+ "immigration rate calculations, but using UN historical "
1083-
+ "data as it is more reliable than backward-solved estimates."
1075+
"WARNING: Large difference between UN pre-period population "
1076+
+ "and period 0 population ({:.2f}). ".format(max_diff)
1077+
+ "This may indicate inconsistencies in the data or "
1078+
+ "immigration rate calculations, but using UN historical "
1079+
+ "data as it is more reliable than backward-solved estimates."
10841080
)
10851081

10861082
# Create the transition matrix for the population distribution

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
setuptools.setup(
77
name="ogcore",
8-
version="0.14.11",
8+
version="0.14.12",
99
author="Jason DeBacker and Richard W. Evans",
1010
license="CC0 1.0 Universal (CC0 1.0) Public Domain Dedication",
1111
description="A general equilibrium overlapping generations model for fiscal policy analysis",

0 commit comments

Comments
 (0)