lemon-0.x: comparison src/work/deba/graph

equal deleted inserted replaced

-:0b89fa58c5ed
+:43821f31297c
 typedef std::string Value;
 QuotedStringWriter(bool _escaped = true) : escaped(_escaped) {}
 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]);
 	}
 	os << ls.str();
 } else {
 	os << value;
 GraphWriter(std::ostream& _os, Graph& _graph) : os(_os), graph(_graph) {}
 ~GraphWriter() {
+for (typename NodeMapWriters::iterator it = node_map_writers.begin();
-for (typename NodeMapWriters::iterator it = node_map_writers.begin(); it != node_map_writers.end(); ++it) {
+	   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;
 }
 }
 // Node map rules
 template <typename Map>
-GraphWriter& writeNodeMap(std::string name, const Map& map) {
+GraphWriter& addNodeMap(std::string name, const Map& map) {
-return writeNodeMap<typename WriterTraits::template Writer<typename Map::Value>, Map>(name, 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;
 }
 // Edge map rules
 template <typename Map>
-GraphWriter& writeEdgeMap(std::string name, const Map& map) {
+GraphWriter& addEdgeMap(std::string name, const Map& map) {
-return writeEdgeMap<typename WriterTraits::template Writer<typename Map::Value>, Map>(name, 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;
 //      }
 edge_map_writers.push_back(make_pair(name, new MapWriter<Edge, Map, Writer>(map, writer)));
 return *this;
 }
 // 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;
 }
 void write() {
 writeNodeSet();
 writeEdgeSet();
 private:
 void writeNodeSet() {
 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);
 	}
 	os << std::endl;
 }
 if (node_map_writers.size() == 0) {
 	throw Exception() << "Missing node id map";
 }
 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';
 }
 os << std::endl;
 for (EdgeIt it(graph); it != INVALID; ++it) {
 	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);
 	}
 	os << std::endl;
 }
 }
 if (node_writers.size() == 0) return;
 if (node_map_writers.size() == 0) {
 	throw Exception() << "Missing node id map";
 }
 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);
 	os << std::endl;
 }
 }
 if (edge_writers.size() == 0) return;
 if (edge_map_writers.size() == 0) {
 	throw Exception() << "Missing edge id map";
 }
 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);
 	os << std::endl;
 }
 }
 MapWriter(const Map& _map, const Writer& _writer)
 	: map(_map), writer(_writer) {}
 virtual void write(std::ostream& os, const Item& item) {
-	Value value;
 	writer.write(os, map[item]);
 }
 };
-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;
 typedef std::vector<std::pair<std::string, Node> > NodeWriters;
 NodeWriters node_writers;

changeset 1119	d3504fc075dc
parent 1037	3eaff8d04171
child 1133	9fd485470fee