Merge pull request #73 from jdebacker/update_calib

Merging
PSLmodels · Oct 25, 2023 · d6aaba5 · d6aaba5
2 parents 422c7b9 + 39db59b
commit d6aaba5
Show file tree

Hide file tree

Showing 33 changed files with 674 additions and 2,074 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
diff --git a/cs-config/cs_config/functions.py b/cs-config/cs_config/functions.py
diff --git a/ogusa/data/PSID/psid1968to2015.RData → data/PSID/psid1968to2015.RData b/ogusa/data/PSID/psid1968to2015.RData → data/PSID/psid1968to2015.RData
diff --git a/ogusa/data/PSID/psid1968to2017.RData → data/PSID/psid1968to2017.RData b/ogusa/data/PSID/psid1968to2017.RData → data/PSID/psid1968to2017.RData
diff --git a/ogusa/data/PSID/psid_download.R → data/PSID/psid_download.R b/ogusa/data/PSID/psid_download.R → data/PSID/psid_download.R
diff --git a/ogusa/data/PSID/psid_lifetime_income.csv → data/PSID/psid_lifetime_income.csv b/ogusa/data/PSID/psid_lifetime_income.csv → data/PSID/psid_lifetime_income.csv
diff --git a/environment.yml b/environment.yml
diff --git a/examples/run_og_usa.py b/examples/run_og_usa.py
diff --git a/ogusa/bequest_transmission.py b/ogusa/bequest_transmission.py
diff --git a/ogusa/calibrate.py b/ogusa/calibrate.py
diff --git a/ogusa/calibrate_chi_n.py b/ogusa/calibrate_chi_n.py
diff --git a/ogusa/demographics.py b/ogusa/demographics.py
diff --git a/ogusa/deterministic_profiles.py b/ogusa/deterministic_profiles.py
diff --git a/ogusa/estimate_beta_j.py b/ogusa/estimate_beta_j.py
diff --git a/ogusa/macro_params.py b/ogusa/macro_params.py
diff --git a/ogusa/ogusa_default_parameters.json b/ogusa/ogusa_default_parameters.json
diff --git a/ogusa/psid_data_setup.py b/ogusa/psid_data_setup.py
diff --git a/ogusa/psid_summ_stats.py b/ogusa/psid_summ_stats.py
diff --git a/ogusa/transfer_distribution.py b/ogusa/transfer_distribution.py
diff --git a/ogusa/utils.py b/ogusa/utils.py
diff --git a/setup.py b/setup.py
diff --git a/ogusa/tests/test_calibrate.py → tests/test_calibrate.py b/ogusa/tests/test_calibrate.py → tests/test_calibrate.py
diff --git a/ogusa/tests/test_demographics.py → tests/test_demographics.py b/ogusa/tests/test_demographics.py → tests/test_demographics.py
diff --git a/ogusa/tests/test_get_micro_data.py → tests/test_get_micro_data.py b/ogusa/tests/test_get_micro_data.py → tests/test_get_micro_data.py
diff --git a/ogusa/tests/test_income.py → tests/test_income.py b/ogusa/tests/test_income.py → tests/test_income.py
diff --git a/...a/tests/test_io_data/TxFuncEst_policy.pkl → tests/test_io_data/TxFuncEst_policy.pkl b/...a/tests/test_io_data/TxFuncEst_policy.pkl → tests/test_io_data/TxFuncEst_policy.pkl
diff --git a/...est_io_data/micro_data_dict_for_tests.pkl → ...est_io_data/micro_data_dict_for_tests.pkl b/...est_io_data/micro_data_dict_for_tests.pkl → ...est_io_data/micro_data_dict_for_tests.pkl
diff --git a/...io_data/mtr_combined_capinc_for_tests.csv → ...io_data/mtr_combined_capinc_for_tests.csv b/...io_data/mtr_combined_capinc_for_tests.csv → ...io_data/mtr_combined_capinc_for_tests.csv
diff --git a/...tests/test_io_data/tax_dict_for_tests.pkl → tests/test_io_data/tax_dict_for_tests.pkl b/...tests/test_io_data/tax_dict_for_tests.pkl → tests/test_io_data/tax_dict_for_tests.pkl
diff --git a/ogusa/tests/test_psid_data_setup.py → tests/test_psid_data_setup.py b/ogusa/tests/test_psid_data_setup.py → tests/test_psid_data_setup.py
diff --git a/ogusa/tests/test_run_example.py → tests/test_run_example.py b/ogusa/tests/test_run_example.py → tests/test_run_example.py
diff --git a/ogusa/tests/test_utils.py → tests/test_utils.py b/ogusa/tests/test_utils.py → tests/test_utils.py
diff --git a/ogusa/tests/test_wealth.py → tests/test_wealth.py b/ogusa/tests/test_wealth.py → tests/test_wealth.py