boost/ublas
2
0
Fork 0
mirror of https://github.com/boostorg/ublas.git synced 2026-02-18 02:22:13 +00:00
Code Issues Projects Releases Wiki Activity

fix #2195:

Browse Source 
* merged changes into release branch


[SVN r56605]
This commit is contained in:
Gunter Winkler
2009-10-05 21:41:32 +00:00
parent 9cbdbcf472
commit 7bc229dcf9
4 changed files with 104 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/numeric/ublas/matrix_sparse.hpp
View File

@@ -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));

1
test/CMakeLists.txt
View File

@@ -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

2
test/Jamfile.v2
View File

@@ -114,4 +114,6 @@ test-suite numeric/uBLAS
]
[ run triangular_layout.cpp
]
[ run comp_mat_erase.cpp
]
;

100
test/comp_mat_erase.cpp Normal file
View File

@@ -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 );
}