Skip to content

Commit 3352711

Browse files
stan-buildbotstan-buildbot
committed
[Jenkins] auto-formatting by clang-format version 6.0.0-1ubuntu2~16.04.1 (tags/RELEASE_600/final)
1 parent 7dcc621 commit 3352711

8 files changed

+46
-42
lines changed

‎stan/math/rev/fun/multiply.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ inline auto multiply(const T1& A, const T2& B) {
4949
arena_t<promote_scalar_t<var, T2>> arena_B = to_ref(B);
5050
using return_t
5151
= return_var_matrix_t<decltype(arena_A_val * value_of(B).eval()), T1,
52-
T2>;
52+
T2>;
5353
arena_t<return_t> res = arena_A_val * value_of(arena_B);
5454
reverse_pass_callback([arena_B, arena_A_val, res]() mutable {
5555
arena_B.adj() += arena_A_val.transpose() * res.adj_op();
@@ -60,7 +60,7 @@ inline auto multiply(const T1& A, const T2& B) {
6060
arena_t<promote_scalar_t<double, T2>> arena_B_val = value_of(to_ref(B));
6161
using return_t
6262
= return_var_matrix_t<decltype(value_of(arena_A).eval() * arena_B_val),
63-
T1, T2>;
63+
T1, T2>;
6464
arena_t<return_t> res = value_of(arena_A) * arena_B_val;
6565
reverse_pass_callback([arena_A, arena_B_val, res]() mutable {
6666
arena_A.adj() += res.adj_op() * arena_B_val.transpose();

‎stan/math/rev/fun/multiply_lower_tri_self_transpose.hpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,15 @@ template <typename T, require_rev_matrix_t<T>* = nullptr>
1616
inline auto multiply_lower_tri_self_transpose(const T& L) {
1717
using ret_type = return_var_matrix_t<T>;
1818
if (L.size() == 0) {
19-
return ret_type(
20-
decltype(multiply_lower_tri_self_transpose(value_of(L)))());
19+
return ret_type(decltype(multiply_lower_tri_self_transpose(value_of(L)))());
2120
}
2221

2322
arena_t<T> arena_L = L;
2423
arena_t<promote_scalar_t<double, T>> arena_L_val
2524
= arena_L.val().template triangularView<Eigen::Lower>();
2625

2726
arena_t<ret_type> res = arena_L_val.template triangularView<Eigen::Lower>()
28-
* arena_L_val.transpose();
27+
* arena_L_val.transpose();
2928

3029
reverse_pass_callback([res, arena_L, arena_L_val]() mutable {
3130
arena_L.adj() += ((res.adj().transpose() + res.adj())

‎stan/math/rev/fun/quad_form.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@ inline auto quad_form_impl(const Mat1& A, const Mat2& B, bool symmetric) {
120120

121121
using return_t
122122
= return_var_matrix_t<decltype(value_of(B).transpose().eval()
123-
* value_of(A) * value_of(B).eval()),
124-
Mat1, Mat2>;
123+
* value_of(A) * value_of(B).eval()),
124+
Mat1, Mat2>;
125125

126126
if (!is_constant<Mat1>::value && !is_constant<Mat2>::value) {
127127
arena_t<promote_scalar_t<var, Mat1>> arena_A = A;

‎stan/math/rev/meta/plain_type.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@
77

88
namespace stan {
99

10-
1110
/**
1211
* Determines plain (non expression) type associated with \c T. For `var_value`
1312
* with an underlying eigen type this is a `var_value<plain_type_t<T>>`
1413
*
1514
* @tparam T type to determine plain type of
1615
*/
1716
template <typename T>
18-
struct plain_type<T, require_t<stan::math::conjunction<is_var<T>, is_eigen<value_type_t<T>>>>> {
17+
struct plain_type<
18+
T,
19+
require_t<stan::math::conjunction<is_var<T>, is_eigen<value_type_t<T>>>>> {
1920
using type = typename stan::math::var_value<plain_type_t<value_type_t<T>>>;
2021
};
2122

‎stan/math/rev/meta/promote_var_matrix.hpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ namespace stan {
1818
template <typename ReturnType, typename... Types>
1919
using promote_var_matrix_t = std::conditional_t<
2020
is_any_var_matrix<ReturnType, Types...>::value,
21-
stan::math::var_value<
22-
stan::math::promote_scalar_t<double, ReturnType>>,
23-
stan::math::promote_scalar_t<stan::math::var_value<double>,
24-
ReturnType>>;
21+
stan::math::var_value<stan::math::promote_scalar_t<double, ReturnType>>,
22+
stan::math::promote_scalar_t<stan::math::var_value<double>, ReturnType>>;
2523
} // namespace stan
2624

2725
#endif

‎test/unit/math/rev/meta/promote_var_matrix_test.cpp

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,15 +36,17 @@ TEST(MathFunctionsPromoteVarMatrix, VarMatrix) {
3636
promote_var_matrix_t<Eigen::VectorXd, var_vector,
3737
vector_var, double>>::value));
3838

39-
EXPECT_TRUE((is_same<stan::math::var_value<
40-
stan::math::promote_scalar_t<double, decltype(A_vm.val().block(0, 0, 2, 2))>>,
41-
promote_var_matrix_t<decltype(A_vm.block(0, 0, 2, 2))>>::value));
39+
EXPECT_TRUE(
40+
(is_same<stan::math::var_value<stan::math::promote_scalar_t<
41+
double, decltype(A_vm.val().block(0, 0, 2, 2))>>,
42+
promote_var_matrix_t<decltype(A_vm.block(0, 0, 2, 2))>>::value));
4243

43-
EXPECT_TRUE((is_same<matrix_var,
44-
promote_var_matrix_t<decltype(A_mv.block(0, 0, 2, 2))>>::value));
44+
EXPECT_TRUE(
45+
(is_same<matrix_var,
46+
promote_var_matrix_t<decltype(A_mv.block(0, 0, 2, 2))>>::value));
4547

46-
EXPECT_TRUE((is_same<matrix_var,
47-
promote_var_matrix_t<decltype(A_mv * A_mv)>>::value));
48+
EXPECT_TRUE((
49+
is_same<matrix_var, promote_var_matrix_t<decltype(A_mv * A_mv)>>::value));
4850

4951
EXPECT_TRUE((is_same<var_value<Eigen::RowVectorXd>,
5052
promote_var_matrix_t<Eigen::RowVectorXd, var_matrix,

‎test/unit/math/rev/meta/return_var_matrix_test.cpp

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,48 +18,50 @@ TEST(MathFunctionsPromoteVarMatrix, VarMatrix) {
1818

1919
EXPECT_TRUE((is_same<var_value<Eigen::MatrixXd>,
2020
return_var_matrix_t<Eigen::MatrixXd, var_matrix,
21-
matrix_var>>::value));
21+
matrix_var>>::value));
2222
EXPECT_TRUE((is_same<var_value<Eigen::MatrixXd>,
2323
return_var_matrix_t<Eigen::MatrixXd, var_matrix,
24-
vector_var, var>>::value));
24+
vector_var, var>>::value));
2525

26-
EXPECT_TRUE((is_same<var_value<Eigen::MatrixXd>,
27-
return_var_matrix_t<decltype(A_vm.block(0, 0, 2, 2))>>::value));
26+
EXPECT_TRUE(
27+
(is_same<var_value<Eigen::MatrixXd>,
28+
return_var_matrix_t<decltype(A_vm.block(0, 0, 2, 2))>>::value));
2829

29-
EXPECT_TRUE((is_same<matrix_var,
30-
return_var_matrix_t<decltype(A_mv.block(0, 0, 2, 2))>>::value));
30+
EXPECT_TRUE(
31+
(is_same<matrix_var,
32+
return_var_matrix_t<decltype(A_mv.block(0, 0, 2, 2))>>::value));
3133

32-
EXPECT_TRUE((is_same<matrix_var,
33-
return_var_matrix_t<decltype(A_mv * A_mv)>>::value));
34+
EXPECT_TRUE(
35+
(is_same<matrix_var, return_var_matrix_t<decltype(A_mv * A_mv)>>::value));
3436

3537
EXPECT_TRUE((is_same<var_value<Eigen::MatrixXd>,
3638
return_var_matrix_t<Eigen::MatrixXd, var_vector,
37-
vector_var, double>>::value));
39+
vector_var, double>>::value));
3840

3941
EXPECT_TRUE((is_same<var_value<Eigen::VectorXd>,
4042
return_var_matrix_t<Eigen::VectorXd, var_matrix,
41-
matrix_var>>::value));
43+
matrix_var>>::value));
4244
EXPECT_TRUE((is_same<var_value<Eigen::VectorXd>,
4345
return_var_matrix_t<Eigen::VectorXd, var_matrix,
44-
vector_var, var>>::value));
46+
vector_var, var>>::value));
4547
EXPECT_TRUE((is_same<var_value<Eigen::VectorXd>,
4648
return_var_matrix_t<Eigen::VectorXd, var_vector,
47-
vector_var, double>>::value));
49+
vector_var, double>>::value));
4850

4951
EXPECT_TRUE((is_same<var_value<Eigen::RowVectorXd>,
5052
return_var_matrix_t<Eigen::RowVectorXd, var_matrix,
51-
matrix_var>>::value));
53+
matrix_var>>::value));
5254
EXPECT_TRUE((is_same<var_value<Eigen::RowVectorXd>,
5355
return_var_matrix_t<Eigen::RowVectorXd, var_matrix,
54-
vector_var, var>>::value));
56+
vector_var, var>>::value));
5557
EXPECT_TRUE((is_same<var_value<Eigen::RowVectorXd>,
5658
return_var_matrix_t<Eigen::RowVectorXd, var_vector,
57-
row_vector_var, double>>::value));
59+
row_vector_var, double>>::value));
5860

