@@ -558,31 +558,42 @@ def test_SS_solver_extra(baseline, param_updates, filename, dask_client):
558558 "gamma_g" : [0.0 , 0.0 , 0.0 , 0.0 ],
559559}
560560filename8 = "inner_loop_outputs_reform_MneI.pkl"
561- param_updates9 = {"J" : 1 , "lambdas" : np .array ([1.0 ])}
561+ param_updates9 = {
562+ "J" : 1 ,
563+ "lambdas" : np .array ([1.0 ]),
564+ "e" : np .ones ((80 , 1 )),
565+ "beta_annual" : [0.96 ],
566+ "chi_b" : [80 ],
567+ "labor_income_tax_noncompliance_rate" : [[0.0 ]],
568+ "capital_income_tax_noncompliance_rate" : [[0.0 ]],
569+ "eta" : np .ones ((80 , 1 )) * (1 / 80 ),
570+ "eta_RM" : np .ones ((80 , 1 )) * (1 / 80 ),
571+ "replacement_rate_adjust" : [[1.0 ]],
572+ }
562573filename9 = "inner_loop_outputs_J1.pkl"
563574
564575
565576@pytest .mark .parametrize (
566577 "baseline,r_p,param_updates,filename" ,
567578 [
568- # (True, 0.03309231672773741, param_updates1, filename1),
569- # (True, 0.05, param_updates2, filename2),
570- # (True, 0.04260341179572245, param_updates3, filename3),
571- # (False, 0.04260341179572245, param_updates4, filename4),
572- # (False, 0.04260341179572245, param_updates5, filename5),
573- # (False, 0.04759112768438152, param_updates7, filename7),
574- # (False, 0.04759112768438152, param_updates8, filename8),
579+ (True , 0.03309231672773741 , param_updates1 , filename1 ),
580+ (True , 0.05 , param_updates2 , filename2 ),
581+ (True , 0.04260341179572245 , param_updates3 , filename3 ),
582+ (False , 0.04260341179572245 , param_updates4 , filename4 ),
583+ (False , 0.04260341179572245 , param_updates5 , filename5 ),
584+ (False , 0.04759112768438152 , param_updates7 , filename7 ),
585+ (False , 0.04759112768438152 , param_updates8 , filename8 ),
575586 (True , 0.04 , param_updates9 , filename9 ),
576587 ],
577588 ids = [
578- # "Baseline, Small Open",
579- # "Baseline, Balanced Budget",
580- # "Baseline",
581- # "Reform",
582- # "Reform, baseline spending",
583- # "Reform, M>1",
584- # "Reform, I!=>M",
585- "J=1"
589+ "Baseline, Small Open" ,
590+ "Baseline, Balanced Budget" ,
591+ "Baseline" ,
592+ "Reform" ,
593+ "Reform, baseline spending" ,
594+ "Reform, M>1" ,
595+ "Reform, I!=>M" ,
596+ "J=1" ,
586597 ],
587598)
588599def test_inner_loop (baseline , r_p , param_updates , filename , dask_client ):
@@ -637,6 +648,7 @@ def test_inner_loop(baseline, r_p, param_updates, filename, dask_client):
637648 )
638649 test_tuple = SS .inner_loop (outer_loop_vars , p , dask_client )
639650
651+ # The output format for the inner loop
640652 try :
641653 (
642654 euler_errors ,
0 commit comments