Skip to content

Commit 41f138f

Browse files
SteveBronderSteveBronder
committed
update tests all passing
1 parent 02bcffc commit 41f138f

6 files changed

Lines changed: 24 additions & 21 deletions

File tree

‎stan/math/prim/meta/ref_type.hpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
#include <stan/math/prim/fun/Eigen.hpp>
55
#include <stan/math/prim/meta/is_constant.hpp>
6+
#include <stan/math/prim/meta/is_autodiff.hpp>
67
#include <stan/math/prim/meta/is_eigen.hpp>
78
#include <stan/math/prim/meta/is_arena_matrix.hpp>
89
#include <stan/math/prim/meta/is_vector.hpp>

‎stan/math/prim/prob/wishart_lpdf.hpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ return_type_t<T_y, T_dof, T_scale> wishart_lpdf(const T_y& W, const T_dof& nu,
9292
lp -= 0.5 * trace(mdivide_left_ldlt(ldlt_S, W_ref));
9393
}
9494

95-
if constexpr (include_summand<propto, T_y, T_dof>::value && nu_ref != (k + 1)) {
96-
lp += 0.5 * (nu_ref - k - 1.0) * log_determinant_ldlt(ldlt_W);
95+
if constexpr (include_summand<propto, T_y, T_dof>::value) {
96+
if (nu_ref != (k + 1)) {
97+
lp += 0.5 * (nu_ref - k - 1.0) * log_determinant_ldlt(ldlt_W);
98+
}
9799
}
98100
return lp;
99101
}

