GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-07-04 04:05:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Big 1261: add missing max(ADS,ADS) overload (same for min)

Browse Source
This commit is contained in:
Gael Guennebaud 2016-07-27 14:52:48 +02:00
parent 5d94dc85e5
commit 8972323c08
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
unsupported/Eigen/src/AutoDiff/AutoDiffScalar.h
View File

@ -562,6 +562,15 @@ inline AutoDiffScalar<typename Eigen::internal::remove_all<DerType>::type::Plain
typedef AutoDiffScalar<typename Eigen::internal::remove_all<DerType>::type::PlainObject> ADS; typedef AutoDiffScalar<typename Eigen::internal::remove_all<DerType>::type::PlainObject> ADS;
return (x > y ? ADS(x) : ADS(y)); return (x > y ? ADS(x) : ADS(y));
} }
template<typename DerType>
inline AutoDiffScalar<typename Eigen::internal::remove_all<DerType>::type::PlainObject> (min)(const AutoDiffScalar<DerType>& x, const AutoDiffScalar<DerType>& y) {
return (x.value() < y.value() ? x : y);
}
template<typename DerType>
inline AutoDiffScalar<typename Eigen::internal::remove_all<DerType>::type::PlainObject> (max)(const AutoDiffScalar<DerType>& x, const AutoDiffScalar<DerType>& y) {
return (x.value() >= y.value() ? x : y);
}
EIGEN_AUTODIFF_DECLARE_GLOBAL_UNARY(abs, EIGEN_AUTODIFF_DECLARE_GLOBAL_UNARY(abs,
using std::abs; using std::abs;

12
unsupported/test/autodiff.cpp
View File

@ -245,6 +245,17 @@ void bug_1260() {
A*v; A*v;
} }
// check a compilation issue with numext::max
double bug_1261() {
typedef AutoDiffScalar<Matrix2d> AD;
typedef Matrix<AD,2,1> VectorAD;
VectorAD v;
const AD maxVal = v.maxCoeff();
const AD minVal = v.minCoeff();
return maxVal.value() + minVal.value();
}
void test_autodiff() void test_autodiff()
{ {
for(int i = 0; i < g_repeat; i++) { for(int i = 0; i < g_repeat; i++) {
@ -257,5 +268,6 @@ void test_autodiff()
bug_1222(); bug_1222();
bug_1223(); bug_1223();
bug_1260(); bug_1260();
bug_1261();
} }