github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*Eigen: Solved namespace

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@13759 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
koldo 2019-12-12 15:12:35 +00:00
parent 13976d5e94
commit b21d66dc05
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
uppsrc/plugin/Eigen/Eigen.h
View file

@ -7,10 +7,10 @@
#define EIGEN_DENSEBASE_PLUGIN <plugin/Eigen/ToStringPlugin.h>
#define EIGEN_TENSOR_PLUGIN <plugin/Eigen/ToStringPlugin.h>
#ifndef flagSSE2
#define EIGEN_DONT_VECTORIZE
#define EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT
#endif
//#ifndef flagSSE2
// #define EIGEN_DONT_VECTORIZE
// #define EIGEN_DISABLE_UNALIGNED_ARRAY_ASSERT
//#endif
#ifndef _DEBUG
#define EIGEN_NO_DEBUG
@ -26,20 +26,19 @@
#include <plugin/Eigen/unsupported/Eigen/FFT>
#include <plugin/Eigen/unsupported/Eigen/CXX11/Tensor>
namespace Upp {
using namespace Eigen;
template<typename _Scalar, ptrdiff_t nx = Dynamic, ptrdiff_t ny = Dynamic>
template<typename _Scalar, ptrdiff_t nx = Eigen::Dynamic, ptrdiff_t ny = Eigen::Dynamic>
struct NonLinearOptimizationFunctor {
typedef _Scalar Scalar;
enum {
InputsAtCompileTime = nx,
ValuesAtCompileTime = ny
};
typedef Matrix<double, InputsAtCompileTime, 1> InputType;
typedef Matrix<double, ValuesAtCompileTime, 1> ValueType;
typedef Matrix<double, ValuesAtCompileTime, InputsAtCompileTime> JacobianType;
typedef Eigen::Matrix<double, InputsAtCompileTime, 1> InputType;
typedef Eigen::Matrix<double, ValuesAtCompileTime, 1> ValueType;
typedef Eigen::Matrix<double, ValuesAtCompileTime, InputsAtCompileTime> JacobianType;
int64 unknowns, datasetLen;
@ -48,7 +47,7 @@ struct NonLinearOptimizationFunctor {
ptrdiff_t inputs() const {return ptrdiff_t(unknowns);}
ptrdiff_t values() const {return ptrdiff_t(datasetLen);}
virtual void operator() (const InputType& x, ValueType* v, JacobianType* j = 0) const {};
virtual void operator() (const InputType& , ValueType* , JacobianType* = 0) const {};
};
template <class T>

1
uppsrc/plugin/Eigen/Eigen.upp
View file

@ -329,6 +329,7 @@ file
unsupported/Eigen/src/SparseExtra/SimplicialCholesky.h,
unsupported/Eigen/src/SparseExtra/Solve.h,
unsupported/Eigen/src/SparseExtra/SparseLDLTLegacy.h,
unsupported\Eigen\CXX11\Tensor,
unsupported/Eigen/src/SparseExtra/SparseLLT.h,
unsupported/Eigen/src/SparseExtra/SparseLU.h,
unsupported/Eigen/src/SparseExtra/SuperLUSupport.h,