From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Thu, 31 Jul 2008 17:29:18 +0000 (+0000)
Subject: Implement CompressedSparsityPattern::print.
X-Git-Tag: v8.0.0~8966
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c9bb191a1ab51321c032564c5f567260c0b5bcbc;p=dealii.git

Implement CompressedSparsityPattern::print.

git-svn-id: https://svn.dealii.org/trunk@16466 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/doc/news/changes.h b/deal.II/doc/news/changes.h
index 20065bbda1..a66dfc5a5b 100644
--- a/deal.II/doc/news/changes.h
+++ b/deal.II/doc/news/changes.h
@@ -199,12 +199,21 @@ inconvenience this causes.
 <h3>lac</h3>
 
 <ol>
+  <li>
+  <p>
+  Fixed: There is now a function CompressedSparsityPattern::print, in analogy
+  to SparsityPattern::print
+  <br>
+  (WB 2008/07/31)
+  <li>
+
   <li>
   <p>
   Fixed: The FullMatrix::copy_from(FullMatrix,bool) function had a bug
   that resulted in an exception being triggered whenever the given matrix
   had rows where the diagonal element is zero and the second parameter
   to the function was set to <code>true</code>. This is now fixed.
+  <br>
   (WB 2008/07/30)
   <li>
 </ol>
diff --git a/deal.II/lac/include/lac/compressed_sparsity_pattern.h b/deal.II/lac/include/lac/compressed_sparsity_pattern.h
index 0a4e6dba2c..92e4e91ea7 100644
--- a/deal.II/lac/include/lac/compressed_sparsity_pattern.h
+++ b/deal.II/lac/include/lac/compressed_sparsity_pattern.h
@@ -211,6 +211,17 @@ class CompressedSparsityPattern : public Subscriptor
 				      */
     void symmetrize ();
     
+				     /**
+				      * Print the sparsity of the
+				      * matrix. The output consists of
+				      * one line per row of the format
+				      * <tt>[i,j1,j2,j3,...]</tt>. <i>i</i>
+				      * is the row number and
+				      * <i>jn</i> are the allocated
+				      * columns in this row.
+				      */
+    void print (std::ostream &out) const;
+
 				     /**
 				      * Print the sparsity of the matrix in a
 				      * format that @p gnuplot understands and
diff --git a/deal.II/lac/source/compressed_sparsity_pattern.cc b/deal.II/lac/source/compressed_sparsity_pattern.cc
index 34a78c3e19..bf48e0818a 100644
--- a/deal.II/lac/source/compressed_sparsity_pattern.cc
+++ b/deal.II/lac/source/compressed_sparsity_pattern.cc
@@ -2,7 +2,7 @@
 //    $Id$
 //    Version: $Name$
 //
-//    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 by the deal.II authors
+//    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 by the deal.II authors
 //
 //    This file is subject to QPL and may not be  distributed
 //    without copyright and license information. Please refer
@@ -329,6 +329,29 @@ CompressedSparsityPattern::symmetrize ()
 
 
 
+void
+CompressedSparsityPattern::print (std::ostream &out) const
+{ 
+  for (unsigned int row=0; row<rows; ++row)
+    {
+      if (lines[row].cache_entries != 0)
+	lines[row].flush_cache ();
+
+      out << row << ' ';
+      
+      for (std::vector<unsigned int>::const_iterator
+             j=lines[row].entries.begin();
+           j != lines[row].entries.end(); ++j)
+        out << *j << ' ';
+
+      out << std::endl;
+    }
+
+  AssertThrow (out, ExcIO());
+}
+
+
+
 void
 CompressedSparsityPattern::print_gnuplot (std::ostream &out) const
 { 
@@ -345,8 +368,7 @@ CompressedSparsityPattern::print_gnuplot (std::ostream &out) const
                                          // x-y, that is we have to exchange
                                          // the order of output
         out << *j << " " << -static_cast<signed int>(row) << std::endl;
-    }
-      
+    }      
 
   AssertThrow (out, ExcIO());
 }