LEMON/LEMON-main Changeset - r724:d8073df341f6

Repositories » LEMON » LEMON-main

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r724:d8073df341f6

« 723:acdd0b

725:114040 »

r724:d8073df341f6

Fri, 25 Sep 2009 12:22:42

[Not Reviewed]

0 comments (0 inline)

kpeter (Peter Kovacs)
kpeter@inf.elte.hu

Rename ValueIterator to ValueIt in graph maps (#302) but keep ValueIterator as an alias in CrossRefMap (only for reverse compatibility).

0 2 0

default

2 files changed with 42 insertions and 36 deletions:

lemon/maps.h

test/maps_test.cc

↑ Collapse diff ↑

lemon/maps.h

Show inline comments

@@ -886,2861 +886,2868 @@
 		  /// Its \c Key and \c Value types are inherited from \c M1.
 		  /// The \c Key and \c Value of \c M2 must be convertible to those of
 		  /// \c M1.
 		  ///
 		  /// If \c m1 is of type \c M1 and \c m2 is of \c M2, then for
 		  /// \code
 		  ///   MulMap<M1,M2> mm(m1,m2);
 		  /// \endcode
 		  /// <tt>mm[x]</tt> will be equal to <tt>m1[x]*m2[x]</tt>.
 		  ///
 		  /// The simplest way of using this map is through the mulMap()
 		  /// function.
 		  ///
 		  /// \sa AddMap, SubMap, DivMap
 		  /// \sa ScaleMap, ScaleWriteMap
 		  template<typename M1, typename M2>
 		  class MulMap : public MapBase<typename M1::Key, typename M1::Value> {
 		    const M1 &_m1;
 		    const M2 &_m2;
 		  public:
 		    ///\e
 		    typedef typename M1::Key Key;
 		    ///\e
 		    typedef typename M1::Value Value;
 		    /// Constructor
 		    MulMap(const M1 &m1,const M2 &m2) : _m1(m1), _m2(m2) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m1[k]*_m2[k]; }
 		  };
 		  /// Returns a \c MulMap class
 		  /// This function just returns a \c MulMap class.
 		  ///
 		  /// For example, if \c m1 and \c m2 are both maps with \c double
 		  /// values, then <tt>mulMap(m1,m2)[x]</tt> will be equal to
 		  /// <tt>m1[x]*m2[x]</tt>.
 		  ///
 		  /// \relates MulMap
 		  template<typename M1, typename M2>
 		  inline MulMap<M1, M2> mulMap(const M1 &m1,const M2 &m2) {
 		    return MulMap<M1, M2>(m1,m2);
+		  }
 		  /// Quotient of two maps
 		  /// This \ref concepts::ReadMap "read-only map" returns the quotient
 		  /// of the values of the two given maps.
 		  /// Its \c Key and \c Value types are inherited from \c M1.
 		  /// The \c Key and \c Value of \c M2 must be convertible to those of
 		  /// \c M1.
 		  ///
 		  /// If \c m1 is of type \c M1 and \c m2 is of \c M2, then for
 		  /// \code
 		  ///   DivMap<M1,M2> dm(m1,m2);
 		  /// \endcode
 		  /// <tt>dm[x]</tt> will be equal to <tt>m1[x]/m2[x]</tt>.
 		  ///
 		  /// The simplest way of using this map is through the divMap()
 		  /// function.
 		  ///
 		  /// \sa AddMap, SubMap, MulMap
 		  template<typename M1, typename M2>
 		  class DivMap : public MapBase<typename M1::Key, typename M1::Value> {
 		    const M1 &_m1;
 		    const M2 &_m2;
 		  public:
 		    ///\e
 		    typedef typename M1::Key Key;
 		    ///\e
 		    typedef typename M1::Value Value;
 		    /// Constructor
 		    DivMap(const M1 &m1,const M2 &m2) : _m1(m1), _m2(m2) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m1[k]/_m2[k]; }
 		  };
 		  /// Returns a \c DivMap class
 		  /// This function just returns a \c DivMap class.
 		  ///
 		  /// For example, if \c m1 and \c m2 are both maps with \c double
 		  /// values, then <tt>divMap(m1,m2)[x]</tt> will be equal to
 		  /// <tt>m1[x]/m2[x]</tt>.
 		  ///
 		  /// \relates DivMap
 		  template<typename M1, typename M2>
 		  inline DivMap<M1, M2> divMap(const M1 &m1,const M2 &m2) {
 		    return DivMap<M1, M2>(m1,m2);
+		  }
 		  /// Shifts a map with a constant.
 		  /// This \ref concepts::ReadMap "read-only map" returns the sum of
 		  /// the given map and a constant value (i.e. it shifts the map with
 		  /// the constant). Its \c Key and \c Value are inherited from \c M.
 		  ///
 		  /// Actually,
 		  /// \code
 		  ///   ShiftMap<M> sh(m,v);
 		  /// \endcode
 		  /// is equivalent to
 		  /// \code
 		  ///   ConstMap<M::Key, M::Value> cm(v);
 		  ///   AddMap<M, ConstMap<M::Key, M::Value> > sh(m,cm);
 		  /// \endcode
 		  ///
 		  /// The simplest way of using this map is through the shiftMap()
 		  /// function.
 		  ///
 		  /// \sa ShiftWriteMap
 		  template<typename M, typename C = typename M::Value>
 		  class ShiftMap : public MapBase<typename M::Key, typename M::Value> {
 		    const M &_m;
 		    C _v;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef typename M::Value Value;
 		    /// Constructor
 		    /// Constructor.
 		    /// \param m The undelying map.
 		    /// \param v The constant value.
 		    ShiftMap(const M &m, const C &v) : _m(m), _v(v) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m[k]+_v; }
 		  };
 		  /// Shifts a map with a constant (read-write version).
 		  /// This \ref concepts::ReadWriteMap "read-write map" returns the sum
 		  /// of the given map and a constant value (i.e. it shifts the map with
 		  /// the constant). Its \c Key and \c Value are inherited from \c M.
 		  /// It makes also possible to write the map.
 		  ///
 		  /// The simplest way of using this map is through the shiftWriteMap()
 		  /// function.
 		  ///
 		  /// \sa ShiftMap
 		  template<typename M, typename C = typename M::Value>
 		  class ShiftWriteMap : public MapBase<typename M::Key, typename M::Value> {
 		    M &_m;
 		    C _v;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef typename M::Value Value;
 		    /// Constructor
 		    /// Constructor.
 		    /// \param m The undelying map.
 		    /// \param v The constant value.
 		    ShiftWriteMap(M &m, const C &v) : _m(m), _v(v) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m[k]+_v; }
 		    ///\e
 		    void set(const Key &k, const Value &v) { _m.set(k, v-_v); }
 		  };
 		  /// Returns a \c ShiftMap class
 		  /// This function just returns a \c ShiftMap class.
 		  ///
 		  /// For example, if \c m is a map with \c double values and \c v is
 		  /// \c double, then <tt>shiftMap(m,v)[x]</tt> will be equal to
 		  /// <tt>m[x]+v</tt>.
 		  ///
 		  /// \relates ShiftMap
 		  template<typename M, typename C>
 		  inline ShiftMap<M, C> shiftMap(const M &m, const C &v) {
 		    return ShiftMap<M, C>(m,v);
+		  }
 		  /// Returns a \c ShiftWriteMap class
 		  /// This function just returns a \c ShiftWriteMap class.
 		  ///
 		  /// For example, if \c m is a map with \c double values and \c v is
 		  /// \c double, then <tt>shiftWriteMap(m,v)[x]</tt> will be equal to
 		  /// <tt>m[x]+v</tt>.
 		  /// Moreover it makes also possible to write the map.
 		  ///
 		  /// \relates ShiftWriteMap
 		  template<typename M, typename C>
 		  inline ShiftWriteMap<M, C> shiftWriteMap(M &m, const C &v) {
 		    return ShiftWriteMap<M, C>(m,v);
+		  }
 		  /// Scales a map with a constant.
 		  /// This \ref concepts::ReadMap "read-only map" returns the value of
 		  /// the given map multiplied from the left side with a constant value.
 		  /// Its \c Key and \c Value are inherited from \c M.
 		  ///
 		  /// Actually,
 		  /// \code
 		  ///   ScaleMap<M> sc(m,v);
 		  /// \endcode
 		  /// is equivalent to
 		  /// \code
 		  ///   ConstMap<M::Key, M::Value> cm(v);
 		  ///   MulMap<ConstMap<M::Key, M::Value>, M> sc(cm,m);
 		  /// \endcode
 		  ///
 		  /// The simplest way of using this map is through the scaleMap()
 		  /// function.
 		  ///
 		  /// \sa ScaleWriteMap
 		  template<typename M, typename C = typename M::Value>
 		  class ScaleMap : public MapBase<typename M::Key, typename M::Value> {
 		    const M &_m;
 		    C _v;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef typename M::Value Value;
 		    /// Constructor
 		    /// Constructor.
 		    /// \param m The undelying map.
 		    /// \param v The constant value.
 		    ScaleMap(const M &m, const C &v) : _m(m), _v(v) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _v*_m[k]; }
 		  };
 		  /// Scales a map with a constant (read-write version).
 		  /// This \ref concepts::ReadWriteMap "read-write map" returns the value of
 		  /// the given map multiplied from the left side with a constant value.
 		  /// Its \c Key and \c Value are inherited from \c M.
 		  /// It can also be used as write map if the \c / operator is defined
 		  /// between \c Value and \c C and the given multiplier is not zero.
 		  ///
 		  /// The simplest way of using this map is through the scaleWriteMap()
 		  /// function.
 		  ///
 		  /// \sa ScaleMap
 		  template<typename M, typename C = typename M::Value>
 		  class ScaleWriteMap : public MapBase<typename M::Key, typename M::Value> {
 		    M &_m;
 		    C _v;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef typename M::Value Value;
 		    /// Constructor
 		    /// Constructor.
 		    /// \param m The undelying map.
 		    /// \param v The constant value.
 		    ScaleWriteMap(M &m, const C &v) : _m(m), _v(v) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _v*_m[k]; }
 		    ///\e
 		    void set(const Key &k, const Value &v) { _m.set(k, v/_v); }
 		  };
 		  /// Returns a \c ScaleMap class
 		  /// This function just returns a \c ScaleMap class.
 		  ///
 		  /// For example, if \c m is a map with \c double values and \c v is
 		  /// \c double, then <tt>scaleMap(m,v)[x]</tt> will be equal to
 		  /// <tt>v*m[x]</tt>.
 		  ///
 		  /// \relates ScaleMap
 		  template<typename M, typename C>
 		  inline ScaleMap<M, C> scaleMap(const M &m, const C &v) {
 		    return ScaleMap<M, C>(m,v);
+		  }
 		  /// Returns a \c ScaleWriteMap class
 		  /// This function just returns a \c ScaleWriteMap class.
 		  ///
 		  /// For example, if \c m is a map with \c double values and \c v is
 		  /// \c double, then <tt>scaleWriteMap(m,v)[x]</tt> will be equal to
 		  /// <tt>v*m[x]</tt>.
 		  /// Moreover it makes also possible to write the map.
 		  ///
 		  /// \relates ScaleWriteMap
 		  template<typename M, typename C>
 		  inline ScaleWriteMap<M, C> scaleWriteMap(M &m, const C &v) {
 		    return ScaleWriteMap<M, C>(m,v);
+		  }
 		  /// Negative of a map
 		  /// This \ref concepts::ReadMap "read-only map" returns the negative
 		  /// of the values of the given map (using the unary \c - operator).
 		  /// Its \c Key and \c Value are inherited from \c M.
 		  ///
 		  /// If M::Value is \c int, \c double etc., then
 		  /// \code
 		  ///   NegMap<M> neg(m);
 		  /// \endcode
 		  /// is equivalent to
 		  /// \code
 		  ///   ScaleMap<M> neg(m,-1);
 		  /// \endcode
 		  ///
 		  /// The simplest way of using this map is through the negMap()
 		  /// function.
 		  ///
 		  /// \sa NegWriteMap
 		  template<typename M>
 		  class NegMap : public MapBase<typename M::Key, typename M::Value> {
 		    const M& _m;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef typename M::Value Value;
 		    /// Constructor
 		    NegMap(const M &m) : _m(m) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return -_m[k]; }
 		  };
 		  /// Negative of a map (read-write version)
 		  /// This \ref concepts::ReadWriteMap "read-write map" returns the
 		  /// negative of the values of the given map (using the unary \c -
 		  /// operator).
 		  /// Its \c Key and \c Value are inherited from \c M.
 		  /// It makes also possible to write the map.
 		  ///
 		  /// If M::Value is \c int, \c double etc., then
 		  /// \code
 		  ///   NegWriteMap<M> neg(m);
 		  /// \endcode
 		  /// is equivalent to
 		  /// \code
 		  ///   ScaleWriteMap<M> neg(m,-1);
 		  /// \endcode
 		  ///
 		  /// The simplest way of using this map is through the negWriteMap()
 		  /// function.
 		  ///
 		  /// \sa NegMap
 		  template<typename M>
 		  class NegWriteMap : public MapBase<typename M::Key, typename M::Value> {
 		    M &_m;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef typename M::Value Value;
 		    /// Constructor
 		    NegWriteMap(M &m) : _m(m) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return -_m[k]; }
 		    ///\e
 		    void set(const Key &k, const Value &v) { _m.set(k, -v); }
 		  };
 		  /// Returns a \c NegMap class
 		  /// This function just returns a \c NegMap class.
 		  ///
 		  /// For example, if \c m is a map with \c double values, then
 		  /// <tt>negMap(m)[x]</tt> will be equal to <tt>-m[x]</tt>.
 		  ///
 		  /// \relates NegMap
 		  template <typename M>
 		  inline NegMap<M> negMap(const M &m) {
 		    return NegMap<M>(m);
+		  }
 		  /// Returns a \c NegWriteMap class
 		  /// This function just returns a \c NegWriteMap class.
 		  ///
 		  /// For example, if \c m is a map with \c double values, then
 		  /// <tt>negWriteMap(m)[x]</tt> will be equal to <tt>-m[x]</tt>.
 		  /// Moreover it makes also possible to write the map.
 		  ///
 		  /// \relates NegWriteMap
 		  template <typename M>
 		  inline NegWriteMap<M> negWriteMap(M &m) {
 		    return NegWriteMap<M>(m);
+		  }
 		  /// Absolute value of a map
 		  /// This \ref concepts::ReadMap "read-only map" returns the absolute
 		  /// value of the values of the given map.
 		  /// Its \c Key and \c Value are inherited from \c M.
 		  /// \c Value must be comparable to \c 0 and the unary \c -
 		  /// operator must be defined for it, of course.
 		  ///
 		  /// The simplest way of using this map is through the absMap()
 		  /// function.
 		  template<typename M>
 		  class AbsMap : public MapBase<typename M::Key, typename M::Value> {
 		    const M &_m;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef typename M::Value Value;
 		    /// Constructor
 		    AbsMap(const M &m) : _m(m) {}
 		    ///\e
 		    Value operator[](const Key &k) const {
 		      Value tmp = _m[k];
 		      return tmp >= 0 ? tmp : -tmp;
+		    }
 		  };
 		  /// Returns an \c AbsMap class
 		  /// This function just returns an \c AbsMap class.
 		  ///
 		  /// For example, if \c m is a map with \c double values, then
 		  /// <tt>absMap(m)[x]</tt> will be equal to <tt>m[x]</tt> if
 		  /// it is positive or zero and <tt>-m[x]</tt> if <tt>m[x]</tt> is
 		  /// negative.
 		  ///
 		  /// \relates AbsMap
 		  template<typename M>
 		  inline AbsMap<M> absMap(const M &m) {
 		    return AbsMap<M>(m);
+		  }
 		  /// @}
 		  // Logical maps and map adaptors:
 		  /// \addtogroup maps
 		  /// @{
 		  /// Constant \c true map.
 		  /// This \ref concepts::ReadMap "read-only map" assigns \c true to
 		  /// each key.
 		  ///
 		  /// Note that
 		  /// \code
 		  ///   TrueMap<K> tm;
 		  /// \endcode
 		  /// is equivalent to
 		  /// \code
 		  ///   ConstMap<K,bool> tm(true);
 		  /// \endcode
 		  ///
 		  /// \sa FalseMap
 		  /// \sa ConstMap
 		  template <typename K>
 		  class TrueMap : public MapBase<K, bool> {
 		  public:
 		    ///\e
 		    typedef K Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Gives back \c true.
 		    Value operator[](const Key&) const { return true; }
 		  };
 		  /// Returns a \c TrueMap class
 		  /// This function just returns a \c TrueMap class.
 		  /// \relates TrueMap
 		  template<typename K>
 		  inline TrueMap<K> trueMap() {
 		    return TrueMap<K>();
+		  }
 		  /// Constant \c false map.
 		  /// This \ref concepts::ReadMap "read-only map" assigns \c false to
 		  /// each key.
 		  ///
 		  /// Note that
 		  /// \code
 		  ///   FalseMap<K> fm;
 		  /// \endcode
 		  /// is equivalent to
 		  /// \code
 		  ///   ConstMap<K,bool> fm(false);
 		  /// \endcode
 		  ///
 		  /// \sa TrueMap
 		  /// \sa ConstMap
 		  template <typename K>
 		  class FalseMap : public MapBase<K, bool> {
 		  public:
 		    ///\e
 		    typedef K Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Gives back \c false.
 		    Value operator[](const Key&) const { return false; }
 		  };
 		  /// Returns a \c FalseMap class
 		  /// This function just returns a \c FalseMap class.
 		  /// \relates FalseMap
 		  template<typename K>
 		  inline FalseMap<K> falseMap() {
 		    return FalseMap<K>();
+		  }
 		  /// @}
 		  /// \addtogroup map_adaptors
 		  /// @{
 		  /// Logical 'and' of two maps
 		  /// This \ref concepts::ReadMap "read-only map" returns the logical
 		  /// 'and' of the values of the two given maps.
 		  /// Its \c Key type is inherited from \c M1 and its \c Value type is
 		  /// \c bool. \c M2::Key must be convertible to \c M1::Key.
 		  ///
 		  /// If \c m1 is of type \c M1 and \c m2 is of \c M2, then for
 		  /// \code
 		  ///   AndMap<M1,M2> am(m1,m2);
 		  /// \endcode
 		  /// <tt>am[x]</tt> will be equal to <tt>m1[x]&&m2[x]</tt>.
 		  ///
 		  /// The simplest way of using this map is through the andMap()
 		  /// function.
 		  ///
 		  /// \sa OrMap
 		  /// \sa NotMap, NotWriteMap
 		  template<typename M1, typename M2>
 		  class AndMap : public MapBase<typename M1::Key, bool> {
 		    const M1 &_m1;
 		    const M2 &_m2;
 		  public:
 		    ///\e
 		    typedef typename M1::Key Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Constructor
 		    AndMap(const M1 &m1, const M2 &m2) : _m1(m1), _m2(m2) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m1[k]&&_m2[k]; }
 		  };
 		  /// Returns an \c AndMap class
 		  /// This function just returns an \c AndMap class.
 		  ///
 		  /// For example, if \c m1 and \c m2 are both maps with \c bool values,
 		  /// then <tt>andMap(m1,m2)[x]</tt> will be equal to
 		  /// <tt>m1[x]&&m2[x]</tt>.
 		  ///
 		  /// \relates AndMap
 		  template<typename M1, typename M2>
 		  inline AndMap<M1, M2> andMap(const M1 &m1, const M2 &m2) {
 		    return AndMap<M1, M2>(m1,m2);
+		  }
 		  /// Logical 'or' of two maps
 		  /// This \ref concepts::ReadMap "read-only map" returns the logical
 		  /// 'or' of the values of the two given maps.
 		  /// Its \c Key type is inherited from \c M1 and its \c Value type is
 		  /// \c bool. \c M2::Key must be convertible to \c M1::Key.
 		  ///
 		  /// If \c m1 is of type \c M1 and \c m2 is of \c M2, then for
 		  /// \code
 		  ///   OrMap<M1,M2> om(m1,m2);
 		  /// \endcode
 		  /// <tt>om[x]</tt> will be equal to <tt>m1[x]||m2[x]</tt>.
 		  ///
 		  /// The simplest way of using this map is through the orMap()
 		  /// function.
 		  ///
 		  /// \sa AndMap
 		  /// \sa NotMap, NotWriteMap
 		  template<typename M1, typename M2>
 		  class OrMap : public MapBase<typename M1::Key, bool> {
 		    const M1 &_m1;
 		    const M2 &_m2;
 		  public:
 		    ///\e
 		    typedef typename M1::Key Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Constructor
 		    OrMap(const M1 &m1, const M2 &m2) : _m1(m1), _m2(m2) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m1[k]||_m2[k]; }
 		  };
 		  /// Returns an \c OrMap class
 		  /// This function just returns an \c OrMap class.
 		  ///
 		  /// For example, if \c m1 and \c m2 are both maps with \c bool values,
 		  /// then <tt>orMap(m1,m2)[x]</tt> will be equal to
 		  /// <tt>m1[x]||m2[x]</tt>.
 		  ///
 		  /// \relates OrMap
 		  template<typename M1, typename M2>
 		  inline OrMap<M1, M2> orMap(const M1 &m1, const M2 &m2) {
 		    return OrMap<M1, M2>(m1,m2);
+		  }
 		  /// Logical 'not' of a map
 		  /// This \ref concepts::ReadMap "read-only map" returns the logical
 		  /// negation of the values of the given map.
 		  /// Its \c Key is inherited from \c M and its \c Value is \c bool.
 		  ///
 		  /// The simplest way of using this map is through the notMap()
 		  /// function.
 		  ///
 		  /// \sa NotWriteMap
 		  template <typename M>
 		  class NotMap : public MapBase<typename M::Key, bool> {
 		    const M &_m;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Constructor
 		    NotMap(const M &m) : _m(m) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return !_m[k]; }
 		  };
 		  /// Logical 'not' of a map (read-write version)
 		  /// This \ref concepts::ReadWriteMap "read-write map" returns the
 		  /// logical negation of the values of the given map.
 		  /// Its \c Key is inherited from \c M and its \c Value is \c bool.
 		  /// It makes also possible to write the map. When a value is set,
 		  /// the opposite value is set to the original map.
 		  ///
 		  /// The simplest way of using this map is through the notWriteMap()
 		  /// function.
 		  ///
 		  /// \sa NotMap
 		  template <typename M>
 		  class NotWriteMap : public MapBase<typename M::Key, bool> {
 		    M &_m;
 		  public:
 		    ///\e
 		    typedef typename M::Key Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Constructor
 		    NotWriteMap(M &m) : _m(m) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return !_m[k]; }
 		    ///\e
 		    void set(const Key &k, bool v) { _m.set(k, !v); }
 		  };
 		  /// Returns a \c NotMap class
 		  /// This function just returns a \c NotMap class.
 		  ///
 		  /// For example, if \c m is a map with \c bool values, then
 		  /// <tt>notMap(m)[x]</tt> will be equal to <tt>!m[x]</tt>.
 		  ///
 		  /// \relates NotMap
 		  template <typename M>
 		  inline NotMap<M> notMap(const M &m) {
 		    return NotMap<M>(m);
+		  }
 		  /// Returns a \c NotWriteMap class
 		  /// This function just returns a \c NotWriteMap class.
 		  ///
 		  /// For example, if \c m is a map with \c bool values, then
 		  /// <tt>notWriteMap(m)[x]</tt> will be equal to <tt>!m[x]</tt>.
 		  /// Moreover it makes also possible to write the map.
 		  ///
 		  /// \relates NotWriteMap
 		  template <typename M>
 		  inline NotWriteMap<M> notWriteMap(M &m) {
 		    return NotWriteMap<M>(m);
+		  }
 		  /// Combination of two maps using the \c == operator
 		  /// This \ref concepts::ReadMap "read-only map" assigns \c true to
 		  /// the keys for which the corresponding values of the two maps are
 		  /// equal.
 		  /// Its \c Key type is inherited from \c M1 and its \c Value type is
 		  /// \c bool. \c M2::Key must be convertible to \c M1::Key.
 		  ///
 		  /// If \c m1 is of type \c M1 and \c m2 is of \c M2, then for
 		  /// \code
 		  ///   EqualMap<M1,M2> em(m1,m2);
 		  /// \endcode
 		  /// <tt>em[x]</tt> will be equal to <tt>m1[x]==m2[x]</tt>.
 		  ///
 		  /// The simplest way of using this map is through the equalMap()
 		  /// function.
 		  ///
 		  /// \sa LessMap
 		  template<typename M1, typename M2>
 		  class EqualMap : public MapBase<typename M1::Key, bool> {
 		    const M1 &_m1;
 		    const M2 &_m2;
 		  public:
 		    ///\e
 		    typedef typename M1::Key Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Constructor
 		    EqualMap(const M1 &m1, const M2 &m2) : _m1(m1), _m2(m2) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m1[k]==_m2[k]; }
 		  };
 		  /// Returns an \c EqualMap class
 		  /// This function just returns an \c EqualMap class.
 		  ///
 		  /// For example, if \c m1 and \c m2 are maps with keys and values of
 		  /// the same type, then <tt>equalMap(m1,m2)[x]</tt> will be equal to
 		  /// <tt>m1[x]==m2[x]</tt>.
 		  ///
 		  /// \relates EqualMap
 		  template<typename M1, typename M2>
 		  inline EqualMap<M1, M2> equalMap(const M1 &m1, const M2 &m2) {
 		    return EqualMap<M1, M2>(m1,m2);
+		  }
 		  /// Combination of two maps using the \c < operator
 		  /// This \ref concepts::ReadMap "read-only map" assigns \c true to
 		  /// the keys for which the corresponding value of the first map is
 		  /// less then the value of the second map.
 		  /// Its \c Key type is inherited from \c M1 and its \c Value type is
 		  /// \c bool. \c M2::Key must be convertible to \c M1::Key.
 		  ///
 		  /// If \c m1 is of type \c M1 and \c m2 is of \c M2, then for
 		  /// \code
 		  ///   LessMap<M1,M2> lm(m1,m2);
 		  /// \endcode
 		  /// <tt>lm[x]</tt> will be equal to <tt>m1[x]<m2[x]</tt>.
 		  ///
 		  /// The simplest way of using this map is through the lessMap()
 		  /// function.
 		  ///
 		  /// \sa EqualMap
 		  template<typename M1, typename M2>
 		  class LessMap : public MapBase<typename M1::Key, bool> {
 		    const M1 &_m1;
 		    const M2 &_m2;
 		  public:
 		    ///\e
 		    typedef typename M1::Key Key;
 		    ///\e
 		    typedef bool Value;
 		    /// Constructor
 		    LessMap(const M1 &m1, const M2 &m2) : _m1(m1), _m2(m2) {}
 		    ///\e
 		    Value operator[](const Key &k) const { return _m1[k]<_m2[k]; }
 		  };
 		  /// Returns an \c LessMap class
 		  /// This function just returns an \c LessMap class.
 		  ///
 		  /// For example, if \c m1 and \c m2 are maps with keys and values of
 		  /// the same type, then <tt>lessMap(m1,m2)[x]</tt> will be equal to
 		  /// <tt>m1[x]<m2[x]</tt>.
 		  ///
 		  /// \relates LessMap
 		  template<typename M1, typename M2>
 		  inline LessMap<M1, M2> lessMap(const M1 &m1, const M2 &m2) {
 		    return LessMap<M1, M2>(m1,m2);
+		  }
 		  namespace _maps_bits {
 		    template <typename _Iterator, typename Enable = void>
 		    struct IteratorTraits {
 		      typedef typename std::iterator_traits<_Iterator>::value_type Value;
 		    };
 		    template <typename _Iterator>
 		    struct IteratorTraits<_Iterator,
 		      typename exists<typename _Iterator::container_type>::type>
+		    {
 		      typedef typename _Iterator::container_type::value_type Value;
 		    };
+		  }
 		  /// @}
 		  /// \addtogroup maps
 		  /// @{
 		  /// \brief Writable bool map for logging each \c true assigned element
 		  ///
 		  /// A \ref concepts::WriteMap "writable" bool map for logging
 		  /// each \c true assigned element, i.e it copies subsequently each
 		  /// keys set to \c true to the given iterator.
 		  /// The most important usage of it is storing certain nodes or arcs
 		  /// that were marked \c true by an algorithm.
 		  ///
 		  /// There are several algorithms that provide solutions through bool
 		  /// maps and most of them assign \c true at most once for each key.
 		  /// In these cases it is a natural request to store each \c true
 		  /// assigned elements (in order of the assignment), which can be
 		  /// easily done with LoggerBoolMap.
 		  ///
 		  /// The simplest way of using this map is through the loggerBoolMap()
 		  /// function.
 		  ///
 		  /// \tparam IT The type of the iterator.
 		  /// \tparam KEY The key type of the map. The default value set
 		  /// according to the iterator type should work in most cases.
 		  ///
 		  /// \note The container of the iterator must contain enough space
 		  /// for the elements or the iterator should be an inserter iterator.
 		#ifdef DOXYGEN
 		  template <typename IT, typename KEY>
 		#else
 		  template <typename IT,
 		            typename KEY = typename _maps_bits::IteratorTraits<IT>::Value>
 		#endif
 		  class LoggerBoolMap : public MapBase<KEY, bool> {
 		  public:
 		    ///\e
 		    typedef KEY Key;
 		    ///\e
 		    typedef bool Value;
 		    ///\e
 		    typedef IT Iterator;
 		    /// Constructor
 		    LoggerBoolMap(Iterator it)
 		      : _begin(it), _end(it) {}
 		    /// Gives back the given iterator set for the first key
 		    Iterator begin() const {
 		      return _begin;
+		    }
 		    /// Gives back the the 'after the last' iterator
 		    Iterator end() const {
 		      return _end;
+		    }
 		    /// The set function of the map
 		    void set(const Key& key, Value value) {
 		      if (value) {
 		        *_end++ = key;
+		      }
+		    }
 		  private:
 		    Iterator _begin;
 		    Iterator _end;
 		  };
 		  /// Returns a \c LoggerBoolMap class
 		  /// This function just returns a \c LoggerBoolMap class.
 		  ///
 		  /// The most important usage of it is storing certain nodes or arcs
 		  /// that were marked \c true by an algorithm.
 		  /// For example it makes easier to store the nodes in the processing
 		  /// order of Dfs algorithm, as the following examples show.
 		  /// \code
 		  ///   std::vector<Node> v;
 		  ///   dfs(g,s).processedMap(loggerBoolMap(std::back_inserter(v))).run();
 		  /// \endcode
 		  /// \code
 		  ///   std::vector<Node> v(countNodes(g));
 		  ///   dfs(g,s).processedMap(loggerBoolMap(v.begin())).run();
 		  /// \endcode
 		  ///
 		  /// \note The container of the iterator must contain enough space
 		  /// for the elements or the iterator should be an inserter iterator.
 		  ///
 		  /// \note LoggerBoolMap is just \ref concepts::WriteMap "writable", so
 		  /// it cannot be used when a readable map is needed, for example as
 		  /// \c ReachedMap for \c Bfs, \c Dfs and \c Dijkstra algorithms.
 		  ///
 		  /// \relates LoggerBoolMap
 		  template<typename Iterator>
 		  inline LoggerBoolMap<Iterator> loggerBoolMap(Iterator it) {
 		    return LoggerBoolMap<Iterator>(it);
+		  }
 		  /// @}
 		  /// \addtogroup graph_maps
 		  /// @{
 		  /// \brief Provides an immutable and unique id for each item in a graph.
 		  ///
 		  /// IdMap provides a unique and immutable id for each item of the
 		  /// same type (\c Node, \c Arc or \c Edge) in a graph. This id is
 		  ///  - \b unique: different items get different ids,
 		  ///  - \b immutable: the id of an item does not change (even if you
 		  ///    delete other nodes).
 		  ///
 		  /// Using this map you get access (i.e. can read) the inner id values of
 		  /// the items stored in the graph, which is returned by the \c id()
 		  /// function of the graph. This map can be inverted with its member
 		  /// class \c InverseMap or with the \c operator()() member.
 		  ///
 		  /// \tparam GR The graph type.
 		  /// \tparam K The key type of the map (\c GR::Node, \c GR::Arc or
 		  /// \c GR::Edge).
 		  ///
 		  /// \see RangeIdMap
 		  template <typename GR, typename K>
 		  class IdMap : public MapBase<K, int> {
 		  public:
 		    /// The graph type of IdMap.
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type of IdMap (\c Node, \c Arc or \c Edge).
 		    typedef K Item;
 		    /// The key type of IdMap (\c Node, \c Arc or \c Edge).
 		    typedef K Key;
 		    /// The value type of IdMap.
 		    typedef int Value;
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor of the map.
 		    explicit IdMap(const Graph& graph) : _graph(&graph) {}
 		    /// \brief Gives back the \e id of the item.
 		    ///
 		    /// Gives back the immutable and unique \e id of the item.
 		    int operator[](const Item& item) const { return _graph->id(item);}
 		    /// \brief Gives back the \e item by its id.
 		    ///
 		    /// Gives back the \e item by its id.
 		    Item operator()(int id) { return _graph->fromId(id, Item()); }
 		  private:
 		    const Graph* _graph;
 		  public:
 		    /// \brief The inverse map type of IdMap.
 		    ///
 		    /// The inverse map type of IdMap. The subscript operator gives back
 		    /// an item by its id.
 		    /// This type conforms to the \ref concepts::ReadMap "ReadMap" concept.
 		    /// \see inverse()
 		    class InverseMap {
 		    public:
 		      /// \brief Constructor.
 		      ///
 		      /// Constructor for creating an id-to-item map.
 		      explicit InverseMap(const Graph& graph) : _graph(&graph) {}
 		      /// \brief Constructor.
 		      ///
 		      /// Constructor for creating an id-to-item map.
 		      explicit InverseMap(const IdMap& map) : _graph(map._graph) {}
 		      /// \brief Gives back an item by its id.
 		      ///
 		      /// Gives back an item by its id.
 		      Item operator[](int id) const { return _graph->fromId(id, Item());}
 		    private:
 		      const Graph* _graph;
 		    };
 		    /// \brief Gives back the inverse of the map.
 		    ///
 		    /// Gives back the inverse of the IdMap.
 		    InverseMap inverse() const { return InverseMap(*_graph);}
 		  };
 		  /// \brief General cross reference graph map type.
 		  /// This class provides simple invertable graph maps.
 		  /// It wraps a standard graph map (\c NodeMap, \c ArcMap or \c EdgeMap)
 		  /// and if a key is set to a new value, then stores it in the inverse map.
 		  /// The graph items can be accessed by their values either using
 		  /// \c InverseMap or \c operator()(), and the values of the map can be
