diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/aws.xml b/.idea/aws.xml new file mode 100644 index 0000000..03f1bb6 --- /dev/null +++ b/.idea/aws.xml @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..ab98567 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..072e1dc --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/openfisca-us-data.iml b/.idea/openfisca-us-data.iml new file mode 100644 index 0000000..5fd47d3 --- /dev/null +++ b/.idea/openfisca-us-data.iml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 513b7a0..28e407b 100644 --- a/README.md +++ b/README.md @@ -116,3 +116,4 @@ class CustomDataset: ### ACS - OpenFisca-US-compatible - Contains OpenFisca-US-compatible input arrays. +### hello world hello \ No newline at end of file diff --git a/openfisca_us_data/datasets/cps/cps.py b/openfisca_us_data/datasets/cps/cps.py index a5e9982..0fd4215 100644 --- a/openfisca_us_data/datasets/cps/cps.py +++ b/openfisca_us_data/datasets/cps/cps.py @@ -40,7 +40,7 @@ def generate(year: int) -> None: add_personal_variables(cps, person) add_personal_income_variables(cps, person) add_SPM_variables(cps, spm_unit) - + add_tax_unit_variables(cps, tax_unit) raw_data.close() cps.close() @@ -121,7 +121,7 @@ def add_personal_income_variables(cps: h5py.File, person: DataFrame): cps["e02100"] = person.FRSE_VAL cps["e02400"] = person.SS_VAL cps["e02300"] = person.UC_VAL - + cps["pencon"] = np.zeros(len(person.index), dtype=np.int32) # Pensions/annuities other_inc_type = person.OI_OFF cps["e01500"] = other_inc_type.isin((2, 13)) * person.OI_VAL @@ -147,3 +147,6 @@ def add_SPM_variables(cps: h5py.File, spm_unit: DataFrame): for openfisca_variable, asec_variable in SPM_RENAMES.items(): cps[openfisca_variable] = spm_unit[asec_variable] + + +