Avoid using the deprecated row_iterator types of sparsity patterns. Replace them...

diff --git a/tests/bits/compressed_set_sparsity_pattern_04.cc b/tests/bits/compressed_set_sparsity_pattern_04.cc
index 6711423c9ce904831473da8ebac41e7b9a96a369..5d83b1017f251f6ca0dd9a7c0dd834798b01043a 100644 (file)
--- a/tests/bits/compressed_set_sparsity_pattern_04.cc
+++ b/tests/bits/compressed_set_sparsity_pattern_04.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2014 by the deal.II authors
+// Copyright (C) 2004 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -15,7 +15,7 @@
 
 
 
-// check CompressedSetSparsityPattern::row_begin iterators. since we create
+// check CompressedSetSparsityPattern::begin iterators. since we create
 // quite some output here, choose smaller number of rows and entries than in
 // the other tests
 
@@ -37,9 +37,9 @@ void test ()
   for (unsigned int i=0; i<N; ++i)
     {
       unsigned int index = 0;
-      for (CompressedSetSparsityPattern::row_iterator
-           j = csp.row_begin(i); j != csp.row_end(i); ++j, ++index)
-        deallog << i << ' ' << index << ' ' << *j
+      for (CompressedSetSparsityPattern::iterator
+           j = csp.begin(i); j != csp.end(i); ++j, ++index)
+        deallog << i << ' ' << index << ' ' << j->column()
                 << std::endl;
     }
 }

diff --git a/tests/bits/compressed_set_sparsity_pattern_05.cc b/tests/bits/compressed_set_sparsity_pattern_05.cc
index 057fff64015c3c4f358e9278d7f08f8730c09185..c4b53583bdf8f078111bb91161acda81346f9299 100644 (file)
--- a/tests/bits/compressed_set_sparsity_pattern_05.cc
+++ b/tests/bits/compressed_set_sparsity_pattern_05.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2004 - 2014 by the deal.II authors
+// Copyright (C) 2004 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -38,9 +38,9 @@ void test ()
   for (unsigned int i=0; i<N; ++i)
     {
       unsigned int index = 0;
-      for (CompressedSetSparsityPattern::row_iterator
-           j = csp.row_begin(i); j != csp.row_end(i); ++j, ++index)
-        deallog << i << ' ' << index << ' ' << *j
+      for (CompressedSetSparsityPattern::iterator
+           j = csp.begin(i); j != csp.end(i); ++j, ++index)
+        deallog << i << ' ' << index << ' ' << j->column()
                 << std::endl;
     }
 }

diff --git a/tests/bits/dof_tools_01b_x.cc b/tests/bits/dof_tools_01b_x.cc
index 101080784d58af7307dd2562678d5c4b814f0ad7..d02da5ce888469e1241303e27ccb21f8571c9a10 100644 (file)
--- a/tests/bits/dof_tools_01b_x.cc
+++ b/tests/bits/dof_tools_01b_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -42,9 +42,9 @@ check_this (const DoFHandler<dim> &dof_handler)
   for (unsigned int l=0; l<20; ++l)
     {
       const unsigned int line = l*(sp.n_rows()/20);
-      for (CompressedSetSparsityPattern::row_iterator
-           c = sp.row_begin(line); c!=sp.row_end(line); ++c)
-        deallog << *c << " ";
+      for (CompressedSetSparsityPattern::iterator
+           c = sp.begin(line); c!=sp.end(line); ++c)
+        deallog << c->column() << " ";
       deallog << std::endl;
     }
 

diff --git a/tests/bits/dof_tools_01d_x.cc b/tests/bits/dof_tools_01d_x.cc
index 73b46b464dc853bc44ba35bdba3b24fb5a7b9dd9..ec0afaf48315e940455ce0c5146f217cac19fdfe 100644 (file)
--- a/tests/bits/dof_tools_01d_x.cc
+++ b/tests/bits/dof_tools_01d_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -66,10 +66,10 @@ check_this (const DoFHandler<dim> &dof_handler)
       block_row = sp.get_row_indices().global_to_local(line);
       for (unsigned int col=0; col<n_components; ++col)
         {
-          for (CompressedSetSparsityPattern::row_iterator
-               c = sp.block(block_row.first,col).row_begin(block_row.second);
-               c!=sp.block(block_row.first,col).row_end(block_row.second); ++c)
-            deallog << *c
+          for (CompressedSetSparsityPattern::iterator
+               c = sp.block(block_row.first,col).begin(block_row.second);
+               c!=sp.block(block_row.first,col).end(block_row.second); ++c)
+            deallog << c->column()
                     << " ";
           deallog << std::endl;
         }

