Changeset 19:3151a1026db9 in lemon-0.x for src/work/marci_graph_demo.cc

Timestamp:

01/20/04 18:39:13 (20 years ago)

Author:

marci

Branch:

default

Phase:

public

Convert:

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

Message:

* empty log message *

File:

• src/work/marci_graph_demo.cc (modified) (12 diffs)

src/work/marci_graph_demo.cc

@@ -4 +4 @@
 
 #include <marci_list_graph.hh>
-#include <marci_graph_traits.hh>
 #include <marci_property_vector.hh>
 #include <marci_bfs.hh>
@@ -13 +12 @@
 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;
-
+  typedef list_graph::node_iterator node_iterator;
+  typedef list_graph::edge_iterator edge_iterator;
+  typedef list_graph::each_node_iterator each_node_iterator;
+  typedef list_graph::each_edge_iterator each_edge_iterator;
+  typedef list_graph::out_edge_iterator out_edge_iterator;
+  typedef list_graph::in_edge_iterator in_edge_iterator;
+  typedef list_graph::sym_edge_iterator sym_edge_iterator;
   list_graph G;
   std::vector<node_iterator> vector_of_node_iterators;
@@ -32 +30 @@
   std::cout << "number of nodes: " << number_of(G.first_node()) << std::endl;
 
