LEMON/LEMON-main Changeset - r165:b4c336c27a03

Repositories » LEMON » LEMON-main

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

Changeset - r165:b4c336c27a03

« 164:00d297

166:579979 »

r165:b4c336c27a03

Sat, 31 May 2008 12:49:18

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Undirected LGF IO

0 2 0

default

2 files changed with 1473 insertions and 0 deletions:

lemon/lgf_reader.h

891

lemon/lgf_writer.h

582

↑ Collapse diff ↑

lemon/lgf_reader.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * 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.
+		 *
 		 */
 		///\ingroup lemon_io
 		///\file
 		///\brief Lemon Graph Format reader.
 		#ifndef LEMON_LGF_READER_H
 		#define LEMON_LGF_READER_H
 		#include <iostream>
 		#include <fstream>
 		#include <sstream>
 		#include <set>
 		#include <map>
 		#include <lemon/assert.h>
 		#include <lemon/graph_utils.h>
 		#include <lemon/lgf_writer.h>
 		#include <lemon/concept_check.h>
 		#include <lemon/concepts/maps.h>
 		namespace lemon {
 		  namespace _reader_bits {
 		    template <typename Value>
 		    struct DefaultConverter {
 		      Value operator()(const std::string& str) {
 			std::istringstream is(str);
 			Value value;
 			is >> value;
 			char c;
 			if (is >> std::ws >> c) {
 			  throw DataFormatError("Remaining characters in token");
+			}
 			return value;
+		      }
 		    };
 		    template <>
 		    struct DefaultConverter<std::string> {
 		      std::string operator()(const std::string& str) {
 			return str;
+		      }
 		    };
 		    template <typename _Item>
 		    class MapStorageBase {
 		    public:
 		      typedef _Item Item;
 		    public:
 		      MapStorageBase() {}
 		      virtual ~MapStorageBase() {}
 		      virtual void set(const Item& item, const std::string& value) = 0;
 		    };
 		    template <typename _Item, typename _Map,
 			      typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class MapStorage : public MapStorageBase<_Item> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Item Item;
 		    private:
 		      Map& _map;
 		      Converter _converter;
 		    public:
 		      MapStorage(Map& map, const Converter& converter = Converter())
 			: _map(map), _converter(converter) {}
 		      virtual ~MapStorage() {}
 		      virtual void set(const Item& item ,const std::string& value) {
 			_map.set(item, _converter(value));
+		      }
 		    };
 		    template <typename _Graph, bool _dir, typename _Map,
 			      typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Graph Graph;
 		      typedef typename Graph::Edge Item;
 		      static const bool dir = _dir;
 		    private:
 		      const Graph& _graph;
 		      Map& _map;
 		      Converter _converter;
 		    public:
 		      GraphArcMapStorage(const Graph& graph, Map& map,
 					 const Converter& converter = Converter())
 			: _graph(graph), _map(map), _converter(converter) {}
 		      virtual ~GraphArcMapStorage() {}
 		      virtual void set(const Item& item ,const std::string& value) {
 			_map.set(_graph.direct(item, dir), _converter(value));
+		      }
 		    };
 		    class ValueStorageBase {
 		    public:
 		      ValueStorageBase() {}
 		      virtual ~ValueStorageBase() {}
 		      virtual void set(const std::string&) = 0;
 		    };
 		    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
 		    class ValueStorage : public ValueStorageBase {
 		    public:
 		      typedef _Value Value;
 		      typedef _Converter Converter;
 		    private:
 		      Value& _value;
 		      Converter _converter;
 		    public:
 		      ValueStorage(Value& value, const Converter& converter = Converter())
 		 	: _value(value), _converter(converter) {}
 		      virtual void set(const std::string& value) {
 			_value = _converter(value);
+		      }
 		    };
 		    template <typename Value>
 		    struct MapLookUpConverter {
 		      const std::map<std::string, Value>& _map;
 		      MapLookUpConverter(const std::map<std::string, Value>& map)
 		        : _map(map) {}
 		      Value operator()(const std::string& str) {
 		        typename std::map<std::string, Value>::const_iterator it =
 		          _map.find(str);
 		        if (it == _map.end()) {
 		          std::ostringstream msg;
 		          msg << "Item not found: " << str;
 		          throw DataFormatError(msg.str().c_str());
+		        }
 		        return it->second;
+		      }
 		    };
 		    template <typename Graph>
 		    struct GraphArcLookUpConverter {
 		      const Graph& _graph;
 		      const std::map<std::string, typename Graph::Edge>& _map;
 		      GraphArcLookUpConverter(const Graph& graph,
 					      const std::map<std::string,
 					                     typename Graph::Edge>& map)
 			: _graph(graph), _map(map) {}
 		      typename Graph::Arc operator()(const std::string& str) {
 			if (str.empty() || (str[0] != '+' && str[0] != '-')) {
 			  throw DataFormatError("Item must start with '+' or '-'");
+			}
 			typename std::map<std::string, typename Graph::Edge>
 			  ::const_iterator it = _map.find(str.substr(1));
 			if (it == _map.end()) {
 			  throw DataFormatError("Item not found");
+			}
 			return _graph.direct(it->second, str[0] == '+');
+		      }
 		    };
 		    bool isWhiteSpace(char c) {
 		      return c == ' ' || c == '\t' || c == '\v' ||
 		        c == '\n' || c == '\r' || c == '\f';
+		    }
 		    bool isOct(char c) {
 		      return '0' <= c && c <='7';
+		    }
 		    int valueOct(char c) {
 		      LEMON_ASSERT(isOct(c), "The character is not octal.");
 		      return c - '0';
+		    }
 		    bool isHex(char c) {
 		      return ('0' <= c && c <= '9') ||
 			('a' <= c && c <= 'z') ||
 			('A' <= c && c <= 'Z');
+		    }
 		    int valueHex(char c) {
 		      LEMON_ASSERT(isHex(c), "The character is not hexadecimal.");
 		      if ('0' <= c && c <= '9') return c - '0';
 		      if ('a' <= c && c <= 'z') return c - 'a' + 10;
 		      return c - 'A' + 10;
+		    }
 		    bool isIdentifierFirstChar(char c) {
 		      return ('a' <= c && c <= 'z') ||
 			('A' <= c && c <= 'Z') || c == '_';
+		    }
 		    bool isIdentifierChar(char c) {
 		      return isIdentifierFirstChar(c) ||
 			('0' <= c && c <= '9');
+		    }
 		    char readEscape(std::istream& is) {
 		      char c;
 		      if (!is.get(c))
 			throw DataFormatError("Escape format error");
 		      switch (c) {
 		      case '\\':
 			return '\\';
 		      case '\"':
 			return '\"';
 		      case '\'':
 			return '\'';
 		      case '\?':
 			return '\?';
 		      case 'a':
 			return '\a';
 		      case 'b':
 			return '\b';
 		      case 'f':
 			return '\f';
 		      case 'n':
 			return '\n';
 		      case 'r':
 			return '\r';
 		      case 't':
 			return '\t';
 		      case 'v':
 			return '\v';
 		      case 'x':
+			{
 			  int code;
 			  if (!is.get(c) || !isHex(c))
 			    throw DataFormatError("Escape format error");
 			  else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
 			  else code = code * 16 + valueHex(c);
 			  return code;
+			}
 		      default:
+			{
 			  int code;
 			  if (!isOct(c))
 			    throw DataFormatError("Escape format error");
 			  else if (code = valueOct(c), !is.get(c) || !isOct(c))
 			    is.putback(c);
 			  else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c))
 			    is.putback(c);
 			  else code = code * 8 + valueOct(c);
 			  return code;
+			}
+		      }
+		    }
 		    std::istream& readToken(std::istream& is, std::string& str) {
 		      std::ostringstream os;
 		      char c;
 		      is >> std::ws;
 		      if (!is.get(c))
 			return is;
 		      if (c == '\"') {
 			while (is.get(c) && c != '\"') {
 			  if (c == '\\')
 			    c = readEscape(is);
 			  os << c;
+			}
 			if (!is)
 			  throw DataFormatError("Quoted format error");
 		      } else {
 			is.putback(c);
 			while (is.get(c) && !isWhiteSpace(c)) {
 			  if (c == '\\')
 			    c = readEscape(is);
 			  os << c;
+			}
 			if (!is) {
 			  is.clear();
 			} else {
 			  is.putback(c);
+			}
+		      }
 		      str = os.str();
 		      return is;
+		    }
 		    class Section {
 		    public:
 		      virtual ~Section() {}
 		      virtual void process(std::istream& is, int& line_num) = 0;
 		    };
 		    template <typename Functor>
 		    class LineSection : public Section {
 		    private:
 		      Functor _functor;
 		    public:
 		      LineSection(const Functor& functor) : _functor(functor) {}
 		      virtual ~LineSection() {}
 		      virtual void process(std::istream& is, int& line_num) {
 			char c;
 			std::string line;
 			while (is.get(c) && c != '@') {
 			  if (c == '\n') {
 			    ++line_num;
 			  } else if (c == '#') {
 			    getline(is, line);
 			    ++line_num;
 			  } else if (!isWhiteSpace(c)) {
 			    is.putback(c);
 			    getline(is, line);
 			    _functor(line);
 			    ++line_num;
+			  }
+			}
 			if (is) is.putback(c);
 			else if (is.eof()) is.clear();
+		      }
 		    };
 		    template <typename Functor>
 		    class StreamSection : public Section {
 		    private:
 		      Functor _functor;
 		    public:
 		      StreamSection(const Functor& functor) : _functor(functor) {}
 		      virtual ~StreamSection() {}
 		      virtual void process(std::istream& is, int& line_num) {
 			_functor(is, line_num);
 			char c;
 			std::string line;
 			while (is.get(c) && c != '@') {
 			  if (c == '\n') {
 			    ++line_num;
 			  } else if (!isWhiteSpace(c)) {
 			    getline(is, line);
 			    ++line_num;
+			  }
+			}
 			if (is) is.putback(c);
 			else if (is.eof()) is.clear();
+		      }
 		    };
