Changeset 1845:f8bbfed86036 in lemon-0.x

Timestamp:

12/03/05 19:17:29 (18 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@2404

Message:

Implementation redesign
Throws exception

Files:

• lemon/error.h (modified) (2 diffs)
• lemon/lemon_reader.h (modified) (46 diffs)
• lemon/lemon_writer.h (modified) (27 diffs)
• test/heap_test.cc (modified) (1 diff)

lemon/error.h

@@ -377 +377 @@
   };
 
-  class IOParameterError : public LogicError {
+  class IOParameterError : public IOError {
   protected:
     ExceptionMember<std::string> _message;
@@ -386 +386 @@
 
     IOParameterError(const IOParameterError &ile) : 
-      LogicError(ile), _message(ile._message), _file(ile._file) {}
+      IOError(ile), _message(ile._message), _file(ile._file) {}
 
     ///\e 

lemon/lemon_reader.h

@@ -46 +46 @@
   namespace _reader_bits {
 
+    template <typename T>
+    bool operator<(T, T) {
+      throw DataFormatError("Id is not comparable");
+    }
+
+    template <typename T>
+    struct Less {
+      bool operator()(const T& p, const T& q) const {
+        return p < q;
+      }
+    };
+
     template <typename Item>
     class ItemIdReader {
@@ -84 +96 @@
 
     };
-  
-    template <typename T>
-    bool operator<(T, T) {
-      throw DataFormatError("Id is not comparable");
-    }
-
-    template <typename T>
-    struct Less {
-      bool operator()(const T& p, const T& q) const {
-        return p < q;
-      }
-    };
 
     template <typename Map>
@@ -197 +197 @@
     struct Arg<YMap<Map> > { 
       typedef const YMap<Map>& Type;
+    };
+
+
+    template <typename _Item>
+    class MapReaderBase;
+    
+    template <typename _Item>
+    class MapInverterBase : public MapReaderBase<_Item> {
+    public:
+      typedef _Item Item;
+      virtual void read(std::istream&, const Item&) = 0;
+      virtual Item read(std::istream&) const = 0;
+
+      virtual MapInverterBase<_Item>* getInverter() {
+        return this;
+      }
+    };
+
+    template <typename _Item, typename _Map, typename _Reader>
+    class MapReaderInverter : public MapInverterBase<_Item> {
+    public:
+      typedef _Item Item;
+      typedef _Reader Reader;
+      typedef typename Reader::Value Value;
+      typedef _Map Map;
+      typedef std::map<Value, Item, _reader_bits::Less<Value> > Inverse;
+
+      typename _reader_bits::Ref<Map>::Type map;
+      Reader reader;
+      Inverse inverse;
+
+      MapReaderInverter(typename _reader_bits::Arg<Map>::Type _map,
+                        const Reader& _reader) 
+        : map(_map), reader(_reader) {}
+
+      virtual ~MapReaderInverter() {}
+
+      virtual void read(std::istream& is, const Item& item) {
+        Value value;
+        reader.read(is, value);
+        map.set(item, value);
+        typename Inverse::iterator it = inverse.find(value);
+        if (it == inverse.end()) {
+          inverse.insert(std::make_pair(value, item));
+        } else {
+          throw DataFormatError("Multiple ID occurence");
+        }
+      }
+
+      virtual Item read(std::istream& is) const {
+        Value value;
+        reader.read(is, value); 
+        typename Inverse::const_iterator it = inverse.find(value);
+        if (it != inverse.end()) {
+          return it->second;
+        } else {
+          throw DataFormatError("Invalid ID error");
+        }
+      }      
+    };
+
+    template <typename _Item, typename _Reader>
+    class SkipReaderInverter : public MapInverterBase<_Item> {
+    public:
+      typedef _Item Item;
+      typedef _Reader Reader;
+      typedef typename Reader::Value Value;
+      typedef std::map<Value, Item, _reader_bits::Less<Value> > Inverse;
+
+      Reader reader;
+
+      SkipReaderInverter(const Reader& _reader) 
+        : reader(_reader) {}
+
+      virtual ~SkipReaderInverter() {}
+
+      virtual void read(std::istream& is, const Item& item) {
+        Value value;
+        reader.read(is, value);
+        typename Inverse::iterator it = inverse.find(value);
+        if (it == inverse.end()) {
+          inverse.insert(std::make_pair(value, item));
+        } else {
+          throw DataFormatError("Multiple ID occurence error");
+        }
+      }
+
+      virtual Item read(std::istream& is) const {
+        Value value;
+        reader.read(is, value); 
+        typename Inverse::const_iterator it = inverse.find(value);
+        if (it != inverse.end()) {
+          return it->second;
+        } else {
+          throw DataFormatError("Invalid ID error");
+        }
+      }
+
+    private:
+      Inverse inverse;
+    };
+
+    template <typename _Item>    
+    class MapReaderBase {
+    public:
+      typedef _Item Item;
+
+      MapReaderBase() { _touched = false; }
+      
+      void touch() { _touched = true; }
+      bool touched() const { return _touched; }
+
+      virtual ~MapReaderBase() {}
+
+      virtual void read(std::istream& is, const Item& item) = 0;
+      virtual MapInverterBase<_Item>* getInverter() = 0;
+
+    private:      
+      bool _touched;
+
+    };
+
+    template <typename _Item, typename _Map, typename _Reader>
+    class MapReader : public MapReaderBase<_Item> {
+    public:
+      typedef _Map Map;
+      typedef _Reader Reader;
+      typedef typename Reader::Value Value;
+      typedef _Item Item;
+      
+      typename _reader_bits::Ref<Map>::Type map;
+      Reader reader;
+
+      MapReader(typename _reader_bits::Arg<Map>::Type _map, 
+                const Reader& _reader) 
+        : map(_map), reader(_reader) {}
+
+      virtual ~MapReader() {}
+
+      virtual void read(std::istream& is, const Item& item) {
+        Value value;
+        reader.read(is, value);
+        map.set(item, value);
+      }
+
+      virtual MapInverterBase<_Item>* getInverter() {
+        return new MapReaderInverter<Item, Map, Reader>(map, reader);
+      }
+    };
+
+
+    template <typename _Item, typename _Reader>
+    class SkipReader : public MapReaderBase<_Item> {
+    public:
+      typedef _Reader Reader;
+      typedef typename Reader::Value Value;
+      typedef _Item Item;
+
+      Reader reader;
+      SkipReader(const Reader& _reader) : reader(_reader) {}
+
+      virtual ~SkipReader() {}
+
+      virtual void read(std::istream& is, const Item&) {
+        Value value;
+        reader.read(is, value);
+      }      
+
+      virtual MapInverterBase<Item>* getInverter() {
+        return new SkipReaderInverter<Item, Reader>(reader);
+      }
+    };
+
+    template <typename _Item>
+    class IdReaderBase {
+    public:
+      typedef _Item Item;
+      virtual ~IdReaderBase() {}
+      virtual Item read(std::istream& is) const = 0;
+      virtual bool isIdReader() const = 0;
+    };
+
+    template <typename _Item, typename _BoxedIdReader>
+    class IdReader : public IdReaderBase<_Item> {
+    public:
+      typedef _Item Item;
+      typedef _BoxedIdReader BoxedIdReader;
+      
+      const BoxedIdReader& boxedIdReader;
+
+      IdReader(const BoxedIdReader& _boxedIdReader) 
+        : boxedIdReader(_boxedIdReader) {}
+
+      virtual Item read(std::istream& is) const {
+        Item item;
+        boxedIdReader.readId(is, item);
+        return item;
+      }
+
+      virtual bool isIdReader() const {
+        return boxedIdReader.isIdReader();
+      }
+    };
+
+    template <typename _Item>
+    class ItemStore {
+    public:
+
+      typedef _Item Item;
+
+      ItemStore(Item& _item) : item(&_item) { 
+        _touched = false; 
+      }
+      
+      void touch() { _touched = true; }
+      bool touched() const { return _touched; }
+
+      void read(const Item& _item) {
+        *item = _item;
+      }
+      
+    private:
+      Item* item;
+      bool _touched;
+    };
+
+    class ValueReaderBase {
+    public:
+      virtual void read(std::istream&) {};
+      virtual ~ValueReaderBase() {}
+    };
+
+    template <typename _Value, typename _Reader>
+    class ValueReader : public ValueReaderBase {
+    public:
+      typedef _Value Value;
+      typedef _Reader Reader;
+
+      ValueReader(Value& _value, const Reader& _reader)
+        : value(_value), reader(_reader) {}
+
+      virtual void read(std::istream& is) {
+        reader.read(is, value);
+      }
+    private:
+      Value& value;
+      Reader reader;
     };
 
@@ -470 +717 @@
   };
 
-  /// \brief Helper class for implementing the common SectionReaders.
-  ///
-  /// Helper class for implementing the common SectionReaders.
-  class CommonSectionReaderBase : public LemonReader::SectionReader {
-    typedef LemonReader::SectionReader Parent;
-  protected:
-    
-    /// \brief Constructor for CommonSectionReaderBase.
-    ///
-    /// Constructor for CommonSectionReaderBase. It attach this reader to
-    /// the given LemonReader.
-    CommonSectionReaderBase(LemonReader& _reader) 
-      : Parent(_reader) {}
-
-    template <typename _Item>
-    class ReaderBase;
-    
-    template <typename _Item>
-    class InverterBase : public ReaderBase<_Item> {
-    public:
-      typedef _Item Item;
-      virtual void read(std::istream&, const Item&) = 0;
-      virtual Item read(std::istream&) const = 0;
-
-      virtual InverterBase<_Item>* getInverter() {
-        return this;
-      }
-    };
-
-    template <typename _Item, typename _Map, typename _Reader>
-    class MapReaderInverter : public InverterBase<_Item> {
-    public:
-      typedef _Item Item;
-      typedef _Reader Reader;
-      typedef typename Reader::Value Value;
-      typedef _Map Map;
-      typedef std::map<Value, Item, _reader_bits::Less<Value> > Inverse;
-
-      typename _reader_bits::Ref<Map>::Type map;
-      Reader reader;
-      Inverse inverse;
-
-      MapReaderInverter(typename _reader_bits::Arg<Map>::Type _map,
-                        const Reader& _reader) 
-        : map(_map), reader(_reader) {}
-
-      virtual ~MapReaderInverter() {}
-
-      virtual void read(std::istream& is, const Item& item) {
-        Value value;
-        reader.read(is, value);
-        map.set(item, value);
-        typename Inverse::iterator it = inverse.find(value);
-        if (it == inverse.end()) {
-          inverse.insert(std::make_pair(value, item));
-        } else {
-          throw DataFormatError("Multiple ID occurence");
-        }
-      }
-
-      virtual Item read(std::istream& is) const {
-        Value value;
-        reader.read(is, value); 
-        typename Inverse::const_iterator it = inverse.find(value);
-        if (it != inverse.end()) {
-          return it->second;
-        } else {
-          throw DataFormatError("Invalid ID error");
-        }
-      }      
-    };
-
-    template <typename _Item, typename _Reader>
-    class SkipReaderInverter : public InverterBase<_Item> {
-    public:
-      typedef _Item Item;
-      typedef _Reader Reader;
-      typedef typename Reader::Value Value;
-      typedef std::map<Value, Item, _reader_bits::Less<Value> > Inverse;
-
-      Reader reader;
-
-      SkipReaderInverter(const Reader& _reader) 
-        : reader(_reader) {}
-
-      virtual ~SkipReaderInverter() {}
-
-      virtual void read(std::istream& is, const Item& item) {
-        Value value;
-        reader.read(is, value);
-        typename Inverse::iterator it = inverse.find(value);
-        if (it == inverse.end()) {
-          inverse.insert(std::make_pair(value, item));
-        } else {
-          throw DataFormatError("Multiple ID occurence error");
-        }
-      }
-
-      virtual Item read(std::istream& is) const {
-        Value value;
-        reader.read(is, value); 
-        typename Inverse::const_iterator it = inverse.find(value);
-        if (it != inverse.end()) {
-          return it->second;
-        } else {
-          throw DataFormatError("Invalid ID error");
-        }
-      }
-
-    private:
-      Inverse inverse;
-    };
-
-    template <typename _Item>    
-    class ReaderBase {
-    public:
-      typedef _Item Item;
-
-      virtual ~ReaderBase() {}
-
-      virtual void read(std::istream& is, const Item& item) = 0;
-      virtual InverterBase<_Item>* getInverter() = 0;
-    };
-
-    template <typename _Item, typename _Map, typename _Reader>
-    class MapReader : public ReaderBase<_Item> {
-    public:
-      typedef _Map Map;
-      typedef _Reader Reader;
-      typedef typename Reader::Value Value;
-      typedef _Item Item;
-      
-      typename _reader_bits::Ref<Map>::Type map;
-      Reader reader;
-
-      MapReader(typename _reader_bits::Arg<Map>::Type _map, 
-                const Reader& _reader) 
-        : map(_map), reader(_reader) {}
-
-      virtual ~MapReader() {}
-
-      virtual void read(std::istream& is, const Item& item) {
-        Value value;
-        reader.read(is, value);
-        map.set(item, value);
-      }
-
-      virtual InverterBase<_Item>* getInverter() {
-        return new MapReaderInverter<Item, Map, Reader>(map, reader);
-      }
-    };
-
-
-    template <typename _Item, typename _Reader>
-    class SkipReader : public ReaderBase<_Item> {
-    public:
-      typedef _Reader Reader;
-      typedef typename Reader::Value Value;
-      typedef _Item Item;
-
-      Reader reader;
-      SkipReader(const Reader& _reader) : reader(_reader) {}
-
-      virtual ~SkipReader() {}
-
-      virtual void read(std::istream& is, const Item&) {
-        Value value;
-        reader.read(is, value);
-      }      
-
-      virtual InverterBase<Item>* getInverter() {
-        return new SkipReaderInverter<Item, Reader>(reader);
-      }
-    };
-
-    template <typename _Item>
-    class IdReaderBase {
-    public:
-      typedef _Item Item;
-      virtual ~IdReaderBase() {}
-      virtual Item read(std::istream& is) const = 0;
-      virtual bool isIdReader() const = 0;
-    };
-
-    template <typename _Item, typename _BoxedIdReader>
-    class IdReader : public IdReaderBase<_Item> {
-    public:
-      typedef _Item Item;
-      typedef _BoxedIdReader BoxedIdReader;
-      
-      const BoxedIdReader& boxedIdReader;
-
-      IdReader(const BoxedIdReader& _boxedIdReader) 
-        : boxedIdReader(_boxedIdReader) {}
-
-      virtual Item read(std::istream& is) const {
-        Item item;
-        boxedIdReader.readId(is, item);
-        return item;
-      }
-
-      virtual bool isIdReader() const {
-        return boxedIdReader.isIdReader();
-      }
-    };
-
-    class ValueReaderBase {
-    public:
-      virtual void read(std::istream&) {};
-      virtual ~ValueReaderBase() {}
-    };
-
-    template <typename _Value, typename _Reader>
-    class ValueReader : public ValueReaderBase {
-    public:
-      typedef _Value Value;
-      typedef _Reader Reader;
-
-      ValueReader(Value& _value, const Reader& _reader)
-        : value(_value), reader(_reader) {}
-
-      virtual void read(std::istream& is) {
-        reader.read(is, value);
-      }
-    private:
-      Value& value;
-      Reader reader;
-    };
-    
-  };
-
   /// \ingroup io_group
   /// \brief SectionReader for reading a graph's nodeset.
@@ -719 +735 @@
   /// \relates LemonReader
   template <typename _Graph, typename _Traits = DefaultReaderTraits>
-  class NodeSetReader : public CommonSectionReaderBase {
-    typedef CommonSectionReaderBase Parent;
+  class NodeSetReader : public LemonReader::SectionReader {
+    typedef LemonReader::SectionReader Parent;
   public:
 
@@ -802 +818 @@
         msg << "Multiple read rule for node map: " << name;
         throw IOParameterError(msg.message());
-      }
+      }      
       readers.insert(
-        make_pair(name, new MapReader<Node, Map, Reader>(map, reader)));
+        make_pair(name, new _reader_bits::
+                  MapReader<Node, Map, Reader>(map, reader)));
       return *this;
     }
