Skip to content

Commit 22fc7a3

Browse files
committed
Set active variables
1 parent 22851b3 commit 22fc7a3

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

include/boost/math/differentiation/autodiff_eigen.hpp

+17-15
Original file line numberDiff line numberDiff line change
@@ -49,21 +49,23 @@ BOOST_AUTODIFF_EIGEN_SCALAR_TRAITS(unsigned int);
4949
BOOST_AUTODIFF_EIGEN_SCALAR_TRAITS(long);
5050
BOOST_AUTODIFF_EIGEN_SCALAR_TRAITS(unsigned long);
5151

52-
template <typename RealType, size_t Order, typename RealType2, size_t Order2,
53-
typename BinaryOp>
54-
struct ScalarBinaryOpTraits<
55-
boost::math::differentiation::autodiff_v1::detail::template fvar<RealType,
56-
Order>,
57-
boost::math::differentiation::autodiff_v1::detail::template fvar<RealType2,
58-
Order2>,
59-
BinaryOp> {
60-
typedef ScalarBinaryOpTraits<RealType, RealType2, BinaryOp>::ReturnType
61-
RealReturn;
62-
const size_t ReturnOrder = (Order > Order2) ? Order : Order2;
63-
typedef boost::math::differentiation::autodiff_v1::detail::template fvar<
64-
RealReturn, ReturnOrder>
65-
ReturnType;
66-
};
52+
// template <typename RealType, size_t Order, typename RealType2, size_t Order2,
53+
// typename BinaryOp>
54+
// struct ScalarBinaryOpTraits<
55+
// boost::math::differentiation::autodiff_v1::detail::template
56+
// fvar<RealType,
57+
// Order>,
58+
// boost::math::differentiation::autodiff_v1::detail::template
59+
// fvar<RealType2,
60+
// Order2>,
61+
// BinaryOp> {
62+
// typedef ScalarBinaryOpTraits<RealType, RealType2, BinaryOp>::ReturnType
63+
// RealReturn;
64+
// const size_t ReturnOrder = (Order > Order2) ? Order : Order2;
65+
// typedef boost::math::differentiation::autodiff_v1::detail::template fvar<
66+
// RealReturn, ReturnOrder>
67+
// ReturnType;
68+
// };
6769
} // namespace Eigen
6870

6971
#endif // BOOST_MATH_DIFFERENTIATION_AUTODIFF_EIGEN_HPP

test/test_autodiff_9.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,10 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(eigen_general, T, all_float_types) {
4646

4747
typedef typename fvar<T, n> fTn;
4848
Eigen::Matrix<fTn, dim, 1> x;
49-
x[0] = -1;
50-
x[1] = 0;
51-
x[2] = 1;
52-
x[3] = 5;
49+
x[0] = make_fvar<T, n>(-1);
50+
x[1] = make_fvar<T, n>(0);
51+
x[2] = make_fvar<T, n>(1);
52+
x[3] = make_fvar<T, n>(5);
5353

5454
Eigen::Matrix<fTn, dim, 1> y1, y2, y3, y4, y5;
5555
y1 = sin(x);
@@ -132,7 +132,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(eigen_scalar, T, all_float_types) {
132132
constexpr size_t n = 4;
133133

134134
typedef typename fvar<T, n> fTn;
135-
fTn x = 4;
135+
fTn x = make_fvar<T, n>(4);
136136
Eigen::Matrix<fTn, dim, 1> X;
137137
Eigen::Matrix<fTn, dim, 1> Z;
138138
Eigen::Matrix<fTn, dim, dim> I = Eigen::Matrix<fTn, dim, dim>::Identity();
@@ -171,7 +171,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(eigen_vector, T, all_float_types) {
171171
constexpr size_t n = 4;
172172

173173
typedef typename fvar<T, n> fTn;
174-
fTn x = 5;
174+
fTn x = make_fvar<T, n>(5);
175175
T xD0 = x.derivative(0);
176176
Eigen::Matrix<fTn, dim, 1> X;
177177
X[0] = 1;
@@ -231,7 +231,7 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(eigen_determinant, T, all_float_types) {
231231
constexpr size_t n = 1;
232232

233233
typedef typename fvar<T, n> fTn;
234-
fTn x = 3;
234+
fTn x = make_fvar<T, n>(3);
235235
T xD0 = x.derivative(0);
236236
Eigen::Matrix<fTn, dim, dim> M = 10 * Eigen::Matrix<fTn, dim, dim>::Random();
237237
M(0, 3) = x;

0 commit comments

Comments
 (0)