From 70ff723ea19c5f7258c063db4b968aaaa3a32fd2 Mon Sep 17 00:00:00 2001 From: Max Ghenis Date: Sat, 25 Sep 2021 09:35:22 -0700 Subject: [PATCH 1/4] should get overwritten --- openfisca_us/api/microsimulation.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_us/api/microsimulation.py b/openfisca_us/api/microsimulation.py index 9d4c7c69c0f..dc559014dc5 100644 --- a/openfisca_us/api/microsimulation.py +++ b/openfisca_us/api/microsimulation.py @@ -36,7 +36,7 @@ def load_dataset(self, dataset, year): data = dataset.load(year) - builder.declare_person_entity("person", data[f"person_id"]) + builder.declare_person_entity("person", np.array(data["person_id"])) for group_entity in ("tax_unit", "family", "spm_unit", "household"): primary_keys = np.array(data[f"{group_entity}_id"]) From ecd78471b1c5ebd9ad2b7c667ba3bd798ac2a81d Mon Sep 17 00:00:00 2001 From: Max Ghenis Date: Sat, 25 Sep 2021 11:10:02 -0700 Subject: [PATCH 2/4] Change to "first person" to align with HHS summary table --- openfisca_us/parameters/poverty/fpg.yaml | 44 ++++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 openfisca_us/parameters/poverty/fpg.yaml diff --git a/openfisca_us/parameters/poverty/fpg.yaml b/openfisca_us/parameters/poverty/fpg.yaml new file mode 100644 index 00000000000..92bb954c28a --- /dev/null +++ b/openfisca_us/parameters/poverty/fpg.yaml @@ -0,0 +1,44 @@ +description: Federal poverty guidelines published by the Department of Health and Human Services. +first_person: + contiguous_US: + 2017-01-01: 12_060 + 2018-01-01: 12_140 + 2019-01-01: 12_490 + 2020-01-01: 12_760 + 2021-01-01: 12_880 + AK: + 2017-01-01: 15_060 + 2018-01-01: 15_180 + 2019-01-01: 15_600 + 2020-01-01: 15_950 + 2021-01-01: 16_090 + HI: + 2017-01-01: 13_860 + 2018-01-01: 13_960 + 2019-01-01: 14_380 + 2020-01-01: 14_680 + 2021-01-01: 14_820 +additional_person: + contiguous_US: + 2017-01-01: 4_180 + 2018-01-01: 4_320 + 2019-01-01: 4_420 + 2020-01-01: 4_480 + 2021-01-01: 4_540 + AK: + 2017-01-01: 5_230 + 2018-01-01: 5_400 + 2019-01-01: 5_530 + 2020-01-01: 5_600 + 2021-01-01: 5_680 + HI: + 2017-01-01: 4_810 + 2018-01-01: 4_810 + 2019-01-01: 5_080 + 2020-01-01: 5_150 + 2021-01-01: 5_220 +metadata: + unit: currency-USD + reference: + title: Prior HHS Poverty Guidelines and Federal Register References + href: https://aspe.hhs.gov/topics/poverty-economic-mobility/poverty-guidelines/prior-hhs-poverty-guidelines-federal-register-references \ No newline at end of file From 1488ff9a1b1c6f3a58dccd38f1bfabcf6f7b0a46 Mon Sep 17 00:00:00 2001 From: Max Ghenis Date: Sat, 25 Sep 2021 11:11:25 -0700 Subject: [PATCH 3/4] add newline --- openfisca_us/parameters/poverty/fpg.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_us/parameters/poverty/fpg.yaml b/openfisca_us/parameters/poverty/fpg.yaml index 92bb954c28a..4a0fff2e0bc 100644 --- a/openfisca_us/parameters/poverty/fpg.yaml +++ b/openfisca_us/parameters/poverty/fpg.yaml @@ -41,4 +41,4 @@ metadata: unit: currency-USD reference: title: Prior HHS Poverty Guidelines and Federal Register References - href: https://aspe.hhs.gov/topics/poverty-economic-mobility/poverty-guidelines/prior-hhs-poverty-guidelines-federal-register-references \ No newline at end of file + href: https://aspe.hhs.gov/topics/poverty-economic-mobility/poverty-guidelines/prior-hhs-poverty-guidelines-federal-register-references From d799e1e03ee59d6f34cc9a46d630a7292f22a435 Mon Sep 17 00:00:00 2001 From: Max Ghenis Date: Sat, 25 Sep 2021 12:00:34 -0700 Subject: [PATCH 4/4] add period --- openfisca_us/parameters/poverty/fpg.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/openfisca_us/parameters/poverty/fpg.yaml b/openfisca_us/parameters/poverty/fpg.yaml index 4a0fff2e0bc..f4d17b02274 100644 --- a/openfisca_us/parameters/poverty/fpg.yaml +++ b/openfisca_us/parameters/poverty/fpg.yaml @@ -42,3 +42,4 @@ metadata: reference: title: Prior HHS Poverty Guidelines and Federal Register References href: https://aspe.hhs.gov/topics/poverty-economic-mobility/poverty-guidelines/prior-hhs-poverty-guidelines-federal-register-references + period: year