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

merge

Browse Source
This commit is contained in:
Gael Guennebaud 2018-10-15 09:22:27 +02:00
commit 3a33db4de5
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Eigen/src/SparseCore/SparseMatrix.h
View File

@ -893,7 +893,7 @@ public:
Index p = m_outerIndex[outer] + m_innerNonZeros[outer]++; Index p = m_outerIndex[outer] + m_innerNonZeros[outer]++;
m_data.index(p) = convert_index(inner); m_data.index(p) = convert_index(inner);
return (m_data.value(p) = 0); return (m_data.value(p) = Scalar(0));
} }
private: private:
@ -1274,7 +1274,7 @@ EIGEN_DONT_INLINE typename SparseMatrix<_Scalar,_Options,_StorageIndex>::Scalar&
m_innerNonZeros[outer]++; m_innerNonZeros[outer]++;
m_data.index(p) = inner; m_data.index(p) = inner;
return (m_data.value(p) = 0); return (m_data.value(p) = Scalar(0));
} }
template<typename _Scalar, int _Options, typename _StorageIndex> template<typename _Scalar, int _Options, typename _StorageIndex>
@ -1381,7 +1381,7 @@ EIGEN_DONT_INLINE typename SparseMatrix<_Scalar,_Options,_StorageIndex>::Scalar&
} }
m_data.index(p) = inner; m_data.index(p) = inner;
return (m_data.value(p) = 0); return (m_data.value(p) = Scalar(0));
} }
namespace internal { namespace internal {

1
test/sparse_basic.cpp
View File

@ -645,6 +645,7 @@ template<typename SparseMatrixType> void sparse_basic(const SparseMatrixType& re
template<typename SparseMatrixType> template<typename SparseMatrixType>
void big_sparse_triplet(Index rows, Index cols, double density) { void big_sparse_triplet(Index rows, Index cols, double density) {
g_dense_op_sparse_count = 0; // Suppresses compiler warning.
typedef typename SparseMatrixType::StorageIndex StorageIndex; typedef typename SparseMatrixType::StorageIndex StorageIndex;
typedef typename SparseMatrixType::Scalar Scalar; typedef typename SparseMatrixType::Scalar Scalar;
typedef Triplet<Scalar,Index> TripletType; typedef Triplet<Scalar,Index> TripletType;