boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-02-26 16:52:12 +00:00
Code Issues Projects Releases Wiki Activity

Merged change r75431 from trunk; refs #6112

Browse Source 
[SVN r75471]
This commit is contained in:
Jeremiah Willcock
2011-11-13 06:10:55 +00:00
parent 3a546c9418
commit a88250f76f
39 changed files with 120 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/graph/chrobak_payne_drawing.hpp
View File

@@ -240,7 +240,7 @@ namespace boost
(*ordering_begin,0,g,x,delta_x,left,right);
vertex_iterator_t vi, vi_end;
for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
vertex_t v(*vi);
drawing[v].x = x[v];

2
include/boost/graph/closeness_centrality.hpp
View File

@@ -126,7 +126,7 @@ all_closeness_centralities(const Graph& g,
typedef typename property_traits<CentralityMap>::value_type Centrality;
typename graph_traits<Graph>::vertex_iterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
for(boost::tie(i, end) = vertices(g); i != end; ++i) {
DistanceMap dm = get(dist, *i);
Centrality c = closeness_centrality(g, dm, measure);
put(cent, *i, c);

2
include/boost/graph/degree_centrality.hpp
View File

@@ -101,7 +101,7 @@ all_degree_centralities(const Graph& g, CentralityMap cent, Measure measure)
typedef typename property_traits<CentralityMap>::value_type Centrality;
VertexIterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
for(boost::tie(i, end) = vertices(g); i != end; ++i) {
Centrality c = degree_centrality(g, *i, measure);
put(cent, *i, c);
}

2
include/boost/graph/detail/geodesic.hpp
View File

@@ -65,7 +65,7 @@ namespace detail {
// zero, so it shouldn't be too problematic.
Distance ret = init;
VertexIterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
for(boost::tie(i, end) = vertices(g); i != end; ++i) {
Vertex v = *i;
if(get(dist, v) != DistanceNumbers::infinity()) {
ret = combine(ret, get(dist, v));

2
include/boost/graph/geodesic_distance.hpp
View File

@@ -156,7 +156,7 @@ all_mean_geodesics(const Graph& g,
Result inf = numeric_values<Result>::infinity();
Result sum = numeric_values<Result>::zero();
VertexIterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
for(boost::tie(i, end) = vertices(g); i != end; ++i) {
DistanceMap dm = get(dist, *i);
Result r = mean_geodesic(g, dm, measure);
put(geo, *i, r);

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

@@ -33,7 +33,7 @@ namespace boost
{
typename graph_traits<Graph>::vertex_iterator vi, vi_end, inner_vi;
Graph K_5(5);
for(tie(vi,vi_end) = vertices(K_5); vi != vi_end; ++vi)
for(boost::tie(vi,vi_end) = vertices(K_5); vi != vi_end; ++vi)
for(inner_vi = next(vi); inner_vi != vi_end; ++inner_vi)
add_edge(*vi, *inner_vi, K_5);
return K_5;
@@ -47,7 +47,7 @@ namespace boost
vi, vi_end, bipartition_start, inner_vi;
Graph K_3_3(6);
bipartition_start = next(next(next(vertices(K_3_3).first)));
for(tie(vi, vi_end) = vertices(K_3_3); vi != bipartition_start; ++vi)
for(boost::tie(vi, vi_end) = vertices(K_3_3); vi != bipartition_start; ++vi)
for(inner_vi= bipartition_start; inner_vi != vi_end; ++inner_vi)
add_edge(*vi, *inner_vi, K_3_3);
return K_3_3;
@@ -158,7 +158,7 @@ namespace boost
{
vertex_iterator_t vi, vi_end;
for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
vertex_t v(*vi);
@@ -242,7 +242,7 @@ namespace boost
if (max_size == 3)
{
// check to see whether we should go on to find a K_5
for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
if (neighbors[*vi].size() == 4)
{
target_graph = detail::tg_k_5;
@@ -261,7 +261,7 @@ namespace boost
v_list_t main_vertices;
vertex_iterator_t vi, vi_end;
for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
if (!neighbors[*vi].empty())
main_vertices.push_back(*vi);

2
include/boost/graph/is_straight_line_drawing.hpp
View File

@@ -126,7 +126,7 @@ namespace boost
active_map_t active_edges;
edge_iterator_t ei, ei_end;
for(tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
for(boost::tie(ei,ei_end) = edges(g); ei != ei_end; ++ei)
{
edge_t e(*ei);
vertex_t s(source(e,g));

4
include/boost/graph/make_maximal_planar.hpp
View File

@@ -62,7 +62,7 @@ namespace boost
degree(degree_vector.begin(), vm)
{
vertex_iterator_t vi, vi_end;
for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
put(degree, *vi, out_degree(*vi, g));
}
@@ -117,7 +117,7 @@ namespace boost
// Mark all of the min degree vertex's neighbors
adjacency_iterator_t ai, ai_end;
for(tie(ai,ai_end) = adjacent_vertices(vertices_on_face.front(),g);
for(boost::tie(ai,ai_end) = adjacent_vertices(vertices_on_face.front(),g);
ai != ai_end; ++ai
)
{

2
include/boost/graph/planar_canonical_ordering.hpp
View File

@@ -67,7 +67,7 @@ namespace boost
vertex_t first_vertex = *vertices(g).first;
vertex_t second_vertex;
adjacency_iterator_t ai, ai_end;
for(tie(ai,ai_end) = adjacent_vertices(first_vertex,g); ai != ai_end; ++ai)
for(boost::tie(ai,ai_end) = adjacent_vertices(first_vertex,g); ai != ai_end; ++ai)
{
if (*ai == first_vertex)
continue;

4
include/boost/graph/planar_face_traversal.hpp
View File

@@ -98,7 +98,7 @@ namespace boost
// PlanarEmbedding so that get(next_edge, e)[v] is the edge that comes
// after e in the clockwise embedding around vertex v.
for(tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
for(boost::tie(vi,vi_end) = vertices(g); vi != vi_end; ++vi)
{
vertex_t v(*vi);
pi_begin = embedding[v].begin();
@@ -122,7 +122,7 @@ namespace boost
std::vector<edge_t> edges_cache;
std::vector<vertex_t> vertices_in_edge;
for(tie(fi,fi_end) = edges(g); fi != fi_end; ++fi)
for(boost::tie(fi,fi_end) = edges(g); fi != fi_end; ++fi)
{
edge_t e(*fi);
edges_cache.push_back(e);

4
include/boost/graph/push_relabel_max_flow.hpp
View File

@@ -550,8 +550,8 @@ namespace boost {
}
// do the bottom
u = bos;
ai = out_edges(u, g).first;
while (get(excess_flow, u) > 0) {
boost::tie(ai, a_end) = out_edges(u, g);
while (get(excess_flow, u) > 0 && ai != a_end) {
if (get(capacity, *ai) == 0 && is_residual_edge(*ai))
push_flow(*ai);
++ai;

6
include/boost/graph/tiernan_all_cycles.hpp
View File

@@ -193,7 +193,7 @@ namespace detail
u = p.back(),
v = p.front();
OutIterator i, end;
for(tie(i, end) = out_edges(u, g); i != end; ++i) {
for(boost::tie(i, end) = out_edges(u, g); i != end; ++i) {
if((target(*i, g) == v)) {
return true;
}
@@ -220,7 +220,7 @@ namespace detail
// AdjacencyIterator i, end;
OutIterator i, end;
for(tie(i, end) = out_edges(u, g); i != end; ++i) {
for(boost::tie(i, end) = out_edges(u, g); i != end; ++i) {
Vertex v = target(*i, g);
// if we can actually extend along this edge,
@@ -324,7 +324,7 @@ tiernan_all_cycles(const Graph& g,
typedef typename graph_traits<Graph>::vertex_iterator VertexIterator;
VertexIterator i, end;
for(tie(i, end) = vertices(g); i != end; ++i) {
for(boost::tie(i, end) = vertices(g); i != end; ++i) {
detail::all_cycles_from_vertex(g, *i, vis, minlen, maxlen);
}
}

2
include/boost/graph/write_dimacs.hpp
View File

@@ -64,7 +64,7 @@ void write_dimacs_max_flow(const Graph& g,
//output the edges
edge_iterator ei, e_end;
for(tie(ei,e_end) = edges(g); ei!=e_end; ++ei){
for(boost::tie(ei,e_end) = edges(g); ei!=e_end; ++ei){
out << "a " << idx[ source(*ei, g) ] + 1 << " " << idx[ target(*ei, g) ] + 1 << " " << get(capacity,*ei) << std::endl;
}
}