@@ -821 +838 @@
         throw IOParameterError(msg.message());
       }
-      readers.insert(make_pair(name, new SkipReader<Node, Reader>(reader)));
+      readers.insert(make_pair(name, new _reader_bits::
+                               SkipReader<Node, Reader>(reader)));
       return *this;
     }
@@ -844 +862 @@
     /// It reads the content of the section.
     virtual void read(std::istream& is) {
-      std::vector<ReaderBase<Node>* > index;
+      std::vector<_reader_bits::MapReaderBase<Node>* > index;
       std::string line;
 
@@ -852 +870 @@
         typename MapReaders::iterator it = readers.find(id);
         if (it != readers.end()) {
+          it->second->touch();
           index.push_back(it->second);
         } else {
@@ -859 +878 @@
           inverter.reset(index.back()->getInverter());
           index.back() = inverter.get();
+        }
+      }
+      for (typename MapReaders::iterator it = readers.begin();
+           it != readers.end(); ++it) {
+        if (!it->second->touched()) {
+          ErrorMessage msg;
+          msg << "Map not found in file: " << it->first;
+          throw IOParameterError(msg.message());
         }
       }
@@ -890 +917 @@
   private:
 
-    typedef std::map<std::string, ReaderBase<Node>*> MapReaders;
+    typedef std::map<std::string, _reader_bits::MapReaderBase<Node>*> MapReaders;
     MapReaders readers;
    
     Graph& graph;   
     std::string id;