diff --git a/tests/bits/dof_tools_02b_x.cc b/tests/bits/dof_tools_02b_x.cc
index 085da19901538a67cf01d6c10c2b4887d2a6a2b3..5c00de6b5bbabee1c0427c588d8308845fb3eb54 100644 (file)
--- a/tests/bits/dof_tools_02b_x.cc
+++ b/tests/bits/dof_tools_02b_x.cc
@@ -52,9 +52,9 @@ check_this (const DoFHandler<dim> &dof_handler)
   for (unsigned int l=0; l<20; ++l)
     {
       const unsigned int line = l*(sp.n_rows()/20);
-      for (CompressedSetSparsityPattern::row_iterator
-           c = sp.row_begin(line); c!=sp.row_end(line); ++c)
-        deallog << *c << " ";
+      for (CompressedSetSparsityPattern::iterator
+           c = sp.begin(line); c!=sp.end(line); ++c)
+        deallog << c->column() << " ";
       deallog << std::endl;
     }
 

diff --git a/tests/bits/dof_tools_02d_x.cc b/tests/bits/dof_tools_02d_x.cc
index ec1172e1639fdc0782220901f86e04ecf7d3ae18..a5846d91a3079b4ff6bafdf60760a633f2d2aa74 100644 (file)
--- a/tests/bits/dof_tools_02d_x.cc
+++ b/tests/bits/dof_tools_02d_x.cc
@@ -75,10 +75,10 @@ check_this (const DoFHandler<dim> &dof_handler)
       block_row = sp.get_row_indices().global_to_local(line);
       for (unsigned int col=0; col<n_components; ++col)
         {
-          for (CompressedSetSparsityPattern::row_iterator
-               c = sp.block(block_row.first,col).row_begin(block_row.second);
-               c!=sp.block(block_row.first,col).row_end(block_row.second); ++c)
-            deallog << *c
+          for (CompressedSetSparsityPattern::iterator
+               c = sp.block(block_row.first,col).begin(block_row.second);
+               c!=sp.block(block_row.first,col).end(block_row.second); ++c)
+            deallog << c->column()
                     << " ";
           deallog << std::endl;
         }

diff --git a/tests/bits/dof_tools_15b_x.cc b/tests/bits/dof_tools_15b_x.cc
index 609243fe7721538319b64225c1e53eb99763f703..e50a21bce0eff48e27df76b6c893a5f167d399be 100644 (file)
--- a/tests/bits/dof_tools_15b_x.cc
+++ b/tests/bits/dof_tools_15b_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -51,9 +51,9 @@ check_this (const DoFHandler<dim> &dof_handler)
   for (unsigned int l=0; l<20; ++l)
     {
       const unsigned int line = l*(sp.n_rows()/20);
-      for (CompressedSetSparsityPattern::row_iterator
-           c = sp.row_begin(line); c!=sp.row_end(line); ++c)
-        deallog << *c << " ";
+      for (CompressedSetSparsityPattern::iterator
+           c = sp.begin(line); c!=sp.end(line); ++c)
+        deallog << c->column() << " ";
       deallog << std::endl;
     }
 

diff --git a/tests/bits/dof_tools_15d_x.cc b/tests/bits/dof_tools_15d_x.cc
index c63b1bfeea53905d2016aa9b61513e3a817e222f..3385500d61529ccc41f4867db3e66788cc496e71 100644 (file)
--- a/tests/bits/dof_tools_15d_x.cc
+++ b/tests/bits/dof_tools_15d_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -72,10 +72,10 @@ check_this (const DoFHandler<dim> &dof_handler)
       block_row = sp.get_row_indices().global_to_local(line);
       for (unsigned int col=0; col<n_blocks; ++col)
         {
-          for (CompressedSetSparsityPattern::row_iterator
-               c = sp.block(block_row.first,col).row_begin(block_row.second);
-               c!=sp.block(block_row.first,col).row_end(block_row.second); ++c)
-            deallog << *c
+          for (CompressedSetSparsityPattern::iterator
+               c = sp.block(block_row.first,col).begin(block_row.second);
+               c!=sp.block(block_row.first,col).end(block_row.second); ++c)
+            deallog << c->column()
                     << " ";
           deallog << std::endl;
         }

