lemon-main: comparison lemon/lgf

equal deleted inserted replaced

-:62eb1816b738
+:749faaf425e8
 ///
 /// It can be used almost the same way as \c GraphReader, but it
 /// reads the red and blue nodes from separate sections, and these
 /// sections can contain different set of maps.
 ///
-/// The red and blue maps are read from the corresponding
+/// The red and blue node maps are read from the corresponding
 /// sections. If a map is defined with the same name in both of
 /// these sections, then it can be read as a node map.
 template <typename BGR>
 class BpGraphReader {
 public:
 new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
 _blue_maps.push_back(std::make_pair(caption, blue_storage));
 return *this;
 }
-/// Add a red map reading rule to the reader.
+/// Add a red node map reading rule to the reader.
 template <typename Map>
-BpGraphReader& redMap(const std::string& caption, Map& map) {
+BpGraphReader& redNodeMap(const std::string& caption, Map& map) {
 checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 _reader_bits::MapStorageBase<Node>* storage =
 new _reader_bits::MapStorage<Node, Map>(map);
 _red_maps.push_back(std::make_pair(caption, storage));
 return *this;
 }
-/// \brief Red map reading rule
+/// \brief Red node map reading rule
 ///
-/// Add a red map reading rule with specialized converter to the
+/// Add a red node map node reading rule with specialized converter to
-/// reader.
+/// the reader.
 template <typename Map, typename Converter>
-BpGraphReader& redMap(const std::string& caption, Map& map,
+BpGraphReader& redNodeMap(const std::string& caption, Map& map,
 const Converter& converter = Converter()) {
 checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 _reader_bits::MapStorageBase<Node>* storage =
 new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
 _red_maps.push_back(std::make_pair(caption, storage));
 return *this;
 }
-/// Add a blue map reading rule to the reader.
+/// Add a blue node map reading rule to the reader.
 template <typename Map>
-BpGraphReader& blueMap(const std::string& caption, Map& map) {
+BpGraphReader& blueNodeMap(const std::string& caption, Map& map) {
 checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 _reader_bits::MapStorageBase<Node>* storage =
 new _reader_bits::MapStorage<Node, Map>(map);
 _blue_maps.push_back(std::make_pair(caption, storage));
 return *this;
 }
-/// \brief Blue map reading rule
+/// \brief Blue node map reading rule
 ///
-/// Add a blue map reading rule with specialized converter to the
+/// Add a blue node map reading rule with specialized converter to
-/// reader.
+/// the reader.
 template <typename Map, typename Converter>
-BpGraphReader& blueMap(const std::string& caption, Map& map,
+BpGraphReader& blueNodeMap(const std::string& caption, Map& map,
 const Converter& converter = Converter()) {
 checkConcept<concepts::WriteMap<Node, typename Map::Value>, Map>();
 _reader_bits::MapStorageBase<Node>* storage =
 new _reader_bits::MapStorage<Node, Map, Converter>(map, converter);
 _blue_maps.push_back(std::make_pair(caption, storage));
 return *this;
 std::string map;
 int index = 0;
 while (_reader_bits::readToken(line, map)) {
 if (maps.find(map) != maps.end()) {
 std::ostringstream msg;
-msg << "Multiple occurence of red map: " << map;
+msg << "Multiple occurence of red node map: " << map;
 throw FormatError(msg.str());
 }
 maps.insert(std::make_pair(map, index));
 ++index;
 }
 std::string map;
 int index = 0;
 while (_reader_bits::readToken(line, map)) {
 if (maps.find(map) != maps.end()) {
 std::ostringstream msg;
-msg << "Multiple occurence of blue map: " << map;
+msg << "Multiple occurence of blue node map: " << map;
 throw FormatError(msg.str());
 }
 maps.insert(std::make_pair(map, index));
 ++index;
 }

changeset 1026	699c7eac2c6d
parent 1024	b84e68af8248
child 1029	374a9519986b