From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Tue, 5 Feb 2013 20:24:56 +0000 (+0000)
Subject: Improve add_entries function a little.
X-Git-Tag: v8.0.0~1431
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc09c658a5e93205a8af49b1a4eb20ce8c584194;p=dealii.git

Improve add_entries function a little.

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

diff --git a/deal.II/source/lac/sparsity_pattern.cc b/deal.II/source/lac/sparsity_pattern.cc
index 3b2c76a383..c67b58d454 100644
--- a/deal.II/source/lac/sparsity_pattern.cc
+++ b/deal.II/source/lac/sparsity_pattern.cc
@@ -848,12 +848,11 @@ SparsityPattern::add (const unsigned int i,
   Assert (j<cols, ExcIndexRange(j,0,cols));
   Assert (compressed==false, ExcMatrixIsCompressed());
 
-  for (unsigned int k=rowstart[i]; k<rowstart[i+1]; k++)
+  for (std::size_t k=rowstart[i]; k<rowstart[i+1]; k++)
     {
       // entry already exists
       if (colnums[k] == j) return;
-      // empty entry found, put new
-      // entry here
+      // empty entry found, put new entry here
       if (colnums[k] == invalid_entry)
         {
           colnums[k] = j;
@@ -861,9 +860,8 @@ SparsityPattern::add (const unsigned int i,
         };
     };
 
-  // if we came thus far, something went
-  // wrong: there was not enough space
-  // in this line
+  // if we came thus far, something went wrong: there was not enough space in
+  // this line
   Assert (false, ExcNotEnoughSpace(i, rowstart[i+1]-rowstart[i]));
 }
 
@@ -874,11 +872,43 @@ void
 SparsityPattern::add_entries (const unsigned int row,
                               ForwardIterator    begin,
                               ForwardIterator    end,
-                              const bool         /*indices_are_sorted*/)
+                              const bool         indices_are_sorted)
 {
-  // right now, just forward to the other function.
-  for (ForwardIterator it = begin; it != end; ++it)
-    add (row, *it);
+  if (indices_are_sorted == true)
+    {
+      if (begin != end)
+        {
+          ForwardIterator it = begin;
+          bool has_larger_entries = false;
+          std::size_t k=rowstart[row];
+          for ( ; k<rowstart[row+1]; k++)
+            if (colnums[k] == invalid_entry)
+              break;
+            else if (colnums[k] >= *it)
+              {
+                has_larger_entries = true;
+                break;
+              }
+          if (has_larger_entries == false)
+            for ( ; it != end; ++it, ++k)
+              {
+                Assert (k <= rowstart[row+1],
+                        ExcNotEnoughSpace(row, rowstart[row+1]-rowstart[row]));
+                colnums[k] = *it;
+              }
+          else
+            // cannot just append the new range at the end, forward to the
+            // other function
+            for (ForwardIterator it = begin; it != end; ++it)
+              add (row, *it);
+        }
+    }
+  else
+    {
+      // forward to the other function.
+      for (ForwardIterator it = begin; it != end; ++it)
+        add (row, *it);
+    }
 }