Skip to content

Better handle the pre-time path population distribution #1073

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

Draft
jdebacker wants to merge 15 commits into
base: master
Choose a base branch
from
Draft

Better handle the pre-time path population distribution #1073

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
6d29d93
update aggregates to use new preTP objects
jdebacker Nov 16, 2025
b2d0ba3
preTP objects in defaults
jdebacker Nov 16, 2025
70a6a38
compute preTP objects in get_pop_objs
jdebacker Nov 16, 2025
7871c19
add new params to constant demographics config
jdebacker Nov 16, 2025
cde87dc
place proper shape pre-TP values
jdebacker Nov 16, 2025
79fbe69
lenght
jdebacker Nov 16, 2025
f6e4a0e
slice in test
jdebacker Nov 16, 2025
b07d609
temp commit
jdebacker Nov 18, 2025
f3485f7
Merge remote-tracking branch 'upstream/master' into prepop
jdebacker Dec 16, 2025
5c27e96
format
jdebacker Dec 16, 2025
891f170
fix fixper, remove pre_pop references
jdebacker Dec 16, 2025
1a7b557
include preTP objects in aggregates tests
jdebacker Dec 16, 2025
18510ce
make preTP default values consistent
jdebacker Dec 16, 2025
4252943
update testing params and constant demographics for pre TP objects
jdebacker Dec 17, 2025
575bb01
change period for imm
jdebacker Dec 22, 2025
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
10 changes: 5 additions & 5 deletions ogcore/aggregates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ def get_B(b, p, method, preTP):
if preTP:
part1 = b * np.transpose(p.omega_S_preTP * p.lambdas)
omega_extended = np.append(p.omega_S_preTP[1:], [0.0])
imm_extended = np.append(p.imm_rates[0, 1:], [0.0])
pop_growth_rate = p.g_n[0]
imm_extended = np.append(p.imm_rates_preTP[1:], [0.0])
pop_growth_rate = p.g_n_preTP
else:
part1 = b * np.transpose(p.omega_SS * p.lambdas)
omega_extended = np.append(p.omega_SS[1:], [0.0])
Expand Down Expand Up @@ -189,8 +189,8 @@ def get_BQ(r, b_splus1, j, p, method, preTP):
if method == "SS":
if preTP:
omega = p.omega_S_preTP
pop_growth_rate = p.g_n[0]
rho = p.rho[0, :]
pop_growth_rate = p.g_n_preTP
rho = p.rho_preTP
else:
omega = p.omega_SS
pop_growth_rate = p.g_n_ss
Expand All @@ -206,7 +206,7 @@ def get_BQ(r, b_splus1, j, p, method, preTP):
p.omega_S_preTP.reshape(1, p.S), p.omega[: p.T - 1, :], axis=0
)
rho = np.append(
p.rho[0, :].reshape(1, p.S), p.rho[: p.T - 1, :], axis=0
p.rho_preTP.reshape(1, p.S), p.rho[: p.T - 1, :], axis=0
)

