Changeset 503:769f31e9f7b0 in lemon-0.x for src/work/alpar

Timestamp:

05/03/04 09:27:29 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

test/graph_test.cc added.
It discovered several bugs and warnings in 'include/smart_graph.h',
in 'include/skeletons/graph.h' and in 'work/alpar/list_graph.h'.
They have also been fixed.

File:

• src/work/alpar/list_graph.h (modified) (8 diffs)

src/work/alpar/list_graph.h

@@ -317 +317 @@
     public:
       Node() {}
-      Node (Invalid i) { n=-1; }
+      Node (Invalid) { n=-1; }
       bool operator==(const Node i) const {return n==i.n;}
       bool operator!=(const Node i) const {return n!=i.n;}
@@ -504 +504 @@
         DynMapBase<Edge>(*m.G), container(m.container)
       {
-        G->dyn_node_maps.push_back(this);
+        G->dyn_edge_maps.push_back(this);
       }
 
@@ -514 +514 @@
         DynMapBase<Edge>(*m.G)
       {
-        G->dyn_node_maps.push_back(this);
+        G->dyn_edge_maps.push_back(this);
         typename std::vector<TT>::const_iterator i;
         for(typename std::vector<TT>::const_iterator i=m.container.begin();
@@ -1295 +1295 @@
       }
       else {
-        typename NodeGraphType::Node n;
-        for(n=G.next(edges[it.n].head);
-            G.valid(n) && nodes[n].first_in == -1;
-            G.next(n)) ;
-        it.n = (G.valid(n))?-1:nodes[n].first_in;
+        NodeIt n;
+        for(n=next(edges[it.n].head);
+            valid(n) && nodes[n].first_in == -1;
+            next(n)) ;
+        it.n = (valid(n))?-1:nodes[n].first_in;
       }
       return it;
@@ -1386 +1386 @@
 //     }
 
+  public:
     class Node : public NodeGraphType::Node {
       friend class EdgeSet;
@@ -1445 +1446 @@
     public:
       EdgeIt(const EdgeSet& G) : Edge() {
-        typename NodeGraphType::Node m;
+        //              typename NodeGraphType::Node m;
+        NodeIt m;
         for(G.first(m);
-            G.valid(m) && nodes[m].first_in == -1;  G.next[m]);
-        n = G.valid(m)?-1:nodes[m].first_in;
+            G.valid(m) && G.nodes[m].first_in == -1;  G.next(m));
+        n = G.valid(m)?-1:G.nodes[m].first_in;
       }
       EdgeIt (Invalid i) : Edge(i) { }
@@ -1515 +1517 @@
         DynMapBase<Edge>(*m.G), container(m.container)
       {
-        G->dyn_node_maps.push_back(this);
+        G->dyn_edge_maps.push_back(this);
       }
 
@@ -1525 +1527 @@
         DynMapBase<Edge>(*m.G)
       {
-        G->dyn_node_maps.push_back(this);
+        G->dyn_edge_maps.push_back(this);
         typename std::vector<TT>::const_iterator i;
         for(typename std::vector<TT>::const_iterator i=m.container.begin();