Changeset 1909:2d806130e700 in lemon-0.x for lemon/bits/static_map.h

Timestamp:

01/26/06 16:42:13 (18 years ago)

Author:

Mihaly Barasz

Branch:

default

Phase:

public

Convert:

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

Message:

Undir -> U transition

File:

• lemon/bits/static_map.h (modified) (9 diffs)

lemon/bits/static_map.h

@@ -306 +306 @@
   /// \e
   template <typename _Base> 
-  class StaticMappableUndirGraphExtender : 
+  class StaticMappableUGraphExtender : 
     public StaticMappableGraphExtender<_Base> {
   public:
 
-    typedef StaticMappableUndirGraphExtender Graph;
+    typedef StaticMappableUGraphExtender Graph;
     typedef StaticMappableGraphExtender<_Base> Parent;
 
-    typedef typename Parent::UndirEdge UndirEdge;
-
-    template <typename _Value>
-    class UndirEdgeMap 
-      : public IterableMapExtender<StaticMap<Graph, UndirEdge, _Value> > {
-    public:
-      typedef StaticMappableUndirGraphExtender Graph;
+    typedef typename Parent::UEdge UEdge;
+
+    template <typename _Value>
+    class UEdgeMap 
+      : public IterableMapExtender<StaticMap<Graph, UEdge, _Value> > {
+    public:
+      typedef StaticMappableUGraphExtender Graph;
       typedef IterableMapExtender<
-        StaticMap<Graph, UndirEdge, _Value> > Parent;
-
-      UndirEdgeMap(const Graph& _g) 
-        : Parent(_g) {}
-      UndirEdgeMap(const Graph& _g, const _Value& _v) 
-        : Parent(_g, _v) {}
-
-      UndirEdgeMap& operator=(const UndirEdgeMap& cmap) {
-        return operator=<UndirEdgeMap>(cmap);
-      }
-
-      template <typename CMap>
-      UndirEdgeMap& operator=(const CMap& cmap) {
-        checkConcept<concept::ReadMap<UndirEdge, _Value>, CMap>();
-        const typename Parent::Graph* graph = Parent::getGraph();
-        UndirEdge it;
+        StaticMap<Graph, UEdge, _Value> > Parent;
+
+      UEdgeMap(const Graph& _g) 
+        : Parent(_g) {}
+      UEdgeMap(const Graph& _g, const _Value& _v) 
+        : Parent(_g, _v) {}
+
+      UEdgeMap& operator=(const UEdgeMap& cmap) {
+        return operator=<UEdgeMap>(cmap);
+      }
+
+      template <typename CMap>
+      UEdgeMap& operator=(const CMap& cmap) {
+        checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
+        const typename Parent::Graph* graph = Parent::getGraph();
+        UEdge it;
         for (graph->first(it); it != INVALID; graph->next(it)) {
           Parent::set(it, cmap[it]);
@@ -347 +347 @@
 
   template <typename _Base>
-  class StaticMappableUndirBipartiteGraphExtender : public _Base {
+  class StaticMappableUBipartiteGraphExtender : public _Base {
   public:
 
     typedef _Base Parent;
-    typedef StaticMappableUndirBipartiteGraphExtender Graph;
+    typedef StaticMappableUBipartiteGraphExtender Graph;
 
     typedef typename Parent::Node Node;
@@ -357 +357 @@
     typedef typename Parent::LowerNode LowerNode;
     typedef typename Parent::Edge Edge;
-    typedef typename Parent::UndirEdge UndirEdge;
+    typedef typename Parent::UEdge UEdge;
     
     template <typename _Value>
@@ -363 +363 @@
       : public IterableMapExtender<StaticMap<Graph, UpperNode, _Value> > {
     public:
-      typedef StaticMappableUndirBipartiteGraphExtender Graph;
+      typedef StaticMappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender<StaticMap<Graph, UpperNode, _Value> > 
       Parent;
@@ -400 +400 @@
       : public IterableMapExtender<StaticMap<Graph, LowerNode, _Value> > {
     public:
-      typedef StaticMappableUndirBipartiteGraphExtender Graph;
+      typedef StaticMappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender<StaticMap<Graph, LowerNode, _Value> > 
       Parent;
@@ -438 +438 @@
     class NodeMapBase : public Parent::NodeNotifier::ObserverBase {
     public:
-      typedef StaticMappableUndirBipartiteGraphExtender Graph;
+      typedef StaticMappableUBipartiteGraphExtender Graph;
 
       typedef Node Key;
@@ -518 +518 @@
       : public IterableMapExtender<NodeMapBase<_Value> > {
     public:
-      typedef StaticMappableUndirBipartiteGraphExtender Graph;
+      typedef StaticMappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender< NodeMapBase<_Value> > Parent;
     
@@ -556 +556 @@
       : public IterableMapExtender<StaticMap<Graph, Edge, _Value> > {
     public:
-      typedef StaticMappableUndirBipartiteGraphExtender Graph;
+      typedef StaticMappableUBipartiteGraphExtender Graph;
       typedef IterableMapExtender<StaticMap<Graph, Edge, _Value> > Parent;
     
@@ -581 +581 @@
 
     template <typename _Value>
-    class UndirEdgeMap 
-      : public IterableMapExtender<StaticMap<Graph, UndirEdge, _Value> > {
-    public:
-      typedef StaticMappableUndirBipartiteGraphExtender Graph;
-      typedef IterableMapExtender<StaticMap<Graph, UndirEdge, _Value> > 
+    class UEdgeMap 
+      : public IterableMapExtender<StaticMap<Graph, UEdge, _Value> > {
+    public:
+      typedef StaticMappableUBipartiteGraphExtender Graph;
+      typedef IterableMapExtender<StaticMap<Graph, UEdge, _Value> > 
       Parent;
     
-      UndirEdgeMap(const Graph& _g) 
-        : Parent(_g) {}
-      UndirEdgeMap(const Graph& _g, const _Value& _v) 
-        : Parent(_g, _v) {}
-    
-      UndirEdgeMap& operator=(const UndirEdgeMap& cmap) {
-        return operator=<UndirEdgeMap>(cmap);
-      }
-    
-      template <typename CMap>
-      UndirEdgeMap& operator=(const CMap& cmap) {
-        checkConcept<concept::ReadMap<UndirEdge, _Value>, CMap>();
-        const typename Parent::Graph* graph = Parent::getGraph();
-        UndirEdge it;
+      UEdgeMap(const Graph& _g) 
+        : Parent(_g) {}
+      UEdgeMap(const Graph& _g, const _Value& _v) 
+        : Parent(_g, _v) {}
+    
+      UEdgeMap& operator=(const UEdgeMap& cmap) {
+        return operator=<UEdgeMap>(cmap);
+      }
+    
+      template <typename CMap>
+      UEdgeMap& operator=(const CMap& cmap) {
+        checkConcept<concept::ReadMap<UEdge, _Value>, CMap>();
+        const typename Parent::Graph* graph = Parent::getGraph();
+        UEdge it;
         for (graph->first(it); it != INVALID; graph->next(it)) {
           Parent::set(it, cmap[it]);