Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removed duplicate instances of str().length() #3097

Closed
wants to merge 3 commits into from
Closed

Removed duplicate instances of str().length() #3097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b3af89
Removed duplicate instances of str().length()
Jan 29, 2022
2969928
Merge commit 'a34588e7ee7ec0d8b9a04972efd5dfabd84b4624' into HEAD
yashikno Jan 29, 2022
24b141c
[Jenkins] auto-formatting by clang-format version 6.0.0-1ubuntu2~16.0…
stan-buildbot Jan 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/stan/callbacks/stream_logger.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,8 @@ class stream_logger final : public logger {
void info(const std::string& message) { info_ << message << std::endl; }

void info(const std::stringstream& message) {
info_ << message.str() << std::endl;
if (message.str().length() > 0)
info_ << message.str() << std::endl;
}

void warn(const std::string& message) { warn_ << message << std::endl; }
Expand Down
6 changes: 2 additions & 4 deletions src/stan/model/gradient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,10 @@ void gradient(const M& model, const Eigen::Matrix<double, Eigen::Dynamic, 1>& x,
try {
stan::math::gradient(model_functional<M>(model, &ss), x, f, grad_f);
} catch (std::exception& e) {
if (ss.str().length() > 0)
logger.info(ss);
logger.info(ss);
throw;
}
if (ss.str().length() > 0)
logger.info(ss);
logger.info(ss);
}

} // namespace model
Expand Down
9 changes: 3 additions & 6 deletions src/stan/services/optimize/bfgs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ int bfgs(Model& model, const stan::io::var_context& init,
std::vector<double> values;
std::stringstream msg;
model.write_array(rng, cont_vector, disc_vector, values, true, true, &msg);
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);

values.insert(values.begin(), lp);
parameter_writer(values);
Expand Down Expand Up @@ -146,8 +145,7 @@ int bfgs(Model& model, const stan::io::var_context& init,
model.write_array(rng, cont_vector, disc_vector, values, true, true,
&msg);
// This if is here to match the pre-refactor behavior
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);

values.insert(values.begin(), lp);
parameter_writer(values);
Expand All @@ -158,8 +156,7 @@ int bfgs(Model& model, const stan::io::var_context& init,
std::vector<double> values;
std::stringstream msg;
model.write_array(rng, cont_vector, disc_vector, values, true, true, &msg);
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);
values.insert(values.begin(), lp);
parameter_writer(values);
}
Expand Down
9 changes: 3 additions & 6 deletions src/stan/services/optimize/lbfgs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,7 @@ int lbfgs(Model& model, const stan::io::var_context& init,
std::vector<double> values;
std::stringstream msg;
model.write_array(rng, cont_vector, disc_vector, values, true, true, &msg);
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);

values.insert(values.begin(), lp);
parameter_writer(values);
Expand Down Expand Up @@ -148,8 +147,7 @@ int lbfgs(Model& model, const stan::io::var_context& init,
std::stringstream msg;
model.write_array(rng, cont_vector, disc_vector, values, true, true,
&msg);
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);

values.insert(values.begin(), lp);
parameter_writer(values);
Expand All @@ -160,8 +158,7 @@ int lbfgs(Model& model, const stan::io::var_context& init,
std::vector<double> values;
std::stringstream msg;
model.write_array(rng, cont_vector, disc_vector, values, true, true, &msg);
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);

values.insert(values.begin(), lp);
parameter_writer(values);
Expand Down
6 changes: 2 additions & 4 deletions src/stan/services/optimize/newton.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,7 @@ int newton(Model& model, const stan::io::var_context& init,
std::vector<double> values;
std::stringstream ss;
model.write_array(rng, cont_vector, disc_vector, values, true, true, &ss);
if (ss.str().length() > 0)
logger.info(ss);
logger.info(ss);
values.insert(values.begin(), lp);
parameter_writer(values);
}
Expand All @@ -111,8 +110,7 @@ int newton(Model& model, const stan::io::var_context& init,
std::vector<double> values;
std::stringstream ss;
model.write_array(rng, cont_vector, disc_vector, values, true, true, &ss);
if (ss.str().length() > 0)
logger.info(ss);
logger.info(ss);
values.insert(values.begin(), lp);
parameter_writer(values);
}
Expand Down
6 changes: 2 additions & 4 deletions src/stan/services/util/gq_writer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,11 @@ class gq_writer {
model.write_array(rng, const_cast<std::vector<double>&>(draw), params_i,
values, false, true, &ss);
} catch (const std::exception& e) {
if (ss.str().length() > 0)
logger_.info(ss);
logger_.info(ss);
logger_.info(e.what());
return;
}
if (ss.str().length() > 0)
logger_.info(ss);
logger_.info(ss);

