diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2013-07-10 23:48:26 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2013-07-10 23:48:26 +0200 |
| commit | 6d1f5dbaaefcb9cc198aad362146131f8eec9cd7 (patch) | |
| tree | bfc10b33b7d6efd0008a539fa3362616995fe518 /test/sparse.h | |
| parent | 71cccf0ed825022555b6da57ea64433622058601 (diff) | |
Add no_assignment_operator to a few classes that must not be assigned, and fix a couple of warnings.
Diffstat (limited to 'test/sparse.h')
| -rw-r--r-- | test/sparse.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/test/sparse.h b/test/sparse.h index 7e2b98494..1a5ceb38d 100644 --- a/test/sparse.h +++ b/test/sparse.h @@ -58,8 +58,8 @@ initSparse(double density, Matrix<Scalar,Dynamic,Dynamic,Opt1>& refMat, SparseMatrix<Scalar,Opt2,Index>& sparseMat, int flags = 0, - std::vector<Vector2i>* zeroCoords = 0, - std::vector<Vector2i>* nonzeroCoords = 0) + std::vector<Matrix<Index,2,1> >* zeroCoords = 0, + std::vector<Matrix<Index,2,1> >* nonzeroCoords = 0) { enum { IsRowMajor = SparseMatrix<Scalar,Opt2,Index>::IsRowMajor }; sparseMat.setZero(); @@ -93,11 +93,11 @@ initSparse(double density, //sparseMat.insertBackByOuterInner(j,i) = v; sparseMat.insertByOuterInner(j,i) = v; if (nonzeroCoords) - nonzeroCoords->push_back(Vector2i(ai,aj)); + nonzeroCoords->push_back(Matrix<Index,2,1> (ai,aj)); } else if (zeroCoords) { - zeroCoords->push_back(Vector2i(ai,aj)); + zeroCoords->push_back(Matrix<Index,2,1> (ai,aj)); } refMat(ai,aj) = v; } @@ -110,8 +110,8 @@ initSparse(double density, Matrix<Scalar,Dynamic,Dynamic, Opt1>& refMat, DynamicSparseMatrix<Scalar, Opt2, Index>& sparseMat, int flags = 0, - std::vector<Vector2i>* zeroCoords = 0, - std::vector<Vector2i>* nonzeroCoords = 0) + std::vector<Matrix<Index,2,1> >* zeroCoords = 0, + std::vector<Matrix<Index,2,1> >* nonzeroCoords = 0) { enum { IsRowMajor = DynamicSparseMatrix<Scalar,Opt2,Index>::IsRowMajor }; sparseMat.setZero(); @@ -142,11 +142,11 @@ initSparse(double density, { sparseMat.insertBackByOuterInner(j,i) = v; if (nonzeroCoords) - nonzeroCoords->push_back(Vector2i(ai,aj)); + nonzeroCoords->push_back(Matrix<Index,2,1> (ai,aj)); } else if (zeroCoords) { - zeroCoords->push_back(Vector2i(ai,aj)); + zeroCoords->push_back(Matrix<Index,2,1> (ai,aj)); } refMat(ai,aj) = v; } |