Changeset 19:3151a1026db9 in lemon-0.x for src/work/marci_property_vector.hh

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_property_vector.hh (modified) (6 diffs)

src/work/marci_property_vector.hh

@@ -3 +3 @@
 
 #include <vector>
-
-#include <marci_graph_traits.hh>
 
 namespace marci {
@@ -11 +9 @@
   int number_of(iterator _it) { 
     int i=0;
-    for( ; _it.is_valid(); ++_it) { ++i; } 
+    for( ; _it.valid(); ++_it) { ++i; } 
     return i;
   }
@@ -17 +15 @@
   template <typename graph_type, typename T>
   class node_property_vector {
-    typedef typename graph_traits<graph_type>::node_iterator node_iterator;
-    typedef typename graph_traits<graph_type>::each_node_iterator each_node_iterator;
+    typedef typename list_graph::node_iterator node_iterator;
+    typedef typename list_graph::each_node_iterator each_node_iterator;
     graph_type& G; 
     std::vector<T> container;
@@ -24 +22 @@
     node_property_vector(graph_type& _G) : G(_G) {
       int i=0;
-      for(each_node_iterator it=G.first_node(); it.is_valid(); ++it) ++i;
+      for(each_node_iterator it=G.first_node(); it.valid(); ++it) ++i;
       container.resize(i); 
     }
     node_property_vector(graph_type& _G, T a) : G(_G) {
-      for(each_node_iterator it=G.first_node(); it.is_valid(); ++it) { container.push_back(a); }
+      for(each_node_iterator it=G.first_node(); it.valid(); ++it) { container.push_back(a); }
     }
     void put(node_iterator nit, const T& a) { container[G.id(nit)]=a; }
@@ -36 +34 @@
   template <typename graph_type, typename T>
   class edge_property_vector {
-    typedef typename graph_traits<graph_type>::edge_iterator edge_iterator;
-    typedef typename graph_traits<graph_type>::each_edge_iterator each_edge_iterator;
+    typedef typename graph_type::edge_iterator edge_iterator;
+    typedef typename graph_type::each_edge_iterator each_edge_iterator;
     graph_type& G; 
     std::vector<T> container;
@@ -43 +41 @@
     edge_property_vector(graph_type& _G) : G(_G) {
       int i=0;
-      for(each_edge_iterator it=G.first_edge(); it.is_valid(); ++it) ++i;
+      for(each_edge_iterator it=G.first_edge(); it.valid(); ++it) ++i;
       container.resize(i); 
     }
     edge_property_vector(graph_type& _G, T a) : G(_G) {
-      for(each_edge_iterator it=G.first_edge(); it.is_valid(); ++it) { 
+      for(each_edge_iterator it=G.first_edge(); it.valid(); ++it) { 
         container.push_back(a); 
       }