COIN-OR::LEMON - Graph Library

About

Downloads

Documentation

Development

Issue Tracker

Browse Tickets

Custom Query

Roadmap

Browse Source

Local Info

Mailing Lists

Search

Changeset 2386:81b47fc5c444 in lemon-0.x for lemon/graph_writer.h


Ignore:
Timestamp:
03/02/07 19:04:28 (17 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3217
Message:

Hard Warning checking

  • based on the remark of the ZIB user
  • we do not use -Winline
File:
1 edited

Legend:

Unmodified
Added
Removed

  • lemon/graph_writer.h

    r2200 r2386  
    159159   /// This function issues a new <i> node map writing command</i> to the writer.
    160160    template <typename Map>
    161     GraphWriter& writeNodeMap(std::string name, const Map& map) {
    162       nodeset_writer.writeNodeMap(name, map);
     161    GraphWriter& writeNodeMap(std::string label, const Map& map) {
     162      nodeset_writer.writeNodeMap(label, map);
    163163      return *this;
    164164    }
    … …  
    168168    ///
    169169   /// This function issues a new <i> node map writing command</i> to the writer.
    170     template <typename Writer, typename Map>
    171     GraphWriter& writeNodeMap(std::string name, const Map& map,
    172                               const Writer& writer = Writer()) {
    173       nodeset_writer.writeNodeMap(name, map, writer);
     170    template <typename ItemWriter, typename Map>
     171    GraphWriter& writeNodeMap(std::string label, const Map& map,
     172                              const ItemWriter& iw = ItemWriter()) {
     173      nodeset_writer.writeNodeMap(label, map, iw);
    174174      return *this;
    175175    }
    … …  
    180180   /// This function issues a new <i> edge map writing command</i> to the writer.
    181181    template <typename Map>
    182     GraphWriter& writeEdgeMap(std::string name, const Map& map) {
    183       edgeset_writer.writeEdgeMap(name, map);
     182    GraphWriter& writeEdgeMap(std::string label, const Map& map) {
     183      edgeset_writer.writeEdgeMap(label, map);
    184184      return *this;
    185185    }
    … …  
    189189    ///
    190190   /// This function issues a new <i> edge map writing command</i> to the writer.
    191     template <typename Writer, typename Map>
    192     GraphWriter& writeEdgeMap(std::string name, const Map& map,
    193                               const Writer& writer = Writer()) {
    194       edgeset_writer.writeEdgeMap(name, map, writer);
     191    template <typename ItemWriter, typename Map>
     192    GraphWriter& writeEdgeMap(std::string label, const Map& map,
     193                              const ItemWriter& iw = ItemWriter()) {
     194      edgeset_writer.writeEdgeMap(label, map, iw);
    195195      return *this;
    196196    }
    … …  
    200200    /// This function issues a new <i> labeled node writing command</i>
    201201    /// to the writer.
    202     GraphWriter& writeNode(std::string name, const Node& node) {
    203       node_writer.writeNode(name, node);
     202    GraphWriter& writeNode(std::string label, const Node& node) {
     203      node_writer.writeNode(label, node);
    204204      return *this;
    205205    }
    … …  
    209209    /// This function issues a new <i> labeled edge writing command</i>
    210210    /// to the writer.
    211     GraphWriter& writeEdge(std::string name, const Edge& edge) {
    212       edge_writer.writeEdge(name, edge);
     211    GraphWriter& writeEdge(std::string label, const Edge& edge) {
     212      edge_writer.writeEdge(label, edge);
    213213    }
    214214
    … …  
    218218    /// to the writer.
    219219    template <typename Value>
    220     GraphWriter& writeAttribute(std::string name, const Value& value) {
    221       attribute_writer.writeAttribute(name, value);
     220    GraphWriter& writeAttribute(std::string label, const Value& value) {
     221      attribute_writer.writeAttribute(label, value);
    222222      return *this;
    223223    }
    … …  
    227227    /// This function issues a new <i> attribute writing command</i>
    228228    /// to the writer.
    229     template <typename Writer, typename Value>
    230     GraphWriter& writeAttribute(std::string name, const Value& value,
    231                                const Writer& writer) {
    232       attribute_writer.writeAttribute<Writer>(name, value, writer);
     229    template <typename ItemWriter, typename Value>
     230    GraphWriter& writeAttribute(std::string label, const Value& value,
     231                               const ItemWriter& iw = ItemWriter()) {
     232      attribute_writer.writeAttribute(label, value, iw);
    233233      return *this;
    234234    }
    … …  
    413413    /// the writer.
    414414    template <typename Map>
    415     UGraphWriter& writeNodeMap(std::string name, const Map& map) {
    416       nodeset_writer.writeNodeMap(name, map);
     415    UGraphWriter& writeNodeMap(std::string label, const Map& map) {
     416      nodeset_writer.writeNodeMap(label, map);
    417417      return *this;
    418418    }
    … …  
    422422    /// This function issues a new <i> node map writing command</i> to
    423423    /// the writer.
    424     template <typename Writer, typename Map>
    425     UGraphWriter& writeNodeMap(std::string name, const Map& map,
    426                               const Writer& writer = Writer()) {
    427       nodeset_writer.writeNodeMap(name, map, writer);
     424    template <typename ItemWriter, typename Map>
     425    UGraphWriter& writeNodeMap(std::string label, const Map& map,
     426                              const ItemWriter& iw = ItemWriter()) {
     427      nodeset_writer.writeNodeMap(label, map, iw);
    428428      return *this;
    429429    }
    … …  
    434434    /// the writer.
    435435    template <typename Map>
    436     UGraphWriter& writeEdgeMap(std::string name, const Map& map) {
    437       u_edgeset_writer.writeEdgeMap(name, map);
     436    UGraphWriter& writeEdgeMap(std::string label, const Map& map) {
     437      u_edgeset_writer.writeEdgeMap(label, map);
    438438      return *this;
    439439    }
    … …  
    443443    /// This function issues a new <i> edge map writing command</i> to
    444444    /// the writer.
    445     template <typename Writer, typename Map>
    446     UGraphWriter& writeEdgeMap(std::string name, const Map& map,
    447                                    const Writer& writer = Writer()) {
    448       u_edgeset_writer.writeEdgeMap(name, map, writer);
     445    template <typename ItemWriter, typename Map>
     446    UGraphWriter& writeEdgeMap(std::string label, const Map& map,
     447                                   const ItemWriter& iw = ItemWriter()) {
     448      u_edgeset_writer.writeEdgeMap(label, map, iw);
    449449      return *this;
    450450    }
    … …  
    455455    /// command</i> to the writer.
    456456    template <typename Map>
    457     UGraphWriter& writeUEdgeMap(std::string name, const Map& map) {
    458       u_edgeset_writer.writeUEdgeMap(name, map);
     457    UGraphWriter& writeUEdgeMap(std::string label, const Map& map) {
     458      u_edgeset_writer.writeUEdgeMap(label, map);
    459459      return *this;
    460460    }
    … …  
    464464    /// This function issues a new <i> undirected edge map writing
    465465    /// command</i> to the writer.
    466    template <typename Writer, typename Map>
    467     UGraphWriter& writeUEdgeMap(std::string name, const Map& map,
    468                                         const Writer& writer = Writer()) {
    469       u_edgeset_writer.writeUEdgeMap(name, map, writer);
     466   template <typename ItemWriter, typename Map>
     467    UGraphWriter& writeUEdgeMap(std::string label, const Map& map,
     468                                        const ItemWriter& iw = ItemWriter()) {
     469      u_edgeset_writer.writeUEdgeMap(label, map, iw);
    470470      return *this;
    471471    }
    … …  
    475475    /// This function issues a new <i> labeled node writing
    476476    /// command</i> to the writer.
    477     UGraphWriter& writeNode(std::string name, const Node& node) {
    478       node_writer.writeNode(name, node);
     477    UGraphWriter& writeNode(std::string label, const Node& node) {
     478      node_writer.writeNode(label, node);
    479479      return *this;
    480480    }
    … …  
    484484    /// This function issues a new <i> labeled edge writing
    485485    /// command</i> to the writer.
    486     UGraphWriter& writeEdge(std::string name, const Edge& edge) {
    487       u_edge_writer.writeEdge(name, edge);
     486    UGraphWriter& writeEdge(std::string label, const Edge& edge) {
     487      u_edge_writer.writeEdge(label, edge);
    488488    }
    489489
    … …  
    493493    /// Issue a new <i>labeled undirected edge writing command</i> to
    494494    /// the writer.
    495     UGraphWriter& writeUEdge(std::string name, const UEdge& edge) {
    496       u_edge_writer.writeUEdge(name, edge);
     495    UGraphWriter& writeUEdge(std::string label, const UEdge& edge) {
     496      u_edge_writer.writeUEdge(label, edge);
    497497    }
    498498
    … …  
    502502    /// command</i> to the writer.
    503503    template <typename Value>
    504     UGraphWriter& writeAttribute(std::string name, const Value& value) {
    505       attribute_writer.writeAttribute(name, value);
     504    UGraphWriter& writeAttribute(std::string label, const Value& value) {
     505      attribute_writer.writeAttribute(label, value);
    506506      return *this;
    507507    }
    … …  
    511511    /// This function issues a new <i> attribute writing
    512512    /// command</i> to the writer.
    513     template <typename Writer, typename Value>
    514     UGraphWriter& writeAttribute(std::string name, const Value& value,
    515                                const Writer& writer) {
    516       attribute_writer.writeAttribute<Writer>(name, value, writer);
     513    template <typename ItemWriter, typename Value>
     514    UGraphWriter& writeAttribute(std::string label, const Value& value,
     515                               const ItemWriter& iw = ItemWriter()) {
     516      attribute_writer.writeAttribute(label, value, iw);
    517517      return *this;
    518518    }
Note: See TracChangeset for help on using the changeset viewer.