From 31625a0b94688239c8045c2e6fd689daa91d7872 Mon Sep 17 00:00:00 2001
From: Dominic Kempf <dominic.kempf@iwr.uni-heidelberg.de>
Date: Mon, 6 Oct 2014 14:31:04 +0200
Subject: [PATCH] Adjust fmatrixtest to use initializer lists.
---
dune/common/test/fmatrixtest.cc | 26 ++++++++++++--------------
1 file changed, 12 insertions(+), 14 deletions(-)
diff --git a/dune/common/test/fmatrixtest.cc b/dune/common/test/fmatrixtest.cc
index 48e659cde..3db6a9a5c 100644
--- a/dune/common/test/fmatrixtest.cc
+++ b/dune/common/test/fmatrixtest.cc
@@ -8,7 +8,6 @@
#define DUNE_ISTL_WITH_CHECKING
#endif
#include <dune/common/fmatrix.hh>
-#include <dune/common/fassign.hh>
#include <dune/common/classname.hh>
#include <iostream>
#include <algorithm>
@@ -452,16 +451,16 @@ void test_ev()
* A small, nonzero eigenvalue
*/
- Dune::FieldMatrix<ft,8,8> A;
- A <<=
- 611, 196, -192, 407, -8, -52, -49, 29, Dune::nextRow,
- 196, 899, 113, -192, -71, -43, -8, -44, Dune::nextRow,
- -192, 113, 899, 196, 61, 49, 8, 52, Dune::nextRow,
- 407, -192, 196, 611, 8, 44, 59, -23, Dune::nextRow,
- -8, -71, 61, 8, 411, -599, 208, 208, Dune::nextRow,
- -52, -43, 49, 44, -599, 411, 208, 208, Dune::nextRow,
- -49, -8, 8, 59, 208, 208, 99, -911, Dune::nextRow,
- 29, -44, 52, -23, 208, 208, -911, 99;
+ Dune::FieldMatrix<ft,8,8> A = {
+ { 611, 196, -192, 407, -8, -52, -49, 29 },
+ { 196, 899, 113, -192, -71, -43, -8, -44 },
+ { -192, 113, 899, 196, 61, 49, 8, 52 },
+ { 407, -192, 196, 611, 8, 44, 59, -23 },
+ { -8, -71, 61, 8, 411, -599, 208, 208 },
+ { -52, -43, 49, 44, -599, 411, 208, 208 },
+ { -49, -8, 8, 59, 208, 208, 99, -911 },
+ { 29, -44, 52, -23, 208, 208, -911, 99}
+ };
// compute eigenvalues
Dune::FieldVector<ft,8> eig;
@@ -476,15 +475,14 @@ void test_ev()
> eig(rosser())
*/
- ref <<=
- -1.02004901843000e+03,
+ ref = { -1.02004901843000e+03,
-4.14362871168386e-14,
9.80486407214362e-02,
1.00000000000000e+03,
1.00000000000000e+03,
1.01990195135928e+03,
1.02000000000000e+03,
- 1.02004901843000e+03;
+ 1.02004901843000e+03 };
if( (ref - eig).two_norm() > 1e-10 )
{
--
GitLab