Changeset 1476:182da222fceb in lemon-0.x for lemon/lemon_reader.h

Timestamp:

06/13/05 19:13:56 (20 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some bug fix.

Added: Concept check for maps and IdReader/Writer? classes

Some runtime check

File:

• lemon/lemon_reader.h (modified) (13 diffs)

lemon/lemon_reader.h

@@ -37 +37 @@
 #include <lemon/bits/item_reader.h>
 
+#include <lemon/concept_check.h>
+#include <lemon/concept/maps.h>
 
 namespace lemon {
 
   namespace _reader_bits {
+
+    template <typename Item>
+    class ItemIdReader {
+    public:
+
+      bool isIdReader() { return true; }
+
+      Item readId(std::istream&, Item) { return Item();}
+      
+      template <class _ItemIdReader>
+      struct Constraints {
+        void constraints() {
+          bool b = reader.isIdReader();
+          ignore_unused_variable_warning(b);
+          Item item = reader.readId(is, Item());
+        }
+        _ItemIdReader& reader;
+        std::istream& is;
+      };
+
+    };
   
     template <typename T>
@@ -532 +555 @@
       typedef _Item Item;
       virtual Item read(std::istream& is) const = 0;
+      virtual bool isIdReader() const = 0;
     };
 
@@ -547 +571 @@
       virtual Item read(std::istream& is) const {
         return boxedIdReader.readId(is, Item());
+      }
+
+      virtual bool isIdReader() const {
+        return boxedIdReader.isIdReader();
       }
     };
@@ -818 +846 @@
                   const std::string& _id = std::string(),
                   const DefaultSkipper& _skipper = DefaultSkipper()) 
-      : Parent(_reader), graph(_graph), id(_id), skipper(_skipper),
-        nodeIdReader(new IdReader<Node, NodeIdReader>(_nodeIdReader)) {} 
-
+      : Parent(_reader), graph(_graph), id(_id), skipper(_skipper) {
+      checkConcept<_reader_bits::ItemIdReader<Node>, NodeIdReader>();
+      nodeIdReader.reset(new IdReader<Node, NodeIdReader>(_nodeIdReader));
+    }
     /// \brief Destructor.
     ///
@@ -922 +951 @@
     /// It reads the content of the section.
     virtual void read(std::istream& is) {
+      if (!nodeIdReader->isIdReader()) {
+        throw DataFormatError("Cannot find nodeset or ID map");
+      }
       std::vector<ReaderBase<Edge>* > index;
       std::string line;
@@ -1034 +1066 @@
                        const std::string& _id = std::string(),
                        const DefaultSkipper& _skipper = DefaultSkipper()) 
-      : Parent(_reader), graph(_graph), id(_id), skipper(_skipper),
-        nodeIdReader(new IdReader<Node, NodeIdReader>(_nodeIdReader)) {} 
-
+      : Parent(_reader), graph(_graph), id(_id), skipper(_skipper) {
+      checkConcept<_reader_bits::ItemIdReader<Node>, NodeIdReader>();
+      nodeIdReader.reset(new IdReader<Node, NodeIdReader>(_nodeIdReader));
+    }
     /// \brief Destructor.
     ///
@@ -1198 +1231 @@
     /// It reads the content of the section.
     virtual void read(std::istream& is) {
+      if (!nodeIdReader->isIdReader()) {
+        throw DataFormatError("Cannot find nodeset or ID map");
+      }
       std::vector<ReaderBase<UndirEdge>* > index;
       std::string line;
@@ -1303 +1339 @@
     NodeReader(LemonReader& _reader, const _IdReader& _idReader, 
                const std::string& _id = std::string()) 
-      : Parent(_reader), id(_id), 
-        idReader(new IdReader<typename Graph::Node, _IdReader>(_idReader)) {} 
+      : Parent(_reader), id(_id) {
+      checkConcept<_reader_bits::ItemIdReader<Node>, _IdReader>();
+      idReader.reset(new IdReader<Node, _IdReader>(_idReader));
+    }
 
     /// \brief Destructor.
@@ -1348 +1386 @@
     /// It reads the content of the section.
     virtual void read(std::istream& is) {
+      if (!idReader->isIdReader()) {
+        throw DataFormatError("Cannot find nodeset or ID map");
+      }
       std::string line;
       while (getline(is, line)) {
@@ -1395 +1436 @@
     EdgeReader(LemonReader& _reader, const _IdReader& _idReader, 
                const std::string& _id = std::string()) 
-      : Parent(_reader), id(_id), 
-        idReader(new IdReader<typename Graph::Edge, _IdReader>(_idReader)) {} 
+      : Parent(_reader), id(_id) {
+      checkConcept<_reader_bits::ItemIdReader<Edge>, _IdReader>();
+      idReader.reset(new IdReader<Edge, _IdReader>(_idReader));
+    }
 
     /// \brief Destructor.
@@ -1439 +1482 @@
     /// It reads the content of the section.
     virtual void read(std::istream& is) {
+      if (!idReader->isIdReader()) {
+        throw DataFormatError("Cannot find edgeset or ID map");
+      }
       std::string line;
       while (getline(is, line)) {
@@ -1488 +1534 @@
     UndirEdgeReader(LemonReader& _reader, const _IdReader& _idReader, 
                const std::string& _id = std::string()) 
-      : Parent(_reader), id(_id), 
-        undirEdgeIdReader(new IdReader<UndirEdge, _IdReader>(_idReader)),
-        edgeIdReader(new IdReader<Edge, _IdReader>(_idReader))
-    {} 
+      : Parent(_reader), id(_id) {
+      checkConcept<_reader_bits::ItemIdReader<UndirEdge>, _IdReader>();
+      checkConcept<_reader_bits::ItemIdReader<Edge>, _IdReader>();
+      undirEdgeIdReader.reset(new IdReader<UndirEdge, _IdReader>(_idReader));
+      egdeIdReader.reset(new IdReader<Edge, _IdReader>(_idReader));
+    }
 
     /// \brief Destructor.
@@ -1546 +1594 @@
     /// It reads the content of the section.
     virtual void read(std::istream& is) {
+      if (!edgeIdReader->isIdReader()) {
+        throw DataFormatError("Cannot find undirected edgeset or ID map");
+      }
+      if (!undirEdgeIdReader->isIdReader()) {
+        throw DataFormatError("Cannot find undirected edgeset or ID map");
+      }
       std::string line;
       while (getline(is, line)) {