diff --git a/cps_stage1/stage1.py b/cps_stage1/stage1.py index 1efb005..ee093b2 100644 --- a/cps_stage1/stage1.py +++ b/cps_stage1/stage1.py @@ -6,7 +6,7 @@ def main(syr=2014): SYR = str(syr) # Start year of CPS - EYR = 2032 # Last year in our extrapolation + EYR = 2033 # Last year in our extrapolation # Read in state SOI estimates soi_estimates = pd.read_csv( diff --git a/cps_stage1/stage_2_targets.csv b/cps_stage1/stage_2_targets.csv index 1150c0e..25f7f81 100644 --- a/cps_stage1/stage_2_targets.csv +++ b/cps_stage1/stage_2_targets.csv @@ -1,24 +1,24 @@ -,2014,2015,2016,2017,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032 -Single,69579590,71086947,71410690,73021932,72028792,71924422,73183813,74331876,75333822,76224441,77122018,77984804,78861507,79745168,80635787,81540322,82451814,83377223,84309589,85248914,86209112,87169310 -Joint,55128595,57272012,57201828,57987204,57069122,56986429,57984256,58893878,59687730,60393376,61104535,61788129,62482750,63182883,63888529,64605200,65327385,66060595,66799319,67543555,68304329,69065104 -HH,22077498,22134303,21659639,21894095,22854626,22821510,23221112,23585391,23903307,24185899,24470699,24744460,25022636,25303020,25585612,25872620,26161835,26455466,26751304,27049351,27354020,27658689 -SS_return,27401498,28087514,28329015,28967603,31684352,32736570,33818929,34953351,36139836,37386604,38614191,39891101,41154310,42384637,43664287,44875433,46007115,47097695,48141692,49089784,49843325,50509181 -Dep_return,96916673,96505181,94809260,94708629,99911398,100735190,101549290,102373082,103187182,104001282,104805690,105610099,106414507,107209224,107984557,108759890,109525532,110281482,111018049,111744924,112452416,113150216 -INTS,156367939,95881223,96640233,106055367,124828526,125813644,138072890,143545768,146829495,143483221,145797466,144515249,159776760,178478366,194850089,209533038,221792285,235380659,247983914,261900661,275614129,289108682 -DIVS,254702232,260252720,254065327,282336042,340613295,332513764,369521998,401130545,421201081,415393870,416234388,452554926,492313944,522725391,546973043,563757920,575703455,588413096,604764980,624580813,646663497,670962090 -SCHCI,374659000,391975736,389078638,416010104,435503622,432281554,462216808,485895257,491852335,497996743,543105686,581770495,607509568,626542246,647635547,670714542,695367104,723541461,752914726,783037310,814171473,846317215 -SCHCL,57400238,60161435,60996610,69637956,63668344,64552308,73696166,77467361,78425945,79396009,86593999,92758785,96862902,99899374,103257288,106936643,110868560,115362998,120046858,124851258,129810638,134936479 -CGNS,705007630,713598090,634341278,859894631,1249696525,1110880523,1505896298,1632163164,1523239485,2000388649,2297760868,2430936809,2356558504,2164655427,2062640823,2012514781,2007297724,2035004524,2081676029,2143928203,2213089451,2289159775 -Pension,663223262,689991999,693626543,729187412,776568117,800178866,846471849,889515039,925594384,986014024,1058835938,1082181397,1138886986,1190817367,1241421302,1294412840,1347868635,1405900671,1464861219,1527336850,1590939961,1657925510 -SCHEI,846331543,891134646,882933054,973306129,1140431754,1129937243,1245546132,1348629314,1385360103,1312829490,1644760721,1734387231,1761723740,1757661349,1785167124,1786521254,1808441241,1858628702,1933190511,2007583053,2080113666,2155691073 -SCHEL,166947674,177896945,176446339,206369393,169401805,168032834,196514107,212774811,218567895,207131979,259486770,273627238,277951182,277316781,281657421,281857758,285330270,293243589,305013400,316749822,328185738,340105801 -SS,575126918,605152093,619856114,644989570,709246515,726500323,755946821,795975655,847794590,899095911,952065100,1016191751,1097687236,1171648557,1244919727,1322159272,1402216939,1488255926,1577285573,1668903291,1762879029,1762879029 -UCOMP,33288898,27225383,25420264,23946035,9810238,9161105,8628482,7962704,7490002,7746327,66767543,10193061,7633144,8711705,9410771,10239665,11098519,12097186,12882804,13372150,13824879,14211031 -wage1,114320683,112017897,111270085,107376379,132211870,134189618,140763057,147839507,154870229,156870841,171538185,186582787,194756716,201444476,208303716,215951770,224308612,232894095,241639628,250728122,260205307,270048317 -wage2,261995646,261659142,253415638,247511878,302997965,307530489,322595239,338812769,354925502,359510425,393124467,427603094,446335783,461662528,477382267,494909775,514061657,533737530,553780197,574608851,596328290,618886115 -wage3,381259619,383184602,382875414,382789227,440926749,447522541,469444969,493044939,516492406,523164449,572080058,622253824,649513887,671817575,694693152,720199420,748069498,776702096,805868457,836178596,867785019,900611472 -wage4,418567676,428313928,436140082,441282302,484073517,491314738,515382379,541291719,567033631,574358565,628060798,683144304,713071893,737558102,762672162,790674340,821271637,852706070,884726497,918002627,952701887,988740564 -wage5,418379915,424369612,426147995,437485582,483856372,491094344,515151189,541048906,566779271,574100919,627779062,682837859,712752023,737227248,762330043,790319659,820903231,852323563,884329626,917590830,952274525,988297035 -wage6,916618937,952347137,962308451,1000500360,1060069801,1075927308,1128632897,1185371609,1241743674,1257784505,1375386715,1496013767,1561552021,1615174229,1670171365,1731493172,1798498016,1867336098,1937457447,2010328653,2086316363,2165237253 -wage7,840581301,835434509,852517230,870406373,972132275,986674331,1035007756,1087039738,1138735488,1153445661,1261292242,1371912741,1432014304,1481188310,1531623189,1587858078,1649304571,1712432226,1776736696,1843562909,1913247099,1985621149 -wage8,3433224075,3714896131,3792750634,4090211841,3970523643,4029918419,4227328804,4439845374,4650988654,4711070076,5151552725,5603365013,5848840534,6049684143,6255677587,6485360278,6736328958,6994164086,7256805727,7529747041,7814361317,8109961910 +,2014,2015,2016,2017,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033 +Single,69579590,71086947,71410690,73021932,72028792,71924422,73183813,74331876,75333822,76224441,77122018,77984804,78861507,79745168,80635787,81540322,82451814,83377223,84309589,85248914,86209112,87169310,88150383 +Joint,55128595,57272012,57201828,57987204,57069122,56986429,57984256,58893878,59687730,60393376,61104535,61788129,62482750,63182883,63888529,64605200,65327385,66060595,66799319,67543555,68304329,69065104,69842417 +HH,22077498,22134303,21659639,21894095,22854626,22821510,23221112,23585391,23903307,24185899,24470699,24744460,25022636,25303020,25585612,25872620,26161835,26455466,26751304,27049351,27354020,27658689,27969982 +SS_return,27401498,28087514,28329015,28967603,31684352,32736570,33818929,34953351,36139836,37386604,38614191,39891101,41154310,42384637,43664287,44875433,46007115,47097695,48141692,49089784,49843325,50509181,51128455 +Dep_return,96916673,96505181,94809260,94708629,99911398,100735190,101549290,102373082,103187182,104001282,104805690,105610099,106414507,107209224,107984557,108759890,109525532,110281482,111018049,111744924,112452416,113150216,113828632 +INTS,156367939,95881223,96640233,106055367,124828526,125813644,138072890,143545768,146829495,146407301,147423693,155851925,184373437,200807707,208407189,223277780,238382923,250517075,260993727,271798752,282244130,293189886,305105123 +DIVS,254702232,260252720,254065327,282336042,340613295,332513764,369521998,401130545,421201081,463481652,494147800,519032208,531334326,529525940,539612149,558944048,583064349,608228930,632425642,657106288,682347280,708148616,734484826 +SCHCI,374659000,391975736,389078638,416010104,435503622,432281554,462216808,485895257,491852335,503691560,536549154,552846820,573190804,600728241,631525210,664682532,696940672,729461073,762580929,796037977,829794753,864188449,898844407 +SCHCL,57400238,60161435,60996610,69637956,63668344,64552308,73696166,77467361,78425945,80308673,85549315,88149545,91386919,95783777,100691497,105978059,111121121,116304362,121585184,126917666,132301809,137783531,143311174 +CGNS,705007630,713598090,634341278,859894631,1249696525,1110880523,1505896298,1631599158,1522675479,1983609468,3514815539,2928178690,2558331688,2358673527,2262087482,2213653457,2207308389,2227189604,2268291549,2325538168,2393782907,2470135233,2552409624 +Pension,663223262,689991999,693626543,729187412,776568117,800178866,846471849,889515039,925594384,996293984,1069779122,1093456192,1161502899,1215621917,1267154364,1326247557,1384478559,1444102331,1504588292,1567660824,1632258770,1700769733,1770474498 +SCHEI,846331543,891134646,882933054,973306129,1140431754,1129937243,1245546132,1348629314,1385360103,1322308403,1621317337,1711451646,1505793081,1517895622,1677005952,1790752912,1894259260,1968482536,2033988597,2104657281,2178795924,2258943521,2339006485 +SCHEL,166947674,177896945,176446339,206369393,169401805,168032834,196514107,212774811,218567895,208634508,255797226,270021168,237566540,239486438,264595369,282542243,298869726,310572758,320906819,332058924,343761956,356399894,369021139 +SS,575126918,605152093,619856114,644989570,709246515,726500323,755946821,795975655,848657280,898463271,939067232,1016191751,1097687236,1171648557,1244919727,1322159272,1402216939,1488255926,1577285573,1668903291,1762879029,1762879029,1762879029 +UCOMP,33288898,27225383,25420264,23946035,9810238,9161105,8628482,7962704,7490002,7746327,66767543,10193061,7633144,8711705,9410771,10239665,11098519,12097186,12882804,13372150,13824879,14211031,14211031 +wage1,114320683,112017897,111270085,107376379,132211870,134189618,140763057,147839507,154870229,157088051,170920853,185370987,194653827,203902370,213848270,223108245,231648000,240542149,249802124,259302173,269030863,278908170,288934094 +wage2,261995646,261659142,253415638,247511878,302997965,307530489,322595239,338812769,354925502,360008217,391709690,424825940,446099986,467295434,490089055,511310703,530881777,551265039,572486686,594258524,616554354,639190778,662167796 +wage3,381259619,383184602,382875414,382789227,440926749,447522541,469444969,493044939,516492406,523888842,570021256,618212472,649170753,680014656,713184243,744066272,772546366,802208364,833090393,864773068,897218261,930159092,963595561 +wage4,418567676,428313928,436140082,441282302,484073517,491314738,515382379,541291719,567033631,575153844,625800532,678707487,712695182,746557307,782972695,816876676,848143682,880708247,914612229,949395203,985015312,1021179559,1057887944 +wage5,418379915,424369612,426147995,437485582,483856372,491094344,515151189,541048906,566779271,574895841,625519811,678403032,712375481,746222416,782621469,816510242,847763222,880313179,914201952,948969323,984573454,1020721479,1057413397 +wage6,916618937,952347137,962308451,1000500360,1060069801,1075927308,1128632897,1185371609,1241743674,1259526081,1370436973,1486297606,1560727064,1634881536,1714627384,1788873517,1857344952,1928657905,2002904039,2079075073,2157079344,2236275221,2316662701 +wage7,840581301,835434509,852517230,870406373,972132275,986674331,1035007756,1087039738,1138735488,1155042766,1256753103,1363002580,1431257781,1499260808,1572391382,1640478467,1703269890,1768667115,1836754201,1906606507,1978139976,2050766200,2124485180 +wage8,3433224075,3714896131,3792750634,4090211841,3970523643,4029918419,4227328804,4439845374,4650988654,4717593201,5133013315,5566972838,5845750633,6123498460,6422188955,6700280105,6956741943,7223846776,7501937926,7787238847,8079406216,8376036776,8677130527 diff --git a/cps_stage2/cps_weights.csv.gz b/cps_stage2/cps_weights.csv.gz index 110897a..b4385ce 100644 Binary files a/cps_stage2/cps_weights.csv.gz and b/cps_stage2/cps_weights.csv.gz differ diff --git a/cps_stage2/solver.jl b/cps_stage2/solver.jl index c84be48..78f2f7f 100644 --- a/cps_stage2/solver.jl +++ b/cps_stage2/solver.jl @@ -80,7 +80,7 @@ function Solve_func(year, tol) end -year_list = [x for x in 2014:2032] +year_list = [x for x in 2014:2033] tol = 0.70 # Run solver function for all years and tolerances (in order) diff --git a/cps_stage2/stage2.py b/cps_stage2/stage2.py index 947dbd7..525a2ce 100644 --- a/cps_stage2/stage2.py +++ b/cps_stage2/stage2.py @@ -11,7 +11,7 @@ STAGE_1_PATH = Path(CUR_PATH, "..", "puf_stage1", "Stage_I_factors.csv") STAGE_2_PATH = Path(CUR_PATH, "..", "cps_stage1", "stage_2_targets.csv") START_YEAR = 2014 -END_YEAR = 2032 +END_YEAR = 2033 # Read hashes used to see which years can be skipped with open(Path(CUR_PATH, "..", "datahashes.json")) as f: diff --git a/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md b/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md index b5b9766..37c3eb4 100644 --- a/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md +++ b/docs/book/content/methods/CBO_Baseline_Updating_Instructions.md @@ -108,7 +108,7 @@ column of this table. Source: [BLS Database](http://data.bls.gov/timeseries/CUSR0000SAM?output_view=pct_1mth) Series ID: CUSR0000SAM -Access Date: February 28 2023 +Access Date: March 07 2023 Manual Instructions: diff --git a/history/report_utils.py b/history/report_utils.py index a41875c..d3aa0ae 100644 --- a/history/report_utils.py +++ b/history/report_utils.py @@ -805,7 +805,7 @@ def validation_table(df_tax_data, df_cbo, category): new_df = new_df.rename_axis(index=None).squeeze() new_df.index = new_df.index.astype(str) df_cbo = df_cbo.drop( - columns=["2019", "2020", "2021", "2022", "2032"], axis=1, inplace=False + columns=["2019", "2020", "2021", "2022", "2033"], axis=1, inplace=False ) df_cbo = df_cbo.transpose() df_cbo_sal = df_cbo.loc[:, df_cbo.columns.str.contains(category)].squeeze() @@ -1271,7 +1271,9 @@ def CBO_validation(cbo_df, new, name, template_args): ) new_taxable_inc = run_calc_var(new, year, "c04800") new_tot_inctax = run_calc_var(new, year, "c05800") - new_tot_cdt = run_calc_var(new, year, "c07100") + new_tot_cdt = run_calc_var(new, year, "c07100") + run_calc_var( + new, year, "refund" + ) new_inctax_af_credit = run_calc_var(new, year, "c05800") - run_calc_var( new, year, "c07100" ) diff --git a/history/reports/taxdata_report_2023-03-08.pdf b/history/reports/taxdata_report_2023-03-08.pdf new file mode 100644 index 0000000..b85c786 Binary files /dev/null and b/history/reports/taxdata_report_2023-03-08.pdf differ diff --git a/puf_stage1/CBO_baseline.csv b/puf_stage1/CBO_baseline.csv index e37ded7..94b4aac 100644 --- a/puf_stage1/CBO_baseline.csv +++ b/puf_stage1/CBO_baseline.csv @@ -1,16 +1,16 @@ -,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032 -GDP,14718.6,14418.7,14964.4,15517.9,16163.2,16800,17348.1,18036.7,18624.5,19479.6,20527.2,21372.6,20893.8,22997.5,25135.4,26529.1,27531.2,28525.2,29516.8,30613.8,31788.4,33032.1,34322.7,35654.3,37026.3 -TPY,12429.6,12087.5,12429.3,13202,13887.7,14166.9,14694.2,15458.5,15928.7,16850.2,17706,18424.4,19627.6,21076.8,21542.2,22671,23704.3,24711.9,25766.2,26830.9,27985.3,29159.3,30402.8,31669,33002.8 -Wages,6531.9,6251.4,6377.5,6633.2,6932.1,7124.7,7477.8,7854.8,8085.3,8474.7,8900.5,9323.5,9444.1,10326.9,11233.1,11725.2,12128,12540.6,13001,13503.9,14020.9,14547.5,15094.7,15665.6,16257.7 -SCHC,979.5,937.5,986.7,1068.1,1187.9,1253.5,1268.5,1336.8,1298.7,1466.4,1541.5,1560.5,1579.9,1723.1,1845.7,1927.4,1987.8,2054.7,2127.9,2206.1,2295.5,2388.7,2484.3,2583,2685 -SCHF,47,35.5,46,75.5,72.3,83.2,78.1,40,43.2,39.5,38.9,38.4,70.2,97.8,66.4,57.7,51.5,47.7,45.5,44.8,44.9,45.6,46.4,47.4,48.4 -INTS,1361.6,1264.3,1195,1231.6,1255.9,1255.2,1302,1302.8,1415.3,1553.4,1615,1652,1614.4,1640.3,1626,1797.7,2008,2192.2,2357.5,2495.4,2648.2,2790.1,2946.6,3101,3252.8 -DIVS,805.4,553.7,544.6,682.2,832.7,824.5,815.5,951.1,962.5,1154.5,1253.3,1316,1297.8,1300.5,1413.9,1538.2,1633.2,1708.9,1761.4,1798.7,1838.4,1889.5,1951.4,2020.4,2096.3 -RENTS,262.1,333.7,402.8,485.3,533,595.8,610.8,659.6,707.4,652.7,681.9,692.1,711.6,727.5,772.3,813.4,836.3,844.2,862.7,899.5,937,978.8,1024,1074.1,1127.4 -CGNS,498,263,394,404,647,511,716,725,641,871,944,881,1157,1329,1406,1363,1252,1193,1164,1161,1177,1204,1240,1280,1324 -BOOK,1285.1,1397,1746.4,1816.6,2022.8,2106.9,2072.9,2088.1,2073.5,2128.9,2305,2367.8,2243.8,2811.1,2964.3,3011.1,3004.1,3051.2,3053.4,3091,3176.7,3304.2,3431.3,3555.3,3684.4 -RETS,142.5,140.5,142.9,145.4,144.9,146.6,148.3,147.8,149.7,149.9,152.5,153.5,160.1,164.3,160.7,163.8,165.4,167.1,168.8,170.6,172.5,174.3,176.2,178.1,180.1 -SOCSEC,503,544.5,572.5,591.5,627.2,663.2,698.2,733.7,762.1,791.1,833,887.2,940.9,996.3,1063.4,1148.7,1226.1,1302.8,1383.6,1467.4,1557.4,1650.6,1746.5,1844.8, -CPIU,215.3,214.5,218.1,224.9,229.6,233,236.7,237,240,245.1,251.1,255.6,258.8,271,287.5,296.4,303.5,310.5,317.7,325.1,332.8,340.7,348.7,356.9,365.2 -CPIM,364.1,375.6,388.4,400.3,414.9,425.1,435.3,446.8,463.7,475.3,484.7,498.4,518.9,525.3,538.7,505.6,512.7,519.7,526.9,534.3,542,549.9,557.9,566.1,574.4 -UCOMP,51.1,131.2,138.9,107.2,83.6,62.2,43.8,39.9,31.2,31.1,28.7,27,27.925,240.656,36.743,27.511,31.4,33.922,36.907,40.003,43.608,46.439,48.195,49.829,51.225 \ No newline at end of file +,2008,2009,2010,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033 +GDP,14718.6,14418.7,14964.4,15517.9,16163.2,16800,17348.1,18036.7,18624.5,19479.6,20527.2,21372.6,21060.5,23315.1,25419.5,26438.4,27591.9,28947,30262.4,31573.1,32843.4,34138.2,35468.3,36831.8,38224.9,39645.9 +TPY,12429.6,12087.5,12429.3,13202,13887.7,14166.9,14694.2,15458.5,15928.7,16850.2,17706,18424.4,19832.3,21294.8,21766.7,23120.9,24197.9,25223.9,26400.2,27559.6,28745.6,29949.9,31206.2,32491.9,33855.8,35242.2 +Wages,6531.9,6251.4,6377.5,6633.2,6932.1,7124.7,7477.8,7854.8,8085.3,8474.7,8900.5,9323.5,9457.4,10290.1,11160.2,11719,12275.6,12874.2,13431.8,13945.9,14481.3,15039,15610.8,16196.8,16790.9,17394.6 +SCHC,979.5,937.5,986.7,1068.1,1187.9,1253.5,1268.5,1336.8,1298.7,1466.4,1541.5,1560.5,1598,1702.3,1754,1818.5,1905.9,2003.6,2108.8,2211.1,2314.3,2419.4,2525.5,2632.6,2741.7,2851.7 +SCHF,47,35.5,46,75.5,72.3,83.2,78.1,40,43.2,39.5,38.9,38.4,45.2,51.3,90.1,93.8,82.3,72.9,66.7,62.8,60.5,59.1,58.4,58.1,58.1,58.3 +INTS,1361.6,1264.3,1195,1231.6,1255.9,1255.2,1302,1302.8,1415.3,1553.4,1615,1652,1647.3,1658.6,1753.4,2074.3,2259.3,2344.8,2512,2682,2818.5,2936.4,3058,3175.5,3298.6,3432.7 +DIVS,805.4,553.7,544.6,682.2,832.7,824.5,815.5,951.1,962.5,1154.5,1253.3,1316,1448.1,1543.9,1621.6,1660.1,1654.4,1685.9,1746.3,1821.7,1900.3,1975.9,2053,2131.9,2212.5,2294.8 +RENTS,262.1,333.7,402.8,485.3,533,595.8,610.8,659.6,707.4,652.7,681.9,692.1,719.9,723.8,783.4,840.8,865.4,873,892,929.9,969.1,1012.5,1059.2,1110.7,1165.3,1216.6 +CGNS,498,263,394,404,647,511,716,725,641,871.3,944,881,1147.7,2033.6,1694.2,1480.2,1364.7,1308.8,1280.8,1277.1,1288.6,1312.4,1345.5,1385,1429.2,1476.8 +BOOK,1285.1,1397,1746.4,1816.6,2022.8,2106.9,2072.9,2088.1,2073.5,2128.9,2305,2367.8,2260.1,2771.1,2925.1,2573.6,2594.4,2866.3,3060.7,3237.6,3364.5,3476.4,3597.2,3723.9,3860.9,3997.7 +RETS,142.5,140.5,142.9,145.4,144.9,146.6,148.3,147.8,149.7,149.9,152.5,153.5,160.1,164.4,170.7,167.3,168.6,169.9,171.2,172.6,174,175.5,177,178.6,180.1,181.6 +SOCSEC,503,544.5,572.5,591.5,627.2,663.2,698.2,733.7,762.1,791.1,833,888.1,940.2,982.7,1063.4,1148.7,1226.1,1302.8,1383.6,1467.4,1557.4,1650.6,1746.5,1844.8,, +CPIU,215.3,214.5,218.1,224.9,229.6,233,236.7,237,240,245.1,251.1,255.6,258.8,271,292.9,306.9,316.2,323.1,329.7,336.5,343.8,351.6,359.6,367.8,376.1,384.7 +CPIM,364.1,375.6,388.4,400.3,414.9,425.1,435.3,446.8,463.7,475.3,484.7,498.4,518.9,525.3,546.6,551.6,527.7,534.6,541.2,548,555.3,563.1,571.1,579.3,587.6,596.2 +UCOMP,51.1,131.2,138.9,107.2,83.6,62.2,43.8,39.9,31.2,31.1,28.7,27,27.925,240.656,36.743,27.511,31.4,33.922,36.907,40.003,43.608,46.439,48.195,49.829,51.225, \ No newline at end of file diff --git a/puf_stage1/Stage_II_targets.csv b/puf_stage1/Stage_II_targets.csv index 9df91d0..0ef58f2 100644 --- a/puf_stage1/Stage_II_targets.csv +++ b/puf_stage1/Stage_II_targets.csv @@ -1,31 +1,31 @@ -,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032 -US Population,311721632,314112078,316497531,318857056,321368864,323995528,326625791,329256465,331883986,334503458,337108968,339698079,342267302,344814299,347334912,349825585,352281475,354698370,357072830,359402194,361684740,363919527 -POP_DEP,82840576,82503131,82296428,82135602,82109509,82178228,82284937,82410728,82547300,82624346,82772040,83023463,83259014,83463249,83673850,83868421,84024180,84193698,84484144,84767392,85040759,85334627 -POP_SNR,41366628,43164909,44723041,46243211,47830245,49420383,51055052,52766466,54556914,56441027,58292098,60221375,62126945,63987872,65919552,67748101,69455598,71098995,72675827,74107408,75245391,76250731 -Single Returns,67294506,66655855,68563354,69579590,71086947,71410690,73021932,74164397,75166909,76052548,76951274,77812834,78684040,79565000,80455824,81356621,82267505,83188586,84119980,85061802,86014169,86977199 -Joint Returns,56013790,56458434,56796607,55128595,57272012,57201828,57987204,58894443,59690545,60393837,61107520,61791691,62483522,63183098,63890507,64605837,65329175,66060612,66800238,67548145,68304426,69069175 -Head of Household Returns,22061944,21814184,21991339,22077498,22134303,21659639,21894095,22236639,22537222,22802762,23072226,23330546,23591759,23855897,24122992,24393077,24666186,24942353,25221612,25503998,25789545,26078289 -Number of Returns w/ Gross Security Income,25837226,26480552,27070833,27401498,28087514,28329015,28967603,29938625,30954489,32023496,33073756,34168389,35249571,36305423,37401419,38438901,39407700,40340131,41234793,42047043,42692712,43263121 -Number of Dependent Exemptions,99345455,97912393,97691386,96916673,96505181,94809260,94708629,94853412,95010605,95099283,95269277,95558660,95829776,96064847,96307245,96531193,96710470,96905582,97239881,97565894,97880535,98218773 -Taxable Interest Income,120111673,111789613,100648711,93894280,95881223,96640233,106055367,110260987,112787090,110220023,111988296,111011991,122734475,137092299,149668196,160953732,170368587,180800710,190488657,201173390,211714750,222078600 -Ordinary Dividends,194609806,260393306,214972683,254702232,260252720,254065327,282336042,306497844,321831296,317380438,318040730,345773001,376170896,399403399,417916035,430755049,439876863,449585604,462082245,477220054,494094187,512655734 -Business Income (Schedule C),337210620,356450905,357363490,374659000,391975736,389078638,416010104,437315586,442705788,448209468,488834568,523615554,546793422,563928590,582907775,603674236,625859172,651221491,677661849,704783075,732783755,761720628 -Business Loss (Schedule C),54240803,52259366,55290946,57400238,60161435,60996610,69637956,73204384,74106676,75027964,81828397,87650556,91530412,94398751,97575769,101051968,104765613,109011135,113437115,117977069,122664239,127508123 -Net Capital Gains in AGI,402566646,644856734,504322768,705007630,713598090,634341278,859894631,931963871,869767130,1142248092,1312055068,1388073308,1345621564,1236036829,1177789087,1149158841,1146197091,1161993089,1188648836,1224189831,1263679825,1307118819 -Taxable Pensions and Annuities,581180358,612544219,638659076,663223262,689991999,693626543,729187412,766221903,797310451,849378574,912092275,932232322,981080807,1025796559,1069400150,1115024670,1161099247,1211055565,1261860067,1315672161,1370466591,1428186391 -Supplemental Income (Schedule E),661331485,777023944,780713118,846331543,891134646,882933054,973306129,1053816820,1082528185,1025836954,1285199333,1355240433,1376636801,1373436489,1394970013,1395975825,1413166069,1452347024,1510638410,1568746921,1625438151,1684461037 -Supplemental Loss (Schedule E),175315530,163765597,167171652,166947674,177896945,176446339,206369393,223440016,229527666,217507466,272499883,287350647,291887303,291208743,295774481,295987742,299632577,307940087,320299567,332620273,344640473,357155053 -Gross Social Security Income,490699539,526514454,553542772,575126918,605152093,619856114,644989570,679150944,723340597,767122597,812290619,866997736,936543445,999648226,1062182293,1128059119,1196381867,1269759520,1345746156,1423934122,1504078825,1504078825 -Unemployment Compensation,92383693,71234134,51923279,33288898,27225383,25420264,23946035,22098109,20789162,21501384,185297653,28290970,21182616,24177026,26118887,28417245,30801069,33576807,35756589,37108655,38366784,39441661 -Wages and Salaries: Zero or Less,21437416,20445434,20280688,19421543,20111022,20544631,20869123,21917664,22959310,23256290,25430204,27661740,28873546,29865449,30881485,32015230,33253631,34526755,35823518,37171009,38576862,40034921 -"Wages and Salaries: $1 Less Than $10,000",92961755,93108807,94466204,94899140,91906875,90725454,86507256,90853698,95171558,96402607,105413971,114664195,119687408,123799073,128010773,132710401,137843857,143121242,148496620,154082278,159909858,165953841 -"Wages and Salaries: $10,000 Less Than $20,000",265080549,262184682,266041138,261995646,261659142,253415638,247511878,259947782,272301910,275824150,301607185,328073640,342445900,354210067,366260453,379706884,394394568,409494058,424873924,440855434,457529125,474821983 -"Wages and Salaries: $20,000 Less Than $30,000",373549061,371577702,380567075,381259619,383184602,382875414,382789227,402021961,421128224,426575541,466450266,507381933,529609337,547803196,566439706,587235270,609950493,633302592,657088308,681804494,707591173,734335424 -"Wages and Salaries: $30,000 Less Than $40,000",410623212,408353008,408654349,418567676,428313928,436140082,441282302,463453943,485479786,491759495,537727377,584913711,610537629,631511647,652995957,676969239,703155519,730075994,757496347,785989352,815716430,846547404 -"Wages and Salaries: $40,000 Less Than $50,000",391671646,391349650,410049846,418379915,424369612,426147995,437485582,459466462,481302798,487528477,533100860,579881210,605284664,626078226,647377688,671144707,697105685,723794541,750978973,779226830,808698141,839263850 -"Wages and Salaries: $50,000 Less Than $75,000",900170384,902783183,915963625,916618937,952347137,962308451,1000500360,1050769166,1100707412,1114945125,1219166126,1326149668,1384245675,1431799163,1480509613,1534863202,1594234228,1655269862,1717438846,1782039811,1849438734,1919340473 -"Wages and Salaries: $75,000 Less Than $100,000",791646425,798324358,822009437,840581301,835434509,852517230,870406373,914138780,957583610,969970008,1060639264,1153711852,1204253697,1245623856,1288000538,1335286589,1386937664,1440036900,1494122118,1550323089,1608958202,1669770693 -"Wages and Salaries: $100,000 Less Than $200,000",1521442934,1599743841,1665691829,1759304940,1876094165,1922367424,2015029480,2116271949,2216848662,2245523725,2455427087,2670894268,2787900888,2883674647,2981778552,3091247864,3210822400,3333749494,3458959180,3589066928,3724809825,3865593446 -"Wages and Salaries: $200,000 Less Than $500,000",750627685,806518068,872227137,955295796,1055689937,1106449651,1206754121,1267385873,1327618918,1344791744,1470497968,1599536233,1669608767,1726965436,1785717575,1851276190,1922886589,1996504756,2071489914,2149408407,2230701660,2315013685 -"Wages and Salaries: $500,000 Less Than $1 Million",230634407,259165177,272996984,310372311,337666673,343994542,379375686,398436911,417372793,422771534,462290674,502857330,524886520,542918135,561388454,581998571,604511231,627655086,651228692,675724470,701281195,727786953 -Wages and Salaries: $1 Million and Over,305543960,387803684,346432571,408251028,336316005,310089733,367731740,386207931,404562625,409795665,448101869,487423438,508776499,526254681,544158101,564135645,585957337,608390852,631240927,654984872,679757200,705449433 +,2011,2012,2013,2014,2015,2016,2017,2018,2019,2020,2021,2022,2023,2024,2025,2026,2027,2028,2029,2030,2031,2032,2033 +US Population,311721632,314112078,316497531,318857056,321368864,323995528,326625791,329256465,331883986,334503458,337108968,339698079,342267302,344814299,347334912,349825585,352281475,354698370,357072830,359402194,361684740,363919527,366106294 +POP_DEP,82840576,82503131,82296428,82135602,82109509,82178228,82284937,82410728,82547300,82624346,82772040,83023463,83259014,83463249,83673850,83868421,84024180,84193698,84484144,84767392,85040759,85334627,85631465 +POP_SNR,41366628,43164909,44723041,46243211,47830245,49420383,51055052,52766466,54556914,56441027,58292098,60221375,62126945,63987872,65919552,67748101,69455598,71098995,72675827,74107408,75245391,76250731,77185290 +Single Returns,67294506,66655855,68563354,69579590,71086947,71410690,73021932,74164397,75166909,76052548,76951274,77812834,78684040,79565000,80455824,81356621,82267505,83188586,84119980,85061802,86014169,86977199,87951011 +Joint Returns,56013790,56458434,56796607,55128595,57272012,57201828,57987204,58894443,59690545,60393837,61107520,61791691,62483522,63183098,63890507,64605837,65329175,66060612,66800238,67548145,68304426,69069175,69842485 +Head of Household Returns,22061944,21814184,21991339,22077498,22134303,21659639,21894095,22236639,22537222,22802762,23072226,23330546,23591759,23855897,24122992,24393077,24666186,24942353,25221612,25503998,25789545,26078289,26370266 +Number of Returns w/ Gross Security Income,25837226,26480552,27070833,27401498,28087514,28329015,28967603,29938625,30954489,32023496,33073756,34168389,35249571,36305423,37401419,38438901,39407700,40340131,41234793,42047043,42692712,43263121,43793371 +Number of Dependent Exemptions,99345455,97912393,97691386,96916673,96505181,94809260,94708629,94853412,95010605,95099283,95269277,95558660,95829776,96064847,96307245,96531193,96710470,96905582,97239881,97565894,97880535,98218773,98560428 +Taxable Interest Income,120111673,111789613,100648711,93894280,95881223,96640233,106055367,110260987,112787090,112466207,113237693,119709978,141618802,154249318,160086664,171501920,183108339,192427612,200477005,208779009,216801093,225205506,234360923 +Ordinary Dividends,194609806,260393306,214972683,254702232,260252720,254065327,282336042,306497844,321831296,354136702,377564846,396566588,405981865,404587915,412291324,427062304,445501574,464723413,483211594,502066604,521361809,541072753,561199436 +Business Income (Schedule C),337210620,356450905,357363490,374659000,391975736,389078638,416010104,437315586,442705788,453344344,482933715,497600738,515899055,540693983,568410969,598255665,627277647,656554953,686371280,716471302,746855019,777806125,809012557 +Business Loss (Schedule C),54240803,52259366,55290946,57400238,60161435,60996610,69637956,73204384,74106676,75887516,80840625,83295809,86358854,90509397,95149078,100144927,105003058,109903929,114895029,119933618,125019697,130200753,135424549 +Net Capital Gains in AGI,402566646,644856734,504322768,705007630,713598090,634341278,859894631,931642984,869467657,1132676539,2006980055,1672022821,1460824094,1346835996,1291667730,1264034252,1260382685,1271732149,1295220606,1327887325,1366870267,1410491687,1457468600 +Taxable Pensions and Annuities,581180358,612544219,638659076,663223262,689991999,693626543,729187412,766221903,797310451,858236906,921526160,941947493,1000550096,1047156952,1091556798,1142460832,1192633524,1243957322,1296073048,1350439058,1406077345,1465099713,1525095762 +Supplemental Income (Schedule E),661331485,777023944,780713118,846331543,891134646,882933054,973306129,1053816820,1082528185,1033289108,1266911839,1337318689,1176617339,1186126836,1310436074,1399313293,1480189733,1538206807,1589366070,1644594301,1702519937,1765154603,1827697831 +Supplemental Loss (Schedule E),175315530,163765597,167171652,166947674,177896945,176446339,206369393,223440016,229527666,219087541,268622399,283550712,249477322,251493613,277850811,296695383,313843556,326144874,336992136,348702137,360984068,374264451,387525446 +Gross Social Security Income,490699539,526514454,553542772,575126918,605152093,619856114,644989570,679150944,724074374,766551882,801202440,866997736,936543445,999648226,1062182293,1128059119,1196381867,1269759520,1345746156,1423934122,1504078825,1504078825,1504078825 +Unemployment Compensation,92383693,71234134,51923279,33288898,27225383,25420264,23946035,22098109,20789162,21501384,185297653,28290970,21182616,24177026,26118887,28417245,30801069,33576807,35756589,37108655,38366784,39441661,39441661 +Wages and Salaries: Zero or Less,21437416,20445434,20280688,19421543,20111022,20544631,20869123,21917664,22959310,23289042,25339583,27482222,28858278,30228917,31702982,33076084,34342065,35660499,37033847,38441916,39884953,41347936,42834560 +"Wages and Salaries: $1 Less Than $10,000",92961755,93108807,94466204,94899140,91906875,90725454,86507256,90853698,95171558,96538370,105038328,113920054,119624120,125305730,131416064,137107881,142355663,147820870,153513708,159350475,165332192,171396590,177558983 +"Wages and Salaries: $10,000 Less Than $20,000",265080549,262184682,266041138,261995646,261659142,253415638,247511878,259947782,272301910,276212590,300532405,325944524,342264823,358520869,376003566,392288818,407303609,422940489,439228661,455928638,473043339,490394609,508026256 +"Wages and Salaries: $20,000 Less Than $30,000",373549061,371577702,380567075,381259619,383184602,382875414,382789227,402021961,421128224,427176282,464788066,504089151,529329292,554470062,581507908,606693846,629914956,654098155,679288610,705115941,731584664,758419252,785687457 +"Wages and Salaries: $30,000 Less Than $40,000",410623212,408353008,408654349,418567676,428313928,436140082,441282302,463453943,485479786,492452033,535811181,581117768,610214792,639197261,670366693,699401232,726170703,754049276,783089023,812862964,843376307,874311422,905746413 +"Wages and Salaries: $40,000 Less Than $50,000",391671646,391349650,410049846,418379915,424369612,426147995,437485582,459466462,481302798,488215057,531201150,576117927,604964605,633697713,664598969,693383700,719922850,747561561,776351454,805869225,836120037,866788991,897953521 +"Wages and Salaries: $50,000 Less Than $75,000",900170384,902783183,915963625,916618937,952347137,962308451,1000500360,1050769166,1100707412,1116515287,1214821617,1317543290,1383513720,1449224423,1519893534,1585722295,1646415563,1709623451,1775464018,1842969193,1912150782,1982288635,2053559838 +"Wages and Salaries: $75,000 Less Than $100,000",791646425,798324358,822009437,840581301,835434509,852517230,870406373,914138780,957583610,971336004,1056859667,1146224551,1203616917,1260783328,1322263411,1379532529,1432333916,1487322951,1544602339,1603329889,1663515870,1724533773,1786537659 +"Wages and Salaries: $100,000 Less Than $200,000",1521442934,1599743841,1665691829,1759304940,1876094165,1922367424,2015029480,2116271949,2216848662,2248686066,2446677151,2653560834,2786426714,2918769500,3061098627,3193679183,3315916743,3443218805,3575823138,3711780028,3851113253,3992372414,4135914167 +"Wages and Salaries: $200,000 Less Than $500,000",750627685,806518068,872227137,955295796,1055689937,1106449651,1206754121,1267385873,1327618918,1346685596,1465257836,1589155645,1668725919,1747982924,1833220516,1912619916,1985825138,2062063371,2141477011,2222898419,2306341835,2390938649,2476902455 +"Wages and Salaries: $500,000 Less Than $1 Million",230634407,259165177,272996984,310372311,337666673,343994542,379375686,398436911,417372793,423366917,460643297,499593913,524608973,549525549,576322284,601283625,624297660,648265204,673231022,698828036,725060723,751656012,778681052 +Wages and Salaries: $1 Million and Over,305543960,387803684,346432571,408251028,336316005,310089733,367731740,386207931,404562625,410372775,446505054,484260182,508507471,532659297,558633576,582828795,605136474,628368396,652567954,677379335,702806878,728585894,754781470 diff --git a/puf_stage1/Stage_I_factors.csv b/puf_stage1/Stage_I_factors.csv index d63d5e0..1c2da1c 100644 --- a/puf_stage1/Stage_I_factors.csv +++ b/puf_stage1/Stage_I_factors.csv @@ -6,18 +6,19 @@ YEAR,APOPN,APOPDEP,APOPSNR,AGDPN,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,ARETS,AWAGE,ASCHC 2015,1.0309,0.9912,1.1563,1.1623,1.1709,0.5298,1.1495,1.0538,1.1162,1.0352,1.1565,1.1624,1.1092,1.3475,1.0147,0.7983,1.3373,1.7726,1.2332,0.2947,0.7938,1.0621 2016,1.0394,0.9920,1.1947,1.2002,1.2065,0.5722,1.1414,1.0671,1.1584,1.0337,1.1738,1.1538,1.1246,1.3351,1.0065,0.8046,1.3055,1.5757,1.2632,0.2752,0.7952,1.1748 2017,1.0478,0.9933,1.2342,1.2553,1.2763,0.5232,1.1719,1.0898,1.1874,1.0518,1.2313,1.2337,1.2839,1.4717,1.1771,0.8830,1.4508,2.1360,1.3144,0.2592,0.8185,1.1984 -2018,1.0563,0.9948,1.2756,1.3228,1.3412,0.5152,1.2689,1.1165,1.2108,1.0683,1.2932,1.2969,1.3496,1.5935,1.2745,0.9180,1.5749,2.3151,1.3840,0.2392,0.8601,1.3326 -2019,1.0647,0.9965,1.3189,1.3773,1.3956,0.5086,1.3034,1.1365,1.2451,1.0827,1.3547,1.3128,1.3663,1.6369,1.3092,0.9390,1.6537,2.1606,1.4741,0.2250,0.8950,1.4158 -2020,1.0731,0.9974,1.3644,1.3464,1.4867,0.9298,1.2352,1.1507,1.2963,1.0955,1.3722,1.3292,1.3832,1.5512,1.2407,0.9176,1.6309,2.8374,1.5633,0.2327,0.9534,1.4223 -2021,1.0814,0.9992,1.4092,1.4820,1.5965,1.2954,1.5475,1.2050,1.3123,1.1084,1.5005,1.4496,1.5086,1.9434,1.5543,0.9324,1.6342,3.2592,1.6554,2.0057,1.0238,1.4764 -2022,1.0897,1.0022,1.4558,1.6198,1.6317,0.8795,1.6318,1.2783,1.3457,1.1208,1.6321,1.5528,1.6160,2.0493,1.6390,0.9242,1.7768,3.4481,1.7669,0.3062,1.0464,1.5326 -2023,1.0980,1.0051,1.5019,1.7096,1.7172,0.7642,1.6575,1.3179,1.2631,1.1334,1.7036,1.6215,1.6875,2.0816,1.6649,1.0218,1.9329,3.3426,1.9086,0.2293,1.1012,1.5909 -2024,1.1062,1.0075,1.5468,1.7742,1.7955,0.6821,1.6537,1.3495,1.2808,1.1461,1.7621,1.6723,1.7404,2.0768,1.6611,1.1414,2.0523,3.0704,2.0372,0.2617,1.1514,1.6514 -2025,1.1142,1.0101,1.5935,1.8382,1.8718,0.6318,1.6796,1.3806,1.2983,1.1589,1.8221,1.7286,1.7989,2.1093,1.6871,1.2461,2.1475,2.9257,2.1646,0.2827,1.2004,1.7143 -2026,1.1222,1.0124,1.6377,1.9021,1.9517,0.6026,1.6808,1.4126,1.3163,1.1719,1.8890,1.7902,1.8630,2.1109,1.6883,1.3400,2.2134,2.8546,2.2989,0.3076,1.2516,1.7795 -2027,1.1301,1.0143,1.6790,1.9728,2.0323,0.5934,1.7015,1.4455,1.3347,1.1850,1.9621,1.8560,1.9315,2.1368,1.7091,1.4184,2.2603,2.8472,2.4381,0.3334,1.3033,1.8472 -2028,1.1379,1.0163,1.7188,2.0485,2.1198,0.5947,1.7487,1.4798,1.3540,1.1983,2.0372,1.9312,2.0098,2.1961,1.7565,1.5053,2.3102,2.8865,2.5877,0.3634,1.3594,1.9175 -2029,1.1455,1.0198,1.7569,2.1286,2.2087,0.6040,1.8189,1.5149,1.3737,1.2117,2.1137,2.0096,2.0914,2.2842,1.8270,1.5859,2.3744,2.9527,2.7425,0.3870,1.4164,1.9904 -2030,1.1530,1.0233,1.7915,2.2118,2.3029,0.6146,1.8889,1.5505,1.3937,1.2252,2.1932,2.0900,2.1751,2.3721,1.8973,1.6749,2.4522,3.0410,2.9018,0.4017,1.4768,2.0662 -2031,1.1603,1.0266,1.8190,2.2976,2.3988,0.6278,1.9571,1.5869,1.4142,1.2390,2.2761,2.1731,2.2615,2.4578,1.9658,1.7626,2.5389,3.1391,3.0652,0.4153,1.5383,2.1448 -2032,1.1675,1.0301,1.8433,2.3860,2.4998,0.6411,2.0282,1.6238,1.4349,1.2528,2.3622,2.2589,2.3508,2.5471,2.0372,1.8489,2.6343,3.2470,3.0652,0.4269,1.6031,2.2264 +2018,1.0563,0.9948,1.2756,1.3228,1.3412,0.5152,1.2689,1.1165,1.2108,1.0683,1.2932,1.2969,1.3496,1.5935,1.2745,0.9180,1.5749,2.3143,1.3840,0.2392,0.8601,1.3326 +2019,1.0647,0.9965,1.3189,1.3773,1.3956,0.5086,1.3034,1.1365,1.2451,1.0827,1.3547,1.3128,1.3663,1.6369,1.3092,0.9390,1.6537,2.1598,1.4756,0.2250,0.8950,1.4158 +2020,1.0731,0.9974,1.3644,1.3572,1.5022,0.5987,1.2441,1.1507,1.2963,1.0955,1.3741,1.3444,1.3991,1.5624,1.2497,0.9363,1.8197,2.8136,1.5622,0.2327,0.9633,1.4223 +2021,1.0814,0.9992,1.4092,1.5025,1.6130,0.6795,1.5254,1.2050,1.3123,1.1084,1.4951,1.4321,1.4904,1.9157,1.5322,0.9428,1.9401,4.9855,1.6328,2.0057,1.0344,1.4764 +2022,1.0897,1.0022,1.4558,1.6381,1.6487,1.1934,1.6102,1.3024,1.3655,1.1208,1.6215,1.4756,1.5357,2.0222,1.6174,0.9967,2.0378,4.1534,1.7669,0.3062,1.0573,1.5326 +2023,1.0980,1.0051,1.5019,1.7037,1.7513,1.2424,1.4167,1.3646,1.3780,1.1334,1.7027,1.5299,1.5921,1.7792,1.4230,1.1791,2.0861,3.6288,1.9086,0.2293,1.1231,1.5909 +2024,1.1062,1.0075,1.5468,1.7781,1.8329,1.0901,1.4282,1.4060,1.3183,1.1461,1.7836,1.6034,1.6687,1.7935,1.4345,1.2842,2.0790,3.3456,2.0372,0.2617,1.1754,1.6514 +2025,1.1142,1.0101,1.5935,1.8654,1.9106,0.9656,1.5778,1.4366,1.3355,1.1589,1.8706,1.6856,1.7542,1.9815,1.5849,1.3328,2.1186,3.2086,2.1646,0.2827,1.2252,1.7143 +2026,1.1222,1.0124,1.6377,1.9502,1.9997,0.8834,1.6849,1.4660,1.3520,1.1719,1.9516,1.7741,1.8463,2.1159,1.6924,1.4279,2.1945,3.1399,2.2989,0.3076,1.2824,1.7795 +2027,1.1301,1.0143,1.6790,2.0346,2.0875,0.8318,1.7822,1.4962,1.3690,1.1850,2.0263,1.8602,1.9359,2.2382,1.7902,1.5245,2.2892,3.1309,2.4381,0.3334,1.3387,1.8472 +2028,1.1379,1.0163,1.7188,2.1165,2.1774,0.8013,1.8521,1.5287,1.3872,1.1983,2.1041,1.9470,2.0262,2.3259,1.8603,1.6021,2.3880,3.1591,2.5877,0.3634,1.3963,1.9175 +2029,1.1455,1.0198,1.7569,2.1999,2.2686,0.7828,1.9137,1.5634,1.4067,1.2117,2.1851,2.0354,2.1182,2.4033,1.9222,1.6691,2.4830,3.2174,2.7425,0.3870,1.4548,1.9904 +2030,1.1530,1.0233,1.7915,2.2856,2.3637,0.7735,1.9802,1.5989,1.4267,1.2252,2.2682,2.1247,2.2111,2.4868,1.9890,1.7382,2.5799,3.2986,2.9018,0.4017,1.5158,2.0662 +2031,1.1603,1.0266,1.8190,2.3735,2.4611,0.7695,2.0499,1.6354,1.4472,1.2390,2.3533,2.2148,2.3049,2.5744,2.0591,1.8050,2.6790,3.3954,3.0652,0.4153,1.5783,2.1448 +2032,1.1675,1.0301,1.8433,2.4633,2.5644,0.7695,2.1253,1.6723,1.4679,1.2528,2.4397,2.3066,2.4004,2.6691,2.1348,1.8750,2.7803,3.5037,3.0652,0.4269,1.6445,2.2264 +2033,1.1745,1.0337,1.8659,2.5548,2.6695,0.7722,2.2006,1.7105,1.4894,1.2669,2.5274,2.3991,2.4967,2.7637,2.2104,1.9512,2.8837,3.6204,3.0652,0.4269,1.7119,2.3111 diff --git a/puf_stage1/growfactors.csv b/puf_stage1/growfactors.csv index a47feac..4d7396f 100644 --- a/puf_stage1/growfactors.csv +++ b/puf_stage1/growfactors.csv @@ -1,23 +1,24 @@ -YEAR,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS,ACGNS,ASOCSEC,AUCOMP,AIPD,ABENOTHER,ABENMCARE,ABENMCAID,ABENSSI,ABENSNAP,ABENWIC,ABENHOUSING,ABENTANF,ABENVET -2011,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2012,1.043862,0.950283,1.104992,1.0209,1.0365,1.032649,1.049023,0.956138,1.165922,0.926962,0.923588,1.327776,1.58966,1.02827,0.7711,0.9231,0.992359,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2013,1.012518,1.142179,1.033784,1.014791,1.024602,1.019984,0.99505,1.050098,0.997245,1.013128,0.893658,0.819381,0.776217,1.014786,0.728829,0.896219,0.992515,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2014,1.029476,0.931683,0.976566,1.015927,1.023917,1.039999,1.040616,1.030349,1.075978,0.991321,0.925886,1.17606,1.387522,1.004801,0.641103,0.970506,0.99257,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2015,1.043858,0.508206,0.999544,1.001235,1.026485,1.024119,1.038052,1.040061,1.04481,1.057257,1.013311,1.013846,1.004308,1.017188,0.81793,0.988666,1.053858,1.023325,1.041528,1.019361,1.102667,1.007792,1.026748,1.132657,1.04693 -2016,1.021978,1.071198,0.984833,1.012621,1.037807,1.006659,0.984484,1.005593,0.982695,0.983807,0.999649,0.968237,0.881651,0.991403,0.933831,1.001764,1.097065,1.011695,1.010367,0.993375,0.989722,1.002577,1.01625,0.828168,1.105413 -2017,1.049373,0.907035,1.018491,1.021273,1.025035,1.040577,1.060677,1.132498,1.093477,1.160123,1.088642,1.102389,1.344721,1.00723,0.94186,1.029301,1.011911,1.030968,1.014601,0.981621,1.0,0.998715,1.063959,1.0,1.0 -2018,1.042394,0.976786,1.074059,1.0245,1.019707,1.041821,1.042769,1.042713,1.074048,1.074033,1.031272,1.076804,1.075127,1.018778,0.92284,1.050825,1.103035,1.045097,1.045897,1.005738,1.0,1.002574,1.034828,1.0,1.0 -2019,1.032351,0.979401,1.019085,1.017913,1.028328,1.039292,1.004274,1.004387,1.019131,1.019122,1.014806,1.041751,0.925901,1.030133,0.940635,1.040577,1.054052,1.052158,1.045866,1.000751,1.0,1.002567,1.034809,1.0,1.0 -2020,1.056938,1.813845,0.940257,1.012495,1.041121,1.004989,1.004567,1.004445,0.940227,0.94026,0.96956,0.978493,1.302967,1.025146,1.034222,1.065251,0.996727,1.050763,1.046106,1.00255,1.0,1.003841,1.034974,1.0,1.0 -2021,1.065613,1.38251,1.243218,1.047189,1.012343,1.085107,1.08221,1.082288,1.243221,1.243145,1.00833,0.994333,1.139841,1.02525,8.619252,1.073841,1.03007,1.047248,1.047927,1.001796,1.0,1.002551,1.034869,1.0,1.0 -2022,1.014264,0.67377,1.046443,1.06083,1.025451,1.079419,1.063033,1.063033,1.04646,1.046462,0.983656,1.078978,1.049901,1.033189,0.152665,1.022075,1.030159,1.048769,1.047573,0.999851,1.0,1.002545,1.034942,1.0,1.0 -2023,1.044444,0.862335,1.008071,1.030979,0.938619,1.035918,1.036349,1.036351,1.008083,1.008124,1.097247,1.079631,0.962076,1.047041,0.748857,1.05237,1.030193,1.050822,1.048715,1.000448,1.0,1.003807,1.034968,1.0,1.0 -2024,1.037847,0.885951,0.990312,1.023978,1.014013,1.026672,1.023684,1.023703,0.990298,0.990322,1.108768,1.053902,0.911757,1.036396,1.1413,1.045587,1.030334,1.048426,1.051767,0.99776,1.0,1.002528,1.034951,1.0,1.0 -2025,1.03501,0.919607,1.008369,1.023046,1.013663,1.026626,1.026244,1.026192,1.008357,1.00836,1.083891,1.038874,0.946031,1.031398,1.080245,1.042557,1.030635,1.046248,1.052213,1.002245,1.0,1.003783,1.034897,1.0,1.0 -2026,1.035253,0.946983,0.993581,1.023178,1.013864,1.029325,1.028253,1.02825,0.993624,0.993577,1.067689,1.023339,0.968743,1.03338,1.088079,1.042652,1.030633,1.072236,1.0,0.999552,1.0,1.002513,1.034808,1.0,1.0 -2027,1.034018,0.977849,1.005239,1.02329,1.013979,1.031437,1.029508,1.029521,1.005193,1.005243,1.051108,1.01405,0.990435,1.034463,1.083875,1.041307,1.030788,1.0,1.0,1.0,1.0,1.002506,1.034863,1.0,1.0 -2028,1.035905,0.995321,1.020695,1.023729,1.01446,1.031158,1.033385,1.033406,1.020707,1.020689,1.053992,1.015071,1.006854,1.036783,1.089982,1.043045,1.030942,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2029,1.035025,1.0089,1.033243,1.023719,1.014549,1.030668,1.033693,1.033697,1.033216,1.033236,1.046554,1.020971,1.016148,1.036838,1.064942,1.04193,1.031131,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2030,1.035867,1.010931,1.03173,1.0235,1.014559,1.030862,1.033243,1.033256,1.031727,1.031723,1.04925,1.026048,1.023206,1.03765,1.037984,1.042643,1.03133,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2031,1.03509,1.015051,1.029587,1.023476,1.014709,1.031269,1.033219,1.033181,1.02961,1.029585,1.04574,1.028842,1.025765,1.04034,1.033856,1.041644,1.03151,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 -2032,1.035678,1.014887,1.029938,1.023253,1.014637,1.031428,1.033072,1.033077,1.029942,1.02993,1.042493,1.031177,1.027994,0.986817,1.027932,1.042124,1.031644,1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0 +YEAR,ATXPY,ASCHF,ABOOK,ACPIU,ACPIM,AWAGE,ASCHCI,ASCHCL,ASCHEI,ASCHEL,AINTS,ADIVS,ACGNS,ASOCSEC,AUCOMP,AIPD,ABENOTHER,ABENMCARE,ABENMCAID,ABENSSI,ABENSNAP,ABENWIC,ABENHOUSING,ABENTANF,ABENVET +2011,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1 +2012,1.043862,0.950283,1.104992,1.0209,1.0365,1.032649,1.049023,0.956138,1.165922,0.926962,0.923588,1.327776,1.58966,1.02827,0.7711,0.9231,0.992359,1,1,1,1,1,1,1,1 +2013,1.012518,1.142179,1.033784,1.014791,1.024602,1.019984,0.99505,1.050098,0.997245,1.013128,0.893658,0.819381,0.776217,1.014786,0.728829,0.896219,0.992515,1,1,1,1,1,1,1,1 +2014,1.029476,0.931683,0.976566,1.015927,1.023917,1.039999,1.040616,1.030349,1.075978,0.991321,0.925886,1.17606,1.387522,1.004801,0.641103,0.970506,0.99257,1,1,1,1,1,1,1,1 +2015,1.043858,0.508206,0.999544,1.001235,1.026485,1.024119,1.038052,1.040061,1.04481,1.057257,1.013311,1.013846,1.004308,1.017188,0.81793,0.988666,1.053858,1.023325,1.041528,1.019361,1.102667,1.007792,1.026748,1.132657,1.04693 +2016,1.021978,1.071198,0.984833,1.012621,1.037807,1.006659,0.984484,1.005593,0.982695,0.983807,0.999649,0.968237,0.881651,0.991403,0.933831,1.001764,1.097065,1.011695,1.010367,0.993375,0.989722,1.002577,1.01625,0.828168,1.105413 +2017,1.049373,0.907035,1.018491,1.021273,1.025035,1.040577,1.060677,1.132498,1.093477,1.160123,1.088642,1.102389,1.344721,1.00723,0.94186,1.029301,1.011911,1.030968,1.014601,0.981621,1,0.998715,1.063959,1,1 +2018,1.042394,0.976786,1.074059,1.0245,1.019707,1.041821,1.042769,1.042713,1.074048,1.074033,1.031272,1.076804,1.074755,1.018778,0.92284,1.050825,1.103035,1.045097,1.045897,1.005738,1,1.002574,1.034828,1,1 +2019,1.032351,0.979401,1.019085,1.017913,1.028328,1.039292,1.004274,1.004387,1.019131,1.019122,1.014806,1.041751,0.925878,1.031182,0.940635,1.040577,1.054052,1.052158,1.045866,1.000751,1,1.002567,1.034809,1,1 +2020,1.067957,1.167938,0.947032,1.012495,1.041121,1.006381,1.016054,1.015991,0.947016,0.94708,0.989319,1.091767,1.292516,1.023383,1.034222,1.076313,0.996727,1.050763,1.046106,1.00255,1,1.003841,1.034974,1,1 +2021,1.065517,1.126248,1.216697,1.047189,1.012343,1.079707,1.057058,1.05708,1.216716,1.216644,0.999214,1.057982,1.758329,1.011965,8.619252,1.073809,1.03007,1.047248,1.047927,1.001796,1,1.002551,1.034869,1,1 +2022,1.014347,1.742914,1.047552,1.08083,1.04054,1.076282,1.022527,1.022546,1.047553,1.047566,1.049118,1.042358,0.82675,1.04749,0.152665,1.022138,1.030159,1.048769,1.047573,0.999851,1,1.002545,1.034942,1,1 +2023,1.054201,1.03319,0.873178,1.047758,1.009154,1.042139,1.028961,1.028889,0.873183,0.873156,1.174061,1.015964,0.867089,1.047041,0.748857,1.062234,1.030193,1.050822,1.048715,1.000448,1,1.003807,1.034968,1,1 +2024,1.038836,0.870911,1.000645,1.030339,0.956676,1.039748,1.040273,1.040343,1.000565,1.000609,1.081062,0.989209,0.915123,1.036396,1.1413,1.046568,1.030334,1.048426,1.051767,0.99776,1,1.002528,1.034951,1,1 +2025,1.034907,0.87943,1.096815,1.021764,1.013047,1.041247,1.043718,1.04369,1.09689,1.096912,1.030393,1.011731,0.952165,1.031398,1.080245,1.042369,1.030635,1.046248,1.052213,1.002245,1,1.003783,1.034897,1,1 +2026,1.039173,0.90835,1.060267,1.020465,1.012355,1.035864,1.045,1.044999,1.060215,1.060215,1.063716,1.028441,0.971613,1.03338,1.088079,1.046686,1.030633,1.072236,1,0.999552,1,1.002513,1.034808,1,1 +2027,1.036609,0.935007,1.050354,1.0206,1.012574,1.031018,1.041202,1.0412,1.050406,1.050393,1.060188,1.035861,0.990163,1.034463,1.083875,1.043902,1.030788,1,1,1,1,1.002506,1.034863,1,1 +2028,1.035916,0.956729,1.032098,1.021722,1.013294,1.031277,1.039487,1.039471,1.03206,1.032034,1.043698,1.036009,1.002091,1.036783,1.089982,1.043027,1.030942,1,1,1,1,1,1,1,1 +2029,1.034972,0.970431,1.026404,1.022699,1.014057,1.031606,1.038467,1.038469,1.026422,1.026419,1.034908,1.032884,1.011698,1.036838,1.064942,1.041896,1.031131,1,1,1,1,1,1,1,1 +2030,1.035143,0.981692,1.028019,1.022707,1.014218,1.031278,1.037083,1.037068,1.028013,1.028021,1.034625,1.032267,1.018569,1.03765,1.037984,1.04193,1.03133,1,1,1,1,1,1,1,1 +2031,1.034656,0.98857,1.028686,1.022828,1.014369,1.030991,1.035848,1.035864,1.028713,1.028731,1.031897,1.031879,1.02287,1.04034,1.033856,1.041232,1.03151,1,1,1,1,1,1,1,1 +2032,1.035547,0.993833,1.030388,1.022563,1.014303,1.030321,1.035026,1.035011,1.030391,1.03037,1.032375,1.031412,1.025532,0.986817,1.027932,1.041944,1.031644,1,1,1,1,1,1,1,1 +2033,1.03478,0.997528,1.029259,1.022843,1.014647,1.029773,1.033903,1.033919,1.029271,1.029242,1.034438,1.031009,1.027149,0.987888,1,1.040985,1.031857,1,1,1,1,1,1,1,1 \ No newline at end of file diff --git a/puf_stage1/stage1.py b/puf_stage1/stage1.py index 6f1ce5f..93f1789 100644 --- a/puf_stage1/stage1.py +++ b/puf_stage1/stage1.py @@ -4,7 +4,7 @@ CUR_PATH = os.path.abspath(os.path.dirname(__file__)) SYR = 2011 # calendar year used to normalize factors BEN_SYR = 2014 # calendar year used just for the benefit start year -EYR = 2032 # last calendar year we have data for +EYR = 2033 # last calendar year we have data for SOI_YR = 2017 # most recently available SOI estimates IRS_RET_YR = 2022 # most recently available IRS return projections diff --git a/puf_stage1/updatecbo.py b/puf_stage1/updatecbo.py index 3d06d94..654d1b4 100644 --- a/puf_stage1/updatecbo.py +++ b/puf_stage1/updatecbo.py @@ -95,6 +95,7 @@ def update_econproj(url, baseline, text_args): # pull all of the latest CBO reports and use them for needed updates session = HTMLSession() r = session.get(url) + cbo_pre_url = "https://www.cbo.gov" divs = r.html.find("div.view.view-recurring-data") revprojections = divs[4] # both assertions are there to throw errors if the order of sections change @@ -104,7 +105,8 @@ def update_econproj(url, baseline, text_args): rev_link = latest_revprojections.find("a")[0] _rev_report = datetime.strptime(rev_link.text, "%b %Y") rev_report = datetime.strftime(_rev_report, "%B %Y") - rev_url = rev_link.attrs["href"] + rev_file_url = rev_link.attrs["href"] + rev_url = "".join([cbo_pre_url, rev_file_url]) econprojections = divs[8] assert "10-Year Economic Projections" in econprojections.text @@ -112,7 +114,8 @@ def update_econproj(url, baseline, text_args): econ_link = latest_econprojections.find("a")[0] _cbo_report = datetime.strptime(econ_link.text, "%b %Y") cbo_report = datetime.strftime(_cbo_report, "%B %Y") - econ_url = econ_link.attrs["href"] + econ_file_url = econ_link.attrs["href"] + econ_url = "".join([cbo_pre_url, econ_file_url]) if cbo_report == text_args["current_cbo"]: print("\tNo new data since last update") @@ -189,7 +192,9 @@ def update_econproj(url, baseline, text_args): ) cg_proj.index = cg_proj[cg_proj.columns[0]] var = "Capital Gains Realizationsa" - cgns = cg_proj[var]["Billions of Dollars"].loc[list(range(2017, 2032))] + # increase the CBO final year to (the last year + 1) for each update. + # e.g. when the CBO final year from CBO is 2033, make the update as range(2017,2034) + cgns = cg_proj[var]["Billions of Dollars"].loc[list(range(2017, 2034))] var_list = [cgns] var_names = ["CGNS"] df = pd.DataFrame(var_list, index=var_names).round(1) diff --git a/puf_stage2/puf_weights.csv.gz b/puf_stage2/puf_weights.csv.gz index e36a9ee..3e68e48 100644 Binary files a/puf_stage2/puf_weights.csv.gz and b/puf_stage2/puf_weights.csv.gz differ diff --git a/puf_stage2/solver.jl b/puf_stage2/solver.jl index db9ccbf..fc5fe4d 100644 --- a/puf_stage2/solver.jl +++ b/puf_stage2/solver.jl @@ -82,11 +82,12 @@ function Solve_func(year, tol) end -year_list = [x for x in 2012:2032] +year_list = [x for x in 2012:2033] tol_list = [0.40, 0.38, 0.35, 0.33, 0.30, - 0.45, 0.45, 0.45, 0.45, 0.45, - 0.45, 0.45, 0.45, 0.45, 0.45, - 0.45, 0.45, 0.45, 0.45, 0.45, 0.45] + 0.45, 0.45, 0.45, 0.45, 0.45, + 0.45, 0.45, 0.45, 0.45, 0.45, + 0.45, 0.45, 0.45, 0.45, 0.45, + 0.45, 0.45] # Run solver function for all years and tolerances (in order) for i in zip(year_list, tol_list) diff --git a/puf_stage2/stage2.py b/puf_stage2/stage2.py index 5afe446..e3179fe 100644 --- a/puf_stage2/stage2.py +++ b/puf_stage2/stage2.py @@ -56,7 +56,7 @@ puf.s006 = puf.matched_weight * 100 # Dataprep -year_list = [x for x in range(2012, 2032 + 1)] +year_list = [x for x in range(2012, 2033 + 1)] skipped_years = [] for i in year_list: try: diff --git a/puf_stage3/puf_ratios.csv b/puf_stage3/puf_ratios.csv index 183526e..bc78f73 100644 --- a/puf_stage3/puf_ratios.csv +++ b/puf_stage3/puf_ratios.csv @@ -7,17 +7,18 @@ INT2015,0.9813,0.9511,0.9323,0.9470,0.9543,0.9246,0.9368,0.9315,0.9463,0.9699,0. INT2016,0.9843,1.0086,1.0453,1.0314,1.0447,1.0342,1.0129,1.0016,1.0025,1.0175,0.9484,0.9531,0.9752,1.0131,1.0723,1.0130,1.0803,1.0810,0.9937 INT2017,0.9932,0.9174,0.8978,0.8924,0.8944,0.9131,0.9198,0.9410,0.9611,0.9787,1.0156,1.0693,1.0312,0.9881,0.9350,0.9756,0.9565,1.0484,1.1943 INT2018,0.9991,0.9744,0.9683,0.9667,0.9757,0.9725,0.9747,0.9779,0.9742,0.9969,0.9930,1.0038,1.0148,1.0067,1.0231,0.9898,1.0182,1.0911,0.9981 -INT2019,0.9979,0.9771,0.9763,0.9903,0.9793,0.9805,0.9769,0.9853,0.9826,0.9937,0.9934,1.0109,1.0020,1.0074,0.9985,1.0006,1.0253,1.0282,1.0196 -INT2020,1.0017,0.9799,0.9743,0.9756,0.9843,0.9849,0.9831,0.9833,0.9931,0.9965,0.9946,1.0114,1.0059,1.0047,1.0076,0.9991,1.0142,1.0115,1.0114 -INT2021,0.9958,0.9797,0.9772,0.9780,0.9829,0.9899,0.9883,0.9868,0.9920,0.9977,1.0055,0.9974,1.0066,1.0119,1.0049,1.0040,1.0295,1.0086,1.0021 -INT2022,1.0062,0.9816,0.9811,0.9784,0.9733,0.9820,0.9852,0.9895,0.9936,1.0050,1.0023,1.0045,1.0030,1.0043,1.0047,1.0045,1.0130,0.9988,1.0112 -INT2023,0.9985,0.9812,0.9761,0.9789,0.9889,0.9893,0.9851,1.0183,0.9942,0.9956,1.0022,1.0018,1.0023,1.0073,1.0005,1.0093,1.0214,1.0020,0.9943 -INT2024,1.0015,0.9841,0.9812,0.9790,0.9710,0.9788,0.9891,1.0127,0.9905,0.9983,0.9986,0.9970,1.0047,1.0073,1.0088,1.0073,1.0237,1.0145,1.0080 -INT2025,1.0086,0.9935,0.9773,0.9769,0.9835,0.9817,1.0013,0.9930,0.9934,1.0007,0.9991,0.9979,1.0051,1.0076,1.0143,1.0152,1.0239,0.9942,0.9913 -INT2026,1.0088,0.9843,0.9792,0.9795,0.9871,0.9904,1.0003,0.9909,0.9953,0.9939,0.9931,0.9931,1.0067,1.0143,1.0373,1.0250,1.0207,0.9993,0.9937 -INT2027,1.0116,0.9888,0.9839,0.9802,0.9889,0.9906,0.9811,0.9952,0.9906,0.9944,0.9990,0.9913,1.0077,1.0184,1.0174,1.0276,1.0259,0.9935,0.9946 -INT2028,1.0062,0.9977,0.9772,0.9831,0.9863,0.9877,1.0107,0.9956,0.9923,0.9954,0.9937,0.9920,1.0067,1.0177,1.0270,1.0219,1.0222,0.9959,0.9918 -INT2029,1.0101,0.9939,0.9780,0.9801,0.9824,0.9852,1.0025,0.9851,0.9945,0.9933,0.9932,0.9929,1.0033,1.0282,1.0278,1.0474,1.0235,1.0012,0.9925 -INT2030,1.0295,1.0010,0.9821,0.9840,0.9820,0.9917,0.9822,0.9870,0.9830,0.9889,0.9815,0.9921,1.0054,1.0362,1.0382,1.0449,1.0300,0.9948,0.9921 -INT2031,1.0279,1.0213,0.9858,0.9918,0.9830,0.9886,0.9859,0.9778,0.9910,0.9938,0.9794,0.9870,0.9953,1.0445,1.0438,1.0728,1.0285,1.0062,0.9932 -INT2032,1.0080,1.0991,0.9919,0.9813,0.9867,0.9850,0.9881,0.9740,0.9733,0.9791,0.9656,0.9834,0.9901,1.0786,1.0904,1.1379,1.0482,1.0099,0.9983 +INT2019,0.9979,0.9771,0.9763,0.9903,0.9793,0.9805,0.9769,0.9852,0.9826,0.9938,0.9934,1.0109,1.0020,1.0074,0.9983,1.0006,1.0253,1.0282,1.0196 +INT2020,1.0017,0.9799,0.9740,0.9756,0.9843,0.9849,0.9831,0.9833,0.9931,0.9964,0.9958,1.0114,1.0058,1.0047,1.0078,0.9991,1.0129,1.0113,1.0113 +INT2021,0.9959,0.9797,0.9776,0.9780,0.9834,0.9898,0.9883,0.9869,0.9920,0.9978,1.0043,0.9974,1.0066,1.0119,1.0049,1.0040,1.0303,1.0085,1.0022 +INT2022,1.0062,0.9815,0.9810,0.9783,0.9727,0.9820,0.9851,0.9893,0.9934,1.0049,1.0022,1.0050,1.0029,1.0042,1.0047,1.0044,1.0133,0.9989,1.0111 +INT2023,0.9983,0.9812,0.9761,0.9789,0.9890,0.9893,0.9851,1.0197,0.9942,0.9956,1.0022,1.0012,1.0023,1.0074,1.0006,1.0093,1.0214,1.0021,0.9943 +INT2024,1.0016,0.9842,0.9813,0.9791,0.9711,0.9789,0.9892,1.0102,0.9906,0.9984,0.9987,0.9971,1.0048,1.0077,1.0089,1.0075,1.0238,1.0147,1.0081 +INT2025,1.0086,0.9935,0.9773,0.9768,0.9835,0.9817,1.0013,0.9942,0.9934,1.0007,0.9992,0.9979,1.0047,1.0074,1.0143,1.0151,1.0239,0.9942,0.9913 +INT2026,1.0088,0.9842,0.9791,0.9795,0.9871,0.9903,1.0007,0.9908,0.9952,0.9939,0.9929,0.9931,1.0072,1.0142,1.0372,1.0249,1.0206,0.9992,0.9936 +INT2027,1.0116,0.9889,0.9840,0.9806,0.9889,0.9907,0.9806,0.9952,0.9907,0.9945,0.9992,0.9914,1.0074,1.0185,1.0175,1.0277,1.0259,0.9932,0.9947 +INT2028,1.0062,0.9977,0.9772,0.9828,0.9863,0.9876,1.0107,0.9956,0.9923,0.9954,0.9935,0.9920,1.0068,1.0177,1.0271,1.0219,1.0222,0.9963,0.9918 +INT2029,1.0107,0.9939,0.9780,0.9801,0.9823,0.9852,1.0025,0.9850,0.9945,0.9933,0.9932,0.9929,1.0033,1.0282,1.0278,1.0474,1.0235,1.0009,0.9925 +INT2030,1.0289,1.0010,0.9821,0.9840,0.9821,0.9917,0.9823,0.9877,0.9826,0.9890,0.9815,0.9919,1.0055,1.0363,1.0382,1.0449,1.0301,0.9951,0.9921 +INT2031,1.0279,1.0213,0.9858,0.9918,0.9829,0.9886,0.9858,0.9770,0.9914,0.9938,0.9794,0.9871,0.9953,1.0447,1.0439,1.0732,1.0284,1.0061,0.9932 +INT2032,1.0080,1.1006,0.9919,0.9812,0.9867,0.9850,0.9881,0.9740,0.9732,0.9791,0.9656,0.9835,0.9900,1.0785,1.0904,1.1373,1.0484,1.0099,0.9983 +INT2033,1.0858,1.2516,1.5470,1.5126,1.4087,1.3807,1.3807,1.2578,1.2154,1.0363,1.0770,0.9676,0.9318,0.8139,0.7723,0.7487,0.7294,0.7180,0.7156 diff --git a/puf_stage3/stage3.py b/puf_stage3/stage3.py index 0491fed..3f285f5 100644 --- a/puf_stage3/stage3.py +++ b/puf_stage3/stage3.py @@ -6,7 +6,7 @@ CUR_PATH = os.path.abspath(os.path.dirname(__file__)) start_year = 2011 -end_year = 2032 +end_year = 2033 def adjustment(agi, var, var_name, target, weights, blowup): diff --git a/tests/puf_agg_expected.txt b/tests/puf_agg_expected.txt index 291616d..ae505c4 100644 --- a/tests/puf_agg_expected.txt +++ b/tests/puf_agg_expected.txt @@ -6,90 +6,90 @@ MARS 454004 1 4 MIDR 1657 0 1 RECID 31971239146 1 252868 XTOT 533466 0 10 -a_lineno 360923 1 16 -age_head 11655145 1 85 -age_spouse 5888460 0 96 -agi_bin 1865529 0 18 +a_lineno 360919 1 16 +age_head 11655139 1 85 +age_spouse 5889518 0 96 +agi_bin 1865530 0 18 blind_head 3115 0 1 blind_spouse 602 0 1 -cmbtp 4308353701 -23842830 83355100 +cmbtp 4308354591 -23842830 83355100 data_source 234486 0 1 -e00200 39329015123 0 56530000 -e00200p 23688258835 0 28265000 -e00200s 15640756288 0 28265000 -e00300 3541845122 0 29460000 +e00200 39329010779 0 56530000 +e00200p 23688273564 0 28265000 +e00200s 15640737215 0 28265000 +e00300 3541845142 0 29460000 e00400 2464032363 0 14350000 -e00600 5842625154 0 37050000 -e00650 4438625037 0 37050000 -e00700 463647760 0 2874000 +e00600 5842625204 0 37050000 +e00650 4438625087 0 37050000 +e00700 463647980 0 2874000 e00800 9197298 0 174000 -e00900 2856879637 -29990000 18990000 -e00900p 2418244348 -29990000 18990000 +e00900 2856893337 -29990000 18990000 +e00900p 2418258048 -29990000 18990000 e00900s 438635289 -5433000 7335000 e01100 5160646 0 282700 e01200 -532271778 -20290000 13350000 e01400 1677384382 0 6424000 -e01500 7575348529 0 47380000 -e01700 1339160745 0 3528000 -e02000 19712196824 -40760000 65100000 +e01500 7575347589 0 47380000 +e01700 1339159805 0 3528000 +e02000 19712194864 -40760000 65100000 e02100 -92569840 -9031000 3169000 e02100p -91084562 -9031000 3169000 e02100s -1485278 -2997000 1328000 -e02300 128982246 0 100000 +e02300 128973716 0 100000 e02400 1018803578 0 114976 e03150 32163222 0 12000 -e03210 13273648 0 2500 +e03210 13275188 0 2500 e03220 1421528 0 500 e03230 6100028 0 4000 e03240 469499524 0 4776000 -e03270 222518362 0 64500 +e03270 222516172 0 64500 e03290 21948270 0 9000 e03300 372776630 0 472900 e03400 1933476 0 540400 -e03500 7813260 0 104700 -e07240 1467822 0 2000 +e03500 7824760 0 104700 +e07240 1467842 0 2000 e07260 9716096 0 280500 e07300 713366224 0 7737000 e07400 126526472 0 3297000 e07600 18659918 0 515700 e09700 301934 0 83700 e09800 22548 0 790 -e09900 15246992 0 339900 +e09900 15246052 0 339900 e11200 16304512 0 28800 -e17500 233112820 0 772900 -e18400 5886364180 0 15160000 -e18500 1172981144 0 578400 -e19200 1881490022 0 5127000 -e19800 2421695378 0 30100000 -e20100 1071606518 0 29580000 +e17500 233117120 0 772900 +e18400 5886365530 0 15160000 +e18500 1172989784 0 578400 +e19200 1881497312 0 5127000 +e19800 2421699498 0 30100000 +e20100 1071606918 0 29580000 e20400 1463458474 0 10850000 e24515 515462282 0 11440000 e24518 298531730 0 20270000 -e26270 17404771718 -40760000 64980000 +e26270 17404793928 -40760000 64980000 e27200 23108666 -566300 795500 -e32800 29398992 0 6000 +e32800 29391792 0 6000 e58990 113676622 0 3515000 e62900 664909862 0 7316000 -e87521 39757460 0 10000 +e87521 39755330 0 10000 e87530 22532900 0 147200 elderly_dependents 21 0 1 -f2441 19009 0 7 -f6251 54654 0 1 -ffpos 281535 1 12 +f2441 19006 0 7 +f6251 54655 0 1 +ffpos 281533 1 12 fips 6902069 1 56 g20500 17004763 0 720000 -h_seq 11813805333 2 94097 -k1bx14p -2191586538 -18990000 2341800 +h_seq 11813802248 2 94097 +k1bx14p -2191587638 -18990000 2341800 k1bx14s -155295865 -7244500 5459500 -n1820 21900 0 3 +n1820 21899 0 3 n21 367212 0 5 n24 121996 0 9 -nu06 42816 0 4 -nu13 106110 0 7 -nu18 152751 0 9 +nu06 42824 0 4 +nu13 106112 0 7 +nu18 152752 0 9 p08000 810824 0 31600 p22250 -630200978 -124900000 39410000 p23250 23291182672 -28160000 91220000 -pencon_p 426344886 0 16500 -pencon_s 280151210 0 16500 -s006 18297348057 1 723334 +pencon_p 427118733 0 16500 +pencon_s 280486356 0 16500 +s006 18297348056 1 723334 diff --git a/tests/test_data.py b/tests/test_data.py index e6364ea..4f7bf86 100644 --- a/tests/test_data.py +++ b/tests/test_data.py @@ -82,7 +82,7 @@ def relationships(data, dataname): else: # see Note (2) in docstring m = "Number of records where n24 > nu18 has changed" - assert (data["n24"] > data["nu18"]).sum() == 9691, m + assert (data["n24"] > data["nu18"]).sum() == 9692, m subdata = data[data["n24"] > data["nu18"]] m = "n24 > nu18 + 3" assert np.all(subdata["n24"] <= subdata["nu18"] + 3), m diff --git a/tests/test_weights.py b/tests/test_weights.py index 9a4cb06..cd41a20 100644 --- a/tests/test_weights.py +++ b/tests/test_weights.py @@ -55,7 +55,7 @@ def test_weights( raise ValueError(msg.format(kind, col, weights[col].max(), MAX_WEIGHT)) # test sum of weights (in millions) for each year MIN_WEIGHT_SUM = 144 - MAX_WEIGHT_SUM = 236 + MAX_WEIGHT_SUM = 258 for col in sorted_weights_columns: weight_sum = weights[col].sum() * 1e-2 * 1e-6 # in millions if DUMP_WEIGHTS: