PSLmodels · huaqunTF · Oct 29, 2019 · Oct 29, 2019 · Dec 1, 2020 · Dec 1, 2020
diff --git a/Pipfile b/Pipfile
@@ -0,0 +1,22 @@
+[[source]]
+name = "pypi"
+url = "https://pypi.org/simple"
+verify_ssl = true
+
+[dev-packages]
+
+[packages]
+numpy = ">=1.12.1"
+pandas = ">=0.20.3"
+scipy = ">=0.18.1"
+bokeh = ">=0.12.3"
+statsmodels = '*'
+pytest = '*'
+pulp = '*'
+tqdm = '*'
+requests = '*'
+lxml = '*'
+
+[requires]
+python_version = "3.6"
+
diff --git a/QuickNotesMDB.docx b/QuickNotesMDB.docx
diff --git 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 = 2033  # Last year in our extrapolation
+    EYR = 2034  # Last year in our extrapolation
 
     # Read in state SOI estimates
     soi_estimates = pd.read_csv(

diff --git a/cps_stage2/cps_weights.csv.gz b/cps_stage2/cps_weights.csv.gz
diff --git 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:2033]
+year_list = [x for x in 2014:2034]
 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
@@ -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 = 2033
+END_YEAR = 2034
 
 # Read hashes used to see which years can be skipped
 with open(Path(CUR_PATH, "..", "datahashes.json")) as f:

diff --git a/cpsmar2016_EXTRACT_ME.zip b/cpsmar2016_EXTRACT_ME.zip
diff --git a/data/cps_raw.csv.gz b/data/cps_raw.csv.gz
diff --git a/data/raw_cps.csv b/data/raw_cps.csv
diff --git a/data/tu16.csv b/data/tu16.csv
diff --git a/puf_data/StatMatch/doc/cpsmar16.pdf b/puf_data/StatMatch/doc/cpsmar16.pdf
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,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,
+,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,2034
+GDP,14718.6,14418.7,14964.4,15517.9,16163.2,16800.0,17348.1,18036.7,18624.5,19479.6,20527.2,21372.6,21060.5,23315.1,25419.5,27340.9,28418.0,29564.9,30812.7,32074.8,33371.4,34714.2,36094.5,37515.9,38979.4,40487.6,42036.7
+TPY,12429.6,12087.5,12429.3,13202.0,13887.7,14166.9,14694.2,15458.5,15928.7,16850.2,17706.0,18424.4,19832.3,21294.8,21766.7,23030.5,24275.3,25439.7,26630.3,27812.2,29035.1,30278.7,31587.2,32943.3,34353.8,35797.6,37278.7
+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,11807.6,12375.8,12951.6,13513.9,14066.1,14630.7,15220.3,15828.2,16451.1,17085.4,17728.3,18382.3
+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.0,1702.3,1754.0,1790.6,1875.5,1960.3,2049.0,2133.8,2216.4,2300.1,2386.0,2476.1,2572.0,2675.3,2780.3
+SCHF,47.0,35.5,46.0,75.5,72.3,83.2,78.1,40.0,43.2,39.5,38.9,38.4,45.2,51.3,90.1,59.3,53.5,51.9,51.6,51.9,52.6,53.5,54.4,55.3,56.2,57.0,57.8
+INTS,1361.6,1264.3,1195.0,1231.6,1255.9,1255.2,1302.0,1302.8,1415.3,1553.4,1615.0,1652.0,1647.3,1658.6,1753.4,1813.1,2111.7,2322.0,2568.3,2758.7,2918.7,3026.6,3159.1,3303.7,3457.7,3588.5,3707.1
+DIVS,805.4,553.7,544.6,682.2,832.7,824.5,815.5,951.1,962.5,1154.5,1253.3,1316.0,1448.1,1543.9,1621.6,1841.0,1897.5,1959.8,2012.9,2054.0,2112.7,2195.1,2282.2,2372.0,2464.5,2559.8,2657.6
+RENTS,262.1,333.7,402.8,485.3,533.0,595.8,610.8,659.6,707.4,652.7,681.9,692.1,719.9,723.8,783.4,961.1,959.8,947.4,940.9,965.1,1010.0,1061.5,1114.7,1164.8,1210.8,1257.7,1305.8
+CGNS,498.0,263.0,394.0,404.0,647.0,511.0,716.0,725.0,641.0,871.3,944.0,881.0,1147.7,2072.7,1319.1,1398.9,1313.9,1293.6,1264.1,1265.0,1285.4,1318.5,1359.7,1406.4,1457.2,1511.1,1567.4
+BOOK,1285.1,1397.0,1746.4,1816.6,2022.8,2106.9,2072.9,2088.1,2073.5,2128.9,2305.0,2367.8,2260.1,2771.1,2925.1,3215.7,3263.0,3353.8,3427.5,3512.3,3621.3,3748.0,3863.6,3984.2,4121.1,4262.4,4414.5
+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,163.2,165.2,167.1,168.7,170.3,171.9,173.6,175.3,177.0,178.6,180.4,182.1,183.8
+SOCSEC,503.0,544.5,572.5,591.5,627.2,663.2,698.2,733.7,762.1,791.1,833.0,888.1,940.2,982.7,1063.4,1190.9,1291.4,1372.6,1454.4,1538.5,1627.6,1719.7,1813.9,1909.2,2005.2,2106.0,2211.9
+CPIU,215.3,214.5,218.1,224.9,229.6,233.0,236.7,237.0,240.0,245.1,251.1,255.6,258.8,271.0,292.9,304.7,312.6,320.4,327.9,335.1,342.4,350.0,357.8,365.8,374.1,382.5,391.1
+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.5,549.1,556.8,533.8,541.3,548.5,555.8,563.4,571.2,579.2,587.5,595.9,604.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.0,27.925,240.656,36.743,27.511,36.8,42.5,44.0,46.0,48.0,50.2,52.4,54.4,56.1,57.7,59.4