Skip to content
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

Python 3.6 compatibility #367

Merged
merged 30 commits into from
Apr 25, 2018
Merged

Python 3.6 compatibility #367

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
465e9e6
change xrange to range
jdebacker Apr 2, 2018
e963a9d
update print functions for python 3
jdebacker Apr 2, 2018
6ec397a
update parameters.py
jdebacker Apr 2, 2018
2cb8777
update cPickle imports
jdebacker Apr 2, 2018
619d4c4
update imports
jdebacker Apr 2, 2018
8db6e31
more import updates
jdebacker Apr 2, 2018
409ed40
more import updates
jdebacker Apr 2, 2018
3c491d4
update print and pickle calls in tests
jdebacker Apr 3, 2018
22ef87d
change dict iterator for 2 and 3 compliance
jdebacker Apr 3, 2018
aedf993
fix dict iterable
jdebacker Apr 3, 2018
cbc901a
make division return integers
jdebacker Apr 3, 2018
5586c35
update to read pickle in py 3
jdebacker Apr 3, 2018
aa5d432
pickle compatibility
jdebacker Apr 3, 2018
a6e5e72
updates to py3
jdebacker Apr 3, 2018
3097673
narrow range of acceptable param values so model solves in py 2 and py 3
jdebacker Apr 3, 2018
d99318f
replace fsolve with opt.root to avoid warnings
jdebacker Apr 3, 2018
91c0f82
clean up
jdebacker Apr 4, 2018
e5c0a08
clean up
jdebacker Apr 4, 2018
1e3fd6c
fix conflicts
jdebacker Apr 21, 2018
f7739a4
pass tax func type
jdebacker Apr 21, 2018
9328c04
change to read in pickle from py 2 to py3
jdebacker Apr 21, 2018
1705c9d
get T_Hss from solution
jdebacker Apr 21, 2018
0faa6a3
update env for not just python 2.7
jdebacker Apr 21, 2018
b738dc5
travis yml to include python 3.6
jdebacker Apr 21, 2018
59ee4a4
remove py 2.7 ref
jdebacker Apr 21, 2018
f1df950
remove ipython from environment
jdebacker Apr 22, 2018
9235571
add try and except to read pickles into py 2 or 3
jdebacker Apr 23, 2018
d19e5ed
test pickle changes
jdebacker Apr 23, 2018
0c345b0
create safe read pickle function
jdebacker Apr 24, 2018
08ac5d4
apply safe pickle read function to tests
jdebacker Apr 24, 2018
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
Prev Previous commit
Next Next commit
add try and except to read pickles into py 2 or 3
  • Loading branch information
@jdebacker
jdebacker committed Apr 23, 2018
commit 92355718025ed20d12977570a0897d7778473844
80 changes: 64 additions & 16 deletions ogusa/tests/test_SS.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ def test_SS_fsolve():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_fsolve_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
guesses, params = input_tuple
params = params + (None, 1)
(bssmat, nssmat, chi_params, ss_params, income_tax_params,
Expand All @@ -37,7 +40,10 @@ def test_SS_fsolve():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_fsolve_outputs.pkl'),
'rb') as f:
expected_list = pickle.load(f, encoding='latin1')
try:
expected_list = pickle.load(f, encoding='latin1')
except TypeError:
expected_list = pickle.load(f)
print('outputs = ', np.absolute(np.array(test_list) -
np.array(expected_list)).max())
assert(np.allclose(np.array(test_list), np.array(expected_list)))
Expand All @@ -49,7 +55,10 @@ def test_SS_fsolve_reform():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_fsolve_reform_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
guesses, params = input_tuple
params = params + (None, 1)
(bssmat, nssmat, chi_params, ss_params, income_tax_params,
Expand All @@ -64,7 +73,10 @@ def test_SS_fsolve_reform():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_fsolve_reform_outputs.pkl'),
'rb') as f:
expected_list = pickle.load(f, encoding='latin1')
try:
expected_list = pickle.load(f, encoding='latin1')
except TypeError:
expected_list = pickle.load(f)

assert(np.allclose(np.array(test_list), np.array(expected_list)))

Expand All @@ -76,7 +88,10 @@ def test_SS_fsolve_reform_baselinespend():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_fsolve_reform_baselinespend_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
guesses, params = input_tuple
params = params + (None, 1)
(bssmat, nssmat, T_Hss, chi_params, ss_params, income_tax_params,
Expand All @@ -91,7 +106,10 @@ def test_SS_fsolve_reform_baselinespend():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_fsolve_reform_baselinespend_outputs.pkl'),
'rb') as f:
expected_list = pickle.load(f, encoding='latin1')
try:
expected_list = pickle.load(f, encoding='latin1')
except TypeError:
expected_list = pickle.load(f)

