Changeset 285:0bc5f7f66bfa in lemon-0.x for src/include

Timestamp:

04/03/04 20:42:39 (21 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

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

Message:

Many of the old stuffs has been finally removed.

File:

• src/include/smart_graph.h (modified) (5 diffs)

src/include/smart_graph.h

@@ -80 +80 @@
     class InEdgeIt;
     
-    //     class Node { int n; };
-    //     class NodeIt : public Node { };
-    //     class Edge { int n; };
-    //     class EdgeIt : public Edge {};
-    //     class OutEdgeIt : public Edge {};
-    //     class InEdgeIt : public Edge {};
-    //     class SymEdge;
-    
     template <typename T> class NodeMap;
     template <typename T> class EdgeMap;
     
   public:
-
-    /* default constructor */
 
     SmartGraph() : nodes(), edges() { }
@@ -119 +109 @@
     Node head(Edge e) const { return edges[e.n].head; }
 
-    // Marci
     Node aNode(OutEdgeIt e) const { return edges[e.n].tail; }
     Node aNode(InEdgeIt e) const { return edges[e.n].head; }
-//     //Node aNode(const SymEdge& e) const { return e.aNode(); }
-
-    // Marci
+
     Node bNode(OutEdgeIt e) const { return edges[e.n].head; }
     Node bNode(InEdgeIt e) const { return edges[e.n].tail; }
-//     //Node bNode(const SymEdge& e) const { return e.bNode(); }
 
     NodeIt& first(NodeIt& v) const { 
@@ -273 +259 @@
       InEdgeIt(const SmartGraph& G,Node v) :Edge(G.nodes[v.n].first_in){}
     };
-
-    // Map types
-
-//     // Static Maps are not necessary.
-//     template <typename T>
-//     class NodeMap {
-//       const SmartGraph& G; 
-//       std::vector<T> container;
-//     public:
-//       typedef T ValueType;
-//       typedef Node KeyType;
-//       NodeMap(const SmartGraph& _G) : G(_G), container(G.maxNodeId()) { }
-//       NodeMap(const SmartGraph& _G, T a) : 
-//      G(_G), container(G.maxNodeId(), a) { }
-//       void set(Node n, T a) { container[n.n]=a; }
-//       T get(Node n) const { return container[n.n]; }
-//       T& operator[](Node n) { return container[n.n]; }
-//       const T& operator[](Node n) const { return container[n.n]; }
-//       void update() { container.resize(G.maxNodeId()); }
-//       void update(T a) { container.resize(G.maxNodeId(), a); }
-//     };
-
-//     template <typename T>
-//     class EdgeMap {
-//       const SmartGraph& G; 
-//       std::vector<T> container;
-//     public:
-//       typedef T ValueType;
-//       typedef Edge KeyType;
-//       EdgeMap(const SmartGraph& _G) : G(_G), container(G.maxEdgeId()) { }
-//       EdgeMap(const SmartGraph& _G, T a) : 
-//      G(_G), container(G.maxEdgeId(), a) { }
-//       void set(Edge e, T a) { container[e.n]=a; }
-//       T get(Edge e) const { return container[e.n]; }
-//       T& operator[](Edge e) { return container[e.n]; } 
-//       const T& operator[](Edge e) const { return container[e.n]; } 
-//       void update() { container.resize(G.maxEdgeId()); }
-//       void update(T a) { container.resize(G.maxEdgeId(), a); }
-//     };
 
     template <typename T> class NodeMap : public DynMapBase<Node>
@@ -375 +322 @@
       
       void set(Node n, T a) { container[n.n]=a; }
-      //T get(Node n) const { return container[n.n]; }
-      //Hajjaj:
-      //T& operator[](Node n) { return container[n.n]; }
+      //'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) const { 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]; }
@@ -401 +346 @@
       }
       
-      void update() {}    //Useless for DynMaps
-      void update(T a) {}  //Useless for DynMaps
+      void update() {}    //Useless for Dynamic Maps
+      void update(T a) {}  //Useless for Dynamic Maps
     };