Skip to content
Snippets Groups Projects
Commit f20e290a authored by Markus Blatt's avatar Markus Blatt
Browse files

[release] Test row_wise build mode with nonzerors provided, too.

parent ba9f66db
No related branches found
No related tags found
No related merge requests found
...@@ -80,9 +80,9 @@ struct Builder<Dune::BCRSMatrix<B,A> > ...@@ -80,9 +80,9 @@ struct Builder<Dune::BCRSMatrix<B,A> >
}*/ }*/
} }
void rowWiseBuild(int rows, int cols) void rowWiseBuild(Dune::BCRSMatrix<B,A> matrix, int rows, int cols)
{ {
Dune::BCRSMatrix<B,A> matrix( rows, cols, Dune::BCRSMatrix<B,A>::row_wise );
for(typename Dune::BCRSMatrix<B,A>::CreateIterator ci=matrix.createbegin(), cend=matrix.createend(); for(typename Dune::BCRSMatrix<B,A>::CreateIterator ci=matrix.createbegin(), cend=matrix.createend();
ci!=cend; ++ci) ci!=cend; ++ci)
{ {
...@@ -99,6 +99,19 @@ struct Builder<Dune::BCRSMatrix<B,A> > ...@@ -99,6 +99,19 @@ struct Builder<Dune::BCRSMatrix<B,A> >
Dune::BCRSMatrix<B,A> matrix1(matrix); Dune::BCRSMatrix<B,A> matrix1(matrix);
Dune::printmatrix(std::cout, matrix, "row_wise", "row"); Dune::printmatrix(std::cout, matrix, "row_wise", "row");
} }
void rowWiseBuild(int rows, int cols)
{
Dune::BCRSMatrix<B,A> matrix( rows, cols, Dune::BCRSMatrix<B,A>::row_wise );
rowWiseBuild(matrix, rows, cols);
}
void rowWiseBuild(int rows, int cols, int nnz)
{
Dune::BCRSMatrix<B,A> matrix( rows, cols, nnz, Dune::BCRSMatrix<B,A>::row_wise );
rowWiseBuild(matrix, rows, cols);
}
}; };
// This code used to trigger a valgrind 'uninitialized memory' warning; see FS 1041 // This code used to trigger a valgrind 'uninitialized memory' warning; see FS 1041
...@@ -115,6 +128,7 @@ int main() ...@@ -115,6 +128,7 @@ int main()
try{ try{
Builder<Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1> > > builder; Builder<Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1> > > builder;
builder.randomBuild(5,4); builder.randomBuild(5,4);
builder.rowWiseBuild(5,4,10);
builder.rowWiseBuild(5,4); builder.rowWiseBuild(5,4);
testDoubleSetSize(); testDoubleSetSize();
}catch(Dune::Exception e) { }catch(Dune::Exception e) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment