From c0032cb21169706fbac2598d77e6ab24c845a8a9 Mon Sep 17 00:00:00 2001 From: David Wells Date: Thu, 25 Aug 2016 10:23:29 -0400 Subject: [PATCH] Make two tests unique. These tests were previously identical to full_matrix/complex_real_full_matrix_19.cc and full_matrix/complex_real_full_matrix_42.cc, respectively. --- .../complex_complex_full_matrix_19.cc | 13 +- .../complex_complex_full_matrix_19.output | 68 +++--- .../complex_complex_full_matrix_42.cc | 31 ++- .../complex_complex_full_matrix_42.output | 220 +++++++++--------- 4 files changed, 179 insertions(+), 153 deletions(-) diff --git a/tests/full_matrix/complex_complex_full_matrix_19.cc b/tests/full_matrix/complex_complex_full_matrix_19.cc index 9987ed5c6c..3ab6d9efa4 100644 --- a/tests/full_matrix/complex_complex_full_matrix_19.cc +++ b/tests/full_matrix/complex_complex_full_matrix_19.cc @@ -33,12 +33,19 @@ check () { for (unsigned int n=1; n<=3; ++n) { - const std::complex array[] = { 1, 2, 3, 4, 5, 6, 7, 8, 9 }; + const std::complex array[] = { std::complex(1.0, 5.0), + std::complex(2.0, 3.0), + std::complex(4.0, 1.0), + std::complex(3.0, 7.0), + std::complex(5.0, 5.0), + std::complex(7.0, 3.0), + std::complex(1.0, 4.0), + std::complex(3.0, 2.0), + std::complex(5.0, 1.0) + }; FullMatrix > m(n,n, array); print_matrix (m); deallog << m.determinant () << std::endl; } } - - diff --git a/tests/full_matrix/complex_complex_full_matrix_19.output b/tests/full_matrix/complex_complex_full_matrix_19.output index 39f150c940..c6d0e8a3f4 100644 --- a/tests/full_matrix/complex_complex_full_matrix_19.output +++ b/tests/full_matrix/complex_complex_full_matrix_19.output @@ -1,35 +1,35 @@ -DEAL::0 0 (1.0,0.0) -DEAL::(1.0,0.0) -DEAL::0 0 (1.0,0.0) -DEAL::0 1 (2.0,0.0) -DEAL::1 0 (3.0,0.0) -DEAL::1 1 (4.0,0.0) -DEAL::(-2.0,0.0) -DEAL::0 0 (1.0,0.0) -DEAL::0 1 (2.0,0.0) -DEAL::0 2 (3.0,0.0) -DEAL::1 0 (4.0,0.0) -DEAL::1 1 (5.0,0.0) -DEAL::1 2 (6.0,0.0) -DEAL::2 0 (7.0,0.0) -DEAL::2 1 (8.0,0.0) -DEAL::2 2 (9.0,0.0) -DEAL::(0.0,0.0) -DEAL::0 0 (1.0,0.0) -DEAL::(1.0,0.0) -DEAL::0 0 (1.0,0.0) -DEAL::0 1 (2.0,0.0) -DEAL::1 0 (3.0,0.0) -DEAL::1 1 (4.0,0.0) -DEAL::(-2.0,0.0) -DEAL::0 0 (1.0,0.0) -DEAL::0 1 (2.0,0.0) -DEAL::0 2 (3.0,0.0) -DEAL::1 0 (4.0,0.0) -DEAL::1 1 (5.0,0.0) -DEAL::1 2 (6.0,0.0) -DEAL::2 0 (7.0,0.0) -DEAL::2 1 (8.0,0.0) -DEAL::2 2 (9.0,0.0) -DEAL::(0.0,0.0) +DEAL::0 0 (1.0,5.0) +DEAL::(1.0,5.0) +DEAL::0 0 (1.0,5.0) +DEAL::0 1 (2.0,3.0) +DEAL::1 0 (4.0,1.0) +DEAL::1 1 (3.0,7.0) +DEAL::(-37.,8.0) +DEAL::0 0 (1.0,5.0) +DEAL::0 1 (2.0,3.0) +DEAL::0 2 (4.0,1.0) +DEAL::1 0 (3.0,7.0) +DEAL::1 1 (5.0,5.0) +DEAL::1 2 (7.0,3.0) +DEAL::2 0 (1.0,4.0) +DEAL::2 1 (3.0,2.0) +DEAL::2 2 (5.0,1.0) +DEAL::(3.0,-3.0) +DEAL::0 0 (1.0,5.0) +DEAL::(1.0,5.0) +DEAL::0 0 (1.0,5.0) +DEAL::0 1 (2.0,3.0) +DEAL::1 0 (4.0,1.0) +DEAL::1 1 (3.0,7.0) +DEAL::(-37.,8.0) +DEAL::0 0 (1.0,5.0) +DEAL::0 1 (2.0,3.0) +DEAL::0 2 (4.0,1.0) +DEAL::1 0 (3.0,7.0) +DEAL::1 1 (5.0,5.0) +DEAL::1 2 (7.0,3.0) +DEAL::2 0 (1.0,4.0) +DEAL::2 1 (3.0,2.0) +DEAL::2 2 (5.0,1.0) +DEAL::(3.0,-3.0) diff --git a/tests/full_matrix/complex_complex_full_matrix_42.cc b/tests/full_matrix/complex_complex_full_matrix_42.cc index fd55665db0..0ecb6e9d9b 100644 --- a/tests/full_matrix/complex_complex_full_matrix_42.cc +++ b/tests/full_matrix/complex_complex_full_matrix_42.cc @@ -33,11 +33,31 @@ check () { for (unsigned int n=1; n<=5; ++n) { - const std::complex array[] = { 50, 2, 3, 4, 5, - 6, 50, 8, 9, 0, - 1, 2, 50, 4, 5, - 6, 7, 8, 50, 0, - 1, 2, 3, 4, 50 + const std::complex array[] = { std::complex (50.0, 50.0), + std::complex (2.0, 6.0), + std::complex (3.0, 1.0), + std::complex (4.0, 6.0), + std::complex (5.0, 1.0), + std::complex (6.0, 2.0), + std::complex (50.0, 50.0), + std::complex (8.0, 2.0), + std::complex (9.0, 7.0), + std::complex (0.0, 2.0), + std::complex (1.0, 3.0), + std::complex (2.0, 8.0), + std::complex (50.0, 50.0), + std::complex (4.0, 8.0), + std::complex (5.0, 3.0), + std::complex (6.0, 4.0), + std::complex (7.0, 9.0), + std::complex (8.0, 4.0), + std::complex (50.0, 50.0), + std::complex (0.0, 4.0), + std::complex (1.0, 5.0), + std::complex (2.0, 0.0), + std::complex (3.0, 5.0), + std::complex (4.0, 0.0), + std::complex (50.0, 50.0) }; FullMatrix > m (n,n,array), p(n,n); @@ -45,4 +65,3 @@ check () print_matrix (p); } } - diff --git a/tests/full_matrix/complex_complex_full_matrix_42.output b/tests/full_matrix/complex_complex_full_matrix_42.output index 95501be4f1..60ca33b7e8 100644 --- a/tests/full_matrix/complex_complex_full_matrix_42.output +++ b/tests/full_matrix/complex_complex_full_matrix_42.output @@ -1,111 +1,111 @@ -DEAL::0 0 (0.020,0.0) -DEAL::0 0 (0.021,0.0) -DEAL::0 1 (-0.010,0.0) -DEAL::1 0 (-0.015,0.0) -DEAL::1 1 (0.26,0.0) -DEAL::0 0 (0.011,0.0) -DEAL::0 1 (-0.022,0.0) -DEAL::0 2 (0.011,0.0) -DEAL::1 0 (-0.96,0.0) -DEAL::1 1 (-1.1,0.0) -DEAL::1 2 (1.0,0.0) -DEAL::2 0 (0.79,0.0) -DEAL::2 1 (1.1,0.0) -DEAL::2 2 (-0.88,0.0) -DEAL::0 0 (0.049,0.0) -DEAL::0 1 (0.0,0.0) -DEAL::0 2 (-0.024,0.0) -DEAL::0 3 (-0.024,0.0) -DEAL::1 0 (-0.32,0.0) -DEAL::1 1 (-0.012,0.0) -DEAL::1 2 (-0.60,0.0) -DEAL::1 3 (0.43,0.0) -DEAL::2 0 (0.074,0.0) -DEAL::2 1 (0.023,0.0) -DEAL::2 2 (-0.026,0.0) -DEAL::2 3 (-0.072,0.0) -DEAL::3 0 (-0.26,0.0) -DEAL::3 1 (-0.012,0.0) -DEAL::3 2 (0.62,0.0) -DEAL::3 3 (0.15,0.0) -DEAL::0 0 (0.020,0.0) -DEAL::0 1 (-0.00052,0.0) -DEAL::0 2 (-0.00081,0.0) -DEAL::0 3 (-0.0013,0.0) -DEAL::0 4 (-0.0019,0.0) -DEAL::1 0 (-0.0020,0.0) -DEAL::1 1 (0.021,0.0) -DEAL::1 2 (-0.0027,0.0) -DEAL::1 3 (-0.0034,0.0) -DEAL::1 4 (0.00047,0.0) -DEAL::2 0 (-0.00014,0.0) -DEAL::2 1 (-0.00054,0.0) -DEAL::2 2 (0.020,0.0) -DEAL::2 3 (-0.0014,0.0) -DEAL::2 4 (-0.0020,0.0) -DEAL::3 0 (-0.0021,0.0) -DEAL::3 1 (-0.0027,0.0) -DEAL::3 2 (-0.0028,0.0) -DEAL::3 3 (0.021,0.0) -DEAL::3 4 (0.00049,0.0) -DEAL::4 0 (-0.00015,0.0) -DEAL::4 1 (-0.00056,0.0) -DEAL::4 2 (-0.00088,0.0) -DEAL::4 3 (-0.0014,0.0) -DEAL::4 4 (0.020,0.0) -DEAL::0 0 (0.020,0.0) -DEAL::0 0 (0.021,0.0) -DEAL::0 1 (-0.010,0.0) -DEAL::1 0 (-0.015,0.0) -DEAL::1 1 (0.26,0.0) -DEAL::0 0 (0.011,0.0) -DEAL::0 1 (-0.022,0.0) -DEAL::0 2 (0.011,0.0) -DEAL::1 0 (-0.96,0.0) -DEAL::1 1 (-1.1,0.0) -DEAL::1 2 (1.0,0.0) -DEAL::2 0 (0.79,0.0) -DEAL::2 1 (1.1,0.0) -DEAL::2 2 (-0.88,0.0) -DEAL::0 0 (0.049,0.0) -DEAL::0 1 (0.0,0.0) -DEAL::0 2 (-0.024,0.0) -DEAL::0 3 (-0.024,0.0) -DEAL::1 0 (-0.32,0.0) -DEAL::1 1 (-0.012,0.0) -DEAL::1 2 (-0.60,0.0) -DEAL::1 3 (0.43,0.0) -DEAL::2 0 (0.074,0.0) -DEAL::2 1 (0.023,0.0) -DEAL::2 2 (-0.026,0.0) -DEAL::2 3 (-0.072,0.0) -DEAL::3 0 (-0.26,0.0) -DEAL::3 1 (-0.012,0.0) -DEAL::3 2 (0.62,0.0) -DEAL::3 3 (0.15,0.0) -DEAL::0 0 (0.020,0.0) -DEAL::0 1 (-0.00052,0.0) -DEAL::0 2 (-0.00081,0.0) -DEAL::0 3 (-0.0013,0.0) -DEAL::0 4 (-0.0019,0.0) -DEAL::1 0 (-0.0020,0.0) -DEAL::1 1 (0.021,0.0) -DEAL::1 2 (-0.0027,0.0) -DEAL::1 3 (-0.0034,0.0) -DEAL::1 4 (0.00047,0.0) -DEAL::2 0 (-0.00014,0.0) -DEAL::2 1 (-0.00054,0.0) -DEAL::2 2 (0.020,0.0) -DEAL::2 3 (-0.0014,0.0) -DEAL::2 4 (-0.0020,0.0) -DEAL::3 0 (-0.0021,0.0) -DEAL::3 1 (-0.0027,0.0) -DEAL::3 2 (-0.0028,0.0) -DEAL::3 3 (0.021,0.0) -DEAL::3 4 (0.00049,0.0) -DEAL::4 0 (-0.00015,0.0) -DEAL::4 1 (-0.00056,0.0) -DEAL::4 2 (-0.00088,0.0) -DEAL::4 3 (-0.0014,0.0) -DEAL::4 4 (0.020,0.0) +DEAL::0 0 (0.010,-0.010) +DEAL::0 0 (0.010,-0.010) +DEAL::0 1 (-0.011,0.0065) +DEAL::1 0 (-0.00075,0.0064) +DEAL::1 1 (0.079,-0.12) +DEAL::0 0 (0.0039,-0.0036) +DEAL::0 1 (-0.020,0.0085) +DEAL::0 2 (0.0083,-0.0069) +DEAL::1 0 (-0.013,-0.12) +DEAL::1 1 (0.083,-0.17) +DEAL::1 2 (0.00087,0.13) +DEAL::2 0 (0.016,0.092) +DEAL::2 1 (0.12,0.097) +DEAL::2 2 (-0.026,-0.10) +DEAL::0 0 (0.039,-0.028) +DEAL::0 1 (0.0017,2.8e-06) +DEAL::0 2 (-0.017,0.010) +DEAL::0 3 (-0.027,0.017) +DEAL::1 0 (-0.26,0.35) +DEAL::1 1 (-0.015,0.011) +DEAL::1 2 (0.16,-0.021) +DEAL::1 3 (0.23,-0.34) +DEAL::2 0 (-0.0014,-0.032) +DEAL::2 1 (0.011,-0.012) +DEAL::2 2 (-0.0019,0.022) +DEAL::2 3 (0.0011,0.029) +DEAL::3 0 (0.065,0.010) +DEAL::3 1 (-0.0013,0.0047) +DEAL::3 2 (0.0011,-0.16) +DEAL::3 3 (-0.062,0.015) +DEAL::0 0 (0.010,-0.010) +DEAL::0 1 (-0.0010,0.00027) +DEAL::0 2 (1.7e-05,0.00032) +DEAL::0 3 (-0.0011,0.00067) +DEAL::0 4 (-0.00012,0.0010) +DEAL::1 0 (-0.00027,0.0010) +DEAL::1 1 (0.010,-0.010) +DEAL::1 2 (-0.00031,0.0014) +DEAL::1 3 (-0.0013,0.0016) +DEAL::1 4 (-0.00033,-0.00020) +DEAL::2 0 (-0.00032,-1.7e-05) +DEAL::2 1 (-0.0014,0.00031) +DEAL::2 2 (0.010,-0.010) +DEAL::2 3 (-0.0014,0.00069) +DEAL::2 4 (-0.00048,0.0011) +DEAL::3 0 (-0.00067,0.0011) +DEAL::3 1 (-0.0016,0.0013) +DEAL::3 2 (-0.00069,0.0014) +DEAL::3 3 (0.011,-0.011) +DEAL::3 4 (-0.00076,-0.00021) +DEAL::4 0 (-0.0010,0.00012) +DEAL::4 1 (0.00020,0.00033) +DEAL::4 2 (-0.0011,0.00048) +DEAL::4 3 (0.00021,0.00076) +DEAL::4 4 (0.010,-0.010) +DEAL::0 0 (0.010,-0.010) +DEAL::0 0 (0.010,-0.010) +DEAL::0 1 (-0.011,0.0065) +DEAL::1 0 (-0.00075,0.0064) +DEAL::1 1 (0.079,-0.12) +DEAL::0 0 (0.0039,-0.0036) +DEAL::0 1 (-0.020,0.0085) +DEAL::0 2 (0.0083,-0.0069) +DEAL::1 0 (-0.013,-0.12) +DEAL::1 1 (0.083,-0.17) +DEAL::1 2 (0.00087,0.13) +DEAL::2 0 (0.016,0.092) +DEAL::2 1 (0.12,0.097) +DEAL::2 2 (-0.026,-0.10) +DEAL::0 0 (0.039,-0.028) +DEAL::0 1 (0.0017,2.8e-06) +DEAL::0 2 (-0.017,0.010) +DEAL::0 3 (-0.027,0.017) +DEAL::1 0 (-0.26,0.35) +DEAL::1 1 (-0.015,0.011) +DEAL::1 2 (0.16,-0.021) +DEAL::1 3 (0.23,-0.34) +DEAL::2 0 (-0.0014,-0.032) +DEAL::2 1 (0.011,-0.012) +DEAL::2 2 (-0.0019,0.022) +DEAL::2 3 (0.0011,0.029) +DEAL::3 0 (0.065,0.010) +DEAL::3 1 (-0.0013,0.0047) +DEAL::3 2 (0.0011,-0.16) +DEAL::3 3 (-0.062,0.015) +DEAL::0 0 (0.010,-0.010) +DEAL::0 1 (-0.0010,0.00027) +DEAL::0 2 (1.7e-05,0.00032) +DEAL::0 3 (-0.0011,0.00067) +DEAL::0 4 (-0.00012,0.0010) +DEAL::1 0 (-0.00027,0.0010) +DEAL::1 1 (0.010,-0.010) +DEAL::1 2 (-0.00031,0.0014) +DEAL::1 3 (-0.0013,0.0016) +DEAL::1 4 (-0.00033,-0.00020) +DEAL::2 0 (-0.00032,-1.7e-05) +DEAL::2 1 (-0.0014,0.00031) +DEAL::2 2 (0.010,-0.010) +DEAL::2 3 (-0.0014,0.00069) +DEAL::2 4 (-0.00048,0.0011) +DEAL::3 0 (-0.00067,0.0011) +DEAL::3 1 (-0.0016,0.0013) +DEAL::3 2 (-0.00069,0.0014) +DEAL::3 3 (0.011,-0.011) +DEAL::3 4 (-0.00076,-0.00021) +DEAL::4 0 (-0.0010,0.00012) +DEAL::4 1 (0.00020,0.00033) +DEAL::4 2 (-0.0011,0.00048) +DEAL::4 3 (0.00021,0.00076) +DEAL::4 4 (0.010,-0.010) -- 2.39.5