Merged latest patches from the trunk

[[Imported from SVN: r6999]]

dune/common/Makefile.am

@@ -30,6 +30,7 @@ commoninclude_HEADERS = 			\
 	deprecated.hh				\
 	densematrix.hh				\
 	densevector.hh				\
+        diagonalmatrix.hh                       \
 	documentation.hh			\
 	dotproduct.hh				\
 	dynmatrix.hh				\

dune/common/test/.gitignore

@@ -3,6 +3,7 @@ Makefile.in
 .deps
 .libs
 semantic.cache
+diagonalmatrixtest
 dynvectortest
 fvectortest
 mpicollectivecommunication

dune/common/test/Makefile.am

@@ -8,6 +8,7 @@ TESTPROGS = \
     bitsetvectortest \
     check_fvector_size \
     conversiontest \
+    diagonalmatrixtest \
     dynmatrixtest \
     dynvectortest \
     enumsettest \
@@ -98,6 +99,8 @@ parametertreetest_SOURCES = parametertreetest.cc
 
 bitsetvectortest_SOURCES = bitsetvectortest.cc
 
+diagonalmatrixtest_SOURCES = diagonalmatrixtest.cc
+
 nullptr_test_SOURCES = nullptr-test.cc nullptr-test2.cc
 nullptr_test_fail_SOURCES = nullptr-test.cc
 nullptr_test_fail_CPPFLAGS = $(AM_CPPFLAGS) -DFAIL

dune/common/test/diagonalmatrixtest.cc

+// -*- tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+// vi: set et ts=4 sw=2 sts=2:
+#include "config.h"
+
+#include <dune/common/diagonalmatrix.hh>
+
+#include <iostream>
+#include <algorithm>
+
+#include <dune/common/fvector.hh>
+#include <dune/common/exceptions.hh>
+
+using namespace Dune;
+
+
+template<class K, int n>
+void test_matrix()
+{
+  typedef typename DiagonalMatrix<K,n>::size_type size_type;
+
+  DiagonalMatrix<K,n> A(1);
+  FieldVector<K,n> f;
+  FieldVector<K,n> v;
+
+  // assign matrix
+  A=2;
+
+  // assign vector
+  f = 1;
+  v = 2;
+
+  // matrix vector product
+  A.umv(v,f);
+
+
+  // test norms
+  A.frobenius_norm();
+  A.frobenius_norm2();
+  A.infinity_norm();
+  A.infinity_norm_real();
+
+  std::sort(v.begin(), v.end());
+
+  // print matrix
+  std::cout << A << std::endl;
+  // print vector
+  std::cout << f << std::endl;
+
+  // assign to FieldMatrix
+  FieldMatrix<K,n,n> AFM = FieldMatrix<K,n,n>(A);
+}
+
+int main()
+{
+  try {
+    test_matrix<float, 1>();
+    test_matrix<double, 1>();
+    test_matrix<double, 5>();
+  }
+  catch (Dune::Exception & e)
+  {
+    std::cerr << "Exception: " << e << std::endl;
+  }
+}