-    SkipReader<Node, DefaultSkipper> skipper;
-
-    std::auto_ptr<InverterBase<Node> > inverter;
+    _reader_bits::SkipReader<Node, DefaultSkipper> skipper;
+
+    std::auto_ptr<_reader_bits::MapInverterBase<Node> > inverter;
   };
 
@@ -923 +950 @@
   /// \relates LemonReader
   template <typename _Graph, typename _Traits = DefaultReaderTraits>
-  class EdgeSetReader : public CommonSectionReaderBase {
-    typedef CommonSectionReaderBase Parent;
+  class EdgeSetReader : public LemonReader::SectionReader {
+    typedef LemonReader::SectionReader Parent;
   public:
 
@@ -949 +976 @@
       : Parent(_reader), graph(_graph), id(_id), skipper(_skipper) {
       checkConcept<_reader_bits::ItemIdReader<Node>, NodeIdReader>();
-      nodeIdReader.reset(new IdReader<Node, NodeIdReader>(_nodeIdReader));
+      nodeIdReader.reset(new _reader_bits::
+                         IdReader<Node, NodeIdReader>(_nodeIdReader));
     }
     /// \brief Destructor.
@@ -1014 +1042 @@
       }
       readers.insert(
-        make_pair(name, new MapReader<Edge, Map, Reader>(map, reader)));
+        make_pair(name, new _reader_bits::
+                  MapReader<Edge, Map, Reader>(map, reader)));
       return *this;
     }