-		  /// accessed with an STL compatible forward iterator (\c ValueIterator).
+		  /// accessed with an STL compatible forward iterator (\c ValueIt).
 		  ///
 		  /// This map is intended to be used when all associated values are
 		  /// different (the map is actually invertable) or there are only a few
 		  /// items with the same value.
 		  /// Otherwise consider to use \c IterableValueMap, which is more
 		  /// suitable and more efficient for such cases. It provides iterators
 		  /// to traverse the items with the same associated value, however
 		  /// it does not have \c InverseMap.
 		  ///
 		  /// This type is not reference map, so it cannot be modified with
 		  /// the subscript operator.
 		  ///
 		  /// \tparam GR The graph type.
 		  /// \tparam K The key type of the map (\c GR::Node, \c GR::Arc or
 		  /// \c GR::Edge).
 		  /// \tparam V The value type of the map.
 		  ///
 		  /// \see IterableValueMap
 		  template <typename GR, typename K, typename V>
 		  class CrossRefMap
 		    : protected ItemSetTraits<GR, K>::template Map<V>::Type {
 		  private:
 		    typedef typename ItemSetTraits<GR, K>::
 		      template Map<V>::Type Map;
 		    typedef std::multimap<V, K> Container;
 		    Container _inv_map;
 		  public:
 		    /// The graph type of CrossRefMap.
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type of CrossRefMap (\c Node, \c Arc or \c Edge).
 		    typedef K Item;
 		    /// The key type of CrossRefMap (\c Node, \c Arc or \c Edge).
 		    typedef K Key;
 		    /// The value type of CrossRefMap.
 		    typedef V Value;
 		    /// \brief Constructor.
 		    ///
 		    /// Construct a new CrossRefMap for the given graph.
 		    explicit CrossRefMap(const Graph& graph) : Map(graph) {}
 		    /// \brief Forward iterator for values.
 		    ///
 		    /// This iterator is an STL compatible forward
 		    /// iterator on the values of the map. The values can
 		    /// be accessed in the <tt>[beginValue, endValue)</tt> range.
 		    /// They are considered with multiplicity, so each value is
 		    /// traversed for each item it is assigned to.
-		    class ValueIterator
+		    class ValueIt
 		      : public std::iterator<std::forward_iterator_tag, Value> {
 		      friend class CrossRefMap;
 		    private:
-		      ValueIterator(typename Container::const_iterator _it)
+		      ValueIt(typename Container::const_iterator _it)
 		        : it(_it) {}
 		    public:
 		      /// Constructor
-		      ValueIterator() {}
+		      ValueIt() {}
 		      /// \e
-		      ValueIterator& operator++() { ++it; return *this; }
+		      ValueIt& operator++() { ++it; return *this; }
 		      /// \e
 		      ValueIterator operator++(int) {
 		        ValueIterator tmp(*this);
 		      ValueIt operator++(int) {
 		        ValueIt tmp(*this);
 		        operator++();
 		        return tmp;
+		      }
 		      /// \e
 		      const Value& operator*() const { return it->first; }
 		      /// \e
 		      const Value* operator->() const { return &(it->first); }
 		      /// \e
-		      bool operator==(ValueIterator jt) const { return it == jt.it; }
+		      bool operator==(ValueIt jt) const { return it == jt.it; }
 		      /// \e
-		      bool operator!=(ValueIterator jt) const { return it != jt.it; }
+		      bool operator!=(ValueIt jt) const { return it != jt.it; }
 		    private:
 		      typename Container::const_iterator it;
 		    };
 		    /// Alias for \c ValueIt
 		    typedef ValueIt ValueIterator;
 		    /// \brief Returns an iterator to the first value.
 		    ///
 		    /// Returns an STL compatible iterator to the
 		    /// first value of the map. The values of the
 		    /// map can be accessed in the <tt>[beginValue, endValue)</tt>
 		    /// range.
 		    ValueIterator beginValue() const {
 		      return ValueIterator(_inv_map.begin());
 		    ValueIt beginValue() const {
 		      return ValueIt(_inv_map.begin());
+		    }
 		    /// \brief Returns an iterator after the last value.
 		    ///
 		    /// Returns an STL compatible iterator after the
 		    /// last value of the map. The values of the
 		    /// map can be accessed in the <tt>[beginValue, endValue)</tt>
 		    /// range.
 		    ValueIterator endValue() const {
 		      return ValueIterator(_inv_map.end());
 		    ValueIt endValue() const {
 		      return ValueIt(_inv_map.end());
+		    }
 		    /// \brief Sets the value associated with the given key.
 		    ///
 		    /// Sets the value associated with the given key.
 		    void set(const Key& key, const Value& val) {
 		      Value oldval = Map::operator[](key);
 		      typename Container::iterator it;
 		      for (it = _inv_map.equal_range(oldval).first;
 		           it != _inv_map.equal_range(oldval).second; ++it) {
 		        if (it->second == key) {
 		          _inv_map.erase(it);
 		          break;
+		        }
+		      }
 		      _inv_map.insert(std::make_pair(val, key));
 		      Map::set(key, val);
+		    }
 		    /// \brief Returns the value associated with the given key.
 		    ///
 		    /// Returns the value associated with the given key.
 		    typename MapTraits<Map>::ConstReturnValue
 		    operator[](const Key& key) const {
 		      return Map::operator[](key);
+		    }
 		    /// \brief Gives back an item by its value.
 		    ///
 		    /// This function gives back an item that is assigned to
 		    /// the given value or \c INVALID if no such item exists.
 		    /// If there are more items with the same associated value,
 		    /// only one of them is returned.
 		    Key operator()(const Value& val) const {
 		      typename Container::const_iterator it = _inv_map.find(val);
 		      return it != _inv_map.end() ? it->second : INVALID;
+		    }
 		    /// \brief Returns the number of items with the given value.
 		    ///
 		    /// This function returns the number of items with the given value
 		    /// associated with it.
 		    int count(const Value &val) const {
 		      return _inv_map.count(val);
+		    }
 		  protected:
 		    /// \brief Erase the key from the map and the inverse map.
 		    ///
 		    /// Erase the key from the map and the inverse map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void erase(const Key& key) {
 		      Value val = Map::operator[](key);
 		      typename Container::iterator it;
 		      for (it = _inv_map.equal_range(val).first;
 		           it != _inv_map.equal_range(val).second; ++it) {
 		        if (it->second == key) {
 		          _inv_map.erase(it);
 		          break;
+		        }
+		      }
 		      Map::erase(key);
+		    }
 		    /// \brief Erase more keys from the map and the inverse map.
 		    ///
 		    /// Erase more keys from the map and the inverse map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void erase(const std::vector<Key>& keys) {
 		      for (int i = 0; i < int(keys.size()); ++i) {
 		        Value val = Map::operator[](keys[i]);
 		        typename Container::iterator it;
 		        for (it = _inv_map.equal_range(val).first;
 		             it != _inv_map.equal_range(val).second; ++it) {
 		          if (it->second == keys[i]) {
 		            _inv_map.erase(it);
 		            break;
+		          }
+		        }
+		      }
 		      Map::erase(keys);
+		    }
 		    /// \brief Clear the keys from the map and the inverse map.
 		    ///
 		    /// Clear the keys from the map and the inverse map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void clear() {
 		      _inv_map.clear();
 		      Map::clear();
+		    }
 		  public:
 		    /// \brief The inverse map type of CrossRefMap.
 		    ///
 		    /// The inverse map type of CrossRefMap. The subscript operator gives
 		    /// back an item by its value.
 		    /// This type conforms to the \ref concepts::ReadMap "ReadMap" concept.
 		    /// \see inverse()
 		    class InverseMap {
 		    public:
 		      /// \brief Constructor
 		      ///
 		      /// Constructor of the InverseMap.
 		      explicit InverseMap(const CrossRefMap& inverted)
 		        : _inverted(inverted) {}
 		      /// The value type of the InverseMap.
 		      typedef typename CrossRefMap::Key Value;
 		      /// The key type of the InverseMap.
 		      typedef typename CrossRefMap::Value Key;
 		      /// \brief Subscript operator.
 		      ///
 		      /// Subscript operator. It gives back an item
 		      /// that is assigned to the given value or \c INVALID
 		      /// if no such item exists.
 		      Value operator[](const Key& key) const {
 		        return _inverted(key);
+		      }
 		    private:
 		      const CrossRefMap& _inverted;
 		    };
 		    /// \brief Gives back the inverse of the map.
 		    ///
 		    /// Gives back the inverse of the CrossRefMap.
 		    InverseMap inverse() const {
 		      return InverseMap(*this);
+		    }
 		  };
 		  /// \brief Provides continuous and unique id for the
 		  /// items of a graph.
 		  ///
 		  /// RangeIdMap provides a unique and continuous
 		  /// id for each item of a given type (\c Node, \c Arc or
 		  /// \c Edge) in a graph. This id is
 		  ///  - \b unique: different items get different ids,
 		  ///  - \b continuous: the range of the ids is the set of integers
 		  ///    between 0 and \c n-1, where \c n is the number of the items of
 		  ///    this type (\c Node, \c Arc or \c Edge).
 		  ///  - So, the ids can change when deleting an item of the same type.
 		  ///
 		  /// Thus this id is not (necessarily) the same as what can get using
 		  /// the \c id() function of the graph or \ref IdMap.
 		  /// This map can be inverted with its member class \c InverseMap,
 		  /// or with the \c operator()() member.
 		  ///
 		  /// \tparam GR The graph type.
 		  /// \tparam K The key type of the map (\c GR::Node, \c GR::Arc or
 		  /// \c GR::Edge).
 		  ///
 		  /// \see IdMap
 		  template <typename GR, typename K>
 		  class RangeIdMap
 		    : protected ItemSetTraits<GR, K>::template Map<int>::Type {
 		    typedef typename ItemSetTraits<GR, K>::template Map<int>::Type Map;
 		  public:
 		    /// The graph type of RangeIdMap.
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type of RangeIdMap (\c Node, \c Arc or \c Edge).
 		    typedef K Item;
 		    /// The key type of RangeIdMap (\c Node, \c Arc or \c Edge).
 		    typedef K Key;
 		    /// The value type of RangeIdMap.
 		    typedef int Value;
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor.
 		    explicit RangeIdMap(const Graph& gr) : Map(gr) {
 		      Item it;
 		      const typename Map::Notifier* nf = Map::notifier();
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 		        Map::set(it, _inv_map.size());
 		        _inv_map.push_back(it);
+		      }
+		    }
 		  protected:
 		    /// \brief Adds a new key to the map.
 		    ///
 		    /// Add a new key to the map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void add(const Item& item) {
 		      Map::add(item);
 		      Map::set(item, _inv_map.size());
 		      _inv_map.push_back(item);
