Update of /cvsroot/boost/boost/libs/graph/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3645/libs/graph/test
Modified Files:
kolmogorov_max_flow_test.cpp
Log Message:
changed coloring to be consistent with edmunds_karp_max_flow
Index: kolmogorov_max_flow_test.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/graph/test/kolmogorov_max_flow_test.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- kolmogorov_max_flow_test.cpp 20 Nov 2006 23:42:44 -0000 1.1
+++ kolmogorov_max_flow_test.cpp 11 Mar 2007 11:56:10 -0000 1.2
@@ -247,7 +247,7 @@
for(tie(ei, e_end) = out_edges(v, tSuper::m_g); ei != e_end; ++ei){
const tVertex& other_node = target(*ei, tSuper::m_g);
if(get_tree(other_node) != get_tree(v)){
- if(get_tree(v) == tColorTraits::white())
+ if(get_tree(v) == tColorTraits::black())
BOOST_CHECK(tSuper::m_res_cap_map[*ei] == 0);
else
BOOST_CHECK(tSuper::m_res_cap_map[tSuper::m_rev_edge_map[*ei]] == 0);
@@ -267,12 +267,12 @@
tVertex current_node = v;
tDistanceVal distance = 0;
tColorValue color = get_tree(v);
- tVertex terminal = (color == tColorTraits::white()) ?
tSuper::m_source : tSuper::m_sink;
+ tVertex terminal = (color == tColorTraits::black()) ?
tSuper::m_source : tSuper::m_sink;
while(current_node != terminal){
BOOST_CHECK(tSuper::has_parent(current_node));
tEdge e = get_edge_to_parent(current_node);
++distance;
- current_node = (color == tColorTraits::white())? source(e,
tSuper::m_g) : target(e, tSuper::m_g);
+ current_node = (color == tColorTraits::black())? source(e,
tSuper::m_g) : target(e, tSuper::m_g);
if(distance > tSuper::m_dist_map[v])
break;
}
@@ -289,7 +289,7 @@
tVertex current_node = v;
while(tSuper::has_parent(current_node)){
tEdge e = get_edge_to_parent(current_node);
- current_node = (color == tColorTraits::white()) ? source(e,
tSuper::m_g) : target(e, tSuper::m_g);
+ current_node = (color == tColorTraits::black()) ? source(e,
tSuper::m_g) : target(e, tSuper::m_g);
BOOST_CHECK(tSuper::m_time_map[current_node] >= time);
}
}
@@ -305,7 +305,7 @@
tVertex current_node = v;
while(tSuper::has_parent(current_node)){
tEdge e = get_edge_to_parent(current_node);
- current_node = (color == tColorTraits::white()) ? source(e,
tSuper::m_g) : target(e, tSuper::m_g);
+ current_node = (color == tColorTraits::black()) ? source(e,
tSuper::m_g) : target(e, tSuper::m_g);
if(tSuper::m_time_map[current_node] == time)
BOOST_CHECK(tSuper::m_dist_map[current_node] < distance);
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