@@ -1031 +1060 @@
         throw IOParameterError(msg.message());
       }
-      readers.insert(make_pair(name, new SkipReader<Edge, Reader>(reader)));
+      readers.insert(make_pair(name, new _reader_bits::
+                               SkipReader<Edge, Reader>(reader)));
       return *this;
     }
@@ -1057 +1087 @@
         throw DataFormatError("Cannot find nodeset or ID map");
       }
-      std::vector<ReaderBase<Edge>* > index;
+      std::vector<_reader_bits::MapReaderBase<Edge>* > index;
       std::string line;
 
@@ -1066 +1096 @@
         if (it != readers.end()) {
           index.push_back(it->second);
+          it->second->touch();
         } else {
           index.push_back(&skipper);
@@ -1072 +1103 @@
           inverter.reset(index.back()->getInverter());
           index.back() = inverter.get();
+        }
+      }
+      for (typename MapReaders::iterator it = readers.begin();
+           it != readers.end(); ++it) {
+        if (!it->second->touched()) {
+          ErrorMessage msg;
+          msg << "Map not found in file: " << it->first;
+          throw IOParameterError(msg.message());
         }
       }
@@ -1105 +1144 @@
   private:
 
-    typedef std::map<std::string, ReaderBase<Edge>*> MapReaders;
+    typedef std::map<std::string, _reader_bits::MapReaderBase<Edge>*> MapReaders;
     MapReaders readers;
    
     Graph& graph;   
     std::string id;
-    SkipReader<Edge, DefaultSkipper> skipper;
-
-    std::auto_ptr<InverterBase<Edge> > inverter;
-    std::auto_ptr<IdReaderBase<Node> > nodeIdReader;
+    _reader_bits::SkipReader<Edge, DefaultSkipper> skipper;
+
+    std::auto_ptr<_reader_bits::MapInverterBase<Edge> > inverter;
+    std::auto_ptr<_reader_bits::IdReaderBase<Node> > nodeIdReader;
   };
 
@@ -1144 +1183 @@
   /// \relates LemonReader
   template <typename _Graph, typename _Traits = DefaultReaderTraits>
-  class UndirEdgeSetReader : public CommonSectionReaderBase {
-    typedef CommonSectionReaderBase Parent;
+  class UndirEdgeSetReader : public LemonReader::SectionReader {
+    typedef LemonReader::SectionReader Parent;
   public:
 
@@ -1171 +1210 @@
       : Parent(_reader), graph(_graph), id(_id), skipper(_skipper) {
       checkConcept<_reader_bits::ItemIdReader<Node>, NodeIdReader>();
-      nodeIdReader.reset(new IdReader<Node, NodeIdReader>(_nodeIdReader));
+      nodeIdReader.reset(new _reader_bits::
+                         IdReader<Node, NodeIdReader>(_nodeIdReader));
     }
     /// \brief Destructor.
@@ -1236 +1276 @@
       }
       readers.insert(
-        make_pair(name, new MapReader<UndirEdge, Map, Reader>(map, reader)));
+        make_pair(name, new _reader_bits::
+                  MapReader<UndirEdge, Map, Reader>(map, reader)));
       return *this;
     }
@@ -1253 +1294 @@
         throw IOParameterError(msg.message());
       }
-      readers.insert(make_pair(name, 
-                               new SkipReader<UndirEdge, Reader>(reader)));
+      readers.insert(make_pair(name, new _reader_bits::
+                               SkipReader<UndirEdge, Reader>(reader)));
       return *this;
     }
@@ -1341 +1382 @@
         throw DataFormatError("Cannot find nodeset or ID map");
       }
-      std::vector<ReaderBase<UndirEdge>* > index;
+      std::vector<_reader_bits::MapReaderBase<UndirEdge>* > index;
       std::string line;
 
@@ -1350 +1391 @@
         if (it != readers.end()) {
           index.push_back(it->second);
+          it->second->touch();
         } else {
           index.push_back(&skipper);
@@ -1356 +1398 @@
           inverter.reset(index.back()->getInverter());
           index.back() = inverter.get();
+        }
+      }
+      for (typename MapReaders::iterator it = readers.begin();
+           it != readers.end(); ++it) {
+        if (!it->second->touched()) {
+          ErrorMessage msg;
+          msg << "Map not found in file: " << it->first;
+          throw IOParameterError(msg.message());
         }
       }
@@ -1409 +1459 @@
   private:
 
-    typedef std::map<std::string, ReaderBase<UndirEdge>*> MapReaders;
+    typedef std::map<std::string, 
+                     _reader_bits::MapReaderBase<UndirEdge>*> MapReaders;
     MapReaders readers;
    
     Graph& graph;   
     std::string id;
-    SkipReader<UndirEdge, DefaultSkipper> skipper;
-
-    std::auto_ptr<InverterBase<UndirEdge> > inverter;
-    std::auto_ptr<IdReaderBase<Node> > nodeIdReader;
+    _reader_bits::SkipReader<UndirEdge, DefaultSkipper> skipper;
+
+    std::auto_ptr<_reader_bits::MapInverterBase<UndirEdge> > inverter;
+    std::auto_ptr<_reader_bits::IdReaderBase<Node> > nodeIdReader;
   };
 
