Changeset 1476:182da222fceb in lemon-0.x

Timestamp:

06/13/05 19:13:56 (19 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

Location:

lemon

Files:

• graph_reader.h (modified) (1 diff)
• lemon_reader.h (modified) (13 diffs)
• lemon_writer.h (modified) (18 diffs)

lemon/graph_reader.h

@@ -262 +262 @@
     GraphReader& readEdge(std::string name, Edge& edge) {
       edge_reader.readEdge(name, edge);
+      return *this;
     }
 

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)) {

lemon/lemon_writer.h

@@ -37 +37 @@
 #include <lemon/maps.h>
 
+#include <lemon/concept_check.h>
+#include <lemon/concept/maps.h>
+
 
 namespace lemon {
+
+  namespace _writer_bits {
+    
+    template <typename Item>
+    class ItemIdWriter {
+    public:
+
+      bool isIdWriter() { return true; }
+
+      void writeId(std::ostream&, const Item&) {}
+      
+      template <class _ItemIdWriter>
+      struct Constraints {
+        void constraints() {
+          const Item item;
+          bool b = writer.isIdWriter();
+          ignore_unused_variable_warning(b);
+          writer.writeId(os, item);
+        }
+        _ItemIdWriter& writer;
+        std::ostream& os;
+      };
+
+    };
+
+  }
 
   /// \ingroup io_group
@@ -230 +259 @@
       typedef _Item Item;
       virtual void write(std::ostream&, const Item&) const = 0;
+      virtual bool isIdWriter() const = 0;
     };
 
@@ -245 +275 @@
       virtual void write(std::ostream& os, const Item& item) const {
         idWriter.writeId(os, item);
+      }
+
+      virtual bool isIdWriter() const {
+        return idWriter.isIdWriter();
       }
     };
@@ -319 +353 @@
     NodeSetWriter& writeNodeMap(std::string name, const Map& map, 
                             const Writer& writer = Writer()) {
+      checkConcept<concept::WriteMap<Node, typename Map::Value>, Map>();
       writers.push_back(
         make_pair(name, new MapWriter<Node, Map, Writer>(map, writer)));
@@ -447 +482 @@
                   bool _forceIdMap = true)
       : Parent(_writer), idMap(0), forceIdMap(_forceIdMap),
-        graph(_graph), id(_id),
-        nodeIdWriter(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter)) {} 
+        graph(_graph), id(_id) {
+      checkConcept<_writer_bits::ItemIdWriter<Node>, NodeIdWriter>();
+      nodeIdWriter.reset(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter));
+    } 
 
     /// \brief Destructor.
