Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/lemon_writer.h

Timestamp:

03/02/07 19:04:28 (17 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Hard Warning checking

• based on the remark of the ZIB user
• we do not use -Winline

File:

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

lemon/lemon_writer.h

@@ -473 +473 @@
     /// Add a new node map writer command for the writer.
     template <typename Map>
-    NodeSetWriter& writeNodeMap(std::string name, const Map& map) {
+    NodeSetWriter& writeNodeMap(std::string label, const Map& map) {
       return writeNodeMap<typename Traits::
-        template Writer<typename Map::Value>, Map>(name, map);
+        template Writer<typename Map::Value>, Map>(label, map);
     }
 
@@ -481 +481 @@
     ///
     /// Add a new node map writer command for the writer.
-    template <typename Writer, typename Map>
-    NodeSetWriter& writeNodeMap(std::string name, const Map& map, 
-                            const Writer& writer = Writer()) {
+    template <typename ItemWriter, typename Map>
+    NodeSetWriter& writeNodeMap(std::string label, const Map& map, 
+                            const ItemWriter& iw = ItemWriter()) {
       checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
-      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>,ItemWriter>();
       writers.push_back(
-        make_pair(name, new _writer_bits::
-                  MapWriter<Node, Map, Writer>(map, writer)));
+        make_pair(label, new _writer_bits::
+                  MapWriter<Node, Map, ItemWriter>(map, iw)));
       return *this;
     }
@@ -505 +505 @@
     /// Write the content of the section.
     virtual void write(std::ostream& os) {
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         if (writers[i].first == "label") {
           labelMap = writers[i].second;
@@ -529 +529 @@
         os << "label\t";
       }
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         os << writers[i].first << '\t';
       }
@@ -538 +538 @@
           os << graph.id(*it) << '\t';
         }
-        for (int i = 0; i < (int)writers.size(); ++i) {
+        for (int i = 0; i < int(writers.size()); ++i) {
           writers[i].second->write(os, *it);
           os << '\t';
@@ -662 +662 @@
     /// Add a new edge map writer command for the writer.
     template <typename Map>
-    EdgeSetWriter& writeEdgeMap(std::string name, const Map& map) {
+    EdgeSetWriter& writeEdgeMap(std::string label, const Map& map) {
       return writeEdgeMap<typename Traits::
-        template Writer<typename Map::Value>, Map>(name, map);
+        template Writer<typename Map::Value>, Map>(label, map);
     }
 
@@ -670 +670 @@
     ///
     /// Add a new edge map writer command for the writer.
-    template <typename Writer, typename Map>
-    EdgeSetWriter& writeEdgeMap(std::string name, const Map& map, 
-                            const Writer& writer = Writer()) {
+    template <typename ItemWriter, typename Map>
+    EdgeSetWriter& writeEdgeMap(std::string label, const Map& map, 
+                            const ItemWriter& iw = ItemWriter()) {
       checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
-      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, ItemWriter>();
       writers.push_back(
-        make_pair(name, new _writer_bits::
-                  MapWriter<Edge, Map, Writer>(map, writer)));
+        make_pair(label, new _writer_bits::
+                  MapWriter<Edge, Map, ItemWriter>(map, iw)));
       return *this;
     }
@@ -697 +697 @@
         throw DataFormatError("Cannot find nodeset or label map");
       }
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         if (writers[i].first == "label") {
           labelMap = writers[i].second;
@@ -722 +722 @@
         os << "label\t";
       }
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         os << writers[i].first << '\t';
       }
@@ -735 +735 @@
           os << graph.id(*it) << '\t';
         }
-        for (int i = 0; i < (int)writers.size(); ++i) {
+        for (int i = 0; i < int(writers.size()); ++i) {
           writers[i].second->write(os, *it);
           os << '\t';
@@ -868 +868 @@
     /// Add a new undirected map writer command for the writer.
     template <typename Map>
-    UEdgeSetWriter& writeUEdgeMap(std::string name, const Map& map) {
+    UEdgeSetWriter& writeUEdgeMap(std::string label, const Map& map) {
       return writeUEdgeMap<typename Traits::
-        template Writer<typename Map::Value>, Map>(name, map);
+        template Writer<typename Map::Value>, Map>(label, map);
     }
 
@@ -876 +876 @@
     ///
     /// Add a new undirected map writer command for the writer.
-    template <typename Writer, typename Map>
-    UEdgeSetWriter& writeUEdgeMap(std::string name, const Map& map, 
-                                  const Writer& writer = Writer()) {
+    template <typename ItemWriter, typename Map>
+    UEdgeSetWriter& writeUEdgeMap(std::string label, const Map& map, 
+                                  const ItemWriter& iw = ItemWriter()) {
       checkConcept<concepts::ReadMap<UEdge, typename Map::Value>, Map>();
-      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, ItemWriter>();
       writers.push_back(
-        make_pair(name, new _writer_bits::
-                  MapWriter<UEdge, Map, Writer>(map, writer)));
+        make_pair(label, new _writer_bits::
+                  MapWriter<UEdge, Map, ItemWriter>(map, iw)));
       return *this;
     }
@@ -891 +891 @@
     /// Add a new directed map writer command for the writer.
     template <typename Map>
-    UEdgeSetWriter& writeEdgeMap(std::string name, const Map& map) {
+    UEdgeSetWriter& writeEdgeMap(std::string label, const Map& map) {
       return writeEdgeMap<typename Traits::
-        template Writer<typename Map::Value>, Map>(name, map);
+        template Writer<typename Map::Value>, Map>(label, map);
     }
 
@@ -899 +899 @@
     ///
     /// Add a new directed map writer command for the writer.
-    template <typename Writer, typename Map>
-    UEdgeSetWriter& writeEdgeMap(std::string name, const Map& map, 
-                                 const Writer& writer = Writer()) {
+    template <typename ItemWriter, typename Map>
+    UEdgeSetWriter& writeEdgeMap(std::string label, const Map& map, 
+                                 const ItemWriter& iw = ItemWriter()) {
       checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
-      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
+      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, ItemWriter>();
       writeUEdgeMap("+" + name, 
-                    _writer_bits::forwardComposeMap(graph, map), writer);
+                    _writer_bits::forwardComposeMap(graph, map), iw);
       writeUEdgeMap("-" + name, 
-                    _writer_bits::backwardComposeMap(graph, map), writer);
+                    _writer_bits::backwardComposeMap(graph, map), iw);
       return *this;
     }
@@ -927 +927 @@
         throw DataFormatError("Cannot find nodeset or label map");
       }
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         if (writers[i].first == "label") {
           labelMap = writers[i].second;
@@ -952 +952 @@
         os << "label\t";
       }
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         os << writers[i].first << '\t';
       }
@@ -965 +965 @@
           os << graph.id(*it) << '\t';
         }
-        for (int i = 0; i < (int)writers.size(); ++i) {
+        for (int i = 0; i < int(writers.size()); ++i) {
           writers[i].second->write(os, *it);
           os << '\t';
@@ -1081 +1081 @@
     ///
     /// Add a node writer command for the NodeWriter.
-    void writeNode(const std::string& name, const Node& item) {
-      writers.push_back(make_pair(name, &item));
+    void writeNode(std::string label, const Node& item) {
+      writers.push_back(make_pair(label, &item));
     }
 
@@ -1101 +1101 @@
         throw DataFormatError("Cannot find nodeset or label map");
       }
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         os << writers[i].first << ' ';
         labelWriter->write(os, *(writers[i].second));
@@ -1165 +1165 @@
     ///
     /// Add an edge writer command for the EdgeWriter.
-    void writeEdge(const std::string& name, const Edge& item) {
-      writers.push_back(make_pair(name, &item));
+    void writeEdge(std::string label, const Edge& item) {
+      writers.push_back(make_pair(label, &item));
     }
 
@@ -1185 +1185 @@
         throw DataFormatError("Cannot find edgeset or label map");
       }
-      for (int i = 0; i < (int)writers.size(); ++i) {
+      for (int i = 0; i < int(writers.size()); ++i) {
         os << writers[i].first << ' ';
         labelWriter->write(os, *(writers[i].second));
@@ -1257 +1257 @@
     ///
     /// Add an edge writer command for the UEdgeWriter.
-    void writeEdge(const std::string& name, const Edge& item) {
-      edgeWriters.push_back(make_pair(name, &item));
+    void writeEdge(std::string label, const Edge& item) {
+      edgeWriters.push_back(make_pair(label, &item));
     }
 
@@ -1264 +1264 @@
     ///
     /// Add an undirected edge writer command for the UEdgeWriter.
-    void writeUEdge(const std::string& name, const UEdge& item) {
-      uEdgeWriters.push_back(make_pair(name, &item));
+    void writeUEdge(std::string label, const UEdge& item) {
+      uEdgeWriters.push_back(make_pair(label, &item));
     }
 
@@ -1287 +1287 @@
         throw DataFormatError("Cannot find undirected edgeset or label map");
       }
-      for (int i = 0; i < (int)uEdgeWriters.size(); ++i) {
+      for (int i = 0; i < int(uEdgeWriters.size()); ++i) {
         os << uEdgeWriters[i].first << ' ';
         uEdgeLabelWriter->write(os, *(uEdgeWriters[i].second));
         os << std::endl;
       }
-      for (int i = 0; i < (int)edgeWriters.size(); ++i) {
+      for (int i = 0; i < int(edgeWriters.size()); ++i) {
         os << edgeWriters[i].first << ' ';
         edgeLabelWriter->write(os, *(edgeWriters[i].second));
@@ -1364 +1364 @@
     /// Add an attribute writer command for the writer.
     template <typename Value>
-    AttributeWriter& writeAttribute(const std::string& name, 
+    AttributeWriter& writeAttribute(std::string label, 
                                     const Value& value) {
       return 
@@ -1373 +1373 @@
     ///
     /// Add an attribute writer command for the writer.
-    template <typename Writer, typename Value>
-    AttributeWriter& writeAttribute(const std::string& name, 
-                                    const Value& value,
-                                    const Writer& writer = Writer()) {
-      checkConcept<_writer_bits::ItemWriter<Value>, Writer>();
-      writers.push_back(make_pair(name, new _writer_bits::
-                                  ValueWriter<Value, Writer>(value, writer)));
+    template <typename ItemWriter, typename Value>
+    AttributeWriter& writeAttribute(std::string label, const Value& value,
+                                    const ItemWriter& iw = ItemWriter()) {
+      checkConcept<_writer_bits::ItemWriter<Value>, ItemWriter>();
+      writers.push_back(make_pair(label, new _writer_bits::
+                                  ValueWriter<Value, ItemWriter>(value, iw)));
       return *this;
     }