From d09a7cbf612ef46f8b77a9688bb4c7a96bc0a146 Mon Sep 17 00:00:00 2001
From: jcarpent <jcarpent@laas.fr>
Date: Mon, 18 Dec 2017 13:42:56 +0100
Subject: [PATCH] [Solvers] LeastSquareDiagonalPreconditioner has been fixed in
Eigen 3.3.5
---
src/solvers/BasicPreconditioners.hpp | 2 +-
src/solvers/preconditioners.cpp | 2 +-
src/solvers/solvers.cpp | 4 ++--
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/solvers/BasicPreconditioners.hpp b/src/solvers/BasicPreconditioners.hpp
index 92a9af5c..3fe921ac 100644
--- a/src/solvers/BasicPreconditioners.hpp
+++ b/src/solvers/BasicPreconditioners.hpp
@@ -93,7 +93,7 @@ namespace eigenpy
}
};
-#if EIGEN_VERSION_AT_LEAST(3,3,0)
+#if EIGEN_VERSION_AT_LEAST(3,3,5)
template<typename Scalar>
struct LeastSquareDiagonalPreconditionerVisitor : PreconditionerBaseVisitor<Eigen::LeastSquareDiagonalPreconditioner<Scalar> >
{
diff --git a/src/solvers/preconditioners.cpp b/src/solvers/preconditioners.cpp
index bea99da1..fb2f2e35 100644
--- a/src/solvers/preconditioners.cpp
+++ b/src/solvers/preconditioners.cpp
@@ -25,7 +25,7 @@ namespace eigenpy
using namespace Eigen;
DiagonalPreconditionerVisitor<double>::expose();
-#if EIGEN_VERSION_AT_LEAST(3,3,0)
+#if EIGEN_VERSION_AT_LEAST(3,3,5)
LeastSquareDiagonalPreconditionerVisitor<double>::expose();
#endif
IdentityPreconditionerVisitor::expose();
diff --git a/src/solvers/solvers.cpp b/src/solvers/solvers.cpp
index 0cca3f8c..d0d7103f 100644
--- a/src/solvers/solvers.cpp
+++ b/src/solvers/solvers.cpp
@@ -17,7 +17,7 @@
#include "eigenpy/solvers/solvers.hpp"
#include "eigenpy/solvers/ConjugateGradient.hpp"
-#if EIGEN_VERSION_AT_LEAST(3,3,0)
+#if EIGEN_VERSION_AT_LEAST(3,3,5)
#include "eigenpy/solvers/LeastSquaresConjugateGradient.hpp"
#endif
@@ -27,7 +27,7 @@ namespace eigenpy
{
using namespace Eigen;
ConjugateGradientVisitor< ConjugateGradient<MatrixXd,Lower|Upper> >::expose();
-#if EIGEN_VERSION_AT_LEAST(3,3,0)
+#if EIGEN_VERSION_AT_LEAST(3,3,5)
LeastSquaresConjugateGradientVisitor< LeastSquaresConjugateGradient<MatrixXd, LeastSquareDiagonalPreconditionerFix<MatrixXd::Scalar> > >::expose();
#endif
--
GitLab