From d5b47621b90cd5a359ca2fc10e36a45381f56810 Mon Sep 17 00:00:00 2001 From: Richard Evans Date: Fri, 13 Sep 2024 00:39:21 -0600 Subject: [PATCH] Updated test_TPI.py --- tests/test_TPI.py | 10 ++++++---- .../test_io_data/firstdoughnutring_inputs.pkl | Bin 4928 -> 4971 bytes 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/test_TPI.py b/tests/test_TPI.py index 6ca514ec7..a1b24eeec 100644 --- a/tests/test_TPI.py +++ b/tests/test_TPI.py @@ -95,11 +95,11 @@ def test_firstdoughnutring(): input_tuple = utils.safe_read_pickle( os.path.join(CUR_PATH, "test_io_data", "firstdoughnutring_inputs.pkl") ) - guesses, r, w, bq, tr, theta, factor, ubi, j, initial_b = input_tuple + guesses, r, w, bq, rm, tr, theta, factor, ubi, j, initial_b = input_tuple p_tilde = 1.0 # needed for multi-industry version p = Specifications() test_list = TPI.firstdoughnutring( - guesses, r, w, p_tilde, bq, tr, theta, factor, ubi, j, initial_b, p + guesses, r, w, p_tilde, bq, rm, tr, theta, factor, ubi, j, initial_b, p ) expected_list = utils.safe_read_pickle( @@ -139,6 +139,7 @@ def test_twist_doughnut(file_inputs, file_outputs): r, w, bq, + rm, tr, theta, factor, @@ -154,12 +155,13 @@ def test_twist_doughnut(file_inputs, file_outputs): ) = input_tuple p_tilde = np.ones_like(r) # needed for multi-industry version p = Specifications() - input_tuple = ( + input_tuple2 = ( guesses, r, w, p_tilde, bq, + rm, tr, theta, factor, @@ -173,7 +175,7 @@ def test_twist_doughnut(file_inputs, file_outputs): initial_b, p, ) - test_list = TPI.twist_doughnut(*input_tuple) + test_list = TPI.twist_doughnut(*input_tuple2) expected_list = utils.safe_read_pickle(file_outputs) assert np.allclose(np.array(test_list), np.array(expected_list), atol=1e-5) diff --git a/tests/test_io_data/firstdoughnutring_inputs.pkl b/tests/test_io_data/firstdoughnutring_inputs.pkl index 9aa01c5cb4f551ec82a84beb99b5f470b1b63316..622ffe5f31b67f15c1bfaf1b7b4fa17c71f76f6d 100644 GIT binary patch delta 112 zcmX@0_F9dlfn{pKM3%LaCon2IIdep^i3ESXxW;};+mxUw8KM~y&KxZBr2gve_=GIP oDZgGuTwx1D$ejTSK*}e+&JY3W>78(j!Jz231KgO+>5Ml80n&6QF#rGn delta 101 zcmaE@c0i4#fn}=cM3%Ky{LUPaY$Cy*FRrnl(l#Y%N``0#P>5xo)L-2lpOA$(<=4xI fD{MgsO%`L!5CN*~op6f5py;;)T>Iupj5h@VN~t8P