add string conversion for BlockIndices

diff --git a/include/deal.II/lac/block_indices.h b/include/deal.II/lac/block_indices.h
index 41fafc8acf2c913285fda4f47085e2db361d16b9..60a6c04a8900199242905372de803fb80199646f 100644 (file)
--- a/include/deal.II/lac/block_indices.h
+++ b/include/deal.II/lac/block_indices.h
@@ -21,6 +21,7 @@
 #include <deal.II/base/subscriptor.h>
 #include <deal.II/base/exceptions.h>
 #include <deal.II/base/logstream.h>
+#include <deal.II/base/utilities.h>
 #include <cstddef>
 #include <vector>
 
@@ -116,6 +117,13 @@ public:
    */
   size_type block_size (const unsigned int i) const;
 
+  /**
+   * String representation of the block sizes. The output is of the
+   * form `[nb->b1,b2,b3|s]`, where `nb` is n_blocks(), `s`
+   * is total_size() and `b1` etc. are the values of block_size().
+   */
+  std::string to_string () const;
+
   //@}
 
   /**
@@ -422,6 +430,23 @@ BlockIndices::block_size (const unsigned int block) const
 
 
 
+inline
+std::string
+BlockIndices::to_string () const
+{
+  std::string result = "[" + Utilities::int_to_string(n_blocks) + "->";
+  for (unsigned int i=0; i<n_blocks; ++i)
+    {
+      if (i>0)
+        result += ',';
+      result += Utilities::int_to_string(block_size(i));
+    }
+  result += "|" + Utilities::int_to_string(total_size()) + ']';
+  return result;
+}
+
+
+
 inline
 BlockIndices::size_type
 BlockIndices::block_start (const unsigned int block) const

diff --git a/tests/lac/block_indices.cc b/tests/lac/block_indices.cc
index 092789ffc09c02184cf301b631f8a1d0acac7a8c..480a1f5e2d847697837101d185f20dea23c7119a 100644 (file)
--- a/tests/lac/block_indices.cc
+++ b/tests/lac/block_indices.cc
@@ -31,7 +31,7 @@ void test (const BlockIndices &idx)
   for (unsigned i=0; i<n; ++i)
     deallog << ' ' << idx.block_start(i);
 
-  deallog << std::endl;
+  deallog << std::endl << "string: " << idx.to_string() << std::endl;
 
   for (unsigned int i=0; i<idx.total_size(); ++i)
     {

diff --git a/tests/lac/block_indices.output b/tests/lac/block_indices.output
index 37bef9e515722d187cdeed83187b3d9d6389b2ef..6c898fc60c097f2c38132619b6e80d61f2eadbfc 100644 (file)
--- a/tests/lac/block_indices.output
+++ b/tests/lac/block_indices.output
@@ -5,19 +5,23 @@ DEAL::push:  2:[3 2]->5
 DEAL::empty: 0:[]->0
 DEAL::sizes: 3:[0 0 0]->0
 DEAL::start:    0 0 0
+DEAL::string: [3->0,0,0|0]
 DEAL::
 DEAL::
 DEAL::sizes: 3:[4 4 4]->12
 DEAL::start:    0 4 8
+DEAL::string: [3->4,4,4|12]
 DEAL:: 0:0:0 1:0:1 2:0:2 3:0:3 4:1:0 5:1:1 6:1:2 7:1:3 8:2:0 9:2:1 10:2:2 11:2:3
 DEAL:: 0:0:0 1:0:1 2:0:2 3:0:3 4:1:0 5:1:1 6:1:2 7:1:3 8:2:0 9:2:1 10:2:2 11:2:3
 DEAL::push: 4:[4 4 4 2]->14
 DEAL::push: 5:[4 4 4 2 5]->19
 DEAL::sizes: 6:[4 4 4 2 5 4]->23
 DEAL::start:    0 4 8 12 14 19
+DEAL::string: [6->4,4,4,2,5,4|23]
 DEAL:: 0:0:0 1:0:1 2:0:2 3:0:3 4:1:0 5:1:1 6:1:2 7:1:3 8:2:0 9:2:1 10:2:2 11:2:3 12:3:0 13:3:1 14:4:0 15:4:1 16:4:2 17:4:3 18:4:4 19:5:0 20:5:1 21:5:2 22:5:3
 DEAL:: 0:0:0 1:0:1 2:0:2 3:0:3 4:1:0 5:1:1 6:1:2 7:1:3 8:2:0 9:2:1 10:2:2 11:2:3 12:3:0 13:3:1 14:4:0 15:4:1 16:4:2 17:4:3 18:4:4 19:5:0 20:5:1 21:5:2 22:5:3
 DEAL::sizes: 4:[4 3 2 1]->10
 DEAL::start:    0 4 7 9
+DEAL::string: [4->4,3,2,1|10]
 DEAL:: 0:0:0 1:0:1 2:0:2 3:0:3 4:1:0 5:1:1 6:1:2 7:2:0 8:2:1 9:3:0
 DEAL:: 0:0:0 1:0:1 2:0:2 3:0:3 4:1:0 5:1:1 6:1:2 7:2:0 8:2:1 9:3:0