Changeset 2381:0248790c66ea in lemon-0.x for lemon/smart_graph.h

Timestamp:

03/01/07 17:47:23 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Bug fix

File:

• lemon/smart_graph.h (modified) (7 diffs)

lemon/smart_graph.h

@@ -287 +287 @@
       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;
@@ -294 +294 @@
       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();
       }
@@ -506 +506 @@
     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;      
+      }
     }
     
@@ -642 +652 @@
         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;
@@ -655 +665 @@
         int n=nodes.size()-1;
         Node node = nodeFromId(n);
-        Parent::getNotifier(Node()).erase(node);
+        Parent::notifier(Node()).erase(node);
         nodes.pop_back();
       }
@@ -1024 +1034 @@
       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;
@@ -1035 +1045 @@
       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();
       }