std::vector<double> gq_values(values.begin() + num_constrained_params_,
values.end());
Expand Down
21 changes: 7 additions & 14 deletions src/stan/services/util/initialize.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,15 @@ std::vector<double> initialize(Model& model, const InitContext& init, RNG& rng,
model.transform_inits(context, disc_vector, unconstrained, &msg);
}
} catch (std::domain_error& e) {
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);
logger.info("Rejecting initial value:");
logger.info(
" Error evaluating the log probability"
" at the initial value.");
logger.info(e.what());
continue;
} catch (std::exception& e) {
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);
logger.info(
"Unrecoverable error evaluating the log probability"
" at the initial value.");
Expand All @@ -128,20 +126,17 @@ std::vector<double> initialize(Model& model, const InitContext& init, RNG& rng,
// the parameters.
log_prob = model.template log_prob<false, Jacobian>(unconstrained,
disc_vector, &msg);
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);
} catch (std::domain_error& e) {
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);
logger.info("Rejecting initial value:");
logger.info(
" Error evaluating the log probability"
" at the initial value.");
logger.info(e.what());
continue;
} catch (std::exception& e) {
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);
logger.info(
"Unrecoverable error evaluating the log probability"
" at the initial value.");
Expand All @@ -167,8 +162,7 @@ std::vector<double> initialize(Model& model, const InitContext& init, RNG& rng,
log_prob = stan::model::log_prob_grad<true, Jacobian>(
model, unconstrained, disc_vector, gradient, &log_prob_msg);
} catch (const std::exception& e) {
if (log_prob_msg.str().length() > 0)
logger.info(log_prob_msg);
logger.info(log_prob_msg);
logger.info(e.what());
throw;
}
Expand All @@ -177,8 +171,7 @@ std::vector<double> initialize(Model& model, const InitContext& init, RNG& rng,
= std::chrono::duration_cast<std::chrono::microseconds>(end - start)
.count()
/ 1000000.0;
if (log_prob_msg.str().length() > 0)
logger.info(log_prob_msg);
logger.info(log_prob_msg);

bool gradient_ok = std::isfinite(stan::math::sum(gradient));

Expand Down
6 changes: 2 additions & 4 deletions src/stan/services/util/mcmc_writer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,13 +111,11 @@ class mcmc_writer {
model.write_array(rng, cont_params, params_i, model_values, true, true,
&ss);
} catch (const std::exception& e) {
if (ss.str().length() > 0)
logger_.info(ss);
logger_.info(ss);
ss.str("");
logger_.info(e.what());
}
if (ss.str().length() > 0)
logger_.info(ss);
logger_.info(ss);

if (model_values.size() > 0)
values.insert(values.end(), model_values.begin(), model_values.end());
Expand Down
9 changes: 3 additions & 6 deletions src/stan/variational/advi.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,7 @@ class advi {
try {
std::stringstream ss;
double log_prob = model_.template log_prob<false, true>(zeta, &ss);
if (ss.str().length() > 0)
logger.info(ss);
logger.info(ss);
stan::math::check_finite(function, "log_prob", log_prob);
elbo += log_prob;
++i;
Expand Down Expand Up @@ -486,8 +485,7 @@ class advi {
std::stringstream msg;
model_.write_array(rng_, cont_vector, disc_vector, values, true, true,
&msg);
if (msg.str().length() > 0)
logger.info(msg);
logger.info(msg);

// The first row of lp_, log_p, and log_g.
values.insert(values.begin(), {0, 0, 0});
Expand All @@ -512,8 +510,7 @@ class advi {
&msg2);
// log_p: Log probability in the unconstrained space
log_p = model_.template log_prob<false, true>(cont_params_, &msg2);
if (msg2.str().length() > 0)
logger.info(msg2);
logger.info(msg2);
// Write lp__, log_p, and log_g.
values.insert(values.begin(), {0, log_p, log_g});
parameter_writer(values);
Expand Down
3 changes: 1 addition & 2 deletions src/stan/variational/families/normal_fullrank.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,8 +428,7 @@ class normal_fullrank : public base_family {
try {
std::stringstream ss;
stan::model::gradient(m, zeta, tmp_lp, tmp_mu_grad, &ss);
if (ss.str().length() > 0)
logger.info(ss);
logger.info(ss);
stan::math::check_finite(function, "Gradient of mu", tmp_mu_grad);

mu_grad += tmp_mu_grad;
Expand Down
3 changes: 1 addition & 2 deletions src/stan/variational/families/normal_meanfield.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,8 +363,7 @@ class normal_meanfield : public base_family {
try {
std::stringstream ss;
stan::model::gradient(m, zeta, tmp_lp, tmp_mu_grad, &ss);
if (ss.str().length() > 0)
logger.info(ss);
logger.info(ss);
stan::math::check_finite(function, "Gradient of mu", tmp_mu_grad);
mu_grad += tmp_mu_grad;
omega_grad.array() += tmp_mu_grad.array().cwiseProduct(eta.array());
Expand Down