1.1 --- a/lemon/lgf_writer.h	Thu Dec 01 09:05:47 2011 +0100
     1.2 +++ b/lemon/lgf_writer.h	Wed Jan 11 22:21:07 2012 +0100
     1.3 @@ -1629,7 +1629,7 @@
     1.4    /// reads the red and blue nodes from separate sections, and these
     1.5    /// sections can contain different set of maps.
     1.6    ///
     1.7 -  /// The red and blue maps are written to the corresponding
     1.8 +  /// The red and blue node maps are written to the corresponding
     1.9    /// sections. The node maps are written to both of these sections
    1.10    /// with the same map name.
    1.11    template <typename BGR>
    1.12 @@ -1805,11 +1805,11 @@
    1.13        return *this;
    1.14      }
    1.15  
    1.16 -    /// \brief Red map writing rule
    1.17 +    /// \brief Red node map writing rule
    1.18      ///
    1.19 -    /// Add a red map writing rule to the writer.
    1.20 +    /// Add a red node map writing rule to the writer.
    1.21      template <typename Map>
    1.22 -    BpGraphWriter& redMap(const std::string& caption, const Map& map) {
    1.23 +    BpGraphWriter& redNodeMap(const std::string& caption, const Map& map) {
    1.24        checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
    1.25        _writer_bits::MapStorageBase<Node>* storage =
    1.26          new _writer_bits::MapStorage<Node, Map>(map);
    1.27 @@ -1817,13 +1817,13 @@
    1.28        return *this;
    1.29      }
    1.30  
    1.31 -    /// \brief Red map writing rule
    1.32 +    /// \brief Red node map writing rule
    1.33      ///
    1.34 -    /// Add a red map writing rule with specialized converter to the
    1.35 +    /// Add a red node map writing rule with specialized converter to the
    1.36      /// writer.
    1.37      template <typename Map, typename Converter>
    1.38 -    BpGraphWriter& redMap(const std::string& caption, const Map& map,
    1.39 -                          const Converter& converter = Converter()) {
    1.40 +    BpGraphWriter& redNodeMap(const std::string& caption, const Map& map,
    1.41 +                              const Converter& converter = Converter()) {
    1.42        checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
    1.43        _writer_bits::MapStorageBase<Node>* storage =
    1.44          new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
    1.45 @@ -1831,11 +1831,11 @@
    1.46        return *this;
    1.47      }
    1.48  
    1.49 -    /// \brief Blue map writing rule
    1.50 +    /// \brief Blue node map writing rule
    1.51      ///
    1.52 -    /// Add a blue map writing rule to the writer.
    1.53 +    /// Add a blue node map writing rule to the writer.
    1.54      template <typename Map>
    1.55 -    BpGraphWriter& blueMap(const std::string& caption, const Map& map) {
    1.56 +    BpGraphWriter& blueNodeMap(const std::string& caption, const Map& map) {
    1.57        checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
    1.58        _writer_bits::MapStorageBase<Node>* storage =
    1.59          new _writer_bits::MapStorage<Node, Map>(map);
    1.60 @@ -1843,13 +1843,13 @@
    1.61        return *this;
    1.62      }
    1.63  
    1.64 -    /// \brief Blue map writing rule
    1.65 +    /// \brief Blue node map writing rule
    1.66      ///
    1.67 -    /// Add a blue map writing rule with specialized converter to the
    1.68 +    /// Add a blue node map writing rule with specialized converter to the
    1.69      /// writer.
    1.70      template <typename Map, typename Converter>
    1.71 -    BpGraphWriter& blueMap(const std::string& caption, const Map& map,
    1.72 -                           const Converter& converter = Converter()) {
    1.73 +    BpGraphWriter& blueNodeMap(const std::string& caption, const Map& map,
    1.74 +                               const Converter& converter = Converter()) {
    1.75        checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
    1.76        _writer_bits::MapStorageBase<Node>* storage =
    1.77          new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
    1.78 @@ -2058,7 +2058,7 @@
    1.79        *_os << std::endl;
    1.80  
    1.81        std::vector<Node> nodes;
    1.82 -      for (RedIt n(_graph); n != INVALID; ++n) {
    1.83 +      for (RedNodeIt n(_graph); n != INVALID; ++n) {
    1.84          nodes.push_back(n);
    1.85        }
    1.86  
    1.87 @@ -2118,7 +2118,7 @@
    1.88        *_os << std::endl;
    1.89  
    1.90        std::vector<Node> nodes;
    1.91 -      for (BlueIt n(_graph); n != INVALID; ++n) {
    1.92 +      for (BlueNodeIt n(_graph); n != INVALID; ++n) {
    1.93          nodes.push_back(n);
    1.94        }
    1.95