+		  }
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief LGF reader for directed graphs
 		  ///
 		  /// This utility reads an \ref lgf-format "LGF" file.
 		  ///
 		  /// The reading method does a batch processing. The user creates a
 		  /// reader object, then various reading rules can be added to the
 		  /// reader, and eventually the reading is executed with the \c run()
 		  /// member function. A map reading rule can be added to the reader
 		  /// with the \c nodeMap() or \c arcMap() members. An optional
 		  /// converter parameter can also be added as a standard functor
 		  /// converting from std::string to the value type of the map. If it
 		  /// is set, it will determine how the tokens in the file should be
 		  /// is converted to the map's value type. If the functor is not set,
 		  /// then a default conversion will be used. One map can be read into
 		  /// multiple map objects at the same time. The \c attribute(), \c
 		  /// node() and \c arc() functions are used to add attribute reading
 		  /// rules.
 		  ///
 		  ///\code
 		  ///     DigraphReader<Digraph>(std::cin, digraph).
 		  ///       nodeMap("coordinates", coord_map).
 		  ///       arcMap("capacity", cap_map).
 		  ///       node("source", src).
 		  ///       node("target", trg).
 		  ///       attribute("caption", caption).
 		  ///       run();
 		  ///\endcode
 		  ///
 		  /// By default the reader uses the first section in the file of the
 		  /// proper type. If a section has an optional name, then it can be
 		  /// selected for reading by giving an optional name parameter to the
 		  /// \c nodes(), \c arcs() or \c attributes() functions. The readers
 		  /// also can load extra sections with the \c sectionLines() and
 		  /// sectionStream() functions.
 		  ///
 		  /// The \c useNodes() and \c useArcs() functions are used to tell the reader
 		  /// that the nodes or arcs should not be constructed (added to the
 		  /// graph) during the reading, but instead the label map of the items
 		  /// are given as a parameter of these functions. An
 		  /// application of these function is multipass reading, which is
 		  /// important if two \e \@arcs sections must be read from the
 		  /// file. In this example the first phase would read the node set and one
 		  /// of the arc sets, while the second phase would read the second arc
 		  /// set into an \e ArcSet class (\c SmartArcSet or \c ListArcSet).
 		  /// The previously read label node map should be passed to the \c
 		  /// useNodes() functions. Another application of multipass reading when
 		  /// paths are given as a node map or an arc map. It is impossible read this in
 		  /// a single pass, because the arcs are not constructed when the node
 		  /// maps are read.
 		  template <typename _Digraph>
 		  class DigraphReader {
 		  public:
 		    typedef _Digraph Digraph;
 		    TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 		  private:
 		    std::istream* _is;
 		    bool local_is;
 		    Digraph& _digraph;
 		    std::string _nodes_caption;
 		    std::string _arcs_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<std::string, Node> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<std::string, Arc> ArcIndex;
 		    ArcIndex _arc_index;
 		    typedef std::vector<std::pair<std::string,
 		      _reader_bits::MapStorageBase<Node>*> > NodeMaps;
 		    NodeMaps _node_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _reader_bits::MapStorageBase<Arc>*> >ArcMaps;
 		    ArcMaps _arc_maps;
 		    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*>
 		      Attributes;
 		    Attributes _attributes;
 		    typedef std::map<std::string, _reader_bits::Section*> Sections;
 		    Sections _sections;
 		    bool _use_nodes;
 		    bool _use_arcs;
 		    int line_num;
 		    std::istringstream line;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph reader, which reads from the given
 		    /// input stream.
 		    DigraphReader(std::istream& is, Digraph& digraph)
 		      : _is(&is), local_is(false), _digraph(digraph),
 			_use_nodes(false), _use_arcs(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph reader, which reads from the given
 		    /// file.
 		    DigraphReader(const std::string& fn, Digraph& digraph)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
 		    	_use_nodes(false), _use_arcs(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph reader, which reads from the given
 		    /// file.
 		    DigraphReader(const char* fn, Digraph& digraph)
 		      : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
 		    	_use_nodes(false), _use_arcs(false) {}
 		    /// \brief Copy constructor
 		    ///
 		    /// The copy constructor transfers all data from the other reader,
 		    /// therefore the copied reader will not be usable more.
 		    DigraphReader(DigraphReader& other)
 		      : _is(other._is), local_is(other.local_is), _digraph(other._digraph),
 			_use_nodes(other._use_nodes), _use_arcs(other._use_arcs) {
 		      other._is = 0;
 		      other.local_is = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _arcs_caption = other._arcs_caption;
 		      _attributes_caption = other._attributes_caption;
 		      _sections.swap(other._sections);
+		    }
 		    /// \brief Destructor
 		    ~DigraphReader() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Sections::iterator it = _sections.begin();
 			   it != _sections.end(); ++it) {
 			delete it->second;
+		      }
 		      if (local_is) {
 			delete _is;
+		      }
+		    }
 		  private:
 		    DigraphReader& operator=(const DigraphReader&);
 		  public:
 		    /// \name Reading rules
 		    /// @{
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule to the reader.
 		    template <typename Map>
 		    DigraphReader& nodeMap(const std::string& caption, Map& map) {
 		      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Node>* storage =
 			new _reader_bits::MapStorage<Node, Map>(map);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename Converter>
 		    DigraphReader& nodeMap(const std::string& caption, Map& map,
 					   const Converter& converter = Converter()) {
 		      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Node>* storage =
 			new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule to the reader.
 		    template <typename Map>
 		    DigraphReader& arcMap(const std::string& caption, Map& map) {
 		      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Arc>* storage =
 			new _reader_bits::MapStorage<Arc, Map>(map);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename Converter>
 		    DigraphReader& arcMap(const std::string& caption, Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Arc>* storage =
 			new _reader_bits::MapStorage<Arc, Map, Converter>(map, converter);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule to the reader.
 		    template <typename Value>
 		    DigraphReader& attribute(const std::string& caption, Value& value) {
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Value>(value);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Value, typename Converter>
 		    DigraphReader& attribute(const std::string& caption, Value& value,
 					     const Converter& converter = Converter()) {
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Value, Converter>(value, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node reading rule
 		    ///
 		    /// Add a node reading rule to reader.
 		    DigraphReader& node(const std::string& caption, Node& node) {
 		      typedef _reader_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc reading rule
 		    ///
 		    /// Add an arc reading rule to reader.
 		    DigraphReader& arc(const std::string& caption, Arc& arc) {
 		      typedef _reader_bits::MapLookUpConverter<Arc> Converter;
 		      Converter converter(_arc_index);
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// @}
 		    /// \name Select section by name
 		    /// @{
 		    /// \brief Set \c \@nodes section to be read
 		    ///
 		    /// Set \c \@nodes section to be read
 		    DigraphReader& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@arcs section to be read
 		    ///
 		    /// Set \c \@arcs section to be read
 		    DigraphReader& arcs(const std::string& caption) {
 		      _arcs_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@attributes section to be read
 		    ///
 		    /// Set \c \@attributes section to be read
 		    DigraphReader& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    /// @}
 		    /// \name Section readers
 		    /// @{
 		    /// \brief Add a section processor with line oriented reading
 		    ///
 		    /// In the \e LGF file extra sections can be placed, which contain
 		    /// any data in arbitrary format. These sections can be read with
 		    /// this function line by line. The first parameter is the type
 		    /// descriptor of the section, the second is a functor, which
 		    /// takes just one \c std::string parameter. At the reading
 		    /// process, each line of the section will be given to the functor
 		    /// object. However, the empty lines and the comment lines are
 		    /// filtered out, and the leading whitespaces are stipped from
 		    /// each processed string.
 		    ///
 		    /// For example let's see a section, which contain several
 		    /// integers, which should be inserted into a vector.
 		    ///\code
 		    ///  @numbers
 		    ///  12 45 23
 		    ///  4
 		    ///  23 6
 		    ///\endcode
 		    ///
 		    /// The functor is implemented as an struct:
 		    ///\code
 		    ///  struct NumberSection {
 		    ///    std::vector<int>& _data;
 		    ///    NumberSection(std::vector<int>& data) : _data(data) {}
 		    ///    void operator()(const std::string& line) {
 		    ///      std::istringstream ls(line);
 		    ///      int value;
 		    ///      while (ls >> value) _data.push_back(value);
 		    ///    }
 		    ///  };
 		    ///
 		    ///  // ...
 		    ///
 		    ///  reader.sectionLines("numbers", NumberSection(vec));
 		    ///\endcode
 		    template <typename Functor>
 		    DigraphReader& sectionLines(const std::string& type, Functor functor) {
 		      LEMON_ASSERT(!type.empty(), "Type is not empty.");
 		      LEMON_ASSERT(_sections.find(type) == _sections.end(),
 				   "Multiple reading of section.");
 		      LEMON_ASSERT(type != "nodes" && type != "arcs" && type != "edges" &&
 				   type != "attributes", "Multiple reading of section.");
 		      _sections.insert(std::make_pair(type,
 		        new _reader_bits::LineSection<Functor>(functor)));
 		      return *this;
+		    }
 		    /// \brief Add a section processor with stream oriented reading
 		    ///
 		    /// In the \e LGF file extra sections can be placed, which contain
 		    /// any data in arbitrary format. These sections can be read
 		    /// directly with this function. The first parameter is the type
 		    /// of the section, the second is a functor, which takes an \c
 		    /// std::istream& and an int& parameter, the latter regard to the
 		    /// line number of stream. The functor can read the input while
 		    /// the section go on, and the line number should be modified
 		    /// accordingly.
 		    template <typename Functor>
 		    DigraphReader& sectionStream(const std::string& type, Functor functor) {
 		      LEMON_ASSERT(!type.empty(), "Type is not empty.");
 		      LEMON_ASSERT(_sections.find(type) == _sections.end(),
 				   "Multiple reading of section.");
 		      LEMON_ASSERT(type != "nodes" && type != "arcs" && type != "edges" &&
 				   type != "attributes", "Multiple reading of section.");
 		      _sections.insert(std::make_pair(type,
 			 new _reader_bits::StreamSection<Functor>(functor)));
 		      return *this;
+		    }
 		    /// @}
 		    /// \name Using previously constructed node or arc set
 		    /// @{
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map.
 		    template <typename Map>
 		    DigraphReader& useNodes(const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
 		      _use_nodes = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (NodeIt n(_digraph); n != INVALID; ++n) {
 			_node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map and a functor which converts the label map values to
 		    /// std::string.
 		    template <typename Map, typename Converter>
 		    DigraphReader& useNodes(const Map& map,
 					    const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
 		      _use_nodes = true;
 		      for (NodeIt n(_digraph); n != INVALID; ++n) {
 			_node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed arc set
 		    ///
 		    /// Use previously constructed arc set, and specify the arc
 		    /// label map.
 		    template <typename Map>
 		    DigraphReader& useArcs(const Map& map) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
 		      _use_arcs = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (ArcIt a(_digraph); a != INVALID; ++a) {
 			_arc_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed arc set
 		    ///
 		    /// Use previously constructed arc set, and specify the arc
 		    /// label map and a functor which converts the label map values to
 		    /// std::string.
 		    template <typename Map, typename Converter>
 		    DigraphReader& useArcs(const Map& map,
 					    const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
 		      _use_arcs = true;
 		      for (ArcIt a(_digraph); a != INVALID; ++a) {
 			_arc_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    bool readLine() {
 		      std::string str;
 		      while(++line_num, std::getline(*_is, str)) {
 			line.clear(); line.str(str);
 			char c;
 			if (line >> std::ws >> c && c != '#') {
 			  line.putback(c);
 			  return true;
+			}
+		      }
 		      return false;
+		    }
 		    bool readSuccess() {
 		      return static_cast<bool>(*_is);
+		    }
 		    void skipSection() {
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 			readLine();
+		      }
 		      line.putback(c);
+		    }
 		    void readNodes() {
 		      std::vector<int> map_index(_node_maps.size());
 		      int map_num, label_index;
 		      if (!readLine())
 			throw DataFormatError("Cannot find map captions");
+		      {
 			std::map<std::string, int> maps;
 			std::string map;
 			int index = 0;
 			while (_reader_bits::readToken(line, map)) {
 			  if (maps.find(map) != maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of node map: " << map;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  maps.insert(std::make_pair(map, index));
 			  ++index;
+			}
 			for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 			  std::map<std::string, int>::iterator jt =
 			    maps.find(_node_maps[i].first);
 			  if (jt == maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Map not found in file: " << _node_maps[i].first;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  map_index[i] = jt->second;
+			}
+			{
 			  std::map<std::string, int>::iterator jt = maps.find("label");
 			  if (jt == maps.end())
 			    throw DataFormatError("Label map not found in file");
 			  label_index = jt->second;
+			}
 			map_num = maps.size();
+		      }
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 			line.putback(c);
 			std::vector<std::string> tokens(map_num);
 			for (int i = 0; i < map_num; ++i) {
 			  if (!_reader_bits::readToken(line, tokens[i])) {
 			    std::ostringstream msg;
 			    msg << "Column not found (" << i + 1 << ")";
 			    throw DataFormatError(msg.str().c_str());
+			  }
+			}
 			if (line >> std::ws >> c)
 			  throw DataFormatError("Extra character on the end of line");
 			Node n;
 			if (!_use_nodes) {
 			  n = _digraph.addNode();
 			  _node_index.insert(std::make_pair(tokens[label_index], n));
 			} else {
 			  typename std::map<std::string, Node>::iterator it =
 			    _node_index.find(tokens[label_index]);
 			  if (it == _node_index.end()) {
 			    std::ostringstream msg;
 			    msg << "Node with label not found: " << tokens[label_index];
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  n = it->second;
+			}
 			for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 			  _node_maps[i].second->set(n, tokens[map_index[i]]);
+			}
+		      }
 		      if (readSuccess()) {
 			line.putback(c);
+		      }
+		    }
 		    void readArcs() {
 		      std::vector<int> map_index(_arc_maps.size());
 		      int map_num, label_index;
 		      if (!readLine())
 			throw DataFormatError("Cannot find map captions");
+		      {
 			std::map<std::string, int> maps;
 			std::string map;
 			int index = 0;
 			while (_reader_bits::readToken(line, map)) {
 			  if (maps.find(map) != maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of arc map: " << map;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  maps.insert(std::make_pair(map, index));
 			  ++index;
+			}
 			for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
 			  std::map<std::string, int>::iterator jt =
 			    maps.find(_arc_maps[i].first);
 			  if (jt == maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Map not found in file: " << _arc_maps[i].first;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  map_index[i] = jt->second;
+			}
+			{
 			  std::map<std::string, int>::iterator jt = maps.find("label");
 			  if (jt == maps.end())
 			    throw DataFormatError("Label map not found in file");
 			  label_index = jt->second;
+			}
 			map_num = maps.size();
+		      }
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 			line.putback(c);
 			std::string source_token;
 			std::string target_token;
 			if (!_reader_bits::readToken(line, source_token))
 			  throw DataFormatError("Source not found");
 			if (!_reader_bits::readToken(line, target_token))
 			  throw DataFormatError("Source not found");
 			std::vector<std::string> tokens(map_num);
 			for (int i = 0; i < map_num; ++i) {
 			  if (!_reader_bits::readToken(line, tokens[i])) {
 			    std::ostringstream msg;
 			    msg << "Column not found (" << i + 1 << ")";
 			    throw DataFormatError(msg.str().c_str());
+			  }
+			}
 			if (line >> std::ws >> c)
 			  throw DataFormatError("Extra character on the end of line");
 			Arc a;
 			if (!_use_arcs) {
 		          typename NodeIndex::iterator it;
 		          it = _node_index.find(source_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << source_token;
 		            throw DataFormatError(msg.str().c_str());
+		          }
 		          Node source = it->second;
 		          it = _node_index.find(target_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << target_token;
 		            throw DataFormatError(msg.str().c_str());
+		          }
 		          Node target = it->second;
 			  a = _digraph.addArc(source, target);
 			  _arc_index.insert(std::make_pair(tokens[label_index], a));
 			} else {
 			  typename std::map<std::string, Arc>::iterator it =
 			    _arc_index.find(tokens[label_index]);
 			  if (it == _arc_index.end()) {
 			    std::ostringstream msg;
 			    msg << "Arc with label not found: " << tokens[label_index];
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  a = it->second;
+			}
 			for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
 			  _arc_maps[i].second->set(a, tokens[map_index[i]]);
+			}
+		      }
 		      if (readSuccess()) {
 			line.putback(c);
+		      }
+		    }
 		    void readAttributes() {
 		      std::set<std::string> read_attr;
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 			line.putback(c);
 			std::string attr, token;
 			if (!_reader_bits::readToken(line, attr))
 			  throw DataFormatError("Attribute name not found");
 			if (!_reader_bits::readToken(line, token))
 			  throw DataFormatError("Attribute value not found");
 			if (line >> c)
 			  throw DataFormatError("Extra character on the end of line");
+			{
 			  std::set<std::string>::iterator it = read_attr.find(attr);
 			  if (it != read_attr.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of attribute " << attr;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  read_attr.insert(attr);
+			}
+			{
 			  typename Attributes::iterator it = _attributes.lower_bound(attr);
 			  while (it != _attributes.end() && it->first == attr) {
 			    it->second->set(token);
 			    ++it;
+			  }
+			}
+		      }
 		      if (readSuccess()) {
 			line.putback(c);
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			if (read_attr.find(it->first) == read_attr.end()) {
 			  std::ostringstream msg;
 			  msg << "Attribute not found in file: " << it->first;
 			  throw DataFormatError(msg.str().c_str());
+			}
+		      }
+		    }
 		  public:
 		    /// \name Execution of the reader
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing
 		    void run() {
 		      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
 		      if (!*_is) {
 			throw DataFormatError("Cannot find file");
+		      }
 		      bool nodes_done = false;
 		      bool arcs_done = false;
 		      bool attributes_done = false;
 		      std::set<std::string> extra_sections;
 		      line_num = 0;
 		      readLine();
 		      while (readSuccess()) {
 			skipSection();
 			try {
 			  char c;
 			  std::string section, caption;
 			  line >> c;
 			  _reader_bits::readToken(line, section);
 			  _reader_bits::readToken(line, caption);
 			  if (line >> c)
 			    throw DataFormatError("Extra character on the end of line");
 			  if (section == "nodes" && !nodes_done) {
 			    if (_nodes_caption.empty() || _nodes_caption == caption) {
 			      readNodes();
 			      nodes_done = true;
+			    }
 			  } else if ((section == "arcs" || section == "edges") &&
 				     !arcs_done) {
 			    if (_arcs_caption.empty() || _arcs_caption == caption) {
 			      readArcs();
 			      arcs_done = true;
+			    }
 			  } else if (section == "attributes" && !attributes_done) {
 			    if (_attributes_caption.empty() || _attributes_caption == caption) {
 			      readAttributes();
 			      attributes_done = true;
+			    }
 			  } else {
 			    if (extra_sections.find(section) != extra_sections.end()) {
 			      std::ostringstream msg;
 			      msg << "Multiple occurence of section " << section;
 			      throw DataFormatError(msg.str().c_str());
+			    }
 			    Sections::iterator it = _sections.find(section);
 			    if (it != _sections.end()) {
 			      extra_sections.insert(section);
 			      it->second->process(*_is, line_num);
 			      readLine();
 			    } else {
 			      readLine();
 			      skipSection();
+			    }
+			  }
 			} catch (DataFormatError& error) {
 			  error.line(line_num);
 			  throw;
+			}
+		      }
 		      if (!nodes_done) {
 			throw DataFormatError("Section @nodes not found");
+		      }
 		      if (!arcs_done) {
 			throw DataFormatError("Section @arcs not found");
+		      }
 		      if (!attributes_done && !_attributes.empty()) {
 			throw DataFormatError("Section @attributes not found");
+		      }
+		    }
 		    /// @}
 		  };
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) {
 		    DigraphReader<Digraph> tmp(is, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(const std::string& fn,
 						       Digraph& digraph) {
 		    DigraphReader<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphReader
 		  template <typename Digraph>
 		  DigraphReader<Digraph> digraphReader(const char* fn, Digraph& digraph) {
 		    DigraphReader<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief LGF reader for undirected graphs
 		  ///
 		  /// This utility reads an \ref lgf-format "LGF" file.
 		  template <typename _Graph>
 		  class GraphReader {
 		  public:
 		    typedef _Graph Graph;
 		    TEMPLATE_GRAPH_TYPEDEFS(Graph);
 		  private:
 		    std::istream* _is;
 		    bool local_is;
 		    Graph& _graph;
 		    std::string _nodes_caption;
 		    std::string _edges_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<std::string, Node> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<std::string, Edge> EdgeIndex;
 		    EdgeIndex _edge_index;
 		    typedef std::vector<std::pair<std::string,
 		      _reader_bits::MapStorageBase<Node>*> > NodeMaps;
 		    NodeMaps _node_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _reader_bits::MapStorageBase<Edge>*> > EdgeMaps;
 		    EdgeMaps _edge_maps;
 		    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*>
 		      Attributes;
 		    Attributes _attributes;
 		    typedef std::map<std::string, _reader_bits::Section*> Sections;
 		    Sections _sections;
 		    bool _use_nodes;
 		    bool _use_edges;
 		    int line_num;
 		    std::istringstream line;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a undirected graph reader, which reads from the given
 		    /// input stream.
 		    GraphReader(std::istream& is, Graph& graph)
 		      : _is(&is), local_is(false), _graph(graph),
 			_use_nodes(false), _use_edges(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a undirected graph reader, which reads from the given
 		    /// file.
 		    GraphReader(const std::string& fn, Graph& graph)
 		      : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
 		    	_use_nodes(false), _use_edges(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a undirected graph reader, which reads from the given
 		    /// file.
 		    GraphReader(const char* fn, Graph& graph)
 		      : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
 		    	_use_nodes(false), _use_edges(false) {}
 		    /// \brief Copy constructor
 		    ///
 		    /// The copy constructor transfers all data from the other reader,
 		    /// therefore the copied reader will not be usable more.
 		    GraphReader(GraphReader& other)
 		      : _is(other._is), local_is(other.local_is), _graph(other._graph),
 			_use_nodes(other._use_nodes), _use_edges(other._use_edges) {
 		      other._is = 0;
 		      other.local_is = false;
 		      _node_index.swap(other._node_index);
 		      _edge_index.swap(other._edge_index);
 		      _node_maps.swap(other._node_maps);
 		      _edge_maps.swap(other._edge_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _edges_caption = other._edges_caption;
 		      _attributes_caption = other._attributes_caption;
 		      _sections.swap(other._sections);
+		    }
 		    /// \brief Destructor
 		    ~GraphReader() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename EdgeMaps::iterator it = _edge_maps.begin();
 			   it != _edge_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Sections::iterator it = _sections.begin();
 			   it != _sections.end(); ++it) {
 			delete it->second;
+		      }
 		      if (local_is) {
 			delete _is;
+		      }
+		    }
 		  private:
 		    GraphReader& operator=(const GraphReader&);
 		  public:
 		    /// \name Reading rules
 		    /// @{
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule to the reader.
 		    template <typename Map>
 		    GraphReader& nodeMap(const std::string& caption, Map& map) {
 		      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Node>* storage =
 			new _reader_bits::MapStorage<Node, Map>(map);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename Converter>
 		    GraphReader& nodeMap(const std::string& caption, Map& map,
 					   const Converter& converter = Converter()) {
 		      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Node>* storage =
 			new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map reading rule
 		    ///
 		    /// Add an edge map reading rule to the reader.
 		    template <typename Map>
 		    GraphReader& edgeMap(const std::string& caption, Map& map) {
 		      checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Edge>* storage =
 			new _reader_bits::MapStorage<Edge, Map>(map);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map reading rule
 		    ///
 		    /// Add an edge map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename Converter>
 		    GraphReader& edgeMap(const std::string& caption, Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Edge>* storage =
 			new _reader_bits::MapStorage<Edge, Map, Converter>(map, converter);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule to the reader.
 		    template <typename Map>
 		    GraphReader& arcMap(const std::string& caption, Map& map) {
 		      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Edge>* forward_storage =
 			new _reader_bits::GraphArcMapStorage<Graph, true, Map>(_graph, map);
 		      _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
 		      _reader_bits::MapStorageBase<Edge>* backward_storage =
 			new _reader_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Arc map reading rule
 		    ///
 		    /// Add an arc map reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Map, typename Converter>
 		    GraphReader& arcMap(const std::string& caption, Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
 		      _reader_bits::MapStorageBase<Edge>* forward_storage =
 			new _reader_bits::GraphArcMapStorage<Graph, true, Map, Converter>
 			(_graph, map, converter);
 		      _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
 		      _reader_bits::MapStorageBase<Edge>* backward_storage =
 			new _reader_bits::GraphArcMapStorage<Graph, false, Map, Converter>
 			(_graph, map, converter);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule to the reader.
 		    template <typename Value>
 		    GraphReader& attribute(const std::string& caption, Value& value) {
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Value>(value);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute reading rule
 		    ///
 		    /// Add an attribute reading rule with specialized converter to the
 		    /// reader.
 		    template <typename Value, typename Converter>
 		    GraphReader& attribute(const std::string& caption, Value& value,
 					     const Converter& converter = Converter()) {
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Value, Converter>(value, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node reading rule
 		    ///
 		    /// Add a node reading rule to reader.
 		    GraphReader& node(const std::string& caption, Node& node) {
 		      typedef _reader_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge reading rule
 		    ///
 		    /// Add an edge reading rule to reader.
 		    GraphReader& edge(const std::string& caption, Edge& edge) {
 		      typedef _reader_bits::MapLookUpConverter<Edge> Converter;
 		      Converter converter(_edge_index);
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Edge, Converter>(edge, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc reading rule
 		    ///
 		    /// Add an arc reading rule to reader.
 		    GraphReader& arc(const std::string& caption, Arc& arc) {
 		      typedef _reader_bits::GraphArcLookUpConverter<Graph> Converter;
 		      Converter converter(_graph, _edge_index);
 		      _reader_bits::ValueStorageBase* storage =
 			new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.insert(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// @}
 		    /// \name Select section by name
 		    /// @{
 		    /// \brief Set \c \@nodes section to be read
 		    ///
 		    /// Set \c \@nodes section to be read
 		    GraphReader& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@edges section to be read
 		    ///
 		    /// Set \c \@edges section to be read
 		    GraphReader& edges(const std::string& caption) {
 		      _edges_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@attributes section to be read
 		    ///
 		    /// Set \c \@attributes section to be read
 		    GraphReader& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    /// @}
 		    /// \name Section readers
 		    /// @{
 		    /// \brief Add a section processor with line oriented reading
 		    ///
 		    /// In the \e LGF file extra sections can be placed, which contain
 		    /// any data in arbitrary format. These sections can be read with
 		    /// this function line by line. The first parameter is the type
 		    /// descriptor of the section, the second is a functor, which
 		    /// takes just one \c std::string parameter. At the reading
 		    /// process, each line of the section will be given to the functor
 		    /// object. However, the empty lines and the comment lines are
 		    /// filtered out, and the leading whitespaces are stipped from
 		    /// each processed string.
 		    ///
 		    /// For example let's see a section, which contain several
 		    /// integers, which should be inserted into a vector.
 		    ///\code
 		    ///  @numbers
 		    ///  12 45 23
 		    ///  4
 		    ///  23 6
 		    ///\endcode
 		    ///
 		    /// The functor is implemented as an struct:
 		    ///\code
 		    ///  struct NumberSection {
 		    ///    std::vector<int>& _data;
 		    ///    NumberSection(std::vector<int>& data) : _data(data) {}
 		    ///    void operator()(const std::string& line) {
 		    ///      std::istringstream ls(line);
 		    ///      int value;
 		    ///      while (ls >> value) _data.push_back(value);
 		    ///    }
 		    ///  };
 		    ///
 		    ///  // ...
 		    ///
 		    ///  reader.sectionLines("numbers", NumberSection(vec));
 		    ///\endcode
 		    template <typename Functor>
 		    GraphReader& sectionLines(const std::string& type, Functor functor) {
 		      LEMON_ASSERT(!type.empty(), "Type is not empty.");
 		      LEMON_ASSERT(_sections.find(type) == _sections.end(),
 				   "Multiple reading of section.");
 		      LEMON_ASSERT(type != "nodes" && type != "arcs" && type != "edges" &&
 				   type != "attributes", "Multiple reading of section.");
 		      _sections.insert(std::make_pair(type,
 		        new _reader_bits::LineSection<Functor>(functor)));
 		      return *this;
+		    }
 		    /// \brief Add a section processor with stream oriented reading
 		    ///
 		    /// In the \e LGF file extra sections can be placed, which contain
 		    /// any data in arbitrary format. These sections can be read
 		    /// directly with this function. The first parameter is the type
 		    /// of the section, the second is a functor, which takes an \c
 		    /// std::istream& and an int& parameter, the latter regard to the
 		    /// line number of stream. The functor can read the input while
 		    /// the section go on, and the line number should be modified
 		    /// accordingly.
 		    template <typename Functor>
 		    GraphReader& sectionStream(const std::string& type, Functor functor) {
 		      LEMON_ASSERT(!type.empty(), "Type is not empty.");
 		      LEMON_ASSERT(_sections.find(type) == _sections.end(),
 				   "Multiple reading of section.");
 		      LEMON_ASSERT(type != "nodes" && type != "arcs" && type != "edges" &&
 				   type != "attributes", "Multiple reading of section.");
 		      _sections.insert(std::make_pair(type,
 			 new _reader_bits::StreamSection<Functor>(functor)));
 		      return *this;
+		    }
 		    /// @}
 		    /// \name Using previously constructed node or edge set
 		    /// @{
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map.
 		    template <typename Map>
 		    GraphReader& useNodes(const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
 		      _use_nodes = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (NodeIt n(_graph); n != INVALID; ++n) {
 			_node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed node set
 		    ///
 		    /// Use previously constructed node set, and specify the node
 		    /// label map and a functor which converts the label map values to
 		    /// std::string.
 		    template <typename Map, typename Converter>
 		    GraphReader& useNodes(const Map& map,
 					    const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_nodes, "Multiple usage of useNodes() member");
 		      _use_nodes = true;
 		      for (NodeIt n(_graph); n != INVALID; ++n) {
 			_node_index.insert(std::make_pair(converter(map[n]), n));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed edge set
 		    ///
 		    /// Use previously constructed edge set, and specify the edge
 		    /// label map.
 		    template <typename Map>
 		    GraphReader& useEdges(const Map& map) {
 		      checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_edges, "Multiple usage of useEdges() member");
 		      _use_edges = true;
 		      _writer_bits::DefaultConverter<typename Map::Value> converter;
 		      for (EdgeIt a(_graph); a != INVALID; ++a) {
 			_edge_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// \brief Use previously constructed edge set
 		    ///
 		    /// Use previously constructed edge set, and specify the edge
 		    /// label map and a functor which converts the label map values to
 		    /// std::string.
 		    template <typename Map, typename Converter>
 		    GraphReader& useEdges(const Map& map,
 					    const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
 		      LEMON_ASSERT(!_use_edges, "Multiple usage of useEdges() member");
 		      _use_edges = true;
 		      for (EdgeIt a(_graph); a != INVALID; ++a) {
 			_edge_index.insert(std::make_pair(converter(map[a]), a));
+		      }
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    bool readLine() {
 		      std::string str;
 		      while(++line_num, std::getline(*_is, str)) {
 			line.clear(); line.str(str);
 			char c;
 			if (line >> std::ws >> c && c != '#') {
 			  line.putback(c);
 			  return true;
+			}
+		      }
 		      return false;
+		    }
 		    bool readSuccess() {
 		      return static_cast<bool>(*_is);
+		    }
 		    void skipSection() {
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 			readLine();
+		      }
 		      line.putback(c);
+		    }
 		    void readNodes() {
 		      std::vector<int> map_index(_node_maps.size());
 		      int map_num, label_index;
 		      if (!readLine())
 			throw DataFormatError("Cannot find map captions");
+		      {
 			std::map<std::string, int> maps;
 			std::string map;
 			int index = 0;
 			while (_reader_bits::readToken(line, map)) {
 			  if (maps.find(map) != maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of node map: " << map;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  maps.insert(std::make_pair(map, index));
 			  ++index;
+			}
 			for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 			  std::map<std::string, int>::iterator jt =
 			    maps.find(_node_maps[i].first);
 			  if (jt == maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Map not found in file: " << _node_maps[i].first;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  map_index[i] = jt->second;
+			}
+			{
 			  std::map<std::string, int>::iterator jt = maps.find("label");
 			  if (jt == maps.end())
 			    throw DataFormatError("Label map not found in file");
 			  label_index = jt->second;
+			}
 			map_num = maps.size();
+		      }
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 			line.putback(c);
 			std::vector<std::string> tokens(map_num);
 			for (int i = 0; i < map_num; ++i) {
 			  if (!_reader_bits::readToken(line, tokens[i])) {
 			    std::ostringstream msg;
 			    msg << "Column not found (" << i + 1 << ")";
 			    throw DataFormatError(msg.str().c_str());
+			  }
+			}
 			if (line >> std::ws >> c)
 			  throw DataFormatError("Extra character on the end of line");
 			Node n;
 			if (!_use_nodes) {
 			  n = _graph.addNode();
 			  _node_index.insert(std::make_pair(tokens[label_index], n));
 			} else {
 			  typename std::map<std::string, Node>::iterator it =
 			    _node_index.find(tokens[label_index]);
 			  if (it == _node_index.end()) {
 			    std::ostringstream msg;
 			    msg << "Node with label not found: " << tokens[label_index];
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  n = it->second;
+			}
 			for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
 			  _node_maps[i].second->set(n, tokens[map_index[i]]);
+			}
+		      }
 		      if (readSuccess()) {
 			line.putback(c);
+		      }
+		    }
 		    void readEdges() {
 		      std::vector<int> map_index(_edge_maps.size());
 		      int map_num, label_index;
 		      if (!readLine())
 			throw DataFormatError("Cannot find map captions");
+		      {
 			std::map<std::string, int> maps;
 			std::string map;
 			int index = 0;
 			while (_reader_bits::readToken(line, map)) {
 			  if (maps.find(map) != maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of edge map: " << map;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  maps.insert(std::make_pair(map, index));
 			  ++index;
+			}
 			for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
 			  std::map<std::string, int>::iterator jt =
 			    maps.find(_edge_maps[i].first);
 			  if (jt == maps.end()) {
 			    std::ostringstream msg;
 			    msg << "Map not found in file: " << _edge_maps[i].first;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  map_index[i] = jt->second;
+			}
+			{
 			  std::map<std::string, int>::iterator jt = maps.find("label");
 			  if (jt == maps.end())
 			    throw DataFormatError("Label map not found in file");
 			  label_index = jt->second;
+			}
 			map_num = maps.size();
+		      }
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 			line.putback(c);
 			std::string source_token;
 			std::string target_token;
 			if (!_reader_bits::readToken(line, source_token))
 			  throw DataFormatError("Source not found");
 			if (!_reader_bits::readToken(line, target_token))
 			  throw DataFormatError("Source not found");
 			std::vector<std::string> tokens(map_num);
 			for (int i = 0; i < map_num; ++i) {
 			  if (!_reader_bits::readToken(line, tokens[i])) {
 			    std::ostringstream msg;
 			    msg << "Column not found (" << i + 1 << ")";
 			    throw DataFormatError(msg.str().c_str());
+			  }
+			}
 			if (line >> std::ws >> c)
 			  throw DataFormatError("Extra character on the end of line");
 			Edge e;
 			if (!_use_edges) {
 		          typename NodeIndex::iterator it;
 		          it = _node_index.find(source_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << source_token;
 		            throw DataFormatError(msg.str().c_str());
+		          }
 		          Node source = it->second;
 		          it = _node_index.find(target_token);
 		          if (it == _node_index.end()) {
 		            std::ostringstream msg;
 		            msg << "Item not found: " << target_token;
 		            throw DataFormatError(msg.str().c_str());
+		          }
 		          Node target = it->second;
 			  e = _graph.addEdge(source, target);
 			  _edge_index.insert(std::make_pair(tokens[label_index], e));
 			} else {
 			  typename std::map<std::string, Edge>::iterator it =
 			    _edge_index.find(tokens[label_index]);
 			  if (it == _edge_index.end()) {
 			    std::ostringstream msg;
 			    msg << "Edge with label not found: " << tokens[label_index];
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  e = it->second;
+			}
 			for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
 			  _edge_maps[i].second->set(e, tokens[map_index[i]]);
+			}
+		      }
 		      if (readSuccess()) {
 			line.putback(c);
+		      }
+		    }
 		    void readAttributes() {
 		      std::set<std::string> read_attr;
 		      char c;
 		      while (readLine() && line >> c && c != '@') {
 			line.putback(c);
 			std::string attr, token;
 			if (!_reader_bits::readToken(line, attr))
 			  throw DataFormatError("Attribute name not found");
 			if (!_reader_bits::readToken(line, token))
 			  throw DataFormatError("Attribute value not found");
 			if (line >> c)
 			  throw DataFormatError("Extra character on the end of line");
+			{
 			  std::set<std::string>::iterator it = read_attr.find(attr);
 			  if (it != read_attr.end()) {
 			    std::ostringstream msg;
 			    msg << "Multiple occurence of attribute " << attr;
 			    throw DataFormatError(msg.str().c_str());
+			  }
 			  read_attr.insert(attr);
+			}
+			{
 			  typename Attributes::iterator it = _attributes.lower_bound(attr);
 			  while (it != _attributes.end() && it->first == attr) {
 			    it->second->set(token);
 			    ++it;
+			  }
+			}
+		      }
 		      if (readSuccess()) {
 			line.putback(c);
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			if (read_attr.find(it->first) == read_attr.end()) {
 			  std::ostringstream msg;
 			  msg << "Attribute not found in file: " << it->first;
 			  throw DataFormatError(msg.str().c_str());
+			}
+		      }
+		    }
 		  public:
 		    /// \name Execution of the reader
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing
 		    void run() {
 		      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
 		      bool nodes_done = false;
 		      bool edges_done = false;
 		      bool attributes_done = false;
 		      std::set<std::string> extra_sections;
 		      line_num = 0;
 		      readLine();
 		      while (readSuccess()) {
 			skipSection();
 			try {
 			  char c;
 			  std::string section, caption;
 			  line >> c;
 			  _reader_bits::readToken(line, section);
 			  _reader_bits::readToken(line, caption);
 			  if (line >> c)
 			    throw DataFormatError("Extra character on the end of line");
 			  if (section == "nodes" && !nodes_done) {
 			    if (_nodes_caption.empty() || _nodes_caption == caption) {
 			      readNodes();
 			      nodes_done = true;
+			    }
 			  } else if ((section == "edges" || section == "arcs") &&
 				     !edges_done) {
 			    if (_edges_caption.empty() || _edges_caption == caption) {
 			      readEdges();
 			      edges_done = true;
+			    }
 			  } else if (section == "attributes" && !attributes_done) {
 			    if (_attributes_caption.empty() || _attributes_caption == caption) {
 			      readAttributes();
 			      attributes_done = true;
+			    }
 			  } else {
 			    if (extra_sections.find(section) != extra_sections.end()) {
 			      std::ostringstream msg;
 			      msg << "Multiple occurence of section " << section;
 			      throw DataFormatError(msg.str().c_str());
+			    }
 			    Sections::iterator it = _sections.find(section);
 			    if (it != _sections.end()) {
 			      extra_sections.insert(section);
 			      it->second->process(*_is, line_num);
 			      readLine();
 			    } else {
 			      readLine();
 			      skipSection();
+			    }
+			  }
 			} catch (DataFormatError& error) {
 			  error.line(line_num);
 			  throw;
+			}
+		      }
 		      if (!nodes_done) {
 			throw DataFormatError("Section @nodes not found");
+		      }
 		      if (!edges_done) {
 			throw DataFormatError("Section @edges not found");
+		      }
 		      if (!attributes_done && !_attributes.empty()) {
 			throw DataFormatError("Section @attributes not found");
+		      }
+		    }
 		    /// @}
 		  };
 		  /// \relates GraphReader
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(std::istream& is, Graph& graph) {
 		    GraphReader<Graph> tmp(is, graph);
 		    return tmp;
+		  }
 		  /// \relates GraphReader
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(const std::string& fn,
 						       Graph& graph) {
 		    GraphReader<Graph> tmp(fn, graph);
 		    return tmp;
+		  }
 		  /// \relates GraphReader
 		  template <typename Graph>
 		  GraphReader<Graph> graphReader(const char* fn, Graph& graph) {
 		    GraphReader<Graph> tmp(fn, graph);
 		    return tmp;
+		  }
+		}
 		#endif

lemon/lgf_writer.h

Show inline comments

 		/* -*- C++ -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library
+		 *
 		 * Copyright (C) 2003-2008
 		 * 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.
+		 *
 		 */
 		///\ingroup lemon_io
 		///\file
 		///\brief Lemon Graph Format writer.
 		#ifndef LEMON_LGF_WRITER_H
 		#define LEMON_LGF_WRITER_H
 		#include <iostream>
 		#include <fstream>
 		#include <sstream>
 		#include <algorithm>
 		#include <vector>
 		#include <functional>
 		#include <lemon/assert.h>
 		#include <lemon/graph_utils.h>
 		namespace lemon {
 		  namespace _writer_bits {
 		    template <typename Value>
 		    struct DefaultConverter {
 		      std::string operator()(const Value& value) {
 			std::ostringstream os;
 			os << value;
 			return os.str();
+		      }
 		    };
 		    template <typename T>
 		    bool operator<(const T&, const T&) {
 		      throw DataFormatError("Label map is not comparable");
+		    }
 		    template <typename _Map>
 		    class MapLess {
 		    public:
 		      typedef _Map Map;
 		      typedef typename Map::Key Item;
 		    private:
 		      const Map& _map;
 		    public:
 		      MapLess(const Map& map) : _map(map) {}
 		      bool operator()(const Item& left, const Item& right) {
 			return _map[left] < _map[right];
+		      }
 		    };
 		    template <typename _Graph, bool _dir, typename _Map>
 		    class GraphArcMapLess {
 		    public:
 		      typedef _Map Map;
 		      typedef _Graph Graph;
 		      typedef typename Graph::Edge Item;
 		    private:
 		      const Graph& _graph;
 		      const Map& _map;
 		    public:
 		      GraphArcMapLess(const Graph& graph, const Map& map)
 			: _graph(graph), _map(map) {}
 		      bool operator()(const Item& left, const Item& right) {
 			return _map[_graph.direct(left, _dir)] <
 			  _map[_graph.direct(right, _dir)];
+		      }
 		    };
 		    template <typename _Item>
 		    class MapStorageBase {
 		    public:
 		      typedef _Item Item;
 		    public:
 		      MapStorageBase() {}
 		      virtual ~MapStorageBase() {}
 		      virtual std::string get(const Item& item) = 0;
 		      virtual void sort(std::vector<Item>&) = 0;
 		    };
 		    template <typename _Item, typename _Map,
 			      typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class MapStorage : public MapStorageBase<_Item> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Item Item;
 		    private:
 		      const Map& _map;
 		      Converter _converter;
 		    public:
 		      MapStorage(const Map& map, const Converter& converter = Converter())
 			: _map(map), _converter(converter) {}
 		      virtual ~MapStorage() {}
 		      virtual std::string get(const Item& item) {
 			return _converter(_map[item]);
+		      }
 		      virtual void sort(std::vector<Item>& items) {
 			MapLess<Map> less(_map);
 			std::sort(items.begin(), items.end(), less);
+		      }
 		    };
 		    template <typename _Graph, bool _dir, typename _Map,
 			      typename _Converter = DefaultConverter<typename _Map::Value> >
 		    class GraphArcMapStorage : public MapStorageBase<typename _Graph::Edge> {
 		    public:
 		      typedef _Map Map;
 		      typedef _Converter Converter;
 		      typedef _Graph Graph;
 		      typedef typename Graph::Edge Item;
 		      static const bool dir = _dir;
 		    private:
 		      const Graph& _graph;
 		      const Map& _map;
 		      Converter _converter;
 		    public:
 		      GraphArcMapStorage(const Graph& graph, const Map& map,
 					 const Converter& converter = Converter())
 			: _graph(graph), _map(map), _converter(converter) {}
 		      virtual ~GraphArcMapStorage() {}
 		      virtual std::string get(const Item& item) {
 			return _converter(_map[_graph.direct(item, dir)]);
+		      }
 		      virtual void sort(std::vector<Item>& items) {
 			GraphArcMapLess<Graph, dir, Map> less(_graph, _map);
 			std::sort(items.begin(), items.end(), less);
+		      }
 		    };
 		    class ValueStorageBase {
 		    public:
 		      ValueStorageBase() {}
 		      virtual ~ValueStorageBase() {}
 		      virtual std::string get() = 0;
 		    };
 		    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
 		    class ValueStorage : public ValueStorageBase {
 		    public:
 		      typedef _Value Value;
 		      typedef _Converter Converter;
 		    private:
 		      const Value& _value;
 		      Converter _converter;
 		    public:
 		      ValueStorage(const Value& value, const Converter& converter = Converter())
 		 	: _value(value), _converter(converter) {}
 		      virtual std::string get() {
 			return _converter(_value);
+		      }
 		    };
 		    template <typename Value>
 		    struct MapLookUpConverter {
 		      const std::map<Value, std::string>& _map;
 		      MapLookUpConverter(const std::map<Value, std::string>& map)
 			: _map(map) {}
 		      std::string operator()(const Value& str) {
 			typename std::map<Value, std::string>::const_iterator it =
 			  _map.find(str);
 			if (it == _map.end()) {
 			  throw DataFormatError("Item not found");
+			}
 			return it->second;
+		      }
 		    };
 		    template <typename Graph>
 		    struct GraphArcLookUpConverter {
 		      const Graph& _graph;
 		      const std::map<typename Graph::Edge, std::string>& _map;
 		      GraphArcLookUpConverter(const Graph& graph,
 					      const std::map<typename Graph::Edge,
 					                     std::string>& map)
 			: _graph(graph), _map(map) {}
 		      std::string operator()(const typename Graph::Arc& val) {
 			typename std::map<typename Graph::Edge, std::string>
 			  ::const_iterator it = _map.find(val);
 			if (it == _map.end()) {
 			  throw DataFormatError("Item not found");
+			}
 			return (_graph.direction(val) ? '+' : '-') + it->second;
+		      }
 		    };
 		    bool isWhiteSpace(char c) {
 		      return c == ' ' || c == '\t' || c == '\v' ||
 		        c == '\n' || c == '\r' || c == '\f';
+		    }
 		    bool isEscaped(char c) {
 		      return c == '\\' || c == '\"' || c == '\'' ||
 			c == '\a' || c == '\b';
+		    }
 		    static void writeEscape(std::ostream& os, char c) {
 		      switch (c) {
 		      case '\\':
 			os << "\\\\";
 			return;
 		      case '\"':
 			os << "\\\"";
 			return;
 		      case '\a':
 			os << "\\a";
 			return;
 		      case '\b':
 			os << "\\b";
 			return;
 		      case '\f':
 			os << "\\f";
 			return;
 		      case '\r':
 			os << "\\r";
 			return;
 		      case '\n':
 			os << "\\n";
 			return;
 		      case '\t':
 			os << "\\t";
 			return;
 		      case '\v':
 			os << "\\v";
 			return;
 		      default:
 			if (c < 0x20) {
 			  std::ios::fmtflags flags = os.flags();
 			  os << '\\' << std::oct << static_cast<int>(c);
 			  os.flags(flags);
 			} else {
 			  os << c;
+			}
 			return;
+		      }
+		    }
 		    bool requireEscape(const std::string& str) {
 		      if (str.empty() || str[0] == '@') return true;
 		      std::istringstream is(str);
 		      char c;
 		      while (is.get(c)) {
 			if (isWhiteSpace(c) || isEscaped(c)) {
 			  return true;
+			}
+		      }
 		      return false;
+		    }
 		    std::ostream& writeToken(std::ostream& os, const std::string& str) {
 		      if (requireEscape(str)) {
 			os << '\"';
 			for (std::string::const_iterator it = str.begin();
 			     it != str.end(); ++it) {
 			  writeEscape(os, *it);
+			}
 			os << '\"';
 		      } else {
 			os << str;
+		      }
 		      return os;
+		    }
+		  }
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief LGF writer for directed graphs
 		  ///
 		  /// This utility writes an \ref lgf-format "LGF" file.
 		  ///
 		  /// The writing method does a batch processing. The user creates a
 		  /// writer object, then various writing rules can be added to the
 		  /// writer, and eventually the writing is executed with the \c run()
 		  /// member function. A map writing rule can be added to the writer
 		  /// with the \c nodeMap() or \c arcMap() members. An optional
 		  /// converter parameter can also be added as a standard functor
 		  /// converting from the value type of the map to std::string. If it
 		  /// is set, it will determine how the map's value type is written to
 		  /// the output stream. If the functor is not set, then a default
 		  /// conversion will be used. The \c attribute(), \c node() and \c
 		  /// arc() functions are used to add attribute writing rules.
 		  ///
 		  ///\code
 		  ///     DigraphWriter<Digraph>(std::cout, digraph).
 		  ///       nodeMap("coordinates", coord_map).
 		  ///       nodeMap("size", size).
 		  ///       nodeMap("title", title).
 		  ///       arcMap("capacity", cap_map).
 		  ///       node("source", src).
 		  ///       node("target", trg).
 		  ///       attribute("caption", caption).
 		  ///       run();
 		  ///\endcode
 		  ///
 		  ///
 		  /// By default, the writer does not write additional captions to the
 		  /// sections, but they can be give as an optional parameter of
 		  /// the \c nodes(), \c arcs() or \c
 		  /// attributes() functions.
 		  ///
 		  /// The \c skipNodes() and \c skipArcs() functions forbid the
 		  /// writing of the sections. If two arc sections should be written
 		  /// to the output, it can be done in two passes, the first pass
 		  /// writes the node section and the first arc section, then the
 		  /// second pass skips the node section and writes just the arc
 		  /// section to the stream. The output stream can be retrieved with
 		  /// the \c ostream() function, hence the second pass can append its
 		  /// output to the output of the first pass.
 		  template <typename _Digraph>
 		  class DigraphWriter {
 		  public:
 		    typedef _Digraph Digraph;
 		    TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 		  private:
 		    std::ostream* _os;
 		    bool local_os;
 		    Digraph& _digraph;
 		    std::string _nodes_caption;
 		    std::string _arcs_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<Node, std::string> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<Arc, std::string> ArcIndex;
 		    ArcIndex _arc_index;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::MapStorageBase<Node>* > > NodeMaps;
 		    NodeMaps _node_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::MapStorageBase<Arc>* > >ArcMaps;
 		    ArcMaps _arc_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::ValueStorageBase*> > Attributes;
 		    Attributes _attributes;
 		    bool _skip_nodes;
 		    bool _skip_arcs;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output stream.
 		    DigraphWriter(std::ostream& is, Digraph& digraph)
 		      : _os(&is), local_os(false), _digraph(digraph),
 			_skip_nodes(false), _skip_arcs(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    DigraphWriter(const std::string& fn, Digraph& digraph)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph),
 			_skip_nodes(false), _skip_arcs(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    DigraphWriter(const char* fn, Digraph& digraph)
 		      : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph),
 			_skip_nodes(false), _skip_arcs(false) {}
 		    /// \brief Copy constructor
 		    ///
 		    /// The copy constructor transfers all data from the other writer,
 		    /// therefore the copied writer will not be usable more.
 		    DigraphWriter(DigraphWriter& other)
 		      : _os(other._os), local_os(other.local_os), _digraph(other._digraph),
 			_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
 		      other._os = 0;
 		      other.local_os = false;
 		      _node_index.swap(other._node_index);
 		      _arc_index.swap(other._arc_index);
 		      _node_maps.swap(other._node_maps);
 		      _arc_maps.swap(other._arc_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _arcs_caption = other._arcs_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    /// \brief Destructor
 		    ~DigraphWriter() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			delete it->second;
+		      }
 		      if (local_os) {
 			delete _os;
+		      }
+		    }
 		  private:
 		    DigraphWriter& operator=(const DigraphWriter&);
 		  public:
 		    /// \name Writing rules
 		    /// @{
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule to the writer.
 		    template <typename Map>
 		    DigraphWriter& nodeMap(const std::string& caption, const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Node>* storage =
 			new _writer_bits::MapStorage<Node, Map>(map);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map writing rule
 		    ///
 		    /// Add a node map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename Converter>
 		    DigraphWriter& nodeMap(const std::string& caption, const Map& map,
 					   const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Node>* storage =
 			new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule to the writer.
 		    template <typename Map>
 		    DigraphWriter& arcMap(const std::string& caption, const Map& map) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Arc>* storage =
 			new _writer_bits::MapStorage<Arc, Map>(map);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename Converter>
 		    DigraphWriter& arcMap(const std::string& caption, const Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Arc>* storage =
 			new _writer_bits::MapStorage<Arc, Map, Converter>(map, converter);
 		      _arc_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule to the writer.
 		    template <typename Value>
 		    DigraphWriter& attribute(const std::string& caption, const Value& value) {
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Value>(value);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Value, typename Converter>
 		    DigraphWriter& attribute(const std::string& caption, const Value& value,
 					     const Converter& converter = Converter()) {
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Value, Converter>(value, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node writing rule
 		    ///
 		    /// Add a node writing rule to the writer.
 		    DigraphWriter& node(const std::string& caption, const Node& node) {
 		      typedef _writer_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc writing rule
 		    ///
 		    /// Add an arc writing rule to writer.
 		    DigraphWriter& arc(const std::string& caption, const Arc& arc) {
 		      typedef _writer_bits::MapLookUpConverter<Arc> Converter;
 		      Converter converter(_arc_index);
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \name Select section by name
 		    /// @{
 		    /// \brief Set \c \@nodes section to be read
 		    ///
 		    /// Set \c \@nodes section to be read
 		    DigraphWriter& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@arcs section to be read
 		    ///
 		    /// Set \c \@arcs section to be read
 		    DigraphWriter& arcs(const std::string& caption) {
 		      _arcs_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@attributes section to be read
 		    ///
 		    /// Set \c \@attributes section to be read
 		    DigraphWriter& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    /// \name Skipping section
 		    /// @{
 		    /// \brief Skip writing the node set
 		    ///
 		    /// The \c \@nodes section will be not written to the stream.
 		    DigraphWriter& skipNodes() {
 		      LEMON_ASSERT(!_skip_nodes, "Multiple usage of skipNodes() member");
 		      return *this;
+		    }
 		    /// \brief Skip writing arc set
 		    ///
 		    /// The \c \@arcs section will be not written to the stream.
 		    DigraphWriter& skipArcs() {
 		      LEMON_ASSERT(!_skip_arcs, "Multiple usage of skipArcs() member");
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    void writeNodes() {
 		      _writer_bits::MapStorageBase<Node>* label = 0;
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 		        if (it->first == "label") {
 			  label = it->second;
 			  break;
+			}
+		      }
 		      *_os << "@nodes";
 		      if (!_nodes_caption.empty()) {
 			_writer_bits::writeToken(*_os << ' ', _nodes_caption);
+		      }
 		      *_os << std::endl;
 		      if (label == 0) {
 			*_os << "label" << '\t';
+		      }
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			_writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Node> nodes;
 		      for (NodeIt n(_digraph); n != INVALID; ++n) {
 			nodes.push_back(n);
+		      }
 		      if (label == 0) {
 			IdMap<Digraph, Node> id_map(_digraph);
 			_writer_bits::MapLess<IdMap<Digraph, Node> > id_less(id_map);
 			std::sort(nodes.begin(), nodes.end(), id_less);
 		      } else {
 			label->sort(nodes);
+		      }
 		      for (int i = 0; i < static_cast<int>(nodes.size()); ++i) {
 			Node n = nodes[i];
 			if (label == 0) {
 			  std::ostringstream os;
 			  os << _digraph.id(n);
 			  _writer_bits::writeToken(*_os, os.str());
 			  *_os << '\t';
 			  _node_index.insert(std::make_pair(n, os.str()));
+			}
 			for (typename NodeMaps::iterator it = _node_maps.begin();
 			     it != _node_maps.end(); ++it) {
 			  std::string value = it->second->get(n);
 			  _writer_bits::writeToken(*_os, value);
 			  if (it->first == "label") {
 			    _node_index.insert(std::make_pair(n, value));
+			  }
 			  *_os << '\t';
+			}
 			*_os << std::endl;
+		      }
+		    }
 		    void writeArcs() {
 		      _writer_bits::MapStorageBase<Arc>* label = 0;
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 		        if (it->first == "label") {
 			  label = it->second;
 			  break;
+			}
+		      }
 		      *_os << "@arcs";
 		      if (!_arcs_caption.empty()) {
 			_writer_bits::writeToken(*_os << ' ', _arcs_caption);
+		      }
 		      *_os << std::endl;
 		      *_os << '\t' << '\t';
 		      if (label == 0) {
 			*_os << "label" << '\t';
+		      }
 		      for (typename ArcMaps::iterator it = _arc_maps.begin();
 			   it != _arc_maps.end(); ++it) {
 			_writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Arc> arcs;
 		      for (ArcIt n(_digraph); n != INVALID; ++n) {
 			arcs.push_back(n);
+		      }
 		      if (label == 0) {
 			IdMap<Digraph, Arc> id_map(_digraph);
 			_writer_bits::MapLess<IdMap<Digraph, Arc> > id_less(id_map);
 			std::sort(arcs.begin(), arcs.end(), id_less);
 		      } else {
 			label->sort(arcs);
+		      }
 		      for (int i = 0; i < static_cast<int>(arcs.size()); ++i) {
 			Arc a = arcs[i];
 			_writer_bits::writeToken(*_os, _node_index.
 						 find(_digraph.source(a))->second);
 			*_os << '\t';
 			_writer_bits::writeToken(*_os, _node_index.
 						 find(_digraph.target(a))->second);
 			*_os << '\t';
 			if (label == 0) {
 			  std::ostringstream os;
 			  os << _digraph.id(a);
 			  _writer_bits::writeToken(*_os, os.str());
 			  *_os << '\t';
 			  _arc_index.insert(std::make_pair(a, os.str()));
+			}
 			for (typename ArcMaps::iterator it = _arc_maps.begin();
 			     it != _arc_maps.end(); ++it) {
 			  std::string value = it->second->get(a);
 			  _writer_bits::writeToken(*_os, value);
 			  if (it->first == "label") {
 			    _arc_index.insert(std::make_pair(a, value));
+			  }
 			  *_os << '\t';
+			}
 			*_os << std::endl;
+		      }
+		    }
 		    void writeAttributes() {
 		      if (_attributes.empty()) return;
 		      *_os << "@attributes";
 		      if (!_attributes_caption.empty()) {
 			_writer_bits::writeToken(*_os << ' ', _attributes_caption);
+		      }
 		      *_os << std::endl;
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			_writer_bits::writeToken(*_os, it->first) << ' ';
 			_writer_bits::writeToken(*_os, it->second->get());
 			*_os << std::endl;
+		      }
+		    }
 		  public:
 		    /// \name Execution of the writer
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing
 		    void run() {
 		      if (!_skip_nodes) {
 			writeNodes();
+		      }
 		      if (!_skip_arcs) {
 			writeArcs();
+		      }
 		      writeAttributes();
+		    }
 		    /// \brief Gives back the stream of the writer
 		    ///
 		    /// Gives back the stream of the writer
 		    std::ostream& ostream() {
 		      return *_os;
+		    }
 		    /// @}
 		  };
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(std::ostream& os, Digraph& digraph) {
 		    DigraphWriter<Digraph> tmp(os, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const std::string& fn,
 						       Digraph& digraph) {
 		    DigraphWriter<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
 		  /// \relates DigraphWriter
 		  template <typename Digraph>
 		  DigraphWriter<Digraph> digraphWriter(const char* fn, Digraph& digraph) {
 		    DigraphWriter<Digraph> tmp(fn, digraph);
 		    return tmp;
+		  }
 		  /// \ingroup lemon_io
 		  ///
 		  /// \brief LGF writer for directed graphs
 		  ///
 		  /// This utility writes an \ref lgf-format "LGF" file.
 		  template <typename _Graph>
 		  class GraphWriter {
 		  public:
 		    typedef _Graph Graph;
 		    TEMPLATE_GRAPH_TYPEDEFS(Graph);
 		  private:
 		    std::ostream* _os;
 		    bool local_os;
 		    Graph& _graph;
 		    std::string _nodes_caption;
 		    std::string _edges_caption;
 		    std::string _attributes_caption;
 		    typedef std::map<Node, std::string> NodeIndex;
 		    NodeIndex _node_index;
 		    typedef std::map<Edge, std::string> EdgeIndex;
 		    EdgeIndex _edge_index;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::MapStorageBase<Node>* > > NodeMaps;
 		    NodeMaps _node_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::MapStorageBase<Edge>* > >EdgeMaps;
 		    EdgeMaps _edge_maps;
 		    typedef std::vector<std::pair<std::string,
 		      _writer_bits::ValueStorageBase*> > Attributes;
 		    Attributes _attributes;
 		    bool _skip_nodes;
 		    bool _skip_edges;
 		  public:
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output stream.
 		    GraphWriter(std::ostream& is, Graph& graph)
 		      : _os(&is), local_os(false), _graph(graph),
 			_skip_nodes(false), _skip_edges(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    GraphWriter(const std::string& fn, Graph& graph)
 		      : _os(new std::ofstream(fn.c_str())), local_os(true), _graph(graph),
 			_skip_nodes(false), _skip_edges(false) {}
 		    /// \brief Constructor
 		    ///
 		    /// Construct a directed graph writer, which writes to the given
 		    /// output file.
 		    GraphWriter(const char* fn, Graph& graph)
 		      : _os(new std::ofstream(fn)), local_os(true), _graph(graph),
 			_skip_nodes(false), _skip_edges(false) {}
 		    /// \brief Copy constructor
 		    ///
 		    /// The copy constructor transfers all data from the other writer,
 		    /// therefore the copied writer will not be usable more.
 		    GraphWriter(GraphWriter& other)
 		      : _os(other._os), local_os(other.local_os), _graph(other._graph),
 			_skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
 		      other._os = 0;
 		      other.local_os = false;
 		      _node_index.swap(other._node_index);
 		      _edge_index.swap(other._edge_index);
 		      _node_maps.swap(other._node_maps);
 		      _edge_maps.swap(other._edge_maps);
 		      _attributes.swap(other._attributes);
 		      _nodes_caption = other._nodes_caption;
 		      _edges_caption = other._edges_caption;
 		      _attributes_caption = other._attributes_caption;
+		    }
 		    /// \brief Destructor
 		    ~GraphWriter() {
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename EdgeMaps::iterator it = _edge_maps.begin();
 			   it != _edge_maps.end(); ++it) {
 			delete it->second;
+		      }
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			delete it->second;
+		      }
 		      if (local_os) {
 			delete _os;
+		      }
+		    }
 		  private:
 		    GraphWriter& operator=(const GraphWriter&);
 		  public:
 		    /// \name Writing rules
 		    /// @{
 		    /// \brief Node map reading rule
 		    ///
 		    /// Add a node map reading rule to the writer.
 		    template <typename Map>
 		    GraphWriter& nodeMap(const std::string& caption, const Map& map) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Node>* storage =
 			new _writer_bits::MapStorage<Node, Map>(map);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node map writing rule
 		    ///
 		    /// Add a node map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename Converter>
 		    GraphWriter& nodeMap(const std::string& caption, const Map& map,
 					   const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Node>* storage =
 			new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
 		      _node_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map writing rule
 		    ///
 		    /// Add an edge map writing rule to the writer.
 		    template <typename Map>
 		    GraphWriter& edgeMap(const std::string& caption, const Map& map) {
 		      checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Edge>* storage =
 			new _writer_bits::MapStorage<Edge, Map>(map);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge map writing rule
 		    ///
 		    /// Add an edge map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename Converter>
 		    GraphWriter& edgeMap(const std::string& caption, const Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Edge>* storage =
 			new _writer_bits::MapStorage<Edge, Map, Converter>(map, converter);
 		      _edge_maps.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule to the writer.
 		    template <typename Map>
 		    GraphWriter& arcMap(const std::string& caption, const Map& map) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Edge>* forward_storage =
 			new _writer_bits::GraphArcMapStorage<Graph, true, Map>(_graph, map);
 		      _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
 		      _writer_bits::MapStorageBase<Edge>* backward_storage =
 			new _writer_bits::GraphArcMapStorage<Graph, false, Map>(_graph, map);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Arc map writing rule
 		    ///
 		    /// Add an arc map writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Map, typename Converter>
 		    GraphWriter& arcMap(const std::string& caption, const Map& map,
 					  const Converter& converter = Converter()) {
 		      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 		      _writer_bits::MapStorageBase<Edge>* forward_storage =
 			new _writer_bits::GraphArcMapStorage<Graph, true, Map, Converter>
 			(_graph, map, converter);
 		      _edge_maps.push_back(std::make_pair('+' + caption, forward_storage));
 		      _writer_bits::MapStorageBase<Edge>* backward_storage =
 			new _writer_bits::GraphArcMapStorage<Graph, false, Map, Converter>
 			(_graph, map, converter);
 		      _edge_maps.push_back(std::make_pair('-' + caption, backward_storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule to the writer.
 		    template <typename Value>
 		    GraphWriter& attribute(const std::string& caption, const Value& value) {
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Value>(value);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Attribute writing rule
 		    ///
 		    /// Add an attribute writing rule with specialized converter to the
 		    /// writer.
 		    template <typename Value, typename Converter>
 		    GraphWriter& attribute(const std::string& caption, const Value& value,
 					     const Converter& converter = Converter()) {
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Value, Converter>(value, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Node writing rule
 		    ///
 		    /// Add a node writing rule to the writer.
 		    GraphWriter& node(const std::string& caption, const Node& node) {
 		      typedef _writer_bits::MapLookUpConverter<Node> Converter;
 		      Converter converter(_node_index);
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Node, Converter>(node, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Edge writing rule
 		    ///
 		    /// Add an edge writing rule to writer.
 		    GraphWriter& edge(const std::string& caption, const Edge& edge) {
 		      typedef _writer_bits::MapLookUpConverter<Edge> Converter;
 		      Converter converter(_edge_index);
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Edge, Converter>(edge, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \brief Arc writing rule
 		    ///
 		    /// Add an arc writing rule to writer.
 		    GraphWriter& arc(const std::string& caption, const Arc& arc) {
 		      typedef _writer_bits::GraphArcLookUpConverter<Graph> Converter;
 		      Converter converter(_graph, _edge_index);
 		      _writer_bits::ValueStorageBase* storage =
 			new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
 		      _attributes.push_back(std::make_pair(caption, storage));
 		      return *this;
+		    }
 		    /// \name Select section by name
 		    /// @{
 		    /// \brief Set \c \@nodes section to be read
 		    ///
 		    /// Set \c \@nodes section to be read
 		    GraphWriter& nodes(const std::string& caption) {
 		      _nodes_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@edges section to be read
 		    ///
 		    /// Set \c \@edges section to be read
 		    GraphWriter& edges(const std::string& caption) {
 		      _edges_caption = caption;
 		      return *this;
+		    }
 		    /// \brief Set \c \@attributes section to be read
 		    ///
 		    /// Set \c \@attributes section to be read
 		    GraphWriter& attributes(const std::string& caption) {
 		      _attributes_caption = caption;
 		      return *this;
+		    }
 		    /// \name Skipping section
 		    /// @{
 		    /// \brief Skip writing the node set
 		    ///
 		    /// The \c \@nodes section will be not written to the stream.
 		    GraphWriter& skipNodes() {
 		      LEMON_ASSERT(!_skip_nodes, "Multiple usage of skipNodes() member");
 		      return *this;
+		    }
 		    /// \brief Skip writing edge set
 		    ///
 		    /// The \c \@edges section will be not written to the stream.
 		    GraphWriter& skipEdges() {
 		      LEMON_ASSERT(!_skip_edges, "Multiple usage of skipEdges() member");
 		      return *this;
+		    }
 		    /// @}
 		  private:
 		    void writeNodes() {
 		      _writer_bits::MapStorageBase<Node>* label = 0;
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 		        if (it->first == "label") {
 			  label = it->second;
 			  break;
+			}
+		      }
 		      *_os << "@nodes";
 		      if (!_nodes_caption.empty()) {
 			_writer_bits::writeToken(*_os << ' ', _nodes_caption);
+		      }
 		      *_os << std::endl;
 		      if (label == 0) {
 			*_os << "label" << '\t';
+		      }
 		      for (typename NodeMaps::iterator it = _node_maps.begin();
 			   it != _node_maps.end(); ++it) {
 			_writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Node> nodes;
 		      for (NodeIt n(_graph); n != INVALID; ++n) {
 			nodes.push_back(n);
+		      }
 		      if (label == 0) {
 			IdMap<Graph, Node> id_map(_graph);
 			_writer_bits::MapLess<IdMap<Graph, Node> > id_less(id_map);
 			std::sort(nodes.begin(), nodes.end(), id_less);
 		      } else {
 			label->sort(nodes);
+		      }
 		      for (int i = 0; i < static_cast<int>(nodes.size()); ++i) {
 			Node n = nodes[i];
 			if (label == 0) {
 			  std::ostringstream os;
 			  os << _graph.id(n);
 			  _writer_bits::writeToken(*_os, os.str());
 			  *_os << '\t';
 			  _node_index.insert(std::make_pair(n, os.str()));
+			}
 			for (typename NodeMaps::iterator it = _node_maps.begin();
 			     it != _node_maps.end(); ++it) {
 			  std::string value = it->second->get(n);
 			  _writer_bits::writeToken(*_os, value);
 			  if (it->first == "label") {
 			    _node_index.insert(std::make_pair(n, value));
+			  }
 			  *_os << '\t';
+			}
 			*_os << std::endl;
+		      }
+		    }
 		    void writeEdges() {
 		      _writer_bits::MapStorageBase<Edge>* label = 0;
 		      for (typename EdgeMaps::iterator it = _edge_maps.begin();
 			   it != _edge_maps.end(); ++it) {
 		        if (it->first == "label") {
 			  label = it->second;
 			  break;
+			}
+		      }
 		      *_os << "@edges";
 		      if (!_edges_caption.empty()) {
 			_writer_bits::writeToken(*_os << ' ', _edges_caption);
+		      }
 		      *_os << std::endl;
 		      *_os << '\t' << '\t';
 		      if (label == 0) {
 			*_os << "label" << '\t';
+		      }
 		      for (typename EdgeMaps::iterator it = _edge_maps.begin();
 			   it != _edge_maps.end(); ++it) {
 			_writer_bits::writeToken(*_os, it->first) << '\t';
+		      }
 		      *_os << std::endl;
 		      std::vector<Edge> edges;
 		      for (EdgeIt n(_graph); n != INVALID; ++n) {
 			edges.push_back(n);
+		      }
 		      if (label == 0) {
 			IdMap<Graph, Edge> id_map(_graph);
 			_writer_bits::MapLess<IdMap<Graph, Edge> > id_less(id_map);
 			std::sort(edges.begin(), edges.end(), id_less);
 		      } else {
 			label->sort(edges);
+		      }
 		      for (int i = 0; i < static_cast<int>(edges.size()); ++i) {
 			Edge e = edges[i];
 			_writer_bits::writeToken(*_os, _node_index.
 						 find(_graph.u(e))->second);
 			*_os << '\t';
 			_writer_bits::writeToken(*_os, _node_index.
 						 find(_graph.v(e))->second);
 			*_os << '\t';
 			if (label == 0) {
 			  std::ostringstream os;
 			  os << _graph.id(e);
 			  _writer_bits::writeToken(*_os, os.str());
 			  *_os << '\t';
 			  _edge_index.insert(std::make_pair(e, os.str()));
+			}
 			for (typename EdgeMaps::iterator it = _edge_maps.begin();
 			     it != _edge_maps.end(); ++it) {
 			  std::string value = it->second->get(e);
 			  _writer_bits::writeToken(*_os, value);
 			  if (it->first == "label") {
 			    _edge_index.insert(std::make_pair(e, value));
+			  }
 			  *_os << '\t';
+			}
 			*_os << std::endl;
+		      }
+		    }
 		    void writeAttributes() {
 		      if (_attributes.empty()) return;
 		      *_os << "@attributes";
 		      if (!_attributes_caption.empty()) {
 			_writer_bits::writeToken(*_os << ' ', _attributes_caption);
+		      }
 		      *_os << std::endl;
 		      for (typename Attributes::iterator it = _attributes.begin();
 			   it != _attributes.end(); ++it) {
 			_writer_bits::writeToken(*_os, it->first) << ' ';
 			_writer_bits::writeToken(*_os, it->second->get());
 			*_os << std::endl;
+		      }
+		    }
 		  public:
 		    /// \name Execution of the writer
 		    /// @{
 		    /// \brief Start the batch processing
 		    ///
 		    /// This function starts the batch processing
 		    void run() {
 		      if (!_skip_nodes) {
 			writeNodes();
+		      }
 		      if (!_skip_edges) {
 			writeEdges();
+		      }
 		      writeAttributes();
+		    }
 		    /// \brief Gives back the stream of the writer
 		    ///
 		    /// Gives back the stream of the writer
 		    std::ostream& ostream() {
 		      return *_os;
+		    }
 		    /// @}
 		  };
 		  /// \relates GraphWriter
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(std::ostream& os, Graph& graph) {
 		    GraphWriter<Graph> tmp(os, graph);
 		    return tmp;
+		  }
 		  /// \relates GraphWriter
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const std::string& fn, Graph& graph) {
 		    GraphWriter<Graph> tmp(fn, graph);
 		    return tmp;
+		  }
 		  /// \relates GraphWriter
 		  template <typename Graph>
 		  GraphWriter<Graph> graphWriter(const char* fn, Graph& graph) {
 		    GraphWriter<Graph> tmp(fn, graph);
 		    return tmp;
+		  }
+		}
 		#endif

0 comments (0 inline)

RhodeCode

Login to your account