Remove deprecated functions SparsityPattern::get_rowstart_indices and SparsityPattern...

These functions have also been deprecated for more than a decade as they leak the storage format of SparsityPattern to the outside.

diff --git a/doc/news/changes.h b/doc/news/changes.h
index b449e56bd7e7343786a501ffc08e954bb346385c..b4c7022516437ec9374ed52cabdc7bc569f16b93 100644 (file)
--- a/doc/news/changes.h
+++ b/doc/news/changes.h
@@ -171,6 +171,8 @@ inconvenience this causes.
   - SparsityPattern and ChunkSparsityPattern functions that take an
     <code>optimize_diagonal</code> argument.
   - SparsityPattern::partition.
+  - SparsityPattern::get_rowstart_indices and
+    SparsityPattern::get_column_numbers.
   - The typedef CompressedBlockSparsityPattern.
   - The deprecated constructors of SparsityPattern iterator classes.
   - The deprecated variants of DoFTools::make_periodicity_constraints.

diff --git a/include/deal.II/lac/sparsity_pattern.h b/include/deal.II/lac/sparsity_pattern.h
index d213d719454bb9d64309082a5bc178bc6bc8f151..1f5f31ae9753da07b83ca9fbe5299bbc68465383 100644 (file)
--- a/include/deal.II/lac/sparsity_pattern.h
+++ b/include/deal.II/lac/sparsity_pattern.h
@@ -1,6 +1,6 @@
 // ---------------------------------------------------------------------
 //
-// Copyright (C) 2000 - 2014 by the deal.II authors
+// Copyright (C) 2000 - 2015 by the deal.II authors
 //
 // This file is part of the deal.II library.
 //
@@ -986,45 +986,6 @@ public:
    */
   row_iterator row_end (const size_type r) const DEAL_II_DEPRECATED;
 
-  /**
-   * @deprecated This is kind of an expert mode. Get access to the rowstart
-   * array, but read-only.
-   *
-   * Use of this function is highly deprecated. Use @p row_length and @p
-   * column_number instead. Also, using iterators may get you most of the
-   * information you may want.
-   *
-   * Though the return value is declared <tt>const</tt>, you should be aware
-   * that it may change if you call any nonconstant function of objects which
-   * operate on it.
-   *
-   * You should use this interface very carefully and only if you are
-   * absolutely sure to know what you do. You should also note that the
-   * structure of these arrays may change over time.  If you change the layout
-   * yourself, you should also rename this function to avoid programs relying
-   * on outdated information!
-   */
-  const std::size_t *get_rowstart_indices () const DEAL_II_DEPRECATED;
-
-  /**
-   * @deprecated. Use @p row_length and @p column_number instead. Also, using
-   * iterators may get you most of the information you may want.
-   *
-   * This is kind of an expert mode: get access to the colnums array, but
-   * readonly.
-   *
-   * Though the return value is declared <tt>const</tt>, you should be aware
-   * that it may change if you call any nonconstant function of objects which
-   * operate on it.
-   *
-   * You should use this interface very carefully and only if you are
-   * absolutely sure to know what you do. You should also note that the
-   * structure of these arrays may change over time. If you change the layout
-   * yourself, you should also rename this function to avoid programs relying
-   * on outdated information!
-   */
-  const size_type *get_column_numbers () const DEAL_II_DEPRECATED;
-
 // @}
 
   BOOST_SERIALIZATION_SPLIT_MEMBER()
@@ -1462,22 +1423,6 @@ SparsityPattern::stores_only_added_elements () const
 }
 
 
-inline
-const std::size_t *
-SparsityPattern::get_rowstart_indices () const
-{
-  return rowstart;
-}
-
-
-inline
-const SparsityPattern::size_type *
-SparsityPattern::get_column_numbers () const
-{
-  return colnums;
-}
-
-
 
 inline
 unsigned int

