Changeset 2031:080d51024ac5 in lemon-0.x for lemon/iterable_maps.h

Timestamp:

04/03/06 11:45:23 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Correcting the structure of the graph's and adaptor's map.
The template assign operators and map iterators can be used for adaptors also.

Some bugfix in the adaptors

New class SwapBpUGraphAdaptor which swaps the two nodeset of the graph.

File:

• lemon/iterable_maps.h (modified) (6 diffs)

lemon/iterable_maps.h

@@ -21 +21 @@
 
 #include <lemon/bits/default_map.h>
+#include <lemon/bits/map_extender.h>
 
 #include <vector>
@@ -401 +402 @@
   template <typename _Graph, typename _Item>
   class IterableIntMap 
-    : protected DefaultMap<_Graph, _Item, _iterable_maps_bits::
-                           IterableIntMapNode<_Item> > {
+    : protected MapExtender<DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                                       IterableIntMapNode<_Item> > >{
   public:
-    typedef DefaultMap<_Graph, _Item, _iterable_maps_bits::
-                       IterableIntMapNode<_Item> >
-    Parent;
+    typedef MapExtender<DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                                   IterableIntMapNode<_Item> > > Parent;
 
     /// The key type
@@ -690 +690 @@
   template <typename _Graph, typename _Item, typename _Value>
   class IterableValueMap 
-    : protected DefaultMap<_Graph, _Item, _iterable_maps_bits::
-                           IterableValueMapNode<_Item, _Value> > {
+    : protected MapExtender<DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                                       IterableValueMapNode<_Item, _Value> > >{
   public:
-    typedef DefaultMap<_Graph, _Item, _iterable_maps_bits::
-                       IterableValueMapNode<_Item, _Value> > Parent;
+    typedef MapExtender<DefaultMap<_Graph, _Item, _iterable_maps_bits::
+                                   IterableValueMapNode<_Item, _Value> > >
+    Parent;
 
     /// The key type
@@ -703 +704 @@
     typedef _Graph Graph;
 
-  protected:
-
-    typedef typename ItemSetTraits<_Graph, Key>::ItemIt KeyIt; 
-
   public:
 
@@ -716 +713 @@
       : Parent(graph, _iterable_maps_bits::
                IterableValueMapNode<_Item, _Value>(value)) {
-      for (KeyIt it(*Parent::getGraph()); it != INVALID; ++it) {
+      for (typename Parent::ItemIt it(*this); it != INVALID; ++it) {
         lace(it);
       }
@@ -904 +901 @@
     virtual void build() {
       Parent::build();
-      for (KeyIt it(*Parent::getGraph()); it != INVALID; ++it) {
+      for (typename Parent::ItemIt it(*this); it != INVALID; ++it) {
         lace(it);
       }