From e1ab01e74b6886ac47daea8e05bb2e743de37df1 Mon Sep 17 00:00:00 2001 From: jdebacker Date: Sat, 3 Aug 2024 08:31:54 -0400 Subject: [PATCH 1/2] ensure G and TR are T+S long --- ogcore/TPI.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ogcore/TPI.py b/ogcore/TPI.py index 20df7c6d5..1ae4873a4 100644 --- a/ogcore/TPI.py +++ b/ogcore/TPI.py @@ -665,9 +665,8 @@ def run_TPI(p, client=None): D_f = np.zeros(p.T + p.S) else: if p.baseline_spending: - TR = TRbaseline - G = Gbaseline - G[p.T :] = ss_vars["Gss"] + TR = np.concatenate((TRbaseline[:p.T], np.ones(p.S) * ss_vars["TR_ss"])) + G = np.concatenate((Gbaseline[:p.T], np.ones(p.S) * ss_vars["Gss"])) else: TR = p.alpha_T * Y G = np.ones(p.T + p.S) * ss_vars["Gss"] From 64d690c30f903b8ff69531f00f145ce53aa9d03f Mon Sep 17 00:00:00 2001 From: jdebacker Date: Mon, 5 Aug 2024 00:18:27 -0400 Subject: [PATCH 2/2] format --- ogcore/TPI.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ogcore/TPI.py b/ogcore/TPI.py index 1ae4873a4..15016fcd0 100644 --- a/ogcore/TPI.py +++ b/ogcore/TPI.py @@ -665,8 +665,12 @@ def run_TPI(p, client=None): D_f = np.zeros(p.T + p.S) else: if p.baseline_spending: - TR = np.concatenate((TRbaseline[:p.T], np.ones(p.S) * ss_vars["TR_ss"])) - G = np.concatenate((Gbaseline[:p.T], np.ones(p.S) * ss_vars["Gss"])) + TR = np.concatenate( + (TRbaseline[: p.T], np.ones(p.S) * ss_vars["TR_ss"]) + ) + G = np.concatenate( + (Gbaseline[: p.T], np.ones(p.S) * ss_vars["Gss"]) + ) else: TR = p.alpha_T * Y G = np.ones(p.T + p.S) * ss_vars["Gss"]