@@ -1431 +1482 @@
   /// \relates LemonReader
   template <typename _Graph>
-  class NodeReader : public CommonSectionReaderBase {
-    typedef CommonSectionReaderBase Parent;
+  class NodeReader : public LemonReader::SectionReader {
+    typedef LemonReader::SectionReader Parent;
     typedef _Graph Graph;
     typedef typename Graph::Node Node;
@@ -1448 +1499 @@
       : Parent(_reader), id(_id) {
       checkConcept<_reader_bits::ItemIdReader<Node>, _IdReader>();
-      nodeIdReader.reset(new IdReader<Node, _IdReader>(_idReader));
+      nodeIdReader.reset(new _reader_bits::
+                         IdReader<Node, _IdReader>(_idReader));
     }
 
@@ -1471 +1523 @@
         throw IOParameterError(msg.message());
       }
-      readers.insert(make_pair(name, &item));
+      readers.insert(make_pair(name, _reader_bits::ItemStore<Node>(item)));
     }
 
@@ -1503 +1555 @@
         typename NodeReaders::iterator it = readers.find(id);
         if (it != readers.end()) {
-          *(it->second) = nodeIdReader->read(ls); 
+          it->second.read(nodeIdReader->read(ls));
+          it->second.touch();
         }       
+      }
+      for (typename NodeReaders::iterator it = readers.begin();
+           it != readers.end(); ++it) {
+        if (!it->second.touched()) {
+          ErrorMessage msg;
+          msg << "Node not found in file: " << it->first;
+          throw IOParameterError(msg.message());
+        }
       }
     }
@@ -1512 +1573 @@
     std::string id;
 
-    typedef std::map<std::string, Node*> NodeReaders;
+    typedef std::map<std::string, _reader_bits::ItemStore<Node> > NodeReaders;
     NodeReaders readers;
-    std::auto_ptr<IdReaderBase<Node> > nodeIdReader;
+    std::auto_ptr<_reader_bits::IdReaderBase<Node> > nodeIdReader;
   };
 
@@ -1528 +1589 @@
   /// \relates LemonReader
   template <typename _Graph>
-  class EdgeReader : public CommonSectionReaderBase {
-    typedef CommonSectionReaderBase Parent;
+  class EdgeReader : public LemonReader::SectionReader {
+    typedef LemonReader::SectionReader Parent;
     typedef _Graph Graph;
     typedef typename Graph::Edge Edge;
@@ -1545 +1606 @@
       : Parent(_reader), id(_id) {
       checkConcept<_reader_bits::ItemIdReader<Edge>, _IdReader>();
-      edgeIdReader.reset(new IdReader<Edge, _IdReader>(_idReader));
+      edgeIdReader.reset(new _reader_bits::
+                         IdReader<Edge, _IdReader>(_idReader));
     }
 
@@ -1567 +1629 @@
         throw IOParameterError(msg.message());
       }
-      readers.insert(make_pair(name, &item));
+      readers.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
     }
 
@@ -1599 +1661 @@
         typename EdgeReaders::iterator it = readers.find(id);
         if (it != readers.end()) {
-          *(it->second) = edgeIdReader->read(ls); 
+          it->second.read(edgeIdReader->read(ls));
+          it->second.touch();
         }       
+      }
+      for (typename EdgeReaders::iterator it = readers.begin();
+           it != readers.end(); ++it) {
+        if (!it->second.touched()) {
+          ErrorMessage msg;
+          msg << "Edge not found in file: " << it->first;
+          throw IOParameterError(msg.message());
+        }
       }
     }
@@ -1608 +1679 @@
     std::string id;
 
-    typedef std::map<std::string, Edge*> EdgeReaders;
+    typedef std::map<std::string, _reader_bits::ItemStore<Edge> > EdgeReaders;
     EdgeReaders readers;
-    std::auto_ptr<IdReaderBase<Edge> > edgeIdReader;
+    std::auto_ptr<_reader_bits::IdReaderBase<Edge> > edgeIdReader;
   };
 
@@ -1624 +1695 @@
   /// \relates LemonReader
   template <typename _Graph>
-  class UndirEdgeReader : public CommonSectionReaderBase {
-    typedef CommonSectionReaderBase Parent;
+  class UndirEdgeReader : public LemonReader::SectionReader {
+    typedef LemonReader::SectionReader Parent;
     typedef _Graph Graph;
     typedef typename Graph::Edge Edge;
@@ -1644 +1715 @@
       checkConcept<_reader_bits::ItemIdReader<UndirEdge>, _IdReader>();
       checkConcept<_reader_bits::ItemIdReader<Edge>, _IdReader>();
-      undirEdgeIdReader.reset(new IdReader<UndirEdge, _IdReader>(_idReader));
-      edgeIdReader.reset(new IdReader<Edge, _IdReader>(_idReader));
+      undirEdgeIdReader.reset(new _reader_bits::
+                              IdReader<UndirEdge, _IdReader>(_idReader));
+      edgeIdReader.reset(new _reader_bits::
+                         IdReader<Edge, _IdReader>(_idReader));
     }
 
@@ -1667 +1740 @@
         throw IOParameterError(msg.message());
       }
-      undirEdgeReaders.insert(make_pair(name, &item));
+      undirEdgeReaders.insert(make_pair(name, _reader_bits::
+                                        ItemStore<UndirEdge>(item)));
     }
 
@@ -1679 +1753 @@
         throw IOParameterError(msg.message());
       }
-      edgeReaders.insert(make_pair(name, &item));
+      edgeReaders.insert(make_pair(name, _reader_bits::ItemStore<Edge>(item)));
     }
 
