Changeset 401:2d0cccf7cc94 in lemon-0.x for src/work

Timestamp:

04/26/04 00:26:19 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Some bugfixes.
Some more docs.

Location:

src/work/alpar

Files:

• list_graph.h (modified) (7 diffs)
• list_graph_demo.cc (modified) (1 diff)

src/work/alpar/list_graph.h

@@ -16 +16 @@
   class SymListGraph;
 
-  ///A smart graph class.
+  ///A list graph class.
 
   ///This is a simple and fast erasable graph implementation.
@@ -724 +724 @@
   
 
-  ///A smart graph class.
-
-  ///This is a simple and fast erasable graph implementation.
+  ///A graph class containing only nodes.
+
+  ///This class implements a graph structure without edges.
+  ///The most useful application of this class is to be the node set of an
+  ///\ref EdgeSet class.
   ///
   ///It conforms to the graph interface documented under
-  ///the description of \ref GraphSkeleton.
-  ///\sa \ref GraphSkeleton.
+  ///the description of \ref GraphSkeleton with the exception that you cannot
+  ///add (or delete) edges. The usual edge iterators are exists, but they are
+  ///always \ref INVALID.
+  ///\sa \ref GraphSkeleton
+  ///\se \ref EdgeSet
   class NodeSet {
 
@@ -1115 +1120 @@
 
 
-  ///This is a simple and fast erasable graph implementation.
+  ///Graph structure using a node set of another graph.
+
+  ///This structure can be used to establish another graph over a node set
+  /// of an existing one. The node iterator will go through the nodes of the
+  /// original graph, and the NodeMap's of both graphs will convert to
+  /// each other.
+  ///
+  ///\param GG The type of the graph which shares its node set with this class.
+  ///Its interface must conform with \ref GraphSkeleton.
   ///
   ///It conforms to the graph interface documented under
   ///the description of \ref GraphSkeleton.
   ///\sa \ref GraphSkeleton.
+  ///\sa \ref NodeSet.
   template<typename GG>
   class EdgeSet {
@@ -1192 +1206 @@
   public:
 
-    EdgeSet(const NodeGraphType &_G) : G(_G),
-                                       nodes(_G), edges(),
-                                       first_free_edge(-1) {}
+    EdgeSet(NodeGraphType &_G) : G(_G),
+                                 nodes(_G), edges(),
+                                 first_free_edge(-1) { }
     EdgeSet(const EdgeSet &_g) : G(_g.G), nodes(_g.G), edges(_g.edges),
-                                 first_free_edge(_g.first_free_edge) {}
+                                 first_free_edge(_g.first_free_edge) { }
     
     ~EdgeSet()
@@ -1288 +1302 @@
       }
       
-      edges[n].tail = u.n; edges[n].head = v.n;
-
-      edges[n].next_out = nodes[u.n].first_out;
-      if(nodes[u.n].first_out != -1) edges[nodes[u.n].first_out].prev_out = n;
-      edges[n].next_in = nodes[v.n].first_in;
-      if(nodes[v.n].first_in != -1) edges[nodes[v.n].first_in].prev_in = n;
+      edges[n].tail = u; edges[n].head = v;
+
+      edges[n].next_out = nodes[u].first_out;
+      if(nodes[u].first_out != -1) edges[nodes[u].first_out].prev_out = n;
+      edges[n].next_in = nodes[v].first_in;
+      if(nodes[v].first_in != -1) edges[nodes[v].first_in].prev_in = n;
       edges[n].prev_in = edges[n].prev_out = -1;
         
-      nodes[u.n].first_out = nodes[v.n].first_in = n;
+      nodes[u].first_out = nodes[v].first_in = n;
 
       Edge e; e.n=n;
@@ -1374 +1388 @@
       NodeIt() : NodeGraphType::NodeIt() { }
       NodeIt (Invalid i) : NodeGraphType::NodeIt(i) {}
-      NodeIt(const EdgeSet& _G) : NodeGraphType::Node(_G.G) { }
+      NodeIt(const EdgeSet& _G) : NodeGraphType::NodeIt(_G.G) { }
       NodeIt(const typename NodeGraphType::NodeIt &n)
         : NodeGraphType::NodeIt(n) {}
@@ -1452 +1466 @@
       ///\todo It can copy between different types.
       ///
-      template<typename TT> friend class NodeMap;
+      template<typename TT>
       NodeMap(const typename NodeGraphType::NodeMap<TT> &m)
         : NodeGraphType::NodeMap<T>(m) { }

src/work/alpar/list_graph_demo.cc

@@ -121 +121 @@
     
   }
+
+  // Tests for NodeSet and EdgeSet
+  
+  {
+    NodeSet N;
+    
+    typedef EdgeSet<NodeSet> ES;
+    
+    ES E(N);
+    ES F(N);
+    for(int i=0;i<10;i++) G.addNode();
+    
+    for(ES::NodeIt n(E);E.valid(n);E.next(n))
+      for(ES::NodeIt m(E);E.valid(m);E.next(m))
+        if(n!=m) F.addEdge(n,m);
+    for(ES::NodeIt n(F);F.valid(n);F.next(n))
+      for(ES::NodeIt m(F);F.valid(m);F.next(m))
+        if(n<m) F.addEdge(n,m);
+    
+
+    NodeSet::NodeMap<int> nm1(N);
+    ES::NodeMap<int> nm2(E);
+    ES::EdgeMap<int> eme(E);
+    ES::EdgeMap<int> emf(F);
+    
+       
+  }
   
 }