Ticket #3: 3fe3c838a89e.patch

lemon/list_graph.h

@@ -56 +56 @@
 
     int first_free_arc;
 
+    int node_num, arc_num;
+
   public:
 
     typedef ListDigraphBase Digraph;
@@ -91 +93 @@
     };
 
 
+    ListDigraphBase()
+      : nodes(), first_node(-1), first_free_node(-1),
+        arcs(), first_free_arc(-1),
+        node_num(0), arc_num(0) {}
 
-    ListDigraphBase()
-      : nodes(), first_node(-1),
-        first_free_node(-1), arcs(), first_free_arc(-1) {}
 
+    typedef True NodeNumTag;
+    typedef True ArcNumTag;
+
+    int nodeNum() const { return node_num; }
+    int arcNum() const { return arc_num; }
 
     int maxNodeId() const { return nodes.size()-1; }
     int maxArcId() const { return arcs.size()-1; }
@@ -182 +190 @@
 
       nodes[n].first_in = nodes[n].first_out = -1;
 
+      ++node_num;
+
       return Node(n);
     }
 
@@ -213 +223 @@
 
       nodes[u.id].first_out = nodes[v.id].first_in = n;
 
+      ++arc_num;
+
       return Arc(n);
     }
 
@@ -233 +245 @@
       first_free_node = n;
       nodes[n].prev = -2;
 
+      --node_num;
     }
 
     void erase(const Arc& arc) {
@@ -262 +275 @@
       arcs[n].next_in = first_free_arc;
       first_free_arc = n;
       arcs[n].prev_in = -2;
+
+      --arc_num;
     }
 
     void clear() {
       arcs.clear();
       nodes.clear();
       first_node = first_free_node = first_free_arc = -1;
+      node_num = arc_num = 0;
     }
 
   protected:
@@ -794 +810 @@
 
     int first_free_arc;
 
+    int node_num, edge_num;
+
   public:
 
     typedef ListGraphBase Digraph;
@@ -855 +873 @@
 
     ListGraphBase()
       : nodes(), first_node(-1),
-        first_free_node(-1), arcs(), first_free_arc(-1) {}
+        first_free_node(-1), arcs(), first_free_arc(-1),
+        node_num(0), edge_num(0) {}
 
+
+    typedef True NodeNumTag;
+    typedef True EdgeNumTag;
+    typedef True ArcNumTag;
+
+    int nodeNum() const { return node_num; }
+    int edgeNum() const { return edge_num; }
+    int arcNum() const { return edge_num * 2; }
 
     int maxNodeId() const { return nodes.size()-1; }
     int maxEdgeId() const { return arcs.size() / 2 - 1; }
@@ -1023 +1050 @@
 
       nodes[n].first_out = -1;
 
+      ++node_num;
+
       return Node(n);
     }
 
@@ -1055 +1084 @@
       arcs[n | 1].prev_out = -1;
       nodes[u.id].first_out = (n | 1);
 
+      ++edge_num;
+
       return Edge(n / 2);
     }
 
@@ -1074 +1105 @@
       nodes[n].next = first_free_node;
       first_free_node = n;
       nodes[n].prev = -2;
+
+      --node_num;
     }
 
     void erase(const Edge& edge) {
@@ -1104 +1137 @@
       arcs[n].prev_out = -2;
       arcs[n | 1].prev_out = -2;
 
+      --edge_num;
     }
 
     void clear() {
       arcs.clear();
       nodes.clear();
       first_node = first_free_node = first_free_arc = -1;
+      node_num = edge_num = 0;
     }
 
   protected: