Skip to content

Commit da353cd

Browse files
fix error in year range for mean_recr
1 parent 5b15d39 commit da353cd

1 file changed

Lines changed: 16 additions & 6 deletions

File tree

SS_write_report.tpl

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1740,7 +1740,7 @@ FUNCTION void write_bigoutput()
17401740
double cross = 0.0;
17411741
double Durbin = 0.0;
17421742
double var = 0.0;
1743-
1743+
warning << recdev_first << " "<<recdev_start << " " << styr << endl;
17441744
for (y = recdev_first; y <= recdev_end; y++)
17451745
{
17461746
temp1 = recdev(y);
@@ -1761,10 +1761,20 @@ FUNCTION void write_bigoutput()
17611761
rmse(1) += value(square(temp1));
17621762
n_rmse(1) += 1.;
17631763
rmse(2) += biasadj(y);
1764-
mean_recr_report(1) += value(exp_rec(y, 1));
1765-
mean_recr_report(2) += value(exp_rec(y, 2));
1766-
mean_recr_report(3) += value(exp_rec(y, 3));
1767-
mean_recr_report(4) += value(exp_rec(y, 4));
1764+
if (y < styr)
1765+
{
1766+
mean_recr_report(1) += value(exp_rec(styr - 1, 1));
1767+
mean_recr_report(2) += value(exp_rec(styr - 1, 2));
1768+
mean_recr_report(3) += value(exp_rec(styr - 1, 3) * mfexp(-biasadj(y) * half_sigmaRsq));
1769+
mean_recr_report(4) += value(exp_rec(styr - 1, 3) * mfexp(recdev(y) - biasadj(y) * half_sigmaRsq));
1770+
}
1771+
else
1772+
{
1773+
mean_recr_report(1) += value(exp_rec(y, 1));
1774+
mean_recr_report(2) += value(exp_rec(y, 2));
1775+
mean_recr_report(3) += value(exp_rec(y, 3));
1776+
mean_recr_report(4) += value(exp_rec(y, 4));
1777+
}
17681778
}
17691779
}
17701780
if (n_rmse(1) > 0. && rmse(1) > 0.)
@@ -2002,7 +2012,7 @@ FUNCTION void write_bigoutput()
20022012
}
20032013
}
20042014
SS2out << endl << "#" << endl << "# mean_recruitment_for_main_recdev_years" << endl
2005-
<< "# ratio()_is_controlled_by_max_bias_adj;_ratio_should_be_near_1.0" << endl
2015+
<< "# NOTE:_ratio()_is_influenced_by_max_bias_adj;_ratio_should_be_near_1.0" << endl
20062016
<< "# SR_exp_recr with_regime bias_adjusted pred_recr ratio(w_reg / pred_rec)" << endl
20072017
<< "# " << mean_recr_report << " " << mean_recr_report(2) / mean_recr_report(4) << endl;
20082018

0 commit comments

Comments
 (0)