LEMON/LEMON-main Changeset - r182:9c6dfb5141d3

Repositories » LEMON » LEMON-main

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

Changeset - r182:9c6dfb5141d3

« 181:e34570

183:0c6556 »

r182:9c6dfb5141d3

Wed, 18 Jun 2008 14:52:23

[Not Reviewed]

0 comments (0 inline)

alpar (Alpar Juttner)
alpar@cs.elte.hu

*Maps() -> *MapNames() in LgfContents

0 1 0

default

1 file changed with 6 insertions and 6 deletions:

lemon/lgf_reader.h

↑ Collapse diff ↑

lemon/lgf_reader.h

Show inline comments

@@ -655,1744 +655,1744 @@
 		      _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();
 		      skipSection();
 		      while (readSuccess()) {
 			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();
 			    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();
 		      skipSection();
 		      while (readSuccess()) {
 			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();
 			    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;
+		  }
 		  /// \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::string> _node_sections;
 		    std::vector<std::string> _edge_sections;
 		    std::vector<std::string> _attribute_sections;
 		    std::vector<std::string> _extra_sections;
 		    std::vector<bool> _arc_sections;
 		    std::vector<std::vector<std::string> > _node_maps;
 		    std::vector<std::vector<std::string> > _edge_maps;
 		    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 Copy constructor
 		    ///
 		    /// The copy constructor transfers all data from the other reader,
 		    /// therefore the copied reader will not be usable more.
 		    LgfContents(LgfContents& other)
 		      : _is(other._is), local_is(other.local_is) {
 		      other._is = 0;
 		      other.local_is = false;
 		      _node_sections.swap(other._node_sections);
 		      _edge_sections.swap(other._edge_sections);
 		      _attribute_sections.swap(other._attribute_sections);
 		      _extra_sections.swap(other._extra_sections);
 		      _arc_sections.swap(other._arc_sections);
 		      _node_maps.swap(other._node_maps);
 		      _edge_maps.swap(other._edge_maps);
 		      _attributes.swap(other._attributes);
+		    }
 		    /// \brief Destructor
 		    ~LgfContents() {
 		      if (local_is) delete _is;
+		    }
 		    /// \name Node sections
 		    /// @{
 		    /// \brief Gives back the number of node sections in the file.
 		    ///
 		    /// Gives back the number of node sections in the file.
 		    int nodeSectionNum() const {
 		      return _node_sections.size();
+		    }
 		    /// \brief Returns the section name at the given position.
 		    ///
 		    /// Returns the 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.
 		    ///
 		    /// Gives back the node maps for the given section.
-		    const std::vector<std::string>& nodeMaps(int i) const {
+		    const std::vector<std::string>& nodeMapNames(int i) const {
 		      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 section name at the given position.
 		    ///
 		    /// Returns the section name at the given position.
 		    /// \note It is synonym of \c edgeSection().
 		    const std::string& arcSection(int i) const {
 		      return _edge_sections[i];
+		    }
 		    /// \brief Gives back the arc/edge maps for the given section.
 		    ///
 		    /// Gives back the arc/edge maps for the given section.
 		    /// \note It is synonym of \c edgeMaps().
 		    const std::vector<std::string>& arcMaps(int i) const {
 		    /// \note It is synonym of \c edgeMapNames().
 		    const std::vector<std::string>& arcMapNames(int i) const {
 		      return _edge_maps[i];
+		    }
 		    /// @}
 		    /// \name Synonyms
 		    /// @{
 		    /// \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 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];
+		    }
 		    /// \brief Gives back the edge maps for the given section.
 		    ///
 		    /// Gives back the edge maps for the given section.
 		    /// \note It is synonym of \c arcMaps().
 		    const std::vector<std::string>& edgeMaps(int i) const {
 		    /// \note It is synonym of \c arcMapNames().
 		    const std::vector<std::string>& edgeMapNames(int i) const {
 		      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 section name at the given position.
 		    ///
 		    /// Returns the section name at the given position.
-		    const std::string& attributeSection(int i) const {
+		    const std::string& attributeSectionNames(int i) const {
 		      return _attribute_sections[i];
+		    }
 		    /// \brief Gives back the attributes for the given section.
 		    ///
 		    /// Gives back the attributes for the given section.
 		    const std::vector<std::string>& attributes(int i) const {
 		      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);
 			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 readMaps(std::vector<std::string>& maps) {
 		      if (!readLine())
 			throw DataFormatError("Cannot find map captions");
 		      std::string map;
 		      while (_reader_bits::readToken(line, map)) {
 			maps.push_back(map);
+		      }
+		    }
 		    void readAttributes(std::vector<std::string>& attrs) {
 		      readLine();
 		      char c;
 		      while (readSuccess() && line >> c && c != '@') {
 			line.putback(c);
 			std::string attr;
 			_reader_bits::readToken(line, attr);
 			attrs.push_back(attr);
 			readLine();
+		      }
 		      line.putback(c);
+		    }
 		  public:
 		    /// \name Execution of the contents reader
 		    /// @{
 		    /// \brief Start the reading
 		    ///
 		    /// This function starts the reading
 		    void run() {
 		      readLine();
 		      skipSection();
 		      while (readSuccess()) {
 			char c;
 			line >> c;
 			std::string section, caption;
 			_reader_bits::readToken(line, section);
 			_reader_bits::readToken(line, caption);
 			if (section == "nodes") {
 			  _node_sections.push_back(caption);
 			  _node_maps.push_back(std::vector<std::string>());
 			  readMaps(_node_maps.back());
 			  readLine(); skipSection();
 			} else if (section == "arcs" || section == "edges") {
 			  _edge_sections.push_back(caption);
 			  _arc_sections.push_back(section == "arcs");
 			  _edge_maps.push_back(std::vector<std::string>());
 			  readMaps(_edge_maps.back());
 			  readLine(); skipSection();
 			} else if (section == "attributes") {
 			  _attribute_sections.push_back(caption);
 			  _attributes.push_back(std::vector<std::string>());
 			  readAttributes(_attributes.back());
 			} else {
 			  _extra_sections.push_back(section);
 			  readLine(); skipSection();
+			}
+		      }
+		    }
 		    /// @}
 		  };
+		}
 		#endif

0 comments (0 inline)

RhodeCode

Login to your account