diff --git a/tests/bits/dof_tools_01a.cc b/tests/bits/dof_tools_01a.cc
index 33caec77b82f2e5a616e0e61dff0e5ab9f968400..26a89598349ad6936e45b900e12a6d224f682605 100644 (file)
--- a/tests/bits/dof_tools_01a.cc
+++ b/tests/bits/dof_tools_01a.cc
@@ -57,9 +57,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_01a_constraints_false.cc b/tests/bits/dof_tools_01a_constraints_false.cc
index 445cf83beef2deb50bf11fe9c8b24db78bcf9231..e331488fd7ce776d73c03d1f170512faacdf32b5 100644 (file)
--- a/tests/bits/dof_tools_01a_constraints_false.cc
+++ b/tests/bits/dof_tools_01a_constraints_false.cc
@@ -63,9 +63,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_01a_constraints_true.cc b/tests/bits/dof_tools_01a_constraints_true.cc
index 42f42295129ba40356068082643ee6e8fed09944..49775e2672b0ea7011a7b7f169074f1d5a8a9b7c 100644 (file)
--- a/tests/bits/dof_tools_01a_constraints_true.cc
+++ b/tests/bits/dof_tools_01a_constraints_true.cc
@@ -63,9 +63,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_01a_subdomain.cc b/tests/bits/dof_tools_01a_subdomain.cc
index 202608a3f7ada2368472604a4df57b9f5419ad8d..8598c37564a064aaa0e38ee8967b0d264549ad99 100644 (file)
--- a/tests/bits/dof_tools_01a_subdomain.cc
+++ b/tests/bits/dof_tools_01a_subdomain.cc
@@ -64,9 +64,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_02a.cc b/tests/bits/dof_tools_02a.cc
index d4ca5da944d40314c6c694d1f403cf22c0bad261..cd5ccf09b8c47aae8ddc825ca2e47e561ba61df5 100644 (file)
--- a/tests/bits/dof_tools_02a.cc
+++ b/tests/bits/dof_tools_02a.cc
@@ -67,9 +67,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_02a_constraints_false.cc b/tests/bits/dof_tools_02a_constraints_false.cc
index fa3b229cb1d4ee58b7569e24a1ff60c34a7f6523..a6373d1bc6e18eb66b0ddbcb23c5f88e4cf018ec 100644 (file)
--- a/tests/bits/dof_tools_02a_constraints_false.cc
+++ b/tests/bits/dof_tools_02a_constraints_false.cc
@@ -73,9 +73,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_02a_constraints_true.cc b/tests/bits/dof_tools_02a_constraints_true.cc
index ae1758a266d94684e4bc34b43429bd2770d10431..463662484ca804b7772d99bb7c3c548ed547b3ab 100644 (file)
--- a/tests/bits/dof_tools_02a_constraints_true.cc
+++ b/tests/bits/dof_tools_02a_constraints_true.cc
@@ -73,9 +73,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_02a_subdomain.cc b/tests/bits/dof_tools_02a_subdomain.cc
index 4f218b5c9ddbace6239d5d16321cc6902966c11d..a944c0e66357d7748a7b7d7a36afb3d153cee23b 100644 (file)
--- a/tests/bits/dof_tools_02a_subdomain.cc
+++ b/tests/bits/dof_tools_02a_subdomain.cc
@@ -75,9 +75,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_15a.cc b/tests/bits/dof_tools_15a.cc
index ffd9d8505004de3c7351a2fc4df33b629816291d..e2dea1e61abd574428ceed08c77692b2f821a350 100644 (file)
--- a/tests/bits/dof_tools_15a.cc
+++ b/tests/bits/dof_tools_15a.cc
@@ -66,9 +66,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_16a.cc b/tests/bits/dof_tools_16a.cc
index 9ede31b6985f3ab45e4c16e64edf25c8f8052cbf..ee4259091f59436792240cef2b5470941bf012db 100644 (file)
--- a/tests/bits/dof_tools_16a.cc
+++ b/tests/bits/dof_tools_16a.cc
@@ -72,9 +72,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_17a.cc b/tests/bits/dof_tools_17a.cc
index 09ba7c8dfa4a8db109108439b4632550c12c841b..92a3774270fe5d60bbe3609b6d41fe6075b39c56 100644 (file)
--- a/tests/bits/dof_tools_17a.cc
+++ b/tests/bits/dof_tools_17a.cc
@@ -57,9 +57,7 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }

diff --git a/tests/bits/dof_tools_18a.cc b/tests/bits/dof_tools_18a.cc
index 19cd178e0e900c0557b19d24f0791f30356d662d..986a72bcef8a2e8cc25c69cf3d8d9cce301f2eab 100644 (file)
--- a/tests/bits/dof_tools_18a.cc
+++ b/tests/bits/dof_tools_18a.cc
@@ -83,10 +83,8 @@ my_check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }
 