diff --git a/tests/bits/dof_tools_16b_x.cc b/tests/bits/dof_tools_16b_x.cc
index 6219cd2678114dc7888f17a503ca93dc44814833..de98f338469f0b88f056b48b121942a8262873f3 100644 (file)
--- a/tests/bits/dof_tools_16b_x.cc
+++ b/tests/bits/dof_tools_16b_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -57,9 +57,9 @@ check_this (const DoFHandler<dim> &dof_handler)
   for (unsigned int l=0; l<20; ++l)
     {
       const unsigned int line = l*(sp.n_rows()/20);
-      for (CompressedSetSparsityPattern::row_iterator
-           c = sp.row_begin(line); c!=sp.row_end(line); ++c)
-        deallog << *c << " ";
+      for (CompressedSetSparsityPattern::iterator
+           c = sp.begin(line); c!=sp.end(line); ++c)
+        deallog << c->column() << " ";
       deallog << std::endl;
     }
 

diff --git a/tests/bits/dof_tools_16d_x.cc b/tests/bits/dof_tools_16d_x.cc
index 7d082da01ee224d65bffacbf87a5f6d7de218f3d..d141d224085d2736ba405325d4426426cbc2b5e8 100644 (file)
--- a/tests/bits/dof_tools_16d_x.cc
+++ b/tests/bits/dof_tools_16d_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -79,10 +79,10 @@ check_this (const DoFHandler<dim> &dof_handler)
       block_row = sp.get_row_indices().global_to_local(line);
       for (unsigned int col=0; col<n_blocks; ++col)
         {
-          for (CompressedSetSparsityPattern::row_iterator
-               c = sp.block(block_row.first,col).row_begin(block_row.second);
-               c!=sp.block(block_row.first,col).row_end(block_row.second); ++c)
-            deallog << *c
+          for (CompressedSetSparsityPattern::iterator
+               c = sp.block(block_row.first,col).begin(block_row.second);
+               c!=sp.block(block_row.first,col).end(block_row.second); ++c)
+            deallog << c->column()
                     << " ";
           deallog << std::endl;
         }

diff --git a/tests/bits/dof_tools_17b_x.cc b/tests/bits/dof_tools_17b_x.cc
index 68bd97bd279f1bf0b77930eb3772ed911fdeb276..79543a0cca95303d9408fd4886792fa1eb00dbbd 100644 (file)
--- a/tests/bits/dof_tools_17b_x.cc
+++ b/tests/bits/dof_tools_17b_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -42,9 +42,9 @@ check_this (const DoFHandler<dim> &dof_handler)
   for (unsigned int l=0; l<20; ++l)
     {
       const unsigned int line = l*(sp.n_rows()/20);
-      for (CompressedSetSparsityPattern::row_iterator
-           c = sp.row_begin(line); c!=sp.row_end(line); ++c)
-        deallog << *c << " ";
+      for (CompressedSetSparsityPattern::iterator
+           c = sp.begin(line); c!=sp.end(line); ++c)
+        deallog << c->column() << " ";
       deallog << std::endl;
     }
 

diff --git a/tests/bits/dof_tools_17d_x.cc b/tests/bits/dof_tools_17d_x.cc
index 7c8a6d4f31108bc9295c644f0d2170987c96db34..6d28c91a358e694f69d8422578acfee582326c96 100644 (file)
--- a/tests/bits/dof_tools_17d_x.cc
+++ b/tests/bits/dof_tools_17d_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -66,10 +66,10 @@ check_this (const DoFHandler<dim> &dof_handler)
       block_row = sp.get_row_indices().global_to_local(line);
       for (unsigned int col=0; col<n_components; ++col)
         {
-          for (CompressedSetSparsityPattern::row_iterator
-               c = sp.block(block_row.first,col).row_begin(block_row.second);
-               c!=sp.block(block_row.first,col).row_end(block_row.second); ++c)
-            deallog << *c
+          for (CompressedSetSparsityPattern::iterator
+               c = sp.block(block_row.first,col).begin(block_row.second);
+               c!=sp.block(block_row.first,col).end(block_row.second); ++c)
+            deallog << c->column()
                     << " ";
           deallog << std::endl;
         }

