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

Timestamp:

01/20/04 18:39:13 (21 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_list_graph.hh (modified) (6 diffs)

src/work/marci_list_graph.hh

@@ -20 +20 @@
     int node_id;
     int edge_id;
+    int _node_num;
+    int _edge_num;
 
     node_item* _first_node;
@@ -81 +83 @@
       _last_node=p;
       if (!_first_node) _first_node=p;
+      ++_node_num;
       return p;
     }
@@ -99 +102 @@
       _head->_last_in_edge=e;
       if (!_head->_first_in_edge) { _head->_first_in_edge=e; } 
+      ++_edge_num;
       return e;
     }
@@ -106 +110 @@
     /* default constructor */
 
-    list_graph() : node_id(0), edge_id(0), _first_node(0), _last_node(0) { }
-    
+    list_graph() : node_id(0), edge_id(0), _node_num(0), _edge_num(0), _first_node(0), _last_node(0) { }
+    
+    int node_num() { return _node_num; }
+    int edge_num() { return _edge_num; }
+
     /* functions to construct iterators from the graph, or from each other */
 
@@ -210 +217 @@
       node_iterator() : node(0) { }
       node_iterator(node_item* _node) : node(_node) { }
-      bool is_valid() { return (node!=0); }
+      bool valid() { return (node!=0); }
       void make_invalid() { node=0; }
       friend bool operator==(const node_iterator& u, const node_iterator& v) { 
@@ -240 +247 @@
       edge_iterator() : edge(0) { }
       edge_iterator(edge_item* _edge) : edge(_edge) { }
-      bool is_valid() { return (edge!=0); }
+      bool valid() { return (edge!=0); }
       void make_invalid() { edge=0; }
       friend bool operator==(const edge_iterator& u, const edge_iterator& v) {