@@ -1715 +1789 @@
           typename UndirEdgeReaders::iterator it = undirEdgeReaders.find(id);
           if (it != undirEdgeReaders.end()) {
-            *(it->second) = undirEdgeIdReader->read(ls); 
-            break;
+            it->second.read(undirEdgeIdReader->read(ls));
+            it->second.touch();
+            continue;
           }     
         } {
           typename EdgeReaders::iterator it = edgeReaders.find(id);
           if (it != edgeReaders.end()) {
-            *(it->second) = edgeIdReader->read(ls); 
-            break;
+            it->second.read(edgeIdReader->read(ls));
+            it->second.touch();
+            continue;
           }     
+        }
+      }
+      for (typename EdgeReaders::iterator it = edgeReaders.begin();
+           it != edgeReaders.end(); ++it) {
+        if (!it->second.touched()) {
+          ErrorMessage msg;
+          msg << "Edge not found in file: " << it->first;
+          throw IOParameterError(msg.message());
+        }
+      }
+      for (typename UndirEdgeReaders::iterator it = undirEdgeReaders.begin();
+           it != undirEdgeReaders.end(); ++it) {
+        if (!it->second.touched()) {
+          ErrorMessage msg;
+          msg << "UndirEdge not found in file: " << it->first;
+          throw IOParameterError(msg.message());
         }
       }
@@ -1732 +1824 @@
     std::string id;
 
-    typedef std::map<std::string, UndirEdge*> UndirEdgeReaders;
+    typedef std::map<std::string, 
+                     _reader_bits::ItemStore<UndirEdge> > UndirEdgeReaders;
     UndirEdgeReaders undirEdgeReaders;
-    std::auto_ptr<IdReaderBase<UndirEdge> > undirEdgeIdReader;
-
-    typedef std::map<std::string, Edge*> EdgeReaders;
+    std::auto_ptr<_reader_bits::IdReaderBase<UndirEdge> > undirEdgeIdReader;
+
+    typedef std::map<std::string, _reader_bits::ItemStore<Edge> > EdgeReaders;
     EdgeReaders edgeReaders;
-    std::auto_ptr<IdReaderBase<Edge> > edgeIdReader;
+    std::auto_ptr<_reader_bits::IdReaderBase<Edge> > edgeIdReader;
   };
 
@@ -1753 +1846 @@
   /// \relates LemonReader
   template <typename _Traits = DefaultReaderTraits>
-  class AttributeReader : public CommonSectionReaderBase {
-    typedef CommonSectionReaderBase Parent;
+  class AttributeReader : public LemonReader::SectionReader {
+    typedef LemonReader::SectionReader Parent;
     typedef _Traits Traits; 
   public:
@@ -1802 +1895 @@
         throw IOParameterError(msg.message());
       }
-      readers.insert(make_pair(name, new ValueReader<Value, Reader>
-                               (value, reader)));
+      readers.insert(make_pair(name, new _reader_bits::
+                               ValueReader<Value, Reader>(value, reader)));
       return *this;
     }
@@ -1841 +1934 @@
     std::string id;
 
-    typedef std::map<std::string, ValueReaderBase*> Readers;
+    typedef std::map<std::string, _reader_bits::ValueReaderBase*> Readers;
     Readers readers;  
   };

lemon/lemon_writer.h

@@ -165 +165 @@
     };
 
+
+    template <typename _Item>    
+    class MapWriterBase {
+    public:
+      typedef _Item Item;
+
+      virtual ~MapWriterBase() {}
+
+      virtual void write(std::ostream& os, const Item& item) = 0;
+    };
+
+
+    template <typename _Item, typename _Map, typename _Writer>
+    class MapWriter : public MapWriterBase<_Item> {
+    public:
+      typedef _Map Map;
+      typedef _Writer Writer;
+      typedef typename Writer::Value Value;
+      typedef _Item Item;
+      
+      typename _writer_bits::Ref<Map>::Type map;
+      Writer writer;
+
+      MapWriter(const Map& _map, const Writer& _writer) 
+        : map(_map), writer(_writer) {}
+
+      virtual ~MapWriter() {}
+
+      virtual void write(std::ostream& os, const Item& item) {
+        Value value = map[item];
+        writer.write(os, value);
+      }
+
+    };
+
+
+    class ValueWriterBase {
+    public:
+      virtual ~ValueWriterBase() {}
+      virtual void write(std::ostream&) = 0;
+    };
+
+    template <typename _Value, typename _Writer>
+    class ValueWriter : public ValueWriterBase {
+    public:
+      typedef _Value Value;
+      typedef _Writer Writer;
+
+      ValueWriter(const Value& _value, const Writer& _writer)
+        : value(_value), writer(_writer) {}
+
+      virtual void write(std::ostream& os) {
+        writer.write(os, value);
+      }
+    private:
+      const Value& value;
+      Writer writer;
+    };
+    
+
+    template <typename _Item>
+    class IdWriterBase {
+    public:
+      typedef _Item Item;
+      virtual ~IdWriterBase() {}
+      virtual void write(std::ostream&, const Item&) const = 0;
+      virtual bool isIdWriter() const = 0;
+    };
+
+    template <typename _Item, typename _BoxedIdWriter>
+    class IdWriter : public IdWriterBase<_Item> {
+    public:
+      typedef _Item Item;
+      typedef _BoxedIdWriter BoxedIdWriter;
+
+      const BoxedIdWriter& idWriter;
+
+      IdWriter(const BoxedIdWriter& _idWriter) 
+        : idWriter(_idWriter) {}
+
+      virtual void write(std::ostream& os, const Item& item) const {
+        idWriter.writeId(os, item);
+      }
+
+      virtual bool isIdWriter() const {
+        return idWriter.isIdWriter();
+      }
+    };
+
   }
 
@@ -282 +371 @@
   };
 