diff --git a/tests/bits/dof_tools_18b_x.cc b/tests/bits/dof_tools_18b_x.cc
index d455f9c8d985d12dfbdd21508a116b8777887d74..b529cdd6160994ed906498a36e016541f93edd56 100644 (file)
--- a/tests/bits/dof_tools_18b_x.cc
+++ b/tests/bits/dof_tools_18b_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -69,9 +69,9 @@ my_check_this (const DoFHandler<dim> &dof_handler)
   for (unsigned int l=0; l<20; ++l)
     {
       const unsigned int line = l*(sp.n_rows()/20);
-      for (CompressedSetSparsityPattern::row_iterator
-           c = sp.row_begin(line); c!=sp.row_end(line); ++c)
-        deallog << *c << " ";
+      for (CompressedSetSparsityPattern::iterator
+           c = sp.begin(line); c!=sp.end(line); ++c)
+        deallog << c->column() << " ";
       deallog << std::endl;
     }
 

diff --git a/tests/bits/dof_tools_18d_x.cc b/tests/bits/dof_tools_18d_x.cc
index e487d2f82d70596edfa0a5aff5bd9415735d21f0..9897ae4fb34508dfee30be16be71be772cb9afa1 100644 (file)
--- a/tests/bits/dof_tools_18d_x.cc
+++ b/tests/bits/dof_tools_18d_x.cc
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2003 - 2014 by the deal.II authors
+// Copyright (C) 2003 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -93,10 +93,10 @@ my_check_this (const DoFHandler<dim> &dof_handler)
       block_row = sp.get_row_indices().global_to_local(line);
       for (unsigned int col=0; col<n_components; ++col)
         {
-          for (CompressedSetSparsityPattern::row_iterator
-               c = sp.block(block_row.first,col).row_begin(block_row.second);
-               c!=sp.block(block_row.first,col).row_end(block_row.second); ++c)
-            deallog << *c
+          for (CompressedSetSparsityPattern::iterator
+               c = sp.block(block_row.first,col).begin(block_row.second);
+               c!=sp.block(block_row.first,col).end(block_row.second); ++c)
+            deallog << c->column()
                     << " ";
           deallog << std::endl;
         }

diff --git a/tests/deal.II/block_list.h b/tests/deal.II/block_list.h
index 95bd3a383523345a7eef31f6244ae05cfa880e09..f3c555620508550e4be91276b2c03182cf27fbdd 100644 (file)
--- a/tests/deal.II/block_list.h
+++ b/tests/deal.II/block_list.h
@@ -36,8 +36,8 @@ print_patches (const SparsityPattern &bl)
     {
       deallog << "Block " << std::setw(3) << i;
       std::vector<unsigned int> entries;
-      for (SparsityPattern::row_iterator b = bl.row_begin(i); b != bl.row_end(i); ++b)
-        entries.push_back(*b);
+      for (SparsityPattern::iterator b = bl.begin(i); b != bl.end(i); ++b)
+        entries.push_back(b->column());
 
       std::sort(entries.begin(), entries.end());
 

diff --git a/tests/deal.II/block_list_01.cc b/tests/deal.II/block_list_01.cc
index 5a0b932b68e322a48ccf8e46c08e611adb2d1e74..6dbe87ef526d004ab35e37e1f181dc1356284b58 100644 (file)
--- a/tests/deal.II/block_list_01.cc
+++ b/tests/deal.II/block_list_01.cc
@@ -36,8 +36,8 @@ test_block_list(const Triangulation<dim> &tr, const FiniteElement<dim> &fe)
     {
       deallog << "Block " << std::setw(3) << i;
       std::vector<unsigned int> entries;
-      for (SparsityPattern::row_iterator b = bl.row_begin(i); b != bl.row_end(i); ++b)
-        entries.push_back(*b);
+      for (SparsityPattern::iterator b = bl.begin(i); b != bl.end(i); ++b)
+        entries.push_back(b->column());
 
       std::sort(entries.begin(), entries.end());