Changeset 985:741f3108a90f in lemon-0.x for src/lemon

Timestamp:

11/13/04 13:24:01 (20 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Bugfixes in UndirFullGraphBase?

File:

• src/lemon/full_graph.h (modified) (5 diffs)

src/lemon/full_graph.h

@@ -297 +297 @@
       
     class Node {
-      friend class FullGraphBase;
+      friend class UndirFullGraphBase;
 
     protected:
@@ -313 +313 @@
 
     class Edge {
-      friend class FullGraphBase;
+      friend class UndirFullGraphBase;
       
     protected:
@@ -320 +320 @@
       Edge(int _id) : id(_id) {}
 
-      Edge(const FullGraphBase& _graph, int tail, int head) 
+      Edge(const UndirFullGraphBase& _graph, int tail, int head) 
         : id(_graph.NodeNum * head+tail) {}
     public:
@@ -351 +351 @@
 
     /// \todo with specialized iterators we can make faster iterating
-    void nextOut(Edge& edge) const {
+    void nextOut(Edge& e) const {
       int tail = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
       int head = e.id - (tail) * (tail - 1) / 2; 
       ++head;
-      return head < tail ? tail * (tail - 1) / 2 + head : -1;
+      e.id = head < tail ? tail * (tail - 1) / 2 + head : -1;
     }
 
@@ -362 +362 @@
     }
     
-    void nextIn(Edge& edge) const {
+    void nextIn(Edge& e) const {
       int tail = ((int)sqrt((double)(1 + 8 * e.id)) + 1) / 2;;
       int head = e.id - (tail) * (tail - 1) / 2; ++head;
       ++tail;
-      return tail < nodeNum ? tail * (tail - 1) / 2 + head : -1;
+      e.id = tail < NodeNum ? tail * (tail - 1) / 2 + head : -1;
     }