Skip to content

Makefile update #344

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andersonfrailey merged 4 commits into from
Jul 28, 2020
Merged

Makefile update #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fecf6fb
commit README
jchuslo Jun 25, 2020
3c54769
Merge remote-tracking branch 'upstream/master'
jchuslo Jul 1, 2020
20cbebe
Merge remote-tracking branch 'upstream/master'
chusloj Jul 10, 2020
fd84998
updates makefile
chusloj Jul 16, 2020
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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ cps_stage1/stage_2_targets.csv: cps_stage1/stage1.py \

cps_stage2/cps_weights.csv.gz: cps_stage2/stage2.py \
cps_stage2/solve_lp_for_year.py \
cps_data/cps_raw.csv.gz \
cps_data/pycps/cps_raw.csv.gz \
puf_stage1/Stage_I_factors.csv \
cps_stage1/stage_2_targets.csv
cd cps_stage2 ; python stage2.py && \
Expand Down
4 changes: 2 additions & 2 deletions puf_data/StatMatch/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# StatMatch

This repo holds scripts for performing a statistical match
using the March 2016 CPS and 2011 IRS SOI Public Use File (PUF) datasets
using the March 2016 CPS and 2011 IRS SOI Public Use File (PUF) datasets.

## Usage

Expand All @@ -26,4 +26,4 @@ Files are run in the following order:
5. `phase1.py`
6. `phase2.py`
7. `add_cps_vars.py`
8. `add_nonfilers.py`
8. `add_nonfilers.py`