5961
EXPECT_TRUE((is_same<Eigen::Matrix<var, -1, -1>,
6062
return_var_matrix_t<Eigen::MatrixXd, vector_var,
61-
vector_var, double>>::value));
63+
vector_var, double>>::value));
6264
EXPECT_TRUE((is_same<Eigen::Matrix<var, 1, -1>,
6365
return_var_matrix_t<Eigen::RowVectorXd, vector_var,
64-
row_vector_var, double>>::value));
66+
row_vector_var, double>>::value));
6567
}

‎test/unit/math/test_ad.hpp

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1712,14 +1712,16 @@ void check_return_type(const ReturnType& ret, const Type& x) {
17121712
FAIL() << type_name<Type>() << " returns a " << type_name<ReturnType>()
17131713
<< " but should return either an Matrix<var> or a var_value<double>";
17141714
} else if (is_var_matrix<Type>::value) {
1715-
if (!(is_var_matrix<ReturnType>::value || std::is_same<ReturnType, var_value<double>>::value)) {
1716-
FAIL() << type_name<Type>() << " returns a " << type_name<ReturnType>()
1717-
<< " but should return either an var<Matrix> or a var_value<double>";
1715+
if (!(is_var_matrix<ReturnType>::value
1716+
|| std::is_same<ReturnType, var_value<double>>::value)) {
1717+
FAIL()
1718+
<< type_name<Type>() << " returns a " << type_name<ReturnType>()
1719+
<< " but should return either an var<Matrix> or a var_value<double>";
17181720
}
17191721
if (!std::is_same<ReturnType, return_var_matrix_t<ReturnType>>::value) {
17201722
FAIL() << type_name<Type>() << " returns a " << type_name<ReturnType>()
1721-
<< " but should return " <<
1722-
type_name<return_var_matrix_t<ReturnType>>();
1723+
<< " but should return "
1724+
<< type_name<return_var_matrix_t<ReturnType>>();
17231725
}
17241726
}
17251727
}

0 commit comments

Comments
 (0)