+		    }
 		    /// \brief Add more new keys to the map.
 		    ///
 		    /// Add more new keys to the map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void add(const std::vector<Item>& items) {
 		      Map::add(items);
 		      for (int i = 0; i < int(items.size()); ++i) {
 		        Map::set(items[i], _inv_map.size());
 		        _inv_map.push_back(items[i]);
+		      }
+		    }
 		    /// \brief Erase the key from the map.
 		    ///
 		    /// Erase the key from the map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void erase(const Item& item) {
 		      Map::set(_inv_map.back(), Map::operator[](item));
 		      _inv_map[Map::operator[](item)] = _inv_map.back();
 		      _inv_map.pop_back();
 		      Map::erase(item);
+		    }
 		    /// \brief Erase more keys from the map.
 		    ///
 		    /// Erase more keys from the map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void erase(const std::vector<Item>& items) {
 		      for (int i = 0; i < int(items.size()); ++i) {
 		        Map::set(_inv_map.back(), Map::operator[](items[i]));
 		        _inv_map[Map::operator[](items[i])] = _inv_map.back();
 		        _inv_map.pop_back();
+		      }
 		      Map::erase(items);
+		    }
 		    /// \brief Build the unique map.
 		    ///
 		    /// Build the unique map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void build() {
 		      Map::build();
 		      Item it;
 		      const typename Map::Notifier* nf = Map::notifier();
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 		        Map::set(it, _inv_map.size());
 		        _inv_map.push_back(it);
