1.1 --- a/lemon/graph_writer.h Fri Mar 02 17:56:22 2007 +0000
1.2 +++ b/lemon/graph_writer.h Fri Mar 02 18:04:28 2007 +0000
1.3 @@ -158,8 +158,8 @@
1.4 ///
1.5 /// This function issues a new <i> node map writing command</i> to the writer.
1.6 template <typename Map>
1.7 - GraphWriter& writeNodeMap(std::string name, const Map& map) {
1.8 - nodeset_writer.writeNodeMap(name, map);
1.9 + GraphWriter& writeNodeMap(std::string label, const Map& map) {
1.10 + nodeset_writer.writeNodeMap(label, map);
1.11 return *this;
1.12 }
1.13
1.14 @@ -167,10 +167,10 @@
1.15 /// \brief Issue a new node map writing command for the writer.
1.16 ///
1.17 /// This function issues a new <i> node map writing command</i> to the writer.
1.18 - template <typename Writer, typename Map>
1.19 - GraphWriter& writeNodeMap(std::string name, const Map& map,
1.20 - const Writer& writer = Writer()) {
1.21 - nodeset_writer.writeNodeMap(name, map, writer);
1.22 + template <typename ItemWriter, typename Map>
1.23 + GraphWriter& writeNodeMap(std::string label, const Map& map,
1.24 + const ItemWriter& iw = ItemWriter()) {
1.25 + nodeset_writer.writeNodeMap(label, map, iw);
1.26 return *this;
1.27 }
1.28
1.29 @@ -179,8 +179,8 @@
1.30 ///
1.31 /// This function issues a new <i> edge map writing command</i> to the writer.
1.32 template <typename Map>
1.33 - GraphWriter& writeEdgeMap(std::string name, const Map& map) {
1.34 - edgeset_writer.writeEdgeMap(name, map);
1.35 + GraphWriter& writeEdgeMap(std::string label, const Map& map) {
1.36 + edgeset_writer.writeEdgeMap(label, map);
1.37 return *this;
1.38 }
1.39
1.40 @@ -188,10 +188,10 @@
1.41 /// \brief Issue a new edge map writing command for the writer.
1.42 ///
1.43 /// This function issues a new <i> edge map writing command</i> to the writer.
1.44 - template <typename Writer, typename Map>
1.45 - GraphWriter& writeEdgeMap(std::string name, const Map& map,
1.46 - const Writer& writer = Writer()) {
1.47 - edgeset_writer.writeEdgeMap(name, map, writer);
1.48 + template <typename ItemWriter, typename Map>
1.49 + GraphWriter& writeEdgeMap(std::string label, const Map& map,
1.50 + const ItemWriter& iw = ItemWriter()) {
1.51 + edgeset_writer.writeEdgeMap(label, map, iw);
1.52 return *this;
1.53 }
1.54
1.55 @@ -199,8 +199,8 @@
1.56 ///
1.57 /// This function issues a new <i> labeled node writing command</i>
1.58 /// to the writer.
1.59 - GraphWriter& writeNode(std::string name, const Node& node) {
1.60 - node_writer.writeNode(name, node);
1.61 + GraphWriter& writeNode(std::string label, const Node& node) {
1.62 + node_writer.writeNode(label, node);
1.63 return *this;
1.64 }
1.65
1.66 @@ -208,8 +208,8 @@
1.67 ///
1.68 /// This function issues a new <i> labeled edge writing command</i>
1.69 /// to the writer.
1.70 - GraphWriter& writeEdge(std::string name, const Edge& edge) {
1.71 - edge_writer.writeEdge(name, edge);
1.72 + GraphWriter& writeEdge(std::string label, const Edge& edge) {
1.73 + edge_writer.writeEdge(label, edge);
1.74 }
1.75
1.76 /// \brief Issue a new attribute writing command.
1.77 @@ -217,8 +217,8 @@
1.78 /// This function issues a new <i> attribute writing command</i>
1.79 /// to the writer.
1.80 template <typename Value>
1.81 - GraphWriter& writeAttribute(std::string name, const Value& value) {
1.82 - attribute_writer.writeAttribute(name, value);
1.83 + GraphWriter& writeAttribute(std::string label, const Value& value) {
1.84 + attribute_writer.writeAttribute(label, value);
1.85 return *this;
1.86 }
1.87
1.88 @@ -226,10 +226,10 @@
1.89 ///
1.90 /// This function issues a new <i> attribute writing command</i>
1.91 /// to the writer.
1.92 - template <typename Writer, typename Value>
1.93 - GraphWriter& writeAttribute(std::string name, const Value& value,
1.94 - const Writer& writer) {
1.95 - attribute_writer.writeAttribute<Writer>(name, value, writer);
1.96 + template <typename ItemWriter, typename Value>
1.97 + GraphWriter& writeAttribute(std::string label, const Value& value,
1.98 + const ItemWriter& iw = ItemWriter()) {
1.99 + attribute_writer.writeAttribute(label, value, iw);
1.100 return *this;
1.101 }
1.102
1.103 @@ -412,8 +412,8 @@
1.104 /// This function issues a new <i> node map writing command</i> to
1.105 /// the writer.
1.106 template <typename Map>
1.107 - UGraphWriter& writeNodeMap(std::string name, const Map& map) {
1.108 - nodeset_writer.writeNodeMap(name, map);
1.109 + UGraphWriter& writeNodeMap(std::string label, const Map& map) {
1.110 + nodeset_writer.writeNodeMap(label, map);
1.111 return *this;
1.112 }
1.113
1.114 @@ -421,10 +421,10 @@
1.115 ///
1.116 /// This function issues a new <i> node map writing command</i> to
1.117 /// the writer.
1.118 - template <typename Writer, typename Map>
1.119 - UGraphWriter& writeNodeMap(std::string name, const Map& map,
1.120 - const Writer& writer = Writer()) {
1.121 - nodeset_writer.writeNodeMap(name, map, writer);
1.122 + template <typename ItemWriter, typename Map>
1.123 + UGraphWriter& writeNodeMap(std::string label, const Map& map,
1.124 + const ItemWriter& iw = ItemWriter()) {
1.125 + nodeset_writer.writeNodeMap(label, map, iw);
1.126 return *this;
1.127 }
1.128
1.129 @@ -433,8 +433,8 @@
1.130 /// This function issues a new <i> edge map writing command</i> to
1.131 /// the writer.
1.132 template <typename Map>
1.133 - UGraphWriter& writeEdgeMap(std::string name, const Map& map) {
1.134 - u_edgeset_writer.writeEdgeMap(name, map);
1.135 + UGraphWriter& writeEdgeMap(std::string label, const Map& map) {
1.136 + u_edgeset_writer.writeEdgeMap(label, map);
1.137 return *this;
1.138 }
1.139
1.140 @@ -442,10 +442,10 @@
1.141 ///
1.142 /// This function issues a new <i> edge map writing command</i> to
1.143 /// the writer.
1.144 - template <typename Writer, typename Map>
1.145 - UGraphWriter& writeEdgeMap(std::string name, const Map& map,
1.146 - const Writer& writer = Writer()) {
1.147 - u_edgeset_writer.writeEdgeMap(name, map, writer);
1.148 + template <typename ItemWriter, typename Map>
1.149 + UGraphWriter& writeEdgeMap(std::string label, const Map& map,
1.150 + const ItemWriter& iw = ItemWriter()) {
1.151 + u_edgeset_writer.writeEdgeMap(label, map, iw);
1.152 return *this;
1.153 }
1.154
1.155 @@ -454,8 +454,8 @@
1.156 /// This function issues a new <i> undirected edge map writing
1.157 /// command</i> to the writer.
1.158 template <typename Map>
1.159 - UGraphWriter& writeUEdgeMap(std::string name, const Map& map) {
1.160 - u_edgeset_writer.writeUEdgeMap(name, map);
1.161 + UGraphWriter& writeUEdgeMap(std::string label, const Map& map) {
1.162 + u_edgeset_writer.writeUEdgeMap(label, map);
1.163 return *this;
1.164 }
1.165
1.166 @@ -463,10 +463,10 @@
1.167 ///
1.168 /// This function issues a new <i> undirected edge map writing
1.169 /// command</i> to the writer.
1.170 - template <typename Writer, typename Map>
1.171 - UGraphWriter& writeUEdgeMap(std::string name, const Map& map,
1.172 - const Writer& writer = Writer()) {
1.173 - u_edgeset_writer.writeUEdgeMap(name, map, writer);
1.174 + template <typename ItemWriter, typename Map>
1.175 + UGraphWriter& writeUEdgeMap(std::string label, const Map& map,
1.176 + const ItemWriter& iw = ItemWriter()) {
1.177 + u_edgeset_writer.writeUEdgeMap(label, map, iw);
1.178 return *this;
1.179 }
1.180
1.181 @@ -474,8 +474,8 @@
1.182 ///
1.183 /// This function issues a new <i> labeled node writing
1.184 /// command</i> to the writer.
1.185 - UGraphWriter& writeNode(std::string name, const Node& node) {
1.186 - node_writer.writeNode(name, node);
1.187 + UGraphWriter& writeNode(std::string label, const Node& node) {
1.188 + node_writer.writeNode(label, node);
1.189 return *this;
1.190 }
1.191
1.192 @@ -483,8 +483,8 @@
1.193 ///
1.194 /// This function issues a new <i> labeled edge writing
1.195 /// command</i> to the writer.
1.196 - UGraphWriter& writeEdge(std::string name, const Edge& edge) {
1.197 - u_edge_writer.writeEdge(name, edge);
1.198 + UGraphWriter& writeEdge(std::string label, const Edge& edge) {
1.199 + u_edge_writer.writeEdge(label, edge);
1.200 }
1.201
1.202 /// \brief Issue a new labeled undirected edge writing command to
1.203 @@ -492,8 +492,8 @@
1.204 ///
1.205 /// Issue a new <i>labeled undirected edge writing command</i> to
1.206 /// the writer.
1.207 - UGraphWriter& writeUEdge(std::string name, const UEdge& edge) {
1.208 - u_edge_writer.writeUEdge(name, edge);
1.209 + UGraphWriter& writeUEdge(std::string label, const UEdge& edge) {
1.210 + u_edge_writer.writeUEdge(label, edge);
1.211 }
1.212
1.213 /// \brief Issue a new attribute writing command.
1.214 @@ -501,8 +501,8 @@
1.215 /// This function issues a new <i> attribute writing
1.216 /// command</i> to the writer.
1.217 template <typename Value>
1.218 - UGraphWriter& writeAttribute(std::string name, const Value& value) {
1.219 - attribute_writer.writeAttribute(name, value);
1.220 + UGraphWriter& writeAttribute(std::string label, const Value& value) {
1.221 + attribute_writer.writeAttribute(label, value);
1.222 return *this;
1.223 }
1.224
1.225 @@ -510,10 +510,10 @@
1.226 ///
1.227 /// This function issues a new <i> attribute writing
1.228 /// command</i> to the writer.
1.229 - template <typename Writer, typename Value>
1.230 - UGraphWriter& writeAttribute(std::string name, const Value& value,
1.231 - const Writer& writer) {
1.232 - attribute_writer.writeAttribute<Writer>(name, value, writer);
1.233 + template <typename ItemWriter, typename Value>
1.234 + UGraphWriter& writeAttribute(std::string label, const Value& value,
1.235 + const ItemWriter& iw = ItemWriter()) {
1.236 + attribute_writer.writeAttribute(label, value, iw);
1.237 return *this;
1.238 }
1.239