COIN-OR::LEMON - Graph Library

Changeset 2282:9d7b12f83daa in lemon-0.x


Ignore:
Timestamp:
10/31/06 15:27:58 (13 years ago)
Author:
Balazs Dezso
Branch:
default
Phase:
public
Convert:
svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@3046
Message:

Bug fixes

Location:
lemon
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/lemon_reader.h

    r2260 r2282  
    118118
    119119    private:
     120      const Graph& graph;
    120121      typename Ref<Map>::Type map;
    121       const Graph& graph;
    122122    };
    123123
     
    148148
    149149    private:
     150      const Graph& graph;
    150151      typename Ref<Map>::Type map;
    151       const Graph& graph;
    152152    };
    153153
     
    13781378      checkConcept<_reader_bits::ItemReader<typename Map::Value>, Reader>();
    13791379      checkConcept<concepts::WriteMap<Edge, typename Map::Value>, Map>();
    1380       readMap("+" + name,
    1381               _reader_bits::forwardComposeMap(graph, map), reader);
    1382       readMap("-" + name,
    1383               _reader_bits::backwardComposeMap(graph, map), reader);
     1380      readUEdgeMap("+" + name,
     1381                   _reader_bits::forwardComposeMap(graph, map), reader);
     1382      readUEdgeMap("-" + name,
     1383                   _reader_bits::backwardComposeMap(graph, map), reader);
    13841384      return *this;     
    13851385    }
     
    13921392    template <typename Reader>
    13931393    UEdgeSetReader& skipEdgeMap(std::string name,
    1394                                     const Reader& reader = Reader()) {
    1395       skipMap("+" + name, reader);
    1396       skipMap("-" + name, reader);
     1394                                const Reader& reader = Reader()) {
     1395      skipUEdgeMap("+" + name, reader);
     1396      skipUEdgeMap("-" + name, reader);
    13971397      return *this;
    13981398    }
  • lemon/lemon_writer.h

    r2260 r2282  
    878878    template <typename Writer, typename Map>
    879879    UEdgeSetWriter& writeUEdgeMap(std::string name, const Map& map,
    880                                           const Writer& writer = Writer()) {
     880                                  const Writer& writer = Writer()) {
    881881      checkConcept<concepts::ReadMap<UEdge, typename Map::Value>, Map>();
    882882      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
     
    901901    template <typename Writer, typename Map>
    902902    UEdgeSetWriter& writeEdgeMap(std::string name, const Map& map,
    903                                      const Writer& writer = Writer()) {
     903                                 const Writer& writer = Writer()) {
    904904      checkConcept<concepts::ReadMap<Edge, typename Map::Value>, Map>();
    905905      checkConcept<_writer_bits::ItemWriter<typename Map::Value>, Writer>();
    906       writeUEdge("+" + name,
    907                      _writer_bits::forwardComposeMap(graph, map), writer);
    908       writeUEdge("-" + name,
    909                      _writer_bits::backwardComposeMap(graph, map), writer);
     906      writeUEdgeMap("+" + name,
     907                    _writer_bits::forwardComposeMap(graph, map), writer);
     908      writeUEdgeMap("-" + name,
     909                    _writer_bits::backwardComposeMap(graph, map), writer);
    910910      return *this;
    911911    }
     
    956956      }
    957957      os << std::endl;
    958       for (typename std::vector<Edge>::iterator it = items.begin();
     958      for (typename std::vector<UEdge>::iterator it = items.begin();
    959959           it != items.end(); ++it) {
    960960        nodeLabelWriter->write(os, graph.source(*it));
Note: See TracChangeset for help on using the changeset viewer.