+		      }
+		    }
 		    /// \brief Clear the keys from the map.
 		    ///
 		    /// Clear the keys from the map. It is called by the
 		    /// \c AlterationNotifier.
 		    virtual void clear() {
 		      _inv_map.clear();
 		      Map::clear();
+		    }
 		  public:
 		    /// \brief Returns the maximal value plus one.
 		    ///
 		    /// Returns the maximal value plus one in the map.
 		    unsigned int size() const {
 		      return _inv_map.size();
+		    }
 		    /// \brief Swaps the position of the two items in the map.
 		    ///
 		    /// Swaps the position of the two items in the map.
 		    void swap(const Item& p, const Item& q) {
 		      int pi = Map::operator[](p);
 		      int qi = Map::operator[](q);
 		      Map::set(p, qi);
 		      _inv_map[qi] = p;
 		      Map::set(q, pi);
 		      _inv_map[pi] = q;
+		    }
 		    /// \brief Gives back the \e range \e id of the item
 		    ///
 		    /// Gives back the \e range \e id of the item.
 		    int operator[](const Item& item) const {
 		      return Map::operator[](item);
+		    }
 		    /// \brief Gives back the item belonging to a \e range \e id
 		    ///
 		    /// Gives back the item belonging to the given \e range \e id.
 		    Item operator()(int id) const {
 		      return _inv_map[id];
+		    }
 		  private:
 		    typedef std::vector<Item> Container;
 		    Container _inv_map;
 		  public:
 		    /// \brief The inverse map type of RangeIdMap.
 		    ///
 		    /// The inverse map type of RangeIdMap. The subscript operator gives
 		    /// back an item by its \e range \e id.
 		    /// This type conforms to the \ref concepts::ReadMap "ReadMap" concept.
 		    class InverseMap {
 		    public:
 		      /// \brief Constructor
 		      ///
 		      /// Constructor of the InverseMap.
 		      explicit InverseMap(const RangeIdMap& inverted)
 		        : _inverted(inverted) {}
 		      /// The value type of the InverseMap.
 		      typedef typename RangeIdMap::Key Value;
 		      /// The key type of the InverseMap.
 		      typedef typename RangeIdMap::Value Key;
 		      /// \brief Subscript operator.
 		      ///
 		      /// Subscript operator. It gives back the item
 		      /// that the given \e range \e id currently belongs to.
 		      Value operator[](const Key& key) const {
 		        return _inverted(key);
+		      }
 		      /// \brief Size of the map.
 		      ///
 		      /// Returns the size of the map.
 		      unsigned int size() const {
 		        return _inverted.size();
+		      }
 		    private:
 		      const RangeIdMap& _inverted;
 		    };
 		    /// \brief Gives back the inverse of the map.
 		    ///
 		    /// Gives back the inverse of the RangeIdMap.
 		    const InverseMap inverse() const {
 		      return InverseMap(*this);
+		    }
 		  };
 		  /// \brief Dynamic iterable \c bool map.
 		  ///
 		  /// This class provides a special graph map type which can store a
 		  /// \c bool value for graph items (\c Node, \c Arc or \c Edge).
 		  /// For both \c true and \c false values it is possible to iterate on
 		  /// the keys mapped to the value.
 		  ///
 		  /// This type is a reference map, so it can be modified with the
 		  /// subscript operator.
 		  ///
 		  /// \tparam GR The graph type.
 		  /// \tparam K The key type of the map (\c GR::Node, \c GR::Arc or
 		  /// \c GR::Edge).
 		  ///
 		  /// \see IterableIntMap, IterableValueMap
 		  /// \see CrossRefMap
 		  template <typename GR, typename K>
 		  class IterableBoolMap
 		    : protected ItemSetTraits<GR, K>::template Map<int>::Type {
 		  private:
 		    typedef GR Graph;
 		    typedef typename ItemSetTraits<GR, K>::ItemIt KeyIt;
 		    typedef typename ItemSetTraits<GR, K>::template Map<int>::Type Parent;
 		    std::vector<K> _array;
 		    int _sep;
 		  public:
 		    /// Indicates that the map is reference map.
 		    typedef True ReferenceMapTag;
 		    /// The key type
 		    typedef K Key;
 		    /// The value type
 		    typedef bool Value;
 		    /// The const reference type.
 		    typedef const Value& ConstReference;
 		  private:
 		    int position(const Key& key) const {
 		      return Parent::operator[](key);
+		    }
 		  public:
 		    /// \brief Reference to the value of the map.
 		    ///
 		    /// This class is similar to the \c bool type. It can be converted to
 		    /// \c bool and it provides the same operators.
 		    class Reference {
 		      friend class IterableBoolMap;
 		    private:
 		      Reference(IterableBoolMap& map, const Key& key)
 		        : _key(key), _map(map) {}
 		    public:
 		      Reference& operator=(const Reference& value) {
 		        _map.set(_key, static_cast<bool>(value));
 		         return *this;
+		      }
 		      operator bool() const {
 		        return static_cast<const IterableBoolMap&>(_map)[_key];
+		      }
 		      Reference& operator=(bool value) {
 		        _map.set(_key, value);
 		        return *this;
+		      }
 		      Reference& operator&=(bool value) {
 		        _map.set(_key, _map[_key] & value);
 		        return *this;
+		      }
 		      Reference& operator|=(bool value) {
 		        _map.set(_key, _map[_key] | value);
 		        return *this;
+		      }
 		      Reference& operator^=(bool value) {
 		        _map.set(_key, _map[_key] ^ value);
 		        return *this;
+		      }
 		    private:
 		      Key _key;
 		      IterableBoolMap& _map;
 		    };
 		    /// \brief Constructor of the map with a default value.
 		    ///
 		    /// Constructor of the map with a default value.
 		    explicit IterableBoolMap(const Graph& graph, bool def = false)
 		      : Parent(graph) {
 		      typename Parent::Notifier* nf = Parent::notifier();
 		      Key it;
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 		        Parent::set(it, _array.size());
 		        _array.push_back(it);
+		      }
 		      _sep = (def ? _array.size() : 0);
+		    }
 		    /// \brief Const subscript operator of the map.
 		    ///
 		    /// Const subscript operator of the map.
 		    bool operator[](const Key& key) const {
 		      return position(key) < _sep;
+		    }
 		    /// \brief Subscript operator of the map.
 		    ///
 		    /// Subscript operator of the map.
 		    Reference operator[](const Key& key) {
 		      return Reference(*this, key);
+		    }
 		    /// \brief Set operation of the map.
 		    ///
 		    /// Set operation of the map.
 		    void set(const Key& key, bool value) {
 		      int pos = position(key);
 		      if (value) {
 		        if (pos < _sep) return;
 		        Key tmp = _array[_sep];
 		        _array[_sep] = key;
 		        Parent::set(key, _sep);
 		        _array[pos] = tmp;
 		        Parent::set(tmp, pos);
 		        ++_sep;
 		      } else {
 		        if (pos >= _sep) return;
 		        --_sep;
 		        Key tmp = _array[_sep];
 		        _array[_sep] = key;
 		        Parent::set(key, _sep);
 		        _array[pos] = tmp;
 		        Parent::set(tmp, pos);
+		      }
+		    }
 		    /// \brief Set all items.
 		    ///
 		    /// Set all items in the map.
 		    /// \note Constant time operation.
 		    void setAll(bool value) {
 		      _sep = (value ? _array.size() : 0);
+		    }
 		    /// \brief Returns the number of the keys mapped to \c true.
 		    ///
 		    /// Returns the number of the keys mapped to \c true.
 		    int trueNum() const {
 		      return _sep;
+		    }
 		    /// \brief Returns the number of the keys mapped to \c false.
 		    ///
 		    /// Returns the number of the keys mapped to \c false.
 		    int falseNum() const {
 		      return _array.size() - _sep;
+		    }
 		    /// \brief Iterator for the keys mapped to \c true.
 		    ///
 		    /// Iterator for the keys mapped to \c true. It works
 		    /// like a graph item iterator, it can be converted to
 		    /// the key type of the map, incremented with \c ++ operator, and
 		    /// if the iterator leaves the last valid key, it will be equal to
 		    /// \c INVALID.
 		    class TrueIt : public Key {
 		    public:
 		      typedef Key Parent;
 		      /// \brief Creates an iterator.
 		      ///
 		      /// Creates an iterator. It iterates on the
 		      /// keys mapped to \c true.
 		      /// \param map The IterableBoolMap.
 		      explicit TrueIt(const IterableBoolMap& map)
 		        : Parent(map._sep > 0 ? map._array[map._sep - 1] : INVALID),
 		          _map(&map) {}
 		      /// \brief Invalid constructor \& conversion.
 		      ///
 		      /// This constructor initializes the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      TrueIt(Invalid) : Parent(INVALID), _map(0) {}
 		      /// \brief Increment operator.
 		      ///
 		      /// Increment operator.
 		      TrueIt& operator++() {
 		        int pos = _map->position(*this);
 		        Parent::operator=(pos > 0 ? _map->_array[pos - 1] : INVALID);
 		        return *this;
+		      }
 		    private:
 		      const IterableBoolMap* _map;
 		    };
 		    /// \brief Iterator for the keys mapped to \c false.
 		    ///
 		    /// Iterator for the keys mapped to \c false. It works
 		    /// like a graph item iterator, it can be converted to
 		    /// the key type of the map, incremented with \c ++ operator, and
 		    /// if the iterator leaves the last valid key, it will be equal to
 		    /// \c INVALID.
 		    class FalseIt : public Key {
 		    public:
 		      typedef Key Parent;
 		      /// \brief Creates an iterator.
 		      ///
 		      /// Creates an iterator. It iterates on the
 		      /// keys mapped to \c false.
 		      /// \param map The IterableBoolMap.
 		      explicit FalseIt(const IterableBoolMap& map)
 		        : Parent(map._sep < int(map._array.size()) ?
 		                 map._array.back() : INVALID), _map(&map) {}
 		      /// \brief Invalid constructor \& conversion.
 		      ///
 		      /// This constructor initializes the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      FalseIt(Invalid) : Parent(INVALID), _map(0) {}
 		      /// \brief Increment operator.
 		      ///
 		      /// Increment operator.
 		      FalseIt& operator++() {
 		        int pos = _map->position(*this);
 		        Parent::operator=(pos > _map->_sep ? _map->_array[pos - 1] : INVALID);
 		        return *this;
+		      }
 		    private:
 		      const IterableBoolMap* _map;
 		    };
 		    /// \brief Iterator for the keys mapped to a given value.
 		    ///
 		    /// Iterator for the keys mapped to a given value. It works
 		    /// like a graph item iterator, it can be converted to
 		    /// the key type of the map, incremented with \c ++ operator, and
 		    /// if the iterator leaves the last valid key, it will be equal to
 		    /// \c INVALID.
 		    class ItemIt : public Key {
 		    public:
 		      typedef Key Parent;
 		      /// \brief Creates an iterator with a value.
 		      ///
 		      /// Creates an iterator with a value. It iterates on the
 		      /// keys mapped to the given value.
 		      /// \param map The IterableBoolMap.
 		      /// \param value The value.
 		      ItemIt(const IterableBoolMap& map, bool value)
 		        : Parent(value ?
 		                 (map._sep > 0 ?
 		                  map._array[map._sep - 1] : INVALID) :
 		                 (map._sep < int(map._array.size()) ?
 		                  map._array.back() : INVALID)), _map(&map) {}
 		      /// \brief Invalid constructor \& conversion.
 		      ///
 		      /// This constructor initializes the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      ItemIt(Invalid) : Parent(INVALID), _map(0) {}
 		      /// \brief Increment operator.
 		      ///
 		      /// Increment operator.
 		      ItemIt& operator++() {
 		        int pos = _map->position(*this);
 		        int _sep = pos >= _map->_sep ? _map->_sep : 0;
 		        Parent::operator=(pos > _sep ? _map->_array[pos - 1] : INVALID);
 		        return *this;
+		      }
 		    private:
 		      const IterableBoolMap* _map;
 		    };
 		  protected:
 		    virtual void add(const Key& key) {
 		      Parent::add(key);
 		      Parent::set(key, _array.size());
 		      _array.push_back(key);
+		    }
 		    virtual void add(const std::vector<Key>& keys) {
 		      Parent::add(keys);
 		      for (int i = 0; i < int(keys.size()); ++i) {
 		        Parent::set(keys[i], _array.size());
 		        _array.push_back(keys[i]);
+		      }
+		    }
 		    virtual void erase(const Key& key) {
 		      int pos = position(key);
 		      if (pos < _sep) {
 		        --_sep;
 		        Parent::set(_array[_sep], pos);
 		        _array[pos] = _array[_sep];
 		        Parent::set(_array.back(), _sep);
 		        _array[_sep] = _array.back();
 		        _array.pop_back();
 		      } else {
 		        Parent::set(_array.back(), pos);
 		        _array[pos] = _array.back();
 		        _array.pop_back();
+		      }
 		      Parent::erase(key);
+		    }
 		    virtual void erase(const std::vector<Key>& keys) {
 		      for (int i = 0; i < int(keys.size()); ++i) {
 		        int pos = position(keys[i]);
 		        if (pos < _sep) {
 		          --_sep;
 		          Parent::set(_array[_sep], pos);
 		          _array[pos] = _array[_sep];
 		          Parent::set(_array.back(), _sep);
 		          _array[_sep] = _array.back();
 		          _array.pop_back();
 		        } else {
 		          Parent::set(_array.back(), pos);
 		          _array[pos] = _array.back();
 		          _array.pop_back();
+		        }
+		      }
 		      Parent::erase(keys);
+		    }
 		    virtual void build() {
 		      Parent::build();
 		      typename Parent::Notifier* nf = Parent::notifier();
 		      Key it;
 		      for (nf->first(it); it != INVALID; nf->next(it)) {
 		        Parent::set(it, _array.size());
 		        _array.push_back(it);
+		      }
 		      _sep = 0;
+		    }
 		    virtual void clear() {
 		      _array.clear();
 		      _sep = 0;
 		      Parent::clear();
+		    }
 		  };
 		  namespace _maps_bits {
 		    template <typename Item>
 		    struct IterableIntMapNode {
 		      IterableIntMapNode() : value(-1) {}
 		      IterableIntMapNode(int _value) : value(_value) {}
 		      Item prev, next;
 		      int value;
 		    };
+		  }
 		  /// \brief Dynamic iterable integer map.
 		  ///
 		  /// This class provides a special graph map type which can store an
 		  /// integer value for graph items (\c Node, \c Arc or \c Edge).
 		  /// For each non-negative value it is possible to iterate on the keys
 		  /// mapped to the value.
 		  ///
 		  /// This map is intended to be used with small integer values, for which
 		  /// it is efficient, and supports iteration only for non-negative values.
 		  /// If you need large values and/or iteration for negative integers,
 		  /// consider to use \ref IterableValueMap instead.
 		  ///
 		  /// This type is a reference map, so it can be modified with the
 		  /// subscript operator.
 		  ///
 		  /// \note The size of the data structure depends on the largest
 		  /// value in the map.
 		  ///
 		  /// \tparam GR The graph type.
 		  /// \tparam K The key type of the map (\c GR::Node, \c GR::Arc or
 		  /// \c GR::Edge).
 		  ///
 		  /// \see IterableBoolMap, IterableValueMap
 		  /// \see CrossRefMap
 		  template <typename GR, typename K>
 		  class IterableIntMap
 		    : protected ItemSetTraits<GR, K>::
 		        template Map<_maps_bits::IterableIntMapNode<K> >::Type {
 		  public:
 		    typedef typename ItemSetTraits<GR, K>::
 		      template Map<_maps_bits::IterableIntMapNode<K> >::Type Parent;
 		    /// The key type
 		    typedef K Key;
 		    /// The value type
 		    typedef int Value;
 		    /// The graph type
 		    typedef GR Graph;
 		    /// \brief Constructor of the map.
 		    ///
 		    /// Constructor of the map. It sets all values to -1.
 		    explicit IterableIntMap(const Graph& graph)
 		      : Parent(graph) {}
 		    /// \brief Constructor of the map with a given value.
 		    ///
 		    /// Constructor of the map with a given value.
 		    explicit IterableIntMap(const Graph& graph, int value)
 		      : Parent(graph, _maps_bits::IterableIntMapNode<K>(value)) {
 		      if (value >= 0) {
 		        for (typename Parent::ItemIt it(*this); it != INVALID; ++it) {
 		          lace(it);
+		        }
+		      }
+		    }
 		  private:
 		    void unlace(const Key& key) {
 		      typename Parent::Value& node = Parent::operator[](key);
 		      if (node.value < 0) return;
 		      if (node.prev != INVALID) {
 		        Parent::operator[](node.prev).next = node.next;
 		      } else {
 		        _first[node.value] = node.next;
+		      }
 		      if (node.next != INVALID) {
 		        Parent::operator[](node.next).prev = node.prev;
+		      }
 		      while (!_first.empty() && _first.back() == INVALID) {
 		        _first.pop_back();
+		      }
+		    }
 		    void lace(const Key& key) {
 		      typename Parent::Value& node = Parent::operator[](key);
 		      if (node.value < 0) return;
 		      if (node.value >= int(_first.size())) {
 		        _first.resize(node.value + 1, INVALID);
+		      }
 		      node.prev = INVALID;
 		      node.next = _first[node.value];
 		      if (node.next != INVALID) {
 		        Parent::operator[](node.next).prev = key;
+		      }
 		      _first[node.value] = key;
+		    }
 		  public:
 		    /// Indicates that the map is reference map.
 		    typedef True ReferenceMapTag;
 		    /// \brief Reference to the value of the map.
 		    ///
 		    /// This class is similar to the \c int type. It can
 		    /// be converted to \c int and it has the same operators.
 		    class Reference {
 		      friend class IterableIntMap;
 		    private:
 		      Reference(IterableIntMap& map, const Key& key)
 		        : _key(key), _map(map) {}
 		    public:
 		      Reference& operator=(const Reference& value) {
 		        _map.set(_key, static_cast<const int&>(value));
 		         return *this;
+		      }
 		      operator const int&() const {
 		        return static_cast<const IterableIntMap&>(_map)[_key];
+		      }
 		      Reference& operator=(int value) {
 		        _map.set(_key, value);
 		        return *this;
+		      }
 		      Reference& operator++() {
 		        _map.set(_key, _map[_key] + 1);
 		        return *this;
+		      }
 		      int operator++(int) {
 		        int value = _map[_key];
 		        _map.set(_key, value + 1);
 		        return value;
+		      }
 		      Reference& operator--() {
 		        _map.set(_key, _map[_key] - 1);
 		        return *this;
+		      }
 		      int operator--(int) {
 		        int value = _map[_key];
 		        _map.set(_key, value - 1);
 		        return value;
+		      }
 		      Reference& operator+=(int value) {
 		        _map.set(_key, _map[_key] + value);
 		        return *this;
+		      }
 		      Reference& operator-=(int value) {
 		        _map.set(_key, _map[_key] - value);
 		        return *this;
+		      }
 		      Reference& operator*=(int value) {
 		        _map.set(_key, _map[_key] * value);
 		        return *this;
+		      }
 		      Reference& operator/=(int value) {
 		        _map.set(_key, _map[_key] / value);
 		        return *this;
+		      }
 		      Reference& operator%=(int value) {
 		        _map.set(_key, _map[_key] % value);
 		        return *this;
+		      }
 		      Reference& operator&=(int value) {
 		        _map.set(_key, _map[_key] & value);
 		        return *this;
+		      }
 		      Reference& operator|=(int value) {
 		        _map.set(_key, _map[_key] | value);
 		        return *this;
+		      }
 		      Reference& operator^=(int value) {
 		        _map.set(_key, _map[_key] ^ value);
 		        return *this;
+		      }
 		      Reference& operator<<=(int value) {
 		        _map.set(_key, _map[_key] << value);
 		        return *this;
+		      }
 		      Reference& operator>>=(int value) {
 		        _map.set(_key, _map[_key] >> value);
 		        return *this;
+		      }
 		    private:
 		      Key _key;
 		      IterableIntMap& _map;
 		    };
 		    /// The const reference type.
 		    typedef const Value& ConstReference;
 		    /// \brief Gives back the maximal value plus one.
 		    ///
 		    /// Gives back the maximal value plus one.
 		    int size() const {
 		      return _first.size();
+		    }
 		    /// \brief Set operation of the map.
 		    ///
 		    /// Set operation of the map.
 		    void set(const Key& key, const Value& value) {
 		      unlace(key);
 		      Parent::operator[](key).value = value;
 		      lace(key);
+		    }
 		    /// \brief Const subscript operator of the map.
 		    ///
 		    /// Const subscript operator of the map.
 		    const Value& operator[](const Key& key) const {
 		      return Parent::operator[](key).value;
+		    }
 		    /// \brief Subscript operator of the map.
 		    ///
 		    /// Subscript operator of the map.
 		    Reference operator[](const Key& key) {
 		      return Reference(*this, key);
+		    }
 		    /// \brief Iterator for the keys with the same value.
 		    ///
 		    /// Iterator for the keys with the same value. It works
 		    /// like a graph item iterator, it can be converted to
 		    /// the item type of the map, incremented with \c ++ operator, and
 		    /// if the iterator leaves the last valid item, it will be equal to
 		    /// \c INVALID.
 		    class ItemIt : public Key {
 		    public:
 		      typedef Key Parent;
 		      /// \brief Invalid constructor \& conversion.
 		      ///
 		      /// This constructor initializes the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      ItemIt(Invalid) : Parent(INVALID), _map(0) {}
 		      /// \brief Creates an iterator with a value.
 		      ///
 		      /// Creates an iterator with a value. It iterates on the
 		      /// keys mapped to the given value.
 		      /// \param map The IterableIntMap.
 		      /// \param value The value.
 		      ItemIt(const IterableIntMap& map, int value) : _map(&map) {
 		        if (value < 0 || value >= int(_map->_first.size())) {
 		          Parent::operator=(INVALID);
 		        } else {
 		          Parent::operator=(_map->_first[value]);
+		        }
+		      }
 		      /// \brief Increment operator.
 		      ///
 		      /// Increment operator.
 		      ItemIt& operator++() {
 		        Parent::operator=(_map->IterableIntMap::Parent::
 		                          operator[](static_cast<Parent&>(*this)).next);
 		        return *this;
+		      }
 		    private:
 		      const IterableIntMap* _map;
 		    };
 		  protected:
 		    virtual void erase(const Key& key) {
 		      unlace(key);
 		      Parent::erase(key);
+		    }
 		    virtual void erase(const std::vector<Key>& keys) {
 		      for (int i = 0; i < int(keys.size()); ++i) {
 		        unlace(keys[i]);
+		      }
 		      Parent::erase(keys);
+		    }
 		    virtual void clear() {
 		      _first.clear();
 		      Parent::clear();
+		    }
 		  private:
 		    std::vector<Key> _first;
 		  };
 		  namespace _maps_bits {
 		    template <typename Item, typename Value>
 		    struct IterableValueMapNode {
 		      IterableValueMapNode(Value _value = Value()) : value(_value) {}
 		      Item prev, next;
 		      Value value;
 		    };
+		  }
 		  /// \brief Dynamic iterable map for comparable values.
 		  ///
 		  /// This class provides a special graph map type which can store a
 		  /// comparable value for graph items (\c Node, \c Arc or \c Edge).
 		  /// For each value it is possible to iterate on the keys mapped to
 		  /// the value (\c ItemIt), and the values of the map can be accessed
