Ticket #35: lgf_io.hg

# HG changeset patch
# User Balazs Dezso <deba@inf.elte.hu>
# Date 1207815600 -7200
# Node ID 988226bc5e6c092db643ebcb020e0a9e38f08dd0
# Parent  b6bede534255e492871c601771442b65e12f7319
Redesign lgf related tools

diff -r b6bede534255 -r 988226bc5e6c demo/Makefile.am
--- a/demo/Makefile.am  Thu Apr 03 13:00:18 2008 +0100
+++ b/demo/Makefile.am  Thu Apr 10 10:20:00 2008 +0200
@@ -4,9 +4,11 @@ if WANT_DEMO
 if WANT_DEMO
 
 noinst_PROGRAMS += \
-        demo/arg_parser_demo
+        demo/arg_parser_demo \
+       demo/lgf_demo
 
 endif WANT_DEMO
 
 demo_arg_parser_demo_SOURCES = demo/arg_parser_demo.cc
+demo_lgf_demo_SOURCES = demo/lgf_demo.cc
 
diff -r b6bede534255 -r 988226bc5e6c demo/lgf_demo.cc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/demo/lgf_demo.cc  Thu Apr 10 10:20:00 2008 +0200
@@ -0,0 +1,125 @@
+/* -*- C++ -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library
+ *
+ * Copyright (C) 2003-2008
+ * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
+ * (Egervary Research Group on Combinatorial Optimization, EGRES).
+ *
+ * Permission to use, modify and distribute this software is granted
+ * provided that this copyright notice appears in all copies. For
+ * precise terms see the accompanying LICENSE file.
+ *
+ * This software is provided "AS IS" with no warranty of any kind,
+ * express or implied, and with no claim as to its suitability for any
+ * purpose.
+ *
+ */
+
+///\ingroup demos
+///\file
+///\brief Demonstrating graph input and output
+///
+/// This simple demo program gives an example of how to read and write
+/// a graph and additional maps (on the nodes or the edges) from/to a
+/// stream. 
+///
+/// \include reader_writer_demo.cc
+
+#include <iostream>
+#include <lemon/smart_graph.h>
+#include <lemon/lgf_reader.h>
+#include <lemon/lgf_writer.h>
+#include <lemon/random.h>
+
+
+using namespace lemon;
+
+int main(int argc, const char *argv[]) {
+  SmartDigraph digraph;
+
+  std::stringstream ss;
+
+  try {
+
+    typedef SmartDigraph Digraph;
+    typedef Digraph::Node Node;
+    typedef Digraph::Arc Arc;
+    typedef Digraph::ArcIt ArcIt;
+
+    typedef Digraph::ArcMap<int> CapacityMap;
+    typedef Digraph::ArcMap<std::string> NameMap;
+
+    const int n = argc > 1 ? std::atoi(argv[1]) : 20;
+    const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * log(n));
+    const int m = argc > 3 ? std::atoi(argv[3]) : 100;
+
+    Digraph digraph;
+    CapacityMap capacity(digraph);
+    NameMap name(digraph);
+
+    std::vector<Node> nodes;
+
+    for (int i = 0; i < n; ++i) {
+      nodes.push_back(digraph.addNode());
+    }
+    for (int i = 0; i < e; ++i) {
+      int s = rnd[n];
+      int t = rnd[n];
+      int c = rnd[m];
+      Arc arc = digraph.addArc(nodes[s], nodes[t]);
+      capacity[arc] = c;
+      std::ostringstream os;
+      os << "arc \t" << i << std::endl;
+      name[arc] = os.str();
+    }
+
+
+    DigraphWriter<Digraph>(ss, digraph).
+      arcMap("capacity", capacity).
+      arcMap("name", name).
+      node("source", nodes[0]).
+      node("target", nodes[1]).
+      run();
+
+  } catch (DataFormatError& error) {
+    std::cerr << error.what() << std::endl;
+  }
+
+  try {
+
+    typedef SmartDigraph Digraph;
+    typedef Digraph::Node Node;
+    typedef Digraph::Arc Arc;
+    typedef Digraph::ArcIt ArcIt;
+
+    typedef Digraph::ArcMap<int> CapacityMap;
+    typedef Digraph::ArcMap<std::string> NameMap;
+
+    Digraph digraph;
+    CapacityMap capacity(digraph);
+    NameMap name(digraph);
+
+    Node s, t;
+
+    DigraphReader<Digraph>(ss, digraph).
+      arcMap("capacity", capacity).
+      arcMap("name", name).
+      node("source", s).
+      node("target", t).
+      run();
+
+    DigraphWriter<Digraph>(std::cout, digraph).
+      arcMap("capacity", capacity).
+      arcMap("name", name).
+      node("source", s).
+      node("target", t).
+      run();
+
+  } catch (DataFormatError& error) {
+    std::cerr << error.what() << std::endl;
+  }
+
+
+  return 0;
+}
diff -r b6bede534255 -r 988226bc5e6c lemon/Makefile.am
--- a/lemon/Makefile.am Thu Apr 03 13:00:18 2008 +0100
+++ b/lemon/Makefile.am Thu Apr 10 10:20:00 2008 +0200
@@ -26,6 +26,7 @@ lemon_HEADERS += \
        lemon/error.h \
        lemon/graph_utils.h \
        lemon/kruskal.h \
+       lemon/lgf_reader.h \
        lemon/list_graph.h \
        lemon/maps.h \
        lemon/math.h \
