Changeset 782:df2e45e09652 in lemon-0.x for src/hugo/full_graph.h

Timestamp:

09/02/04 12:07:30 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

--This line, and those below, will be ignored--

A hugo/sym_map_factory.h
M hugo/list_graph.h
A hugo/array_map_factory.h
A hugo/map_registry.h
M hugo/smart_graph.h
A hugo/map_defines.h
A hugo/extended_pair.h
M hugo/full_graph.h
A hugo/vector_map_factory.h

File:

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

src/hugo/full_graph.h

@@ -9 +9 @@
 
 #include <vector>
-#include <limits.h>
+#include <climits>
 
 #include <hugo/invalid.h>
+
+#include <hugo/map_registry.h>
+#include <hugo/array_map_factory.h>
 
 namespace hugo {
@@ -34 +37 @@
     int EdgeNum;
   public:
-    template <typename T> class EdgeMap;
-    template <typename T> class NodeMap;
+
+    typedef FullGraph Graph;
 
     class Node;
     class Edge;
+
     class NodeIt;
     class EdgeIt;
@@ -44 +48 @@
     class InEdgeIt;
     
-    template <typename T> class NodeMap;
-    template <typename T> class EdgeMap;
+    CREATE_MAP_REGISTRIES;
+    CREATE_MAPS(ArrayMapFactory);
     
   public:
@@ -86 +90 @@
     Edge findEdge(Node u,Node v, Edge prev = INVALID) 
     {
-      return prev.n==-1?Edge(*this,u.n,v.n):INVALID;
+      return prev.n == -1 ? Edge(*this, u.n, v.n) : INVALID;
     }
     
@@ -188 +192 @@
     };
 
-    template <typename T> class NodeMap
-    {
-      std::vector<T> container;
-
-    public:
-      typedef T ValueType;
-      typedef Node KeyType;
-
-      NodeMap(const FullGraph &_G) : container(_G.NodeNum) { }
-      NodeMap(const FullGraph &_G,const T &t) : container(_G.NodeNum,t) { }
-      NodeMap(const NodeMap<T> &m) : container(m.container) { }
-
-      template<typename TT> friend class NodeMap;
-      ///\todo It can copy between different types.
-      template<typename TT> NodeMap(const NodeMap<TT> &m)
-        : container(m.container.size())
-      {
-        typename std::vector<TT>::const_iterator i;
-        for(typename std::vector<TT>::const_iterator i=m.container.begin();
-            i!=m.container.end();
-            i++)
-          container.push_back(*i);
-      }
-      void set(Node n, T a) { container[n.n]=a; }
-      //'T& operator[](Node n)' would be wrong here
-      typename std::vector<T>::reference
-      operator[](Node n) { return container[n.n]; }
-      //'const T& operator[](Node n)' would be wrong here
-      typename std::vector<T>::const_reference 
-      operator[](Node n) const { return container[n.n]; }
-
-      ///\warning There is no safety check at all!
-      ///Using operator = between maps attached to different graph may
-      ///cause serious problem.
-      ///\todo Is this really so?
-      ///\todo It can copy between different types.
-      const NodeMap<T>& operator=(const NodeMap<T> &m)
-      {
-        container = m.container;
-        return *this;
-      }
-      template<typename TT>
-      const NodeMap<T>& operator=(const NodeMap<TT> &m)
-      {
-        std::copy(m.container.begin(), m.container.end(), container.begin());
-        return *this;
-      }
-      
-      void update() {}    //Useless for Dynamic Maps
-      void update(T a) {}  //Useless for Dynamic Maps
-    };
-    
-    template <typename T> class EdgeMap
-    {
-      std::vector<T> container;
-
-    public:
-      typedef T ValueType;
-      typedef Edge KeyType;
-
-      EdgeMap(const FullGraph &_G) : container(_G.EdgeNum) { }
-      EdgeMap(const FullGraph &_G,const T &t) : container(_G.EdgeNum,t) { } 
-      EdgeMap(const EdgeMap<T> &m) : container(m.container) { }
-
-      template<typename TT> friend class EdgeMap;
-      ///\todo It can copy between different types. 
-      ///\todo We could use 'copy'
-      template<typename TT> EdgeMap(const EdgeMap<TT> &m) :
-        container(m.container.size())
-      {
-        typename std::vector<TT>::const_iterator i;
-        for(typename std::vector<TT>::const_iterator i=m.container.begin();
-            i!=m.container.end();
-            i++)
-          container.push_back(*i);
-      }
-      void set(Edge n, T a) { container[n.n]=a; }
-      //T get(Edge n) const { return container[n.n]; }
-      typename std::vector<T>::reference
-      operator[](Edge n) { return container[n.n]; }
-      typename std::vector<T>::const_reference
-      operator[](Edge n) const { return container[n.n]; }
-
-      ///\warning There is no safety check at all!
-      ///Using operator = between maps attached to different graph may
-      ///cause serious problem.
-      ///\todo Is this really so?
-      ///\todo It can copy between different types.
-      const EdgeMap<T>& operator=(const EdgeMap<T> &m)
-      {
-        container = m.container;
-        return *this;
-      }
-      template<typename TT>
-      const EdgeMap<T>& operator=(const EdgeMap<TT> &m)
-      {
-        std::copy(m.container.begin(), m.container.end(), container.begin());
-        return *this;
-      }
-
-      void update() {}
-      void update(T a) {}
-    };
-
   };