-  /// \brief Helper class for implementing the common SectionWriters.
-  ///
-  /// Helper class for implementing the common SectionWriters.
-  class CommonSectionWriterBase : public LemonWriter::SectionWriter {
-    typedef LemonWriter::SectionWriter Parent;
-  protected:
-    
-    /// \brief Constructor for CommonSectionWriterBase.
-    ///
-    /// Constructor for CommonSectionWriterBase. It attach this writer to
-    /// the given LemonWriter.
-    CommonSectionWriterBase(LemonWriter& _writer) 
-      : Parent(_writer) {}
-
-    template <typename _Item>    
-    class WriterBase {
-    public:
-      typedef _Item Item;
-
-      virtual ~WriterBase() {}
-
-      virtual void write(std::ostream& os, const Item& item) = 0;
-    };
-
-
-    template <typename _Item, typename _Map, typename _Writer>
-    class MapWriter : public WriterBase<_Item> {
-    public:
-      typedef _Map Map;
-      typedef _Writer Writer;
-      typedef typename Writer::Value Value;
-      typedef _Item Item;
-      
-      typename _writer_bits::Ref<Map>::Type map;
-      Writer writer;
-
-      MapWriter(const Map& _map, const Writer& _writer) 
-        : map(_map), writer(_writer) {}
-
-      virtual ~MapWriter() {}
-
-      virtual void write(std::ostream& os, const Item& item) {
-        Value value = map[item];
-        writer.write(os, value);
-      }
-
-    };
-
-
-    class ValueWriterBase {
-    public:
-      virtual ~ValueWriterBase() {}
-      virtual void write(std::ostream&) = 0;
-    };
-
-    template <typename _Value, typename _Writer>
-    class ValueWriter : public ValueWriterBase {
-    public:
-      typedef _Value Value;
-      typedef _Writer Writer;
-
-      ValueWriter(const Value& _value, const Writer& _writer)
-        : value(_value), writer(_writer) {}
-
-      virtual void write(std::ostream& os) {
-        writer.write(os, value);
-      }
-    private:
-      const Value& value;
-      Writer writer;
-    };
-    
-
-    template <typename _Item>
-    class IdWriterBase {
-    public:
-      typedef _Item Item;
-      virtual ~IdWriterBase() {}
-      virtual void write(std::ostream&, const Item&) const = 0;
-      virtual bool isIdWriter() const = 0;
-    };
-
-    template <typename _Item, typename _BoxedIdWriter>
-    class IdWriter : public IdWriterBase<_Item> {
-    public:
-      typedef _Item Item;
-      typedef _BoxedIdWriter BoxedIdWriter;
-
-      const BoxedIdWriter& idWriter;
-
-      IdWriter(const BoxedIdWriter& _idWriter) 
-        : idWriter(_idWriter) {}
-
-      virtual void write(std::ostream& os, const Item& item) const {
-        idWriter.writeId(os, item);
-      }
-
-      virtual bool isIdWriter() const {
-        return idWriter.isIdWriter();
-      }
-    };
-  };
-
   /// \ingroup io_group
   /// \brief SectionWriter for writing a graph's nodeset.
@@ -404 +390 @@
   /// \relates LemonWriter
   template <typename _Graph, typename _Traits = DefaultWriterTraits>
-  class NodeSetWriter : public CommonSectionWriterBase {
-    typedef CommonSectionWriterBase Parent;
+  class NodeSetWriter : public LemonWriter::SectionWriter {
+    typedef LemonWriter::SectionWriter Parent;
   public:
 
@@ -458 +444 @@
       checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
       writers.push_back(
-        make_pair(name, new MapWriter<Node, Map, Writer>(map, writer)));
+        make_pair(name, new _writer_bits::
+                  MapWriter<Node, Map, Writer>(map, writer)));
       return *this;
     }
@@ -528 +515 @@
   private:
 
-    typedef std::vector<std::pair<std::string, WriterBase<Node>*> > MapWriters;
+    typedef std::vector<std::pair<std::string, _writer_bits::
+                                  MapWriterBase<Node>*> > MapWriters;
     MapWriters writers;
 
-    WriterBase<Node>* idMap;
+    _writer_bits::MapWriterBase<Node>* idMap;
     bool forceIdMap;
    
@@ -563 +551 @@
   /// \relates LemonWriter
   template <typename _Graph, typename _Traits = DefaultWriterTraits>
-  class EdgeSetWriter : public CommonSectionWriterBase {
-    typedef CommonSectionWriterBase Parent;
+  class EdgeSetWriter : public LemonWriter::SectionWriter {
+    typedef LemonWriter::SectionWriter Parent;
   public:
 
@@ -587 +575 @@
         graph(_graph), id(_id) {
       checkConcept<_writer_bits::ItemIdWriter<Node>, NodeIdWriter>();
-      nodeIdWriter.reset(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter));
+      nodeIdWriter.reset(new _writer_bits::
+                         IdWriter<Node, NodeIdWriter>(_nodeIdWriter));
     } 
 
@@ -624 +613 @@
       checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
       writers.push_back(
-        make_pair(name, new MapWriter<Edge, Map, Writer>(map, writer)));
+        make_pair(name, new _writer_bits::
+                  MapWriter<Edge, Map, Writer>(map, writer)));
       return *this;
     }
@@ -702 +692 @@
   private:
 
-    typedef std::vector<std::pair<std::string, WriterBase<Edge>*> > MapWriters;
+    typedef std::vector<std::pair<std::string, _writer_bits::
+                                  MapWriterBase<Edge>*> > MapWriters;
     MapWriters writers;
 
-    WriterBase<Edge>* idMap;
+    _writer_bits::MapWriterBase<Edge>* idMap;
     bool forceIdMap;
    
@@ -711 +702 @@
     std::string id;
 
-    std::auto_ptr<IdWriterBase<Node> > nodeIdWriter;
+    std::auto_ptr<_writer_bits::IdWriterBase<Node> > nodeIdWriter;
   };
 
@@ -744 +735 @@
   /// \relates LemonWriter
   template <typename _Graph, typename _Traits = DefaultWriterTraits>
-  class UndirEdgeSetWriter : public CommonSectionWriterBase {
-    typedef CommonSectionWriterBase Parent;
+  class UndirEdgeSetWriter : public LemonWriter::SectionWriter {
+    typedef LemonWriter::SectionWriter Parent;
   public:
 
@@ -769 +760 @@
         graph(_graph), id(_id) {
       checkConcept<_writer_bits::ItemIdWriter<Node>, NodeIdWriter>();
-      nodeIdWriter.reset(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter));
+      nodeIdWriter.reset(new _writer_bits::
+                         IdWriter<Node, NodeIdWriter>(_nodeIdWriter));
     } 
 
@@ -806 +798 @@
       checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
       writers.push_back(
-        make_pair(name, new MapWriter<UndirEdge, Map, Writer>(map, writer)));
+        make_pair(name, new _writer_bits::
+                  MapWriter<UndirEdge, Map, Writer>(map, writer)));
       return *this;
     }
