From 8a1a7021584856057779e5fa1c05fe6bb866e8cd Mon Sep 17 00:00:00 2001 From: David Wells Date: Fri, 16 Mar 2018 13:21:14 -0400 Subject: [PATCH] Update tests with identical output. The FullMatrix tests now default to using rectangular matrices, but this does not make sense for every test. This commit modifies tests so that they use the old (square) test matrix. --- tests/full_matrix/complex_complex_full_matrix_13.cc | 5 ++--- tests/full_matrix/complex_complex_full_matrix_18.cc | 3 +-- tests/full_matrix/complex_complex_full_matrix_20.cc | 3 +-- tests/full_matrix/complex_complex_full_matrix_36.cc | 3 +-- tests/full_matrix/complex_complex_full_matrix_40.cc | 3 +-- tests/full_matrix/complex_complex_full_matrix_41.cc | 3 +-- tests/full_matrix/complex_complex_full_matrix_43.cc | 7 +++---- tests/full_matrix/complex_complex_full_matrix_44.cc | 7 +++---- tests/full_matrix/complex_complex_full_matrix_45.cc | 5 ++--- tests/full_matrix/complex_complex_full_matrix_51.cc | 7 +++---- tests/full_matrix/complex_complex_full_matrix_52.cc | 7 +++---- tests/full_matrix/complex_real_full_matrix_13.cc | 5 ++--- tests/full_matrix/complex_real_full_matrix_18.cc | 3 +-- tests/full_matrix/complex_real_full_matrix_20.cc | 3 +-- tests/full_matrix/complex_real_full_matrix_36.cc | 3 +-- tests/full_matrix/complex_real_full_matrix_40.cc | 3 +-- tests/full_matrix/complex_real_full_matrix_41.cc | 3 +-- tests/full_matrix/complex_real_full_matrix_43.cc | 7 +++---- tests/full_matrix/complex_real_full_matrix_44.cc | 7 +++---- tests/full_matrix/complex_real_full_matrix_49.cc | 7 +++---- tests/full_matrix/full_matrix_13.cc | 5 ++--- tests/full_matrix/full_matrix_14.cc | 7 +++---- tests/full_matrix/full_matrix_18.cc | 3 +-- tests/full_matrix/full_matrix_20.cc | 3 +-- tests/full_matrix/full_matrix_36.cc | 3 +-- tests/full_matrix/full_matrix_40.cc | 3 +-- tests/full_matrix/full_matrix_41.cc | 3 +-- tests/full_matrix/full_matrix_43.cc | 7 +++---- tests/full_matrix/full_matrix_44.cc | 7 +++---- tests/full_matrix/full_matrix_49.cc | 7 +++---- tests/full_matrix/full_matrix_51.cc | 7 +++---- tests/full_matrix/full_matrix_52.cc | 7 +++---- tests/full_matrix/full_matrix_59.cc | 3 +-- tests/full_matrix/full_matrix_60.cc | 3 +-- 34 files changed, 64 insertions(+), 98 deletions(-) diff --git a/tests/full_matrix/complex_complex_full_matrix_13.cc b/tests/full_matrix/complex_complex_full_matrix_13.cc index b262783a9b..7e08dec8a1 100644 --- a/tests/full_matrix/complex_complex_full_matrix_13.cc +++ b/tests/full_matrix/complex_complex_full_matrix_13.cc @@ -31,10 +31,9 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); Vector > v; - make_complex_vector (v); + make_complex_range_vector (v); deallog << m.matrix_norm_square (v) << std::endl; } - diff --git a/tests/full_matrix/complex_complex_full_matrix_18.cc b/tests/full_matrix/complex_complex_full_matrix_18.cc index 2f5aaf603c..6da5ea4715 100644 --- a/tests/full_matrix/complex_complex_full_matrix_18.cc +++ b/tests/full_matrix/complex_complex_full_matrix_18.cc @@ -31,7 +31,6 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); deallog << m.relative_symmetry_norm2() << std::endl; } - diff --git a/tests/full_matrix/complex_complex_full_matrix_20.cc b/tests/full_matrix/complex_complex_full_matrix_20.cc index 6bf3a17f65..690834e544 100644 --- a/tests/full_matrix/complex_complex_full_matrix_20.cc +++ b/tests/full_matrix/complex_complex_full_matrix_20.cc @@ -31,7 +31,6 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); deallog << m.trace() << std::endl; } - diff --git a/tests/full_matrix/complex_complex_full_matrix_36.cc b/tests/full_matrix/complex_complex_full_matrix_36.cc index f6e270a048..8486cd4e41 100644 --- a/tests/full_matrix/complex_complex_full_matrix_36.cc +++ b/tests/full_matrix/complex_complex_full_matrix_36.cc @@ -31,8 +31,7 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); m.diagadd (3.141); print_matrix (m); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_40.cc b/tests/full_matrix/complex_complex_full_matrix_40.cc index 9ad21d3488..42405fddf9 100644 --- a/tests/full_matrix/complex_complex_full_matrix_40.cc +++ b/tests/full_matrix/complex_complex_full_matrix_40.cc @@ -31,8 +31,7 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); m.symmetrize (); print_matrix (m); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_41.cc b/tests/full_matrix/complex_complex_full_matrix_41.cc index 8f6ea44f87..7820614877 100644 --- a/tests/full_matrix/complex_complex_full_matrix_41.cc +++ b/tests/full_matrix/complex_complex_full_matrix_41.cc @@ -31,9 +31,8 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); m(0,0) = m(1,1) = m(2,2) = m(3,3) = m(4,4) = 50; m.gauss_jordan (); print_matrix (m); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_43.cc b/tests/full_matrix/complex_complex_full_matrix_43.cc index e48f16a3c3..45e48efefb 100644 --- a/tests/full_matrix/complex_complex_full_matrix_43.cc +++ b/tests/full_matrix/complex_complex_full_matrix_43.cc @@ -31,9 +31,9 @@ void check () { FullMatrix > m, n, o; - make_complex_matrix (m); - make_complex_matrix (n); - make_complex_matrix (o); + make_complex_square_matrix (m); + make_complex_square_matrix (n); + make_complex_square_matrix (o); m.mmult (n, o, true); print_matrix (m); @@ -45,4 +45,3 @@ check () print_matrix (n); print_matrix (o); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_44.cc b/tests/full_matrix/complex_complex_full_matrix_44.cc index ad233bdd31..b5ea053f18 100644 --- a/tests/full_matrix/complex_complex_full_matrix_44.cc +++ b/tests/full_matrix/complex_complex_full_matrix_44.cc @@ -31,9 +31,9 @@ void check () { FullMatrix > m, n, o; - make_complex_matrix (m); - make_complex_matrix (n); - make_complex_matrix (o); + make_complex_square_matrix (m); + make_complex_square_matrix (n); + make_complex_square_matrix (o); m.Tmmult (n, o, true); print_matrix (m); @@ -45,4 +45,3 @@ check () print_matrix (n); print_matrix (o); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_45.cc b/tests/full_matrix/complex_complex_full_matrix_45.cc index 57a5815b74..6b6a43d16a 100644 --- a/tests/full_matrix/complex_complex_full_matrix_45.cc +++ b/tests/full_matrix/complex_complex_full_matrix_45.cc @@ -33,8 +33,8 @@ check () FullMatrix > m; make_complex_matrix (m); Vector > v, w; - make_complex_vector (v); - make_complex_vector (w); + make_complex_range_vector (v); + make_complex_domain_vector (w); m.vmult (v, w, true); print_vector (v); @@ -44,4 +44,3 @@ check () print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_51.cc b/tests/full_matrix/complex_complex_full_matrix_51.cc index 8197ed9d3e..0574a71dde 100644 --- a/tests/full_matrix/complex_complex_full_matrix_51.cc +++ b/tests/full_matrix/complex_complex_full_matrix_51.cc @@ -31,13 +31,12 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); Vector > x, y; - make_complex_vector (x); - make_complex_vector (y); + make_complex_range_vector (x); + make_complex_range_vector (y); m.forward (x, y); print_vector (x); print_vector (y); } - diff --git a/tests/full_matrix/complex_complex_full_matrix_52.cc b/tests/full_matrix/complex_complex_full_matrix_52.cc index 4b53eb0f52..b2c7d58f61 100644 --- a/tests/full_matrix/complex_complex_full_matrix_52.cc +++ b/tests/full_matrix/complex_complex_full_matrix_52.cc @@ -31,13 +31,12 @@ void check () { FullMatrix > m; - make_complex_matrix (m); + make_complex_square_matrix (m); Vector > x, y; - make_complex_vector (x); - make_complex_vector (y); + make_complex_range_vector (x); + make_complex_range_vector (y); m.backward (x, y); print_vector (x); print_vector (y); } - diff --git a/tests/full_matrix/complex_real_full_matrix_13.cc b/tests/full_matrix/complex_real_full_matrix_13.cc index 1789905a9f..fa95d7f1b3 100644 --- a/tests/full_matrix/complex_real_full_matrix_13.cc +++ b/tests/full_matrix/complex_real_full_matrix_13.cc @@ -31,10 +31,9 @@ void check () { FullMatrix > m; - make_matrix (m); + make_square_matrix (m); Vector > v; - make_vector (v); + make_range_vector (v); deallog << m.matrix_norm_square (v) << std::endl; } - diff --git a/tests/full_matrix/complex_real_full_matrix_18.cc b/tests/full_matrix/complex_real_full_matrix_18.cc index f8bde86969..fd58106200 100644 --- a/tests/full_matrix/complex_real_full_matrix_18.cc +++ b/tests/full_matrix/complex_real_full_matrix_18.cc @@ -31,7 +31,6 @@ void check () { FullMatrix > m; - make_matrix (m); + make_square_matrix (m); deallog << m.relative_symmetry_norm2() << std::endl; } - diff --git a/tests/full_matrix/complex_real_full_matrix_20.cc b/tests/full_matrix/complex_real_full_matrix_20.cc index deae6614fc..9a35f609e5 100644 --- a/tests/full_matrix/complex_real_full_matrix_20.cc +++ b/tests/full_matrix/complex_real_full_matrix_20.cc @@ -31,7 +31,6 @@ void check () { FullMatrix > m; - make_matrix (m); + make_square_matrix (m); deallog << m.trace() << std::endl; } - diff --git a/tests/full_matrix/complex_real_full_matrix_36.cc b/tests/full_matrix/complex_real_full_matrix_36.cc index d8722a113f..f384e1c8d8 100644 --- a/tests/full_matrix/complex_real_full_matrix_36.cc +++ b/tests/full_matrix/complex_real_full_matrix_36.cc @@ -31,8 +31,7 @@ void check () { FullMatrix > m; - make_matrix (m); + make_square_matrix (m); m.diagadd (3.141); print_matrix (m); } - diff --git a/tests/full_matrix/complex_real_full_matrix_40.cc b/tests/full_matrix/complex_real_full_matrix_40.cc index f44e21e59b..9ece7c37af 100644 --- a/tests/full_matrix/complex_real_full_matrix_40.cc +++ b/tests/full_matrix/complex_real_full_matrix_40.cc @@ -31,8 +31,7 @@ void check () { FullMatrix > m; - make_matrix (m); + make_square_matrix (m); m.symmetrize (); print_matrix (m); } - diff --git a/tests/full_matrix/complex_real_full_matrix_41.cc b/tests/full_matrix/complex_real_full_matrix_41.cc index 6efd9f76a2..87959b1efc 100644 --- a/tests/full_matrix/complex_real_full_matrix_41.cc +++ b/tests/full_matrix/complex_real_full_matrix_41.cc @@ -31,9 +31,8 @@ void check () { FullMatrix > m; - make_matrix (m); + make_square_matrix (m); m(0,0) = m(1,1) = m(2,2) = m(3,3) = m(4,4) = 50; m.gauss_jordan (); print_matrix (m); } - diff --git a/tests/full_matrix/complex_real_full_matrix_43.cc b/tests/full_matrix/complex_real_full_matrix_43.cc index dacfa2a3d8..7cd13aa19d 100644 --- a/tests/full_matrix/complex_real_full_matrix_43.cc +++ b/tests/full_matrix/complex_real_full_matrix_43.cc @@ -31,9 +31,9 @@ void check () { FullMatrix > m, n, o; - make_matrix (m); - make_matrix (n); - make_matrix (o); + make_square_matrix (m); + make_square_matrix (n); + make_square_matrix (o); m.mmult (n, o, true); print_matrix (m); @@ -45,4 +45,3 @@ check () print_matrix (n); print_matrix (o); } - diff --git a/tests/full_matrix/complex_real_full_matrix_44.cc b/tests/full_matrix/complex_real_full_matrix_44.cc index c76bed978a..6473112c10 100644 --- a/tests/full_matrix/complex_real_full_matrix_44.cc +++ b/tests/full_matrix/complex_real_full_matrix_44.cc @@ -31,9 +31,9 @@ void check () { FullMatrix > m, n, o; - make_matrix (m); - make_matrix (n); - make_matrix (o); + make_square_matrix (m); + make_square_matrix (n); + make_square_matrix (o); m.Tmmult (n, o, true); print_matrix (m); @@ -45,4 +45,3 @@ check () print_matrix (n); print_matrix (o); } - diff --git a/tests/full_matrix/complex_real_full_matrix_49.cc b/tests/full_matrix/complex_real_full_matrix_49.cc index 2319bf7ebf..58703d9384 100644 --- a/tests/full_matrix/complex_real_full_matrix_49.cc +++ b/tests/full_matrix/complex_real_full_matrix_49.cc @@ -31,13 +31,12 @@ void check () { FullMatrix > m; - make_matrix (m); + make_square_matrix (m); Vector > v, w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_range_vector (w); m.precondition_Jacobi (v, w, 3.141); print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/full_matrix_13.cc b/tests/full_matrix/full_matrix_13.cc index 5cadd505a9..e7c5e9866a 100644 --- a/tests/full_matrix/full_matrix_13.cc +++ b/tests/full_matrix/full_matrix_13.cc @@ -29,10 +29,9 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); Vector v; - make_vector (v); + make_range_vector (v); deallog << m.matrix_norm_square (v) << std::endl; } - diff --git a/tests/full_matrix/full_matrix_14.cc b/tests/full_matrix/full_matrix_14.cc index 520b2dc4da..e2c3c41493 100644 --- a/tests/full_matrix/full_matrix_14.cc +++ b/tests/full_matrix/full_matrix_14.cc @@ -29,13 +29,12 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); Vector v,w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_range_vector (w); for (unsigned int i=0; i m; - make_matrix (m); + make_square_matrix (m); deallog << m.relative_symmetry_norm2() << std::endl; } - diff --git a/tests/full_matrix/full_matrix_20.cc b/tests/full_matrix/full_matrix_20.cc index 88240d2bf7..ab21a8f86b 100644 --- a/tests/full_matrix/full_matrix_20.cc +++ b/tests/full_matrix/full_matrix_20.cc @@ -29,7 +29,6 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); deallog << m.trace() << std::endl; } - diff --git a/tests/full_matrix/full_matrix_36.cc b/tests/full_matrix/full_matrix_36.cc index d0b028b911..45c8c181f7 100644 --- a/tests/full_matrix/full_matrix_36.cc +++ b/tests/full_matrix/full_matrix_36.cc @@ -29,8 +29,7 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); m.diagadd (3.141); print_matrix (m); } - diff --git a/tests/full_matrix/full_matrix_40.cc b/tests/full_matrix/full_matrix_40.cc index c678cfac91..c53e65036d 100644 --- a/tests/full_matrix/full_matrix_40.cc +++ b/tests/full_matrix/full_matrix_40.cc @@ -29,8 +29,7 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); m.symmetrize (); print_matrix (m); } - diff --git a/tests/full_matrix/full_matrix_41.cc b/tests/full_matrix/full_matrix_41.cc index 8c40e85c88..ff966a57ec 100644 --- a/tests/full_matrix/full_matrix_41.cc +++ b/tests/full_matrix/full_matrix_41.cc @@ -29,9 +29,8 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); m(0,0) = m(1,1) = m(2,2) = m(3,3) = m(4,4) = 50; m.gauss_jordan (); print_matrix (m); } - diff --git a/tests/full_matrix/full_matrix_43.cc b/tests/full_matrix/full_matrix_43.cc index 015fc84394..d7d2c2b802 100644 --- a/tests/full_matrix/full_matrix_43.cc +++ b/tests/full_matrix/full_matrix_43.cc @@ -29,9 +29,9 @@ void check () { FullMatrix m, n, o; - make_matrix (m); - make_matrix (n); - make_matrix (o); + make_square_matrix (m); + make_square_matrix (n); + make_square_matrix (o); m.mmult (n, o, true); print_matrix (m); @@ -43,4 +43,3 @@ check () print_matrix (n); print_matrix (o); } - diff --git a/tests/full_matrix/full_matrix_44.cc b/tests/full_matrix/full_matrix_44.cc index 4dab6f5005..19db43ff50 100644 --- a/tests/full_matrix/full_matrix_44.cc +++ b/tests/full_matrix/full_matrix_44.cc @@ -29,9 +29,9 @@ void check () { FullMatrix m, n, o; - make_matrix (m); - make_matrix (n); - make_matrix (o); + make_square_matrix (m); + make_square_matrix (n); + make_square_matrix (o); m.Tmmult (n, o, true); print_matrix (m); @@ -43,4 +43,3 @@ check () print_matrix (n); print_matrix (o); } - diff --git a/tests/full_matrix/full_matrix_49.cc b/tests/full_matrix/full_matrix_49.cc index cc225b0620..31f00b55ba 100644 --- a/tests/full_matrix/full_matrix_49.cc +++ b/tests/full_matrix/full_matrix_49.cc @@ -29,13 +29,12 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); Vector v, w; - make_vector (v); - make_vector (w); + make_range_vector (v); + make_range_vector (w); m.precondition_Jacobi (v, w, 3.141); print_vector (v); print_vector (w); } - diff --git a/tests/full_matrix/full_matrix_51.cc b/tests/full_matrix/full_matrix_51.cc index f5986e0904..5efac46477 100644 --- a/tests/full_matrix/full_matrix_51.cc +++ b/tests/full_matrix/full_matrix_51.cc @@ -29,13 +29,12 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); Vector x, y; - make_vector (x); - make_vector (y); + make_range_vector (x); + make_range_vector (y); m.forward (x, y); print_vector (x); print_vector (y); } - diff --git a/tests/full_matrix/full_matrix_52.cc b/tests/full_matrix/full_matrix_52.cc index 2de6ec6c3e..3427594421 100644 --- a/tests/full_matrix/full_matrix_52.cc +++ b/tests/full_matrix/full_matrix_52.cc @@ -29,13 +29,12 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); Vector x, y; - make_vector (x); - make_vector (y); + make_range_vector (x); + make_range_vector (y); m.backward (x, y); print_vector (x); print_vector (y); } - diff --git a/tests/full_matrix/full_matrix_59.cc b/tests/full_matrix/full_matrix_59.cc index 3863960c18..10ffe25573 100644 --- a/tests/full_matrix/full_matrix_59.cc +++ b/tests/full_matrix/full_matrix_59.cc @@ -29,7 +29,7 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); for (typename FullMatrix::const_iterator p = m.begin(); p!=m.end(); ++p) @@ -37,4 +37,3 @@ check () << p->value() << std::endl; } - diff --git a/tests/full_matrix/full_matrix_60.cc b/tests/full_matrix/full_matrix_60.cc index 0f1742e3cf..9a202775df 100644 --- a/tests/full_matrix/full_matrix_60.cc +++ b/tests/full_matrix/full_matrix_60.cc @@ -29,7 +29,7 @@ void check () { FullMatrix m; - make_matrix (m); + make_square_matrix (m); for (typename FullMatrix::const_iterator @@ -38,4 +38,3 @@ check () << p->value() << std::endl; } - -- 2.39.5