lemon-0.x: comparison lemon/lemon

equal deleted inserted replaced

-:44a8d3238562
+:f4c4800df71a
 /// \brief Add a new node map writer command for the writer.
 ///
 /// 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);
 }
 /// \brief Add a new node map writer command for the writer.
 ///
 /// Add a new node map writer command for the writer.
-template <typename Writer, typename Map>
+template <typename ItemWriter, typename Map>
-NodeSetWriter& writeNodeMap(std::string name, const Map& map,
+NodeSetWriter& writeNodeMap(std::string label, const Map& map,
-			    const Writer& writer = Writer()) {
+			    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::
+	make_pair(label, new _writer_bits::
-		  MapWriter<Node, Map, Writer>(map, writer)));
+		  MapWriter<Node, Map, ItemWriter>(map, iw)));
 return *this;
 }
 protected:
 /// \brief  Writer function of the section.
 ///
 /// 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;
 	  forceLabelMap = false;
 	  break;
 	}
 }
 }
 if (forceLabelMap) {
 	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';
 }
 os << std::endl;
 for (typename std::vector<Node>::iterator it = items.begin();
 it != items.end(); ++it) {
 	if (forceLabelMap) {
 	  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';
 	}
 	os << std::endl;
 }
 /// \brief Add a new edge map writer command for the writer.
 ///
 /// 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);
 }
 /// \brief Add a new edge map writer command for the writer.
 ///
 /// Add a new edge map writer command for the writer.
-template <typename Writer, typename Map>
+template <typename ItemWriter, typename Map>
-EdgeSetWriter& writeEdgeMap(std::string name, const Map& map,
+EdgeSetWriter& writeEdgeMap(std::string label, const Map& map,
-			    const Writer& writer = Writer()) {
+			    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::
+	make_pair(label, new _writer_bits::
-		  MapWriter<Edge, Map, Writer>(map, writer)));
+		  MapWriter<Edge, Map, ItemWriter>(map, iw)));
 return *this;
 }
 protected:
 /// Write the content of the section.
 virtual void write(std::ostream& os) {
 if (!nodeLabelWriter->isLabelWriter()) {
 	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;
 	  forceLabelMap = false;
 	  break;
 	}
 }
 os << "\t\t";
 if (forceLabelMap) {
 	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';
 }
 os << std::endl;
 for (typename std::vector<Edge>::iterator it = items.begin();
 it != items.end(); ++it) {
 	nodeLabelWriter->write(os, graph.target(*it));
 	os << '\t';
 	if (forceLabelMap) {
 	  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';
 	}
 	os << std::endl;
 }
 /// \brief Add a new undirected edge map writer command for the writer.
 ///
 /// 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);
 }
 /// \brief Add a new undirected map writer command for the writer.
 ///
 /// Add a new undirected map writer command for the writer.
-template <typename Writer, typename Map>
+template <typename ItemWriter, typename Map>
-UEdgeSetWriter& writeUEdgeMap(std::string name, const Map& map,
+UEdgeSetWriter& writeUEdgeMap(std::string label, const Map& map,
-const Writer& writer = Writer()) {
+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::
+	make_pair(label, new _writer_bits::
-		  MapWriter<UEdge, Map, Writer>(map, writer)));
+		  MapWriter<UEdge, Map, ItemWriter>(map, iw)));
 return *this;
 }
 /// \brief Add a new directed edge map writer command for the writer.
 ///
 /// 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);
 }
 /// \brief Add a new directed map writer command for the writer.
 ///
 /// Add a new directed map writer command for the writer.
