Changeset 1115:444f69240539 in lemon-0.x for src/work/deba/graph_writer.h

Timestamp:

02/01/05 16:56:37 (19 years ago)

Author:

Balazs Dezso

Branch:

default

Phase:

public

Convert:

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

Message:

Some changes in the IO and map utilities.

File:

• src/work/deba/graph_writer.h (modified) (12 diffs)

src/work/deba/graph_writer.h

@@ -55 +55 @@
 
     void write(std::ostream& os, const std::string& value) {
-      char c;
       os << "\"";
       if (escaped) {
         ostringstream ls;
-        for (int i = 0; i < value.size(); ++i) {
+        for (int i = 0; i < (int)value.size(); ++i) {
           writeEscape(ls, value[i]);
         }
@@ -137 +136 @@
 
     ~GraphWriter() {
-
-      for (typename NodeMapWriters::iterator it = node_map_writers.begin(); it != node_map_writers.end(); ++it) {
+      for (typename NodeMapWriters::iterator it = node_map_writers.begin(); 
+           it != node_map_writers.end(); ++it) {
         delete it->second;
       }
 
-      for (typename EdgeMapWriters::iterator it = edge_map_writers.begin(); it != edge_map_writers.end(); ++it) {
+      for (typename EdgeMapWriters::iterator it = edge_map_writers.begin();
+           it != edge_map_writers.end(); ++it) {
         delete it->second;
       }
@@ -151 +151 @@
 
     template <typename Map>
-    GraphWriter& writeNodeMap(std::string name, const Map& map) {
-      return writeNodeMap<typename WriterTraits::template Writer<typename Map::Value>, Map>(name, map);
+    GraphWriter& addNodeMap(std::string name, const Map& map) {
+      return addNodeMap<typename WriterTraits::template Writer<
+        typename Map::Value>, Map>(name, map);
     }
 
     template <typename Writer, typename Map>
-    GraphWriter& writeNodeMap(std::string name, const Map& map, const Writer& writer = Writer()) {
+    GraphWriter& addNodeMap(std::string name, const Map& map, 
+                              const Writer& writer = Writer()) {
       //      if (node_map_writers.find(name) != node_map_writers.end()) {
-      //        throw Exception() << "Multiple write rule for node map: " << name;
+      //        throw Exception() << "Multiple write rule for node map: " 
+      //        << name;
       //      }
-      node_map_writers.push_back(make_pair(name, new MapWriter<Node, Map, Writer>(map, writer)));
+      node_map_writers.push_back(
+        make_pair(name, new MapWriter<Node, Map, Writer>(map, writer)));
       return *this;
     }
@@ -167 +171 @@
 
     template <typename Map>
-    GraphWriter& writeEdgeMap(std::string name, const Map& map) { 
-      return writeEdgeMap<typename WriterTraits::template Writer<typename Map::Value>, Map>(name, map);
+    GraphWriter& addEdgeMap(std::string name, const Map& map) { 
+      return addEdgeMap<typename WriterTraits::template Writer<typename Map::Value>, Map>(name, map);
     }
 
 
     template <typename Writer, typename Map>
-    GraphWriter& writeEdgeMap(std::string name, const Map& map, const Writer& writer = Writer()) {
+    GraphWriter& addEdgeMap(std::string name, const Map& map, const Writer& writer = Writer()) {
       //      if (edge_map_writers.find(name) != edge_map_writers.end()) {
       //        throw Exception() << "Multiple write rule for edge map: " << name;
@@ -182 +186 @@
 
     // Node rules
-    GraphWriter& writeNode(std::string name, const Node& node) {
+    GraphWriter& addNode(std::string name, const Node& node) {
       //      if (node_writers.find(name) != node_writers.end()) {
       //        throw Exception() << "Multiple write rule for node";
       //      }
       node_writers.push_back(make_pair(name, node));
+      return *this;
     }
 
     // Edge rules
 
-    GraphWriter& writeEdge(std::string name, const Edge& edge) {
+    GraphWriter& addEdge(std::string name, const Edge& edge) {
       //      if (edge_writers.find(name) != edge_writers.end()) {
       //        throw Exception() << "Multiple write rule for edge";
       //      }
       edge_writers.push_back(make_pair(name, edge));
+      return *this;
     }
 
@@ -211 +217 @@
       if (node_map_writers.size() == 0) return;
       os << "@nodeset" << std::endl;
-      for (int i = 0; i < node_map_writers.size(); ++i) {
+      for (int i = 0; i < (int)node_map_writers.size(); ++i) {
         os << node_map_writers[i].first << '\t';
       } 
       os << std::endl;
       for (NodeIt it(graph); it != INVALID; ++it) {
-        for (int i = 0; i < node_map_writers.size(); ++i) {
+        for (int i = 0; i < (int)node_map_writers.size(); ++i) {
           node_map_writers[i].second->write(os, it);
         }
@@ -231 +237 @@
       os << "@edgeset" << std::endl;
       os << "\t\t";
-      for (int i = 0; i < edge_map_writers.size(); ++i) {
+      for (int i = 0; i < (int)edge_map_writers.size(); ++i) {
         os << edge_map_writers[i].first << '\t';
       } 
@@ -238 +244 @@
         node_map_writers[0].second->write(os, graph.source(it));
         node_map_writers[0].second->write(os, graph.target(it));
-        for (int i = 0; i < edge_map_writers.size(); ++i) {
+        for (int i = 0; i < (int)edge_map_writers.size(); ++i) {
           edge_map_writers[i].second->write(os, it);
         }
@@ -251 +257 @@
       }
       os << "@nodes" << std::endl;
-      for (int i = 0; i < node_writers.size(); ++i) {
+      for (int i = 0; i < (int)node_writers.size(); ++i) {
         os << node_writers[i].first << '\t';
         node_map_writers[0].second->write(os, node_writers[i].second);
@@ -264 +270 @@
       }
       os << "@edges" << std::endl;
-      for (int i = 0; i < edge_writers.size(); ++i) {
+      for (int i = 0; i < (int)edge_writers.size(); ++i) {
         os << edge_writers[i].first << '\t';
         edge_map_writers[0].second->write(os, edge_writers[i].second);
@@ -296 +302 @@
 
       virtual void write(std::ostream& os, const Item& item) {
-        Value value;
         writer.write(os, map[item]);
       }
@@ -304 +309 @@
 
 
-    typedef std::vector< std::pair<std::string, WriterBase<Node>*> > NodeMapWriters;
+    typedef std::vector< std::pair<std::string, WriterBase<Node>*> > 
+      NodeMapWriters;
     NodeMapWriters node_map_writers;
 
-    typedef std::vector< std::pair<std::string, WriterBase<Edge>*> > EdgeMapWriters;
+    typedef std::vector< std::pair<std::string, WriterBase<Edge>*> > 
+      EdgeMapWriters;
     EdgeMapWriters edge_map_writers;