Changeset 1492:0d58f0301923 in lemon-0.x for lemon/lemon_writer.h

Timestamp:

06/15/05 12:10:59 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Correcting concept checks.

File:

• lemon/lemon_writer.h (modified) (8 diffs)

lemon/lemon_writer.h

@@ -56 +56 @@
       struct Constraints {
         void constraints() {
-          const Item item;
           bool b = writer.isIdWriter();
           ignore_unused_variable_warning(b);
@@ -63 +62 @@
         _ItemIdWriter& writer;
         std::ostream& os;
+        const Item& item;
+      };
+
+    };
+
+    template <typename Item>
+    class ItemWriter {
+    public:
+
+      void write(std::ostream&, const Item&) {}
+      
+      template <class _ItemWriter>
+      struct Constraints {
+        void constraints() {
+          writer.write(os, item);
+        }
+        _ItemWriter& writer;
+        std::ostream& os;
+        const Item& item;
       };
 
@@ -353 +371 @@
     NodeSetWriter& writeNodeMap(std::string name, const Map& map, 
                             const Writer& writer = Writer()) {
-      checkConcept<concept::WriteMap<Node, typename Map::Value>, Map>();
+      checkConcept<concept::ReadMap<Node, typename Map::Value>, Map>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
       writers.push_back(
         make_pair(name, new MapWriter<Node, Map, Writer>(map, writer)));
@@ -518 +537 @@
     EdgeSetWriter& writeEdgeMap(std::string name, const Map& map, 
                             const Writer& writer = Writer()) {
-      checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
+      checkConcept<concept::ReadMap<Edge, typename Map::Value>, Map>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
       writers.push_back(
         make_pair(name, new MapWriter<Edge, Map, Writer>(map, writer)));
@@ -699 +719 @@
     UndirEdgeSetWriter& writeUndirEdgeMap(std::string name, const Map& map, 
                                           const Writer& writer = Writer()) {
-      checkConcept<concept::WriteMap<UndirEdge, typename Map::Value>, Map>();
+      checkConcept<concept::ReadMap<UndirEdge, typename Map::Value>, Map>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
       writers.push_back(
         make_pair(name, new MapWriter<UndirEdge, Map, Writer>(map, writer)));
@@ -710 +731 @@
     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));
-      return *this;
+      return writeEdgeMap<typename Traits::
+        template Writer<typename Map::Value>, Map>(name, map);
     }
 
@@ -722 +741 @@
     UndirEdgeSetWriter& writeEdgeMap(std::string name, const Map& map, 
                                      const Writer& writer = Writer()) {
-      checkConcept<concept::WriteMap<Edge, typename Map::Value>, Map>();
+      checkConcept<concept::ReadMap<Edge, typename Map::Value>, Map>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
       writeUndirEdge("+" + name, composeMap(forwardMap(graph), map), writer);
       writeUndirEdge("-" + name, composeMap(backwardMap(graph), map), writer);
@@ -1161 +1181 @@
                                     const Value& value,
                                     const Writer& writer = Writer()) {
+      checkConcept<_writer_bits::ItemWriter<Value>, Writer>();
       writers.push_back(make_pair(name, new ValueWriter<Value, Writer>
                                (value, writer)));