-template <typename Writer, typename Map>
+template <typename ItemWriter, typename Map>
-UEdgeSetWriter& writeEdgeMap(std::string name, const Map& map,
+UEdgeSetWriter& writeEdgeMap(std::string label, const Map& map,
-const Writer& writer = Writer()) {
+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;
 }
 protected:
 /// Write the content of the section.
 virtual void write(std::ostream& os) {
 if (!nodeLabelWriter->isLabelWriter()) {
 	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;
 	  forceLabelMap = false;
 	  break;
 	}
 }
 os << "\t\t";
 if (forceLabelMap) {
 	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';
 }
 os << std::endl;
 for (typename std::vector<UEdge>::iterator it = items.begin();
 it != items.end(); ++it) {
 	nodeLabelWriter->write(os, graph.target(*it));
 	os << '\t';
 	if (forceLabelMap) {
 	  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';
 	}
 	os << std::endl;
 }
 public:
 /// \brief Add a node writer command for the NodeWriter.
 ///
 /// Add a node writer command for the NodeWriter.
-void writeNode(const std::string& name, const Node& item) {
+void writeNode(std::string label, const Node& item) {
-writers.push_back(make_pair(name, &item));
+writers.push_back(make_pair(label, &item));
 }
 protected:
 /// \brief The header of the section.
 /// Write the content of the section.
 virtual void write(std::ostream& os) {
 if (!labelWriter->isLabelWriter()) {
 	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));
 	os << std::endl;
 }
 }
 public:
 /// \brief Add an edge writer command for the EdgeWriter.
 ///
 /// Add an edge writer command for the EdgeWriter.
-void writeEdge(const std::string& name, const Edge& item) {
+void writeEdge(std::string label, const Edge& item) {
-writers.push_back(make_pair(name, &item));
+writers.push_back(make_pair(label, &item));
 }
 protected:
 /// \brief The header of the section.
 /// Write the content of the section.
 virtual void write(std::ostream& os) {
 if (!labelWriter->isLabelWriter()) {
 	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));
 	os << std::endl;
 }
 }
 public:
 /// \brief Add an edge writer command for the UEdgeWriter.
 ///
 /// Add an edge writer command for the UEdgeWriter.
-void writeEdge(const std::string& name, const Edge& item) {
+void writeEdge(std::string label, const Edge& item) {
-edgeWriters.push_back(make_pair(name, &item));
+edgeWriters.push_back(make_pair(label, &item));
 }
 /// \brief Add an undirected edge writer command for the UEdgeWriter.
 ///
 /// Add an undirected edge writer command for the UEdgeWriter.
-void writeUEdge(const std::string& name, const UEdge& item) {
+void writeUEdge(std::string label, const UEdge& item) {
-uEdgeWriters.push_back(make_pair(name, &item));
+uEdgeWriters.push_back(make_pair(label, &item));
 }
 protected:
 /// \brief The header of the section.
 	throw DataFormatError("Cannot find undirected edgeset or label map");
 }
 if (!uEdgeLabelWriter->isLabelWriter()) {
 	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));
 	os << std::endl;
 }
 }
 public:
 /// \brief Add an attribute writer command for the writer.
 ///
 /// 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
 	writeAttribute<typename Traits::template Writer<Value> >(name, value);
 }
 /// \brief Add an attribute writer command for the writer.
 ///
 /// Add an attribute writer command for the writer.
-template <typename Writer, typename Value>
+template <typename ItemWriter, typename Value>
-AttributeWriter& writeAttribute(const std::string& name,
+AttributeWriter& writeAttribute(std::string label, const Value& value,
-				    const Value& value,
+				    const ItemWriter& iw = ItemWriter()) {
-				    const Writer& writer = Writer()) {
+checkConcept<_writer_bits::ItemWriter<Value>, ItemWriter>();
-checkConcept<_writer_bits::ItemWriter<Value>, Writer>();
+writers.push_back(make_pair(label, new _writer_bits::
-writers.push_back(make_pair(name, new _writer_bits::
+				  ValueWriter<Value, ItemWriter>(value, iw)));
-				  ValueWriter<Value, Writer>(value, writer)));
 return *this;
 }
 protected:

changeset 2386	81b47fc5c444
parent 2282	9d7b12f83daa
child 2391	14a343be7a5a