-  for(each_node_iterator i=G.first_node(); i.is_valid(); ++i) {
+  for(each_node_iterator i=G.first_node(); i.valid(); ++i) {
     std::cout << "node " << G.id(i) << std::endl;
     std::cout << " outdegree (out_edge_iterator): " << number_of(G.first_out_edge(i)) << " "; 
-    for(out_edge_iterator j=G.first_out_edge(i); j.is_valid(); ++j) { 
+    for(out_edge_iterator j=G.first_out_edge(i); j.valid(); ++j) { 
       std::cout << "(" << G.id(G.tail(j)) << "--" << G.id(j) << "->" << G.id(G.head(j)) << ") ";
     }
@@ -41 +39 @@
 
     std::cout<< " ";
-    for(out_edge_iterator j=G.first_out_edge(i); j.is_valid(); ++j) { 
+    for(out_edge_iterator j=G.first_out_edge(i); j.valid(); ++j) { 
       std::cout << G.a_node(j) << "->" << G.b_node(j) << " "; } 
     std::cout<<std::endl;
 
     std::cout << " indegree: (in_edge_oterator) " << number_of(G.first_in_edge(i)) << " ";
-    for(in_edge_iterator j=G.first_in_edge(i); j.is_valid(); ++j) { 
+    for(in_edge_iterator j=G.first_in_edge(i); j.valid(); ++j) { 
       std::cout << j << " "; } 
     std::cout << std::endl;
 
     std::cout<< " ";
-    for(in_edge_iterator j=G.first_in_edge(i); j.is_valid(); ++j) { 
+    for(in_edge_iterator j=G.first_in_edge(i); j.valid(); ++j) { 
       std::cout << G.a_node(j) << "->" << G.b_node(j) << " "; } 
     std::cout<<std::endl;
 
     std::cout << " degree: (sym_edge_iterator) " << number_of(G.first_sym_edge(i)) << " ";
-    for(sym_edge_iterator j=G.first_sym_edge(i); j.is_valid(); ++j) { 
+    for(sym_edge_iterator j=G.first_sym_edge(i); j.valid(); ++j) { 
       std::cout << j << " "; } 
     std::cout<<std::endl;
 
     std::cout<< " ";
-    for(sym_edge_iterator j=G.first_sym_edge(i); j.is_valid(); ++j) { 
+    for(sym_edge_iterator j=G.first_sym_edge(i); j.valid(); ++j) { 
       std::cout << G.a_node(j) << "->" << G.b_node(j) << " "; } 
     std::cout<<std::endl;
@@ -67 +65 @@
 
   std::cout << "all edges: ";
-  for(each_edge_iterator i=G.first_edge(); i.is_valid(); ++i) {
+  for(each_edge_iterator i=G.first_edge(); i.valid(); ++i) {
     std::cout << i << " ";
   }
@@ -83 +81 @@
   my_property_vector.put(vector_of_node_iterators[7], 1978);
   std::cout << "some node property values..." << std::endl;
-  for(each_node_iterator i=G.first_node(); i.is_valid(); ++i) {
+  for(each_node_iterator i=G.first_node(); i.valid(); ++i) {
     std::cout << my_property_vector.get(i) << std::endl;
   }
@@ -89 +87 @@
   int _ii=1;
   edge_property_vector<list_graph, int> my_edge_property(G);
-  for(each_edge_iterator i=G.first_edge(); i.is_valid(); ++i) {
+  for(each_edge_iterator i=G.first_edge(); i.valid(); ++i) {
     my_edge_property.put(i, _i);
     _i*=_ii; ++_ii;
@@ -95 +93 @@
 
   std::cout << "node and edge property values on the tails and heads of edges..." << std::endl;
-  for(each_edge_iterator j=G.first_edge(); j.is_valid(); ++j) {
+  for(each_edge_iterator j=G.first_edge(); j.valid(); ++j) {
     std::cout << my_property_vector.get(G.tail(j)) << "--" << my_edge_property.get(j) << "-->" << my_property_vector.get(G.head(j)) << " ";
   }
@@ -102 +100 @@
   //std::cout << "the same for inedges of the nodes..." << std::endl;
   //k=0;
-  //for(each_node_iterator i=G.first_node(); i.is_valid(); ++i) {
-  //  for(in_edge_iterator j=G.first_in_edge(i); j.is_valid(); ++j) {
+  //for(each_node_iterator i=G.first_node(); i.valid(); ++i) {
+  //  for(in_edge_iterator j=G.first_in_edge(i); j.valid(); ++j) {
   //    std::cout << my_property_vector.get(G.tail(j)) << "-->" << my_property_vector.get(G.head(j)) << " ";
   //  }
@@ -113 +111 @@
   bfs_test.run();
   std::cout << "reached: ";
-  for(each_node_iterator i=G.first_node(); i.is_valid(); ++i) {
+  for(each_node_iterator i=G.first_node(); i.valid(); ++i) {
     std::cout << bfs_test.reached.get(i) << " ";
   }
   std::cout<<std::endl;
   std::cout << "dist: ";
-  for(each_node_iterator i=G.first_node(); i.is_valid(); ++i) {
+  for(each_node_iterator i=G.first_node(); i.valid(); ++i) {
     std::cout << bfs_test.dist.get(i) << " ";
   }
@@ -168 +166 @@
   std::cout << "on directed graph graph" << std::endl; //<< flow_test;
   std::cout << "names and capacity values" << std::endl; 
-  for(each_node_iterator i=flow_test.first_node(); i.is_valid(); ++i) { 
+  for(each_node_iterator i=flow_test.first_node(); i.valid(); ++i) { 
     std::cout << node_name.get(i) << ": ";
     std::cout << "out edges: ";
-    for(out_edge_iterator j=flow_test.first_out_edge(i); j.is_valid(); ++j) 
+    for(out_edge_iterator j=flow_test.first_out_edge(i); j.valid(); ++j) 
       std::cout << node_name.get(flow_test.tail(j)) << "-"<< cap.get(j) << "->" << node_name.get(flow_test.head(j)) << " ";
     std::cout << "in edges: ";
-    for(in_edge_iterator j=flow_test.first_in_edge(i); j.is_valid(); ++j) 
+    for(in_edge_iterator j=flow_test.first_in_edge(i); j.valid(); ++j) 
       std::cout << node_name.get(flow_test.tail(j)) << "-"<< cap.get(j) << "->" << node_name.get(flow_test.head(j)) << " ";
     std::cout << std::endl;
@@ -180 +178 @@
 
   
-  //for(each_node_iterator i=flow_test.first_node(); i.is_valid(); ++i) { 
+  //for(each_node_iterator i=flow_test.first_node(); i.valid(); ++i) { 
   //  std::cout << i << " ";
   //}