From 3b48a3b9649e9444edab161396807e14418a42b3 Mon Sep 17 00:00:00 2001 From: Antonio Sanchez Date: Thu, 2 Sep 2021 12:33:18 -0700 Subject: [PATCH] Remove stray DynamicSparseMatrix references. DynamicSparseMatrix has been removed. These shouldn't be here anymore. --- Eigen/src/SparseCore/SparseSelfAdjointView.h | 9 ---- Eigen/src/SparseCore/SparseUtil.h | 1 - test/sparse.h | 49 -------------------- 3 files changed, 59 deletions(-) diff --git a/Eigen/src/SparseCore/SparseSelfAdjointView.h b/Eigen/src/SparseCore/SparseSelfAdjointView.h index f4d1f356b..efad57032 100644 --- a/Eigen/src/SparseCore/SparseSelfAdjointView.h +++ b/Eigen/src/SparseCore/SparseSelfAdjointView.h @@ -260,15 +260,6 @@ struct Assignment run(tmp, src, AssignOpType()); dst -= tmp; } - - template - static void run(DynamicSparseMatrix& dst, const SrcXprType &src, const AssignOpType&/*func*/) - { - // TODO directly evaluate into dst; - SparseMatrix tmp(dst.rows(),dst.cols()); - internal::permute_symm_to_fullsymm(src.matrix(), tmp); - dst = tmp; - } }; } // end namespace internal diff --git a/Eigen/src/SparseCore/SparseUtil.h b/Eigen/src/SparseCore/SparseUtil.h index 9cf09761c..9ead5ae47 100644 --- a/Eigen/src/SparseCore/SparseUtil.h +++ b/Eigen/src/SparseCore/SparseUtil.h @@ -50,7 +50,6 @@ const int OuterRandomAccessPattern = 0x4 | CoherentAccessPattern; const int RandomAccessPattern = 0x8 | OuterRandomAccessPattern | InnerRandomAccessPattern; template class SparseMatrix; -template class DynamicSparseMatrix; template class SparseVector; template class MappedSparseMatrix; diff --git a/test/sparse.h b/test/sparse.h index 6cd07fc0a..67cc06ebf 100644 --- a/test/sparse.h +++ b/test/sparse.h @@ -102,55 +102,6 @@ initSparse(double density, //sparseMat.finalize(); } -template void -initSparse(double density, - Matrix& refMat, - DynamicSparseMatrix& sparseMat, - int flags = 0, - std::vector >* zeroCoords = 0, - std::vector >* nonzeroCoords = 0) -{ - enum { IsRowMajor = DynamicSparseMatrix::IsRowMajor }; - sparseMat.setZero(); - sparseMat.reserve(int(refMat.rows()*refMat.cols()*density)); - for(int j=0; j(0,1) < density) ? internal::random() : Scalar(0); - if ((flags&ForceNonZeroDiag) && (i==j)) - { - v = internal::random()*Scalar(3.); - v = v*v + Scalar(5.); - } - if ((flags & MakeLowerTriangular) && aj>ai) - v = Scalar(0); - else if ((flags & MakeUpperTriangular) && ajpush_back(Matrix (ai,aj)); - } - else if (zeroCoords) - { - zeroCoords->push_back(Matrix (ai,aj)); - } - refMat(ai,aj) = v; - } - } - sparseMat.finalize(); -} - template void initSparse(double density, Matrix& refVec,