Skip to content

Commit 1389a59

Browse files
stan-buildbotstan-buildbot
committed
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
1 parent 6250cc3 commit 1389a59

11 files changed

Lines changed: 46 additions & 52 deletions

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@ using laplace_options_user_supplied = laplace_options<true>;
109109
*/
110110
inline auto generate_laplace_options(int theta_0_size) {
111111
auto ops = laplace_options_default{};
112-
return std::make_tuple(
113-
Eigen::VectorXd::Zero(theta_0_size).eval(),
114-
ops.tolerance, ops.max_num_steps, ops.solver,
115-
ops.line_search.max_iterations, static_cast<int>(ops.allow_fallthrough));
112+
return std::make_tuple(Eigen::VectorXd::Zero(theta_0_size).eval(),
113+
ops.tolerance, ops.max_num_steps, ops.solver,
114+
ops.line_search.max_iterations,
115+
static_cast<int>(ops.allow_fallthrough));
116116
}
117117

118118
/**
@@ -123,10 +123,10 @@ inline auto generate_laplace_options(int theta_0_size) {
123123
template <typename ThetaVec, require_eigen_t<ThetaVec>* = nullptr>
124124
inline auto generate_laplace_options(ThetaVec&& theta_0) {
125125
auto ops = laplace_options_default{};
126-
return std::make_tuple(
127-
std::forward<ThetaVec>(theta_0),
128-
ops.tolerance, ops.max_num_steps, ops.solver,
129-
ops.line_search.max_iterations, static_cast<int>(ops.allow_fallthrough));
126+
return std::make_tuple(std::forward<ThetaVec>(theta_0), ops.tolerance,
127+
ops.max_num_steps, ops.solver,
128+
ops.line_search.max_iterations,
129+
static_cast<int>(ops.allow_fallthrough));
130130
}
131131

132132
namespace internal {

‎stan/math/mix/prob/laplace_latent_bernoulli_logit_rng.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ inline Eigen::VectorXd laplace_latent_tol_bernoulli_logit_rng(
3636
const std::vector<int>& y, const std::vector<int>& n_samples, Mean&& mean,
3737
CovarFun&& covariance_function, CovarArgs&& covar_args,
3838
int hessian_block_size, OpsTuple&& ops, RNG& rng, std::ostream* msgs) {
39-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
39+
auto options
40+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
4041
options.hessian_block_size = hessian_block_size;
4142
return laplace_base_rng(
4243
bernoulli_logit_likelihood{},
@@ -70,8 +71,7 @@ template <typename Mean, typename CovarFun, typename CovarArgs, typename RNG>
7071
inline Eigen::VectorXd laplace_latent_bernoulli_logit_rng(
7172
const std::vector<int>& y, const std::vector<int>& n_samples, Mean&& mean,
7273
CovarFun&& covariance_function, CovarArgs&& covar_args,
73-
int hessian_block_size, RNG& rng,
74-
std::ostream* msgs) {
74+
int hessian_block_size, RNG& rng, std::ostream* msgs) {
7575
auto options = laplace_options_default{hessian_block_size};
7676
return laplace_base_rng(
7777
bernoulli_logit_likelihood{},

‎stan/math/mix/prob/laplace_latent_neg_binomial_2_log_rng.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ inline Eigen::VectorXd laplace_latent_tol_neg_binomial_2_log_rng(
4343
const std::vector<int>& y, const std::vector<int>& y_index, Eta&& eta,
4444
Mean&& mean, CovarFun&& covariance_function, CovarArgs&& covar_args,
4545
int hessian_block_size, OpsTuple&& ops, RNG& rng, std::ostream* msgs) {
46-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
46+
auto options
47+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
4748
options.hessian_block_size = hessian_block_size;
4849
return laplace_base_rng(
4950
neg_binomial_2_log_likelihood{},

‎stan/math/mix/prob/laplace_latent_poisson_log_rng.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ inline Eigen::VectorXd laplace_latent_tol_poisson_log_rng(
3838
const std::vector<int>& y, const std::vector<int>& y_index, Mean&& mean,
3939
CovarFun&& covariance_function, CovarArgs&& covar_args,
4040
int hessian_block_size, OpsTuple&& ops, RNG& rng, std::ostream* msgs) {
41-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
41+
auto options
42+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
4243
options.hessian_block_size = hessian_block_size;
4344
return laplace_base_rng(
4445
poisson_log_likelihood{},
@@ -73,8 +74,7 @@ template <typename CovarFun, typename CovarArgs, typename RNG, typename Mean>
7374
inline Eigen::VectorXd laplace_latent_poisson_log_rng(
7475
const std::vector<int>& y, const std::vector<int>& y_index, Mean&& mean,
7576
CovarFun&& covariance_function, CovarArgs&& covar_args,
76-
int hessian_block_size, RNG& rng,
77-
std::ostream* msgs) {
77+
int hessian_block_size, RNG& rng, std::ostream* msgs) {
7878
auto options = laplace_options_default{hessian_block_size};
7979
return laplace_base_rng(
8080
poisson_log_likelihood{},

‎stan/math/mix/prob/laplace_latent_rng.hpp‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ inline auto laplace_latent_tol_rng(LLFunc&& L_f, LLArgs&& ll_args,
3838
CovarArgs&& covar_args,
3939
int hessian_block_size, OpsTuple&& ops,
4040
RNG& rng, std::ostream* msgs) {
41-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
41+
auto options
42+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
4243
options.hessian_block_size = hessian_block_size;
4344
return laplace_base_rng(
4445
std::forward<LLFunc>(L_f), std::forward<LLArgs>(ll_args),
@@ -71,14 +72,12 @@ template <typename LLFunc, typename LLArgs, typename CovarFun,
7172
inline auto laplace_latent_rng(LLFunc&& L_f, LLArgs&& ll_args,
7273
CovarFun&& covariance_function,
7374
CovarArgs&& covar_args, int hessian_block_size,
74-
RNG& rng,
75-
std::ostream* msgs) {
75+
RNG& rng, std::ostream* msgs) {
7676
auto options = laplace_options_default{hessian_block_size};
77-
return laplace_base_rng(std::forward<LLFunc>(L_f),
78-
std::forward<LLArgs>(ll_args),
79-
std::forward<CovarFun>(covariance_function),
80-
std::forward<CovarArgs>(covar_args), options, rng,
81-
msgs);
77+
return laplace_base_rng(
78+
std::forward<LLFunc>(L_f), std::forward<LLArgs>(ll_args),
79+
std::forward<CovarFun>(covariance_function),
80+
std::forward<CovarArgs>(covar_args), options, rng, msgs);
8281
}
8382

8483
} // namespace math

‎stan/math/mix/prob/laplace_marginal.hpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ template <bool propto = false, typename LFun, typename LArgs, typename CovarFun,
3131
typename CovarArgs, typename OpsTuple>
3232
inline auto laplace_marginal_tol(LFun&& L_f, LArgs&& l_args,
3333
CovarFun&& covariance_function,
34-
CovarArgs&& covar_args,
35-
int hessian_block_size, OpsTuple&& ops,
36-
std::ostream* msgs) {
37-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
34+
CovarArgs&& covar_args, int hessian_block_size,
35+
OpsTuple&& ops, std::ostream* msgs) {
36+
auto options
37+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
3838
options.hessian_block_size = hessian_block_size;
3939
return laplace_marginal_density(
4040
std::forward<LFun>(L_f), std::forward<LArgs>(l_args),

‎stan/math/mix/prob/laplace_marginal_bernoulli_logit_lpmf.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ inline auto laplace_marginal_tol_bernoulli_logit_lpmf(
6060
const std::vector<int>& y, const std::vector<int>& n_samples, Mean&& mean,
6161
CovarFun&& covariance_function, CovarArgs&& covar_args,
6262
int hessian_block_size, OpsTuple&& ops, std::ostream* msgs) {
63-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
63+
auto options
64+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
6465
options.hessian_block_size = hessian_block_size;
6566
return laplace_marginal_density(
6667
bernoulli_logit_likelihood{},
@@ -93,8 +94,7 @@ template <bool propto = false, typename Mean, typename CovarFun,
9394
inline auto laplace_marginal_bernoulli_logit_lpmf(
9495
const std::vector<int>& y, const std::vector<int>& n_samples, Mean&& mean,
9596
CovarFun&& covariance_function, CovarArgs&& covar_args,
96-
int hessian_block_size,
97-
std::ostream* msgs) {
97+
int hessian_block_size, std::ostream* msgs) {
9898
auto options = laplace_options_default{hessian_block_size};
9999
return laplace_marginal_density(
100100
bernoulli_logit_likelihood{},

‎stan/math/mix/prob/laplace_marginal_neg_binomial_2_log_lpmf.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,8 @@ inline auto laplace_marginal_tol_neg_binomial_2_log_lpmf(
8484
const std::vector<int>& y, const std::vector<int>& y_index, const Eta& eta,
8585
Mean&& mean, CovarFun&& covariance_function, CovarArgs&& covar_args,
8686
int hessian_block_size, OpsTuple&& ops, std::ostream* msgs) {
87-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
87+
auto options
88+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
8889
options.hessian_block_size = hessian_block_size;
8990
return laplace_marginal_density(
9091
neg_binomial_2_log_likelihood{},
@@ -185,7 +186,8 @@ inline auto laplace_marginal_tol_neg_binomial_2_log_summary_lpmf(
185186
const std::vector<int>& counts_per_group, const Eta& eta, Mean&& mean,
186187
CovarFun&& covariance_function, CovarArgs&& covar_args,
187188
int hessian_block_size, OpsTuple&& ops, std::ostream* msgs) {
188-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
189+
auto options
190+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
189191
options.hessian_block_size = hessian_block_size;
190192
return laplace_marginal_density(
191193
neg_binomial_2_log_likelihood_summary{},

‎stan/math/mix/prob/laplace_marginal_poisson_log_lpmf.hpp‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ inline auto laplace_marginal_tol_poisson_log_lpmf(
7676
const std::vector<int>& y, const std::vector<int>& y_index, Mean&& mean,
7777
CovarFun&& covariance_function, CovarArgs&& covar_args,
7878
int hessian_block_size, OpsTuple&& ops, std::ostream* msgs) {
79-
auto options = internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
79+
auto options
80+
= internal::tuple_to_laplace_options(std::forward<OpsTuple>(ops));
8081
options.hessian_block_size = hessian_block_size;
8182
return laplace_marginal_density(
8283
poisson_log_likelihood{},
@@ -105,19 +106,15 @@ inline auto laplace_marginal_tol_poisson_log_lpmf(
105106
*/
106107
template <bool propto = false, typename CovarFun, typename CovarArgs,
107108
typename Mean>
108-
inline auto laplace_marginal_poisson_log_lpmf(const std::vector<int>& y,
109-
const std::vector<int>& y_index,
110-
Mean&& mean,
111-
CovarFun&& covariance_function,
112-
CovarArgs&& covar_args,
113-
int hessian_block_size,
114-
std::ostream* msgs) {
109+
inline auto laplace_marginal_poisson_log_lpmf(
110+
const std::vector<int>& y, const std::vector<int>& y_index, Mean&& mean,
111+
CovarFun&& covariance_function, CovarArgs&& covar_args,
112+
int hessian_block_size, std::ostream* msgs) {
115113
auto options = laplace_options_default{hessian_block_size};
116114
return laplace_marginal_density(
117115
poisson_log_likelihood{},
118116
std::forward_as_tuple(y, y_index, std::forward<Mean>(mean)),
119-
covariance_function, std::forward<CovarArgs>(covar_args),
120-
options, msgs);
117+
covariance_function, std::forward<CovarArgs>(covar_args), options, msgs);
121118
}
122119

