More tests, courtesy of Uli Sack

[[Imported from SVN: r1640]]

dune/istl/test/iotest.cc

@@ -2,24 +2,52 @@
 // vi: set et ts=4 sw=2 sts=2:
 #include "config.h"
 #include <dune/common/fmatrix.hh>
+#include <dune/istl/diagonalmatrix.hh>
+#include <dune/istl/scaledidmatrix.hh>
 #include <dune/istl/bcrsmatrix.hh>
 #include <dune/istl/io.hh>
 #include "laplacian.hh"
 
-int main(int argc, char** argv)
+/*  "tests" the writeMatrixToMatlabHelper method by calling it for a Laplacian with a given BlockType and writing to cout.
+ *  Actual functionality is not tested.
+ */
+template <class BlockType>
+bool testWriteMatrixToMatlab(BlockType b=BlockType(0.0))
 {
-  typedef Dune::BCRSMatrix<Dune::FieldMatrix<double,1,1> > Matrix;
-  typedef Dune::BCRSMatrix<Dune::FieldMatrix<std::complex<double>,1,1> > ComplexMatrix;
+  typedef Dune::BCRSMatrix<BlockType> Matrix;
 
   Matrix A;
-  ComplexMatrix C;
-
   setupLaplacian(A, 3);
-  setupLaplacian(C, 3);
-
-  C[0][0]=std::complex<double>(0,-1);
 
+  A[0][0] += b;
   writeMatrixToMatlabHelper(A, 0, 0, std::cout);
-  writeMatrixToMatlabHelper(C, 0, 0, std::cout);
+}
+
+int main(int argc, char** argv)
+{
+  /* testing the writeMatrixToMatlabHelper method for BlockType=FieldMatrix with different field_types */
+  testWriteMatrixToMatlab<Dune::FieldMatrix<double,1,1> >();
+  testWriteMatrixToMatlab<Dune::FieldMatrix<double,1,2> >();
+  //    testWriteMatrixToMatlab<Dune::FieldMatrix<double,2,1> >(); // commented because setUpLaplacian cannot handle block_types with more rows than cols
+  testWriteMatrixToMatlab<Dune::FieldMatrix<double,4,7> >();
+  //    testWriteMatrixToMatlab<Dune::FieldMatrix<double,7,4> >(); // commented because setUpLaplacian cannot handle block_types with more rows than cols
+  testWriteMatrixToMatlab<Dune::FieldMatrix<double,2,2> >();
+
+  testWriteMatrixToMatlab<Dune::FieldMatrix<std::complex<double>,1,1> >(Dune::FieldMatrix<std::complex<double>,1,1>(std::complex<double>(0, 1)));
+  testWriteMatrixToMatlab<Dune::FieldMatrix<std::complex<double>,1,2> >(Dune::FieldMatrix<std::complex<double>,1,2>(std::complex<double>(0, 1)));
+  //    testWriteMatrixToMatlab<Dune::FieldMatrix<std::complex<double>,2,1> >(); // commented because setUpLaplacian cannot handle block_types with more rows than cols
+  testWriteMatrixToMatlab<Dune::FieldMatrix<std::complex<double>,4,7> >(Dune::FieldMatrix<std::complex<double>,4,7>(std::complex<double>(0, 1)));
+  //    testWriteMatrixToMatlab<Dune::FieldMatrix<std::complex<double>,7,4> >(); // commented because setUpLaplacian cannot handle block_types with more rows than cols
+  testWriteMatrixToMatlab<Dune::FieldMatrix<std::complex<double>,2,2> >(Dune::FieldMatrix<std::complex<double>,2,2>(std::complex<double>(0, 1)));
+
+  /* testing the writeMatrixToMatlabHelper method for BlockType=[Diagonal|ScaledIdentity]Matrix with different field_types */
+  testWriteMatrixToMatlab<Dune::DiagonalMatrix<double,1> >();
+  testWriteMatrixToMatlab<Dune::ScaledIdentityMatrix<double,1> >();
+  testWriteMatrixToMatlab<Dune::DiagonalMatrix<double,2> >();
+  testWriteMatrixToMatlab<Dune::ScaledIdentityMatrix<double,2> >();
 
+  testWriteMatrixToMatlab<Dune::DiagonalMatrix<std::complex<double>,1> >(Dune::DiagonalMatrix<std::complex<double>,1>(std::complex<double>(0,1)));
+  testWriteMatrixToMatlab<Dune::ScaledIdentityMatrix<std::complex<double>,1> >(Dune::ScaledIdentityMatrix<std::complex<double>,1>(std::complex<double>(0,1)));
+  testWriteMatrixToMatlab<Dune::DiagonalMatrix<std::complex<double>,2> >(Dune::DiagonalMatrix<std::complex<double>,2>(std::complex<double>(0,1)));
+  testWriteMatrixToMatlab<Dune::ScaledIdentityMatrix<std::complex<double>,2> >(Dune::ScaledIdentityMatrix<std::complex<double>,2>(std::complex<double>(0,1)));
 }