diff -r b6bede534255 -r 988226bc5e6c lemon/lgf_reader.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lemon/lgf_reader.h        Thu Apr 10 10:20:00 2008 +0200
@@ -0,0 +1,866 @@
+/* -*- C++ -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library
+ *
+ * Copyright (C) 2003-2008
+ * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
+ * (Egervary Research Group on Combinatorial Optimization, EGRES).
+ *
+ * Permission to use, modify and distribute this software is granted
+ * provided that this copyright notice appears in all copies. For
+ * precise terms see the accompanying LICENSE file.
+ *
+ * This software is provided "AS IS" with no warranty of any kind,
+ * express or implied, and with no claim as to its suitability for any
+ * purpose.
+ *
+ */
+
+///\ingroup lemon_io
+///\file
+///\brief Lemon Graph Format reader.
+
+
+#ifndef LEMON_LGF_READER_H
+#define LEMON_LGF_READER_H
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include <map>
+#include <typeinfo>
+
+#include <lemon/assert.h>
+#include <lemon/graph_utils.h>
+
+namespace lemon {
+
+  namespace _reader_bits {
+
+    template <typename Value>
+    struct DefaultConverter {
+      Value operator()(const std::string& str) {
+       std::istringstream is(str);
+       Value value;
+       is >> value;
+
+       char c;
+       if (is >> std::ws >> c) {
+         throw DataFormatError("Remaining characters in token");
+       }
+       return value;
+      }
+    };
+
+    template <>
+    struct DefaultConverter<std::string> {
+      std::string operator()(const std::string& str) {
+       return str;
+      }
+    };
+
+    template <typename _Item>    
+    class MapStorageBase {
+    public:
+      typedef _Item Item;
+
+    private:      
+      bool _touched;
+
+    public:
+      MapStorageBase() : _touched(false) {}
+      virtual ~MapStorageBase() {}
+
+      void touch(bool value = true) { _touched = value; }
+      bool touched() const { return _touched; }
+
+      virtual void set(const Item& item, const std::string& value) = 0;
+
+    };
+
+    template <typename _Item, typename _Map, 
+             typename _Converter = DefaultConverter<typename _Map::Value> >
+    class MapStorage : public MapStorageBase<_Item> {
+    public:
+      typedef _Map Map;
+      typedef _Converter Converter;
+      typedef _Item Item;
+      
+    private:
+      Map& _map;
+      Converter _converter;
+
+    public:
+      MapStorage(Map& map, const Converter& converter = Converter()) 
+       : _map(map), _converter(converter) {}
+      virtual ~MapStorage() {}
+
+      virtual void set(const Item& item ,const std::string& value) {
+       _map.set(item, _converter(value));
+      }
+    };
+
+    class ValueStorageBase {
+    private:
+      bool _touched;
+
+    public:
+      ValueStorageBase() : _touched(false) {}
+      virtual ~ValueStorageBase() {}
+
+      void touch() { _touched = true; }
+      bool touched() const { return _touched; }
+
+      virtual void set(const std::string&) = 0;
+    };
+
+    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
+    class ValueStorage : public ValueStorageBase {
+    public:
+      typedef _Value Value;
+      typedef _Converter Converter;
+
+    private:
+      Value& _value;
+      Converter _converter;
+
+    public:
+      ValueStorage(Value& value, const Converter& converter = Converter())
+       : _value(value), _converter(converter) {}
+
+      virtual void set(const std::string& value) {
+       _value = _converter(value);
+      }
+    };
+
+
+    class FilterStreamBuf : public std::streambuf {
+    public:
+
+      typedef std::streambuf Parent;
+      typedef Parent::char_type char_type;
+      FilterStreamBuf(std::istream& is, int& num) 
+       : _is(is), _base(0), _eptr(0), 
+         _num(num), skip_state(after_endl) {}
+
+    protected:
+
+      enum skip_state_type {
+       no_skip,
+       after_endl,
+       comment_line
+      };
+
+      char_type small_buf[1];
+
+
+      std::istream& _is;
+
+      char_type* _base;
+      char_type* _eptr;
+
+      int& _num;
+
+      skip_state_type skip_state;
+
+
+      char_type* base() { return _base; }
+      char_type* eptr() { return _eptr; }
+      int_type blen() { return _eptr - _base; }
+
+      void setb(char_type* buf, int_type len) {
+       _base = buf;
+       _eptr = buf + len;
+      }
+  
+      virtual std::streambuf* setbuf(char *buf, std::streamsize len) {
+       if (base()) return 0;
+       if (buf != 0 && len >= int(sizeof(small_buf))) {
+         setb(buf, len);
+       } else {
+         setb(small_buf, sizeof(small_buf));
+       }
+       setg(0, 0, 0);
+       return this;
+      }
+
+      bool put_char(char c) {
+       switch (skip_state) {
+       case no_skip:
+         switch (c) {
+         case '\n': 
+           skip_state = after_endl;
+           return true;
+         default:
+           return true;
+         }
+       case after_endl:
+         switch (c) {
+         case '@':
+           return false;
+         case '\n': 
+           return false;
+         case '#':
+           skip_state = comment_line;
+           return false;
+         default:
+           if (!isspace(c)) {
+             skip_state = no_skip;
+             return true;
+           } else {
+             return false;
+           }
+         }
+         break;
+       case comment_line:
+         switch (c) {
+         case '\n': 
+           skip_state = after_endl;
+           return false;
+         default:
+           return false;
+         }
+       }
+       return false;
+      }
+
+      virtual int_type underflow() {
+       char c;
+       if ((c = _is.peek()) != EOF) {
+         if (c == '@') {
+           return EOF;
+         }
+       } else {
+         return EOF;
+       }
+       char_type *ptr;
+       for (ptr = base(); ptr != eptr(); ++ptr) {
+         if ((c = _is.get()) != EOF) {
+           if (c == '\n') ++_num;
+           if (put_char(c)) {
+             *ptr = c;
+           } else {
+             if (skip_state == after_endl && c == '@') {
+               _is.putback(c);
+               break;
+             }
+             --ptr;
+           }
+         } else {
+           break;
+         }
+       }
+       setg(base(), base(), ptr);
+       return *base();
+      }
+
+      virtual int_type sync() {
+       return EOF;
+      }
+
+    public:
+
+      int line_num() const {
+       int r = _num;
+       for (char_type* p = gptr(); p != egptr(); ++p) {
+         if (*p == '\n') --r;
+       }
+       return r;
+      }
+
+    };
+
+    template <typename Value>
+    struct MapLookUpConverter {
+      const std::map<std::string, Value>& _map;
+      
+      MapLookUpConverter(const std::map<std::string, Value>& map) 
+       : _map(map) {}
+      
+      Value operator()(const std::string& str) {
+       typename std::map<std::string, Value>::const_iterator it = 
+         _map.find(str);
+
+       if (it == _map.end()) {
+         std::ostringstream msg;
+         msg << "Item not found: " << str;
+         throw DataFormatError(msg.str().c_str());
+       }
+       return it->second;
+      }
+    };
+
+    bool isWhiteSpace(char c) {
+      return c == ' ' || c == '\t' || c == '\v' || 
+        c == '\n' || c == '\r' || c == '\f'; 
+    }
+    
+    bool isOct(char c) {
+      return '0' <= c && c <='7'; 
+    }
+    
+    int valueOct(char c) {
+      LEMON_ASSERT(isOct(c), "The character is not octal.");
+      return c - '0';
+    }
+
+    bool isHex(char c) {
+      return ('0' <= c && c <= '9') || 
+       ('a' <= c && c <= 'z') || 
+       ('A' <= c && c <= 'Z'); 
+    }
+    
+    int valueHex(char c) {
+      LEMON_ASSERT(isHex(c), "The character is not hexadecimal.");
+      if ('0' <= c && c <= '9') return c - '0';
+      if ('a' <= c && c <= 'z') return c - 'a' + 10;
+      return c - 'A' + 10;
+    }
+
+    char readEscape(std::istream& is) {
+      char c;
+      if (!is.get(c))
+       throw DataFormatError("Escape format error");
+
+      switch (c) {
+      case '\\':
+       return '\\';
+      case '\"':
+       return '\"';
+      case '\'':
+       return '\'';
+      case '\?':
+       return '\?';
+      case 'a':
+       return '\a';
+      case 'b':
+       return '\b';
+      case 'f':
+       return '\f';
+      case 'n':
+       return '\n';
+      case 'r':
+       return '\r';
+      case 't':
+       return '\t';
+      case 'v':
+       return '\v';
+      case 'x':
+       {
+         int code;
+         if (!is.get(c) || !isHex(c)) 
+           throw DataFormatError("Escape format error");
+         else if (code = valueHex(c), !is.get(c) || !isHex(c)) is.putback(c);
+         else code = code * 16 + valueHex(c);
+         return code;
+       }
+      default:
+       {
+         int code;
+         if (!isOct(c)) 
+           throw DataFormatError("Escape format error");
+         else if (code = valueOct(c), !is.get(c) || !isOct(c)) 
+           is.putback(c);
+         else if (code = code * 8 + valueOct(c), !is.get(c) || !isOct(c)) 
+           is.putback(c);
+         else code = code * 8 + valueOct(c);
+         return code;
+       }             
+      } 
+    }
+
+
+    std::istream& readToken(std::istream& is, std::string& str) {
+      std::ostringstream os;
+
+      char c;
+      is >> std::ws;
+      
+      if (!is.get(c)) 
+       throw DataFormatError("Token not found");
+
+      if (c == '\"') {
+       while (is.get(c) && c != '\"') {
+         if (c == '\\') 
+           c = readEscape(is);
+         os << c;
+       }
+       if (!is) 
+         throw DataFormatError("Quoted format error");
+      } else {
+       is.putback(c);
+       while (is.get(c) && !isWhiteSpace(c)) {
+         if (c == '\\') 
+           c = readEscape(is);
+         os << c;
+       }
+       if (!is) {
+         is.setstate(std::ios_base::goodbit);
+       } else {
+         is.putback(c);
+       }
+      }
+      str = os.str();
+      return is;
+    }
+
+  }
+  
+  /// \e
+  template <typename _Digraph>
+  class DigraphReader {
+  public:
+
+    typedef _Digraph Digraph;
+    GRAPH_TYPEDEFS(typename Digraph);
+    
+  private:
+
+
+    std::istream* _is;
+    bool local_is;
+
+    Digraph& _digraph;
+
+    std::string _node_set_caption;
+    std::string _arc_set_caption;
+    std::string _attributes_caption;
+
+    typedef std::map<std::string, Node> NodeIndex;
+    NodeIndex _node_index;
+    typedef std::map<std::string, Arc> ArcIndex;
+    ArcIndex _arc_index;
+    
+    typedef std::multimap<std::string, _reader_bits::MapStorageBase<Node>* > 
+      NodeMaps;    
+    NodeMaps _node_maps; 
+
+    typedef std::multimap<std::string, _reader_bits::MapStorageBase<Arc>* > 
+      ArcMaps;
+    ArcMaps _arc_maps;
+
+    typedef std::multimap<std::string, _reader_bits::ValueStorageBase*> 
+      Attributes;
+    Attributes _attributes;
+
+  public:
+
+    /// \e
+    DigraphReader(std::istream& is, Digraph& digraph) 
+      : _is(&is), local_is(false), _digraph(digraph) {}
+
+    /// \e
+    DigraphReader(const std::string& fn, Digraph& digraph) 
+      : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph) {}
+
+    /// \e
+    DigraphReader(const char* fn, Digraph& digraph) 
+      : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph) {}
+
+    DigraphReader(DigraphReader& other) 
+      : _is(other._is), local_is(other.local_is), _digraph(other._digraph) {
+
+      other.is = 0;
+      other.local_is = false;
+
+      _node_index.swap(other._node_index);
+      _arc_index.swap(other._arc_index);
+
+      _node_maps.swap(other._node_maps);
+      _arc_maps.swap(other._arc_maps);
+      _attributes.swap(other._attributes);
+
+      _node_set_caption = other._node_set_caption;
+      _arc_set_caption = other._arc_set_caption;
+      _attributes_caption = other._attributes_caption;
+    }
+
+    /// \e
+    ~DigraphReader() {
+      for (typename NodeMaps::iterator it = _node_maps.begin(); 
+          it != _node_maps.end(); ++it) {
+       delete it->second;
+      }
+
+      for (typename ArcMaps::iterator it = _arc_maps.begin(); 
+          it != _arc_maps.end(); ++it) {
+       delete it->second;
+      }
+
+      for (typename Attributes::iterator it = _attributes.begin(); 
+          it != _attributes.end(); ++it) {
+       delete it->second;
+      }
+
+      if (local_is) {
+       delete _is;
+      }
+    }
+
+  private:
+    
+    DigraphReader& operator=(const DigraphReader&);
+
+  public:
+
+    /// \e
+    template <typename Map>
+    DigraphReader& nodeMap(const std::string& caption, Map& map) {
+      _reader_bits::MapStorageBase<Node>* storage = 
+       new _reader_bits::MapStorage<Node, Map>(map);
+      _node_maps.insert(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Map, typename Converter>
+    DigraphReader& nodeMap(const std::string& caption, Map& map, 
+                          const Converter& converter = Converter()) {
+      _reader_bits::MapStorageBase<Node>* storage = 
+       new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
+      _node_maps.insert(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Map>
+    DigraphReader& arcMap(const std::string& caption, Map& map) {
+      _reader_bits::MapStorageBase<Arc>* storage = 
+       new _reader_bits::MapStorage<Arc, Map>(map);
+      _arc_maps.insert(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Map, typename Converter>
+    DigraphReader& arcMap(const std::string& caption, Map& map, 
+                         const Converter& converter = Converter()) {
+      _reader_bits::MapStorageBase<Arc>* storage = 
+       new _reader_bits::MapStorage<Arc, Map, Converter>(map, converter);
+      _arc_maps.insert(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Value>
+    DigraphReader& attribute(const std::string& caption, Value& value) {
+      _reader_bits::ValueStorageBase* storage = 
+       new _reader_bits::ValueStorage<Value>(value);
+      _attributes.insert(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Value, typename Converter>
+    DigraphReader& attribute(const std::string& caption, Value& value, 
+                            const Converter& converter = Converter()) {
+      _reader_bits::ValueStorageBase* storage = 
+       new _reader_bits::ValueStorage<Value, Converter>(value, converter);
+      _attributes.insert(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    DigraphReader& node(const std::string& caption, Node& node) {
+      typedef _reader_bits::MapLookUpConverter<Node> Converter;
+      Converter converter(_node_index);
+      _reader_bits::ValueStorageBase* storage = 
+       new _reader_bits::ValueStorage<Node, Converter>(node, converter);
+      _attributes.insert(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    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;
+    }
+
+    /// \e
+    DigraphReader& nodeSet(const std::string& caption) {
+      _node_set_caption = caption;
+      return *this;
+    }
+
+    /// \e
+    DigraphReader& arcSet(const std::string& caption) {
+      _arc_set_caption = caption;
+      return *this;
+    }
+
+    /// \e
+    DigraphReader& attributes(const std::string& caption) {
+      _attributes_caption = caption;
+      return *this;
+    }
+
+  private:
+    
+
+    static void skipSection(std::istream& is, int& line_num) {
+      enum skip_state_type { skip, after_endl };
+
+      skip_state_type skip_state = after_endl;
+      char c;
+      
+      while ((c = is.get()) != EOF) {
+       if (c == '\n') ++line_num;
+
+       switch (skip_state) {
+       case skip:
+         if (c == '\n') skip_state = after_endl;
+         break;
+       case after_endl:
+         switch (c) {
+         case '@':
+           is.putback(c);
+           return;
+         case '\n':
+           continue;
+         default:
+           if (!isspace(c)) {
+             skip_state = skip;
+           }
+           break;
+         }
+       }       
+      }
+    }
+
+    void readNodeSet(std::istream& is) {
+
+      std::vector<std::string> maps;
+      std::string line;
+
+      {
+       std::getline(is, line);
+        std::istringstream ls(line);
+
+       std::string map;
+       while (ls >> map) {
+         maps.push_back(map);
+
+         typename NodeMaps::iterator it = _node_maps.lower_bound(map);
+         while (it != _node_maps.end() && it->first == map) {
+           it->second->touch();
+           ++it;
+         }
+       }
+
+       for (typename NodeMaps::iterator it = _node_maps.begin(); 
+            it != _node_maps.end(); ++it) {
+         if (!it->second->touched()) {
+           ErrorMessage msg;
+           msg << "Map not found in file: " << it->first;
+           throw IoParameterError(msg.message());
+         }
+       }
+      }
+      
+      while (getline(is, line)) {
+       Node n = _digraph.addNode();
+
+       std::istringstream ls(line);
+       for (int i = 0; i < static_cast<int>(maps.size()); ++i) {
+         std::string token;
+         _reader_bits::readToken(ls, token);
+         
+         typename NodeMaps::iterator it = _node_maps.lower_bound(maps[i]);
+         while (it != _node_maps.end() && it->first == maps[i]) {
+           it->second->set(n, token);
+           ++it;
+         }
+         
+         if (maps[i] == "label") {
+           _node_index[token] = n;
+         }
+       }
+      }
+    }
+
+    void readArcSet(std::istream& is) {
+
+      std::vector<std::string> maps;
+      std::string line;
+
+      {
+       
+       std::getline(is, line);
+        std::istringstream ls(line);
+
+       std::string map;
+       while (ls >> map) {
+         maps.push_back(map);
+
+         typename ArcMaps::iterator it = _arc_maps.lower_bound(map);
+         while (it != _arc_maps.end() && it->first == map) {
+           it->second->touch();
+           ++it;
+         }
+       }
+
+       for (typename ArcMaps::iterator it = _arc_maps.begin(); 
+            it != _arc_maps.end(); ++it) {
+         if (!it->second->touched()) {
+           ErrorMessage msg;
+           msg << "Map not found in file: " << it->first;
+           throw IoParameterError(msg.message());
+         }
+       }
+      }
+      
+      while (getline(is, line)) {
+       std::istringstream ls(line);
+
+       Node s, t;
+       {
+         std::string token;
+         typename NodeIndex::iterator it;
+         
+         _reader_bits::readToken(ls, token);
+         it = _node_index.find(token);
+         if (it == _node_index.end()) {
+           std::ostringstream msg;
+           msg << "Item not found: " << token;
+           throw DataFormatError(msg.str().c_str());
+         }
+         s = it->second;
+
+         _reader_bits::readToken(ls, token);
+         it = _node_index.find(token);
+         if (it == _node_index.end()) {
+           std::ostringstream msg;
+           msg << "Item not found: " << token;
+           throw DataFormatError(msg.str().c_str());
+         }
+         t = it->second;
+       }
+
+       Arc a = _digraph.addArc(s, t);
+
+       for (int i = 0; i < static_cast<int>(maps.size()); ++i) {
+         std::string token;
+         _reader_bits::readToken(ls, token);
+         
+         typename ArcMaps::iterator it = _arc_maps.lower_bound(maps[i]);
+         while (it != _arc_maps.end() && it->first == maps[i]) {
+           it->second->set(a, token);
+           ++it;
+         }
+         
+         if (maps[i] == "label") {
+           _arc_index[token] = a;
+         }
+       }
+      }
+    }
+
+    void readAttributes(std::istream& is) {
+
+      std::vector<std::string> maps;
+      std::string line;
+
+      while (std::getline(is, line)) {
+
+        std::istringstream ls(line);
+
+       std::string attr, token;
+
+       ls >> attr;
+       _reader_bits::readToken(ls, token);
+       
+       typename Attributes::iterator it = _attributes.lower_bound(attr);
+       while (it != _attributes.end() && it->first == attr) {
+         it->second->set(token);
+         it->second->touch();
+         ++it;
+       }
+      }
+      for (typename Attributes::iterator it = _attributes.begin();
+          it != _attributes.end(); ++it) {
+       if (!it->second->touched()) {
+         ErrorMessage msg;
+         msg << "Attribute not found in file: " << it->first;
+         throw IoParameterError(msg.message());
+       }       
+      }
+    }
+
+  public:
+    
+    /// \e
+    void run() {
+      LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
+      
+      bool node_set_done = false;
+      bool arc_set_done = false;
+      bool attributes_done = false;
+      
+      int line_num = 0;
+      std::string line;
+      
+      skipSection(*_is, line_num);
+
+      while (++line_num, getline(*_is, line)) {
+       char buf[2048];
+       _reader_bits::FilterStreamBuf buffer(*_is, line_num);
+       try {
+         buffer.pubsetbuf(buf, sizeof(buf));
+         std::istream fs(&buffer);
+         
+         std::istringstream ls(line);
+         std::string section, caption;
+         ls >> section >> caption;
+
+         if (section == "@nodeset" && !node_set_done) {
+           if (_node_set_caption.empty() || _node_set_caption == caption) {
+             readNodeSet(fs);
+             node_set_done = true;
+           }
+         } else if ((section == "@arcset" || section == "@edgeset") && 
+                    !arc_set_done) {
+           if (_arc_set_caption.empty() || _arc_set_caption == caption) {
+             readArcSet(fs);
+             arc_set_done = true;
+           }
+         } else if (section == "@attributes" && !attributes_done) {
+           if (_attributes_caption.empty() || _attributes_caption == caption) {
+             readAttributes(fs);
+             attributes_done = true;
+           }
+         }
+         
+         skipSection(*_is, line_num);
+       } catch (DataFormatError& error) {
+         error.line(buffer.line_num());
+         throw;
+       }       
+      }        
+
+    }
+    
+  };
+
+  template <typename Digraph>
+  DigraphReader<Digraph> digraphReader(std::istream& is, Digraph& digraph) {
+    return DigraphReader<Digraph>(is, digraph);
+  }
+
+  template <typename Digraph>
+  DigraphReader<Digraph> digraphReader(const std::string& fn, 
+                                      Digraph& digraph) {
+    return DigraphReader<Digraph>(fn, digraph);
+  }
+
+  template <typename Digraph>
+  DigraphReader<Digraph> digraphReader(const char* fn, Digraph& digraph) {
+    return DigraphReader<Digraph>(fn, digraph);
+  }
+}
+
+#endif
diff -r b6bede534255 -r 988226bc5e6c lemon/lgf_writer.h
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/lemon/lgf_writer.h        Thu Apr 10 10:20:00 2008 +0200
@@ -0,0 +1,542 @@
+/* -*- C++ -*-
+ *
+ * This file is a part of LEMON, a generic C++ optimization library
+ *
+ * Copyright (C) 2003-2008
+ * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
+ * (Egervary Research Group on Combinatorial Optimization, EGRES).
+ *
+ * Permission to use, modify and distribute this software is granted
+ * provided that this copyright notice appears in all copies. For
+ * precise terms see the accompanying LICENSE file.
+ *
+ * This software is provided "AS IS" with no warranty of any kind,
+ * express or implied, and with no claim as to its suitability for any
+ * purpose.
+ *
+ */
+
+///\ingroup lemon_io
+///\file
+///\brief Lemon Graph Format writer.
+
+
+#ifndef LEMON_LGF_WRITER_H
+#define LEMON_LGF_WRITER_H
+
+#include <iostream>
+#include <fstream>
+#include <sstream>
+
+#include <vector>
+#include <functional>
+
+#include <lemon/assert.h>
+#include <lemon/graph_utils.h>
+
+namespace lemon {
+
+  namespace _writer_bits {
+
+    template <typename Value>
+    struct DefaultConverter {
+      std::string operator()(const Value& value) {
+       std::ostringstream os;
+       os << value;
+       return os.str();
+      }
+    };
+
+    template <typename _Item>    
+    class MapStorageBase {
+    public:
+      typedef _Item Item;
+
+    public:
+      MapStorageBase() {}
+      virtual ~MapStorageBase() {}
+
+      virtual std::string get(const Item& item) = 0;
+
+    };
+
+    template <typename _Item, typename _Map, 
+             typename _Converter = DefaultConverter<typename _Map::Value> >
+    class MapStorage : public MapStorageBase<_Item> {
+    public:
+      typedef _Map Map;
+      typedef _Converter Converter;
+      typedef _Item Item;
+      
+    private:
+      const Map& _map;
+      Converter _converter;
+
+    public:
+      MapStorage(const Map& map, const Converter& converter = Converter()) 
+       : _map(map), _converter(converter) {}
+      virtual ~MapStorage() {}
+
+      virtual std::string get(const Item& item) {
+       return _converter(_map[item]);
+      }
+    };
+
+    class ValueStorageBase {
+    public:
+      ValueStorageBase() {}
+      virtual ~ValueStorageBase() {}
+
+      virtual std::string get() = 0;
+    };
+
+    template <typename _Value, typename _Converter = DefaultConverter<_Value> >
+    class ValueStorage : public ValueStorageBase {
+    public:
+      typedef _Value Value;
+      typedef _Converter Converter;
+
+    private:
+      const Value& _value;
+      Converter _converter;
+
+    public:
+      ValueStorage(const Value& value, const Converter& converter = Converter())
+       : _value(value), _converter(converter) {}
+
+      virtual std::string get() {
+       return _converter(_value);
+      }
+    };
+
+    template <typename Value>
+    struct MapLookUpConverter {
+      const std::map<Value, std::string>& _map;
+      
+      MapLookUpConverter(const std::map<Value, std::string>& map) 
+       : _map(map) {}
+      
+      std::string operator()(const Value& str) {
+       typename std::map<Value, std::string>::const_iterator it = 
+         _map.find(str);
+       if (it == _map.end()) {
+         std::ostringstream msg;
+         msg << "Item not found";
+         throw DataFormatError("Item not found");
+       }
+       return it->second;
+      }
+    };
+
+    bool isWhiteSpace(char c) {
+      return c == ' ' || c == '\t' || c == '\v' || 
+        c == '\n' || c == '\r' || c == '\f'; 
+    }
+
+    bool isEscaped(char c) {
+      return c == '\\' || c == '\"' || c == '\'' || 
+       c == '\a' || c == '\b';
+    }
+
+    static void writeEscape(std::ostream& os, char c) {
+      switch (c) {
+      case '\\':
+       os << "\\\\";
+       return;
+      case '\"':
+       os << "\\\"";
+       return;
+      case '\a':
+       os << "\\a";
+       return;
+      case '\b':
+       os << "\\b";
+       return;
+      case '\f':
+       os << "\\f";
+       return;
+      case '\r':
+       os << "\\r";
+       return;
+      case '\n':
+       os << "\\n";
+       return;
+      case '\t':
+       os << "\\t";
+       return;
+      case '\v':
+       os << "\\v";
+       return;
+      default:
+       if (c < 0x20) {
+         os << '\\' << std::oct << static_cast<int>(c);
+       } else {
+         os << c;
+       }
+       return;
+      }     
+    }
+
+    bool requireEscape(const std::string& str) {
+      std::istringstream is(str);
+      char c;
+      while (is.get(c)) {
+       if (isWhiteSpace(c) || isEscaped(c)) {
+         return true;
+       }
+      }
+      return false;
+    }
+    
+    std::ostream& writeToken(std::ostream& os, const std::string& str) {
+
+      if (requireEscape(str)) {
+       os << '\"';
+       for (std::string::const_iterator it = str.begin(); 
+            it != str.end(); ++it) {
+         writeEscape(os, *it);
+       }       
+       os << '\"';
+      } else {
+       os << str;
+      }
+      return os;
+    }
+
+  }
+  
+  /// \e
+  template <typename _Digraph>
+  class DigraphWriter {
+  public:
+
+    typedef _Digraph Digraph;
+    GRAPH_TYPEDEFS(typename Digraph);
+    
+  private:
+
+
+    std::ostream* _os;
+    bool local_os;
+
+    Digraph& _digraph;
+
+    std::string _node_set_caption;
+    std::string _arc_set_caption;
+    std::string _attributes_caption;
+    
+    typedef std::map<Node, std::string> NodeIndex;
+    NodeIndex _node_index;
+    typedef std::map<Arc, std::string> ArcIndex;
+    ArcIndex _arc_index;
+
+    typedef std::vector<std::pair<std::string, 
+      _writer_bits::MapStorageBase<Node>* > > NodeMaps;    
+    NodeMaps _node_maps; 
+
+    typedef std::vector<std::pair<std::string, 
+      _writer_bits::MapStorageBase<Arc>* > >ArcMaps;
+    ArcMaps _arc_maps;
+
+    typedef std::vector<std::pair<std::string, 
+      _writer_bits::ValueStorageBase*> > Attributes;
+    Attributes _attributes;
+
+  public:
+
+    /// \e
+    DigraphWriter(std::ostream& is, Digraph& digraph) 
+      : _os(&is), local_os(false), _digraph(digraph) {}
+
+    /// \e
+    DigraphWriter(const std::string& fn, Digraph& digraph) 
+      : _os(new std::ofstream(fn.c_str())), local_os(true), _digraph(digraph) {}
+
+    /// \e
+    DigraphWriter(const char* fn, Digraph& digraph) 
+      : _os(new std::ofstream(fn)), local_os(true), _digraph(digraph) {}
+
+    DigraphWriter(DigraphWriter& other) 
+      : _os(other._os), local_os(other.local_os), _digraph(other._digraph) {
+
+      other.is = 0;
+      other.local_os = false;
+
+      _node_index.swap(other._node_index);
+      _arc_index.swap(other._arc_index);
+
+      _node_maps.swap(other._node_maps);
+      _arc_maps.swap(other._arc_maps);
+      _attributes.swap(other._attributes);
+
+      _node_set_caption = other._node_set_caption;
+      _arc_set_caption = other._arc_set_caption;
+      _attributes_caption = other._attributes_caption;
+    }
+
+    /// \e
+    ~DigraphWriter() {
+      for (typename NodeMaps::iterator it = _node_maps.begin(); 
+          it != _node_maps.end(); ++it) {
+       delete it->second;
+      }
+
+      for (typename ArcMaps::iterator it = _arc_maps.begin(); 
+          it != _arc_maps.end(); ++it) {
+       delete it->second;
+      }
+
+      for (typename Attributes::iterator it = _attributes.begin(); 
+          it != _attributes.end(); ++it) {
+       delete it->second;
+      }
+
+      if (local_os) {
+       delete _os;
+      }
+    }
+
+  private:
+    
+    DigraphWriter& operator=(const DigraphWriter&);
+
+  public:
+
+    /// \e
+    template <typename Map>
+    DigraphWriter& nodeMap(const std::string& caption, const Map& map) {
+      _writer_bits::MapStorageBase<Node>* storage = 
+       new _writer_bits::MapStorage<Node, Map>(map);
+      _node_maps.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Map, typename Converter>
+    DigraphWriter& nodeMap(const std::string& caption, const Map& map, 
+                          const Converter& converter = Converter()) {
+      _writer_bits::MapStorageBase<Node>* storage = 
+       new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
+      _node_maps.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Map>
+    DigraphWriter& arcMap(const std::string& caption, const Map& map) {
+      _writer_bits::MapStorageBase<Arc>* storage = 
+       new _writer_bits::MapStorage<Arc, Map>(map);
+      _arc_maps.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Map, typename Converter>
+    DigraphWriter& arcMap(const std::string& caption, const Map& map, 
+                         const Converter& converter = Converter()) {
+      _writer_bits::MapStorageBase<Arc>* storage = 
+       new _writer_bits::MapStorage<Arc, Map, Converter>(map, converter);
+      _arc_maps.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Value>
+    DigraphWriter& attribute(const std::string& caption, const Value& value) {
+      _writer_bits::ValueStorageBase* storage = 
+       new _writer_bits::ValueStorage<Value>(value);
+      _attributes.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    template <typename Value, typename Converter>
+    DigraphWriter& attribute(const std::string& caption, const Value& value, 
+                            const Converter& converter = Converter()) {
+      _writer_bits::ValueStorageBase* storage = 
+       new _writer_bits::ValueStorage<Value, Converter>(value, converter);
+      _attributes.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    DigraphWriter& node(const std::string& caption, const Node& node) {
+      typedef _writer_bits::MapLookUpConverter<Node> Converter;
+      Converter converter(_node_index);
+      _writer_bits::ValueStorageBase* storage = 
+       new _writer_bits::ValueStorage<Node, Converter>(node, converter);
+      _attributes.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    DigraphWriter& arc(const std::string& caption, const Arc& arc) {
+      typedef _writer_bits::MapLookUpConverter<Arc> Converter;
+      Converter converter(_arc_index);
+      _writer_bits::ValueStorageBase* storage = 
+       new _writer_bits::ValueStorage<Arc, Converter>(arc, converter);
+      _attributes.push_back(std::make_pair(caption, storage));
+      return *this;
+    }
+
+    /// \e
+    DigraphWriter& nodeSet(const std::string& caption) {
+      _node_set_caption = caption;
+      return *this;
+    }
+
+    /// \e
+    DigraphWriter& arcSet(const std::string& caption) {
+      _arc_set_caption = caption;
+      return *this;
+    }
+
+    /// \e
+    DigraphWriter& attributes(const std::string& caption) {
+      _attributes_caption = caption;
+      return *this;
+    }
+
+  private:
+
+    void writeNodeSet() {
+      bool _write_label = true;
+      for (typename NodeMaps::iterator it = _node_maps.begin();
+          it != _node_maps.end(); ++it) {
+        if (it->first == "label") {
+         _write_label = false;
+       }
+      }
+
+      *_os << "@nodeset";
+      if (!_node_set_caption.empty()) {
+       *_os << ' ' << _node_set_caption;
+      }
+      *_os << std::endl;
+
+      if (_write_label) {
+       *_os << "label" << '\t';
+      }
+      for (typename NodeMaps::iterator it = _node_maps.begin();
+          it != _node_maps.end(); ++it) {
+       *_os << it->first << '\t';
+      }
+      *_os << std::endl;
+
+      for (NodeIt n(_digraph); n != INVALID; ++n) {
+       if (_write_label) {
+         std::ostringstream os;
+         os << _digraph.id(n);
+         _writer_bits::writeToken(*_os, os.str());
+         *_os << '\t';
+         _node_index.insert(std::make_pair(n, os.str()));
+       }
+       for (typename NodeMaps::iterator it = _node_maps.begin();
+            it != _node_maps.end(); ++it) {
+         std::string value = it->second->get(n);
+         _writer_bits::writeToken(*_os, value);
+         if (it->first == "label") {
+           _node_index.insert(std::make_pair(n, value));
+         }
+         *_os << '\t';
+       }
+       *_os << std::endl;
+      }
+    }
+
+    void writeArcSet() {
+      bool _write_label = true;
+      for (typename ArcMaps::iterator it = _arc_maps.begin();
+          it != _arc_maps.end(); ++it) {
+        if (it->first == "label") {
+         _write_label = false;
+       }
+      }
+
+      *_os << "@arcset";
+      if (!_arc_set_caption.empty()) {
+       *_os << ' ' << _arc_set_caption;
+      }
+      *_os << std::endl;
+
+      *_os << '\t' << '\t';
+      if (_write_label) {
+       *_os << "label" << '\t';
+      }
+      for (typename ArcMaps::iterator it = _arc_maps.begin();
+          it != _arc_maps.end(); ++it) {
+       *_os << it->first << '\t';
+      }
+      *_os << std::endl;
+
+      for (ArcIt a(_digraph); a != INVALID; ++a) {
+       _writer_bits::writeToken(*_os, _node_index.
+                                find(_digraph.source(a))->second);
+       *_os << '\t';
+       _writer_bits::writeToken(*_os, _node_index.
+                                find(_digraph.target(a))->second);
+       *_os << '\t';
+       if (_write_label) {
+         std::ostringstream os;
+         os << _digraph.id(a);
+         _writer_bits::writeToken(*_os, os.str());
+         *_os << '\t';
+         _arc_index.insert(std::make_pair(a, os.str()));
+       }
+       for (typename ArcMaps::iterator it = _arc_maps.begin();
+            it != _arc_maps.end(); ++it) {
+         std::string value = it->second->get(a);
+         _writer_bits::writeToken(*_os, value);
+         if (it->first == "label") {
+           _arc_index.insert(std::make_pair(a, value));
+         }
+         *_os << '\t';
+       }
+       *_os << std::endl;
+      }
+    }
+
+    void writeAttributes() {
+      if (_attributes.empty()) return;
+      *_os << "@attributes";
+      if (!_attributes_caption.empty()) {
+       *_os << ' ' << _attributes_caption;
+      }
+      *_os << std::endl;
+      for (typename Attributes::iterator it = _attributes.begin();
+          it != _attributes.end(); ++it) {
+       *_os << it->first << ' ';
+       _writer_bits::writeToken(*_os, it->second->get());
+       *_os << std::endl;
+      }
+    }
+    
+  public:
+    
+    /// \e
+    void run() {
+      writeNodeSet();
+      writeArcSet();
+      writeAttributes();
+    }
+    
+  };
+
+  template <typename Digraph>
+  DigraphWriter<Digraph> digraphWriter(std::istream& is, Digraph& digraph) {
+    return DigraphWriter<Digraph>(is, digraph);
+  }
+
+  template <typename Digraph>
+  DigraphWriter<Digraph> digraphWriter(const std::string& fn, 
+                                      Digraph& digraph) {
+    return DigraphWriter<Digraph>(fn, digraph);
+  }
+
+  template <typename Digraph>
+  DigraphWriter<Digraph> digraphWriter(const char* fn, Digraph& digraph) {
+    return DigraphWriter<Digraph>(fn, digraph);
+  }
+}
+
+#endif
# HG changeset patch
# User Balazs Dezso <deba@inf.elte.hu>
# Date 1207839002 -7200
# Node ID 7174a0d8102dd0ea4c5c84b78bcd75433d839375
# Parent  988226bc5e6c092db643ebcb020e0a9e38f08dd0
Several changes in lgf IO

- Manual handling comments and section delimiters instead of FilterStreamBuf
- Renaming nodeset and arcset
- Reading full line in attributes

diff -r 988226bc5e6c -r 7174a0d8102d lemon/lgf_reader.h
--- a/lemon/lgf_reader.h        Thu Apr 10 10:20:00 2008 +0200
+++ b/lemon/lgf_reader.h        Thu Apr 10 16:50:02 2008 +0200
@@ -134,160 +134,22 @@ namespace lemon {
       }
     };
 
-
-    class FilterStreamBuf : public std::streambuf {
-    public:
-
-      typedef std::streambuf Parent;
-      typedef Parent::char_type char_type;
-      FilterStreamBuf(std::istream& is, int& num) 
-       : _is(is), _base(0), _eptr(0), 
-         _num(num), skip_state(after_endl) {}
-
-    protected:
-
-      enum skip_state_type {
-       no_skip,
-       after_endl,
-       comment_line
-      };
-
-      char_type small_buf[1];
-
-
-      std::istream& _is;
-
-      char_type* _base;
-      char_type* _eptr;
-
-      int& _num;
-
-      skip_state_type skip_state;
-
-
-      char_type* base() { return _base; }
-      char_type* eptr() { return _eptr; }
-      int_type blen() { return _eptr - _base; }
-
-      void setb(char_type* buf, int_type len) {
-       _base = buf;
-       _eptr = buf + len;
-      }
-  
-      virtual std::streambuf* setbuf(char *buf, std::streamsize len) {
-       if (base()) return 0;
-       if (buf != 0 && len >= int(sizeof(small_buf))) {
-         setb(buf, len);
-       } else {
-         setb(small_buf, sizeof(small_buf));
-       }
-       setg(0, 0, 0);
-       return this;
-      }
-
-      bool put_char(char c) {
-       switch (skip_state) {
-       case no_skip:
-         switch (c) {
-         case '\n': 
-           skip_state = after_endl;
-           return true;
-         default:
-           return true;
-         }
-       case after_endl:
-         switch (c) {
-         case '@':
-           return false;
-         case '\n': 
-           return false;
-         case '#':
-           skip_state = comment_line;
-           return false;
-         default:
-           if (!isspace(c)) {
-             skip_state = no_skip;
-             return true;
-           } else {
-             return false;
-           }
-         }
-         break;
-       case comment_line:
-         switch (c) {
-         case '\n': 
-           skip_state = after_endl;
-           return false;
-         default:
-           return false;
-         }
-       }
-       return false;
-      }
-
-      virtual int_type underflow() {
-       char c;
-       if ((c = _is.peek()) != EOF) {
-         if (c == '@') {
-           return EOF;
-         }
-       } else {
-         return EOF;
-       }
-       char_type *ptr;
-       for (ptr = base(); ptr != eptr(); ++ptr) {
-         if ((c = _is.get()) != EOF) {
-           if (c == '\n') ++_num;
-           if (put_char(c)) {
-             *ptr = c;
-           } else {
-             if (skip_state == after_endl && c == '@') {
-               _is.putback(c);
-               break;
-             }
-             --ptr;
-           }
-         } else {
-           break;
-         }
-       }
-       setg(base(), base(), ptr);
-       return *base();
-      }
-
-      virtual int_type sync() {
-       return EOF;
-      }
-
-    public:
-
-      int line_num() const {
-       int r = _num;
-       for (char_type* p = gptr(); p != egptr(); ++p) {
-         if (*p == '\n') --r;
-       }
-       return r;
-      }
-
-    };
-
     template <typename Value>
     struct MapLookUpConverter {
       const std::map<std::string, Value>& _map;
-      
-      MapLookUpConverter(const std::map<std::string, Value>& map) 
-       : _map(map) {}
-      
+
+      MapLookUpConverter(const std::map<std::string, Value>& map)
+        : _map(map) {}
+
       Value operator()(const std::string& str) {
-       typename std::map<std::string, Value>::const_iterator it = 
-         _map.find(str);
-
-       if (it == _map.end()) {
-         std::ostringstream msg;
-         msg << "Item not found: " << str;
-         throw DataFormatError(msg.str().c_str());
-       }
-       return it->second;
+        typename std::map<std::string, Value>::const_iterator it =
+          _map.find(str);
+        if (it == _map.end()) {
+          std::ostringstream msg;
+          msg << "Item not found: " << str;
+          throw DataFormatError(msg.str().c_str());
+        }
+        return it->second;
       }
     };
 
@@ -369,8 +231,7 @@ namespace lemon {
        }             
       } 
     }
-
-
+    
     std::istream& readToken(std::istream& is, std::string& str) {
       std::ostringstream os;
 
@@ -396,7 +257,7 @@ namespace lemon {
          os << c;
        }
        if (!is) {
-         is.setstate(std::ios_base::goodbit);
+         is.clear();
        } else {
          is.putback(c);
        }
@@ -423,8 +284,8 @@ namespace lemon {
 
     Digraph& _digraph;
 
-    std::string _node_set_caption;
-    std::string _arc_set_caption;
+    std::string _nodes_caption;
+    std::string _arcs_caption;
     std::string _attributes_caption;
 
     typedef std::map<std::string, Node> NodeIndex;
@@ -443,6 +304,9 @@ namespace lemon {
     typedef std::multimap<std::string, _reader_bits::ValueStorageBase*> 
       Attributes;
     Attributes _attributes;
+
+    int line_num;
+    std::istringstream line;
 
   public:
 
@@ -471,8 +335,8 @@ namespace lemon {
       _arc_maps.swap(other._arc_maps);
       _attributes.swap(other._attributes);
 
-      _node_set_caption = other._node_set_caption;
-      _arc_set_caption = other._arc_set_caption;
+      _nodes_caption = other._nodes_caption;
+      _arcs_caption = other._arcs_caption;
       _attributes_caption = other._attributes_caption;
     }
 
@@ -582,14 +446,14 @@ namespace lemon {
     }
 
     /// \e
-    DigraphReader& nodeSet(const std::string& caption) {
-      _node_set_caption = caption;
+    DigraphReader& nodes(const std::string& caption) {
+      _nodes_caption = caption;
       return *this;
     }
 
     /// \e
-    DigraphReader& arcSet(const std::string& caption) {
-      _arc_set_caption = caption;
+    DigraphReader& arcs(const std::string& caption) {
+      _arcs_caption = caption;
       return *this;
     }
 
@@ -600,49 +464,39 @@ namespace lemon {
     }
 
   private:
-    
 
-    static void skipSection(std::istream& is, int& line_num) {
-      enum skip_state_type { skip, after_endl };
-
-      skip_state_type skip_state = after_endl;
-      char c;
-      
-      while ((c = is.get()) != EOF) {
-       if (c == '\n') ++line_num;
-
-       switch (skip_state) {
-       case skip:
-         if (c == '\n') skip_state = after_endl;
-         break;
-       case after_endl:
-         switch (c) {
-         case '@':
-           is.putback(c);
-           return;
-         case '\n':
-           continue;
-         default:
-           if (!isspace(c)) {
-             skip_state = skip;
-           }
-           break;
-         }
-       }       
+    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;
     }
 
-    void readNodeSet(std::istream& is) {
+    bool readSuccess() {
+      return static_cast<bool>(*_is);
+    }
+    
+    void skipSection() {
+      char c;
+      while (readSuccess() && line >> std::ws >> c && c != '@') {
+       readLine();
+      }
+      line.putback(c);
+    }
+
+    void readNodes() {
 
       std::vector<std::string> maps;
-      std::string line;
 
-      {
-       std::getline(is, line);
-        std::istringstream ls(line);
-
+      if (readLine()) {
        std::string map;
-       while (ls >> map) {
+       while (line >> map) {
          maps.push_back(map);
 
          typename NodeMaps::iterator it = _node_maps.lower_bound(map);
@@ -661,14 +515,15 @@ namespace lemon {
          }
        }
       }
-      
-      while (getline(is, line)) {
+
+      char c;
+      while (readLine() && line >> c && c != '@') {
+       line.putback(c);
        Node n = _digraph.addNode();
 
-       std::istringstream ls(line);
        for (int i = 0; i < static_cast<int>(maps.size()); ++i) {
          std::string token;
-         _reader_bits::readToken(ls, token);
+         _reader_bits::readToken(line, token);
          
          typename NodeMaps::iterator it = _node_maps.lower_bound(maps[i]);
          while (it != _node_maps.end() && it->first == maps[i]) {
@@ -681,20 +536,18 @@ namespace lemon {
          }
        }
       }
+      if (readSuccess()) {
+       line.putback(c);
+      }
     }
 
-    void readArcSet(std::istream& is) {
+    void readArcs() {
 
       std::vector<std::string> maps;
-      std::string line;
-
-      {
-       
-       std::getline(is, line);
-        std::istringstream ls(line);
-
+      
+      if (readLine()) {        
        std::string map;
-       while (ls >> map) {
+       while (line >> map) {
          maps.push_back(map);
 
          typename ArcMaps::iterator it = _arc_maps.lower_bound(map);
@@ -714,15 +567,16 @@ namespace lemon {
        }
       }
       
-      while (getline(is, line)) {
-       std::istringstream ls(line);
+      char c;
+      while (readLine() && line >> c && c != '@') {
+       line.putback(c);
 
        Node s, t;
        {
          std::string token;
          typename NodeIndex::iterator it;
          
-         _reader_bits::readToken(ls, token);
+         _reader_bits::readToken(line, token);
          it = _node_index.find(token);
          if (it == _node_index.end()) {
            std::ostringstream msg;
@@ -731,7 +585,7 @@ namespace lemon {
          }
          s = it->second;
 
-         _reader_bits::readToken(ls, token);
+         _reader_bits::readToken(line, token);
          it = _node_index.find(token);
          if (it == _node_index.end()) {
            std::ostringstream msg;
@@ -745,7 +599,7 @@ namespace lemon {
 
        for (int i = 0; i < static_cast<int>(maps.size()); ++i) {
          std::string token;
-         _reader_bits::readToken(ls, token);
+         _reader_bits::readToken(line, token);
          
          typename ArcMaps::iterator it = _arc_maps.lower_bound(maps[i]);
          while (it != _arc_maps.end() && it->first == maps[i]) {
@@ -758,21 +612,22 @@ namespace lemon {
          }
        }
       }
+      if (readSuccess()) {
+       line.putback(c);
+      }
     }
 
-    void readAttributes(std::istream& is) {
+    void readAttributes() {
 
       std::vector<std::string> maps;
-      std::string line;
 
-      while (std::getline(is, line)) {
-
-        std::istringstream ls(line);
-
+      char c;
+      while (readLine() && line >> c && c != '@') {
+       line.putback(c);
+       
        std::string attr, token;
-
-       ls >> attr;
-       _reader_bits::readToken(ls, token);
+       line >> attr;
+       std::getline(line >> std::ws, token);
        
        typename Attributes::iterator it = _attributes.lower_bound(attr);
        while (it != _attributes.end() && it->first == attr) {
@@ -780,6 +635,9 @@ namespace lemon {
          it->second->touch();
          ++it;
        }
+      }
+      if (readSuccess()) {
+       line.putback(c);
       }
       for (typename Attributes::iterator it = _attributes.begin();
           it != _attributes.end(); ++it) {
@@ -797,47 +655,39 @@ namespace lemon {
     void run() {
       LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
       
-      bool node_set_done = false;
-      bool arc_set_done = false;
+      bool nodes_done = false;
+      bool arcs_done = false;
       bool attributes_done = false;
       
-      int line_num = 0;
-      std::string line;
-      
-      skipSection(*_is, line_num);
+      readLine();
 
-      while (++line_num, getline(*_is, line)) {
-       char buf[2048];
-       _reader_bits::FilterStreamBuf buffer(*_is, line_num);
+      while (readSuccess()) {
+       skipSection();
        try {
-         buffer.pubsetbuf(buf, sizeof(buf));
-         std::istream fs(&buffer);
-         
-         std::istringstream ls(line);
          std::string section, caption;
-         ls >> section >> caption;
+         line >> section >> caption;
 
-         if (section == "@nodeset" && !node_set_done) {
-           if (_node_set_caption.empty() || _node_set_caption == caption) {
-             readNodeSet(fs);
-             node_set_done = true;
+         if (section == "@nodes" && !nodes_done) {
+           if (_nodes_caption.empty() || _nodes_caption == caption) {
+             readNodes();
+             nodes_done = true;
            }
-         } else if ((section == "@arcset" || section == "@edgeset") && 
-                    !arc_set_done) {
-           if (_arc_set_caption.empty() || _arc_set_caption == caption) {
-             readArcSet(fs);
-             arc_set_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(fs);
+             readAttributes();
              attributes_done = true;
            }
          }
          
-         skipSection(*_is, line_num);
+         skipSection();
        } catch (DataFormatError& error) {
-         error.line(buffer.line_num());
+         error.line(line_num);
          throw;
        }       
       }        
diff -r 988226bc5e6c -r 7174a0d8102d lemon/lgf_writer.h
--- a/lemon/lgf_writer.h        Thu Apr 10 10:20:00 2008 +0200
+++ b/lemon/lgf_writer.h        Thu Apr 10 16:50:02 2008 +0200
@@ -120,8 +120,6 @@ namespace lemon {
        typename std::map<Value, std::string>::const_iterator it = 
          _map.find(str);
        if (it == _map.end()) {
-         std::ostringstream msg;
-         msg << "Item not found";
          throw DataFormatError("Item not found");
        }
        return it->second;
@@ -221,8 +219,8 @@ namespace lemon {
 
     Digraph& _digraph;
 
-    std::string _node_set_caption;
-    std::string _arc_set_caption;
+    std::string _nodes_caption;
+    std::string _arcs_caption;
     std::string _attributes_caption;
     
     typedef std::map<Node, std::string> NodeIndex;
@@ -269,8 +267,8 @@ namespace lemon {
       _arc_maps.swap(other._arc_maps);
       _attributes.swap(other._attributes);
 
-      _node_set_caption = other._node_set_caption;
-      _arc_set_caption = other._arc_set_caption;
+      _nodes_caption = other._nodes_caption;
+      _arcs_caption = other._arcs_caption;
       _attributes_caption = other._attributes_caption;
     }
 
@@ -380,14 +378,14 @@ namespace lemon {
     }
 
     /// \e
-    DigraphWriter& nodeSet(const std::string& caption) {
-      _node_set_caption = caption;
+    DigraphWriter& nodes(const std::string& caption) {
+      _nodes_caption = caption;
       return *this;
     }
 
     /// \e
-    DigraphWriter& arcSet(const std::string& caption) {
-      _arc_set_caption = caption;
+    DigraphWriter& arcs(const std::string& caption) {
+      _arcs_caption = caption;
       return *this;
     }
 
@@ -399,7 +397,7 @@ namespace lemon {
 
   private:
 
-    void writeNodeSet() {
+    void writeNodes() {
       bool _write_label = true;
       for (typename NodeMaps::iterator it = _node_maps.begin();
           it != _node_maps.end(); ++it) {
@@ -408,9 +406,9 @@ namespace lemon {
        }
       }
 
-      *_os << "@nodeset";
-      if (!_node_set_caption.empty()) {
-       *_os << ' ' << _node_set_caption;
+      *_os << "@nodes";
+      if (!_nodes_caption.empty()) {
+       *_os << ' ' << _nodes_caption;
       }
       *_os << std::endl;
 
@@ -444,7 +442,7 @@ namespace lemon {
       }
     }
 
-    void writeArcSet() {
+    void writeArcs() {
       bool _write_label = true;
       for (typename ArcMaps::iterator it = _arc_maps.begin();
           it != _arc_maps.end(); ++it) {
@@ -453,9 +451,9 @@ namespace lemon {
        }
       }
 
-      *_os << "@arcset";
-      if (!_arc_set_caption.empty()) {
-       *_os << ' ' << _arc_set_caption;
+      *_os << "@arcs";
+      if (!_arcs_caption.empty()) {
+       *_os << ' ' << _arcs_caption;
       }
       *_os << std::endl;
 
@@ -515,8 +513,8 @@ namespace lemon {
     
     /// \e
     void run() {
-      writeNodeSet();
-      writeArcSet();
+      writeNodes();
+      writeArcs();
       writeAttributes();
     }
     
# HG changeset patch
# User Balazs Dezso <deba@inf.elte.hu>
# Date 1207906639 -7200
# Node ID 80086ce5c586577faaa0dba778d0ecbd4c5450ad
# Parent  7174a0d8102dd0ea4c5c84b78bcd75433d839375
Several improvments in lgf IO
- More format checking code
- Better node and arc map reading
- Sorting arcs and nodes by label on writing

diff -r 7174a0d8102d -r 80086ce5c586 lemon/lgf_reader.h
--- a/lemon/lgf_reader.h        Thu Apr 10 16:50:02 2008 +0200
+++ b/lemon/lgf_reader.h        Fri Apr 11 11:37:19 2008 +0200
@@ -484,7 +484,7 @@ namespace lemon {
     
     void skipSection() {
       char c;
-      while (readSuccess() && line >> std::ws >> c && c != '@') {
+      while (readSuccess() && line >> c && c != '@') {
        readLine();
       }
       line.putback(c);
@@ -492,26 +492,39 @@ namespace lemon {
 
     void readNodes() {
 
-      std::vector<std::string> maps;
+      std::vector<std::vector<_reader_bits::MapStorageBase<Node>*> > maps;
+      int label = -1;
 
       if (readLine()) {
        std::string map;
        while (line >> map) {
-         maps.push_back(map);
+
+         if (map == "label") {
+           label = maps.size();
+         }
+
+         maps.push_back(std::vector<_reader_bits::MapStorageBase<Node>*>());
 
          typename NodeMaps::iterator it = _node_maps.lower_bound(map);
          while (it != _node_maps.end() && it->first == map) {
+           if (it->second->touched()) {
+             std::ostringstream msg;
+             msg << "Multiple occurence of node map " << map;
+             throw DataFormatError(msg.str().c_str());
+           }
+           maps.back().push_back(it->second);
            it->second->touch();
            ++it;
          }
+
        }
 
        for (typename NodeMaps::iterator it = _node_maps.begin(); 
             it != _node_maps.end(); ++it) {
          if (!it->second->touched()) {
-           ErrorMessage msg;
+           std::ostringstream msg;
            msg << "Map not found in file: " << it->first;
-           throw IoParameterError(msg.message());
+           throw IoParameterError(msg.str().c_str());
          }
        }
       }
@@ -524,16 +537,19 @@ namespace lemon {
        for (int i = 0; i < static_cast<int>(maps.size()); ++i) {
          std::string token;
          _reader_bits::readToken(line, token);
-         
-         typename NodeMaps::iterator it = _node_maps.lower_bound(maps[i]);
-         while (it != _node_maps.end() && it->first == maps[i]) {
-           it->second->set(n, token);
-           ++it;
+
+         for (int j = 0; j < static_cast<int>(maps[i].size()); ++j) {
+           maps[i][j]->set(n, token);
          }
          
-         if (maps[i] == "label") {
-           _node_index[token] = n;
+         if (label == i) {
+           _node_index.insert(std::make_pair(token, n));
          }
+
+       }
+
+       if (line >> std::ws >> c) {
+         throw DataFormatError("Extra character on the end of line");
        }
       }
       if (readSuccess()) {
@@ -543,15 +559,27 @@ namespace lemon {
 
     void readArcs() {
 
-      std::vector<std::string> maps;
-      
-      if (readLine()) {        
+      std::vector<std::vector<_reader_bits::MapStorageBase<Arc>*> > maps;
+      int label = -1;
+
+      if (readLine()) {
        std::string map;
        while (line >> map) {
-         maps.push_back(map);
+
+         if (map == "label") {
+           label = maps.size();
+         }
+
+         maps.push_back(std::vector<_reader_bits::MapStorageBase<Arc>*>());
 
          typename ArcMaps::iterator it = _arc_maps.lower_bound(map);
          while (it != _arc_maps.end() && it->first == map) {
+           if (it->second->touched()) {
+             std::ostringstream msg;
+             msg << "Multiple occurence of arc map " << map;
+             throw DataFormatError(msg.str().c_str());
+           }
+           maps.back().push_back(it->second);
            it->second->touch();
            ++it;
          }
@@ -560,9 +588,9 @@ namespace lemon {
        for (typename ArcMaps::iterator it = _arc_maps.begin(); 
             it != _arc_maps.end(); ++it) {
          if (!it->second->touched()) {
-           ErrorMessage msg;
+           std::ostringstream msg;
            msg << "Map not found in file: " << it->first;
-           throw IoParameterError(msg.message());
+           throw IoParameterError(msg.str().c_str());
          }
        }
       }
@@ -600,16 +628,19 @@ namespace lemon {
        for (int i = 0; i < static_cast<int>(maps.size()); ++i) {
          std::string token;
          _reader_bits::readToken(line, token);
-         
-         typename ArcMaps::iterator it = _arc_maps.lower_bound(maps[i]);
-         while (it != _arc_maps.end() && it->first == maps[i]) {
-           it->second->set(a, token);
-           ++it;
+                 
+         for (int j = 0; j < static_cast<int>(maps[i].size()); ++j) {
+           maps[i][j]->set(a, token);
+         }
+
+         if (label == i) {
+           _arc_index.insert(std::make_pair(token, a));
          }
          
-         if (maps[i] == "label") {
-           _arc_index[token] = a;
-         }
+       }
+
+       if (line >> std::ws >> c) {
+         throw DataFormatError("Extra character on the end of line");
        }
       }
       if (readSuccess()) {
@@ -631,6 +662,11 @@ namespace lemon {
        
        typename Attributes::iterator it = _attributes.lower_bound(attr);
        while (it != _attributes.end() && it->first == attr) {
+         if (it->second->touched()) {
+           std::ostringstream msg;
+           msg << "Multiple occurence of attribute " << attr;
+           throw DataFormatError(msg.str().c_str());
+         }
          it->second->set(token);
          it->second->touch();
          ++it;
@@ -642,9 +678,9 @@ namespace lemon {
       for (typename Attributes::iterator it = _attributes.begin();
           it != _attributes.end(); ++it) {
        if (!it->second->touched()) {
-         ErrorMessage msg;
+         std::ostringstream msg;
          msg << "Attribute not found in file: " << it->first;
-         throw IoParameterError(msg.message());
+         throw IoParameterError(msg.str().c_str());
        }       
       }
     }
@@ -690,7 +726,19 @@ namespace lemon {
          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");
+      }
 
     }
     
diff -r 7174a0d8102d -r 80086ce5c586 lemon/lgf_writer.h
--- a/lemon/lgf_writer.h        Thu Apr 10 16:50:02 2008 +0200
+++ b/lemon/lgf_writer.h        Fri Apr 11 11:37:19 2008 +0200
@@ -28,6 +28,8 @@
 #include <fstream>
 #include <sstream>
 
+#include <algorithm>
+
 #include <vector>
 #include <functional>
 
@@ -47,6 +49,28 @@ namespace lemon {
       }
     };
 
+    template <typename T>
+    bool operator<(const T&, const T&) {
+      throw DataFormatError("Label map is not comparable");
+    }
+
+    template <typename _Map>
+    class MapLess {
+    public:
+      typedef _Map Map;
+      typedef typename Map::Key Item;
+
+    private:
+      const Map& _map;
+      
+    public:
+      MapLess(const Map& map) : _map(map) {}
+
+      bool operator()(const Item& left, const Item& right) {
+       return _map[left] < _map[right];
+      }
+    };
+
     template <typename _Item>    
     class MapStorageBase {
     public:
@@ -57,7 +81,7 @@ namespace lemon {
       virtual ~MapStorageBase() {}
 
       virtual std::string get(const Item& item) = 0;
-
+      virtual void sort(std::vector<Item>&) = 0;
     };
 
     template <typename _Item, typename _Map, 
@@ -80,6 +104,10 @@ namespace lemon {
       virtual std::string get(const Item& item) {
        return _converter(_map[item]);
       }
+      virtual void sort(std::vector<Item>& items) {
+       MapLess<Map> less(_map);
+       std::sort(items.begin(), items.end(), less);
+      }
     };
 
     class ValueStorageBase {
@@ -87,7 +115,7 @@ namespace lemon {
       ValueStorageBase() {}
       virtual ~ValueStorageBase() {}
 
-      virtual std::string get() = 0;
+      virtual std::string get() = 0;      
     };
 
     template <typename _Value, typename _Converter = DefaultConverter<_Value> >
@@ -398,11 +426,12 @@ namespace lemon {
   private:
 
     void writeNodes() {
-      bool _write_label = true;
+      _writer_bits::MapStorageBase<Node>* label = 0;
       for (typename NodeMaps::iterator it = _node_maps.begin();
           it != _node_maps.end(); ++it) {
         if (it->first == "label") {
-         _write_label = false;
+         label = it->second;
+         break;
        }
       }
 
@@ -412,7 +441,7 @@ namespace lemon {
       }
       *_os << std::endl;
 
-      if (_write_label) {
+      if (label == 0) {
        *_os << "label" << '\t';
       }
       for (typename NodeMaps::iterator it = _node_maps.begin();
@@ -421,8 +450,22 @@ namespace lemon {
       }
       *_os << std::endl;
 
+      std::vector<Node> nodes;
       for (NodeIt n(_digraph); n != INVALID; ++n) {
-       if (_write_label) {
+       nodes.push_back(n);
+      }
+      
+      if (label == 0) {
+       IdMap<Digraph, Node> id_map(_digraph);
+       _writer_bits::MapLess<IdMap<Digraph, Node> > id_less(id_map);
+       std::sort(nodes.begin(), nodes.end(), id_less);
+      } else {
+       label->sort(nodes);
+      }
+
+      for (int i = 0; i < static_cast<int>(nodes.size()); ++i) {
+       Node n = nodes[i];
+       if (label == 0) {
          std::ostringstream os;
          os << _digraph.id(n);
          _writer_bits::writeToken(*_os, os.str());
@@ -443,11 +486,12 @@ namespace lemon {
     }
 
     void writeArcs() {
-      bool _write_label = true;
+      _writer_bits::MapStorageBase<Arc>* label = 0;
       for (typename ArcMaps::iterator it = _arc_maps.begin();
           it != _arc_maps.end(); ++it) {
         if (it->first == "label") {
-         _write_label = false;
+         label = it->second;
+         break;
        }
       }
 
@@ -458,7 +502,7 @@ namespace lemon {
       *_os << std::endl;
 
       *_os << '\t' << '\t';
-      if (_write_label) {
+      if (label == 0) {
        *_os << "label" << '\t';
       }
       for (typename ArcMaps::iterator it = _arc_maps.begin();
@@ -467,14 +511,28 @@ namespace lemon {
       }
       *_os << std::endl;
 
-      for (ArcIt a(_digraph); a != INVALID; ++a) {
+      std::vector<Arc> arcs;
+      for (ArcIt n(_digraph); n != INVALID; ++n) {
+       arcs.push_back(n);
+      }
+      
+      if (label == 0) {
+       IdMap<Digraph, Arc> id_map(_digraph);
+       _writer_bits::MapLess<IdMap<Digraph, Arc> > id_less(id_map);
+       std::sort(arcs.begin(), arcs.end(), id_less);
+      } else {
+       label->sort(arcs);
+      }
+
+      for (int i = 0; i < static_cast<int>(arcs.size()); ++i) {
+       Arc a = arcs[i];
        _writer_bits::writeToken(*_os, _node_index.
                                 find(_digraph.source(a))->second);
        *_os << '\t';
        _writer_bits::writeToken(*_os, _node_index.
                                 find(_digraph.target(a))->second);
        *_os << '\t';
-       if (_write_label) {
+       if (label == 0) {
          std::ostringstream os;
          os << _digraph.id(a);
          _writer_bits::writeToken(*_os, os.str());
# HG changeset patch
# User Balazs Dezso <deba@inf.elte.hu>
# Date 1207908422 -7200
# Node ID 676fb304b549e57446844f189efcdffd3f78bffa
# Parent  80086ce5c586577faaa0dba778d0ecbd4c5450ad
Bug fix with attributes

diff -r 80086ce5c586 -r 676fb304b549 demo/lgf_demo.cc
--- a/demo/lgf_demo.cc  Fri Apr 11 11:37:19 2008 +0200
+++ b/demo/lgf_demo.cc  Fri Apr 11 12:07:02 2008 +0200
@@ -47,6 +47,7 @@ int main(int argc, const char *argv[]) {
     typedef Digraph::Arc Arc;
     typedef Digraph::ArcIt ArcIt;
 
+    typedef Digraph::NodeMap<int> PotentialMap;
     typedef Digraph::ArcMap<int> CapacityMap;
     typedef Digraph::ArcMap<std::string> NameMap;
 
@@ -55,14 +56,18 @@ int main(int argc, const char *argv[]) {
     const int m = argc > 3 ? std::atoi(argv[3]) : 100;
 
     Digraph digraph;
+    PotentialMap potential(digraph);
     CapacityMap capacity(digraph);
     NameMap name(digraph);
 
     std::vector<Node> nodes;
+    for (int i = 0; i < n; ++i) {
+      Node node = digraph.addNode();
+      potential[node] = rnd[m];
+      nodes.push_back(node);
+    }
 
-    for (int i = 0; i < n; ++i) {
-      nodes.push_back(digraph.addNode());
-    }
+    std::vector<Arc> arcs;
     for (int i = 0; i < e; ++i) {
       int s = rnd[n];
       int t = rnd[n];
@@ -72,14 +77,18 @@ int main(int argc, const char *argv[]) {
       std::ostringstream os;
       os << "arc \t" << i << std::endl;
       name[arc] = os.str();
+      arcs.push_back(arc);
     }
 
 
     DigraphWriter<Digraph>(ss, digraph).
+      nodeMap("potential", potential).
       arcMap("capacity", capacity).
       arcMap("name", name).
       node("source", nodes[0]).
       node("target", nodes[1]).
+      arc("bottleneck", arcs[e / 2]).
+      attribute("creator", "lemon library").
       run();
 
   } catch (DataFormatError& error) {
@@ -93,27 +102,38 @@ int main(int argc, const char *argv[]) {
     typedef Digraph::Arc Arc;
     typedef Digraph::ArcIt ArcIt;
 
+    typedef Digraph::NodeMap<int> PotentialMap;
     typedef Digraph::ArcMap<int> CapacityMap;
     typedef Digraph::ArcMap<std::string> NameMap;
 
     Digraph digraph;
+    PotentialMap potential(digraph);
     CapacityMap capacity(digraph);
     NameMap name(digraph);
 
     Node s, t;
+    Arc a;
+    
+    std::string creator;
 
     DigraphReader<Digraph>(ss, digraph).
+      nodeMap("potential", potential).
       arcMap("capacity", capacity).
       arcMap("name", name).
       node("source", s).
       node("target", t).
+      arc("bottleneck", a).
+      attribute("creator", creator).
       run();
 
     DigraphWriter<Digraph>(std::cout, digraph).
+      nodeMap("potential", potential).
       arcMap("capacity", capacity).
       arcMap("name", name).
       node("source", s).
       node("target", t).
+      arc("bottleneck", a).
+      attribute("creator", creator).
       run();
 
   } catch (DataFormatError& error) {
diff -r 80086ce5c586 -r 676fb304b549 lemon/lgf_reader.h
--- a/lemon/lgf_reader.h        Fri Apr 11 11:37:19 2008 +0200
+++ b/lemon/lgf_reader.h        Fri Apr 11 12:07:02 2008 +0200
@@ -658,7 +658,10 @@ namespace lemon {
        
        std::string attr, token;
        line >> attr;
-       std::getline(line >> std::ws, token);
+       _reader_bits::readToken(line, token);
+       if (line >> c) {
+         throw DataFormatError("Extra character on the end of line");    
+       }
        
        typename Attributes::iterator it = _attributes.lower_bound(attr);
        while (it != _attributes.end() && it->first == attr) {
# HG changeset patch
# User Balazs Dezso <deba@inf.elte.hu>
# Date 1207924771 -7200
# Node ID b553a184f119055b4e6c4e8462363fc461fa5f1c
# Parent  676fb304b549e57446844f189efcdffd3f78bffa
Checking map concepts

diff -r 676fb304b549 -r b553a184f119 lemon/lgf_reader.h
--- a/lemon/lgf_reader.h        Fri Apr 11 12:07:02 2008 +0200
+++ b/lemon/lgf_reader.h        Fri Apr 11 16:39:31 2008 +0200
@@ -33,6 +33,9 @@
 
 #include <lemon/assert.h>
 #include <lemon/graph_utils.h>
+
+#include <lemon/concept_check.h>
+#include <lemon/concepts/maps.h>
 
 namespace lemon {
 
@@ -371,6 +374,7 @@ namespace lemon {
     /// \e
     template <typename Map>
     DigraphReader& nodeMap(const std::string& caption, Map& map) {
+      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
       _reader_bits::MapStorageBase<Node>* storage = 
        new _reader_bits::MapStorage<Node, Map>(map);
       _node_maps.insert(std::make_pair(caption, storage));
@@ -381,6 +385,7 @@ namespace lemon {
     template <typename Map, typename Converter>
     DigraphReader& nodeMap(const std::string& caption, Map& map, 
                           const Converter& converter = Converter()) {
+      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
       _reader_bits::MapStorageBase<Node>* storage = 
        new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
       _node_maps.insert(std::make_pair(caption, storage));
@@ -390,6 +395,7 @@ namespace lemon {
     /// \e
     template <typename Map>
     DigraphReader& arcMap(const std::string& caption, Map& map) {
+      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
       _reader_bits::MapStorageBase<Arc>* storage = 
        new _reader_bits::MapStorage<Arc, Map>(map);
       _arc_maps.insert(std::make_pair(caption, storage));
@@ -400,6 +406,7 @@ namespace lemon {
     template <typename Map, typename Converter>
     DigraphReader& arcMap(const std::string& caption, Map& map, 
                          const Converter& converter = Converter()) {
+      checkConcept<concepts::WriteMap<Arc, typename Map::Value>, Map>();
       _reader_bits::MapStorageBase<Arc>* storage = 
        new _reader_bits::MapStorage<Arc, Map, Converter>(map, converter);
       _arc_maps.insert(std::make_pair(caption, storage));
diff -r 676fb304b549 -r b553a184f119 lemon/lgf_writer.h
--- a/lemon/lgf_writer.h        Fri Apr 11 12:07:02 2008 +0200
+++ b/lemon/lgf_writer.h        Fri Apr 11 16:39:31 2008 +0200
@@ -331,6 +331,7 @@ namespace lemon {
     /// \e
     template <typename Map>
     DigraphWriter& nodeMap(const std::string& caption, const Map& map) {
+      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
       _writer_bits::MapStorageBase<Node>* storage = 
        new _writer_bits::MapStorage<Node, Map>(map);
       _node_maps.push_back(std::make_pair(caption, storage));
@@ -341,6 +342,7 @@ namespace lemon {
     template <typename Map, typename Converter>
     DigraphWriter& nodeMap(const std::string& caption, const Map& map, 
                           const Converter& converter = Converter()) {
+      checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
       _writer_bits::MapStorageBase<Node>* storage = 
        new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
       _node_maps.push_back(std::make_pair(caption, storage));
@@ -350,6 +352,7 @@ namespace lemon {
     /// \e
     template <typename Map>
     DigraphWriter& arcMap(const std::string& caption, const Map& map) {
+      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
       _writer_bits::MapStorageBase<Arc>* storage = 
        new _writer_bits::MapStorage<Arc, Map>(map);
       _arc_maps.push_back(std::make_pair(caption, storage));
@@ -360,6 +363,7 @@ namespace lemon {
     template <typename Map, typename Converter>
     DigraphWriter& arcMap(const std::string& caption, const Map& map, 
                          const Converter& converter = Converter()) {
+      checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
       _writer_bits::MapStorageBase<Arc>* storage = 
        new _writer_bits::MapStorage<Arc, Map, Converter>(map, converter);
       _arc_maps.push_back(std::make_pair(caption, storage));