Changeset 549:5531429143bc in lemon0.x
 Timestamp:
 05/06/04 17:10:48 (17 years ago)
 Branch:
 default
 Phase:
 public
 Convert:
 svn:c9d7d8f590d60310b91f818b3a526b0e/lemon/trunk@722
 Location:
 src
 Files:

 2 added
 3 edited
Legend:
 Unmodified
 Added
 Removed

src/hugo/dimacs.h
r542 r549 78 78 NullMap<typename Graph::Edge, int> n; 79 79 readDimacs(is, g, n, u, u, n); 80 std::cout<<"igen en.";81 80 } 82 81 
src/work/marci/bfs_dfs_misc.h
r548 r549 20 20 if (!reached[n]) { 21 21 bfs.pushAndSetReached(n); 22 bool_map.set(n, false) { 23 while (!bfs.finished()) { 24 if (bfs.isBNodeNewlyReached()) { 25 bool_map.set(bfs.bNode())=!bfs.aNode(); 26 } else { 27 if (bool_map[bfs.bNode()]==bool_map[bfs.aNode()]) { 28 return false; 29 } 22 bool_map.set(n, false); 23 while (!bfs.finished()) { 24 if (bfs.isBNodeNewlyReached()) { 25 bool_map.set(bfs.bNode())=!bfs.aNode(); 26 } else { 27 if (bool_map[bfs.bNode()]==bool_map[bfs.aNode()]) { 28 return false; 30 29 } 31 ++bfs;32 30 } 31 ++bfs; 33 32 } 34 33 } 35 34 } 35 36 36 return true; 37 37 } … … 39 39 /// experimental topsort, 40 40 /// I think the final version will work as an iterator 41 /// if the graph is not a acyclic, the na pretopological order is obtained 42 /// (see Schrijver's book) 41 43 template<typename Graph> 42 void topSort( Graph& g, std::list<typename Graph::Node>& l) {44 void topSort(const Graph& g, std::list<typename Graph::Node>& l) { 43 45 l.clear(); 44 46 typedef typename Graph::template NodeMap<bool> ReachedMap; 
src/work/marci/makefile
r544 r549 5 5 6 6 LEDABINARIES = leda_graph_demo leda_bfs_dfs max_bipartite_matching_demo 7 BINARIES = max_flow_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try bipartite_matching_try_2 bipartite_matching_try_3 7 BINARIES = max_flow_demo iterator_bfs_demo macro_test lg_vs_sg bfsit_vs_byhand bipartite_graph_wrapper_test bipartite_matching_try bipartite_matching_try_2 bipartite_matching_try_3 top_sort_test 8 8 #gw_vs_not preflow_demo_boost edmonds_karp_demo_boost preflow_demo_jacint preflow_demo_athos edmonds_karp_demo_alpar preflow_demo_leda 9 9
Note: See TracChangeset
for help on using the changeset viewer.