Changeset 891:74589d20dbc3 in lemon-0.x for src/hugo/graph_wrapper.h

Timestamp:

09/21/04 00:57:48 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

template<typename CMap> Map(const CMap&) like constructors and
assigns are removed.

File:

• src/hugo/graph_wrapper.h (modified) (13 diffs)

src/hugo/graph_wrapper.h

@@ -287 +287 @@
       return GraphWrapper<Graph>::tail(e); }
 
-    KEEP_MAPS(Parent, RevGraphWrapper);
+    //    KEEP_MAPS(Parent, RevGraphWrapper);
 
   };
@@ -494 +494 @@
     }
 
-    KEEP_MAPS(Parent, SubGraphWrapper);
+    //    KEEP_MAPS(Parent, SubGraphWrapper);
   };
 
@@ -559 +559 @@
         return this->graph->tail(e); }
 
-    KEEP_MAPS(Parent, UndirGraphWrapper);
+    //    KEEP_MAPS(Parent, UndirGraphWrapper);
 
   };
@@ -566 +566 @@
   ///
   ///\warning Graph wrappers are in even more experimental state than the other
-  ///parts of the lib. Use them at you own risk.
+  ///parts of the lib. Use them at your own risk.
   ///
   /// An undirected graph template.
@@ -582 +582 @@
     }
 
-    KEEP_MAPS(Parent, UndirGraph);
+    //    KEEP_MAPS(Parent, UndirGraph);
   };
 
@@ -895 +895 @@
     /// one for the backward edges.
     class EdgeMap {
+      template <typename TT> friend class EdgeMap;
       typename Graph::template EdgeMap<T> forward_map, backward_map; 
     public:
       typedef T ValueType;
       typedef Edge KeyType;
+
       EdgeMap(const SubBidirGraphWrapper<Graph, 
               ForwardFilterMap, BackwardFilterMap>& g) : 
         forward_map(*(g.graph)), backward_map(*(g.graph)) { }
+
       EdgeMap(const SubBidirGraphWrapper<Graph, 
               ForwardFilterMap, BackwardFilterMap>& g, T a) : 
         forward_map(*(g.graph), a), backward_map(*(g.graph), a) { }
+
+      template <typename TT>
+      EdgeMap(const EdgeMap<TT>& copy) 
+        : forward_map(copy.forward_map), backward_map(copy.backward_map) {}
+
+      template <typename TT>
+      EdgeMap& operator=(const EdgeMap<TT>& copy) {
+        forward_map = copy.forward_map;
+        backward_map = copy.backward_map;
+        return *this;
+      }
+      
       void set(Edge e, T a) { 
         if (!e.backward) 
@@ -911 +926 @@
           backward_map.set(e, a); 
       }
-      T operator[](Edge e) const { 
+
+      typename Graph::template EdgeMap<T>::ConstReferenceType 
+      operator[](Edge e) const { 
         if (!e.backward) 
           return forward_map[e]; 
@@ -917 +934 @@
           return backward_map[e]; 
       }
+
+      typename Graph::template EdgeMap<T>::ReferenceType 
+      operator[](Edge e) { 
+        if (!e.backward) 
+          return forward_map[e]; 
+        else 
+          return backward_map[e]; 
+      }
+
       void update() { 
         forward_map.update(); 
@@ -924 +950 @@
 
 
-    KEEP_NODE_MAP(Parent, SubBidirGraphWrapper);
+    //    KEEP_NODE_MAP(Parent, SubBidirGraphWrapper);
 
   };
@@ -966 +992 @@
       return 2*this->graph->edgeNum();
     }
-    KEEP_MAPS(Parent, BidirGraphWrapper);
+    //    KEEP_MAPS(Parent, BidirGraphWrapper);
   };
 
@@ -992 +1018 @@
       Parent::setGraph(gr); 
     }
-    KEEP_MAPS(Parent, BidirGraph);
+    //    KEEP_MAPS(Parent, BidirGraph);
   };
 
@@ -1107 +1133 @@
     };
 
-    KEEP_MAPS(Parent, ResGraphWrapper);
+    //    KEEP_MAPS(Parent, ResGraphWrapper);
   };
 
@@ -1169 +1195 @@
     }
 
-    KEEP_MAPS(Parent, ErasingFirstGraphWrapper);
+    //    KEEP_MAPS(Parent, ErasingFirstGraphWrapper);
   };