Skip to content

Commit

Permalink
update optimization tolerance
Browse files Browse the repository at this point in the history
  • Loading branch information
Bodi Yang committed Jun 5, 2023
1 parent 563fde6 commit ece9fb0
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion history/report.py
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ def report():
revprojections = divs[4]

assert "Revenue Projections" in revprojections.text
latest_revprojections = revprojections.find("div.views-col.col-1")[0]
latest_revprojections = revprojections.find("div.views-col.col-1")[1]
rev_link = latest_revprojections.find("a")[0]
_rev_report = datetime.strptime(rev_link.text, "%b %Y")
rev_report = datetime.strftime(_rev_report, "%B %Y")
Expand Down
2 changes: 1 addition & 1 deletion history/report_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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", "2033"], axis=1, inplace=False
columns=["2019", "2020", "2021", "2022"], axis=1, inplace=False
)
df_cbo = df_cbo.transpose()
df_cbo_sal = df_cbo.loc[:, df_cbo.columns.str.contains(category)].squeeze()
Expand Down
Binary file modified puf_stage2/puf_weights.csv.gz
Binary file not shown.
2 changes: 1 addition & 1 deletion puf_stage2/solver.jl
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ 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.5]

# Run solver function for all years and tolerances (in order)
for i in zip(year_list, tol_list)
Expand Down
2 changes: 1 addition & 1 deletion puf_stage3/puf_ratios.csv
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ INT2029,1.0107,0.9939,0.9780,0.9801,0.9823,0.9852,1.0025,0.9850,0.9945,0.9933,0.
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
INT2033,0.9351,0.8350,0.9708,0.9751,0.9896,0.9850,0.9879,1.0383,1.0312,1.0351,1.1160,1.0744,1.0375,0.8505,0.8247,0.7425,0.8975,1.0567,1.0931

0 comments on commit ece9fb0

Please sign in to comment.