boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-02-01 08:32:11 +00:00
Code Issues Projects Releases Wiki Activity

Applied changes r58876, r59133, r59134, r59628, r60078, r60079, r60126, r60127, r60196, r60197, r60198, r60365, r60366, r60384, r60385, r60472, r60485, r60610, r60611, r60651, r60769, r60770, r60899, r60900, r60916, r60919, r60920, r60958, r60998, r60999, r61000 from trunk, except for changes to <boost/detail/algorithm.hpp> which are waiting for Boost.Range algorithms to be merged; added find_if to <boost/detail/algorithm.hpp>

Browse Source 
[SVN r61001]
This commit is contained in:
Jeremiah Willcock
2010-04-02 15:25:11 +00:00
parent afab978e75
commit 7b548b372f
64 changed files with 1898 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
test/csr_graph_test.cpp
View File

@@ -19,6 +19,7 @@
#include <boost/graph/erdos_renyi_generator.hpp>
#include <boost/graph/graph_utility.hpp>
#include <boost/random/linear_congruential.hpp>
#include <boost/concept_check.hpp> // for ignore_unused_variable_warning
#include <cassert>
#include <iostream>
#include <vector>
@@ -43,10 +44,15 @@ struct VertexData
int index;
};
typedef boost::compressed_sparse_row_graph<boost::directedS, VertexData>
struct EdgeData
{
int index_e;
};
typedef boost::compressed_sparse_row_graph<boost::directedS, VertexData, EdgeData>
CSRGraphT;
typedef boost::compressed_sparse_row_graph<boost::bidirectionalS, VertexData>
typedef boost::compressed_sparse_row_graph<boost::bidirectionalS, VertexData, EdgeData>
BidirCSRGraphT;
template <class G1, class VI1, class G2, class VI2, class IsomorphismMap>
@@ -423,6 +429,27 @@ int test_main(int argc, char* argv[])
std::cout << "Testing CSR graph built from unsorted edges" << std::endl;
std::pair<int, int> unsorted_edges[] = {std::make_pair(5, 0), std::make_pair(3, 2), std::make_pair(4, 1), std::make_pair(4, 0), std::make_pair(0, 2), std::make_pair(5, 2)};
CSRGraphT g(boost::edges_are_unsorted, unsorted_edges, unsorted_edges + sizeof(unsorted_edges) / sizeof(*unsorted_edges), 6);
// Test vertex and edge bundle access
boost::ignore_unused_variable_warning(
(VertexData&)get(get(boost::vertex_bundle, g), vertex(0, g)));
boost::ignore_unused_variable_warning(
(const VertexData&)get(get(boost::vertex_bundle, (const CSRGraphT&)g), vertex(0, g)));
boost::ignore_unused_variable_warning(
(VertexData&)get(boost::vertex_bundle, g, vertex(0, g)));
boost::ignore_unused_variable_warning(
(const VertexData&)get(boost::vertex_bundle, (const CSRGraphT&)g, vertex(0, g)));
put(boost::vertex_bundle, g, vertex(0, g), VertexData());
boost::ignore_unused_variable_warning(
(EdgeData&)get(get(boost::edge_bundle, g), *edges(g).first));
boost::ignore_unused_variable_warning(
(const EdgeData&)get(get(boost::edge_bundle, (const CSRGraphT&)g), *edges(g).first));
boost::ignore_unused_variable_warning(
(EdgeData&)get(boost::edge_bundle, g, *edges(g).first));
boost::ignore_unused_variable_warning(
(const EdgeData&)get(boost::edge_bundle, (const CSRGraphT&)g, *edges(g).first));
put(boost::edge_bundle, g, *edges(g).first, EdgeData());
CSRGraphT g2(boost::edges_are_unsorted_multi_pass, unsorted_edges, unsorted_edges + sizeof(unsorted_edges) / sizeof(*unsorted_edges), 6);
graph_test(g);
graph_test(g2);
@@ -439,7 +466,7 @@ int test_main(int argc, char* argv[])
// Test building a graph using add_edges on unsorted lists
CSRGraphT g3(boost::edges_are_unsorted, unsorted_edges, unsorted_edges, 6); // Empty range
add_edges(unsorted_edges, unsorted_edges + 3, g3);
boost::no_property edge_data[3];
EdgeData edge_data[3];
add_edges(unsorted_edges + 3, unsorted_edges + 6, edge_data, edge_data + 3, g3);
graph_test(g3);
assert_graphs_equal(g, boost::identity_property_map(),