-		  /// with an STL compatible forward iterator (\c ValueIterator).
+		  /// with an STL compatible forward iterator (\c ValueIt).
 		  /// The map stores a linked list for each value, which contains
 		  /// the items mapped to the value, and the used values are stored
 		  /// in balanced binary tree (\c std::map).
 		  ///
 		  /// \ref IterableBoolMap and \ref IterableIntMap are similar classes
 		  /// specialized for \c bool and \c int values, respectively.
 		  ///
 		  /// This type is not reference map, so it cannot be modified with
 		  /// the subscript operator.
 		  ///
 		  /// \tparam GR The graph type.
 		  /// \tparam K The key type of the map (\c GR::Node, \c GR::Arc or
 		  /// \c GR::Edge).
 		  /// \tparam V The value type of the map. It can be any comparable
 		  /// value type.
 		  ///
 		  /// \see IterableBoolMap, IterableIntMap
 		  /// \see CrossRefMap
 		  template <typename GR, typename K, typename V>
 		  class IterableValueMap
 		    : protected ItemSetTraits<GR, K>::
 		        template Map<_maps_bits::IterableValueMapNode<K, V> >::Type {
 		  public:
 		    typedef typename ItemSetTraits<GR, K>::
 		      template Map<_maps_bits::IterableValueMapNode<K, V> >::Type Parent;
 		    /// The key type
 		    typedef K Key;
 		    /// The value type
 		    typedef V Value;
 		    /// The graph type
 		    typedef GR Graph;
 		  public:
 		    /// \brief Constructor of the map with a given value.
 		    ///
 		    /// Constructor of the map with a given value.
 		    explicit IterableValueMap(const Graph& graph,
 		                              const Value& value = Value())
 		      : Parent(graph, _maps_bits::IterableValueMapNode<K, V>(value)) {
 		      for (typename Parent::ItemIt it(*this); it != INVALID; ++it) {
 		        lace(it);
+		      }
+		    }
 		  protected:
 		    void unlace(const Key& key) {
 		      typename Parent::Value& node = Parent::operator[](key);
 		      if (node.prev != INVALID) {
 		        Parent::operator[](node.prev).next = node.next;
 		      } else {
 		        if (node.next != INVALID) {
 		          _first[node.value] = node.next;
 		        } else {
 		          _first.erase(node.value);
+		        }
+		      }
 		      if (node.next != INVALID) {
 		        Parent::operator[](node.next).prev = node.prev;
+		      }
+		    }
 		    void lace(const Key& key) {
 		      typename Parent::Value& node = Parent::operator[](key);
 		      typename std::map<Value, Key>::iterator it = _first.find(node.value);
 		      if (it == _first.end()) {
 		        node.prev = node.next = INVALID;
 		        _first.insert(std::make_pair(node.value, key));
 		      } else {
 		        node.prev = INVALID;
 		        node.next = it->second;
 		        if (node.next != INVALID) {
 		          Parent::operator[](node.next).prev = key;
+		        }
 		        it->second = key;
+		      }
+		    }
 		  public:
 		    /// \brief Forward iterator for values.
 		    ///
 		    /// This iterator is an STL compatible forward
 		    /// iterator on the values of the map. The values can
 		    /// be accessed in the <tt>[beginValue, endValue)</tt> range.
-		    class ValueIterator
+		    class ValueIt
 		      : public std::iterator<std::forward_iterator_tag, Value> {
 		      friend class IterableValueMap;
 		    private:
-		      ValueIterator(typename std::map<Value, Key>::const_iterator _it)
+		      ValueIt(typename std::map<Value, Key>::const_iterator _it)
 		        : it(_it) {}
 		    public:
 		      /// Constructor
-		      ValueIterator() {}
+		      ValueIt() {}
 		      /// \e
-		      ValueIterator& operator++() { ++it; return *this; }
+		      ValueIt& operator++() { ++it; return *this; }
 		      /// \e
 		      ValueIterator operator++(int) {
 		        ValueIterator tmp(*this);
 		      ValueIt operator++(int) {
 		        ValueIt tmp(*this);
 		        operator++();
 		        return tmp;
+		      }
 		      /// \e
 		      const Value& operator*() const { return it->first; }
 		      /// \e
 		      const Value* operator->() const { return &(it->first); }
 		      /// \e
-		      bool operator==(ValueIterator jt) const { return it == jt.it; }
+		      bool operator==(ValueIt jt) const { return it == jt.it; }
 		      /// \e
-		      bool operator!=(ValueIterator jt) const { return it != jt.it; }
+		      bool operator!=(ValueIt jt) const { return it != jt.it; }
 		    private:
 		      typename std::map<Value, Key>::const_iterator it;
 		    };
 		    /// \brief Returns an iterator to the first value.
 		    ///
 		    /// Returns an STL compatible iterator to the
 		    /// first value of the map. The values of the
 		    /// map can be accessed in the <tt>[beginValue, endValue)</tt>
 		    /// range.
 		    ValueIterator beginValue() const {
 		      return ValueIterator(_first.begin());
 		    ValueIt beginValue() const {
 		      return ValueIt(_first.begin());
+		    }
 		    /// \brief Returns an iterator after the last value.
 		    ///
 		    /// Returns an STL compatible iterator after the
 		    /// last value of the map. The values of the
 		    /// map can be accessed in the <tt>[beginValue, endValue)</tt>
 		    /// range.
 		    ValueIterator endValue() const {
 		      return ValueIterator(_first.end());
 		    ValueIt endValue() const {
 		      return ValueIt(_first.end());
+		    }
 		    /// \brief Set operation of the map.
 		    ///
 		    /// Set operation of the map.
 		    void set(const Key& key, const Value& value) {
 		      unlace(key);
 		      Parent::operator[](key).value = value;
 		      lace(key);
+		    }
 		    /// \brief Const subscript operator of the map.
 		    ///
 		    /// Const subscript operator of the map.
 		    const Value& operator[](const Key& key) const {
 		      return Parent::operator[](key).value;
+		    }
 		    /// \brief Iterator for the keys with the same value.
 		    ///
 		    /// Iterator for the keys with the same value. It works
 		    /// like a graph item iterator, it can be converted to
 		    /// the item type of the map, incremented with \c ++ operator, and
 		    /// if the iterator leaves the last valid item, it will be equal to
 		    /// \c INVALID.
 		    class ItemIt : public Key {
 		    public:
 		      typedef Key Parent;
 		      /// \brief Invalid constructor \& conversion.
 		      ///
 		      /// This constructor initializes the iterator to be invalid.
 		      /// \sa Invalid for more details.
 		      ItemIt(Invalid) : Parent(INVALID), _map(0) {}
 		      /// \brief Creates an iterator with a value.
 		      ///
 		      /// Creates an iterator with a value. It iterates on the
 		      /// keys which have the given value.
 		      /// \param map The IterableValueMap
 		      /// \param value The value
 		      ItemIt(const IterableValueMap& map, const Value& value) : _map(&map) {
 		        typename std::map<Value, Key>::const_iterator it =
 		          map._first.find(value);
 		        if (it == map._first.end()) {
 		          Parent::operator=(INVALID);
 		        } else {
 		          Parent::operator=(it->second);
+		        }
+		      }
 		      /// \brief Increment operator.
 		      ///
 		      /// Increment Operator.
 		      ItemIt& operator++() {
 		        Parent::operator=(_map->IterableValueMap::Parent::
 		                          operator[](static_cast<Parent&>(*this)).next);
 		        return *this;
+		      }
 		    private:
 		      const IterableValueMap* _map;
 		    };
 		  protected:
 		    virtual void add(const Key& key) {
 		      Parent::add(key);
 		      unlace(key);
+		    }
 		    virtual void add(const std::vector<Key>& keys) {
 		      Parent::add(keys);
 		      for (int i = 0; i < int(keys.size()); ++i) {
 		        lace(keys[i]);
+		      }
+		    }
 		    virtual void erase(const Key& key) {
 		      unlace(key);
 		      Parent::erase(key);
+		    }
 		    virtual void erase(const std::vector<Key>& keys) {
 		      for (int i = 0; i < int(keys.size()); ++i) {
 		        unlace(keys[i]);
+		      }
 		      Parent::erase(keys);
+		    }
 		    virtual void build() {
 		      Parent::build();
 		      for (typename Parent::ItemIt it(*this); it != INVALID; ++it) {
 		        lace(it);
+		      }
+		    }
 		    virtual void clear() {
 		      _first.clear();
 		      Parent::clear();
+		    }
 		  private:
 		    std::map<Value, Key> _first;
 		  };
 		  /// \brief Map of the source nodes of arcs in a digraph.
 		  ///
 		  /// SourceMap provides access for the source node of each arc in a digraph,
 		  /// which is returned by the \c source() function of the digraph.
 		  /// \tparam GR The digraph type.
 		  /// \see TargetMap
 		  template <typename GR>
 		  class SourceMap {
 		  public:
-		    ///\e
+		    /// The key type (the \c Arc type of the digraph).
 		    typedef typename GR::Arc Key;
-		    ///\e
+		    /// The value type (the \c Node type of the digraph).
 		    typedef typename GR::Node Value;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param digraph The digraph that the map belongs to.
 		    explicit SourceMap(const GR& digraph) : _graph(digraph) {}
 		    /// \brief Returns the source node of the given arc.
 		    ///
 		    /// Returns the source node of the given arc.
 		    Value operator[](const Key& arc) const {
 		      return _graph.source(arc);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c SourceMap class.
 		  ///
 		  /// This function just returns an \c SourceMap class.
 		  /// \relates SourceMap
 		  template <typename GR>
 		  inline SourceMap<GR> sourceMap(const GR& graph) {
 		    return SourceMap<GR>(graph);
+		  }
 		  /// \brief Map of the target nodes of arcs in a digraph.
 		  ///
 		  /// TargetMap provides access for the target node of each arc in a digraph,
 		  /// which is returned by the \c target() function of the digraph.
 		  /// \tparam GR The digraph type.
 		  /// \see SourceMap
 		  template <typename GR>
 		  class TargetMap {
 		  public:
-		    ///\e
+		    /// The key type (the \c Arc type of the digraph).
 		    typedef typename GR::Arc Key;
-		    ///\e
+		    /// The value type (the \c Node type of the digraph).
 		    typedef typename GR::Node Value;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param digraph The digraph that the map belongs to.
 		    explicit TargetMap(const GR& digraph) : _graph(digraph) {}
 		    /// \brief Returns the target node of the given arc.
 		    ///
 		    /// Returns the target node of the given arc.
 		    Value operator[](const Key& e) const {
 		      return _graph.target(e);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c TargetMap class.
 		  ///
 		  /// This function just returns a \c TargetMap class.
 		  /// \relates TargetMap
 		  template <typename GR>
 		  inline TargetMap<GR> targetMap(const GR& graph) {
 		    return TargetMap<GR>(graph);
+		  }
 		  /// \brief Map of the "forward" directed arc view of edges in a graph.
 		  ///
 		  /// ForwardMap provides access for the "forward" directed arc view of
 		  /// each edge in a graph, which is returned by the \c direct() function
 		  /// of the graph with \c true parameter.
 		  /// \tparam GR The graph type.
 		  /// \see BackwardMap
 		  template <typename GR>
 		  class ForwardMap {
 		  public:
 		    /// The key type (the \c Edge type of the digraph).
 		    typedef typename GR::Edge Key;
 		    /// The value type (the \c Arc type of the digraph).
 		    typedef typename GR::Arc Value;
 		    typedef typename GR::Edge Key;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param graph The graph that the map belongs to.
 		    explicit ForwardMap(const GR& graph) : _graph(graph) {}
 		    /// \brief Returns the "forward" directed arc view of the given edge.
 		    ///
 		    /// Returns the "forward" directed arc view of the given edge.
 		    Value operator[](const Key& key) const {
 		      return _graph.direct(key, true);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c ForwardMap class.
 		  ///
 		  /// This function just returns an \c ForwardMap class.
 		  /// \relates ForwardMap
 		  template <typename GR>
 		  inline ForwardMap<GR> forwardMap(const GR& graph) {
 		    return ForwardMap<GR>(graph);
+		  }
 		  /// \brief Map of the "backward" directed arc view of edges in a graph.
 		  ///
 		  /// BackwardMap provides access for the "backward" directed arc view of
 		  /// each edge in a graph, which is returned by the \c direct() function
 		  /// of the graph with \c false parameter.
 		  /// \tparam GR The graph type.
 		  /// \see ForwardMap
 		  template <typename GR>
 		  class BackwardMap {
 		  public:
 		    /// The key type (the \c Edge type of the digraph).
 		    typedef typename GR::Edge Key;
 		    /// The value type (the \c Arc type of the digraph).
 		    typedef typename GR::Arc Value;
 		    typedef typename GR::Edge Key;
 		    /// \brief Constructor
 		    ///
 		    /// Constructor.
 		    /// \param graph The graph that the map belongs to.
 		    explicit BackwardMap(const GR& graph) : _graph(graph) {}
 		    /// \brief Returns the "backward" directed arc view of the given edge.
 		    ///
 		    /// Returns the "backward" directed arc view of the given edge.
 		    Value operator[](const Key& key) const {
 		      return _graph.direct(key, false);
+		    }
 		  private:
 		    const GR& _graph;
 		  };
 		  /// \brief Returns a \c BackwardMap class
 		  /// This function just returns a \c BackwardMap class.
 		  /// \relates BackwardMap
 		  template <typename GR>
 		  inline BackwardMap<GR> backwardMap(const GR& graph) {
 		    return BackwardMap<GR>(graph);
+		  }
 		  /// \brief Map of the in-degrees of nodes in a digraph.
 		  ///
 		  /// This map returns the in-degree of a node. Once it is constructed,
 		  /// the degrees are stored in a standard \c NodeMap, so each query is done
 		  /// in constant time. On the other hand, the values are updated automatically
 		  /// whenever the digraph changes.
 		  ///
 		  /// \warning Besides \c addNode() and \c addArc(), a digraph structure
 		  /// may provide alternative ways to modify the digraph.
 		  /// The correct behavior of InDegMap is not guarantied if these additional
 		  /// features are used. For example the functions
 		  /// \ref ListDigraph::changeSource() "changeSource()",
 		  /// \ref ListDigraph::changeTarget() "changeTarget()" and
 		  /// \ref ListDigraph::reverseArc() "reverseArc()"
 		  /// of \ref ListDigraph will \e not update the degree values correctly.
 		  ///
 		  /// \sa OutDegMap
 		  template <typename GR>
 		  class InDegMap
 		    : protected ItemSetTraits<GR, typename GR::Arc>
 		      ::ItemNotifier::ObserverBase {
 		  public:
 		    /// The graph type of InDegMap
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type
 		    typedef typename Digraph::Node Key;
 		    /// The value type
 		    typedef int Value;
 		    typedef typename ItemSetTraits<Digraph, typename Digraph::Arc>
 		    ::ItemNotifier::ObserverBase Parent;
 		  private:
 		    class AutoNodeMap
 		      : public ItemSetTraits<Digraph, Key>::template Map<int>::Type {
 		    public:
 		      typedef typename ItemSetTraits<Digraph, Key>::
 		      template Map<int>::Type Parent;
 		      AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 		      virtual void add(const Key& key) {
 		        Parent::add(key);
 		        Parent::set(key, 0);
+		      }
 		      virtual void add(const std::vector<Key>& keys) {
 		        Parent::add(keys);
 		        for (int i = 0; i < int(keys.size()); ++i) {
 		          Parent::set(keys[i], 0);
+		        }
+		      }
 		      virtual void build() {
 		        Parent::build();
 		        Key it;
 		        typename Parent::Notifier* nf = Parent::notifier();
 		        for (nf->first(it); it != INVALID; nf->next(it)) {
 		          Parent::set(it, 0);
+		        }
+		      }
 		    };
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor for creating an in-degree map.
 		    explicit InDegMap(const Digraph& graph)
 		      : _digraph(graph), _deg(graph) {
 		      Parent::attach(_digraph.notifier(typename Digraph::Arc()));
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countInArcs(_digraph, it);
+		      }
+		    }
 		    /// \brief Gives back the in-degree of a Node.
 		    ///
 		    /// Gives back the in-degree of a Node.
 		    int operator[](const Key& key) const {
 		      return _deg[key];
+		    }
 		  protected:
 		    typedef typename Digraph::Arc Arc;
 		    virtual void add(const Arc& arc) {
 		      ++_deg[_digraph.target(arc)];
+		    }
 		    virtual void add(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        ++_deg[_digraph.target(arcs[i])];
+		      }
+		    }
 		    virtual void erase(const Arc& arc) {
 		      --_deg[_digraph.target(arc)];
+		    }
 		    virtual void erase(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        --_deg[_digraph.target(arcs[i])];
+		      }
+		    }
 		    virtual void build() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countInArcs(_digraph, it);
+		      }
+		    }
 		    virtual void clear() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = 0;
+		      }
+		    }
 		  private:
 		    const Digraph& _digraph;
 		    AutoNodeMap _deg;
 		  };
 		  /// \brief Map of the out-degrees of nodes in a digraph.
 		  ///
 		  /// This map returns the out-degree of a node. Once it is constructed,
 		  /// the degrees are stored in a standard \c NodeMap, so each query is done
 		  /// in constant time. On the other hand, the values are updated automatically
 		  /// whenever the digraph changes.
 		  ///
 		  /// \warning Besides \c addNode() and \c addArc(), a digraph structure
 		  /// may provide alternative ways to modify the digraph.
 		  /// The correct behavior of OutDegMap is not guarantied if these additional
 		  /// features are used. For example the functions
 		  /// \ref ListDigraph::changeSource() "changeSource()",
 		  /// \ref ListDigraph::changeTarget() "changeTarget()" and
 		  /// \ref ListDigraph::reverseArc() "reverseArc()"
 		  /// of \ref ListDigraph will \e not update the degree values correctly.
 		  ///
 		  /// \sa InDegMap
 		  template <typename GR>
 		  class OutDegMap
 		    : protected ItemSetTraits<GR, typename GR::Arc>
 		      ::ItemNotifier::ObserverBase {
 		  public:
 		    /// The graph type of OutDegMap
 		    typedef GR Graph;
 		    typedef GR Digraph;
 		    /// The key type
 		    typedef typename Digraph::Node Key;
 		    /// The value type
 		    typedef int Value;
 		    typedef typename ItemSetTraits<Digraph, typename Digraph::Arc>
 		    ::ItemNotifier::ObserverBase Parent;
 		  private:
 		    class AutoNodeMap
 		      : public ItemSetTraits<Digraph, Key>::template Map<int>::Type {
 		    public:
 		      typedef typename ItemSetTraits<Digraph, Key>::
 		      template Map<int>::Type Parent;
 		      AutoNodeMap(const Digraph& digraph) : Parent(digraph, 0) {}
 		      virtual void add(const Key& key) {
 		        Parent::add(key);
 		        Parent::set(key, 0);
+		      }
 		      virtual void add(const std::vector<Key>& keys) {
 		        Parent::add(keys);
 		        for (int i = 0; i < int(keys.size()); ++i) {
 		          Parent::set(keys[i], 0);
+		        }
+		      }
 		      virtual void build() {
 		        Parent::build();
 		        Key it;
 		        typename Parent::Notifier* nf = Parent::notifier();
 		        for (nf->first(it); it != INVALID; nf->next(it)) {
 		          Parent::set(it, 0);
+		        }
+		      }
 		    };
 		  public:
 		    /// \brief Constructor.
 		    ///
 		    /// Constructor for creating an out-degree map.
 		    explicit OutDegMap(const Digraph& graph)
 		      : _digraph(graph), _deg(graph) {
 		      Parent::attach(_digraph.notifier(typename Digraph::Arc()));
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countOutArcs(_digraph, it);
+		      }
+		    }
 		    /// \brief Gives back the out-degree of a Node.
 		    ///
 		    /// Gives back the out-degree of a Node.
 		    int operator[](const Key& key) const {
 		      return _deg[key];
+		    }
 		  protected:
 		    typedef typename Digraph::Arc Arc;
 		    virtual void add(const Arc& arc) {
 		      ++_deg[_digraph.source(arc)];
+		    }
 		    virtual void add(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        ++_deg[_digraph.source(arcs[i])];
+		      }
+		    }
 		    virtual void erase(const Arc& arc) {
 		      --_deg[_digraph.source(arc)];
+		    }
 		    virtual void erase(const std::vector<Arc>& arcs) {
 		      for (int i = 0; i < int(arcs.size()); ++i) {
 		        --_deg[_digraph.source(arcs[i])];
+		      }
+		    }
 		    virtual void build() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = countOutArcs(_digraph, it);
+		      }
+		    }
 		    virtual void clear() {
 		      for(typename Digraph::NodeIt it(_digraph); it != INVALID; ++it) {
 		        _deg[it] = 0;
+		      }
+		    }
 		  private:
 		    const Digraph& _digraph;
 		    AutoNodeMap _deg;
 		  };
 		  /// \brief Potential difference map
 		  ///
 		  /// PotentialDifferenceMap returns the difference between the potentials of
 		  /// the source and target nodes of each arc in a digraph, i.e. it returns
 		  /// \code
 		  ///   potential[gr.target(arc)] - potential[gr.source(arc)].
 		  /// \endcode
 		  /// \tparam GR The digraph type.
 		  /// \tparam POT A node map storing the potentials.
 		  template <typename GR, typename POT>
 		  class PotentialDifferenceMap {
 		  public:
 		    /// Key type
 		    typedef typename GR::Arc Key;
 		    /// Value type
 		    typedef typename POT::Value Value;
 		    /// \brief Constructor
 		    ///
 		    /// Contructor of the map.
 		    explicit PotentialDifferenceMap(const GR& gr,
 		                                    const POT& potential)
 		      : _digraph(gr), _potential(potential) {}
 		    /// \brief Returns the potential difference for the given arc.
 		    ///
 		    /// Returns the potential difference for the given arc, i.e.
 		    /// \code
 		    ///   potential[gr.target(arc)] - potential[gr.source(arc)].
 		    /// \endcode
 		    Value operator[](const Key& arc) const {
 		      return _potential[_digraph.target(arc)] -
 		        _potential[_digraph.source(arc)];
+		    }
 		  private:
 		    const GR& _digraph;
 		    const POT& _potential;
 		  };
 		  /// \brief Returns a PotentialDifferenceMap.
 		  ///
 		  /// This function just returns a PotentialDifferenceMap.
 		  /// \relates PotentialDifferenceMap
 		  template <typename GR, typename POT>
 		  PotentialDifferenceMap<GR, POT>
 		  potentialDifferenceMap(const GR& gr, const POT& potential) {
 		    return PotentialDifferenceMap<GR, POT>(gr, potential);
+		  }
 		  /// @}