@@ -481 +518 @@
     EdgeSetWriter& writeEdgeMap(std::string name, const Map& map, 
                             const Writer& writer = Writer()) {
+      checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
       writers.push_back(
         make_pair(name, new MapWriter<Edge, Map, Writer>(map, writer)));
@@ -499 +537 @@
     /// Write the content of the section.
     virtual void write(std::ostream& os) {
+      if (!nodeIdWriter->isIdWriter()) {
+        throw DataFormatError("Cannot find nodeset or ID map");
+      }
       for (int i = 0; i < (int)writers.size(); ++i) {
         if (writers[i].first == "id") {
@@ -622 +663 @@
                        bool _forceIdMap = true)
       : Parent(_writer), idMap(0), forceIdMap(_forceIdMap),
-        graph(_graph), id(_id),
-        nodeIdWriter(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter)) {} 
+        graph(_graph), id(_id) {
+      checkConcept<_writer_bits::ItemIdWriter<Node>, NodeIdWriter>();
+      nodeIdWriter.reset(new IdWriter<Node, NodeIdWriter>(_nodeIdWriter));
+    } 
 
     /// \brief Destructor.
@@ -656 +699 @@
     UndirEdgeSetWriter& writeUndirEdgeMap(std::string name, const Map& map, 
                                           const Writer& writer = Writer()) {
+      checkConcept<concept::WriteMap<UndirEdge, typename Map::Value>, Map>();
       writers.push_back(
         make_pair(name, new MapWriter<UndirEdge, Map, Writer>(map, writer)));
@@ -666 +710 @@
     template <typename Map>
     UndirEdgeSetWriter& writeEdgeMap(std::string name, const Map& map) {
+      checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
       writeUndirEdgeMap("+" + name, composeMap(forwardMap(graph), map));
       writeUndirEdgeMap("-" + name, composeMap(backwardMap(graph), map));
@@ -677 +722 @@
     UndirEdgeSetWriter& writeEdgeMap(std::string name, const Map& map, 
                                      const Writer& writer = Writer()) {
+      checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
       writeUndirEdge("+" + name, composeMap(forwardMap(graph), map), writer);
-      writeUndirEdge("-" + name, composeMap(forwardMap(graph), map), writer);
+      writeUndirEdge("-" + name, composeMap(backwardMap(graph), map), writer);
       return *this;
     }
@@ -695 +741 @@
     /// Write the content of the section.
     virtual void write(std::ostream& os) {
+      if (!nodeIdWriter->isIdWriter()) {
+        throw DataFormatError("Cannot find nodeset or ID map");
+      }
       for (int i = 0; i < (int)writers.size(); ++i) {
         if (writers[i].first == "id") {
@@ -812 +861 @@
     NodeWriter(LemonWriter& _writer, const _IdWriter& _idWriter, 
                const std::string& _id = std::string()) 
-      : Parent(_writer), id(_id), 
-        idWriter(new IdWriter<typename Graph::Node, _IdWriter>(_idWriter)) {} 
+      : Parent(_writer), id(_id) {
+      checkConcept<_writer_bits::ItemIdWriter<Node>, _IdWriter>();
+      idWriter.reset(new IdWriter<Node, _IdWriter>(_idWriter));
+    }
+
 
     /// \brief Destructor.
@@ -847 +899 @@
     /// Write the content of the section.
     virtual void write(std::ostream& os) {
+      if (!idWriter->isIdWriter()) {
+        throw DataFormatError("Cannot find nodeset or ID map");
+      }
       for (int i = 0; i < (int)writers.size(); ++i) {
         os << writers[i].first << ' ';
@@ -888 +943 @@
     EdgeWriter(LemonWriter& _writer, const _IdWriter& _idWriter, 
                const std::string& _id = std::string()) 
-      : Parent(_writer), id(_id), 
-        idWriter(new IdWriter<typename Graph::Edge, _IdWriter>(_idWriter)) {} 
+      : Parent(_writer), id(_id) {
+      checkConcept<_writer_bits::ItemIdWriter<Edge>, _IdWriter>();
+      idWriter.reset(new IdWriter<Edge, _IdWriter>(_idWriter));
+    }
 
     /// \brief Destructor.
@@ -922 +979 @@
     /// Write the content of the section.
     virtual void write(std::ostream& os) {
+      if (!idWriter->isIdWriter()) {
+        throw DataFormatError("Cannot find edgeset or ID map");
+      }
       for (int i = 0; i < (int)writers.size(); ++i) {
         os << writers[i].first << ' ';
@@ -967 +1027 @@
     UndirEdgeWriter(LemonWriter& _writer, const _IdWriter& _idWriter, 
                const std::string& _id = std::string()) 
-      : Parent(_writer), id(_id), 
-        undirEdgeIdWriter(new IdWriter<UndirEdge, _IdWriter>(_idWriter)),
-        edgeIdWriter(new IdWriter<Edge, _IdWriter>(_idWriter)) {}
+      : Parent(_writer), id(_id) {
+      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));
+    }
 
     /// \brief Destructor.
@@ -1009 +1072 @@
     /// Write the content of the section.
     virtual void write(std::ostream& os) {
+      if (!edgeIdWriter->isIdWriter()) {
+        throw DataFormatError("Cannot find undirected edgeset or ID map");
+      }
+      if (!undirEdgeIdWriter->isIdWriter()) {
+        throw DataFormatError("Cannot find undirected edgeset or ID map");
+      }
       for (int i = 0; i < (int)undirEdgeWriters.size(); ++i) {
         os << undirEdgeWriters[i].first << ' ';