123120
} // namespace math

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,8 +177,7 @@ TEST_P(laplace_marginal_poisson_log_lpmf, mean_argument) {
177177
constexpr int max_num_steps = 500;
178178
double marginal_density = laplace_marginal_tol_poisson_log_lpmf(
179179
y, y_index, mu, diag_covariance{},
180-
std::tuple<double, int>(sigmaz, dim_theta),
181-
hessian_block_size,
180+
std::tuple<double, int>(sigmaz, dim_theta), hessian_block_size,
182181
std::make_tuple(theta_0, tolerance, max_num_steps, solver_num,
183182
max_steps_line_search, true),
184183
&output_stream);
@@ -204,8 +203,7 @@ TEST_P(laplace_disease_map_test, laplace_marginal_poisson_log_lpmf) {
204203

205204
double marginal_density = laplace_marginal_tol_poisson_log_lpmf(
206205
y, y_index, log(ye), stan::math::test::sqr_exp_kernel_functor(),
207-
std::forward_as_tuple(x, phi_dbl(0), phi_dbl(1)),
208-
hessian_block_size,
206+
std::forward_as_tuple(x, phi_dbl(0), phi_dbl(1)), hessian_block_size,
209207
std::make_tuple(theta_0, tolerance, max_num_steps, solver_num,
210208
max_steps_line_search, true),
211209
&output_stream);

0 commit comments

Comments
 (0)