From 7bc229dcf9fa9d73d1ebe568cb034573edc00c63 Mon Sep 17 00:00:00 2001
From: Gunter Winkler <guwi17@gmx.de>
Date: Mon, 5 Oct 2009 21:41:32 +0000
Subject: [PATCH] fix #2195:  * merged changes into release branch

[SVN r56605]
---
 include/boost/numeric/ublas/matrix_sparse.hpp |   2 +-
 test/CMakeLists.txt                           |   1 +
 test/Jamfile.v2                               |   2 +
 test/comp_mat_erase.cpp                       | 100 ++++++++++++++++++
 4 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 test/comp_mat_erase.cpp

diff --git a/include/boost/numeric/ublas/matrix_sparse.hpp b/include/boost/numeric/ublas/matrix_sparse.hpp
index 4c24e925..baa3b5a8 100644
--- a/include/boost/numeric/ublas/matrix_sparse.hpp
+++ b/include/boost/numeric/ublas/matrix_sparse.hpp
@@ -2903,7 +2903,7 @@ namespace boost { namespace numeric { namespace ublas {
         void erase_element (size_type i, size_type j) {
             size_type element1 = layout_type::index_M (i, j);
             size_type element2 = layout_type::index_m (i, j);
-            if (element1 + 1 > filled1_)
+            if (element1 + 1 >= filled1_)
                 return;
             vector_subiterator_type itv (index1_data_.begin () + element1);
             subiterator_type it_begin (index2_data_.begin () + zero_based (*itv));
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index adb7b7af..7e2c8703 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -72,6 +72,7 @@ boost_test_run(triangular_access
 boost_test_run(triangular_layout 
   triangular_layout.cpp)
 
+boost_test_run(comp_mat_erase)
 
 SET(test_compile_flags "-DEXTERNAL")
 #-- Intel Compiler flags
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 0bd12e83..7389e6d4 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -114,4 +114,6 @@ test-suite numeric/uBLAS
       ]
       [ run triangular_layout.cpp
       ]
+      [ run comp_mat_erase.cpp
+      ]
     ;
diff --git a/test/comp_mat_erase.cpp b/test/comp_mat_erase.cpp
new file mode 100644
index 00000000..9adb027e
--- /dev/null
+++ b/test/comp_mat_erase.cpp
@@ -0,0 +1,100 @@
+#include "boost/numeric/ublas/matrix_sparse.hpp"
+
+#define BOOST_TEST_MODULE SparseMatrixErasureTest
+#include <boost/test/included/unit_test.hpp>
+
+
+BOOST_AUTO_TEST_CASE( compressed_matrix_erase_after_end )
+{
+    boost::numeric::ublas::compressed_matrix<int, boost::numeric::ublas::row_major > A(2, 2);
+
+    BOOST_CHECK_EQUAL( A.filled1(), 1 );
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+
+    A(0,0) = 1;
+
+    BOOST_CHECK_EQUAL( A.nnz(), 1 );
+    BOOST_CHECK_EQUAL( A.filled1(), 2 );
+
+    // check new element
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.index2_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.value_data()[0], 1 );
+    // check end of list marker
+    BOOST_CHECK_EQUAL( A.index1_data()[1], 1 );
+
+    A.erase_element(1,0);
+
+    BOOST_CHECK_EQUAL( A.nnz(), 1 );
+    BOOST_CHECK_EQUAL( A.filled1(), 2 );
+    BOOST_CHECK_EQUAL( A.filled2(), 1 );
+
+    // check new element
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.index2_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.value_data()[0], 1 );
+    // check end of list marker
+    BOOST_CHECK_EQUAL( A.index1_data()[1], 1 );
+
+    A.erase_element(0,0);
+
+    BOOST_CHECK_EQUAL( A.nnz(), 0 );
+    BOOST_CHECK_EQUAL( A.filled1(), 2 );
+    BOOST_CHECK_EQUAL( A.filled2(), 0 );
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+
+}
+
+BOOST_AUTO_TEST_CASE( compressed_matrix_erase_in_the_middle )
+{
+    boost::numeric::ublas::compressed_matrix<int, boost::numeric::ublas::row_major > A(2, 2);
+
+    BOOST_CHECK_EQUAL( A.filled1(), 1 );
+    BOOST_CHECK_EQUAL( A.filled2(), 0 );
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+
+    A.insert_element(0,1,5);
+
+    BOOST_CHECK_EQUAL( A.filled1(), 2 );
+    BOOST_CHECK_EQUAL( A.filled2(), 1 );
+
+    // check new element
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.index2_data()[0], 1 );
+    BOOST_CHECK_EQUAL( A.value_data()[0], 5 );
+    // check end of list marker
+    BOOST_CHECK_EQUAL( A.index1_data()[1], 1 );
+
+    A.insert_element(0,0,4);
+
+    BOOST_CHECK_EQUAL( A.filled1(), 2 );
+    BOOST_CHECK_EQUAL( A.filled2(), 2 );
+
+    // check new element
+    BOOST_CHECK_EQUAL( A.index2_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.value_data()[0], 4 );
+    // check previous element
+    BOOST_CHECK_EQUAL( A.index2_data()[1], 1 );
+    BOOST_CHECK_EQUAL( A.value_data()[1], 5 );
+    // check end of list marker
+    BOOST_CHECK_EQUAL( A.index1_data()[1], 2 );
+
+    A.erase_element(0,0);
+
+    BOOST_CHECK_EQUAL( A.filled1(), 2 );
+    BOOST_CHECK_EQUAL( A.filled2(), 1 );
+
+    BOOST_CHECK_EQUAL( A.index2_data()[0], 1 );
+    BOOST_CHECK_EQUAL( A.value_data()[0], 5 );
+
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.index1_data()[1], 1 );
+
+    A.erase_element(0,1);
+
+    BOOST_CHECK_EQUAL( A.filled1(), 2 );
+    BOOST_CHECK_EQUAL( A.filled2(), 0 );
+    BOOST_CHECK_EQUAL( A.index1_data()[0], 0 );
+    BOOST_CHECK_EQUAL( A.index1_data()[1], 0 );
+
+}