From 28e09428ccdf422a2cb66c0f3c800d59f4220d32 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:11:30 -0500 Subject: [PATCH 01/23] Updated medicaid income formula Co-authored-by: Max Ghenis --- openfisca_us/variables/hhs/medicaid.py | 40 ++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 openfisca_us/variables/hhs/medicaid.py diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py new file mode 100644 index 00000000000..71f1c17e5e2 --- /dev/null +++ b/openfisca_us/variables/hhs/medicaid.py @@ -0,0 +1,40 @@ +from openfisca_core.model_api import * +from openfisca_us.entities import * +from openfisca_us.tools.general import * +from openfisca_us.variables.demographic.person import * +from openfisca_us.variables.demographic.household import * + +class MedicaidPersonType(Enum): + ADULT_WITHOUT_DEPENDENT = "Adult without dependent" + ADULT_WITH_DEPENDENT = "Adult with dependent" + CHILD_AGE_0 = "Child age 0" + CHILD_AGE_1_5 = "Child age 1 to 5" + CHILD_AGE_6_18 = "Child age 6 to 18" + + +class medicaid_person_type(Variable): + value_type = Enum + possible_values = MedicaidPersonType + default_value = MedicaidPersonType.ADULT_WITHOUT_DEPENDENT + entity = Person + definition_period = YEAR + documentation = "Person type for Medicaid" + + +class medicaid_income_threshold(Variable): + value_type = float + entity = Person + label = "Medicaid FPL threshold" + documentation = "Maximum income as a percentage of the federal poverty line to qualify for Medicaid" + + # Get state + # Get person type + # Get parameter + # Return indexed parameter + def formula(person, period, parameters): + state_code = person("state_code_str", period) + person_type = person("medicaid_person_type", period) + income_threshold = parameters(period).hhs.medicaid + return income_threshold[state_code][person_type] + + \ No newline at end of file From 0675397af3feabec2e5f212b90b39c1de042d9a7 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:11:59 -0500 Subject: [PATCH 02/23] Added 4 more tests --- .../parameters/hhs/medicaid/income_limit.yaml | 19 ++++++ .../medicaid/medicaid_income_threshold.yaml | 61 +++++++++++++++++++ 2 files changed, 80 insertions(+) create mode 100644 openfisca_us/parameters/hhs/medicaid/income_limit.yaml create mode 100644 openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml diff --git a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml new file mode 100644 index 00000000000..971a20ecf28 --- /dev/null +++ b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml @@ -0,0 +1,19 @@ +description: Medicaid income limit as a percentage of the federal poverty guideline. +CA: + ADULT_WITHOUT_DEPENDENT: + 2021-01-01: 1.38 + ADULT_WITH_DEPENDENT: + 2021-01-01: 1.38 + CHILD_AGE_0: + 2021-01-01: 1.38 + CHILD_AGE_1_5: + 2021-01-01: 1.38 + CHILD_AGE_6_18: + 2021-01-01: 1.38 + +metadata: + unit: /1 + reference: + title: # Add reference title + href: # Add link + period: year \ No newline at end of file diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml new file mode 100644 index 00000000000..b844fe2925f --- /dev/null +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -0,0 +1,61 @@ +- name: California adult with no dependents + period: 2022 + input: + people: + person: + medicaid_person_type: ADULT_NO_DEPENDENTS + households: + household: + state_code_str: CA + members: [person] + output: + medicaid_income_threshold: 1.38 +- name: California adult with dependents + period: 2022 + input: + people: + person: + medicaid_person_type: ADULT_WITH_DEPENDENT + households: + household: + state_code_str: CA + members: [person] + output: + medicaid_income_threshold: 1.38 +- name: Californian child age 0 + period: 2022 + input: + people: + person: + medicaid_person_type: CHILD_AGE_0 + households: + household: + state_code_str: CA + members: [person] + output: + medicaid_income_threshold: 2.66 +- name: California child between 1-5 years of age + period: 2022 + input: + people: + person: + medicaid_person_type: CHILD_AGE_1_5 + households: + household: + state_code_str: CA + members: [person] + output: + medicaid_income_threshold: 2.66 +- name: California child between 6-18 years of age + period: 2022 + input: + people: + person: + medicaid_person_type: CHILD_AGE_6_18 + households: + household: + state_code_str: CA + members: [person] + output: + medicaid_income_threshold: 2.66 +# TODO: Other California tests From b09574ec02f240b40e855d7439879bcafb07cc54 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:25:09 -0500 Subject: [PATCH 03/23] Formatted code --- openfisca_us/variables/hhs/medicaid.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 71f1c17e5e2..15e9b6fda36 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -4,6 +4,7 @@ from openfisca_us.variables.demographic.person import * from openfisca_us.variables.demographic.household import * + class MedicaidPersonType(Enum): ADULT_WITHOUT_DEPENDENT = "Adult without dependent" ADULT_WITH_DEPENDENT = "Adult with dependent" @@ -27,14 +28,12 @@ class medicaid_income_threshold(Variable): label = "Medicaid FPL threshold" documentation = "Maximum income as a percentage of the federal poverty line to qualify for Medicaid" - # Get state - # Get person type - # Get parameter - # Return indexed parameter + # Get state + # Get person type + # Get parameter + # Return indexed parameter def formula(person, period, parameters): state_code = person("state_code_str", period) person_type = person("medicaid_person_type", period) income_threshold = parameters(period).hhs.medicaid return income_threshold[state_code][person_type] - - \ No newline at end of file From 4717f2378d967f0de9a8838395eba790b4f3637e Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:30:37 -0500 Subject: [PATCH 04/23] Added label and period --- openfisca_us/variables/hhs/medicaid.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 15e9b6fda36..ae7d52cf67f 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -19,12 +19,14 @@ class medicaid_person_type(Variable): default_value = MedicaidPersonType.ADULT_WITHOUT_DEPENDENT entity = Person definition_period = YEAR + label = "Medicaid person type" documentation = "Person type for Medicaid" class medicaid_income_threshold(Variable): value_type = float entity = Person + definition_period = YEAR label = "Medicaid FPL threshold" documentation = "Maximum income as a percentage of the federal poverty line to qualify for Medicaid" From 80a49b75cbe5257a86199596af62f6f3d4763e5b Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:40:04 -0500 Subject: [PATCH 05/23] changed person type --- .../policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index b844fe2925f..1ad6e5cb632 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -3,7 +3,7 @@ input: people: person: - medicaid_person_type: ADULT_NO_DEPENDENTS + medicaid_person_type: ADULT_WITHOUT_DEPENDENTS households: household: state_code_str: CA From 6f5fbb5df0820b56d0c42f34cd7ce7aa5c841c30 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:41:21 -0500 Subject: [PATCH 06/23] deleted comment --- .../policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index 1ad6e5cb632..93063e86e8e 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -58,4 +58,4 @@ members: [person] output: medicaid_income_threshold: 2.66 -# TODO: Other California tests + From 5c56df691d3212f17316f69cd0eefa35d722c7e1 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:43:08 -0500 Subject: [PATCH 07/23] changed person type --- .../policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index 93063e86e8e..cb78d704814 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -3,7 +3,7 @@ input: people: person: - medicaid_person_type: ADULT_WITHOUT_DEPENDENTS + medicaid_person_type: ADULT_WITHOUT_DEPENDENT households: household: state_code_str: CA From b88051dc963970e6236777e9b3d6fd8e0a9dfb47 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sat, 4 Dec 2021 13:47:16 -0500 Subject: [PATCH 08/23] added .household to person for state_code --- openfisca_us/variables/hhs/medicaid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index ae7d52cf67f..03eac6b66e7 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -35,7 +35,7 @@ class medicaid_income_threshold(Variable): # Get parameter # Return indexed parameter def formula(person, period, parameters): - state_code = person("state_code_str", period) + state_code = person.household("state_code_str", period) person_type = person("medicaid_person_type", period) income_threshold = parameters(period).hhs.medicaid return income_threshold[state_code][person_type] From 93172d3ea4171dd084025cd87d73a1e110d1f7ea Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Mon, 6 Dec 2021 21:25:54 -0500 Subject: [PATCH 09/23] tests passed --- .../baseline/hhs/medicaid/medicaid_income_threshold.yaml | 7 +++---- openfisca_us/variables/hhs/medicaid.py | 7 ++----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index cb78d704814..6cc00f66662 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -33,7 +33,7 @@ state_code_str: CA members: [person] output: - medicaid_income_threshold: 2.66 + medicaid_income_threshold: 1.38 - name: California child between 1-5 years of age period: 2022 input: @@ -45,7 +45,7 @@ state_code_str: CA members: [person] output: - medicaid_income_threshold: 2.66 + medicaid_income_threshold: 1.38 - name: California child between 6-18 years of age period: 2022 input: @@ -57,5 +57,4 @@ state_code_str: CA members: [person] output: - medicaid_income_threshold: 2.66 - + medicaid_income_threshold: 1.38 diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 03eac6b66e7..42b07f50d20 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -30,12 +30,9 @@ class medicaid_income_threshold(Variable): label = "Medicaid FPL threshold" documentation = "Maximum income as a percentage of the federal poverty line to qualify for Medicaid" - # Get state - # Get person type - # Get parameter - # Return indexed parameter + def formula(person, period, parameters): state_code = person.household("state_code_str", period) person_type = person("medicaid_person_type", period) - income_threshold = parameters(period).hhs.medicaid + income_threshold = parameters(period).hhs.medicaid.income_limit return income_threshold[state_code][person_type] From aab49ed4099f1aa986e414af8cb01f4289df2892 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Mon, 6 Dec 2021 21:40:19 -0500 Subject: [PATCH 10/23] fixed formatting --- openfisca_us/variables/hhs/medicaid.py | 38 ++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 42b07f50d20..bbd3c9c5525 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -30,6 +30,44 @@ class medicaid_income_threshold(Variable): label = "Medicaid FPL threshold" documentation = "Maximum income as a percentage of the federal poverty line to qualify for Medicaid" + def formula(person, period, parameters): + state_code = person.household("state_code_str", period) + person_type = person("medicaid_person_type", period) + income_threshold = parameters(period).hhs.medicaid.income_limit + return income_threshold[state_code][person_type] + + +from openfisca_core.model_api import * +from openfisca_us.entities import * +from openfisca_us.tools.general import * +from openfisca_us.variables.demographic.person import * +from openfisca_us.variables.demographic.household import * + + +class MedicaidPersonType(Enum): + ADULT_WITHOUT_DEPENDENT = "Adult without dependent" + ADULT_WITH_DEPENDENT = "Adult with dependent" + CHILD_AGE_0 = "Child age 0" + CHILD_AGE_1_5 = "Child age 1 to 5" + CHILD_AGE_6_18 = "Child age 6 to 18" + + +class medicaid_person_type(Variable): + value_type = Enum + possible_values = MedicaidPersonType + default_value = MedicaidPersonType.ADULT_WITHOUT_DEPENDENT + entity = Person + definition_period = YEAR + label = "Medicaid person type" + documentation = "Person type for Medicaid" + + +class medicaid_income_threshold(Variable): + value_type = float + entity = Person + definition_period = YEAR + label = "Medicaid FPL threshold" + documentation = "Maximum income as a percentage of the federal poverty line to qualify for Medicaid" def formula(person, period, parameters): state_code = person.household("state_code_str", period) From 4b6d8015ff0122a09f0a58388aa97eddc024504f Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Tue, 7 Dec 2021 10:12:55 -0500 Subject: [PATCH 11/23] deleted duplicated code, added newline --- .../medicaid/medicaid_income_threshold.yaml | 1 + openfisca_us/variables/hhs/medicaid.py | 39 ------------------- 2 files changed, 1 insertion(+), 39 deletions(-) diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index 6cc00f66662..5039ea58877 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -58,3 +58,4 @@ members: [person] output: medicaid_income_threshold: 1.38 + diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index bbd3c9c5525..1f07b4ec67d 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -5,45 +5,6 @@ from openfisca_us.variables.demographic.household import * -class MedicaidPersonType(Enum): - ADULT_WITHOUT_DEPENDENT = "Adult without dependent" - ADULT_WITH_DEPENDENT = "Adult with dependent" - CHILD_AGE_0 = "Child age 0" - CHILD_AGE_1_5 = "Child age 1 to 5" - CHILD_AGE_6_18 = "Child age 6 to 18" - - -class medicaid_person_type(Variable): - value_type = Enum - possible_values = MedicaidPersonType - default_value = MedicaidPersonType.ADULT_WITHOUT_DEPENDENT - entity = Person - definition_period = YEAR - label = "Medicaid person type" - documentation = "Person type for Medicaid" - - -class medicaid_income_threshold(Variable): - value_type = float - entity = Person - definition_period = YEAR - label = "Medicaid FPL threshold" - documentation = "Maximum income as a percentage of the federal poverty line to qualify for Medicaid" - - def formula(person, period, parameters): - state_code = person.household("state_code_str", period) - person_type = person("medicaid_person_type", period) - income_threshold = parameters(period).hhs.medicaid.income_limit - return income_threshold[state_code][person_type] - - -from openfisca_core.model_api import * -from openfisca_us.entities import * -from openfisca_us.tools.general import * -from openfisca_us.variables.demographic.person import * -from openfisca_us.variables.demographic.household import * - - class MedicaidPersonType(Enum): ADULT_WITHOUT_DEPENDENT = "Adult without dependent" ADULT_WITH_DEPENDENT = "Adult with dependent" From e344295812b0a95fed81f8a48a31828b6ab0d73c Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sun, 26 Dec 2021 18:31:48 -0800 Subject: [PATCH 12/23] Fixed formatting. --- openfisca_us/parameters/hhs/medicaid/income_limit.yaml | 3 ++- .../baseline/hhs/medicaid/medicaid_income_threshold.yaml | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml index 971a20ecf28..685e055e976 100644 --- a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml +++ b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml @@ -16,4 +16,5 @@ metadata: reference: title: # Add reference title href: # Add link - period: year \ No newline at end of file + period: year + \ No newline at end of file diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index 5039ea58877..8a28edad2be 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -57,5 +57,4 @@ state_code_str: CA members: [person] output: - medicaid_income_threshold: 1.38 - + medicaid_income_threshold: 1.38 \ No newline at end of file From 7e85b4244df1a7b18a69587b2da3827c6b771c23 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sun, 26 Dec 2021 19:04:09 -0800 Subject: [PATCH 13/23] increase version number to 0.4.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index b220bb4ca75..c38c30d71a6 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name="OpenFisca-US", - version="0.4.0", + version="0.4.1", author="Nikhil Woodruff", author_email="nikhil@policyengine.org", classifiers=[ From 88772b157593914ed688a1c35a07de49533fde33 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sun, 26 Dec 2021 19:08:47 -0800 Subject: [PATCH 14/23] Updated Changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6683b673f73..fc2d41def8d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,3 +16,7 @@ * Broke down TANF eligibility into demographic and financial variables, with financial separated by current enrollment in program * Specified demographic TANF eligibility per IL rules + +### 0.4.1 + +* Added Medicaid Tests + Income Threshold Formula for California From e488681213e33e3364600b1f9731be4739f73fe7 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sun, 26 Dec 2021 20:42:44 -0800 Subject: [PATCH 15/23] medicaid tests for alabama --- .../medicaid/medicaid_income_threshold.yaml | 62 ++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index 8a28edad2be..0ae38629e41 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -57,4 +57,64 @@ state_code_str: CA members: [person] output: - medicaid_income_threshold: 1.38 \ No newline at end of file + medicaid_income_threshold: 1.38 +- name: Alabama adult with no dependents + period: 2022 + input: + people: + person: + medicaid_person_type: ADULT_WITHOUT_DEPENDENT + households: + household: + state_code_str: AL + members: [person] + output: + medicaid_income_threshold: 0 + name: Alabama adult with dependents + period: 2022 + input: + people: + person: + medicaid_person_type: ADULT_WITH_DEPENDENT + households: + household: + state_code_str: AL + members: [person] + output: + medicaid_income_threshold: 0.18 +- name: Alabama child age 0 + period: 2022 + input: + people: + person: + medicaid_person_type: CHILD_AGE_0 + households: + household: + state_code_str: AL + members: [person] + output: + medicaid_income_threshold: 3.17 +- name: Alabama child between 1-5 years of age + period: 2022 + input: + people: + person: + medicaid_person_type: CHILD_AGE_1_5 + households: + household: + state_code_str: AL + members: [person] + output: + medicaid_income_threshold: 3.17 +- name: Alabama child between 6-18 years of age + period: 2022 + input: + people: + person: + medicaid_person_type: CHILD_AGE_6_18 + households: + household: + state_code_str: AL + members: [person] + output: + medicaid_income_threshold: 3.17 \ No newline at end of file From 44a8300371cd95f96b57c5b90e002f8861e992f8 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Sun, 26 Dec 2021 21:03:13 -0800 Subject: [PATCH 16/23] deleted alabama tests --- .../medicaid/medicaid_income_threshold.yaml | 62 +------------------ 1 file changed, 1 insertion(+), 61 deletions(-) diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index 0ae38629e41..8a28edad2be 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -57,64 +57,4 @@ state_code_str: CA members: [person] output: - medicaid_income_threshold: 1.38 -- name: Alabama adult with no dependents - period: 2022 - input: - people: - person: - medicaid_person_type: ADULT_WITHOUT_DEPENDENT - households: - household: - state_code_str: AL - members: [person] - output: - medicaid_income_threshold: 0 - name: Alabama adult with dependents - period: 2022 - input: - people: - person: - medicaid_person_type: ADULT_WITH_DEPENDENT - households: - household: - state_code_str: AL - members: [person] - output: - medicaid_income_threshold: 0.18 -- name: Alabama child age 0 - period: 2022 - input: - people: - person: - medicaid_person_type: CHILD_AGE_0 - households: - household: - state_code_str: AL - members: [person] - output: - medicaid_income_threshold: 3.17 -- name: Alabama child between 1-5 years of age - period: 2022 - input: - people: - person: - medicaid_person_type: CHILD_AGE_1_5 - households: - household: - state_code_str: AL - members: [person] - output: - medicaid_income_threshold: 3.17 -- name: Alabama child between 6-18 years of age - period: 2022 - input: - people: - person: - medicaid_person_type: CHILD_AGE_6_18 - households: - household: - state_code_str: AL - members: [person] - output: - medicaid_income_threshold: 3.17 \ No newline at end of file + medicaid_income_threshold: 1.38 \ No newline at end of file From 4786d0c15fad140cd5e3720be70108033e2d4c25 Mon Sep 17 00:00:00 2001 From: CrimsonOHara Date: Mon, 27 Dec 2021 16:09:08 -0500 Subject: [PATCH 17/23] Update openfisca_us/parameters/hhs/medicaid/income_limit.yaml Co-authored-by: Max Ghenis --- openfisca_us/parameters/hhs/medicaid/income_limit.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml index 685e055e976..971a20ecf28 100644 --- a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml +++ b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml @@ -16,5 +16,4 @@ metadata: reference: title: # Add reference title href: # Add link - period: year - \ No newline at end of file + period: year \ No newline at end of file From 257d44bb074955181a1c7ff1a541284da2c4e134 Mon Sep 17 00:00:00 2001 From: CrimsonOHara Date: Mon, 27 Dec 2021 16:09:17 -0500 Subject: [PATCH 18/23] Update setup.py Co-authored-by: Max Ghenis --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index c38c30d71a6..7442ff90f2e 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name="OpenFisca-US", - version="0.4.1", + version="0.5.0", author="Nikhil Woodruff", author_email="nikhil@policyengine.org", classifiers=[ From 5eb101cf52e2027a2295cf209dc52fbebf6ba60d Mon Sep 17 00:00:00 2001 From: CrimsonOHara Date: Mon, 27 Dec 2021 16:11:41 -0500 Subject: [PATCH 19/23] Update openfisca_us/variables/hhs/medicaid.py Co-authored-by: Max Ghenis --- openfisca_us/variables/hhs/medicaid.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 1f07b4ec67d..8aa5ab96104 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -1,4 +1,4 @@ -from openfisca_core.model_api import * +from openfisca_us.model_api import * from openfisca_us.entities import * from openfisca_us.tools.general import * from openfisca_us.variables.demographic.person import * From 4d56a067533b4cf219644f1b99d35cd2e4031e45 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Mon, 27 Dec 2021 13:23:01 -0800 Subject: [PATCH 20/23] version + import statements changed --- CHANGELOG.md | 2 +- openfisca_us/parameters/hhs/medicaid/income_limit.yaml | 1 - .../policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml | 2 +- openfisca_us/variables/hhs/medicaid.py | 2 +- setup.py | 2 +- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fc2d41def8d..6f0f95b5819 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,6 @@ * Broke down TANF eligibility into demographic and financial variables, with financial separated by current enrollment in program * Specified demographic TANF eligibility per IL rules -### 0.4.1 +### 0.5.0 * Added Medicaid Tests + Income Threshold Formula for California diff --git a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml index 685e055e976..27781863b8d 100644 --- a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml +++ b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml @@ -17,4 +17,3 @@ metadata: title: # Add reference title href: # Add link period: year - \ No newline at end of file diff --git a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml index 8a28edad2be..6cc00f66662 100644 --- a/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml +++ b/openfisca_us/tests/policy/baseline/hhs/medicaid/medicaid_income_threshold.yaml @@ -57,4 +57,4 @@ state_code_str: CA members: [person] output: - medicaid_income_threshold: 1.38 \ No newline at end of file + medicaid_income_threshold: 1.38 diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 1f07b4ec67d..8aa5ab96104 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -1,4 +1,4 @@ -from openfisca_core.model_api import * +from openfisca_us.model_api import * from openfisca_us.entities import * from openfisca_us.tools.general import * from openfisca_us.variables.demographic.person import * diff --git a/setup.py b/setup.py index c38c30d71a6..7442ff90f2e 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ setup( name="OpenFisca-US", - version="0.4.1", + version="0.5.0", author="Nikhil Woodruff", author_email="nikhil@policyengine.org", classifiers=[ From 2d573f876be75bf4f3aae92793a4e51b2c2119b0 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Mon, 27 Dec 2021 15:50:16 -0800 Subject: [PATCH 21/23] deleted import statements --- openfisca_us/variables/hhs/medicaid.py | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 8aa5ab96104..98d932b9a1b 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -1,9 +1,4 @@ from openfisca_us.model_api import * -from openfisca_us.entities import * -from openfisca_us.tools.general import * -from openfisca_us.variables.demographic.person import * -from openfisca_us.variables.demographic.household import * - class MedicaidPersonType(Enum): ADULT_WITHOUT_DEPENDENT = "Adult without dependent" @@ -21,7 +16,7 @@ class medicaid_person_type(Variable): definition_period = YEAR label = "Medicaid person type" documentation = "Person type for Medicaid" - + class medicaid_income_threshold(Variable): value_type = float From 5b65d4b0cefa1ed87dfb41bc8b9a1d648011905f Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Mon, 27 Dec 2021 15:52:17 -0800 Subject: [PATCH 22/23] fixed formatting --- openfisca_us/variables/hhs/medicaid.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openfisca_us/variables/hhs/medicaid.py b/openfisca_us/variables/hhs/medicaid.py index 98d932b9a1b..aa3f60b39ee 100644 --- a/openfisca_us/variables/hhs/medicaid.py +++ b/openfisca_us/variables/hhs/medicaid.py @@ -1,5 +1,6 @@ from openfisca_us.model_api import * + class MedicaidPersonType(Enum): ADULT_WITHOUT_DEPENDENT = "Adult without dependent" ADULT_WITH_DEPENDENT = "Adult with dependent" @@ -16,7 +17,7 @@ class medicaid_person_type(Variable): definition_period = YEAR label = "Medicaid person type" documentation = "Person type for Medicaid" - + class medicaid_income_threshold(Variable): value_type = float From bf34636be58161abd3488ef51d54eb5bb37f9174 Mon Sep 17 00:00:00 2001 From: Sachi Parikh Date: Mon, 27 Dec 2021 15:53:47 -0800 Subject: [PATCH 23/23] added reference --- openfisca_us/parameters/hhs/medicaid/income_limit.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml index 27781863b8d..3db99c573db 100644 --- a/openfisca_us/parameters/hhs/medicaid/income_limit.yaml +++ b/openfisca_us/parameters/hhs/medicaid/income_limit.yaml @@ -13,7 +13,7 @@ CA: metadata: unit: /1 - reference: - title: # Add reference title - href: # Add link + reference: + title: California Medicaid Eligibility + href: https://www.dhcs.ca.gov/services/medi-cal/Pages/DoYouQualifyForMedi-Cal.aspx period: year