GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-11 03:09:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix some warnings

Browse Source
This commit is contained in:
Thomas Capricelli 2010-05-22 19:17:04 +02:00
parent 79e9e3f24c
commit 76dd0e5314
6 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -5,6 +5,7 @@ qrc_*cxx
*.diff *.diff
diff diff
*.save *.save
save
*.old *.old
*.gmo *.gmo
*.qm *.qm

6
Eigen/src/Sparse/SparseLU.h
View File

@ -102,7 +102,7 @@ class SparseLU
void setOrderingMethod(int m) void setOrderingMethod(int m)
{ {
ei_assert(m&~OrderingMask == 0 && m!=0 && "invalid ordering method"); ei_assert( (m&~OrderingMask) == 0 && m!=0 && "invalid ordering method");
m_flags = m_flags&~OrderingMask | m&OrderingMask; m_flags = m_flags&~OrderingMask | m&OrderingMask;
} }
@ -138,7 +138,7 @@ class SparseLU
* using the default algorithm. * using the default algorithm.
*/ */
template<typename MatrixType, int Backend> template<typename MatrixType, int Backend>
void SparseLU<MatrixType,Backend>::compute(const MatrixType& a) void SparseLU<MatrixType,Backend>::compute(const MatrixType& )
{ {
ei_assert(false && "not implemented yet"); ei_assert(false && "not implemented yet");
} }
@ -153,7 +153,7 @@ void SparseLU<MatrixType,Backend>::compute(const MatrixType& a)
*/ */
template<typename MatrixType, int Backend> template<typename MatrixType, int Backend>
template<typename BDerived, typename XDerived> template<typename BDerived, typename XDerived>
bool SparseLU<MatrixType,Backend>::solve(const MatrixBase<BDerived> &b, MatrixBase<XDerived>* x, const int transposed) const bool SparseLU<MatrixType,Backend>::solve(const MatrixBase<BDerived> &, MatrixBase<XDerived>* , const int ) const
{ {
ei_assert(false && "not implemented yet"); ei_assert(false && "not implemented yet");
return false; return false;

9
Eigen/src/Sparse/SparseProduct.h
View File

@ -156,8 +156,8 @@ static void ei_sparse_product_impl2(const Lhs& lhs, const Rhs& rhs, ResultType&
float avgNnzPerRhsColumn = float(rhs.nonZeros())/float(cols); float avgNnzPerRhsColumn = float(rhs.nonZeros())/float(cols);
float ratioRes = std::min(ratioLhs * avgNnzPerRhsColumn, 1.f); float ratioRes = std::min(ratioLhs * avgNnzPerRhsColumn, 1.f);
int t200 = rows/(log2(200)*1.39); // int t200 = rows/(log2(200)*1.39);
int t = (rows*100)/139; // int t = (rows*100)/139;
res.resize(rows, cols); res.resize(rows, cols);
res.reserve(int(ratioRes*rows*cols)); res.reserve(int(ratioRes*rows*cols));
@ -377,6 +377,11 @@ struct ei_sparse_product_selector2<Lhs,Rhs,ResultType,RowMajor,ColMajor,ColMajor
{ {
static void run(const Lhs& lhs, const Rhs& rhs, ResultType& res) static void run(const Lhs& lhs, const Rhs& rhs, ResultType& res)
{ {
// prevent warnings until the code is fixed
(void) lhs;
(void) rhs;
(void) res;
// typedef SparseMatrix<typename ResultType::Scalar,RowMajor> RowMajorMatrix; // typedef SparseMatrix<typename ResultType::Scalar,RowMajor> RowMajorMatrix;
// RowMajorMatrix rhsRow = rhs; // RowMajorMatrix rhsRow = rhs;
// RowMajorMatrix resRow(res.rows(), res.cols()); // RowMajorMatrix resRow(res.rows(), res.cols());

2
Eigen/src/Sparse/SparseSelfAdjointView.h
View File

@ -214,7 +214,7 @@ class DenseTimeSparseSelfAdjointProduct
DenseTimeSparseSelfAdjointProduct(const Lhs& lhs, const Rhs& rhs) : Base(lhs,rhs) DenseTimeSparseSelfAdjointProduct(const Lhs& lhs, const Rhs& rhs) : Base(lhs,rhs)
{} {}
template<typename Dest> void scaleAndAddTo(Dest& dest, Scalar alpha) const template<typename Dest> void scaleAndAddTo(Dest& /*dest*/, Scalar /*alpha*/) const
{ {
// TODO // TODO
} }

2
Eigen/src/Sparse/SparseUtil.h
View File

@ -144,7 +144,7 @@ const int InnerRandomAccessPattern = 0x2 | CoherentAccessPattern;
const int OuterRandomAccessPattern = 0x4 | CoherentAccessPattern; const int OuterRandomAccessPattern = 0x4 | CoherentAccessPattern;
const int RandomAccessPattern = 0x8 | OuterRandomAccessPattern | InnerRandomAccessPattern; const int RandomAccessPattern = 0x8 | OuterRandomAccessPattern | InnerRandomAccessPattern;
template<typename T> class ei_eval<T,Sparse> template<typename T> struct ei_eval<T,Sparse>
{ {
typedef typename ei_traits<T>::Scalar _Scalar; typedef typename ei_traits<T>::Scalar _Scalar;
enum { enum {

2
Eigen/src/Sparse/SparseVector.h
View File

@ -379,7 +379,7 @@ class SparseVector<Scalar,_Options>::InnerIterator
{} {}
template<unsigned int Added, unsigned int Removed> template<unsigned int Added, unsigned int Removed>
InnerIterator(const Flagged<SparseVector,Added,Removed>& vec, int outer) InnerIterator(const Flagged<SparseVector,Added,Removed>& vec, int )
: m_data(vec._expression().m_data), m_id(0), m_end(m_data.size()) : m_data(vec._expression().m_data), m_id(0), m_end(m_data.size())
{} {}