Make Block<SparseMatrix> inherit SparseCompressedBase in the case of an inner-panels and fix valuePtr() innerIndexPtr()

2 files changed, 13 insertions, 6 deletions

diff --git a/Eigen/src/Core/Block.h b/Eigen/src/Core/Block.h
index 9cf9d5432..5f6307206 100644
--- a/Eigen/src/Core/Block.h
+++ b/Eigen/src/Core/Block.h
@@ -87,7 +87,7 @@ struct traits<Block<XprType, BlockRows, BlockCols, InnerPanel> > : traits<XprTyp
     // FIXME, this traits is rather specialized for dense object and it needs to be cleaned further
     FlagsLvalueBit = is_lvalue<XprType>::value ? LvalueBit : 0,
     FlagsRowMajorBit = IsRowMajor ? RowMajorBit : 0,
-    Flags = (traits<XprType>::Flags & DirectAccessBit) | FlagsLvalueBit | FlagsRowMajorBit
+    Flags = (traits<XprType>::Flags & (DirectAccessBit | (InnerPanel?CompressedAccessBit:0))) | FlagsLvalueBit | FlagsRowMajorBit
     // FIXME DirectAccessBit should not be handled by expressions
   };
 };
diff --git a/Eigen/src/SparseCore/SparseBlock.h b/Eigen/src/SparseCore/SparseBlock.h
index 9e4da2057..6b8ade5aa 100644
--- a/Eigen/src/SparseCore/SparseBlock.h
+++ b/Eigen/src/SparseCore/SparseBlock.h
@@ -74,7 +74,7 @@ namespace internal {
 

 template<typename SparseMatrixType, int BlockRows, int BlockCols>

 class sparse_matrix_block_impl

-  : public SparseMatrixBase<Block<SparseMatrixType,BlockRows,BlockCols,true> >

+  : public SparseCompressedBase<Block<SparseMatrixType,BlockRows,BlockCols,true> >

 {

     typedef typename internal::remove_all<typename SparseMatrixType::Nested>::type _MatrixTypeNested;

     typedef Block<SparseMatrixType, BlockRows, BlockCols, true> BlockType;

@@ -172,19 +172,24 @@ public:
     }

 

     inline const Scalar* valuePtr() const

-    { return m_matrix.valuePtr() + m_matrix.outerIndexPtr()[m_outerStart]; }

+    { return m_matrix.valuePtr(); }

     inline Scalar* valuePtr()

-    { return m_matrix.const_cast_derived().valuePtr() + m_matrix.outerIndexPtr()[m_outerStart]; }

+    { return m_matrix.const_cast_derived().valuePtr(); }

 

     inline const Index* innerIndexPtr() const

-    { return m_matrix.innerIndexPtr() + m_matrix.outerIndexPtr()[m_outerStart]; }

+    { return m_matrix.innerIndexPtr(); }

     inline Index* innerIndexPtr()

-    { return m_matrix.const_cast_derived().innerIndexPtr() + m_matrix.outerIndexPtr()[m_outerStart]; }

+    { return m_matrix.const_cast_derived().innerIndexPtr(); }

 

     inline const Index* outerIndexPtr() const

     { return m_matrix.outerIndexPtr() + m_outerStart; }

     inline Index* outerIndexPtr()

     { return m_matrix.const_cast_derived().outerIndexPtr() + m_outerStart; }

+    

+    inline const Index* innerNonZeroPtr() const

+    { return isCompressed() ? 0 : m_matrix.innerNonZeroPtr(); }

+    inline Index* innerNonZeroPtr()

+    { return isCompressed() ? 0 : m_matrix.const_cast_derived().innerNonZeroPtr(); }

 

     Index nonZeros() const

     {

@@ -196,6 +201,8 @@ public:
       else

         return Map<const Matrix<Index,OuterSize,1> >(m_matrix.innerNonZeroPtr()+m_outerStart, m_outerSize.value()).sum();

     }

+    

+    bool isCompressed() const { return m_matrix.innerNonZeroPtr()==0; }

 

     const Scalar& lastCoeff() const

     {