Changeset 627:6cc21a9c9fda in lemon-0.x for src/work/deba/test_graph.h

Timestamp:

05/13/04 10:20:39 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

 

File:

• src/work/deba/test_graph.h (modified) (4 diffs)

src/work/deba/test_graph.h

@@ -31 +31 @@
     class SymEdgeIt;
     
-//    template <typename T> class NodeMap;
-//    template <typename T> class EdgeMap;
+    //    template <typename T> class NodeMap;
+    //    template <typename T> class EdgeMap;
   private:
-//    template <typename T> friend class NodeMap;
- //   template <typename T> friend class EdgeMap;
+    //    template <typename T> friend class NodeMap;
+    //   template <typename T> friend class EdgeMap;
  
   private:
 
  
-        public:
+  public:
         
-                typedef MapBase<ListGraph, Node, NodeIt> NodeMapBase;
-                typedef MapRegistry<ListGraph, Node, NodeIt> NodeMapRegistry;
-                typedef VectorMapFactory<ListGraph, Node, NodeIt> NodeMapFactory;
-                NodeMapRegistry node_maps;
-
-
-
-                typedef MapBase<ListGraph, Edge, EdgeIt> EdgeMapBase;
-                typedef MapRegistry<ListGraph, Edge, EdgeIt> EdgeMapRegistry;
-                typedef VectorMapFactory<ListGraph, Edge, EdgeIt> EdgeMapFactory;
-                EdgeMapRegistry edge_maps;
+    typedef MapRegistry<ListGraph, Node, NodeIt> NodeMapRegistry;
+    typedef VectorMapFactory<NodeMapRegistry> NodeMapFactory;
+    NodeMapRegistry node_maps;
+
+
+
+    typedef MapRegistry<ListGraph, Edge, EdgeIt> EdgeMapRegistry;
+    typedef VectorMapFactory<EdgeMapRegistry> EdgeMapFactory;
+    EdgeMapRegistry edge_maps;
  
 
@@ -303 +301 @@
 
     Node addNode() { 
-                        Node n = _add_node();
-                        node_maps.add(n);
-                        return n; 
-                }
+      Node n = _add_node();
+      node_maps.add(n);
+      return n; 
+    }
     Edge addEdge(Node u, Node v) {
-                        Edge e = _add_edge(u.node, v.node);
-                        edge_maps.add(e);
+      Edge e = _add_edge(u.node, v.node);
+      edge_maps.add(e);
       return e; 
     }
 
     void erase(Node i) { 
-                        node_maps.erase(i);
+      node_maps.erase(i);
       while (first<OutEdgeIt>(i).valid()) erase(first<OutEdgeIt>(i));
       while (first<InEdgeIt>(i).valid()) erase(first<InEdgeIt>(i));
@@ -321 +319 @@
   
     void erase(Edge e) { 
-                        edge_maps.erase(e);
-                        _delete_edge(e.edge); 
-                }
+      edge_maps.erase(e);
+      _delete_edge(e.edge); 
+    }
 
     void clear() { 
@@ -511 +509 @@
   };
 
-//   template< typename T >
-//   T ListGraph::first() const { 
-//     std::cerr << "Invalid use of template<typemane T> T ListGraph::first<T>();" << std::endl; 
-//     return T(); 
-//   }
-
-//   template<>
-//   ListGraph::NodeIt ListGraph::first<ListGraph::NodeIt>() const { 
-//     return firstNode(); 
-//   }
-
-//   template<>
-//   ListGraph::EdgeIt ListGraph::first<ListGraph::EdgeIt>() const { 
-//     return firstEdge(); 
-//   }
-
-//   template< typename T >
-//   T ListGraph::first(ListGraph::Node v) const {
-//     std::cerr << "Invalid use of template<typemane T> T ListGraph::first<T>(ListGRaph::Node);" << std::endl; 
-//     return T(); 
-//   } 
-
-//   template<>
-//   ListGraph::OutEdgeIt ListGraph::first<ListGraph::OutEdgeIt>(const ListGraph::Node v) const { 
-//     return firstOutEdge(v); 
-//   }
-
-//   template<>
-//   ListGraph::InEdgeIt ListGraph::first<ListGraph::InEdgeIt>(const ListGraph::Node v) const { 
-//     return firstInEdge(v); 
-//   }
-
-//   template<>
-//   ListGraph::SymEdgeIt ListGraph::first<ListGraph::SymEdgeIt>(const ListGraph::Node v) const { 
-//     return firstSymEdge(v); 
-//   }
+  //   template< typename T >
+  //   T ListGraph::first() const { 
+  //     std::cerr << "Invalid use of template<typemane T> T ListGraph::first<T>();" << std::endl; 
+  //     return T(); 
+  //   }
+
+  //   template<>
+  //   ListGraph::NodeIt ListGraph::first<ListGraph::NodeIt>() const { 
+  //     return firstNode(); 
+  //   }
+
+  //   template<>
+  //   ListGraph::EdgeIt ListGraph::first<ListGraph::EdgeIt>() const { 
+  //     return firstEdge(); 
+  //   }
+
+  //   template< typename T >
+  //   T ListGraph::first(ListGraph::Node v) const {
+  //     std::cerr << "Invalid use of template<typemane T> T ListGraph::first<T>(ListGRaph::Node);" << std::endl; 
+  //     return T(); 
+  //   } 
+
+  //   template<>
+  //   ListGraph::OutEdgeIt ListGraph::first<ListGraph::OutEdgeIt>(const ListGraph::Node v) const { 
+  //     return firstOutEdge(v); 
+  //   }
+
+  //   template<>
+  //   ListGraph::InEdgeIt ListGraph::first<ListGraph::InEdgeIt>(const ListGraph::Node v) const { 
+  //     return firstInEdge(v); 
+  //   }
+
+  //   template<>
+  //   ListGraph::SymEdgeIt ListGraph::first<ListGraph::SymEdgeIt>(const ListGraph::Node v) const { 
+  //     return firstSymEdge(v); 
+  //   }