diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2018-06-08 16:55:10 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2018-06-08 16:55:10 +0200 |
| commit | d6813fb1c565e0150cad0332b5afa6ac2e1ed286 (patch) | |
| tree | e1f9025910125d0e3f964b2447f4fb00eac7aef9 /Eigen | |
| parent | 89d65bb9d6ed8ebc9ce297a3fad90d78ba6cbbbb (diff) | |
bug #1531: expose NumDimensions for solve and sparse expressions.
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/SolverBase.h | 3 | ||||
| -rw-r--r-- | Eigen/src/SparseCore/SparseMatrixBase.h | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/Eigen/src/Core/SolverBase.h b/Eigen/src/Core/SolverBase.h index 8a4adc229..702a5485c 100644 --- a/Eigen/src/Core/SolverBase.h +++ b/Eigen/src/Core/SolverBase.h @@ -56,7 +56,8 @@ class SolverBase : public EigenBase<Derived> MaxSizeAtCompileTime = (internal::size_at_compile_time<internal::traits<Derived>::MaxRowsAtCompileTime, internal::traits<Derived>::MaxColsAtCompileTime>::ret), IsVectorAtCompileTime = internal::traits<Derived>::MaxRowsAtCompileTime == 1 - || internal::traits<Derived>::MaxColsAtCompileTime == 1 + || internal::traits<Derived>::MaxColsAtCompileTime == 1, + NumDimensions = int(MaxSizeAtCompileTime) == 1 ? 0 : bool(IsVectorAtCompileTime) ? 1 : 2 }; /** Default constructor */ diff --git a/Eigen/src/SparseCore/SparseMatrixBase.h b/Eigen/src/SparseCore/SparseMatrixBase.h index dac2d8c62..229449f02 100644 --- a/Eigen/src/SparseCore/SparseMatrixBase.h +++ b/Eigen/src/SparseCore/SparseMatrixBase.h @@ -87,6 +87,11 @@ template<typename Derived> class SparseMatrixBase * we are dealing with a column-vector (if there is only one column) or with * a row-vector (if there is only one row). */ + NumDimensions = int(MaxSizeAtCompileTime) == 1 ? 0 : bool(IsVectorAtCompileTime) ? 1 : 2, + /**< This value is equal to Tensor::NumDimensions, i.e. 0 for scalars, 1 for vectors, + * and 2 for matrices. + */ + Flags = internal::traits<Derived>::Flags, /**< This stores expression \ref flags flags which may or may not be inherited by new expressions * constructed from this one. See the \ref flags "list of flags". |