lemon-1.2: comparison lemon/lgf

equal deleted inserted replaced

-:412ba81372ca
+:b85957f2ba40
-/* -*- C++ -*-
+/* -*- mode: C++; indent-tabs-mode: nil; -*-
 *
-* This file is a part of LEMON, a generic C++ optimization library
+* 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).
 *
 namespace _reader_bits {
 template <typename Value>
 struct DefaultConverter {
 Value operator()(const std::string& str) {
-	std::istringstream is(str);
+std::istringstream is(str);
-	Value value;
+Value value;
-	is >> value;
+is >> value;
-	char c;
+char c;
-	if (is >> std::ws >> c) {
+if (is >> std::ws >> c) {
-	  throw DataFormatError("Remaining characters in token");
+throw DataFormatError("Remaining characters in token");
-	}
+}
-	return value;
+return value;
 }
 };
 template <>
 struct DefaultConverter<std::string> {
 std::string operator()(const std::string& str) {
-	return str;
+return str;
 }
 };
 template <typename _Item>
 class MapStorageBase {
 public:
 typedef _Item Item;
 public:
 virtual void set(const Item& item, const std::string& value) = 0;
 };
 template <typename _Item, typename _Map,
-	      typename _Converter = DefaultConverter<typename _Map::Value> >
+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) {}
+: _map(map), _converter(converter) {}
 virtual ~MapStorage() {}
 virtual void set(const Item& item ,const std::string& value) {
-	_map.set(item, _converter(value));
+_map.set(item, _converter(value));
 }
 };
 template <typename _Graph, bool _dir, typename _Map,
-	      typename _Converter = DefaultConverter<typename _Map::Value> >
+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())
+const Converter& converter = Converter())
-	: _graph(graph), _map(map), _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));
+_map.set(_graph.direct(item, dir), _converter(value));
 }
 };
 class ValueStorageBase {
 public:
 Value& _value;
 Converter _converter;
 public:
 ValueStorage(Value& value, const Converter& converter = Converter())
-	: _value(value), _converter(converter) {}
+: _value(value), _converter(converter) {}
 virtual void set(const std::string& value) {
-	_value = _converter(value);
+_value = _converter(value);
 }
 };
 template <typename Value>
 struct MapLookUpConverter {
 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,
+const std::map<std::string,
-			                     typename Graph::Edge>& map)
+typename Graph::Edge>& map)
-	: _graph(graph), _map(map) {}
+: _graph(graph), _map(map) {}
 typename Graph::Arc operator()(const std::string& str) {
-	if (str.empty() || (str[0] != '+' && str[0] != '-')) {
+if (str.empty() || (str[0] != '+' && str[0] != '-')) {
-	  throw DataFormatError("Item must start with '+' or '-'");
+throw DataFormatError("Item must start with '+' or '-'");
-	}
+}
-	typename std::map<std::string, typename Graph::Edge>
+typename std::map<std::string, typename Graph::Edge>
-	  ::const_iterator it = _map.find(str.substr(1));
+::const_iterator it = _map.find(str.substr(1));
-	if (it == _map.end()) {
+if (it == _map.end()) {
-	  throw DataFormatError("Item not found");
+throw DataFormatError("Item not found");
-	}
+}
-	return _graph.direct(it->second, str[0] == '+');
+return _graph.direct(it->second, str[0] == '+');
 }
 };
 inline bool isWhiteSpace(char c) {
 return c == ' ' || c == '\t' || c == '\v' ||
 c == '\n' || c == '\r' || c == '\f';
 }
 inline bool isOct(char c) {
 return '0' <= c && c <='7';
 }
 inline int valueOct(char c) {
 LEMON_ASSERT(isOct(c), "The character is not octal.");
 return c - '0';
 }
 inline bool isHex(char c) {
 return ('0' <= c && c <= '9') ||
-	('a' <= c && c <= 'z') ||
+('a' <= c && c <= 'z') ||
-	('A' <= c && c <= 'Z');
+('A' <= c && c <= 'Z');
 }
 inline 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;
 }
 inline bool isIdentifierFirstChar(char c) {
 return ('a' <= c && c <= 'z') ||
-	('A' <= c && c <= 'Z') || c == '_';
+('A' <= c && c <= 'Z') || c == '_';
 }
 inline bool isIdentifierChar(char c) {
 return isIdentifierFirstChar(c) ||
-	('0' <= c && c <= '9');
+('0' <= c && c <= '9');
 }
 inline char readEscape(std::istream& is) {
 char c;
 if (!is.get(c))
-	throw DataFormatError("Escape format error");
+throw DataFormatError("Escape format error");
 switch (c) {
 case '\\':
-	return '\\';
+return '\\';
 case '\"':
-	return '\"';
+return '\"';
 case '\'':
-	return '\'';
+return '\'';
 case '\?':
-	return '\?';
+return '\?';
 case 'a':
-	return '\a';
+return '\a';
 case 'b':
-	return '\b';
+return '\b';
 case 'f':
-	return '\f';
+return '\f';
 case 'n':
-	return '\n';
+return '\n';
 case 'r':
-	return '\r';
+return '\r';
 case 't':
-	return '\t';
+return '\t';
 case 'v':
-	return '\v';
+return '\v';
 case 'x':
-	{
+{
-	  int code;
+int code;
-	  if (!is.get(c) || !isHex(c))
+if (!is.get(c) || !isHex(c))
-	    throw DataFormatError("Escape format error");
+throw DataFormatError("Escape format error");
-	  else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
+else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
-	  else code = code * 16 + valueHex(c);
+else code = code * 16 + valueHex(c);
-	  return code;
+return code;
-	}
+}
 default:
-	{
+{
-	  int code;
+int code;
-	  if (!isOct(c))
+if (!isOct(c))
-	    throw DataFormatError("Escape format error");
+throw DataFormatError("Escape format error");
-	  else if (code = valueOct(c), !is.get(c) || !isOct(c))
+else if (code = valueOct(c), !is.get(c) || !isOct(c))
-	    is.putback(c);
+is.putback(c);
-	  else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c))
+else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c))
-	    is.putback(c);
+is.putback(c);
-	  else code = code * 8 + valueOct(c);
+else code = code * 8 + valueOct(c);
-	  return code;
+return code;
-	}
+}
 }
 }
 inline std::istream& readToken(std::istream& is, std::string& str) {
 std::ostringstream os;
 char c;
 is >> std::ws;
 if (!is.get(c))
-	return is;
+return is;
 if (c == '\"') {
-	while (is.get(c) && c != '\"') {
+while (is.get(c) && c != '\"') {
-	  if (c == '\\')
+if (c == '\\')
-	    c = readEscape(is);
+c = readEscape(is);
-	  os << c;
+os << c;
-	}
+}
-	if (!is)
+if (!is)
-	  throw DataFormatError("Quoted format error");
+throw DataFormatError("Quoted format error");
 } else {
-	is.putback(c);
+is.putback(c);
-	while (is.get(c) && !isWhiteSpace(c)) {
+while (is.get(c) && !isWhiteSpace(c)) {
-	  if (c == '\\')
+if (c == '\\')
-	    c = readEscape(is);
+c = readEscape(is);
-	  os << c;
+os << c;
-	}
+}
-	if (!is) {
+if (!is) {
-	  is.clear();
+is.clear();
-	} else {
+} else {
-	  is.putback(c);
+is.putback(c);
-	}
+}
 }
 str = os.str();
 return is;
 }
 private:
 Functor _functor;
 public:
 LineSection(const Functor& functor) : _functor(functor) {}
 virtual ~LineSection() {}
 virtual void process(std::istream& is, int& line_num) {
-	char c;
+char c;
-	std::string line;
+std::string line;
-	while (is.get(c) && c != '@') {
+while (is.get(c) && c != '@') {
-	  if (c == '\n') {
+if (c == '\n') {
-	    ++line_num;
+++line_num;
-	  } else if (c == '#') {
+} else if (c == '#') {
-	    getline(is, line);
+getline(is, line);
-	    ++line_num;
+++line_num;
-	  } else if (!isWhiteSpace(c)) {
+} else if (!isWhiteSpace(c)) {
-	    is.putback(c);
+is.putback(c);
-	    getline(is, line);
+getline(is, line);
-	    _functor(line);
+_functor(line);
-	    ++line_num;
+++line_num;
-	  }
+}
-	}
+}
-	if (is) is.putback(c);
+if (is) is.putback(c);
-	else if (is.eof()) is.clear();
+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);
+_functor(is, line_num);
-	char c;
+char c;
-	std::string line;
+std::string line;
-	while (is.get(c) && c != '@') {
+while (is.get(c) && c != '@') {
-	  if (c == '\n') {
+if (c == '\n') {
-	    ++line_num;
+++line_num;
-	  } else if (!isWhiteSpace(c)) {
+} else if (!isWhiteSpace(c)) {
-	    getline(is, line);
+getline(is, line);
-	    ++line_num;
+++line_num;
-	  }
+}
-	}
+}
-	if (is) is.putback(c);
+if (is) is.putback(c);
-	else if (is.eof()) is.clear();
+else if (is.eof()) is.clear();
 }
 };
 }
 template <typename Digraph>
 class DigraphReader;
 template <typename Digraph>
 DigraphReader<Digraph> digraphReader(const char *fn, Digraph& digraph);
 /// \ingroup lemon_io
 ///
 /// \brief \ref lgf-format "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
 class DigraphReader {
 public:
 typedef _Digraph Digraph;
 TEMPLATE_DIGRAPH_TYPEDEFS(Digraph);
 private:
 std::istream* _is;
 bool local_is;
 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;
 bool _use_nodes;
 bool _use_arcs;
 /// \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),
+_use_nodes(false), _use_arcs(false),
-	_skip_nodes(false), _skip_arcs(false) {}
+_skip_nodes(false), _skip_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),
+_use_nodes(false), _use_arcs(false),
-	_skip_nodes(false), _skip_arcs(false) {}
+_skip_nodes(false), _skip_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),
+_use_nodes(false), _use_arcs(false),
-	_skip_nodes(false), _skip_arcs(false) {}
+_skip_nodes(false), _skip_arcs(false) {}
 /// \brief Destructor
 ~DigraphReader() {
 for (typename NodeMaps::iterator it = _node_maps.begin();
-	   it != _node_maps.end(); ++it) {
+it != _node_maps.end(); ++it) {
-	delete it->second;
+delete it->second;
 }
 for (typename ArcMaps::iterator it = _arc_maps.begin();
-	   it != _arc_maps.end(); ++it) {
+it != _arc_maps.end(); ++it) {
-	delete it->second;
+delete it->second;
 }
 for (typename Attributes::iterator it = _attributes.begin();
-	   it != _attributes.end(); ++it) {
+it != _attributes.end(); ++it) {
-	delete it->second;
+delete it->second;
 }
 if (local_is) {
-	delete _is;
+delete _is;
 }
 }
 private:
 friend DigraphReader<Digraph> digraphReader<>(std::istream& is,
-						  Digraph& digraph);
+Digraph& digraph);
 friend DigraphReader<Digraph> digraphReader<>(const std::string& fn,
-						  Digraph& digraph);
+Digraph& digraph);
 friend DigraphReader<Digraph> digraphReader<>(const char *fn,
-						  Digraph& digraph);
+Digraph& digraph);
 DigraphReader(DigraphReader& other)
 : _is(other._is), local_is(other.local_is), _digraph(other._digraph),
-	_use_nodes(other._use_nodes), _use_arcs(other._use_arcs),
+_use_nodes(other._use_nodes), _use_arcs(other._use_arcs),
-	_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
+_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_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);
 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);
+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()) {
+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);
+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);
+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()) {
+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);
+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);
+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()) {
+const Converter& converter = Converter()) {
 _reader_bits::ValueStorageBase* storage =
-	new _reader_bits::ValueStorage<Value, Converter>(value, converter);
+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);
+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);
+new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
 _attributes.insert(std::make_pair(caption, storage));
 return *this;
 }
 /// @}
 /// 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));
+_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
 /// \c std::string.
 template <typename Map, typename Converter>
 DigraphReader& useNodes(const Map& map,
-			    const Converter& converter = Converter()) {
+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));
+_node_index.insert(std::make_pair(converter(map[n]), n));
 }
 return *this;
 }
 /// \brief Use previously constructed arc set
 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));
+_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
 /// \c std::string.
 template <typename Map, typename Converter>
 DigraphReader& useArcs(const Map& map,
-			   const Converter& converter = Converter()) {
+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));
+_arc_index.insert(std::make_pair(converter(map[a]), a));
 }
 return *this;
 }
 /// \brief Skips the reading of node section
 /// will not be constructed, which usually cause that the arc set
 /// could not be read due to lack of node name resolving.
 /// Therefore \c skipArcs() function should also be used, or
 /// \c useNodes() should be used to specify the label of the nodes.
 DigraphReader& skipNodes() {
 LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
 _skip_nodes = true;
 return *this;
 }
 /// \brief Skips the reading of arc section
 ///
 /// Omit the reading of the arc section. This implies that each arc
 /// map reading rule will be abandoned, and the arcs of the graph
 /// will not be constructed.
 DigraphReader& skipArcs() {
 LEMON_ASSERT(!_skip_arcs, "Skip arcs already set");
 _skip_arcs = true;
 return *this;
 }
 /// @}
 private:
 bool readLine() {
 std::string str;
 while(++line_num, std::getline(*_is, str)) {
-	line.clear(); line.str(str);
+line.clear(); line.str(str);
-	char c;
+char c;
-	if (line >> std::ws >> c && c != '#') {
+if (line >> std::ws >> c && c != '#') {
-	  line.putback(c);
+line.putback(c);
-	  return true;
+return true;
-	}
+}
 }
 return false;
 }
 bool readSuccess() {
 return static_cast<bool>(*_is);
 }
 void skipSection() {
 char c;
 while (readSuccess() && line >> c && c != '@') {
-	readLine();
+readLine();
 }
 line.putback(c);
 }
 void readNodes() {
 std::vector<int> map_index(_node_maps.size());
 int map_num, label_index;
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
-	if (readSuccess() && line) line.putback(c);
+if (readSuccess() && line) line.putback(c);
-	if (!_node_maps.empty())
+if (!_node_maps.empty())
-	  throw DataFormatError("Cannot find map names");
+throw DataFormatError("Cannot find map names");
-	return;
+return;
 }
 line.putback(c);
 {
-	std::map<std::string, int> maps;
+std::map<std::string, int> maps;
-	std::string map;
+std::string map;
-	int index = 0;
+int index = 0;
-	while (_reader_bits::readToken(line, map)) {
+while (_reader_bits::readToken(line, map)) {
-	  if (maps.find(map) != maps.end()) {
+if (maps.find(map) != maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Multiple occurence of node map: " << map;
+msg << "Multiple occurence of node map: " << map;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  maps.insert(std::make_pair(map, index));
+maps.insert(std::make_pair(map, index));
-	  ++index;
+++index;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-	  std::map<std::string, int>::iterator jt =
+std::map<std::string, int>::iterator jt =
-	    maps.find(_node_maps[i].first);
+maps.find(_node_maps[i].first);
-	  if (jt == maps.end()) {
+if (jt == maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Map not found in file: " << _node_maps[i].first;
+msg << "Map not found in file: " << _node_maps[i].first;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  map_index[i] = jt->second;
+map_index[i] = jt->second;
-	}
+}
-	{
+{
-	  std::map<std::string, int>::iterator jt = maps.find("label");
+std::map<std::string, int>::iterator jt = maps.find("label");
-	  if (jt != maps.end()) {
+if (jt != maps.end()) {
-	    label_index = jt->second;
+label_index = jt->second;
-	  } else {
+} else {
-	    label_index = -1;
+label_index = -1;
-	  }
+}
-	}
+}
-	map_num = maps.size();
+map_num = maps.size();
 }
 while (readLine() && line >> c && c != '@') {
-	line.putback(c);
+line.putback(c);
-	std::vector<std::string> tokens(map_num);
+std::vector<std::string> tokens(map_num);
-	for (int i = 0; i < map_num; ++i) {
+for (int i = 0; i < map_num; ++i) {
-	  if (!_reader_bits::readToken(line, tokens[i])) {
+if (!_reader_bits::readToken(line, tokens[i])) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Column not found (" << i + 1 << ")";
+msg << "Column not found (" << i + 1 << ")";
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	}
+}
-	if (line >> std::ws >> c)
+if (line >> std::ws >> c)
-	  throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	Node n;
+Node n;
-	if (!_use_nodes) {
+if (!_use_nodes) {
-	  n = _digraph.addNode();
+n = _digraph.addNode();
-	  if (label_index != -1)
+if (label_index != -1)
-	    _node_index.insert(std::make_pair(tokens[label_index], n));
+_node_index.insert(std::make_pair(tokens[label_index], n));
-	} else {
+} else {
-	  if (label_index == -1)
+if (label_index == -1)
-	    throw DataFormatError("Label map not found in file");
+throw DataFormatError("Label map not found in file");
-	  typename std::map<std::string, Node>::iterator it =
+typename std::map<std::string, Node>::iterator it =
-	    _node_index.find(tokens[label_index]);
+_node_index.find(tokens[label_index]);
-	  if (it == _node_index.end()) {
+if (it == _node_index.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Node with label not found: " << tokens[label_index];
+msg << "Node with label not found: " << tokens[label_index];
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  n = it->second;
+n = it->second;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-	  _node_maps[i].second->set(n, tokens[map_index[i]]);
+_node_maps[i].second->set(n, tokens[map_index[i]]);
-	}
+}
 }
 if (readSuccess()) {
-	line.putback(c);
+line.putback(c);
 }
 }
 void readArcs() {
 std::vector<int> map_index(_arc_maps.size());
 int map_num, label_index;
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
-	if (readSuccess() && line) line.putback(c);
+if (readSuccess() && line) line.putback(c);
-	if (!_arc_maps.empty())
+if (!_arc_maps.empty())
-	  throw DataFormatError("Cannot find map names");
+throw DataFormatError("Cannot find map names");
-	return;
+return;
 }
 line.putback(c);
 {
-	std::map<std::string, int> maps;
+std::map<std::string, int> maps;
-	std::string map;
+std::string map;
-	int index = 0;
+int index = 0;
-	while (_reader_bits::readToken(line, map)) {
+while (_reader_bits::readToken(line, map)) {
-	  if (maps.find(map) != maps.end()) {
+if (maps.find(map) != maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Multiple occurence of arc map: " << map;
+msg << "Multiple occurence of arc map: " << map;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  maps.insert(std::make_pair(map, index));
+maps.insert(std::make_pair(map, index));
-	  ++index;
+++index;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
-	  std::map<std::string, int>::iterator jt =
+std::map<std::string, int>::iterator jt =
-	    maps.find(_arc_maps[i].first);
+maps.find(_arc_maps[i].first);
-	  if (jt == maps.end()) {
+if (jt == maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Map not found in file: " << _arc_maps[i].first;
+msg << "Map not found in file: " << _arc_maps[i].first;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  map_index[i] = jt->second;
+map_index[i] = jt->second;
-	}
+}
-	{
+{
-	  std::map<std::string, int>::iterator jt = maps.find("label");
+std::map<std::string, int>::iterator jt = maps.find("label");
-	  if (jt != maps.end()) {
+if (jt != maps.end()) {
-	    label_index = jt->second;
+label_index = jt->second;
-	  } else {
+} else {
-	    label_index = -1;
+label_index = -1;
-	  }
+}
-	}
+}
-	map_num = maps.size();
+map_num = maps.size();
 }
 while (readLine() && line >> c && c != '@') {
-	line.putback(c);
+line.putback(c);
-	std::string source_token;
+std::string source_token;
-	std::string target_token;
+std::string target_token;
-	if (!_reader_bits::readToken(line, source_token))
+if (!_reader_bits::readToken(line, source_token))
-	  throw DataFormatError("Source not found");
+throw DataFormatError("Source not found");
-	if (!_reader_bits::readToken(line, target_token))
+if (!_reader_bits::readToken(line, target_token))
-	  throw DataFormatError("Target not found");
+throw DataFormatError("Target not found");
-	std::vector<std::string> tokens(map_num);
+std::vector<std::string> tokens(map_num);
-	for (int i = 0; i < map_num; ++i) {
+for (int i = 0; i < map_num; ++i) {
-	  if (!_reader_bits::readToken(line, tokens[i])) {
+if (!_reader_bits::readToken(line, tokens[i])) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Column not found (" << i + 1 << ")";
+msg << "Column not found (" << i + 1 << ")";
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	}
+}
-	if (line >> std::ws >> c)
+if (line >> std::ws >> c)
-	  throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	Arc a;
+Arc a;
-	if (!_use_arcs) {
+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);
+a = _digraph.addArc(source, target);
-	  if (label_index != -1)
+if (label_index != -1)
-	    _arc_index.insert(std::make_pair(tokens[label_index], a));
+_arc_index.insert(std::make_pair(tokens[label_index], a));
-	} else {
+} else {
-	  if (label_index == -1)
+if (label_index == -1)
-	    throw DataFormatError("Label map not found in file");
+throw DataFormatError("Label map not found in file");
-	  typename std::map<std::string, Arc>::iterator it =
+typename std::map<std::string, Arc>::iterator it =
-	    _arc_index.find(tokens[label_index]);
+_arc_index.find(tokens[label_index]);
-	  if (it == _arc_index.end()) {
+if (it == _arc_index.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Arc with label not found: " << tokens[label_index];
+msg << "Arc with label not found: " << tokens[label_index];
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  a = it->second;
+a = it->second;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_arc_maps.size()); ++i) {
-	  _arc_maps[i].second->set(a, tokens[map_index[i]]);
+_arc_maps[i].second->set(a, tokens[map_index[i]]);
-	}
+}
 }
 if (readSuccess()) {
-	line.putback(c);
+line.putback(c);
 }
 }
 void readAttributes() {
 std::set<std::string> read_attr;
 char c;
 while (readLine() && line >> c && c != '@') {
-	line.putback(c);
+line.putback(c);
-	std::string attr, token;
+std::string attr, token;
-	if (!_reader_bits::readToken(line, attr))
+if (!_reader_bits::readToken(line, attr))
-	  throw DataFormatError("Attribute name not found");
+throw DataFormatError("Attribute name not found");
-	if (!_reader_bits::readToken(line, token))
+if (!_reader_bits::readToken(line, token))
-	  throw DataFormatError("Attribute value not found");
+throw DataFormatError("Attribute value not found");
-	if (line >> c)
+if (line >> c)
-	  throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	{
+{
-	  std::set<std::string>::iterator it = read_attr.find(attr);
+std::set<std::string>::iterator it = read_attr.find(attr);
-	  if (it != read_attr.end()) {
+if (it != read_attr.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Multiple occurence of attribute " << attr;
+msg << "Multiple occurence of attribute " << attr;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  read_attr.insert(attr);
+read_attr.insert(attr);
-	}
+}
-	{
+{
-	  typename Attributes::iterator it = _attributes.lower_bound(attr);
+typename Attributes::iterator it = _attributes.lower_bound(attr);
-	  while (it != _attributes.end() && it->first == attr) {
+while (it != _attributes.end() && it->first == attr) {
-	    it->second->set(token);
+it->second->set(token);
-	    ++it;
+++it;
-	  }
+}
-	}
+}
 }
 if (readSuccess()) {
-	line.putback(c);
+line.putback(c);
 }
 for (typename Attributes::iterator it = _attributes.begin();
-	   it != _attributes.end(); ++it) {
+it != _attributes.end(); ++it) {
-	if (read_attr.find(it->first) == read_attr.end()) {
+if (read_attr.find(it->first) == read_attr.end()) {
-	  std::ostringstream msg;
+std::ostringstream msg;
-	  msg << "Attribute not found in file: " << it->first;
+msg << "Attribute not found in file: " << it->first;
-	  throw DataFormatError(msg.str().c_str());
+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");
+throw DataFormatError("Cannot find file");
 }
 bool nodes_done = _skip_nodes;
 bool arcs_done = _skip_arcs;
 bool attributes_done = false;
 line_num = 0;
 readLine();
 skipSection();
 while (readSuccess()) {
-	try {
+try {
-	  char c;
+char c;
-	  std::string section, caption;
+std::string section, caption;
-	  line >> c;
+line >> c;
-	  _reader_bits::readToken(line, section);
+_reader_bits::readToken(line, section);
-	  _reader_bits::readToken(line, caption);
+_reader_bits::readToken(line, caption);
-	  if (line >> c)
+if (line >> c)
-	    throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	  if (section == "nodes" && !nodes_done) {
+if (section == "nodes" && !nodes_done) {
-	    if (_nodes_caption.empty() || _nodes_caption == caption) {
+if (_nodes_caption.empty() || _nodes_caption == caption) {
-	      readNodes();
+readNodes();
-	      nodes_done = true;
+nodes_done = true;
-	    }
+}
-	  } else if ((section == "arcs" || section == "edges") &&
+} else if ((section == "arcs" || section == "edges") &&
-		     !arcs_done) {
+!arcs_done) {
-	    if (_arcs_caption.empty() || _arcs_caption == caption) {
+if (_arcs_caption.empty() || _arcs_caption == caption) {
-	      readArcs();
+readArcs();
-	      arcs_done = true;
+arcs_done = true;
-	    }
+}
-	  } else if (section == "attributes" && !attributes_done) {
+} else if (section == "attributes" && !attributes_done) {
-	    if (_attributes_caption.empty() || _attributes_caption == caption) {
+if (_attributes_caption.empty() || _attributes_caption == caption) {
-	      readAttributes();
+readAttributes();
-	      attributes_done = true;
+attributes_done = true;
-	    }
+}
-	  } else {
+} else {
-	    readLine();
+readLine();
-	    skipSection();
+skipSection();
-	  }
+}
-	} catch (DataFormatError& error) {
+} catch (DataFormatError& error) {
-	  error.line(line_num);
+error.line(line_num);
-	  throw;
+throw;
-	}
+}
 }
 if (!nodes_done) {
-	throw DataFormatError("Section @nodes not found");
+throw DataFormatError("Section @nodes not found");
 }
 if (!arcs_done) {
-	throw DataFormatError("Section @arcs not found");
+throw DataFormatError("Section @arcs not found");
 }
 if (!attributes_done && !_attributes.empty()) {
-	throw DataFormatError("Section @attributes not found");
+throw DataFormatError("Section @attributes not found");
 }
 }
 /// @}
 };
 /// \brief Return a \ref DigraphReader class
 ///
 /// This function just returns a \ref DigraphReader class.
 /// \relates DigraphReader
 template <typename Digraph>
 DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) {
 DigraphReader<Digraph> tmp(is, digraph);
 return tmp;
 }
 /// \brief Return a \ref DigraphReader class
 ///
 /// This function just returns a \ref DigraphReader class.
 /// \relates DigraphReader
 template <typename Digraph>
 DigraphReader<Digraph> digraphReader(const std::string& fn,
-				       Digraph& digraph) {
+Digraph& digraph) {
 DigraphReader<Digraph> tmp(fn, digraph);
 return tmp;
 }
 /// \brief Return a \ref DigraphReader class
 ///
 /// This function just returns a \ref DigraphReader class.
 /// \relates DigraphReader
 template <typename Digraph>
 DigraphReader<Digraph> digraphReader(const char* fn, Digraph& digraph) {
 DigraphReader<Digraph> tmp(fn, digraph);
 template <typename Graph>
 class GraphReader;
 template <typename Graph>
 GraphReader<Graph> graphReader(std::istream& is, Graph& graph);
 template <typename Graph>
 GraphReader<Graph> graphReader(const std::string& fn, Graph& graph);
 template <typename Graph>
 GraphReader<Graph> graphReader(const char *fn, Graph& graph);
 /// \ingroup lemon_io
 ///
 /// \brief \ref lgf-format "LGF" reader for undirected graphs
 ///
 /// This utility reads an \ref lgf-format "LGF" file.
 ///
 /// It can be used almost the same way as \c DigraphReader.
 class GraphReader {
 public:
 typedef _Graph Graph;
 TEMPLATE_GRAPH_TYPEDEFS(Graph);
 private:
 std::istream* _is;
 bool local_is;
 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;
 bool _use_nodes;
 bool _use_edges;
 /// \brief Constructor
 ///
 /// Construct an 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),
+_use_nodes(false), _use_edges(false),
-	_skip_nodes(false), _skip_edges(false) {}
+_skip_nodes(false), _skip_edges(false) {}
 /// \brief Constructor
 ///
 /// Construct an 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),
+_use_nodes(false), _use_edges(false),
-	_skip_nodes(false), _skip_edges(false) {}
+_skip_nodes(false), _skip_edges(false) {}
 /// \brief Constructor
 ///
 /// Construct an 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),
+_use_nodes(false), _use_edges(false),
-	_skip_nodes(false), _skip_edges(false) {}
+_skip_nodes(false), _skip_edges(false) {}
 /// \brief Destructor
 ~GraphReader() {
 for (typename NodeMaps::iterator it = _node_maps.begin();
-	   it != _node_maps.end(); ++it) {
+it != _node_maps.end(); ++it) {
-	delete it->second;
+delete it->second;
 }
 for (typename EdgeMaps::iterator it = _edge_maps.begin();
-	   it != _edge_maps.end(); ++it) {
+it != _edge_maps.end(); ++it) {
-	delete it->second;
+delete it->second;
 }
 for (typename Attributes::iterator it = _attributes.begin();
-	   it != _attributes.end(); ++it) {
+it != _attributes.end(); ++it) {
-	delete it->second;
+delete it->second;
 }
 if (local_is) {
-	delete _is;
+delete _is;
 }
 }
 private:
 friend GraphReader<Graph> graphReader<>(std::istream& is, Graph& graph);
 friend GraphReader<Graph> graphReader<>(const std::string& fn,
-					    Graph& graph);
+Graph& graph);
 friend GraphReader<Graph> graphReader<>(const char *fn, Graph& graph);
 GraphReader(GraphReader& other)
 : _is(other._is), local_is(other.local_is), _graph(other._graph),
-	_use_nodes(other._use_nodes), _use_edges(other._use_edges),
+_use_nodes(other._use_nodes), _use_edges(other._use_edges),
-	_skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
+_skip_nodes(other._skip_nodes), _skip_edges(other._skip_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);
 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);
+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()) {
+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);
+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);
+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()) {
+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);
+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);
+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);
+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()) {
+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>
+new _reader_bits::GraphArcMapStorage<Graph, true, Map, Converter>
-	(_graph, 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>
+new _reader_bits::GraphArcMapStorage<Graph, false, Map, Converter>
-	(_graph, 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);
+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()) {
+const Converter& converter = Converter()) {
 _reader_bits::ValueStorageBase* storage =
-	new _reader_bits::ValueStorage<Value, Converter>(value, converter);
+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);
+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);
+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);
+new _reader_bits::ValueStorage<Arc, Converter>(arc, converter);
 _attributes.insert(std::make_pair(caption, storage));
 return *this;
 }
 /// @}
 /// 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));
+_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
 /// \c std::string.
 template <typename Map, typename Converter>
 GraphReader& useNodes(const Map& map,
-			    const Converter& converter = Converter()) {
+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));
+_node_index.insert(std::make_pair(converter(map[n]), n));
 }
 return *this;
 }
 /// \brief Use previously constructed edge set
 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));
+_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
 /// \c std::string.
 template <typename Map, typename Converter>
 GraphReader& useEdges(const Map& map,
-			    const Converter& converter = Converter()) {
+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));
+_edge_index.insert(std::make_pair(converter(map[a]), a));
 }
 return *this;
 }
 /// \brief Skip the reading of node section
 /// could not be read due to lack of node name
 /// could not be read due to lack of node name resolving.
 /// Therefore \c skipEdges() function should also be used, or
 /// \c useNodes() should be used to specify the label of the nodes.
 GraphReader& skipNodes() {
 LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
 _skip_nodes = true;
 return *this;
 }
 /// \brief Skip the reading of edge section
 ///
 /// Omit the reading of the edge section. This implies that each edge
 /// map reading rule will be abandoned, and the edges of the graph
 /// will not be constructed.
 GraphReader& skipEdges() {
 LEMON_ASSERT(!_skip_edges, "Skip edges already set");
 _skip_edges = true;
 return *this;
 }
 /// @}
 private:
 bool readLine() {
 std::string str;
 while(++line_num, std::getline(*_is, str)) {
-	line.clear(); line.str(str);
+line.clear(); line.str(str);
-	char c;
+char c;
-	if (line >> std::ws >> c && c != '#') {
+if (line >> std::ws >> c && c != '#') {
-	  line.putback(c);
+line.putback(c);
-	  return true;
+return true;
-	}
+}
 }
 return false;
 }
 bool readSuccess() {
 return static_cast<bool>(*_is);
 }
 void skipSection() {
 char c;
 while (readSuccess() && line >> c && c != '@') {
-	readLine();
+readLine();
 }
 line.putback(c);
 }
 void readNodes() {
 std::vector<int> map_index(_node_maps.size());
 int map_num, label_index;
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
-	if (readSuccess() && line) line.putback(c);
+if (readSuccess() && line) line.putback(c);
-	if (!_node_maps.empty())
+if (!_node_maps.empty())
-	  throw DataFormatError("Cannot find map names");
+throw DataFormatError("Cannot find map names");
-	return;
+return;
 }
 line.putback(c);
 {
-	std::map<std::string, int> maps;
+std::map<std::string, int> maps;
-	std::string map;
+std::string map;
-	int index = 0;
+int index = 0;
-	while (_reader_bits::readToken(line, map)) {
+while (_reader_bits::readToken(line, map)) {
-	  if (maps.find(map) != maps.end()) {
+if (maps.find(map) != maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Multiple occurence of node map: " << map;
+msg << "Multiple occurence of node map: " << map;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  maps.insert(std::make_pair(map, index));
+maps.insert(std::make_pair(map, index));
-	  ++index;
+++index;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-	  std::map<std::string, int>::iterator jt =
+std::map<std::string, int>::iterator jt =
-	    maps.find(_node_maps[i].first);
+maps.find(_node_maps[i].first);
-	  if (jt == maps.end()) {
+if (jt == maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Map not found in file: " << _node_maps[i].first;
+msg << "Map not found in file: " << _node_maps[i].first;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  map_index[i] = jt->second;
+map_index[i] = jt->second;
-	}
+}
-	{
+{
-	  std::map<std::string, int>::iterator jt = maps.find("label");
+std::map<std::string, int>::iterator jt = maps.find("label");
-	  if (jt != maps.end()) {
+if (jt != maps.end()) {
-	    label_index = jt->second;
+label_index = jt->second;
-	  } else {
+} else {
-	    label_index = -1;
+label_index = -1;
-	  }
+}
-	}
+}
-	map_num = maps.size();
+map_num = maps.size();
 }
 while (readLine() && line >> c && c != '@') {
-	line.putback(c);
+line.putback(c);
-	std::vector<std::string> tokens(map_num);
+std::vector<std::string> tokens(map_num);
-	for (int i = 0; i < map_num; ++i) {
+for (int i = 0; i < map_num; ++i) {
-	  if (!_reader_bits::readToken(line, tokens[i])) {
+if (!_reader_bits::readToken(line, tokens[i])) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Column not found (" << i + 1 << ")";
+msg << "Column not found (" << i + 1 << ")";
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	}
+}
-	if (line >> std::ws >> c)
+if (line >> std::ws >> c)
-	  throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	Node n;
+Node n;
-	if (!_use_nodes) {
+if (!_use_nodes) {
-	  n = _graph.addNode();
+n = _graph.addNode();
-	  if (label_index != -1)
+if (label_index != -1)
-	    _node_index.insert(std::make_pair(tokens[label_index], n));
+_node_index.insert(std::make_pair(tokens[label_index], n));
-	} else {
+} else {
-	  if (label_index == -1)
+if (label_index == -1)
-	    throw DataFormatError("Label map not found in file");
+throw DataFormatError("Label map not found in file");
-	  typename std::map<std::string, Node>::iterator it =
+typename std::map<std::string, Node>::iterator it =
-	    _node_index.find(tokens[label_index]);
+_node_index.find(tokens[label_index]);
-	  if (it == _node_index.end()) {
+if (it == _node_index.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Node with label not found: " << tokens[label_index];
+msg << "Node with label not found: " << tokens[label_index];
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  n = it->second;
+n = it->second;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_node_maps.size()); ++i) {
-	  _node_maps[i].second->set(n, tokens[map_index[i]]);
+_node_maps[i].second->set(n, tokens[map_index[i]]);
-	}
+}
 }
 if (readSuccess()) {
-	line.putback(c);
+line.putback(c);
 }
 }
 void readEdges() {
 std::vector<int> map_index(_edge_maps.size());
 int map_num, label_index;
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
-	if (readSuccess() && line) line.putback(c);
+if (readSuccess() && line) line.putback(c);
-	if (!_edge_maps.empty())
+if (!_edge_maps.empty())
-	  throw DataFormatError("Cannot find map names");
+throw DataFormatError("Cannot find map names");
-	return;
+return;
 }
 line.putback(c);
 {
-	std::map<std::string, int> maps;
+std::map<std::string, int> maps;
-	std::string map;
+std::string map;
-	int index = 0;
+int index = 0;
-	while (_reader_bits::readToken(line, map)) {
+while (_reader_bits::readToken(line, map)) {
-	  if (maps.find(map) != maps.end()) {
+if (maps.find(map) != maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Multiple occurence of edge map: " << map;
+msg << "Multiple occurence of edge map: " << map;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  maps.insert(std::make_pair(map, index));
+maps.insert(std::make_pair(map, index));
-	  ++index;
+++index;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
-	  std::map<std::string, int>::iterator jt =
+std::map<std::string, int>::iterator jt =
-	    maps.find(_edge_maps[i].first);
+maps.find(_edge_maps[i].first);
-	  if (jt == maps.end()) {
+if (jt == maps.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Map not found in file: " << _edge_maps[i].first;
+msg << "Map not found in file: " << _edge_maps[i].first;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  map_index[i] = jt->second;
+map_index[i] = jt->second;
-	}
+}
-	{
+{
-	  std::map<std::string, int>::iterator jt = maps.find("label");
+std::map<std::string, int>::iterator jt = maps.find("label");
-	  if (jt != maps.end()) {
+if (jt != maps.end()) {
-	    label_index = jt->second;
+label_index = jt->second;
-	  } else {
+} else {
-	    label_index = -1;
+label_index = -1;
-	  }
+}
-	}
+}
-	map_num = maps.size();
+map_num = maps.size();
 }
 while (readLine() && line >> c && c != '@') {
-	line.putback(c);
+line.putback(c);
-	std::string source_token;
+std::string source_token;
-	std::string target_token;
+std::string target_token;
-	if (!_reader_bits::readToken(line, source_token))
+if (!_reader_bits::readToken(line, source_token))
-	  throw DataFormatError("Node u not found");
+throw DataFormatError("Node u not found");
-	if (!_reader_bits::readToken(line, target_token))
+if (!_reader_bits::readToken(line, target_token))
-	  throw DataFormatError("Node v not found");
+throw DataFormatError("Node v not found");
-	std::vector<std::string> tokens(map_num);
+std::vector<std::string> tokens(map_num);
-	for (int i = 0; i < map_num; ++i) {
+for (int i = 0; i < map_num; ++i) {
-	  if (!_reader_bits::readToken(line, tokens[i])) {
+if (!_reader_bits::readToken(line, tokens[i])) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Column not found (" << i + 1 << ")";
+msg << "Column not found (" << i + 1 << ")";
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	}
+}
-	if (line >> std::ws >> c)
+if (line >> std::ws >> c)
-	  throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	Edge e;
+Edge e;
-	if (!_use_edges) {
+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);
+e = _graph.addEdge(source, target);
-	  if (label_index != -1)
+if (label_index != -1)
-	    _edge_index.insert(std::make_pair(tokens[label_index], e));
+_edge_index.insert(std::make_pair(tokens[label_index], e));
-	} else {
+} else {
-	  if (label_index == -1)
+if (label_index == -1)
-	    throw DataFormatError("Label map not found in file");
+throw DataFormatError("Label map not found in file");
-	  typename std::map<std::string, Edge>::iterator it =
+typename std::map<std::string, Edge>::iterator it =
-	    _edge_index.find(tokens[label_index]);
+_edge_index.find(tokens[label_index]);
-	  if (it == _edge_index.end()) {
+if (it == _edge_index.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Edge with label not found: " << tokens[label_index];
+msg << "Edge with label not found: " << tokens[label_index];
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  e = it->second;
+e = it->second;
-	}
+}
-	for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
+for (int i = 0; i < static_cast<int>(_edge_maps.size()); ++i) {
-	  _edge_maps[i].second->set(e, tokens[map_index[i]]);
+_edge_maps[i].second->set(e, tokens[map_index[i]]);
-	}
+}
 }
 if (readSuccess()) {
-	line.putback(c);
+line.putback(c);
 }
 }
 void readAttributes() {
 std::set<std::string> read_attr;
 char c;
 while (readLine() && line >> c && c != '@') {
-	line.putback(c);
+line.putback(c);
-	std::string attr, token;
+std::string attr, token;
-	if (!_reader_bits::readToken(line, attr))
+if (!_reader_bits::readToken(line, attr))
-	  throw DataFormatError("Attribute name not found");
+throw DataFormatError("Attribute name not found");
-	if (!_reader_bits::readToken(line, token))
+if (!_reader_bits::readToken(line, token))
-	  throw DataFormatError("Attribute value not found");
+throw DataFormatError("Attribute value not found");
-	if (line >> c)
+if (line >> c)
-	  throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	{
+{
-	  std::set<std::string>::iterator it = read_attr.find(attr);
+std::set<std::string>::iterator it = read_attr.find(attr);
-	  if (it != read_attr.end()) {
+if (it != read_attr.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Multiple occurence of attribute " << attr;
+msg << "Multiple occurence of attribute " << attr;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  read_attr.insert(attr);
+read_attr.insert(attr);
-	}
+}
-	{
+{
-	  typename Attributes::iterator it = _attributes.lower_bound(attr);
+typename Attributes::iterator it = _attributes.lower_bound(attr);
-	  while (it != _attributes.end() && it->first == attr) {
+while (it != _attributes.end() && it->first == attr) {
-	    it->second->set(token);
+it->second->set(token);
-	    ++it;
+++it;
-	  }
+}
-	}
+}
 }
 if (readSuccess()) {
-	line.putback(c);
+line.putback(c);
 }
 for (typename Attributes::iterator it = _attributes.begin();
-	   it != _attributes.end(); ++it) {
+it != _attributes.end(); ++it) {
-	if (read_attr.find(it->first) == read_attr.end()) {
+if (read_attr.find(it->first) == read_attr.end()) {
-	  std::ostringstream msg;
+std::ostringstream msg;
-	  msg << "Attribute not found in file: " << it->first;
+msg << "Attribute not found in file: " << it->first;
-	  throw DataFormatError(msg.str().c_str());
+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 = _skip_nodes;
 bool edges_done = _skip_edges;
 bool attributes_done = false;
 line_num = 0;
 readLine();
 skipSection();
 while (readSuccess()) {
-	try {
+try {
-	  char c;
+char c;
-	  std::string section, caption;
+std::string section, caption;
-	  line >> c;
+line >> c;
-	  _reader_bits::readToken(line, section);
+_reader_bits::readToken(line, section);
-	  _reader_bits::readToken(line, caption);
+_reader_bits::readToken(line, caption);
-	  if (line >> c)
+if (line >> c)
-	    throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	  if (section == "nodes" && !nodes_done) {
+if (section == "nodes" && !nodes_done) {
-	    if (_nodes_caption.empty() || _nodes_caption == caption) {
+if (_nodes_caption.empty() || _nodes_caption == caption) {
-	      readNodes();
+readNodes();
-	      nodes_done = true;
+nodes_done = true;
-	    }
+}
-	  } else if ((section == "edges" || section == "arcs") &&
+} else if ((section == "edges" || section == "arcs") &&
-		     !edges_done) {
+!edges_done) {
-	    if (_edges_caption.empty() || _edges_caption == caption) {
+if (_edges_caption.empty() || _edges_caption == caption) {
-	      readEdges();
+readEdges();
-	      edges_done = true;
+edges_done = true;
-	    }
+}
-	  } else if (section == "attributes" && !attributes_done) {
+} else if (section == "attributes" && !attributes_done) {
-	    if (_attributes_caption.empty() || _attributes_caption == caption) {
+if (_attributes_caption.empty() || _attributes_caption == caption) {
-	      readAttributes();
+readAttributes();
-	      attributes_done = true;
+attributes_done = true;
-	    }
+}
-	  } else {
+} else {
-	    readLine();
+readLine();
-	    skipSection();
+skipSection();
-	  }
+}
-	} catch (DataFormatError& error) {
+} catch (DataFormatError& error) {
-	  error.line(line_num);
+error.line(line_num);
-	  throw;
+throw;
-	}
+}
 }
 if (!nodes_done) {
-	throw DataFormatError("Section @nodes not found");
+throw DataFormatError("Section @nodes not found");
 }
 if (!edges_done) {
-	throw DataFormatError("Section @edges not found");
+throw DataFormatError("Section @edges not found");
 }
 if (!attributes_done && !_attributes.empty()) {
-	throw DataFormatError("Section @attributes not found");
+throw DataFormatError("Section @attributes not found");
 }
 }
 /// @}
 };
 /// \brief Return a \ref GraphReader class
 ///
 /// This function just returns a \ref GraphReader class.
 /// \relates GraphReader
 template <typename Graph>
 GraphReader<Graph> graphReader(std::istream& is, Graph& graph) {
 GraphReader<Graph> tmp(is, graph);
 return tmp;
 }
 /// \brief Return a \ref GraphReader class
 ///
 /// This function just returns a \ref GraphReader class.
 /// \relates GraphReader
 template <typename Graph>
 GraphReader<Graph> graphReader(const std::string& fn,
-				       Graph& graph) {
+Graph& graph) {
 GraphReader<Graph> tmp(fn, graph);
 return tmp;
 }
 /// \brief Return a \ref GraphReader class
 ///
 /// This function just returns a \ref GraphReader class.
 /// \relates GraphReader
 template <typename Graph>
 GraphReader<Graph> graphReader(const char* fn, Graph& graph) {
 GraphReader<Graph> tmp(fn, graph);
 class SectionReader;
 SectionReader sectionReader(std::istream& is);
 SectionReader sectionReader(const std::string& fn);
 SectionReader sectionReader(const char* fn);
 /// \ingroup lemon_io
 ///
 /// \brief Section reader class
 ///
 /// In the \ref lgf-format "LGF" file extra sections can be placed,
 /// which contain any data in arbitrary format. Such sections can be
 /// read with this class. A reading rule can be added to the class
 /// with two different functions. With the \c sectionLines() function a
 /// functor can process the section line-by-line, while with the \c
 /// sectionStream() member the section can be read from an input
 /// stream.
 class SectionReader {
 private:
 std::istream* _is;
 bool local_is;
 typedef std::map<std::string, _reader_bits::Section*> Sections;
 Sections _sections;
 /// \brief Constructor
 ///
 /// Construct a section reader, which reads from the given input
 /// stream.
 SectionReader(std::istream& is)
 : _is(&is), local_is(false) {}
 /// \brief Constructor
 ///
 /// Construct a section reader, which reads from the given file.
 SectionReader(const std::string& fn)
 : _is(new std::ifstream(fn.c_str())), local_is(true) {}
 /// \brief Constructor
 ///
 /// Construct a section reader, which reads from the given file.
 SectionReader(const char* fn)
 : _is(new std::ifstream(fn)), local_is(true) {}
 /// \brief Destructor
 ~SectionReader() {
 for (Sections::iterator it = _sections.begin();
-	   it != _sections.end(); ++it) {
+it != _sections.end(); ++it) {
-	delete it->second;
+delete it->second;
 }
 if (local_is) {
-	delete _is;
+delete _is;
 }
 }
 private:
 friend SectionReader sectionReader(std::istream& is);
 friend SectionReader sectionReader(const std::string& fn);
 friend SectionReader sectionReader(const char* fn);
 SectionReader(SectionReader& other)
 : _is(other._is), local_is(other.local_is) {
 other._is = 0;
 other.local_is = false;
 _sections.swap(other._sections);
 }
 SectionReader& operator=(const SectionReader&);
 public:
 /// \name Section readers
 ///    }
 ///  };
 ///
 ///  // ...
 ///
 ///  reader.sectionLines("numbers", NumberSection(vec));
 ///\endcode
 template <typename Functor>
 SectionReader& sectionLines(const std::string& type, Functor functor) {
 LEMON_ASSERT(!type.empty(), "Type is empty.");
 LEMON_ASSERT(_sections.find(type) == _sections.end(),
-		   "Multiple reading of section.");
+"Multiple reading of section.");
 _sections.insert(std::make_pair(type,
 new _reader_bits::LineSection<Functor>(functor)));
 return *this;
 }
 /// functor can read the input while the section go on, and the
 /// line number should be modified accordingly.
 template <typename Functor>
 SectionReader& sectionStream(const std::string& type, Functor functor) {
 LEMON_ASSERT(!type.empty(), "Type is empty.");
 LEMON_ASSERT(_sections.find(type) == _sections.end(),
-		   "Multiple reading of section.");
+"Multiple reading of section.");
 _sections.insert(std::make_pair(type,
-	 new _reader_bits::StreamSection<Functor>(functor)));
+new _reader_bits::StreamSection<Functor>(functor)));
 return *this;
 }
 /// @}
 private:
 bool readLine() {
 std::string str;
 while(++line_num, std::getline(*_is, str)) {
-	line.clear(); line.str(str);
+line.clear(); line.str(str);
-	char c;
+char c;
-	if (line >> std::ws >> c && c != '#') {
+if (line >> std::ws >> c && c != '#') {
-	  line.putback(c);
+line.putback(c);
-	  return true;
+return true;
-	}
+}
 }
 return false;
 }
 bool readSuccess() {
 return static_cast<bool>(*_is);
 }
 void skipSection() {
 char c;
 while (readSuccess() && line >> c && c != '@') {
-	readLine();
+readLine();
 }
 line.putback(c);
 }
 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");
 std::set<std::string> extra_sections;
 line_num = 0;
 readLine();
 skipSection();
 while (readSuccess()) {
-	try {
+try {
-	  char c;
+char c;
-	  std::string section, caption;
+std::string section, caption;
-	  line >> c;
+line >> c;
-	  _reader_bits::readToken(line, section);
+_reader_bits::readToken(line, section);
-	  _reader_bits::readToken(line, caption);
+_reader_bits::readToken(line, caption);
-	  if (line >> c)
+if (line >> c)
-	    throw DataFormatError("Extra character on the end of line");
+throw DataFormatError("Extra character on the end of line");
-	  if (extra_sections.find(section) != extra_sections.end()) {
+if (extra_sections.find(section) != extra_sections.end()) {
-	    std::ostringstream msg;
+std::ostringstream msg;
-	    msg << "Multiple occurence of section " << section;
+msg << "Multiple occurence of section " << section;
-	    throw DataFormatError(msg.str().c_str());
+throw DataFormatError(msg.str().c_str());
-	  }
+}
-	  Sections::iterator it = _sections.find(section);
+Sections::iterator it = _sections.find(section);
-	  if (it != _sections.end()) {
+if (it != _sections.end()) {
-	    extra_sections.insert(section);
+extra_sections.insert(section);
-	    it->second->process(*_is, line_num);
+it->second->process(*_is, line_num);
-	  }
+}
-	  readLine();
+readLine();
-	  skipSection();
+skipSection();
-	} catch (DataFormatError& error) {
+} catch (DataFormatError& error) {
-	  error.line(line_num);
+error.line(line_num);
-	  throw;
+throw;
-	}
+}
 }
 for (Sections::iterator it = _sections.begin();
-	   it != _sections.end(); ++it) {
+it != _sections.end(); ++it) {
-	if (extra_sections.find(it->first) == extra_sections.end()) {
+if (extra_sections.find(it->first) == extra_sections.end()) {
-	  std::ostringstream os;
+std::ostringstream os;
-	  os << "Cannot find section: " << it->first;
+os << "Cannot find section: " << it->first;
-	  throw DataFormatError(os.str().c_str());
+throw DataFormatError(os.str().c_str());
-	}
+}
 }
 }
 /// @}
 };
 /// \brief Return a \ref SectionReader class
 ///
 /// This function just returns a \ref SectionReader class.
 /// \relates SectionReader
 inline SectionReader sectionReader(std::istream& is) {
 SectionReader tmp(is);
 return tmp;
 }
 /// \brief Return a \ref SectionReader class
 ///
 /// This function just returns a \ref SectionReader class.
 /// \relates SectionReader
 inline SectionReader sectionReader(const std::string& fn) {
 SectionReader tmp(fn);
 return tmp;
 }
 /// \brief Return a \ref SectionReader class
 ///
 /// This function just returns a \ref SectionReader class.
 /// \relates SectionReader
 inline SectionReader sectionReader(const char* fn) {
 SectionReader tmp(fn);
 return tmp;
 }
 /// \ingroup lemon_io
 ///
 /// \brief Reader for the contents of the \ref lgf-format "LGF" file
 ///
 /// This class can be used to read the sections, the map names and
 /// the attributes from a file. Usually, the Lemon programs know
 /// that, which type of graph, which maps and which attributes
 /// should be read from a file, but in general tools (like glemon)
 /// the contents of an LGF file should be guessed somehow. This class
 /// reads the graph and stores the appropriate information for
 /// reading the graph.
 ///
 ///\code
 /// LgfContents contents("graph.lgf");
 /// contents.run();
 ///
 /// // Does it contain any node section and arc section?
 /// if (contents.nodeSectionNum() == 0 || contents.arcSectionNum()) {
 ///   std::cerr << "Failure, cannot find graph." << std::endl;
 ///   return -1;
 /// }
 /// std::cout << "The name of the default node section: "
 ///           << contents.nodeSection(0) << std::endl;
 /// std::cout << "The number of the arc maps: "
 ///           << contents.arcMaps(0).size() << std::endl;
 /// std::cout << "The name of second arc map: "
 ///           << contents.arcMaps(0)[1] << std::endl;
 ///\endcode
 class LgfContents {
 private:
 std::istream* _is;
 bool local_is;
 std::vector<std::vector<std::string> > _attributes;
 int line_num;
 std::istringstream line;
 public:
 /// \brief Constructor
 ///
 /// Construct an \e LGF contents reader, which reads from the given
 /// input stream.
 LgfContents(std::istream& is)
 : _is(&is), local_is(false) {}
 /// \brief Constructor
 ///
 /// Construct an \e LGF contents reader, which reads from the given
 /// file.
 LgfContents(const std::string& fn)
 : _is(new std::ifstream(fn.c_str())), local_is(true) {}
 /// \brief Constructor
 ///
 /// Construct an \e LGF contents reader, which reads from the given
 /// file.
 LgfContents(const char* fn)
 : _is(new std::ifstream(fn)), local_is(true) {}
 /// \brief Destructor
 ~LgfContents() {
 if (local_is) delete _is;
 }
 private:
 LgfContents(const LgfContents&);
 LgfContents& operator=(const LgfContents&);
 public:
 /// Gives back the number of node sections in the file.
 int nodeSectionNum() const {
 return _node_sections.size();
 }
 /// \brief Returns the node section name at the given position.
 ///
 /// Returns the node section name at the given position.
 const std::string& nodeSection(int i) const {
 return _node_sections[i];
 }
 /// \brief Gives back the node maps for the given section.
 return _node_maps[i];
 }
 /// @}
 /// \name Arc/Edge sections
 /// @{
 /// \brief Gives back the number of arc/edge sections in the file.
 ///
 /// Gives back the number of arc/edge sections in the file.
 /// \note It is synonym of \c edgeSectionNum().
 int arcSectionNum() const {
 return _edge_sections.size();
 }
 /// \brief Returns the arc/edge section name at the given position.
 ///
 /// Returns the arc/edge section name at the given position.
 /// \note It is synonym of \c edgeSection().
 const std::string& arcSection(int i) const {
 return _edge_sections[i];
 }
 /// \note It is synonym of \c arcSectionNum().
 int edgeSectionNum() const {
 return _edge_sections.size();
 }
 /// \brief Returns the section name at the given position.
 ///
 /// Returns the section name at the given position.
 /// \note It is synonym of \c arcSection().
 const std::string& edgeSection(int i) const {
 return _edge_sections[i];
 }
 return _edge_maps[i];
 }
 /// @}
 /// \name Attribute sections
 /// @{
 /// \brief Gives back the number of attribute sections in the file.
 ///
 /// Gives back the number of attribute sections in the file.
 int attributeSectionNum() const {
 return _attribute_sections.size();
 }
 /// \brief Returns the attribute section name at the given position.
 ///
 /// Returns the attribute section name at the given position.
 const std::string& attributeSectionNames(int i) const {
 return _attribute_sections[i];
 }
 /// \brief Gives back the attributes for the given section.
 return _attributes[i];
 }
 /// @}
 /// \name Extra sections
 /// @{
 /// \brief Gives back the number of extra sections in the file.
 ///
 /// Gives back the number of extra sections in the file.
 int extraSectionNum() const {
 return _extra_sections.size();
 }
 /// \brief Returns the extra section type at the given position.
 ///
 /// Returns the section type at the given position.
 const std::string& extraSection(int i) const {
 return _extra_sections[i];
 }
 /// @}
 private:
 bool readLine() {
 std::string str;
 while(++line_num, std::getline(*_is, str)) {
-	line.clear(); line.str(str);
+line.clear(); line.str(str);
-	char c;
+char c;
-	if (line >> std::ws >> c && c != '#') {
+if (line >> std::ws >> c && c != '#') {
-	  line.putback(c);
+line.putback(c);
-	  return true;
+return true;
-	}
+}
 }
 return false;
 }
 bool readSuccess() {
 }
 void skipSection() {
 char c;
 while (readSuccess() && line >> c && c != '@') {
-	readLine();
+readLine();
 }
 line.putback(c);
 }
 void readMaps(std::vector<std::string>& maps) {
 char c;
 if (!readLine() || !(line >> c) || c == '@') {
-	if (readSuccess() && line) line.putback(c);
+if (readSuccess() && line) line.putback(c);
-	return;
+return;
 }
 line.putback(c);
 std::string map;
 while (_reader_bits::readToken(line, map)) {
-	maps.push_back(map);
+maps.push_back(map);
 }
 }
 void readAttributes(std::vector<std::string>& attrs) {
 readLine();
 char c;
 while (readSuccess() && line >> c && c != '@') {
-	line.putback(c);
+line.putback(c);
-	std::string attr;
+std::string attr;
-	_reader_bits::readToken(line, attr);
+_reader_bits::readToken(line, attr);
-	attrs.push_back(attr);
+attrs.push_back(attr);
-	readLine();
+readLine();
 }
 line.putback(c);
 }
 public:
 /// \name Execution of the contents reader
 /// @{
 /// \brief Starts the reading
 ///
 /// This function starts the reading.
 readLine();
 skipSection();
 while (readSuccess()) {
-	char c;
+char c;
-	line >> c;
+line >> c;
-	std::string section, caption;
+std::string section, caption;
-	_reader_bits::readToken(line, section);
+_reader_bits::readToken(line, section);
-	_reader_bits::readToken(line, caption);
+_reader_bits::readToken(line, caption);
-	if (section == "nodes") {
+if (section == "nodes") {
-	  _node_sections.push_back(caption);
+_node_sections.push_back(caption);
-	  _node_maps.push_back(std::vector<std::string>());
+_node_maps.push_back(std::vector<std::string>());
-	  readMaps(_node_maps.back());
+readMaps(_node_maps.back());
-	  readLine(); skipSection();
+readLine(); skipSection();
-	} else if (section == "arcs" || section == "edges") {
+} else if (section == "arcs" || section == "edges") {
-	  _edge_sections.push_back(caption);
+_edge_sections.push_back(caption);
-	  _arc_sections.push_back(section == "arcs");
+_arc_sections.push_back(section == "arcs");
-	  _edge_maps.push_back(std::vector<std::string>());
+_edge_maps.push_back(std::vector<std::string>());
-	  readMaps(_edge_maps.back());
+readMaps(_edge_maps.back());
-	  readLine(); skipSection();
+readLine(); skipSection();
-	} else if (section == "attributes") {
+} else if (section == "attributes") {
-	  _attribute_sections.push_back(caption);
+_attribute_sections.push_back(caption);
-	  _attributes.push_back(std::vector<std::string>());
+_attributes.push_back(std::vector<std::string>());
-	  readAttributes(_attributes.back());
+readAttributes(_attributes.back());
-	} else {
+} else {
-	  _extra_sections.push_back(section);
+_extra_sections.push_back(section);
-	  readLine(); skipSection();
+readLine(); skipSection();
-	}
+}
 }
 }
 /// @}
 };
 }
 #endif

changeset 209	765619b7cbb2
parent 201	9757e3d9bfeb
child 210	81cfc04531e8