1.1 --- a/lemon/graph_writer.h	Thu Jan 19 16:56:39 2006 +0000
     1.2 +++ b/lemon/graph_writer.h	Tue Jan 24 16:07:38 2006 +0000
     1.3 @@ -54,12 +54,12 @@
     1.4    /// The \c writeNodeMap() function declares a \c NodeMap writing 
     1.5    /// command in the \c GraphWriter. You should give as parameter 
     1.6    /// the name of the map and the map object. The NodeMap writing 
     1.7 -  /// command with name "id" should write a unique map because it 
     1.8 -  /// is regarded as ID map (such a map is essential if the graph has edges).
     1.9 +  /// command with name "label" should write a unique map because it 
    1.10 +  /// is regarded as label map (such a map is essential if the graph has edges).
    1.11    ///
    1.12    /// \code
    1.13 -  /// IdMap<ListGraph, Node> nodeIdMap;
    1.14 -  /// writer.writeNodeMap("id", nodeIdMap);
    1.15 +  /// IdMap<ListGraph, Node> nodeLabelMap;
    1.16 +  /// writer.writeNodeMap("label", nodeLabelMap);
    1.17    ///
    1.18    /// writer.writeNodeMap("coords", coords);
    1.19    /// writer.writeNodeMap("color", colorMap);
    1.20 @@ -253,20 +253,20 @@
    1.21        writer->run();
    1.22      }
    1.23  
    1.24 -    /// \brief Write the id of the given node.
    1.25 +    /// \brief Write the label of the given node.
    1.26      ///
    1.27 -    /// It writes the id of the given node. If there was written an "id"
    1.28 +    /// It writes the label of the given node. If there was written an "label"
    1.29      /// named node map then it will write the map value belonging to the node.
    1.30 -    void writeId(std::ostream& os, const Node& item) const {
    1.31 -      nodeset_writer.writeId(os, item);
    1.32 +    void writeLabel(std::ostream& os, const Node& item) const {
    1.33 +      nodeset_writer.writeLabel(os, item);
    1.34      } 
    1.35  
    1.36 -    /// \brief Write the id of the given edge.
    1.37 +    /// \brief Write the label of the given edge.
    1.38      ///
    1.39 -    /// It writes the id of the given edge. If there was written an "id"
    1.40 +    /// It writes the label of the given edge. If there was written an "label"
    1.41      /// named edge map then it will write the map value belonging to the edge.
    1.42 -    void writeId(std::ostream& os, const Edge& item) const {
    1.43 -      edgeset_writer.writeId(os, item);
    1.44 +    void writeLabel(std::ostream& os, const Edge& item) const {
    1.45 +      edgeset_writer.writeLabel(os, item);
    1.46      } 
    1.47  
    1.48    private:
    1.49 @@ -327,12 +327,12 @@
    1.50    /// The \c writeNodeMap() function declares a \c NodeMap writing 
    1.51    /// command in the \c UndirGraphWriter. You should give as parameter 
    1.52    /// the name of the map and the map object. The NodeMap writing 
    1.53 -  /// command with name "id" should write a unique map because it 
    1.54 -  /// is regarded as ID map.
    1.55 +  /// command with name "label" should write a unique map because it 
    1.56 +  /// is regarded as label map.
    1.57    ///
    1.58    /// \code
    1.59 -  /// IdMap<UndirListGraph, Node> nodeIdMap;
    1.60 -  /// writer.writeNodeMap("id", nodeIdMap);
    1.61 +  /// IdMap<UndirListGraph, Node> nodeLabelMap;
    1.62 +  /// writer.writeNodeMap("label", nodeLabelMap);
    1.63    ///
    1.64    /// writer.writeNodeMap("coords", coords);
    1.65    /// writer.writeNodeMap("color", colorMap);
    1.66 @@ -561,29 +561,29 @@
    1.67        writer->run();
    1.68      }
    1.69  
    1.70 -    /// \brief Write the id of the given node.
    1.71 +    /// \brief Write the label of the given node.
    1.72      ///
    1.73 -    /// It writes the id of the given node. If there was written an "id"
    1.74 +    /// It writes the label of the given node. If there was written an "label"
    1.75      /// named node map then it will write the map value belonging to the node.
    1.76 -    void writeId(std::ostream& os, const Node& item) const {
    1.77 -      nodeset_writer.writeId(os, item);
    1.78 +    void writeLabel(std::ostream& os, const Node& item) const {
    1.79 +      nodeset_writer.writeLabel(os, item);
    1.80      } 
    1.81  
    1.82 -    /// \brief Write the id of the given edge.
    1.83 +    /// \brief Write the label of the given edge.
    1.84      ///
    1.85 -    /// It writes the id of the given edge. If there was written an "id"
    1.86 +    /// It writes the label of the given edge. If there was written an "label"
    1.87      /// named edge map then it will write the map value belonging to the edge.
    1.88 -    void writeId(std::ostream& os, const Edge& item) const {
    1.89 -      undir_edgeset_writer.writeId(os, item);
    1.90 +    void writeLabel(std::ostream& os, const Edge& item) const {
    1.91 +      undir_edgeset_writer.writeLabel(os, item);
    1.92      } 
    1.93  
    1.94 -    /// \brief Write the id of the given undirected edge.
    1.95 +    /// \brief Write the label of the given undirected edge.
    1.96      ///
    1.97 -    /// It writes the id of the given undirected edge. If there was written 
    1.98 -    /// an "id" named edge map then it will write the map value belonging to 
    1.99 +    /// It writes the label of the given undirected edge. If there was written 
   1.100 +    /// an "label" named edge map then it will write the map value belonging to 
   1.101      /// the edge.
   1.102 -    void writeId(std::ostream& os, const UndirEdge& item) const {
   1.103 -      undir_edgeset_writer.writeId(os, item);
   1.104 +    void writeLabel(std::ostream& os, const UndirEdge& item) const {
   1.105 +      undir_edgeset_writer.writeLabel(os, item);
   1.106      } 
   1.107  
   1.108