Changeset 902:309d81806228 in lemon-0.x for src/work/marci/bipartite_graph_wrapper_test.cc

Timestamp:

09/22/04 14:25:50 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1210

Message:

correction to 0.2

File:

• src/work/marci/bipartite_graph_wrapper_test.cc (modified) (2 diffs)

src/work/marci/bipartite_graph_wrapper_test.cc

@@ -4 +4 @@
 #include <vector>
 
-#include <sage_graph.h>
-//#include <smart_graph.h>
+//#include <sage_graph.h>
+#include <hugo/smart_graph.h>
 //#include <dimacs.h>
 #include <hugo/time_measure.h>
-#include <for_each_macros.h>
+//#include <for_each_macros.h>
 #include <bfs_dfs.h>
 #include <hugo/graph_wrapper.h>
 #include <bipartite_graph_wrapper.h>
 #include <hugo/maps.h>
-#include <hugo/max_flow.h>
+#include <hugo/preflow.h>
 #include <augmenting_flow.h>
+
+using std::cout;
+using std::endl;
 
 using namespace hugo;
 
 int main() {
-  typedef UndirSageGraph Graph; 
+  //typedef UndirSageGraph Graph; 
+  typedef SmartGraph Graph;
   typedef Graph::Node Node;
   typedef Graph::NodeIt NodeIt;
@@ -53 +57 @@
 
   Graph::Node u;
-  std::cout << "These nodes will be in S:\n";
+  cout << "These nodes will be in S:" << endl;
   //FIXME azert kellene ++, es invalid vizsgalat u-bol, hogy ezt le lehessen 
   //irni 1etlen FOR_EACH-csel.
-  for (bipartite_map.first(u, false); g.valid(u); bipartite_map.next(u)) 
-    std::cout << u << " ";
-  std::cout << "\n";
-  std::cout << "These nodes will be in T:\n";
-  for (bipartite_map.first(u, true); g.valid(u); bipartite_map.next(u)) 
-    std::cout << u << " ";
-  std::cout << "\n";
+  for (bipartite_map.first(u, false); u!=INVALID; bipartite_map.next(u)) 
+    cout << g.id(u) << " ";
+  cout << endl;
+  cout << "These nodes will be in T:" << endl;
+  for (bipartite_map.first(u, true); u!=INVALID; bipartite_map.next(u)) 
+    cout << g.id(u) << " ";
+  cout << endl;
 
   typedef BipartiteGraphWrapper<Graph> BGW;
   BGW bgw(g, bipartite_map);
 
-  std::cout << "Nodes by NodeIt:\n";
-  FOR_EACH_LOC(BGW::NodeIt, n, bgw) {
-    std::cout << n << " ";
-  }
-  std::cout << "\n";
-  std::cout << "Nodes in S by ClassNodeIt:\n";
-  FOR_EACH_INC_LOC(BGW::ClassNodeIt, n, bgw, bgw.S_CLASS) {
-    std::cout << n << " ";
-  }
-  std::cout << "\n";
-  std::cout << "Nodes in T by ClassNodeIt:\n";
-  FOR_EACH_INC_LOC(BGW::ClassNodeIt, n, bgw, bgw.T_CLASS) {
-    std::cout << n << " ";
-  }
-  std::cout << "\n";
-  std::cout << "Edges of the bipartite graph:\n";
-  FOR_EACH_LOC(BGW::EdgeIt, e, bgw) {
-    std::cout << bgw.tail(e) << "->" << bgw.head(e) << std::endl;
-  }
+  cout << "Nodes by NodeIt:" << endl;
+  for (BGW::NodeIt n(bgw); n!=INVALID; ++n)
+    cout << g.id(n) << " ";
+  cout << endl;
+
+  cout << "Nodes in S by ClassNodeIt:" << endl;
+  for (BGW::ClassNodeIt n(bgw, bgw.S_CLASS); n!=INVALID; ++n)
+    cout << g.id(n) << " ";
+  cout << endl;
+
+  cout << "Nodes in T by ClassNodeIt:" << endl;
+  for (BGW::ClassNodeIt n(bgw, bgw.T_CLASS); n!=INVALID; ++n)
+    cout << g.id(n) << " ";
+  cout << endl;
+
+  cout << "Edges of the bipartite graph:" << endl;
+  for (BGW::EdgeIt e(bgw); e!=INVALID; ++e)
+    cout << g.id(bgw.tail(e)) << "->" << g.id(bgw.head(e)) << endl;
 
   BGW::NodeMap<int> dbyj(bgw);
   BGW::EdgeMap<int> dbyxcj(bgw);
 
-  typedef stBipartiteGraphWrapper<BGW> stGW;
-  stGW stgw(bgw);
-  ConstMap<stGW::Edge, int> const1map(1);
-  stGW::NodeMap<int> ize(stgw);
-  stGW::EdgeMap<int> flow(stgw);
+//   typedef stBipartiteGraphWrapper<BGW> stGW;
+//   stGW stgw(bgw);
+//   ConstMap<stGW::Edge, int> const1map(1);
+//   stGW::NodeMap<int> ize(stgw);
+//   stGW::EdgeMap<int> flow(stgw);
 
-  BfsIterator< BGW, BGW::NodeMap<bool> > bfs(bgw);
-  Graph::NodeIt si;
-  Graph::Node s; 
-  s=g.first(si);
-  bfs.pushAndSetReached(BGW::Node(s));
-  while (!bfs.finished()) { ++bfs; }
+//   BfsIterator< BGW, BGW::NodeMap<bool> > bfs(bgw);
+//   Graph::NodeIt si;
+//   Graph::Node s; 
+//   s=g.first(si);
+//   bfs.pushAndSetReached(BGW::Node(s));
+//   while (!bfs.finished()) { ++bfs; }
 
-  FOR_EACH_LOC(stGW::NodeIt, n, stgw) { 
-    std::cout << "out-edges of " << n << ":\n"; 
-    FOR_EACH_INC_LOC(stGW::OutEdgeIt, e, stgw, n) { 
-      std::cout << " " << e << "\n";
-      std::cout << " aNode: " << stgw.aNode(e) << "\n";
-      std::cout << " bNode: " << stgw.bNode(e) << "\n";      
-    }
-    std::cout << "in-edges of " << n << ":\n"; 
-    FOR_EACH_INC_LOC(stGW::InEdgeIt, e, stgw, n) { 
-      std::cout << " " << e << "\n";
-      std::cout << " aNode: " << stgw.aNode(e) << "\n";
-      std::cout << " bNode: " << stgw.bNode(e) << "\n";     
-    }
-  }
-  std::cout << "Edges of the stGraphWrapper:\n"; 
-  FOR_EACH_LOC(stGW::EdgeIt, n, stgw) { 
-    std::cout << " " << n << "\n";
-  }
+//   FOR_EACH_LOC(stGW::NodeIt, n, stgw) { 
+//     cout << "out-edges of " << n << ":" << endl; 
+//     FOR_EACH_INC_LOC(stGW::OutEdgeIt, e, stgw, n) { 
+//       cout << " " << e << endl;
+//       cout << " aNode: " << stgw.aNode(e) << endl;
+//       cout << " bNode: " << stgw.bNode(e) << endl;      
+//     }
+//     cout << "in-edges of " << n << ":" << endl; 
+//     FOR_EACH_INC_LOC(stGW::InEdgeIt, e, stgw, n) { 
+//       cout << " " << e << endl;
+//       cout << " aNode: " << stgw.aNode(e) << endl;
+//       cout << " bNode: " << stgw.bNode(e) << endl;     
+//     }
+//   }
+//   cout << "Edges of the stGraphWrapper:" << endl; 
+//   FOR_EACH_LOC(stGW::EdgeIt, n, stgw) { 
+//     cout << " " << n << endl;
+//   }
 
-  stGW::NodeMap<bool> b(stgw);
-  FOR_EACH_LOC(stGW::NodeIt, n, stgw) { 
-    std::cout << n << ": " << b[n] <<"\n";
-  }
+//   stGW::NodeMap<bool> b(stgw);
+//   FOR_EACH_LOC(stGW::NodeIt, n, stgw) { 
+//     cout << n << ": " << b[n] << endl;
+//   }
 
-  std::cout << "Bfs from s: \n";
-  BfsIterator< stGW, stGW::NodeMap<bool> > bfs_stgw(stgw);
-  bfs_stgw.pushAndSetReached(stgw.S_NODE);
-  while (!bfs_stgw.finished()) { 
-    std::cout << " " << stGW::OutEdgeIt(bfs_stgw) << "\n";
-    ++bfs_stgw; 
-  }
+//   cout << "Bfs from s:" << endl;
+//   BfsIterator< stGW, stGW::NodeMap<bool> > bfs_stgw(stgw);
+//   bfs_stgw.pushAndSetReached(stgw.S_NODE);
+//   while (!bfs_stgw.finished()) { 
+//     cout << " " << stGW::OutEdgeIt(bfs_stgw) << endl;
+//     ++bfs_stgw; 
+//   }
   
-  AugmentingFlow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
-    max_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow);
-  while (max_flow_test.augmentOnShortestPath()) { }
+//   AugmentingFlow<stGW, int, ConstMap<stGW::Edge, int>, stGW::EdgeMap<int> > 
+//     max_flow_test(stgw, stgw.S_NODE, stgw.T_NODE, const1map, flow);
+//   while (max_flow_test.augmentOnShortestPath()) { }
 
-  std::cout << max_flow_test.flowValue() << std::endl;
+//   cout << max_flow_test.flowValue() << std::endl;
 
   return 0;