if j is not None:
Expand Down
98 changes: 96 additions & 2 deletions ogcore/default_parameters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4531,8 +4531,7 @@
"value": [
{
"value": [0.017479913702712725, 0.017252673721361574, 0.017313468985451712, 0.01741734467720022, 0.017610836147653894, 0.018037326972746067, 0.018428614504312973, 0.018731212768297128, 0.019223877430412158, 0.019533665622202632, 0.019434917008899554, 0.018636460788059497, 0.018161740350649384, 0.017819885884360336, 0.017856106761386912, 0.017939064896242172, 0.0173584158450137, 0.01759326731381578, 0.017556092457882918, 0.017348831455567988, 0.01763610875892841, 0.016521134511611055, 0.01616493583053726, 0.015964729480990054, 0.015477015195103342, 0.01591654299984056, 0.01539650128360123, 0.01561223197188071, 0.016292741432876165, 0.017193018202081137, 0.01736681745887612, 0.016428597852015135, 0.01605376707200027, 0.016036840400303197, 0.016306172531601798, 0.017250621809611313, 0.017536449193224023, 0.017487907335860874, 0.017416472477538542, 0.017590642752769312, 0.01769271828193883, 0.017056672755048446, 0.016903326974848074, 0.016655018441783655, 0.01601349080436947, 0.015817814264164037, 0.015095305117520927, 0.014438237313875455, 0.013801453267642878, 0.013298311958716617, 0.012889796775514745, 0.012405992316545383, 0.012171305937986552, 0.012537090181191982, 0.009140572473656714, 0.008895104621663985, 0.00854997250414294, 0.008604276207804186, 0.007359240011714394, 0.0065857742259522725, 0.00608824742682594, 0.005584969530483296, 0.005194883294310685, 0.00463722646525393, 0.004268302269151332, 0.003921275687879491, 0.003360617443596329, 0.00307989603033834, 0.0027689270722019797, 0.002464564334019259, 0.002189389475001142, 0.001817465282607566, 0.0015516186002795162, 0.001280287314428285, 0.0010211214995148833, 0.0008163607706652746, 0.0006238227539144882, 0.0004616610853196622, 0.0003378106654761438, 0.00023711271717107317]
}
],
} ],
"validators": {
"range": {
"min": 0.0,
Expand Down Expand Up @@ -4577,6 +4576,24 @@
}
}
},
"g_n_preTP": {
"title": "Population growth rate from year before model start to start year",
"description": "Population growth rate from year before model start to start year.",
"section_1": "Demographic Parameters",
"notes": "",
"type": "float",
"value": [
{
"value": 0.0074789353843102225
}
],
"validators": {
"range": {
"min": -1.0,
"max": 1.0
}
}
},
"imm_rates": {
"title": "Immigration rates over the time path.",
"description": "Immigration rates over the time path.",
Expand All @@ -4598,6 +4615,45 @@
}
}
},
"imm_rates_preTP": {
"title": "Immigration rates in period before model start year",
"description": "Immigration rates in period before model start year.",
"section_1": "Demographic Parameters",
"notes": "",
"type": "float",
"number_dims": 1,
"value": [
{
"value":
[6.21124324e-03, 6.69539127e-03, 7.24160599e-03, 7.59057707e-03,
7.64614775e-03, 7.51951110e-03, 7.06681489e-03, 6.56429771e-03,
6.07319754e-03, 5.50700033e-03, 4.94732741e-03, 4.54958259e-03,
4.23425001e-03, 3.97403995e-03, 3.67752183e-03, 3.38021287e-03,
3.00514338e-03, 2.71916344e-03, 2.41686669e-03, 2.13548533e-03,
1.86850952e-03, 1.63930855e-03, 1.45713458e-03, 1.34212247e-03,
1.27164811e-03, 9.88138261e-04, 8.42267890e-04, 7.97801211e-04,
6.63231805e-04, 4.87948389e-04, 4.32979019e-04, 5.60040782e-04,
4.55369916e-04, 4.13717216e-04, 4.55029226e-04, 4.52104109e-04,
5.58645176e-04, 6.14631276e-04, 5.66684121e-04, 5.11408015e-04,
4.68968748e-04, 4.86541731e-04, 1.87084644e-04, -2.33525940e-05,
1.21315737e-03, 1.05324177e-03, 8.29011129e-07, -1.80456466e-04,
6.44696838e-04, 1.08838720e-03, 6.18137660e-04, 4.41473826e-04,
6.10186803e-04, 6.58633423e-04, 5.63207404e-04, 5.34295717e-04,
6.00114993e-04, 6.29050763e-04, 8.43098879e-04, 9.20493620e-04,
9.68908696e-04, 1.26374022e-03, 1.60616956e-03, 1.72840304e-03,
1.50429547e-03, 1.03459297e-03, 8.01449649e-04, 9.28625040e-04,
1.60993336e-03, 2.23227102e-03, 3.53451125e-03, 5.32480275e-03,
7.84622608e-03, 1.08220386e-02, 1.30810434e-02, 1.64519720e-02,
1.88010017e-02, 2.12725905e-02, 2.17955114e-02, 1.92400972e-02]
}
],
"validators": {
"range": {
"min": -1.0,
"max": 1.0
}
}
},
"rho": {
"title": "Age-specific mortality rates.",
"description": "Age-specific mortality rates.",
Expand All @@ -4617,6 +4673,44 @@
}
}
},
"rho_preTP": {
"title": "Age-specific mortality rates.",
"description": "Age-specific mortality rates.",
"section_1": "Demographic Parameters",
"notes": "",
"type": "float",
"number_dims": 1,
"value": [
{
"value": [7.32853396e-04, 8.17119742e-04, 8.78872967e-04, 9.11652521e-04,
9.22980233e-04, 9.27340681e-04, 9.35710239e-04, 9.50095370e-04,
9.75973557e-04, 1.01035546e-03, 1.04974597e-03, 1.08965056e-03,
1.12905646e-03, 1.16544560e-03, 1.20432393e-03, 1.25117739e-03,
1.31100453e-03, 1.38282557e-03, 1.46963538e-03, 1.57292023e-03,
1.69015991e-03, 1.82531513e-03, 1.98785868e-03, 2.18224842e-03,
2.40545835e-03, 2.64949570e-03, 2.91235990e-03, 3.19652189e-03,
3.50144041e-03, 3.82658531e-03, 4.17597720e-03, 4.54600008e-03,
4.92938669e-03, 5.32344068e-03, 5.73216261e-03, 6.18294920e-03,
6.66506301e-03, 7.14289275e-03, 7.60533472e-03, 8.07929361e-03,
8.60718380e-03, 9.21954043e-03, 9.91697732e-03, 1.07137947e-02,
1.16186807e-02, 1.26511756e-02, 1.38062007e-02, 1.50692314e-02,
1.64399087e-02, 1.79462854e-02, 1.96828400e-02, 2.16430913e-02,
2.37466335e-02, 2.59837193e-02, 2.84282734e-02, 3.12585980e-02,
3.45111290e-02, 3.80870625e-02, 4.19924732e-02, 4.63268386e-02,
5.13310180e-02, 5.70418578e-02, 6.33201548e-02, 7.01769632e-02,
7.77688358e-02, 8.62903314e-02, 9.59061899e-02, 1.06724255e-01,
1.18798575e-01, 1.32125256e-01, 1.46682823e-01, 1.62432478e-01,
1.79326966e-01, 1.97313414e-01, 2.16339448e-01, 2.35357633e-01,
2.54059844e-01, 2.72119171e-01, 2.89195180e-01, 1.00000000e+00]
}
],
"validators": {
"range": {
"min": 0.0,
"max": 1.0
}
}
},
"etr_params": {
"title": "Effective tax rate function parameters.",
"description": "Effective tax rate function parameters.",
Expand Down
Loading
Loading