diff -r 69b2d279c8f0 -r ecc1171307be src/work/jacint/flow_test.cc
--- a/src/work/jacint/flow_test.cc	Mon Feb 16 15:57:59 2004 +0000
+++ b/src/work/jacint/flow_test.cc	Mon Feb 16 16:15:58 2004 +0000
@@ -2,150 +2,147 @@
 #include <vector>
 #include <string>
 
-#include <marci_list_graph.hh>
-#include <marci_graph_traits.hh>
-#include <marci_property_vector.hh>
-#include <preflow_push_hl.hh>
-#include <preflow_push_max_flow.hh>
-#include <reverse_bfs.hh>
-//#include <dijkstra.hh>
+#include <list_graph.hh>
+#include <preflow_push_hl.h>
+#include <preflow_push_max_flow.h>
+#include <reverse_bfs.h>
+//#include <dijkstra.h>
 
 using namespace marci;
 
 
 int main (int, char*[])
 {
-  typedef graph_traits<list_graph>::node_iterator node_iterator;
-  typedef graph_traits<list_graph>::edge_iterator edge_iterator;
-  typedef graph_traits<list_graph>::each_node_iterator each_node_iterator;
-  typedef graph_traits<list_graph>::each_edge_iterator each_edge_iterator;
-  typedef graph_traits<list_graph>::out_edge_iterator out_edge_iterator;
-  typedef graph_traits<list_graph>::in_edge_iterator in_edge_iterator;
-  typedef graph_traits<list_graph>::sym_edge_iterator sym_edge_iterator;
-
-  list_graph flow_test;
+  typedef ListGraph::NodeIt NodeIt;
+  typedef ListGraph::EdgeIt EdgeIt;
+  typedef ListGraph::EachNodeIt EachNodeIt;
+  typedef ListGraph::EachEdgeIt EachEdgeIt;
+  typedef ListGraph::OutEdgeIt OutEdgeIt;
+  typedef ListGraph::InEdgeIt InEdgeIt;
+  
+  ListGraph flow_test;
  
     //Ahuja könyv példája, maxflowvalue=13
-  node_iterator s=flow_test.add_node();
-  node_iterator v1=flow_test.add_node();
-  node_iterator v2=flow_test.add_node();
-  node_iterator v3=flow_test.add_node();
-  node_iterator v4=flow_test.add_node();
-  node_iterator v5=flow_test.add_node();
-  node_iterator t=flow_test.add_node();
+  NodeIt s=flow_test.addNode();
+  NodeIt v1=flow_test.addNode();
+  NodeIt v2=flow_test.addNode();
+  NodeIt v3=flow_test.addNode();
+  NodeIt v4=flow_test.addNode();
+  NodeIt v5=flow_test.addNode();
+  NodeIt t=flow_test.addNode();
   
-  node_property_vector<list_graph, std::string> node_name(flow_test);
-  node_name.put(s, "s");
-  node_name.put(v1, "v1");
-  node_name.put(v2, "v2");
-  node_name.put(v3, "v3");
-  node_name.put(v4, "v4");
-  node_name.put(v5, "v5");
-  node_name.put(t, "t");
+  ListGraph::NodeMap<std::string> Node_name(flow_test);
+  Node_name.set(s, "s");
+  Node_name.set(v1, "v1");
+  Node_name.set(v2, "v2");
+  Node_name.set(v3, "v3");
+  Node_name.set(v4, "v4");
+  Node_name.set(v5, "v5");
+  Node_name.set(t, "t");
 
-  edge_iterator s_v1=flow_test.add_edge(s, v1);
-  edge_iterator s_v2=flow_test.add_edge(s, v2);
-  edge_iterator s_v3=flow_test.add_edge(s, v3);
-  edge_iterator v2_v4=flow_test.add_edge(v2, v4);
-  edge_iterator v2_v5=flow_test.add_edge(v2, v5);
-  edge_iterator v3_v5=flow_test.add_edge(v3, v5);
-  edge_iterator v4_t=flow_test.add_edge(v4, t);
-  edge_iterator v5_t=flow_test.add_edge(v5, t);
-  edge_iterator v2_s=flow_test.add_edge(v2, s);
+  EdgeIt s_v1=flow_test.addEdge(s, v1);
+  EdgeIt s_v2=flow_test.addEdge(s, v2);
+  EdgeIt s_v3=flow_test.addEdge(s, v3);
+  EdgeIt v2_v4=flow_test.addEdge(v2, v4);
+  EdgeIt v2_v5=flow_test.addEdge(v2, v5);
+  EdgeIt v3_v5=flow_test.addEdge(v3, v5);
+  EdgeIt v4_t=flow_test.addEdge(v4, t);
+  EdgeIt v5_t=flow_test.addEdge(v5, t);
+  EdgeIt v2_s=flow_test.addEdge(v2, s);
   
-  edge_property_vector<list_graph, int> cap(flow_test);  
-  cap.put(s_v1, 0);
-  cap.put(s_v2, 10);
-  cap.put(s_v3, 10);
-  cap.put(v2_v4, 5);
-  cap.put(v2_v5, 8);
-  cap.put(v3_v5, 5);
-  cap.put(v4_t, 8);
-  cap.put(v5_t, 8);
-  cap.put(v2_s, 0);
+   ListGraph::EdgeMap<int> cap(flow_test);  
+  cap.set(s_v1, 0);
+  cap.set(s_v2, 10);
+  cap.set(s_v3, 10);
+  cap.set(v2_v4, 5);
+  cap.set(v2_v5, 8);
+  cap.set(v3_v5, 5);
+  cap.set(v4_t, 8);
+  cap.set(v5_t, 8);
+  cap.set(v2_s, 0);
 
 
   
   //Marci példája, maxflowvalue=23
-  /*  node_iterator s=flow_test.add_node();
-  node_iterator v1=flow_test.add_node();
-  node_iterator v2=flow_test.add_node();
-  node_iterator v3=flow_test.add_node();
-  node_iterator v4=flow_test.add_node();
-  node_iterator t=flow_test.add_node();
-  node_iterator w=flow_test.add_node();
+  /*  NodeIt s=flow_test.addNode();
+  NodeIt v1=flow_test.addNode();
+  NodeIt v2=flow_test.addNode();
+  NodeIt v3=flow_test.addNode();
+  NodeIt v4=flow_test.addNode();
+  NodeIt t=flow_test.addNode();
+  NodeIt w=flow_test.addNode();
 
   
-  node_property_vector<list_graph, std::string> node_name(flow_test);
-  node_name.put(s, "s");
-  node_name.put(v1, "v1");
-  node_name.put(v2, "v2");
-  node_name.put(v3, "v3");
-  node_name.put(v4, "v4");
-  node_name.put(t, "t");
-  node_name.put(w, "w");
+  NodeMap<ListGraph, std::string> Node_name(flow_test);
+  Node_name.set(s, "s");
+  Node_name.set(v1, "v1");
+  Node_name.set(v2, "v2");
+  Node_name.set(v3, "v3");
+  Node_name.set(v4, "v4");
+  Node_name.set(t, "t");
+  Node_name.set(w, "w");
 
-  edge_iterator s_v1=flow_test.add_edge(s, v1);
-  edge_iterator s_v2=flow_test.add_edge(s, v2);
-  edge_iterator v1_v2=flow_test.add_edge(v1, v2);
-  edge_iterator v2_v1=flow_test.add_edge(v2, v1);
-  edge_iterator v1_v3=flow_test.add_edge(v1, v3);
-  edge_iterator v3_v2=flow_test.add_edge(v3, v2);
-  edge_iterator v2_v4=flow_test.add_edge(v2, v4);
-  edge_iterator v4_v3=flow_test.add_edge(v4, v3);
-  edge_iterator v3_t=flow_test.add_edge(v3, t);
-  edge_iterator v4_t=flow_test.add_edge(v4, t);
-  edge_iterator v3_v3=flow_test.add_edge(v3, v3);
-  edge_iterator s_w=flow_test.add_edge(s, w);
-  //  edge_iterator v2_s=flow_test.add_edge(v2, s);
+  EdgeIt s_v1=flow_test.addEdge(s, v1);
+  EdgeIt s_v2=flow_test.addEdge(s, v2);
+  EdgeIt v1_v2=flow_test.addEdge(v1, v2);
+  EdgeIt v2_v1=flow_test.addEdge(v2, v1);
+  EdgeIt v1_v3=flow_test.addEdge(v1, v3);
+  EdgeIt v3_v2=flow_test.addEdge(v3, v2);
+  EdgeIt v2_v4=flow_test.addEdge(v2, v4);
+  EdgeIt v4_v3=flow_test.addEdge(v4, v3);
+  EdgeIt v3_t=flow_test.addEdge(v3, t);
+  EdgeIt v4_t=flow_test.addEdge(v4, t);
+  EdgeIt v3_v3=flow_test.addEdge(v3, v3);
+  EdgeIt s_w=flow_test.addEdge(s, w);
+  //  EdgeIt v2_s=flow_test.addEdge(v2, s);
   
 
 
-  edge_property_vector<list_graph, int> cap(flow_test);  //serves as length in dijkstra
-  cap.put(s_v1, 16);
-  cap.put(s_v2, 13);
-  cap.put(v1_v2, 10);
-  cap.put(v2_v1, 4);
-  cap.put(v1_v3, 12);
-  cap.put(v3_v2, 9);
-  cap.put(v2_v4, 14);
-  cap.put(v4_v3, 7);
-  cap.put(v3_t, 20);
-  cap.put(v4_t, 4);
-  cap.put(v3_v3, 4);
-  cap.put(s_w, 4);
-  //  cap.put(v2_s, 0);
+  EdgeMap<ListGraph, int> cap(flow_test);  //serves as length in dijkstra
+  cap.set(s_v1, 16);
+  cap.set(s_v2, 13);
+  cap.set(v1_v2, 10);
+  cap.set(v2_v1, 4);
+  cap.set(v1_v3, 12);
+  cap.set(v3_v2, 9);
+  cap.set(v2_v4, 14);
+  cap.set(v4_v3, 7);
+  cap.set(v3_t, 20);
+  cap.set(v4_t, 4);
+  cap.set(v3_v3, 4);
+  cap.set(s_w, 4);
+  //  cap.set(v2_s, 0);
 
 */
 
   //pelda 3, maxflowvalue=4
-  /*      node_iterator s=flow_test.add_node();
-  node_iterator v1=flow_test.add_node();
-  node_iterator v2=flow_test.add_node();
-  node_iterator t=flow_test.add_node();
-  node_iterator w=flow_test.add_node();
+  /*      NodeIt s=flow_test.addNode();
+  NodeIt v1=flow_test.addNode();
+  NodeIt v2=flow_test.addNode();
+  NodeIt t=flow_test.addNode();
+  NodeIt w=flow_test.addNode();
   
-  node_property_vector<list_graph, std::string> node_name(flow_test);
-  node_name.put(s, "s");
-  node_name.put(v1, "v1");
-  node_name.put(v2, "v2");
-  node_name.put(t, "t");
-  node_name.put(w, "w");
+  NodeMap<ListGraph, std::string> Node_name(flow_test);
+  Node_name.set(s, "s");
+  Node_name.set(v1, "v1");
+  Node_name.set(v2, "v2");
+  Node_name.set(t, "t");
+  Node_name.set(w, "w");
 
-  edge_iterator s_v1=flow_test.add_edge(s, v1);
-  edge_iterator v1_v2=flow_test.add_edge(v1, v2);
-  edge_iterator v2_t=flow_test.add_edge(v2, t);
-  edge_iterator v1_v1=flow_test.add_edge(v1, v1);
-  edge_iterator s_w=flow_test.add_edge(s, w);
+  EdgeIt s_v1=flow_test.addEdge(s, v1);
+  EdgeIt v1_v2=flow_test.addEdge(v1, v2);
+  EdgeIt v2_t=flow_test.addEdge(v2, t);
+  EdgeIt v1_v1=flow_test.addEdge(v1, v1);
+  EdgeIt s_w=flow_test.addEdge(s, w);
 
 
-  edge_property_vector<list_graph, int> cap(flow_test); 
+  EdgeMap<ListGraph, int> cap(flow_test); 
     
-  cap.put(s_v1, 16);
-  cap.put(v1_v2, 10);
-  cap.put(v2_t, 4);
-  cap.put(v1_v1, 3);
-  cap.put(s_w, 5);
+  cap.set(s_v1, 16);
+  cap.set(v1_v2, 10);
+  cap.set(v2_t, 4);
+  cap.set(v1_v1, 3);
+  cap.set(s_w, 5);
   */
   
 
@@ -153,11 +150,11 @@
   /*
   std::cout << "Testing reverse_bfs..." << std::endl;
   
-  reverse_bfs<list_graph> bfs_test(flow_test, t);
+  reverse_bfs<ListGraph> bfs_test(flow_test, t);
 
   bfs_test.run();
 
-  for (each_node_iterator w=flow_test.first_node(); w.valid(); ++w) {
+  for (EachNodeIt w=flow_test.first_Node(); w.valid(); ++w) {
     std::cout <<"The distance of " << w << " is " << bfs_test.dist(w) <<std::endl;
     }
 
@@ -167,24 +164,24 @@
 
   std::cout << "Testing preflow_push_hl..." << std::endl;
   
-  preflow_push_hl<list_graph, int> preflow_push_test(flow_test, s, t, cap);
+  preflow_push_hl<ListGraph, int> preflow_push_test(flow_test, s, t, cap);
 
   preflow_push_test.run();
 
   std::cout << "Maximum flow value is: " << preflow_push_test.maxflow() << "."<<std::endl;
 
-  std::cout<< "The flow on edge s-v1 is "<< preflow_push_test.flowonedge(s_v1) << "."<<std::endl;
+  std::cout<< "The flow on Edge s-v1 is "<< preflow_push_test.flowonEdge(s_v1) << "."<<std::endl;
 
-  edge_property_vector<list_graph, int> flow=preflow_push_test.allflow();  
-  for (each_edge_iterator e=flow_test.first_edge(); e.valid(); ++e) {
-    std::cout <<"Flow on edge " << flow_test.tail(e) <<"-" << flow_test.head(e)<< " is " <<flow.get(e) <<std::endl;
+   ListGraph::EdgeMap<int> flow=preflow_push_test.allflow();  
+  for (EachEdgeIt e=flow_test.template first<EachEdgeIt>(); e.valid(); ++e) {
+    std::cout <<"Flow on Edge " << flow_test.tail(e) <<"-" << flow_test.head(e)<< " is " <<flow.get(e) <<std::endl;
     }
 
   std::cout << "A minimum cut: " <<std::endl;  
-  node_property_vector<list_graph, bool> mincut=preflow_push_test.mincut();
+   ListGraph::NodeMap<bool> mincut=preflow_push_test.mincut();
 
-  for (each_node_iterator v=flow_test.first_node(); v.valid(); ++v) {
-      if (mincut.get(v)) std::cout <<node_name.get(v)<< " ";
+  for (EachNodeIt v=flow_test.template first<EachNodeIt>(); v.valid(); ++v) {
+      if (mincut.get(v)) std::cout <<Node_name.get(v)<< " ";
     }
   
   std::cout<<"\n\n"<<std::endl;
@@ -194,17 +191,17 @@
 
   std::cout << "Testing preflow_push_max_flow..." << std::endl;
  
-  preflow_push_max_flow<list_graph, int> max_flow_test(flow_test, s, t, cap);
+  preflow_push_max_flow<ListGraph, int> max_flow_test(flow_test, s, t, cap);
 
   max_flow_test.run();
 
   std::cout << "Maximum flow value is: " << max_flow_test.maxflow() << "."<< std::endl;
 
   std::cout << "A minimum cut: " <<std::endl;  
-  node_property_vector<list_graph, bool> mincut2=max_flow_test.mincut();
+   ListGraph::NodeMap<bool> mincut2=max_flow_test.mincut();
 
-  for (each_node_iterator v=flow_test.first_node(); v.valid(); ++v) {
-    if (mincut2.get(v)) std::cout <<node_name.get(v)<< " ";
+  for (EachNodeIt v=flow_test.template first<EachNodeIt>(); v.valid(); ++v) {
+    if (mincut2.get(v)) std::cout <<Node_name.get(v)<< " ";
   }
   
   std::cout << std::endl <<std::endl;
@@ -213,17 +210,17 @@
   /*
     std::cout << "Testing dijkstra..." << std::endl;
   
-    node_iterator root=v2;
+    NodeIt root=v2;
 
-    dijkstra<list_graph, int> dijkstra_test(flow_test, root, cap);
+    dijkstra<ListGraph, int> dijkstra_test(flow_test, root, cap);
 
     dijkstra_test.run();
 
-    for (each_node_iterator w=flow_test.first_node(); w.valid(); ++w) {
+    for (EachNodeIt w=flow_test.first_Node(); w.valid(); ++w) {
       if (dijkstra_test.reach(w)) {
       std::cout <<"The distance of " << w << " is " << dijkstra_test.dist(w);
       if (dijkstra_test.pred(w).valid()) {
-      std::cout <<", a shortest path from the root ends with edge " << dijkstra_test.pred(w) <<std::endl; 
+      std::cout <<", a shortest path from the root ends with Edge " << dijkstra_test.pred(w) <<std::endl; 
       } else {
        std::cout <<", this is the root."<<std::endl; }