+		}
 		#endif // LEMON_MAPS_H

test/maps_test.cc

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2009
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#include <deque>
 		#include <set>
 		#include <lemon/concept_check.h>
 		#include <lemon/concepts/maps.h>
 		#include <lemon/maps.h>
 		#include <lemon/list_graph.h>
 		#include <lemon/smart_graph.h>
 		#include <lemon/adaptors.h>
 		#include <lemon/dfs.h>
 		#include "test_tools.h"
 		using namespace lemon;
 		using namespace lemon::concepts;
 		struct A {};
 		inline bool operator<(A, A) { return true; }
 		struct B {};
 		class C {
 		  int x;
 		public:
 		  C(int _x) : x(_x) {}
 		};
 		class F {
 		public:
 		  typedef A argument_type;
 		  typedef B result_type;
 		  B operator()(const A&) const { return B(); }
 		private:
 		  F& operator=(const F&);
 		};
 		int func(A) { return 3; }
 		int binc(int a, B) { return a+1; }
 		typedef ReadMap<A, double> DoubleMap;
 		typedef ReadWriteMap<A, double> DoubleWriteMap;
 		typedef ReferenceMap<A, double, double&, const double&> DoubleRefMap;
 		typedef ReadMap<A, bool> BoolMap;
 		typedef ReadWriteMap<A, bool> BoolWriteMap;
 		typedef ReferenceMap<A, bool, bool&, const bool&> BoolRefMap;
 		template<typename Map1, typename Map2, typename ItemIt>
 		void compareMap(const Map1& map1, const Map2& map2, ItemIt it) {
 		  for (; it != INVALID; ++it)
 		    check(map1[it] == map2[it], "The maps are not equal");
+		}
 		int main()
