boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-01-30 07:52:10 +00:00
Code Issues Projects Releases Wiki Activity

Added more comprehensive CSR tests, and fixed a few m_last_source-related bugs

Browse Source 
[SVN r31897]
This commit is contained in:
Jeremiah Willcock
2005-12-04 05:28:26 +00:00
parent 29d60b8e6a
commit 6fe01d0c4c
2 changed files with 40 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/boost/graph/compressed_sparse_row_graph.hpp
View File

@@ -440,7 +440,7 @@ class compressed_sparse_row_graph
std::vector<EdgeIndex> m_rowstart;
std::vector<Vertex> m_column;
GraphProperty m_property;
Vertex m_last_source;
Vertex m_last_source; // Last source of added edge, plus one
};
template<typename Vertex, typename EdgeIndex>
@@ -483,10 +483,11 @@ add_vertices(Vertex count, BOOST_CSR_GRAPH_TYPE& g) {
template<BOOST_CSR_GRAPH_TEMPLATE_PARMS>
inline typename BOOST_CSR_GRAPH_TYPE::edge_descriptor
add_edge(Vertex src, Vertex tgt, BOOST_CSR_GRAPH_TYPE& g) {
assert (src >= g.m_last_source);
assert (src >= g.m_last_source - 1 && src < num_vertices(g));
assert (tgt < num_vertices(g));
EdgeIndex num_edges_orig = g.m_column.size();
for (; g.m_last_source < src; ++g.m_last_source)
g.m_rowstart[g.m_last_source + 1] = num_edges_orig;
for (; g.m_last_source <= src; ++g.m_last_source)
g.m_rowstart[g.m_last_source] = num_edges_orig;
g.m_rowstart[src + 1] = num_edges_orig + 1;
g.m_column.push_back(tgt);
return typename BOOST_CSR_GRAPH_TYPE::edge_descriptor(src, num_edges_orig);
@@ -638,6 +639,7 @@ inline typename BOOST_CSR_GRAPH_TYPE::edge_descriptor
edge_from_index(EdgeIndex idx, const BOOST_CSR_GRAPH_TYPE& g)
{
typedef typename std::vector<EdgeIndex>::const_iterator row_start_iter;
assert (idx < num_edges(g));
row_start_iter src_plus_1 =
std::upper_bound(g.m_rowstart.begin(),
g.m_rowstart.begin() + g.m_last_source + 1,