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

Timestamp:

05/03/04 09:27:29 (20 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.

Location:

src/include

Files:

• skeletons/graph.h (modified) (9 diffs)
• smart_graph.h (modified) (5 diffs)

src/include/skeletons/graph.h

@@ -1 +1 @@
 // -*- c++ -*-
-#ifndef HUGO_GRAPH_H
-#define HUGO_GRAPH_H
+#ifndef HUGO_SKELETON_GRAPH_H
+#define HUGO_SKELETON_GRAPH_H
 
 ///\file
@@ -59 +59 @@
       /// Two iterators are equal if and only if they point to the
       /// same object or both are invalid.
-      bool operator==(Node n) const { return true; }
+      bool operator==(Node) const { return true; }
 
       /// \sa \ref operator==(Node n)
       ///
-      bool operator!=(Node n) const { return true; }
-
-      bool operator<(Node n) const { return true; }
+      bool operator!=(Node) const { return true; }
+
+      bool operator<(Node) const { return true; }
     };
     
@@ -91 +91 @@
       /// @warning The default constructor sets the iterator
       /// to an undefined value.
-      NodeIt(const NodeIt &) {}
+      NodeIt(const NodeIt &n) : Node(n) {}
     };
     
@@ -105 +105 @@
       /// Two iterators are equal if and only if they point to the
       /// same object or both are invalid.
-      bool operator==(Edge n) const { return true; }
-      bool operator!=(Edge n) const { return true; }
-      bool operator<(Edge n) const { return true; }
+      bool operator==(Edge) const { return true; }
+      bool operator!=(Edge) const { return true; }
+      bool operator<(Edge) const { return true; }
     };
     
@@ -188 +188 @@
 
     /// The first incoming edge.
-    InEdgeIt &first(InEdgeIt &i, Node n) const { return i;}
+    InEdgeIt &first(InEdgeIt &i, Node) const { return i;}
     /// The first outgoing edge.
-    OutEdgeIt &first(OutEdgeIt &i, Node n) const { return i;}
+    OutEdgeIt &first(OutEdgeIt &i, Node) const { return i;}
     //  SymEdgeIt &first(SymEdgeIt &, Node) const { return i;}
     /// The first edge of the Graph.
@@ -259 +259 @@
     ///and head node \c head.
     ///\return the new edge.
-    Edge addEdge(Node tail, Node head) { return INVALID;}
+    Edge addEdge(Node, Node) { return INVALID;}
     
     /// Resets the graph.
@@ -295 +295 @@
       /// Sets the value associated with node \c i to the value \c t.
       ///
-      void set(Node i, T t) {}
-      /// Gets the value of a node.
-      T get(Node i) const {return *(T*)0;}  //FIXME: Is it necessary
-      T &operator[](Node i) {return *(T*)0;}
-      const T &operator[](Node i) const {return *(T*)0;}
+      void set(Node, T) {}
+      // Gets the value of a node.
+      //T get(Node i) const {return *(T*)0;}  //FIXME: Is it necessary?
+      T &operator[](Node) {return *(T*)0;}
+      const T &operator[](Node) const {return *(T*)0;}
 
       /// Updates the map if the graph has been changed
@@ -327 +327 @@
       EdgeMap(const GraphSkeleton &G, T t) {}
     
-      void set(Edge i, T t) {}
-      T get(Edge i) const {return *(T*)0;}
-      T &operator[](Edge i) {return *(T*)0;}
+      ///\todo It can copy between different types.
+      ///
+      template<typename TT> EdgeMap(const EdgeMap<TT> &m) {}
+
+      void set(Edge, T) {}
+      //T get(Edge) const {return *(T*)0;}
+      T &operator[](Edge) {return *(T*)0;}
+      const T &operator[](Edge) const {return *(T*)0;}
     
       void update() {}
@@ -392 +397 @@
 // }
 
-#endif // HUGO_GRAPH_H
+#endif // HUGO_SKELETON_GRAPH_H

src/include/smart_graph.h

@@ -81 +81 @@
   public:
 
+
     class NodeIt;
     class EdgeIt;
@@ -139 +140 @@
     bool valid(Node n) const { return n.n!=-1; }
     
+    ///\deprecated Use
+    ///\code
+    ///  e=INVALID;
+    ///\endcode
+    ///instead.
     void setInvalid(Edge &e) { e.n=-1; }
+    ///\deprecated Use
+    ///\code
+    ///  e=INVALID;
+    ///\endcode
+    ///instead.
     void setInvalid(Node &n) { n.n=-1; }
     
@@ -198 +209 @@
     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;}
@@ -380 +391 @@
         DynMapBase<Edge>(*m.G), container(m.container)
       {
-        G->dyn_node_maps.push_back(this);
+        G->dyn_edge_maps.push_back(this);
       }
 
@@ -390 +401 @@
         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();