‎test/unit/math/fwd/meta/require_generics_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,37 +43,37 @@ TEST(requires_fwd_scal, fvar_any_not_test) {
4343
TEST(requires_fwd_scal, autodiff_test) {
4444
using stan::math::fvar;
4545
using stan::test::require_scal_checker;
46-
require_scal_checker<stan::require_autodiff_t, fvar<double>,
46+
require_scal_checker<stan::require_autodiff_scalar_t, fvar<double>,
4747
fvar<double>>::unary();
4848
}
4949
TEST(requires_fwd_scal, autodiff_not_test) {
5050
using stan::math::fvar;
5151
using stan::test::require_scal_checker;
52-
require_scal_checker<stan::require_not_autodiff_t, fvar<double>,
52+
require_scal_checker<stan::require_not_autodiff_scalar_t, fvar<double>,
5353
fvar<double>>::not_unary();
5454
}
5555
TEST(requires_fwd_scal, autodiff_all_test) {
5656
using stan::math::fvar;
5757
using stan::test::require_scal_checker;
58-
require_scal_checker<stan::require_all_autodiff_t, fvar<double>,
58+
require_scal_checker<stan::require_all_autodiff_scalar_t, fvar<double>,
5959
fvar<double>>::all();
6060
}
6161
TEST(requires_fwd_scal, autodiff_all_not_test) {
6262
using stan::math::fvar;
6363
using stan::test::require_scal_checker;
64-
require_scal_checker<stan::require_all_not_autodiff_t, fvar<double>,
64+
require_scal_checker<stan::require_all_not_autodiff_scalar_t, fvar<double>,
6565
fvar<double>>::all_not();
6666
}
6767
TEST(requires_fwd_scal, autodiff_any_test) {
6868
using stan::math::fvar;
6969
using stan::test::require_scal_checker;
70-
require_scal_checker<stan::require_any_autodiff_t, fvar<double>,
70+
require_scal_checker<stan::require_any_autodiff_scalar_t, fvar<double>,
7171
fvar<double>>::any();
7272
}
7373
TEST(requires_fwd_scal, autodiff_any_not_test) {
7474
using stan::math::fvar;
7575
using stan::test::require_scal_checker;
76-
require_scal_checker<stan::require_any_not_autodiff_t, fvar<double>,
76+
require_scal_checker<stan::require_any_not_autodiff_scalar_t, fvar<double>,
7777
fvar<double>>::any_not();
7878
}
7979

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ struct poisson_re_log_ll {
5656
struct cov_fun {
5757
template <typename T0__,
5858
stan::require_all_t<stan::math::disjunction<
59-
stan::is_autodiff<T0__>,
59+
stan::is_autodiff_scalar<T0__>,
6060
std::is_floating_point<std::decay_t<T0__>>>>* = nullptr>
6161
Eigen::Matrix<stan::return_type_t<T0__>, -1, -1> operator()(
6262
const T0__& sigma, const int& N, std::ostream* pstream__) const {

‎test/unit/math/mix/meta/require_generics_test.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,39 @@ TEST(requires_mix_scal, autodiff_mix_test) {
88
using stan::math::fvar;
99
using stan::math::var;
1010
using stan::test::require_scal_checker;
11-
require_scal_checker<stan::require_autodiff_t, var, fvar<double>>::unary();
11+
require_scal_checker<stan::require_autodiff_scalar_t, var, fvar<double>>::unary();
1212
}
1313
TEST(requires_mix_scal, autodiff_not_mix_test) {
1414
using stan::math::fvar;
1515
using stan::math::var;
1616
using stan::test::require_scal_checker;
17-
require_scal_checker<stan::require_not_autodiff_t, var,
17+
require_scal_checker<stan::require_not_autodiff_scalar_t, var,
1818
fvar<double>>::not_unary();
1919
}
2020
TEST(requires_mix_scal, autodiff_all_mix_test) {
2121
using stan::math::fvar;
2222
using stan::math::var;
2323
using stan::test::require_scal_checker;
24-
require_scal_checker<stan::require_all_autodiff_t, var, fvar<double>>::all();
24+
require_scal_checker<stan::require_all_autodiff_scalar_t, var, fvar<double>>::all();
2525
}
2626
TEST(requires_mix_scal, autodiff_all_not_mix_test) {
2727
using stan::math::fvar;
2828
using stan::math::var;
2929
using stan::test::require_scal_checker;
30-
require_scal_checker<stan::require_all_not_autodiff_t, var,
30+
require_scal_checker<stan::require_all_not_autodiff_scalar_t, var,
3131
fvar<double>>::all_not();
3232
}
3333
TEST(requires_mix_scal, autodiff_any_mix_test) {
3434
using stan::math::fvar;
3535
using stan::math::var;
3636
using stan::test::require_scal_checker;
37-
require_scal_checker<stan::require_any_autodiff_t, var, fvar<double>>::any();
37+
require_scal_checker<stan::require_any_autodiff_scalar_t, var, fvar<double>>::any();
3838
}
3939
TEST(requires_mix_scal, autodiff_any_not_mix_test) {
4040
using stan::math::fvar;
4141
using stan::math::var;
4242
using stan::test::require_scal_checker;
43-
require_scal_checker<stan::require_any_not_autodiff_t, var,
43+
require_scal_checker<stan::require_any_not_autodiff_scalar_t, var,
4444
fvar<double>>::any_not();
4545
}
4646

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,32 +42,32 @@ TEST(requires_rev_scal, var_any_not_test) {
4242
TEST(requires_rev_scal, autodiff_test) {
4343
using stan::math::var;
4444
using stan::test::require_scal_checker;
45-
require_scal_checker<stan::require_autodiff_t, var, var>::unary();
45+
require_scal_checker<stan::require_autodiff_scalar_t, var, var>::unary();
4646
}
4747
TEST(requires_rev_scal, autodiff_not_test) {
4848
using stan::math::var;
4949
using stan::test::require_scal_checker;
50-
require_scal_checker<stan::require_not_autodiff_t, var, var>::not_unary();
50+
require_scal_checker<stan::require_not_autodiff_scalar_t, var, var>::not_unary();
5151
}
5252
TEST(requires_rev_scal, autodiff_all_test) {
5353
using stan::math::var;
5454
using stan::test::require_scal_checker;
55-
require_scal_checker<stan::require_all_autodiff_t, var, var>::all();
55+
require_scal_checker<stan::require_all_autodiff_scalar_t, var, var>::all();
5656
}
5757
TEST(requires_rev_scal, autodiff_all_not_test) {
5858
using stan::math::var;
5959
using stan::test::require_scal_checker;
60-
require_scal_checker<stan::require_all_not_autodiff_t, var, var>::all_not();
60+
require_scal_checker<stan::require_all_not_autodiff_scalar_t, var, var>::all_not();
6161
}
6262
TEST(requires_rev_scal, autodiff_any_test) {
6363
using stan::math::var;
6464
using stan::test::require_scal_checker;
65-
require_scal_checker<stan::require_any_autodiff_t, var, var>::any();
65+
require_scal_checker<stan::require_any_autodiff_scalar_t, var, var>::any();
6666
}
6767
TEST(requires_rev_scal, autodiff_any_not_test) {
6868
using stan::math::var;
6969
using stan::test::require_scal_checker;
70-
require_scal_checker<stan::require_any_not_autodiff_t, var, var>::any_not();
70+
require_scal_checker<stan::require_any_not_autodiff_scalar_t, var, var>::any_not();
7171
}
7272

7373
TEST(requires_rev_scal, stan_scalar_test) {

0 commit comments

Comments
 (0)