change years

PSLmodels · Feb 12, 2024 · e6f8c38 · e6f8c38
1 parent 5c8fa95
commit e6f8c38
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
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/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/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 = 2033  # last calendar year we have data for
+EYR = 2034  # 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_stage2/solver.jl b/puf_stage2/solver.jl
@@ -82,12 +82,12 @@ function Solve_func(year, tol)
 end
 
 
-year_list = [x for x in 2012:2033]
+year_list = [x for x in 2012:2034]
 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.5]
+	    0.45, 0.5, 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
@@ -56,7 +56,7 @@
 puf.s006 = puf.matched_weight * 100
 
 # Dataprep
-year_list = [x for x in range(2012, 2033 + 1)]
+year_list = [x for x in range(2012, 2034 + 1)]
 skipped_years = []
 for i in year_list:
     try:

diff --git 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 = 2033
+end_year = 2034
 
 
 def adjustment(agi, var, var_name, target, weights, blowup):