COIN-OR::LEMON - Graph Library

Changeset 1194:699c7eac2c6d in lemon for lemon/lgf_reader.h


Ignore:
Timestamp:
01/11/12 22:21:07 (8 years ago)
Author:
Balazs Dezso <deba@…>
Branch:
default
Phase:
public
Message:

Renamings in BpGraphs? (#69)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lemon/lgf_reader.h

    r1192 r1194  
    21492149  /// sections can contain different set of maps.
    21502150  ///
    2151   /// The red and blue maps are read from the corresponding
     2151  /// The red and blue node maps are read from the corresponding
    21522152  /// sections. If a map is defined with the same name in both of
    21532153  /// these sections, then it can be read as a node map.
     
    23382338    }
    23392339
    2340     /// Add a red map reading rule to the reader.
     2340    /// Add a red node map reading rule to the reader.
    23412341    template <typename Map>
    2342     BpGraphReader& redMap(const std::string& caption, Map& map) {
     2342    BpGraphReader& redNodeMap(const std::string& caption, Map& map) {
    23432343      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    23442344      _reader_bits::MapStorageBase<Node>* storage =
     
    23482348    }
    23492349
    2350     /// \brief Red map reading rule
    2351     ///
    2352     /// Add a red map reading rule with specialized converter to the
    2353     /// reader.
     2350    /// \brief Red node map reading rule
     2351    ///
     2352    /// Add a red node map node reading rule with specialized converter to
     2353    /// the reader.
    23542354    template <typename Map, typename Converter>
    2355     BpGraphReader& redMap(const std::string& caption, Map& map,
    2356                           const Converter& converter = Converter()) {
     2355    BpGraphReader& redNodeMap(const std::string& caption, Map& map,
     2356                              const Converter& converter = Converter()) {
    23572357      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    23582358      _reader_bits::MapStorageBase<Node>* storage =
     
    23622362    }
    23632363
    2364     /// Add a blue map reading rule to the reader.
     2364    /// Add a blue node map reading rule to the reader.
    23652365    template <typename Map>
    2366     BpGraphReader& blueMap(const std::string& caption, Map& map) {
     2366    BpGraphReader& blueNodeMap(const std::string& caption, Map& map) {
    23672367      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    23682368      _reader_bits::MapStorageBase<Node>* storage =
     
    23722372    }
    23732373
    2374     /// \brief Blue map reading rule
    2375     ///
    2376     /// Add a blue map reading rule with specialized converter to the
    2377     /// reader.
     2374    /// \brief Blue node map reading rule
     2375    ///
     2376    /// Add a blue node map reading rule with specialized converter to
     2377    /// the reader.
    23782378    template <typename Map, typename Converter>
    2379     BpGraphReader& blueMap(const std::string& caption, Map& map,
    2380                            const Converter& converter = Converter()) {
     2379    BpGraphReader& blueNodeMap(const std::string& caption, Map& map,
     2380                               const Converter& converter = Converter()) {
    23812381      checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
    23822382      _reader_bits::MapStorageBase<Node>* storage =
     
    26852685          if (maps.find(map) != maps.end()) {
    26862686            std::ostringstream msg;
    2687             msg << "Multiple occurence of red map: " << map;
     2687            msg << "Multiple occurence of red node map: " << map;
    26882688            throw FormatError(msg.str());
    26892689          }
     
    27782778          if (maps.find(map) != maps.end()) {
    27792779            std::ostringstream msg;
    2780             msg << "Multiple occurence of blue map: " << map;
     2780            msg << "Multiple occurence of blue node map: " << map;
    27812781            throw FormatError(msg.str());
    27822782          }
Note: See TracChangeset for help on using the changeset viewer.