assert(np.allclose(np.array(test_list), np.array(expected_list)))

Expand All @@ -102,7 +120,10 @@ def test_SS_solver():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_solver_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
(b_guess_init, n_guess_init, rss, T_Hss, factor_ss, Yss, params,
baseline, fsolve_flag, baseline_spending) = input_tuple
(bssmat, nssmat, chi_params, ss_params, income_tax_params,
Expand All @@ -117,7 +138,10 @@ def test_SS_solver():
with open(os.path.join(CUR_PATH,
'test_io_data/SS_solver_outputs.pkl'),
'rb') as f:
expected_dict = pickle.load(f, encoding='latin1')
try:
expected_dict = pickle.load(f, encoding='latin1')
except TypeError:
expected_dict = pickle.load(f)

for k, v in expected_dict.items():
assert(np.allclose(test_dict[k], v))
Expand All @@ -129,7 +153,10 @@ def test_inner_loop():
with open(os.path.join(CUR_PATH,
'test_io_data/inner_loop_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
(outer_loop_vars, params, baseline, baseline_spending) = input_tuple
ss_params, income_tax_params, chi_params, small_open_params = params
income_tax_params = ('DEP',) + income_tax_params
Expand All @@ -141,7 +168,10 @@ def test_inner_loop():
with open(os.path.join(CUR_PATH,
'test_io_data/inner_loop_outputs.pkl'),
'rb') as f:
expected_tuple = pickle.load(f, encoding='latin1')
try:
expected_tuple = pickle.load(f, encoding='latin1')
except TypeError:
expected_tuple = pickle.load(f)
for i, v in enumerate(expected_tuple):
assert(np.allclose(test_tuple[i], v))

Expand All @@ -152,7 +182,10 @@ def test_euler_equation_solver():
with open(os.path.join(CUR_PATH,
'test_io_data/euler_eqn_solver_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
(guesses, params) = input_tuple
(r, w, T_H, factor, j, J, S, beta, sigma, ltilde, g_y, g_n_ss,
tau_payroll, retire, mean_income_data, h_wealth, p_wealth,
Expand All @@ -170,7 +203,10 @@ def test_euler_equation_solver():
with open(os.path.join(CUR_PATH,
'test_io_data/euler_eqn_solver_outputs.pkl'),
'rb') as f:
expected_list = pickle.load(f, encoding='latin1')
try:
expected_list = pickle.load(f, encoding='latin1')
except TypeError:
expected_list = pickle.load(f)

assert(np.allclose(np.array(test_list), np.array(expected_list)))

Expand All @@ -180,14 +216,20 @@ def test_create_steady_state_parameters():
with open(os.path.join(CUR_PATH,
'test_io_data/create_params_inputs.pkl'),
'rb') as f:
input_dict = pickle.load(f, encoding='latin1')
try:
input_dict = pickle.load(f, encoding='latin1')
except TypeError:
input_dict = pickle.load(f)
input_dict['tax_func_type'] = 'DEP'
test_tuple = SS.create_steady_state_parameters(**input_dict)

with open(os.path.join(CUR_PATH,
'test_io_data/create_params_outputs.pkl'),
'rb') as f:
expected_tuple = pickle.load(f, encoding='latin1')
try:
expected_tuple = pickle.load(f, encoding='latin1')
except TypeError:
expected_tuple = pickle.load(f)
(income_tax_params, ss_params, iterative_params, chi_params,
small_open_params) = expected_tuple
income_tax_params = ('DEP', ) + income_tax_params
Expand Down Expand Up @@ -215,7 +257,10 @@ def test_run_SS(input_path, expected_path):
# ensure that output returned matches what it has been before.
with open(os.path.join(CUR_PATH, 'test_io_data', input_path),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
(income_tax_params, ss_params, iterative_params, chi_params,
small_open_params, baseline, baseline_spending, baseline_dir) =\
input_tuple
Expand All @@ -226,7 +271,10 @@ def test_run_SS(input_path, expected_path):

with open(os.path.join(CUR_PATH, 'test_io_data', expected_path),
'rb') as f:
expected_dict = pickle.load(f, encoding='latin1')
try:
expected_dict = pickle.load(f, encoding='latin1')
except TypeError:
expected_dict = pickle.load(f)

for k, v in expected_dict.items():
assert(np.allclose(test_dict[k], v))
40 changes: 32 additions & 8 deletions ogusa/tests/test_TPI.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,10 @@ def test_firstdoughnutring():
with open(os.path.join(CUR_PATH,
'test_io_data/firstdoughnutring_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
guesses, r, w, b, BQ, T_H, j, params = input_tuple
income_tax_params, tpi_params, initial_b = params
tpi_params = tpi_params + [True]
Expand All @@ -48,7 +51,10 @@ def test_firstdoughnutring():
with open(os.path.join(CUR_PATH,
'test_io_data/firstdoughnutring_outputs.pkl'),
'rb') as f:
expected_list = pickle.load(f, encoding='latin1')
try:
expected_list = pickle.load(f, encoding='latin1')
except TypeError:
expected_list = pickle.load(f)

assert(np.allclose(np.array(test_list), np.array(expected_list)))

Expand All @@ -59,7 +65,10 @@ def test_twist_doughnut():
with open(os.path.join(CUR_PATH,
'test_io_data/twist_doughnut_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
guesses, r, w, BQ, T_H, j, s, t, params = input_tuple
income_tax_params, tpi_params, initial_b = params
tpi_params = tpi_params + [True]
Expand All @@ -70,7 +79,10 @@ def test_twist_doughnut():
with open(os.path.join(CUR_PATH,
'test_io_data/twist_doughnut_outputs.pkl'),
'rb') as f:
expected_list = pickle.load(f, encoding='latin1')
try:
expected_list = pickle.load(f, encoding='latin1')
except TypeError:
expected_list = pickle.load(f)

assert(np.allclose(np.array(test_list), np.array(expected_list)))

Expand All @@ -82,7 +94,10 @@ def test_inner_loop():
with open(os.path.join(CUR_PATH,
'test_io_data/tpi_inner_loop_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
guesses, outer_loop_vars, params, j = input_tuple
income_tax_params, tpi_params, initial_values, ind = params
initial_values = initial_values #+ (0.0,)
Expand All @@ -95,7 +110,10 @@ def test_inner_loop():
with open(os.path.join(CUR_PATH,
'test_io_data/tpi_inner_loop_outputs.pkl'),
'rb') as f:
expected_tuple = pickle.load(f, encoding='latin1')
try:
expected_tuple = pickle.load(f, encoding='latin1')
except TypeError:
expected_tuple = pickle.load(f)

for i, v in enumerate(expected_tuple):
assert(np.allclose(test_tuple[i], v))
Expand All @@ -107,7 +125,10 @@ def test_run_TPI():
# ensure that output returned matches what it has been before.
with open(os.path.join(CUR_PATH, 'test_io_data/run_TPI_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
(income_tax_params, tpi_params, iterative_params, small_open_params,
initial_values, SS_values, fiscal_params, biz_tax_params,
output_dir, baseline_spending) = input_tuple
Expand All @@ -121,7 +142,10 @@ def test_run_TPI():

with open(os.path.join(CUR_PATH, 'test_io_data/run_TPI_outputs.pkl'),
'rb') as f:
expected_dict = pickle.load(f, encoding='latin1')
try:
expected_dict = pickle.load(f, encoding='latin1')
except TypeError:
expected_dict = pickle.load(f)

for k, v in expected_dict.items():
assert(np.allclose(test_dict[k], v))
10 changes: 8 additions & 2 deletions ogusa/tests/test_txfunc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,10 @@ def test_txfunc_est():
with open(os.path.join(CUR_PATH,
'test_io_data/txfunc_est_inputs.pkl'),
'rb') as f:
input_tuple = pickle.load(f, encoding='latin1')
try:
input_tuple = pickle.load(f, encoding='latin1')
except TypeError:
input_tuple = pickle.load(f)
(df, s, t, rate_type, output_dir, graph) = input_tuple
tax_func_type = 'DEP'
numparams = 12
Expand All @@ -138,7 +141,10 @@ def test_txfunc_est():
with open(os.path.join(CUR_PATH,
'test_io_data/txfunc_est_outputs.pkl'),
'rb') as f:
expected_tuple = pickle.load(f, encoding='latin1')
try:
expected_tuple = pickle.load(f, encoding='latin1')
except TypeError:
expected_tuple = pickle.load(f)
for i, v in enumerate(expected_tuple):
assert(np.allclose(test_tuple[i], v))

Expand Down