Merge pull request #332 from chusloj/cbo_covid_update

Adjustment to January 2020 CBO economic projections due to COVID-19
PSLmodels · Aug 10, 2020 · ed4b648 · ed4b648
2 parents 98fc990 + 8f57e4e
commit ed4b648
Show file tree

Hide file tree

Showing 14 changed files with 121 additions and 113 deletions.
diff --git a/.gitignore b/.gitignore
@@ -23,4 +23,4 @@ cpsmar*.csv
 *.dat
 
 # pickle
-cps*.pkl
+cps*.pkl
diff --git a/README.md b/README.md
@@ -117,4 +117,4 @@ Contributors
 A full list of contributors on GitHub can be found 
 here](https://github.com/PSLmodels/taxdata/graphs/contributors). John O'Hare
 of Quantria Strategies has also made significant contributions to the
-development of `taxdata`.
+development of `taxdata`.
diff --git a/cps_stage1/stage_2_targets.csv b/cps_stage1/stage_2_targets.csv
@@ -4,21 +4,21 @@ Joint,55128595,56368988,57256559,58243361,59152982,59952347,60657993,61374665,62
 HH,22077498,22574242,22929689,23324877,23689155,24009279,24291871,24578879,24854847,25133024,25413408,25698208,25987423,26276638,26572477,26868315,27170777
 SS_return,27401498,31684352,32736570,33818929,34953351,36139836,37386604,38614191,39891101,41154310,42384637,43664287,44875433,46007115,47097695,48141692,49089784
 Dep_return,96916673,99911398,100735190,101549290,102373082,103187182,104001282,104805690,105610099,106414507,107209224,107984557,108759890,109525532,110281482,111018049,111744924
-INTS,156367939,122311002,132881475,145672372,159854944,161793906,161324803,162888482,167032232,175272823,186249852,199290938,211909831,223934525,235740305,247123891,258304198
-DIVS,254702232,388777487,393438538,461902498,501763397,520738713,540554547,561924064,582121951,602854713,626032616,650280269,673942106,698215229,724704261,753714845,787157248
-SCHCI,374659000,438688223,426174612,485707928,512458580,534188802,557043001,576974860,597693503,618599475,639055856,661348067,685476106,711589839,738303025,765802996,794352012
-SCHCL,57400238,64012745,62187418,70877814,74781030,77955263,81284477,84194669,87219662,90267614,93252427,96507020,100031395,103842771,107740247,111746783,115914041
-CGNS,705007630,1250190030,1105310962,1501948255,1662337491,1786489334,1752014461,1745105387,1736433793,1705413457,1703721439,1719231607,1752014461,1798544965,1851984543,1910641178,1976136387
-Pension,663223262,776568117,800178866,847930940,895152437,935675378,972285302,1013206177,1054922921,1098430367,1143396904,1190618400,1239962211,1291428336,1345812643,1402053976,1461346135
-SCHEI,846331543,1091005992,1083389008,1048096983,1083981440,1088128465,1169037760,1224895642,1271951676,1330094653,1390691991,1438763623,1492505676,1552256683,1606168002,1671420164,1746828305
-SCHEL,166947674,160152904,159017659,153842282,159117828,159718840,171588819,179785950,186697584,195245305,204126921,211188808,219068738,227850185,235763505,245329607,256414932
+INTS,156367939,122311002,132881475,145672372,159854944,161543718,156493033,151270344,148924825,148940462,149972490,155070085,163936147,176899049,195788296,216585232,239571319
+DIVS,254702232,388777487,393438538,461902498,501763397,520076488,499547488,428179922,451969111,482456968,514651330,550411523,586757532,622797898,659067496,694955040,730766174
+SCHCI,374659000,438688223,426174612,485707928,512458580,533664280,522274646,514294409,532652700,555169706,581470768,608671011,636096050,663446157,691695446,721031246,751341159
+SCHCL,57400238,64012745,62187418,70877814,74781030,77874903,76210296,75045071,77731402,81014696,84849032,88821128,92821925,96811241,100932578,105214636,109640195
+CGNS,705007630,1250190030,1105310962,1502441760,1662337491,1786136831,1752648968,1745810394,1736786297,1705413457,1702875430,1719725112,1752014461,1797839957,1851279536,1911134683,1975995385
+Pension,663223262,776568117,800178866,847930940,895152437,934813188,964989846,939190461,971622079,1011282830,1054723954,1103669830,1157125625,1213632247,1274184531,1335400038,1398472570
+SCHEI,846331543,1091005992,1083389008,1048096983,1083981440,1084066073,1047843083,1090328927,1173523318,1239114012,1330094653,1418620932,1488189385,1545316764,1588564306,1624194864,1666849974
+SCHEL,166947674,160152904,159017659,153842282,159117828,159117828,153808892,160036040,172256610,181872796,195245305,208233834,218451031,226815110,233175816,238417973,244661816
 SS,575126918,708326312,735759866,763768547,804199969,856536519,908010378,966213222,1029764747,1097457185,1169578100,1244747189,1323424551,1406472878,1496652779,1592641461,1694784002
-UCOMP,33288898,10925416,8545260,8518629,7859509,7393464,7476686,7995993,9174420,11474683,12679741,12899448,13638462,14077875,14540591,15089857,15529271
-wage1,114320683,134555444,138499507,144958626,152263718,159717426,167056814,174590547,181495516,188240437,195076813,201958919,209126825,216969224,225234610,233465699,241662492
-wage2,261995646,308368875,317407725,332210479,348952001,366034117,382854237,400119751,415944288,431402031,447069370,462841508,479268635,497241537,516183822,535047508,553832596
-wage3,381259619,448742572,461896028,483437197,507799687,532657814,557134681,582259690,605287771,627782089,650581414,673533243,697438221,723592631,751157701,778608394,805944709
-wage4,418567676,492654155,507094739,530743813,557490288,584780900,611652945,639236555,664518042,689213535,714243882,739441656,765685850,794399592,824662035,854798908,884810210
-wage5,418379915,492433160,506867267,530505732,557240209,584518579,611378570,638949806,664219953,688904368,713923487,739109958,765342379,794043241,824292109,854415462,884413302
-wage6,916618937,1078860489,1110483842,1162272812,1220844762,1280608317,1339455253,1399860441,1455224224,1509304742,1564118554,1619299014,1676771021,1739651081,1805922630,1871919193,1937640771
-wage7,840581301,989364191,1018364246,1065857090,1119570235,1174376136,1228341455,1283735763,1334506873,1384101170,1434367932,1484970926,1537675374,1595339251,1656113279,1716635133,1776904812
-wage8,3433224075,4040904736,4159350967,4353328127,4572711145,4796557355,5016970341,5243219807,5450586541,5653146762,5858453562,6065133651,6280396800,6515915972,6764138073,7011330206,7257492372
+UCOMP,33288898,10925416,8545260,8518629,7859509,7393464,7646460,8175753,9360838,11321554,12509968,12906106,13631804,14081204,14537262,15099844,15515955
+wage1,114320683,134555444,138499507,144958626,152263718,159385896,154481539,159728858,166999654,173733142,181049666,189074978,197683325,206634635,215345871,223519799,231739457
+wage2,261995646,308368875,317407725,332210479,348952001,365274330,354034716,366060317,382723240,398154783,414922505,433314599,453042871,473557130,493521198,512253887,531091374
+wage3,381259619,448742572,461896028,483437197,507799687,531552161,515196123,532695940,556944051,579400243,603800859,630565284,659274133,689126761,718178744,745438807,772851374
+wage4,418567676,492654155,507094739,530743813,557490288,583567054,565610501,584822757,611443661,636097297,662885628,692269079,723787225,756561074,788455931,818383520,848478536
+wage5,418379915,492433160,506867267,530505732,557240209,583305277,565356779,584560417,611169380,635811957,662588271,691958541,723462549,756221696,788102246,818016410,848097926
+wage6,916618937,1078860489,1110483842,1162272812,1220844762,1277950122,1238627170,1280699979,1338996943,1392985799,1451649411,1515996060,1585017466,1656788729,1726635092,1792173346,1858078247
+wage7,840581301,989364191,1018364246,1065857090,1119570235,1171938450,1135877512,1174460194,1227921165,1277431403,1331228606,1390237414,1453533186,1519350702,1583402997,1643504560,1703942355
+wage8,3433224075,4040904736,4159350967,4353328127,4572711145,4786601005,4639315693,4796900678,5015253729,5217470627,5437196968,5678209298,5936731070,6205552516,6467164190,6712639711,6959488522
diff --git a/cps_stage2/cps_weights.csv.gz b/cps_stage2/cps_weights.csv.gz
diff --git 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
-GDP,14718.6,14418.7,14964.4,15517.9,16163.2,16800.0,17348.1,18036.7,18624.5,19519.4,20580.3,21440.0,22339.9,23251.4,24138.7,25035.5,25954.8,26888.1,27866.7,28923.6,30010.0,31135.2,32296.7
-TPY,12429.6,12087.5,12429.3,13202.0,13887.7,14166.9,14694.2,15458.5,15928.7,16878.8,17819.2,18625.6,19354.1,20169.1,20999.7,21865.5,22760.4,23700.3,24682.1,25707.2,26789.0,27909.6,29089.8
-Wages,6531.9,6251.4,6377.5,6633.2,6932.1,7124.7,7477.8,7854.8,8085.3,8462.1,8888.5,9324.1,9752.6,10192.3,10595.3,10988.8,11387.9,11789.6,12208.5,12666.4,13148.7,13628.9,14107.4
-SCHC,979.5,937.5,986.7,1068.1,1187.9,1253.5,1268.5,1336.8,1298.7,1480.1,1561.6,1627.9,1697.5,1758.2,1821.4,1885.1,1947.4,2015.3,2088.9,2168.5,2249.9,2333.6,2420.6
-SCHF,47.0,35.5,46.0,75.5,72.3,83.2,78.1,40.0,43.2,38.1,27.2,30.5,27.4,30.6,35.8,39.4,42.6,45.4,47.9,50.6,53.6,57.0,60.6
-INTS,1361.6,1264.3,1195.0,1231.6,1255.9,1255.2,1302.0,1302.8,1415.3,1551.6,1702.7,1723.4,1718.3,1735.0,1779.1,1866.9,1983.8,2122.7,2257.1,2385.3,2510.9,2632.2,2751.4
-DIVS,805.4,553.7,544.6,682.2,832.7,824.5,815.5,951.1,962.5,1130.0,1227.5,1273.9,1322.4,1374.7,1424.1,1474.8,1531.5,1590.8,1648.7,1708.1,1772.9,1843.9,1925.7
-RENTS,262.1,333.7,402.8,485.3,533.0,595.8,610.8,659.6,707.4,718.8,756.8,776.0,799.1,836.9,876.8,903.4,914.8,925.4,946.1,973.8,1004.0,1036.5,1073.9
-CGNS,498.0,264.0,394.0,404.0,647.0,511.0,716.0,725.0,641.0,871.0,964.0,1036.0,1016.0,1012.0,1007.0,989.0,988.0,997.0,1016.0,1043.0,1074.0,1108.0,1146.0
-BOOK,1285.1,1397.0,1746.4,1816.6,2022.8,2106.9,2072.9,2088.1,2073.5,2006.0,2074.6,2082.6,2237.4,2344.3,2434.3,2545.7,2661.6,2753.6,2856.5,2970.9,3074.0,3198.9,3343.3
-RETS,142.5,140.5,142.9,145.4,144.9,146.6,148.3,147.8,149.7,149.9,152.5,153.6,155.1,156.6,158.0,159.5,161.0,162.4,163.9,165.4,166.9,168.4,169.9
-SOCSEC,503.0,544.5,572.5,591.5,627.2,663.2,698.2,733.7,762.1,791.1,833.0,887.2,940.5,1000.8,1066.6,1136.7,1211.4,1289.3,1370.8,1456.8,1550.2,1649.6,1755.4
-CPIU,215.3,214.5,218.1,224.9,229.6,233.0,236.7,237.0,240.0,245.1,251.1,255.7,261.9,268.5,275.4,282.2,289.0,295.6,302.3,309.1,316.0,323.1,330.3
-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,511.6,470.1,477.0,483.8,490.6,497.2,503.9,510.7,517.6,524.7,531.9
-UCOMP,51.1,131.2,138.9,107.2,83.6,62.2,43.8,39.9,31.2,31.1,28.7,27.0,27.3,29.2,33.5,41.9,46.3,47.1,49.8,51.4,53.1,55.1,56.7
+GDP,14718.6,14418.7,14964.4,15517.9,16163.2,16800,17348.1,18036.7,18624.5,19519.4,20580.3,21427.7,20339.1,21313,22298,23208.5,24213.7,25286.6,26415.3,27582.8,28746.8,29873.5,31022.3
+TPY,12429.6,12087.5,12429.3,13202,13887.7,14166.9,14694.2,15458.5,15928.7,16878.8,17819.2,18608.3,19208.3,18695.7,19341.5,20130.6,20995.7,21969.5,23033.8,24157.9,25364.3,26582.2,27837.8
+Wages,6531.9,6251.4,6377.5,6633.2,6932.1,7124.7,7477.8,7854.8,8085.3,8462.1,8888.5,9304.2,9018.2,9324.6,9748.8,10141.9,10569.3,11037.6,11540.5,12062.9,12571.5,13048.6,13528.3
+SCHC,979.5,937.5,986.7,1068.1,1187.9,1253.5,1268.5,1336.8,1298.7,1480.1,1561.6,1626.3,1591.5,1567.2,1623.2,1691.8,1771.9,1854.8,1938.4,2021.7,2107.8,2197.2,2289.6
+SCHF,47,35.5,46,75.5,72.3,83.2,78.1,40,43.2,38.1,27.2,32,28.7,30.6,34.7,37.6,40.4,43,45.3,47.8,50.5,53.6,56.9
+INTS,1361.6,1264.3,1195,1231.6,1255.9,1255.2,1302,1302.8,1415.3,1551.6,1702.7,1720.6,1666.8,1611.3,1586.3,1586.4,1597.5,1651.8,1746.1,1884.2,2085.4,2307,2551.8
+DIVS,805.4,553.7,544.6,682.2,832.7,824.5,815.5,951.1,962.5,1130,1227.5,1272.3,1222.1,1047.5,1105.7,1180.3,1259,1346.5,1435.4,1523.6,1612.3,1700.1,1787.7
+RENTS,262.1,333.7,402.8,485.3,533,595.8,610.8,659.6,707.4,718.8,756.8,777.9,802.8,807.1,849.7,903.1,946.7,978.8,1005.7,1029.5,1054.5,1080.9,1108.8
+CGNS,498,264,394,404,647,511,716,725,641,871.3,964,1035.8,1016.4,1012.4,1007.2,989,987.5,997.3,1016,1042.6,1073.6,1108.3,1145.9
+BOOK,1285.1,1397,1746.4,1816.6,2022.8,2106.9,2072.9,2088.1,2073.5,2006,2074.6,2074.7,2005.4,2086.7,2246,2371.5,2545.7,2715.1,2848.3,2957.5,3040.3,3108.6,3190.2
+RETS,142.5,140.5,142.9,145.4,144.9,146.6,148.3,147.8,149.7,149.9,152.5,153.6,155.1,156.6,158,159.5,161,162.4,163.9,165.4,166.9,168.4,169.9
+SOCSEC,503,544.5,572.5,591.5,627.2,663.2,698.2,733.7,762.1,791.1,833,887.2,940.5,1000.8,1066.6,1136.7,1211.4,1289.3,1370.8,1456.8,1550.2,1649.6,1755.4
+CPIU,215.3,214.5,218.1,224.9,229.6,233,236.7,237,240,245.1,251.1,255.6,258.1,261.2,266,271.8,277.9,284.2,290.5,297,303.6,310.4,317.3
+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,514.6,463.4,468.2,474,480.1,486.4,492.7,499.2,505.8,512.6,519.5
+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,29.855,34.185,41.335,45.685,47.125,49.78,51.42,53.08,55.135,56.655