@@ -929 +922 @@
   private:
 
-    typedef std::vector<std::pair<std::string, 
-                                  WriterBase<UndirEdge>*> > MapWriters;
+    typedef std::vector<std::pair<std::string, _writer_bits::
+                                  MapWriterBase<UndirEdge>*> > MapWriters;
     MapWriters writers;
 
-    WriterBase<UndirEdge>* idMap;
+    _writer_bits::MapWriterBase<UndirEdge>* idMap;
     bool forceIdMap;
    
@@ -939 +932 @@
     std::string id;
 
-    std::auto_ptr<IdWriterBase<Node> > nodeIdWriter;
+    std::auto_ptr<_writer_bits::IdWriterBase<Node> > nodeIdWriter;
   };
 
@@ -953 +946 @@
   /// \relates LemonWriter
   template <typename _Graph>
-  class NodeWriter : public CommonSectionWriterBase {
-    typedef CommonSectionWriterBase Parent;
+  class NodeWriter : public LemonWriter::SectionWriter {
+    typedef LemonWriter::SectionWriter Parent;
     typedef _Graph Graph;
     typedef typename Graph::Node Node;
@@ -969 +962 @@
       : Parent(_writer), id(_id) {
       checkConcept<_writer_bits::ItemIdWriter<Node>, _IdWriter>();
-      idWriter.reset(new IdWriter<Node, _IdWriter>(_idWriter));
+      idWriter.reset(new _writer_bits::IdWriter<Node, _IdWriter>(_idWriter));
     }
 
@@ -1021 +1014 @@
     typedef std::vector<std::pair<std::string, const Node*> > NodeWriters;
     NodeWriters writers;
-    std::auto_ptr<IdWriterBase<Node> > idWriter;
+    std::auto_ptr<_writer_bits::IdWriterBase<Node> > idWriter;
   };
 
@@ -1035 +1028 @@
   /// \relates LemonWriter
   template <typename _Graph>
-  class EdgeWriter : public CommonSectionWriterBase {
-    typedef CommonSectionWriterBase Parent;
+  class EdgeWriter : public LemonWriter::SectionWriter {
+    typedef LemonWriter::SectionWriter Parent;
     typedef _Graph Graph;
     typedef typename Graph::Edge Edge;
@@ -1051 +1044 @@
       : Parent(_writer), id(_id) {
       checkConcept<_writer_bits::ItemIdWriter<Edge>, _IdWriter>();
-      idWriter.reset(new IdWriter<Edge, _IdWriter>(_idWriter));
+      idWriter.reset(new _writer_bits::IdWriter<Edge, _IdWriter>(_idWriter));
     }
 
@@ -1102 +1095 @@
     EdgeWriters writers;
 
-    std::auto_ptr<IdWriterBase<Edge> > idWriter;
+    std::auto_ptr<_writer_bits::IdWriterBase<Edge> > idWriter;
   };
 
@@ -1116 +1109 @@
   /// \relates LemonWriter
   template <typename _Graph>
-  class UndirEdgeWriter : public CommonSectionWriterBase {
-    typedef CommonSectionWriterBase Parent;
+  class UndirEdgeWriter : public LemonWriter::SectionWriter {
+    typedef LemonWriter::SectionWriter Parent;
     typedef _Graph Graph;
     typedef typename Graph::Node Node;
@@ -1136 +1129 @@
       checkConcept<_writer_bits::ItemIdWriter<Edge>, _IdWriter>();
       checkConcept<_writer_bits::ItemIdWriter<UndirEdge>, _IdWriter>();
-      undirEdgeIdWriter.reset(new IdWriter<UndirEdge, _IdWriter>(_idWriter));
-      edgeIdWriter.reset(new IdWriter<Edge, _IdWriter>(_idWriter));
+      undirEdgeIdWriter.reset(new _writer_bits::
+                              IdWriter<UndirEdge, _IdWriter>(_idWriter));
+      edgeIdWriter.reset(new _writer_bits::
+                         IdWriter<Edge, _IdWriter>(_idWriter));
     }
 
@@ -1203 +1198 @@
                                   const UndirEdge*> > UndirEdgeWriters;
     UndirEdgeWriters undirEdgeWriters;
-    std::auto_ptr<IdWriterBase<UndirEdge> > undirEdgeIdWriter;
+    std::auto_ptr<_writer_bits::IdWriterBase<UndirEdge> > undirEdgeIdWriter;
 
     typedef std::vector<std::pair<std::string, const Edge*> > EdgeWriters;
     EdgeWriters edgeWriters;
-    std::auto_ptr<IdWriterBase<Edge> > edgeIdWriter;
+    std::auto_ptr<_writer_bits::IdWriterBase<Edge> > edgeIdWriter;
 
   };
@@ -1223 +1218 @@
   /// \relates LemonWriter
   template <typename _Traits = DefaultWriterTraits>
-  class AttributeWriter : public CommonSectionWriterBase {
-    typedef CommonSectionWriterBase Parent;
+  class AttributeWriter : public LemonWriter::SectionWriter {
+    typedef LemonWriter::SectionWriter Parent;
     typedef _Traits Traits; 
   public:
@@ -1268 +1263 @@
                                     const Writer& writer = Writer()) {
       checkConcept<_writer_bits::ItemWriter<Value>, Writer>();
-      writers.push_back(make_pair(name, new ValueWriter<Value, Writer>
-                               (value, writer)));
+      writers.push_back(make_pair(name, new _writer_bits::
+                                  ValueWriter<Value, Writer>(value, writer)));
       return *this;
     }
@@ -1297 +1292 @@
     std::string id;
 
-    typedef std::vector<std::pair<std::string, ValueWriterBase*> > Writers;
+    typedef std::vector<std::pair<std::string, 
+                                  _writer_bits::ValueWriterBase*> > Writers;
     Writers writers;  
   };

test/heap_test.cc

@@ -57 +57 @@
   check(input, "Input file '" << f_name << "' not found.");
   GraphReader<Graph>(input, graph).
-    readEdgeMap("length", length).
+    readEdgeMap("capacity", length).
     readNode("source", start).
     run();