Skip to content

Commit db837e8

Browse files
committed
[Jenkins] auto-formatting by clang-format version 10.0.0-4ubuntu1
1 parent 1722ad9 commit db837e8

2 files changed

Lines changed: 39 additions & 25 deletions

File tree

stan/math/prim/fun/select.hpp

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -142,11 +142,14 @@ template <typename T_bool, typename T_true, typename T_false,
142142
require_all_stan_scalar_t<T_true, T_false>* = nullptr>
143143
inline auto select(T_bool&& c, const T_true& y_true, const T_false& y_false) {
144144
using ret_t = return_type_t<T_true, T_false>;
145-
return make_holder([y_true, y_false](auto&& c_) {
146-
return std::forward<decltype(c_)>(c_).unaryExpr([y_true, y_false](bool cond) {
147-
return cond ? ret_t(y_true) : ret_t(y_false);
148-
});
149-
}, std::forward<T_bool>(c));
145+
return make_holder(
146+
[y_true, y_false](auto&& c_) {
147+
return std::forward<decltype(c_)>(c_).unaryExpr(
148+
[y_true, y_false](bool cond) {
149+
return cond ? ret_t(y_true) : ret_t(y_false);
150+
});
151+
},
152+
std::forward<T_bool>(c));
150153
}
151154

152155
/**
@@ -169,17 +172,25 @@ inline auto select(T_bool&& c, T_true&& y_true, T_false&& y_false) {
169172
"right hand side", y_false);
170173
using ret_t = return_type_t<T_true, T_false>;
171174
if constexpr (!std::is_same_v<std::decay_t<T_true>, std::decay_t<T_false>>) {
172-
return make_holder([](auto&& c_, auto&& y_true_, auto&& y_false_) {
173-
return std::forward<decltype(c_)>(c_).select(
174-
std::forward<decltype(y_true_)>(y_true_),
175-
std::forward<decltype(y_false_)>(y_false_));
176-
}, std::forward<T_bool>(c), std::forward<T_true>(y_true), std::forward<T_false>(y_false));
175+
return make_holder(
176+
[](auto&& c_, auto&& y_true_, auto&& y_false_) {
177+
return std::forward<decltype(c_)>(c_).select(
178+
std::forward<decltype(y_true_)>(y_true_),
179+
std::forward<decltype(y_false_)>(y_false_));
180+
},
181+
std::forward<T_bool>(c), std::forward<T_true>(y_true),
182+
std::forward<T_false>(y_false));
177183
} else {
178-
return make_holder([](auto&& c_, auto&& y_true_, auto&& y_false_) {
179-
return std::forward<decltype(c_)>(c_).select(std::forward<decltype(y_true_)>(y_true_),
180-
std::forward<decltype(y_false_)>(y_false_)).template cast<ret_t>();
181-
}, std::forward<T_bool>(c), std::forward<T_true>(y_true), std::forward<T_false>(y_false));
182-
}
184+
return make_holder(
185+
[](auto&& c_, auto&& y_true_, auto&& y_false_) {
186+
return std::forward<decltype(c_)>(c_)
187+
.select(std::forward<decltype(y_true_)>(y_true_),
188+
std::forward<decltype(y_false_)>(y_false_))
189+
.template cast<ret_t>();
190+
},
191+
std::forward<T_bool>(c), std::forward<T_true>(y_true),
192+
std::forward<T_false>(y_false));
193+
}
183194
}
184195
} // namespace math
185196
} // namespace stan

stan/math/prim/prob/neg_binomial_2_lpmf.hpp

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -61,31 +61,34 @@ inline return_type_t<T_location, T_precision> neg_binomial_2_lpmf(
6161
auto mu_plus_phi = mu_val + phi_val;
6262
auto log_mu_plus_phi = log(mu_plus_phi);
6363
auto n_plus_phi = value_of(n_vec) + phi_val;
64-
constexpr bool include_precision = include_summand<propto, T_precision>::value;
64+
constexpr bool include_precision
65+
= include_summand<propto, T_precision>::value;
6566
constexpr bool include_location = include_summand<propto, T_location>::value;
6667
auto logp_calc = [&]() {
6768
return -phi_val * (log1p(mu_val / phi_val))
68-
- value_of(n_vec) * log_mu_plus_phi;
69+
- value_of(n_vec) * log_mu_plus_phi;
6970
};
7071
if constexpr (include_precision || include_location) {
7172
if constexpr (include_precision && include_location) {
72-
logp += sum(binomial_coefficient_log(n_plus_phi - 1, n_vec) + multiply_log(n_vec, mu_val) + logp_calc());
73+
logp += sum(binomial_coefficient_log(n_plus_phi - 1, n_vec)
74+
+ multiply_log(n_vec, mu_val) + logp_calc());
7375
} else if constexpr (include_precision) {
74-
logp += sum(binomial_coefficient_log(n_plus_phi - 1, n_vec) + logp_calc());
76+
logp
77+
+= sum(binomial_coefficient_log(n_plus_phi - 1, n_vec) + logp_calc());
7578
} else if constexpr (include_location) {
7679
logp += sum(multiply_log(n_vec, mu_val) + logp_calc());
7780
}
7881
}
7982
if constexpr (is_autodiff_v<T_location>) {
80-
partials<0>(ops_partials) = n_vec / mu_val - (n_vec + phi_val) / mu_plus_phi;
83+
partials<0>(ops_partials)
84+
= n_vec / mu_val - (n_vec + phi_val) / mu_plus_phi;
8185
}
8286
if constexpr (is_autodiff_v<T_precision>) {
83-
auto log_term
84-
= select(mu_val < phi_val, log1p(-mu_val / mu_plus_phi),
85-
log_phi - log_mu_plus_phi);
87+
auto log_term = select(mu_val < phi_val, log1p(-mu_val / mu_plus_phi),
88+
log_phi - log_mu_plus_phi);
8689
partials<1>(ops_partials) = (mu_val - value_of(n_vec)) / mu_plus_phi
87-
+ log_term - digamma(phi_val)
88-
+ digamma(n_plus_phi);
90+
+ log_term - digamma(phi_val)
91+
+ digamma(n_plus_phi);
8992
}
9093
return ops_partials.build(logp);
9194
}

0 commit comments

Comments
 (0)