Skip to content

Commit deec14c

Browse files
stan-buildbotstan-buildbot
committed
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
1 parent f088d86 commit deec14c

8 files changed

Lines changed: 74 additions & 69 deletions

‎stan/math/mix/functor/laplace_marginal_density_estimator.hpp‎

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1020,7 +1020,8 @@ inline void log_solver_fallback(const bool allow_fallthrough,
10201020
<< " " << std::left << std::setw(12) << "reason:" << e.what() << "\n"
10211021
<< " " << std::left << std::setw(12) << "action:"
10221022
<< "trying " << next_solver << "\n"
1023-
<< "note: this warning message will only be displayed once." << "\n";
1023+
<< "note: this warning message will only be displayed once."
1024+
<< "\n";
10241025
if (allow_fallthrough && msgs) {
10251026
(*msgs) << os.str();
10261027
} else {
@@ -1181,11 +1182,13 @@ inline auto laplace_marginal_density_est(
11811182
const std::string solver_type
11821183
= (options.hessian_block_size == 1) ? "Diagonal" : "Block";
11831184
std::string failed = "solver 1 (" + solver_type + " Hessian-root Cholesky)";
1184-
std::call_once(fallback_warning, [](auto&&... args) {
1185-
log_solver_fallback(std::forward<decltype(args)>(args)...);
1186-
}, options.allow_fallthrough, msgs,
1187-
"laplace_marginal_density", step_iter, std::move(failed),
1188-
"solver 2 (Covariance-root Cholesky)", e);
1185+
std::call_once(
1186+
fallback_warning,
1187+
[](auto&&... args) {
1188+
log_solver_fallback(std::forward<decltype(args)>(args)...);
1189+
},
1190+
options.allow_fallthrough, msgs, "laplace_marginal_density", step_iter,
1191+
std::move(failed), "solver 2 (Covariance-root Cholesky)", e);
11891192
}
11901193
try {
11911194
if (options.solver == 2 || options.allow_fallthrough) {
@@ -1194,12 +1197,14 @@ inline auto laplace_marginal_density_est(
11941197
covariance, update_fun, msgs);
11951198
}
11961199
} catch (const std::exception& e) {
1197-
std::call_once(fallback_warning, [](auto&&... args) {
1198-
log_solver_fallback(std::forward<decltype(args)>(args)...);
1199-
}, options.allow_fallthrough, msgs,
1200-
"laplace_marginal_density", step_iter,
1201-
"solver 2 (Covariance-root Cholesky)",
1202-
"solver 3 (General LU solver)", e);
1200+
std::call_once(
1201+
fallback_warning,
1202+
[](auto&&... args) {
1203+
log_solver_fallback(std::forward<decltype(args)>(args)...);
1204+
},
1205+
options.allow_fallthrough, msgs, "laplace_marginal_density", step_iter,
1206+
"solver 2 (Covariance-root Cholesky)", "solver 3 (General LU solver)",
1207+
e);
12031208
}
12041209
if (options.solver == 3 || options.allow_fallthrough) {
12051210
LUSolver solver;

‎test/unit/math/laplace/laplace_marginal_bernoulli_logit_lpmf_test.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ TEST_P(laplace_marginal_bernoulli_logit_lpmf, phi_dim500) {
2323
using stan::math::test::flag_test;
2424
constexpr int dim_theta = 500;
2525
const auto test_params = GetParam();
26-
const auto solver_num = std::get<0>(test_params);
27-
const auto hessian_block_size = std::get<1>(test_params);
28-
const auto max_steps_line_search = std::get<2>(test_params);
26+
const auto solver_num = std::get<0>(test_params);
27+
const auto hessian_block_size = std::get<1>(test_params);
28+
const auto max_steps_line_search = std::get<2>(test_params);
2929
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
3030
// LAPLACE_SKIP_ZERO_STEPS(max_steps_line_search);
3131

‎test/unit/math/laplace/laplace_marginal_lpdf_moto_test.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@ TEST_P(laplace_motorcyle_gp_test, gp_motorcycle_val) {
141141
constexpr double tolerance = 1e-12;
142142
constexpr int max_num_steps = 1000;
143143
const auto test_params = GetParam();
144-
const auto solver_num = std::get<0>(test_params);
145-
const auto hessian_block_size = std::get<1>(test_params);
146-
const auto max_steps_line_search = std::get<2>(test_params);
144+
const auto solver_num = std::get<0>(test_params);
145+
const auto hessian_block_size = std::get<1>(test_params);
146+
const auto max_steps_line_search = std::get<2>(test_params);
147147
constexpr int dim_theta = 2 * n_obs;
148148
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
149149

@@ -171,9 +171,9 @@ TEST_P(laplace_motorcyle_gp_test, gp_motorcycle_ad) {
171171
Eigen::VectorXd phi_rest = phi_dbl.tail(2);
172172
Eigen::VectorXd phi_01{{phi_0, phi_1}};
173173
const auto test_params = GetParam();
174-
const auto solver_num = std::get<0>(test_params);
175-
const auto hessian_block_size = std::get<1>(test_params);
176-
const auto max_steps_line_search = std::get<2>(test_params);
174+
const auto solver_num = std::get<0>(test_params);
175+
const auto hessian_block_size = std::get<1>(test_params);
176+
const auto max_steps_line_search = std::get<2>(test_params);
177177
constexpr int dim_theta = 2 * n_obs;
178178
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
179179
constexpr stan::test::ad_tolerances tols{
@@ -249,9 +249,9 @@ TEST_P(laplace_motorcyle_gp_test, gp_motorcycle2_val) {
249249
constexpr double tolerance = 1e-12;
250250
constexpr int max_num_steps = 300;
251251
const auto test_params = GetParam();
252-
const auto solver_num = std::get<0>(test_params);
253-
const auto hessian_block_size = std::get<1>(test_params);
254-
const auto max_steps_line_search = std::get<2>(test_params);
252+
const auto solver_num = std::get<0>(test_params);
253+
const auto hessian_block_size = std::get<1>(test_params);
254+
const auto max_steps_line_search = std::get<2>(test_params);
255255
constexpr int dim_theta = 2 * n_obs;
256256
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
257257
laplace_marginal_tol<false>(
@@ -278,9 +278,9 @@ TEST_P(laplace_motorcyle_gp_test, gp_motorcycle2_ad) {
278278
Eigen::VectorXd length_scale_vec = phi_dbl.head(2);
279279
Eigen::VectorXd sigma_vec = phi_dbl.tail(2);
280280
const auto test_params = GetParam();
281-
const auto solver_num = std::get<0>(test_params);
282-
const auto hessian_block_size = std::get<1>(test_params);
283-
const auto max_steps_line_search = std::get<2>(test_params);
281+
const auto solver_num = std::get<0>(test_params);
282+
const auto hessian_block_size = std::get<1>(test_params);
283+
const auto max_steps_line_search = std::get<2>(test_params);
284284
constexpr int dim_theta = 2 * n_obs;
285285
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
286286
constexpr stan::test::ad_tolerances tols{

‎test/unit/math/laplace/laplace_marginal_lpdf_test.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,9 @@ TEST_P(laplace_marginal_lpdf, poisson_log_phi_dim_2) {
4848
std::vector<int> n_samples = {1, 1};
4949
std::vector<int> sums = {1, 0};
5050
const auto test_params = GetParam();
51-
const auto solver_num = std::get<0>(test_params);
52-
const auto hessian_block_size = std::get<1>(test_params);
53-
const auto max_steps_line_search = std::get<2>(test_params);
51+
const auto solver_num = std::get<0>(test_params);
52+
const auto hessian_block_size = std::get<1>(test_params);
53+
const auto max_steps_line_search = std::get<2>(test_params);
5454
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
5555

5656
double target = laplace_marginal<false>(
@@ -126,9 +126,9 @@ TEST_P(laplace_disease_map_test, laplace_marginal) {
126126
using stan::math::value_of;
127127
using stan::math::var;
128128
const auto test_params = GetParam();
129-
const auto solver_num = std::get<0>(test_params);
130-
const auto hessian_block_size = std::get<1>(test_params);
131-
const auto max_steps_line_search = std::get<2>(test_params);
129+
const auto solver_num = std::get<0>(test_params);
130+
const auto hessian_block_size = std::get<1>(test_params);
131+
const auto max_steps_line_search = std::get<2>(test_params);
132132
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
133133

134134
{
@@ -197,9 +197,9 @@ TEST_P(laplace_marginal_lpdf, bernoulli_logit_phi_dim500) {
197197
std::vector<double> delta;
198198
Eigen::Matrix<double, Eigen::Dynamic, 1> phi_dbl{{1.6, 1}};
199199
const auto test_params = GetParam();
200-
const auto solver_num = std::get<0>(test_params);
201-
const auto hessian_block_size = std::get<1>(test_params);
202-
const auto max_steps_line_search = std::get<2>(test_params);
200+
const auto solver_num = std::get<0>(test_params);
201+
const auto hessian_block_size = std::get<1>(test_params);
202+
const auto max_steps_line_search = std::get<2>(test_params);
203203
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
204204
double target = laplace_marginal<false>(
205205
bernoulli_logit_likelihood{}, std::forward_as_tuple(y),

‎test/unit/math/laplace/laplace_marginal_neg_binomial_log_lpmf_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ TEST_P(laplace_marginal_neg_binomial_log_lpmf, phi_dim_2) {
3434
std::vector<int> y_index{1, 2};
3535
constexpr double eta_dbl = 100;
3636
const auto test_params = GetParam();
37-
const auto solver_num = std::get<0>(test_params);
38-
const auto hessian_block_size = std::get<1>(test_params);
39-
const auto max_steps_line_search = std::get<2>(test_params);
37+
const auto solver_num = std::get<0>(test_params);
38+
const auto hessian_block_size = std::get<1>(test_params);
39+
const auto max_steps_line_search = std::get<2>(test_params);
4040
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
4141

4242
constexpr double tolerance = 1e-12;
@@ -75,9 +75,9 @@ TEST_P(laplace_disease_map_test, laplace_marginal_neg_binomial_2_log_lpmf) {
7575
using stan::math::value_of;
7676
using stan::math::var;
7777
const auto test_params = GetParam();
78-
const auto solver_num = std::get<0>(test_params);
79-
const auto hessian_block_size = std::get<1>(test_params);
80-
const auto max_steps_line_search = std::get<2>(test_params);
78+
const auto solver_num = std::get<0>(test_params);
79+
const auto hessian_block_size = std::get<1>(test_params);
80+
const auto max_steps_line_search = std::get<2>(test_params);
8181
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
8282
constexpr double eta = 1;
8383

‎test/unit/math/laplace/laplace_marginal_neg_binomial_log_summary_lpmf_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ TEST_P(laplace_marginal_neg_binomial_log_summary_lpmf, phi_dim_2) {
4141
counts_per_group[y_index[i] - 1] += y[i];
4242
}
4343
const auto test_params = GetParam();
44-
const auto solver_num = std::get<0>(test_params);
45-
const auto hessian_block_size = std::get<1>(test_params);
46-
const auto max_steps_line_search = std::get<2>(test_params);
44+
const auto solver_num = std::get<0>(test_params);
45+
const auto hessian_block_size = std::get<1>(test_params);
46+
const auto max_steps_line_search = std::get<2>(test_params);
4747
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
4848
constexpr double tolerance = 1e-12;
4949
constexpr int max_num_steps = 1000;
@@ -84,9 +84,9 @@ TEST_P(laplace_disease_map_test,
8484
using stan::math::value_of;
8585
using stan::math::var;
8686
const auto test_params = GetParam();
87-
const auto solver_num = std::get<0>(test_params);
88-
const auto hessian_block_size = std::get<1>(test_params);
89-
const auto max_steps_line_search = std::get<2>(test_params);
87+
const auto solver_num = std::get<0>(test_params);
88+
const auto hessian_block_size = std::get<1>(test_params);
89+
const auto max_steps_line_search = std::get<2>(test_params);
9090
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
9191
constexpr double eta = 1;
9292
std::vector<int> n_per_group(theta_0.size(), 0);

‎test/unit/math/laplace/laplace_marginal_poisson_log_lpmf_test.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ class laplace_marginal_poisson_log_lpmf : public LaplaceAdTest {};
1616
TEST_P(laplace_marginal_poisson_log_lpmf, phi_dim_2) {
1717
constexpr int dim_theta = 2;
1818
const auto test_params = GetParam();
19-
const auto solver_num = std::get<0>(test_params);
20-
const auto hessian_block_size = std::get<1>(test_params);
21-
const auto max_steps_line_search = std::get<2>(test_params);
19+
const auto solver_num = std::get<0>(test_params);
20+
const auto hessian_block_size = std::get<1>(test_params);
21+
const auto max_steps_line_search = std::get<2>(test_params);
2222
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
2323

2424
using stan::math::laplace_marginal_poisson_log_lpmf;
@@ -79,9 +79,9 @@ const auto max_steps_line_search = std::get<2>(test_params);
7979
TEST_P(laplace_marginal_poisson_log_lpmf, log_phi_dim_2) {
8080
constexpr int dim_theta = 2;
8181
const auto test_params = GetParam();
82-
const auto solver_num = std::get<0>(test_params);
83-
const auto hessian_block_size = std::get<1>(test_params);
84-
const auto max_steps_line_search = std::get<2>(test_params);
82+
const auto solver_num = std::get<0>(test_params);
83+
const auto hessian_block_size = std::get<1>(test_params);
84+
const auto max_steps_line_search = std::get<2>(test_params);
8585
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
8686
using stan::math::laplace_marginal_poisson_log_lpmf;
8787
using stan::math::laplace_marginal_tol_poisson_log_lpmf;
@@ -153,9 +153,9 @@ struct diag_covariance {
153153
TEST_P(laplace_marginal_poisson_log_lpmf, mean_argument) {
154154
constexpr int dim_theta = 1;
155155
const auto test_params = GetParam();
156-
const auto solver_num = std::get<0>(test_params);
157-
const auto hessian_block_size = std::get<1>(test_params);
158-
const auto max_steps_line_search = std::get<2>(test_params);
156+
const auto solver_num = std::get<0>(test_params);
157+
const auto hessian_block_size = std::get<1>(test_params);
158+
const auto max_steps_line_search = std::get<2>(test_params);
159159
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
160160

161161
// working example from
@@ -186,9 +186,9 @@ LAPLACE_INSTANTIATE_TEST_SUITE_P(laplace_marginal_poisson_log_lpmf);
186186

187187
TEST_P(laplace_disease_map_test, laplace_marginal_poisson_log_lpmf) {
188188
const auto test_params = GetParam();
189-
const auto solver_num = std::get<0>(test_params);
190-
const auto hessian_block_size = std::get<1>(test_params);
191-
const auto max_steps_line_search = std::get<2>(test_params);
189+
const auto solver_num = std::get<0>(test_params);
190+
const auto hessian_block_size = std::get<1>(test_params);
191+
const auto max_steps_line_search = std::get<2>(test_params);
192192
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
193193

194194
using stan::math::laplace_marginal_poisson_log_lpmf;

‎test/unit/math/laplace/laplace_types_test.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,9 @@ TEST_P(laplace_types, poisson_log_phi_dim_2_tuple_extended) {
136136
std::vector<int> n_samples = {1, 1};
137137
std::vector<int> sums = {1, 0};
138138
const auto test_params = GetParam();
139-
const auto solver_num = std::get<0>(test_params);
140-
const auto hessian_block_size = std::get<1>(test_params);
141-
const auto max_steps_line_search = std::get<2>(test_params);
139+
const auto solver_num = std::get<0>(test_params);
140+
const auto hessian_block_size = std::get<1>(test_params);
141+
const auto max_steps_line_search = std::get<2>(test_params);
142142
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
143143

144144
constexpr double tolerance = 1e-12;
@@ -204,9 +204,9 @@ TEST_P(laplace_types, poisson_log_phi_dim_2_tuple) {
204204
std::vector<int> n_samples = {1, 1};
205205
std::vector<int> sums = {1, 0};
206206
const auto test_params = GetParam();
207-
const auto solver_num = std::get<0>(test_params);
208-
const auto hessian_block_size = std::get<1>(test_params);
209-
const auto max_steps_line_search = std::get<2>(test_params);
207+
const auto solver_num = std::get<0>(test_params);
208+
const auto hessian_block_size = std::get<1>(test_params);
209+
const auto max_steps_line_search = std::get<2>(test_params);
210210
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
211211

212212
constexpr double tolerance = 1e-12;
@@ -301,9 +301,9 @@ TEST_P(laplace_types, poisson_log_phi_dim_2_array_tuple) {
301301
std::vector<int> n_samples = {1, 1};
302302
std::vector<int> sums = {1, 0};
303303
const auto test_params = GetParam();
304-
const auto solver_num = std::get<0>(test_params);
305-
const auto hessian_block_size = std::get<1>(test_params);
306-
const auto max_steps_line_search = std::get<2>(test_params);
304+
const auto solver_num = std::get<0>(test_params);
305+
const auto hessian_block_size = std::get<1>(test_params);
306+
const auto max_steps_line_search = std::get<2>(test_params);
307307
LAPLACE_SKIP_IF_INVALID_TEST_COMBO(hessian_block_size, dim_theta);
308308

309309
constexpr double tolerance = 1e-12;

0 commit comments

Comments
 (0)