Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/aws.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/openfisca-us-data.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,3 +116,4 @@ class CustomDataset:
### ACS
- OpenFisca-US-compatible
- Contains OpenFisca-US-compatible input arrays.
### hello world hello
7 changes: 5 additions & 2 deletions openfisca_us_data/datasets/cps/cps.py
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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
Expand All @@ -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]