diff -r 7b0558c52de3 -r 0248790c66ea lemon/smart_graph.h
--- a/lemon/smart_graph.h	Thu Mar 01 16:04:12 2007 +0000
+++ b/lemon/smart_graph.h	Thu Mar 01 16:47:23 2007 +0000
@@ -286,14 +286,14 @@
     {
       while(s.edge_num<edges.size()) {
         Edge edge = edgeFromId(edges.size()-1);
-	Parent::getNotifier(Edge()).erase(edge);
+	Parent::notifier(Edge()).erase(edge);
 	nodes[edges.back().source].first_out=edges.back().next_out;
 	nodes[edges.back().target].first_in=edges.back().next_in;
 	edges.pop_back();
       }
       while(s.node_num<nodes.size()) {
         Node node = nodeFromId(nodes.size()-1);
-	Parent::getNotifier(Node()).erase(node);
+	Parent::notifier(Node()).erase(node);
 	nodes.pop_back();
       }
     }    
@@ -505,13 +505,23 @@
 
     void firstInc(UEdge &edge, bool& d, const Node& v) const {
       int de = nodes[v.id].first_out;
-      edge.id = de / 2;
-      d = ((de & 1) == 1);
+      if (de != -1) {
+        edge.id = de / 2;
+        d = ((de & 1) == 1);
+      } else {
+        edge.id = -1;
+        d = true;
+      }
     }
     void nextInc(UEdge &edge, bool& d) const {
       int de = (edges[(edge.id * 2) | (d ? 1 : 0)].next_out);
-      edge.id = de / 2;
-      d = ((de & 1) == 1);
+      if (de != -1) {
+        edge.id = de / 2;
+        d = ((de & 1) == 1);
+      } else {
+        edge.id = -1;
+        d = true;      
+      }
     }
     
     static int id(Node v) { return v.id; }
@@ -641,11 +651,11 @@
       while(s.edge_num<edges.size()) {
         int n=edges.size()-1;
         UEdge edge=uEdgeFromId(n/2);
-	Parent::getNotifier(UEdge()).erase(edge);
+	Parent::notifier(UEdge()).erase(edge);
         std::vector<Edge> dir;
         dir.push_back(edgeFromId(n));
         dir.push_back(edgeFromId(n-1));
-	Parent::getNotifier(Edge()).erase(dir);
+	Parent::notifier(Edge()).erase(dir);
 	nodes[edges[n].target].first_out=edges[n].next_out;
 	nodes[edges[n-1].target].first_out=edges[n-1].next_out;
 	edges.pop_back();
@@ -654,7 +664,7 @@
       while(s.node_num<nodes.size()) {
         int n=nodes.size()-1;
         Node node = nodeFromId(n);
-	Parent::getNotifier(Node()).erase(node);
+	Parent::notifier(Node()).erase(node);
 	nodes.pop_back();
       }
     }    
@@ -1023,25 +1033,25 @@
     {
       while(s.edge_num<edges.size()) {
         UEdge edge = uEdgeFromId(edges.size()-1);
-	Parent::getNotifier(UEdge()).erase(edge);
+	Parent::notifier(UEdge()).erase(edge);
         std::vector<Edge> dir;
         dir.push_back(Parent::direct(edge, true));
         dir.push_back(Parent::direct(edge, false));
-	Parent::getNotifier(Edge()).erase(dir);
+	Parent::notifier(Edge()).erase(dir);
 	aNodes[edges.back().aNode >> 1].first=edges.back().next_out;
 	bNodes[edges.back().bNode >> 1].first=edges.back().next_in;
 	edges.pop_back();
       }
       while(s.anode_num<aNodes.size()) {
         Node node = nodeFromANodeId(aNodes.size() - 1);
-	Parent::getNotifier(ANode()).erase(node);
-	Parent::getNotifier(Node()).erase(node);
+	Parent::notifier(ANode()).erase(node);
+	Parent::notifier(Node()).erase(node);
 	aNodes.pop_back();
       }
       while(s.bnode_num<bNodes.size()) {
         Node node = nodeFromBNodeId(bNodes.size() - 1);
-	Parent::getNotifier(BNode()).erase(node);
-	Parent::getNotifier(Node()).erase(node);
+	Parent::notifier(BNode()).erase(node);
+	Parent::notifier(Node()).erase(node);
 	bNodes.pop_back();
       }
     }