+		{
 		  // Map concepts
 		  checkConcept<ReadMap<A,B>, ReadMap<A,B> >();
 		  checkConcept<ReadMap<A,C>, ReadMap<A,C> >();
 		  checkConcept<WriteMap<A,B>, WriteMap<A,B> >();
 		  checkConcept<WriteMap<A,C>, WriteMap<A,C> >();
 		  checkConcept<ReadWriteMap<A,B>, ReadWriteMap<A,B> >();
 		  checkConcept<ReadWriteMap<A,C>, ReadWriteMap<A,C> >();
 		  checkConcept<ReferenceMap<A,B,B&,const B&>, ReferenceMap<A,B,B&,const B&> >();
 		  checkConcept<ReferenceMap<A,C,C&,const C&>, ReferenceMap<A,C,C&,const C&> >();
 		  // NullMap
+		  {
 		    checkConcept<ReadWriteMap<A,B>, NullMap<A,B> >();
 		    NullMap<A,B> map1;
 		    NullMap<A,B> map2 = map1;
 		    map1 = nullMap<A,B>();
+		  }
 		  // ConstMap
+		  {
 		    checkConcept<ReadWriteMap<A,B>, ConstMap<A,B> >();
 		    checkConcept<ReadWriteMap<A,C>, ConstMap<A,C> >();
 		    ConstMap<A,B> map1;
 		    ConstMap<A,B> map2 = B();
 		    ConstMap<A,B> map3 = map1;
 		    map1 = constMap<A>(B());
 		    map1 = constMap<A,B>();
 		    map1.setAll(B());
 		    ConstMap<A,C> map4(C(1));
 		    ConstMap<A,C> map5 = map4;
 		    map4 = constMap<A>(C(2));
 		    map4.setAll(C(3));
 		    checkConcept<ReadWriteMap<A,int>, ConstMap<A,int> >();
 		    check(constMap<A>(10)[A()] == 10, "Something is wrong with ConstMap");
 		    checkConcept<ReadWriteMap<A,int>, ConstMap<A,Const<int,10> > >();
 		    ConstMap<A,Const<int,10> > map6;
 		    ConstMap<A,Const<int,10> > map7 = map6;
 		    map6 = constMap<A,int,10>();
 		    map7 = constMap<A,Const<int,10> >();
 		    check(map6[A()] == 10 && map7[A()] == 10,
 		          "Something is wrong with ConstMap");
+		  }
 		  // IdentityMap
+		  {
 		    checkConcept<ReadMap<A,A>, IdentityMap<A> >();
 		    IdentityMap<A> map1;
 		    IdentityMap<A> map2 = map1;
 		    map1 = identityMap<A>();
 		    checkConcept<ReadMap<double,double>, IdentityMap<double> >();
 		    check(identityMap<double>()[1.0] == 1.0 &&
 		          identityMap<double>()[3.14] == 3.14,
 		          "Something is wrong with IdentityMap");
+		  }
 		  // RangeMap
+		  {
 		    checkConcept<ReferenceMap<int,B,B&,const B&>, RangeMap<B> >();
 		    RangeMap<B> map1;
 		    RangeMap<B> map2(10);
 		    RangeMap<B> map3(10,B());
 		    RangeMap<B> map4 = map1;
 		    RangeMap<B> map5 = rangeMap<B>();
 		    RangeMap<B> map6 = rangeMap<B>(10);
 		    RangeMap<B> map7 = rangeMap(10,B());
 		    checkConcept< ReferenceMap<int, double, double&, const double&>,
 		                  RangeMap<double> >();
 		    std::vector<double> v(10, 0);
 		    v[5] = 100;
 		    RangeMap<double> map8(v);
 		    RangeMap<double> map9 = rangeMap(v);
 		    check(map9.size() == 10 && map9[2] == 0 && map9[5] == 100,
 		          "Something is wrong with RangeMap");
+		  }
 		  // SparseMap
+		  {
 		    checkConcept<ReferenceMap<A,B,B&,const B&>, SparseMap<A,B> >();
 		    SparseMap<A,B> map1;
 		    SparseMap<A,B> map2 = B();
 		    SparseMap<A,B> map3 = sparseMap<A,B>();
 		    SparseMap<A,B> map4 = sparseMap<A>(B());
 		    checkConcept< ReferenceMap<double, int, int&, const int&>,
 		                  SparseMap<double, int> >();
 		    std::map<double, int> m;
 		    SparseMap<double, int> map5(m);
 		    SparseMap<double, int> map6(m,10);
 		    SparseMap<double, int> map7 = sparseMap(m);
 		    SparseMap<double, int> map8 = sparseMap(m,10);
 		    check(map5[1.0] == 0 && map5[3.14] == 0 &&
 		          map6[1.0] == 10 && map6[3.14] == 10,
 		          "Something is wrong with SparseMap");
 		    map5[1.0] = map6[3.14] = 100;
 		    check(map5[1.0] == 100 && map5[3.14] == 0 &&
 		          map6[1.0] == 10 && map6[3.14] == 100,
 		          "Something is wrong with SparseMap");
+		  }
 		  // ComposeMap
+		  {
 		    typedef ComposeMap<DoubleMap, ReadMap<B,A> > CompMap;
 		    checkConcept<ReadMap<B,double>, CompMap>();
 		    CompMap map1 = CompMap(DoubleMap(),ReadMap<B,A>());
 		    CompMap map2 = composeMap(DoubleMap(), ReadMap<B,A>());
 		    SparseMap<double, bool> m1(false); m1[3.14] = true;
 		    RangeMap<double> m2(2); m2[0] = 3.0; m2[1] = 3.14;
 		    check(!composeMap(m1,m2)[0] && composeMap(m1,m2)[1],
 		          "Something is wrong with ComposeMap")
+		  }
 		  // CombineMap
+		  {
 		    typedef CombineMap<DoubleMap, DoubleMap, std::plus<double> > CombMap;
 		    checkConcept<ReadMap<A,double>, CombMap>();
 		    CombMap map1 = CombMap(DoubleMap(), DoubleMap());
 		    CombMap map2 = combineMap(DoubleMap(), DoubleMap(), std::plus<double>());
 		    check(combineMap(constMap<B,int,2>(), identityMap<B>(), &binc)[B()] == 3,
 		          "Something is wrong with CombineMap");
+		  }
 		  // FunctorToMap, MapToFunctor
+		  {
 		    checkConcept<ReadMap<A,B>, FunctorToMap<F,A,B> >();
 		    checkConcept<ReadMap<A,B>, FunctorToMap<F> >();
 		    FunctorToMap<F> map1;
 		    FunctorToMap<F> map2 = FunctorToMap<F>(F());
 		    B b = functorToMap(F())[A()];
 		    checkConcept<ReadMap<A,B>, MapToFunctor<ReadMap<A,B> > >();
 		    MapToFunctor<ReadMap<A,B> > map = MapToFunctor<ReadMap<A,B> >(ReadMap<A,B>());
 		    check(functorToMap(&func)[A()] == 3,
 		          "Something is wrong with FunctorToMap");
 		    check(mapToFunctor(constMap<A,int>(2))(A()) == 2,
 		          "Something is wrong with MapToFunctor");
 		    check(mapToFunctor(functorToMap(&func))(A()) == 3 &&
 		          mapToFunctor(functorToMap(&func))[A()] == 3,
 		          "Something is wrong with FunctorToMap or MapToFunctor");
 		    check(functorToMap(mapToFunctor(constMap<A,int>(2)))[A()] == 2,
 		          "Something is wrong with FunctorToMap or MapToFunctor");
+		  }
 		  // ConvertMap
+		  {
 		    checkConcept<ReadMap<double,double>,
 		      ConvertMap<ReadMap<double, int>, double> >();
 		    ConvertMap<RangeMap<bool>, int> map1(rangeMap(1, true));
 		    ConvertMap<RangeMap<bool>, int> map2 = convertMap<int>(rangeMap(2, false));
+		  }
 		  // ForkMap
+		  {
 		    checkConcept<DoubleWriteMap, ForkMap<DoubleWriteMap, DoubleWriteMap> >();
 		    typedef RangeMap<double> RM;
 		    typedef SparseMap<int, double> SM;
 		    RM m1(10, -1);
 		    SM m2(-1);
 		    checkConcept<ReadWriteMap<int, double>, ForkMap<RM, SM> >();
 		    checkConcept<ReadWriteMap<int, double>, ForkMap<SM, RM> >();
 		    ForkMap<RM, SM> map1(m1,m2);
 		    ForkMap<SM, RM> map2 = forkMap(m2,m1);
 		    map2.set(5, 10);
 		    check(m1[1] == -1 && m1[5] == 10 && m2[1] == -1 &&
 		          m2[5] == 10 && map2[1] == -1 && map2[5] == 10,
 		          "Something is wrong with ForkMap");
+		  }
 		  // Arithmetic maps:
 		  // - AddMap, SubMap, MulMap, DivMap
 		  // - ShiftMap, ShiftWriteMap, ScaleMap, ScaleWriteMap
 		  // - NegMap, NegWriteMap, AbsMap
+		  {
 		    checkConcept<DoubleMap, AddMap<DoubleMap,DoubleMap> >();
 		    checkConcept<DoubleMap, SubMap<DoubleMap,DoubleMap> >();
 		    checkConcept<DoubleMap, MulMap<DoubleMap,DoubleMap> >();
 		    checkConcept<DoubleMap, DivMap<DoubleMap,DoubleMap> >();
 		    ConstMap<int, double> c1(1.0), c2(3.14);
 		    IdentityMap<int> im;
 		    ConvertMap<IdentityMap<int>, double> id(im);
 		    check(addMap(c1,id)[0] == 1.0  && addMap(c1,id)[10] == 11.0,
 		          "Something is wrong with AddMap");
 		    check(subMap(id,c1)[0] == -1.0 && subMap(id,c1)[10] == 9.0,
 		          "Something is wrong with SubMap");
 		    check(mulMap(id,c2)[0] == 0    && mulMap(id,c2)[2]  == 6.28,
 		          "Something is wrong with MulMap");
 		    check(divMap(c2,id)[1] == 3.14 && divMap(c2,id)[2]  == 1.57,
 		          "Something is wrong with DivMap");
 		    checkConcept<DoubleMap, ShiftMap<DoubleMap> >();
 		    checkConcept<DoubleWriteMap, ShiftWriteMap<DoubleWriteMap> >();
 		    checkConcept<DoubleMap, ScaleMap<DoubleMap> >();
 		    checkConcept<DoubleWriteMap, ScaleWriteMap<DoubleWriteMap> >();
 		    checkConcept<DoubleMap, NegMap<DoubleMap> >();
 		    checkConcept<DoubleWriteMap, NegWriteMap<DoubleWriteMap> >();
 		    checkConcept<DoubleMap, AbsMap<DoubleMap> >();
 		    check(shiftMap(id, 2.0)[1] == 3.0 && shiftMap(id, 2.0)[10] == 12.0,
 		          "Something is wrong with ShiftMap");
 		    check(shiftWriteMap(id, 2.0)[1] == 3.0 &&
 		          shiftWriteMap(id, 2.0)[10] == 12.0,
 		          "Something is wrong with ShiftWriteMap");
 		    check(scaleMap(id, 2.0)[1] == 2.0 && scaleMap(id, 2.0)[10] == 20.0,
 		          "Something is wrong with ScaleMap");
 		    check(scaleWriteMap(id, 2.0)[1] == 2.0 &&
 		          scaleWriteMap(id, 2.0)[10] == 20.0,
 		          "Something is wrong with ScaleWriteMap");
 		    check(negMap(id)[1] == -1.0 && negMap(id)[-10] == 10.0,
 		          "Something is wrong with NegMap");
 		    check(negWriteMap(id)[1] == -1.0 && negWriteMap(id)[-10] == 10.0,
 		          "Something is wrong with NegWriteMap");
 		    check(absMap(id)[1] == 1.0 && absMap(id)[-10] == 10.0,
 		          "Something is wrong with AbsMap");
+		  }
 		  // Logical maps:
 		  // - TrueMap, FalseMap
 		  // - AndMap, OrMap
 		  // - NotMap, NotWriteMap
 		  // - EqualMap, LessMap
+		  {
 		    checkConcept<BoolMap, TrueMap<A> >();
 		    checkConcept<BoolMap, FalseMap<A> >();
 		    checkConcept<BoolMap, AndMap<BoolMap,BoolMap> >();
 		    checkConcept<BoolMap, OrMap<BoolMap,BoolMap> >();
 		    checkConcept<BoolMap, NotMap<BoolMap> >();
 		    checkConcept<BoolWriteMap, NotWriteMap<BoolWriteMap> >();
 		    checkConcept<BoolMap, EqualMap<DoubleMap,DoubleMap> >();
 		    checkConcept<BoolMap, LessMap<DoubleMap,DoubleMap> >();
 		    TrueMap<int> tm;
 		    FalseMap<int> fm;
 		    RangeMap<bool> rm(2);
 		    rm[0] = true; rm[1] = false;
 		    check(andMap(tm,rm)[0] && !andMap(tm,rm)[1] &&
 		          !andMap(fm,rm)[0] && !andMap(fm,rm)[1],
 		          "Something is wrong with AndMap");
 		    check(orMap(tm,rm)[0] && orMap(tm,rm)[1] &&
 		          orMap(fm,rm)[0] && !orMap(fm,rm)[1],
 		          "Something is wrong with OrMap");
 		    check(!notMap(rm)[0] && notMap(rm)[1],
 		          "Something is wrong with NotMap");
 		    check(!notWriteMap(rm)[0] && notWriteMap(rm)[1],
 		          "Something is wrong with NotWriteMap");
 		    ConstMap<int, double> cm(2.0);
 		    IdentityMap<int> im;
 		    ConvertMap<IdentityMap<int>, double> id(im);
 		    check(lessMap(id,cm)[1] && !lessMap(id,cm)[2] && !lessMap(id,cm)[3],
 		          "Something is wrong with LessMap");
 		    check(!equalMap(id,cm)[1] && equalMap(id,cm)[2] && !equalMap(id,cm)[3],
 		          "Something is wrong with EqualMap");
+		  }
 		  // LoggerBoolMap
+		  {
 		    typedef std::vector<int> vec;
 		    checkConcept<WriteMap<int, bool>, LoggerBoolMap<vec::iterator> >();
 		    checkConcept<WriteMap<int, bool>,
 		                 LoggerBoolMap<std::back_insert_iterator<vec> > >();
 		    vec v1;
 		    vec v2(10);
 		    LoggerBoolMap<std::back_insert_iterator<vec> >
 		      map1(std::back_inserter(v1));
 		    LoggerBoolMap<vec::iterator> map2(v2.begin());
 		    map1.set(10, false);
 		    map1.set(20, true);   map2.set(20, true);
 		    map1.set(30, false);  map2.set(40, false);
 		    map1.set(50, true);   map2.set(50, true);
 		    map1.set(60, true);   map2.set(60, true);
 		    check(v1.size() == 3 && v2.size() == 10 &&
 		          v1[0]==20 && v1[1]==50 && v1[2]==60 &&
 		          v2[0]==20 && v2[1]==50 && v2[2]==60,
 		          "Something is wrong with LoggerBoolMap");
 		    int i = 0;
 		    for ( LoggerBoolMap<vec::iterator>::Iterator it = map2.begin();
 		          it != map2.end(); ++it )
 		      check(v1[i++] == *it, "Something is wrong with LoggerBoolMap");
 		    typedef ListDigraph Graph;
 		    DIGRAPH_TYPEDEFS(Graph);
 		    Graph gr;
 		    Node n0 = gr.addNode();
 		    Node n1 = gr.addNode();
 		    Node n2 = gr.addNode();
 		    Node n3 = gr.addNode();
 		    gr.addArc(n3, n0);
 		    gr.addArc(n3, n2);
 		    gr.addArc(n0, n2);
 		    gr.addArc(n2, n1);
 		    gr.addArc(n0, n1);
+		    {
 		      std::vector<Node> v;
 		      dfs(gr).processedMap(loggerBoolMap(std::back_inserter(v))).run();
 		      check(v.size()==4 && v[0]==n1 && v[1]==n2 && v[2]==n0 && v[3]==n3,
 		            "Something is wrong with LoggerBoolMap");
+		    }
+		    {
 		      std::vector<Node> v(countNodes(gr));
 		      dfs(gr).processedMap(loggerBoolMap(v.begin())).run();
 		      check(v.size()==4 && v[0]==n1 && v[1]==n2 && v[2]==n0 && v[3]==n3,
 		            "Something is wrong with LoggerBoolMap");
+		    }
+		  }
 		  // IdMap, RangeIdMap
+		  {
 		    typedef ListDigraph Graph;
 		    DIGRAPH_TYPEDEFS(Graph);
 		    checkConcept<ReadMap<Node, int>, IdMap<Graph, Node> >();
 		    checkConcept<ReadMap<Arc, int>, IdMap<Graph, Arc> >();
 		    checkConcept<ReadMap<Node, int>, RangeIdMap<Graph, Node> >();
 		    checkConcept<ReadMap<Arc, int>, RangeIdMap<Graph, Arc> >();
 		    Graph gr;
 		    IdMap<Graph, Node> nmap(gr);
 		    IdMap<Graph, Arc> amap(gr);
 		    RangeIdMap<Graph, Node> nrmap(gr);
 		    RangeIdMap<Graph, Arc> armap(gr);
 		    Node n0 = gr.addNode();
 		    Node n1 = gr.addNode();
 		    Node n2 = gr.addNode();
 		    Arc a0 = gr.addArc(n0, n1);
 		    Arc a1 = gr.addArc(n0, n2);
 		    Arc a2 = gr.addArc(n2, n1);
 		    Arc a3 = gr.addArc(n2, n0);
 		    check(nmap[n0] == gr.id(n0) && nmap(gr.id(n0)) == n0, "Wrong IdMap");
 		    check(nmap[n1] == gr.id(n1) && nmap(gr.id(n1)) == n1, "Wrong IdMap");
 		    check(nmap[n2] == gr.id(n2) && nmap(gr.id(n2)) == n2, "Wrong IdMap");
 		    check(amap[a0] == gr.id(a0) && amap(gr.id(a0)) == a0, "Wrong IdMap");
 		    check(amap[a1] == gr.id(a1) && amap(gr.id(a1)) == a1, "Wrong IdMap");
 		    check(amap[a2] == gr.id(a2) && amap(gr.id(a2)) == a2, "Wrong IdMap");
 		    check(amap[a3] == gr.id(a3) && amap(gr.id(a3)) == a3, "Wrong IdMap");
 		    check(nmap.inverse()[gr.id(n0)] == n0, "Wrong IdMap::InverseMap");
 		    check(amap.inverse()[gr.id(a0)] == a0, "Wrong IdMap::InverseMap");
 		    check(nrmap.size() == 3 && armap.size() == 4,
 		          "Wrong RangeIdMap::size()");
 		    check(nrmap[n0] == 0 && nrmap(0) == n0, "Wrong RangeIdMap");
 		    check(nrmap[n1] == 1 && nrmap(1) == n1, "Wrong RangeIdMap");
 		    check(nrmap[n2] == 2 && nrmap(2) == n2, "Wrong RangeIdMap");
 		    check(armap[a0] == 0 && armap(0) == a0, "Wrong RangeIdMap");
 		    check(armap[a1] == 1 && armap(1) == a1, "Wrong RangeIdMap");
 		    check(armap[a2] == 2 && armap(2) == a2, "Wrong RangeIdMap");
 		    check(armap[a3] == 3 && armap(3) == a3, "Wrong RangeIdMap");
 		    check(nrmap.inverse()[0] == n0, "Wrong RangeIdMap::InverseMap");
 		    check(armap.inverse()[0] == a0, "Wrong RangeIdMap::InverseMap");
 		    gr.erase(n1);
 		    if (nrmap[n0] == 1) nrmap.swap(n0, n2);
 		    nrmap.swap(n2, n0);
 		    if (armap[a1] == 1) armap.swap(a1, a3);
 		    armap.swap(a3, a1);
 		    check(nrmap.size() == 2 && armap.size() == 2,
 		          "Wrong RangeIdMap::size()");
 		    check(nrmap[n0] == 1 && nrmap(1) == n0, "Wrong RangeIdMap");
 		    check(nrmap[n2] == 0 && nrmap(0) == n2, "Wrong RangeIdMap");
 		    check(armap[a1] == 1 && armap(1) == a1, "Wrong RangeIdMap");
 		    check(armap[a3] == 0 && armap(0) == a3, "Wrong RangeIdMap");
 		    check(nrmap.inverse()[0] == n2, "Wrong RangeIdMap::InverseMap");
 		    check(armap.inverse()[0] == a3, "Wrong RangeIdMap::InverseMap");
+		  }
 		  // SourceMap, TargetMap, ForwardMap, BackwardMap, InDegMap, OutDegMap
+		  {
 		    typedef ListGraph Graph;
 		    GRAPH_TYPEDEFS(Graph);
 		    checkConcept<ReadMap<Arc, Node>, SourceMap<Graph> >();
 		    checkConcept<ReadMap<Arc, Node>, TargetMap<Graph> >();
 		    checkConcept<ReadMap<Edge, Arc>, ForwardMap<Graph> >();
 		    checkConcept<ReadMap<Edge, Arc>, BackwardMap<Graph> >();
 		    checkConcept<ReadMap<Node, int>, InDegMap<Graph> >();
 		    checkConcept<ReadMap<Node, int>, OutDegMap<Graph> >();
 		    Graph gr;
 		    Node n0 = gr.addNode();
 		    Node n1 = gr.addNode();
 		    Node n2 = gr.addNode();
 		    gr.addEdge(n0,n1);
 		    gr.addEdge(n1,n2);
 		    gr.addEdge(n0,n2);
 		    gr.addEdge(n2,n1);
 		    gr.addEdge(n1,n2);
 		    gr.addEdge(n0,n1);
 		    for (EdgeIt e(gr); e != INVALID; ++e) {
 		      check(forwardMap(gr)[e] == gr.direct(e, true), "Wrong ForwardMap");
 		      check(backwardMap(gr)[e] == gr.direct(e, false), "Wrong BackwardMap");
+		    }
 		    compareMap(sourceMap(orienter(gr, constMap<Edge, bool>(true))),
 		               targetMap(orienter(gr, constMap<Edge, bool>(false))),
 		               EdgeIt(gr));
 		    typedef Orienter<Graph, const ConstMap<Edge, bool> > Digraph;
 		    Digraph dgr(gr, constMap<Edge, bool>(true));
 		    OutDegMap<Digraph> odm(dgr);
 		    InDegMap<Digraph> idm(dgr);
 		    check(odm[n0] == 3 && odm[n1] == 2 && odm[n2] == 1, "Wrong OutDegMap");
 		    check(idm[n0] == 0 && idm[n1] == 3 && idm[n2] == 3, "Wrong InDegMap");
 		    gr.addEdge(n2, n0);
 		    check(odm[n0] == 3 && odm[n1] == 2 && odm[n2] == 2, "Wrong OutDegMap");
 		    check(idm[n0] == 1 && idm[n1] == 3 && idm[n2] == 3, "Wrong InDegMap");
+		  }
 		  // CrossRefMap
+		  {
 		    typedef ListDigraph Graph;
 		    DIGRAPH_TYPEDEFS(Graph);
 		    checkConcept<ReadWriteMap<Node, int>,
 		                 CrossRefMap<Graph, Node, int> >();
 		    checkConcept<ReadWriteMap<Node, bool>,
 		                 CrossRefMap<Graph, Node, bool> >();
 		    checkConcept<ReadWriteMap<Node, double>,
 		                 CrossRefMap<Graph, Node, double> >();
 		    Graph gr;
 		    typedef CrossRefMap<Graph, Node, char> CRMap;
 		    typedef CRMap::ValueIterator ValueIt;
 		    CRMap map(gr);
 		    Node n0 = gr.addNode();
 		    Node n1 = gr.addNode();
 		    Node n2 = gr.addNode();
 		    map.set(n0, 'A');
 		    map.set(n1, 'B');
 		    map.set(n2, 'C');
 		    check(map[n0] == 'A' && map('A') == n0 && map.inverse()['A'] == n0,
 		          "Wrong CrossRefMap");
 		    check(map[n1] == 'B' && map('B') == n1 && map.inverse()['B'] == n1,
 		          "Wrong CrossRefMap");
 		    check(map[n2] == 'C' && map('C') == n2 && map.inverse()['C'] == n2,
 		          "Wrong CrossRefMap");
 		    check(map.count('A') == 1 && map.count('B') == 1 && map.count('C') == 1,
 		          "Wrong CrossRefMap::count()");
 		    ValueIt it = map.beginValue();
+		    CRMap::ValueIt it = map.beginValue();
 		    check(*it++ == 'A' && *it++ == 'B' && *it++ == 'C' &&
 		          it == map.endValue(), "Wrong value iterator");
 		    map.set(n2, 'A');
 		    check(map[n0] == 'A' && map[n1] == 'B' && map[n2] == 'A',
 		          "Wrong CrossRefMap");
 		    check(map('A') == n0 && map.inverse()['A'] == n0, "Wrong CrossRefMap");
 		    check(map('B') == n1 && map.inverse()['B'] == n1, "Wrong CrossRefMap");
 		    check(map('C') == INVALID && map.inverse()['C'] == INVALID,
 		          "Wrong CrossRefMap");
 		    check(map.count('A') == 2 && map.count('B') == 1 && map.count('C') == 0,
 		          "Wrong CrossRefMap::count()");
 		    it = map.beginValue();
 		    check(*it++ == 'A' && *it++ == 'A' && *it++ == 'B' &&
 		          it == map.endValue(), "Wrong value iterator");
 		    map.set(n0, 'C');
 		    check(map[n0] == 'C' && map[n1] == 'B' && map[n2] == 'A',
 		          "Wrong CrossRefMap");
 		    check(map('A') == n2 && map.inverse()['A'] == n2, "Wrong CrossRefMap");
 		    check(map('B') == n1 && map.inverse()['B'] == n1, "Wrong CrossRefMap");
 		    check(map('C') == n0 && map.inverse()['C'] == n0, "Wrong CrossRefMap");
 		    check(map.count('A') == 1 && map.count('B') == 1 && map.count('C') == 1,
 		          "Wrong CrossRefMap::count()");
 		    it = map.beginValue();
 		    check(*it++ == 'A' && *it++ == 'B' && *it++ == 'C' &&
 		          it == map.endValue(), "Wrong value iterator");
+		  }
 		  // Iterable bool map
+		  {
 		    typedef SmartGraph Graph;
 		    typedef SmartGraph::Node Item;
 		    typedef IterableBoolMap<SmartGraph, SmartGraph::Node> Ibm;
 		    checkConcept<ReferenceMap<Item, bool, bool&, const bool&>, Ibm>();
 		    const int num = 10;
 		    Graph g;
 		    std::vector<Item> items;
 		    for (int i = 0; i < num; ++i) {
 		      items.push_back(g.addNode());
+		    }
 		    Ibm map1(g, true);
 		    int n = 0;
 		    for (Ibm::TrueIt it(map1); it != INVALID; ++it) {
 		      check(map1[static_cast<Item>(it)], "Wrong TrueIt");
 		      ++n;
+		    }
 		    check(n == num, "Wrong number");
 		    n = 0;
 		    for (Ibm::ItemIt it(map1, true); it != INVALID; ++it) {
 		        check(map1[static_cast<Item>(it)], "Wrong ItemIt for true");
 		        ++n;
+		    }
 		    check(n == num, "Wrong number");
 		    check(Ibm::FalseIt(map1) == INVALID, "Wrong FalseIt");
 		    check(Ibm::ItemIt(map1, false) == INVALID, "Wrong ItemIt for false");
 		    map1[items[5]] = true;
 		    n = 0;
 		    for (Ibm::ItemIt it(map1, true); it != INVALID; ++it) {
 		        check(map1[static_cast<Item>(it)], "Wrong ItemIt for true");
 		        ++n;
+		    }
 		    check(n == num, "Wrong number");
 		    map1[items[num / 2]] = false;
 		    check(map1[items[num / 2]] == false, "Wrong map value");
 		    n = 0;
 		    for (Ibm::TrueIt it(map1); it != INVALID; ++it) {
 		        check(map1[static_cast<Item>(it)], "Wrong TrueIt for true");
 		        ++n;
+		    }
 		    check(n == num - 1, "Wrong number");
 		    n = 0;
 		    for (Ibm::FalseIt it(map1); it != INVALID; ++it) {
 		        check(!map1[static_cast<Item>(it)], "Wrong FalseIt for true");
 		        ++n;
+		    }
 		    check(n == 1, "Wrong number");
 		    map1[items[0]] = false;
 		    check(map1[items[0]] == false, "Wrong map value");
 		    map1[items[num - 1]] = false;
 		    check(map1[items[num - 1]] == false, "Wrong map value");
 		    n = 0;
 		    for (Ibm::TrueIt it(map1); it != INVALID; ++it) {
 		        check(map1[static_cast<Item>(it)], "Wrong TrueIt for true");
 		        ++n;
+		    }
 		    check(n == num - 3, "Wrong number");
 		    check(map1.trueNum() == num - 3, "Wrong number");
 		    n = 0;
 		    for (Ibm::FalseIt it(map1); it != INVALID; ++it) {
 		        check(!map1[static_cast<Item>(it)], "Wrong FalseIt for true");
 		        ++n;
+		    }
 		    check(n == 3, "Wrong number");
 		    check(map1.falseNum() == 3, "Wrong number");
+		  }
 		  // Iterable int map
+		  {
 		    typedef SmartGraph Graph;
 		    typedef SmartGraph::Node Item;
 		    typedef IterableIntMap<SmartGraph, SmartGraph::Node> Iim;
 		    checkConcept<ReferenceMap<Item, int, int&, const int&>, Iim>();
 		    const int num = 10;
 		    Graph g;
 		    std::vector<Item> items;
 		    for (int i = 0; i < num; ++i) {
 		      items.push_back(g.addNode());
+		    }
 		    Iim map1(g);
 		    check(map1.size() == 0, "Wrong size");
 		    for (int i = 0; i < num; ++i) {
 		      map1[items[i]] = i;
+		    }
 		    check(map1.size() == num, "Wrong size");
 		    for (int i = 0; i < num; ++i) {
 		      Iim::ItemIt it(map1, i);
 		      check(static_cast<Item>(it) == items[i], "Wrong value");
 		      ++it;
 		      check(static_cast<Item>(it) == INVALID, "Wrong value");
+		    }
 		    for (int i = 0; i < num; ++i) {
 		      map1[items[i]] = i % 2;
+		    }
 		    check(map1.size() == 2, "Wrong size");
 		    int n = 0;
 		    for (Iim::ItemIt it(map1, 0); it != INVALID; ++it) {
 		      check(map1[static_cast<Item>(it)] == 0, "Wrong value");
 		      ++n;
+		    }
 		    check(n == (num + 1) / 2, "Wrong number");
 		    for (Iim::ItemIt it(map1, 1); it != INVALID; ++it) {
 		      check(map1[static_cast<Item>(it)] == 1, "Wrong value");
 		      ++n;
+		    }
 		    check(n == num, "Wrong number");
+		  }
 		  // Iterable value map
+		  {
 		    typedef SmartGraph Graph;
 		    typedef SmartGraph::Node Item;
 		    typedef IterableValueMap<SmartGraph, SmartGraph::Node, double> Ivm;
 		    checkConcept<ReadWriteMap<Item, double>, Ivm>();
 		    const int num = 10;
 		    Graph g;
 		    std::vector<Item> items;
 		    for (int i = 0; i < num; ++i) {
 		      items.push_back(g.addNode());
+		    }
 		    Ivm map1(g, 0.0);
 		    check(distance(map1.beginValue(), map1.endValue()) == 1, "Wrong size");
 		    check(*map1.beginValue() == 0.0, "Wrong value");
 		    for (int i = 0; i < num; ++i) {
 		      map1.set(items[i], static_cast<double>(i));
+		    }
 		    check(distance(map1.beginValue(), map1.endValue()) == num, "Wrong size");
 		    for (int i = 0; i < num; ++i) {
 		      Ivm::ItemIt it(map1, static_cast<double>(i));
 		      check(static_cast<Item>(it) == items[i], "Wrong value");
 		      ++it;
 		      check(static_cast<Item>(it) == INVALID, "Wrong value");
+		    }
-		    for (Ivm::ValueIterator vit = map1.beginValue();
+		    for (Ivm::ValueIt vit = map1.beginValue();
 		         vit != map1.endValue(); ++vit) {
 		      check(map1[static_cast<Item>(Ivm::ItemIt(map1, *vit))] == *vit,
-		            "Wrong ValueIterator");
+		            "Wrong ValueIt");
+		    }
 		    for (int i = 0; i < num; ++i) {
 		      map1.set(items[i], static_cast<double>(i % 2));
+		    }
 		    check(distance(map1.beginValue(), map1.endValue()) == 2, "Wrong size");
 		    int n = 0;
 		    for (Ivm::ItemIt it(map1, 0.0); it != INVALID; ++it) {
 		      check(map1[static_cast<Item>(it)] == 0.0, "Wrong value");
 		      ++n;
+		    }
 		    check(n == (num + 1) / 2, "Wrong number");
 		    for (Ivm::ItemIt it(map1, 1.0); it != INVALID; ++it) {
 		      check(map1[static_cast<Item>(it)] == 1.0, "Wrong value");
 		      ++n;
+		    }
 		    check(n == num, "Wrong number");
+		  }
 		  return 0;
+		}

0 comments (0 inline)

RhodeCode

Login to your account