diff --git a/tests/bits/dof_tools_18a_1d.cc b/tests/bits/dof_tools_18a_1d.cc
index b9cbae5afa93a2b3443e4ae262ffa8d6ba9f1077..b6e79894bca5241d5893a6c584388c04acc6c0cc 100644 (file)
--- a/tests/bits/dof_tools_18a_1d.cc
+++ b/tests/bits/dof_tools_18a_1d.cc
@@ -84,10 +84,8 @@ check_this (const DoFHandler<dim> &dof_handler)
   unsigned int hash = 0;
   for (unsigned int l=0; l<sp.n_rows(); ++l)
     hash += l*(sp.row_length(l) +
-               sp.get_rowstart_indices()[l] +
-               sp.get_column_numbers()[sp.get_rowstart_indices()[l]
-                                       +
-                                       (sp.row_length(l)>1 ? 1 : 0)]);
+               (sp.begin(l)-sp.begin()) +
+               (sp.row_length(l)>1 ? ++sp.begin(l) : sp.begin(l))->column());
   deallog << hash << std::endl;
 }
 

diff --git a/tests/lac/sparsity_pattern.cc b/tests/lac/sparsity_pattern.cc
index b657a0ef219d3df6a0996f47914feece0ef3fd07..2f365245a6e2db65c7a70bceb2b6542185e3da46 100644 (file)
--- a/tests/lac/sparsity_pattern.cc
+++ b/tests/lac/sparsity_pattern.cc
@@ -86,9 +86,8 @@ main ()
   for (unsigned int row=0; row<sp3.n_rows(); ++row)
     {
       sparsity.push_back (std::set<unsigned int,std::greater<unsigned int> >());
-      for (const types::global_dof_index *p=sp3.get_column_numbers()+sp3.get_rowstart_indices()[row];
-           p != sp3.get_column_numbers()+sp3.get_rowstart_indices()[row+1]; ++p)
-        sparsity.back().insert (*p);
+      for (SparsityPattern::const_iterator p=sp3.begin(row); p!=sp3.end(row); ++p)
+        sparsity.back().insert (p->column());
     };
   SparsityPattern sp4;
   sp4.copy_from ((N-1)*(N-1), (N-1)*(N-1),
@@ -97,14 +96,9 @@ main ()
   // now check for equivalence of sp3 and sp4
   for (unsigned int row=0; row<sp3.n_rows(); ++row)
     {
-      const types::global_dof_index
-      *sp3_p=sp3.get_column_numbers()+sp3.get_rowstart_indices()[row];
-      const types::global_dof_index
-      *sp4_p=sp4.get_column_numbers()+sp4.get_rowstart_indices()[row];
-      for (; sp3_p != (sp3.get_column_numbers() +
-                       sp3.get_rowstart_indices()[row+1]);
-           ++sp3_p, ++sp4_p)
-        Assert (*sp3_p == *sp4_p, ExcInternalError());
+      SparsityPattern::const_iterator p3=sp3.begin(row), p4=sp4.begin(row);
+      for (; p3!=sp3.end(row); ++p3, ++p4)
+        Assert (p3->column() == p4->column(), ExcInternalError());
     };
 
 
@@ -159,15 +153,10 @@ main ()
 
   for (unsigned int row=0; row<sp3.n_rows(); ++row)
     {
-      const types::global_dof_index
-      *sp3_p=sp3.get_column_numbers()+sp3.get_rowstart_indices()[row];
-      const types::global_dof_index
-      *sp5_p=sp5.get_column_numbers()+sp5.get_rowstart_indices()[row];
-      for (; sp3_p != (sp3.get_column_numbers() +
-                       sp3.get_rowstart_indices()[row+1]);
-           ++sp3_p, ++sp5_p)
-        Assert (*sp3_p == *sp5_p, ExcInternalError());
-    };
+      SparsityPattern::const_iterator p3=sp3.begin(row), p5=sp5.begin(row);
+      for (; p3!=sp3.end(row); ++p3, ++p5)
+        Assert (p3->column() == p5->column(), ExcInternalError());
+    }
 }