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

Merged more changes (bug fixes, especially hopefully fixing the VC++ test failure) from trunk

Browse Source 
[SVN r79390]
This commit is contained in:
Jeremiah Willcock
2012-07-09 20:07:47 +00:00
parent 708d8b62a5
commit 6604e3a013
3 changed files with 100 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/implicit_graph.cpp
View File

@@ -95,6 +95,12 @@ namespace boost {
typedef edge_weight_map type;
typedef edge_weight_map const_type;
};
template<>
struct property_map< const ring_graph, edge_weight_t > {
typedef edge_weight_map type;
typedef edge_weight_map const_type;
};
}
// Tag values that specify the traversal type in graph::traversal_category.
@@ -374,7 +380,7 @@ edges_size_type num_edges(const ring_graph& g) {
// AdjacencyMatrix valid expressions
std::pair<edge_descriptor, bool>
edge(vertex_descriptor u, vertex_descriptor v, const ring_graph& g) {
if (abs(u-v) == 1 &&
if ((u == v + 1 || v == u + 1) &&
u >= 0 && u < num_vertices(g) && v >= 0 && v < num_vertices(g))
return std::pair<edge_descriptor, bool>(edge_descriptor(u, v), true);
else