lemon-main: comparison lemon/lgf

equal deleted inserted replaced

-:28bd1197eef9
+:78a60dc7dae2
 ///
 /// It can be used almost the same way as \c GraphWriter, 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 written to the corresponding
+/// The red and blue node maps are written to the corresponding
 /// sections. The node maps are written to both of these sections
 /// with the same map name.
 template <typename BGR>
 class BpGraphWriter {
 public:
 new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
 _blue_maps.push_back(std::make_pair(caption, blue_storage));
 return *this;
 }
-/// \brief Red map writing rule
+/// \brief Red node map writing rule
 ///
-/// Add a red map writing rule to the writer.
+/// Add a red node map writing rule to the writer.
 template <typename Map>
-BpGraphWriter& redMap(const std::string& caption, const Map& map) {
+BpGraphWriter& redNodeMap(const std::string& caption, const Map& map) {
 checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 _writer_bits::MapStorageBase<Node>* storage =
 new _writer_bits::MapStorage<Node, Map>(map);
 _red_maps.push_back(std::make_pair(caption, storage));
 return *this;
 }
-/// \brief Red map writing rule
+/// \brief Red node map writing rule
 ///
-/// Add a red map writing rule with specialized converter to the
+/// Add a red node map writing rule with specialized converter to the
 /// writer.
 template <typename Map, typename Converter>
-BpGraphWriter& redMap(const std::string& caption, const Map& map,
+BpGraphWriter& redNodeMap(const std::string& caption, const Map& map,
 const Converter& converter = Converter()) {
 checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 _writer_bits::MapStorageBase<Node>* storage =
 new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
 _red_maps.push_back(std::make_pair(caption, storage));
 return *this;
 }
-/// \brief Blue map writing rule
+/// \brief Blue node map writing rule
 ///
-/// Add a blue map writing rule to the writer.
+/// Add a blue node map writing rule to the writer.
 template <typename Map>
-BpGraphWriter& blueMap(const std::string& caption, const Map& map) {
+BpGraphWriter& blueNodeMap(const std::string& caption, const Map& map) {
 checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 _writer_bits::MapStorageBase<Node>* storage =
 new _writer_bits::MapStorage<Node, Map>(map);
 _blue_maps.push_back(std::make_pair(caption, storage));
 return *this;
 }
-/// \brief Blue map writing rule
+/// \brief Blue node map writing rule
 ///
-/// Add a blue map writing rule with specialized converter to the
+/// Add a blue node map writing rule with specialized converter to the
 /// writer.
 template <typename Map, typename Converter>
-BpGraphWriter& blueMap(const std::string& caption, const Map& map,
+BpGraphWriter& blueNodeMap(const std::string& caption, const Map& map,
 const Converter& converter = Converter()) {
 checkConcept<concepts::ReadMap<Node, typename Map::Value>, Map>();
 _writer_bits::MapStorageBase<Node>* storage =
 new _writer_bits::MapStorage<Node, Map, Converter>(map, converter);
 _blue_maps.push_back(std::make_pair(caption, storage));
 return *this;
 _writer_bits::writeToken(*_os, it->first) << '\t';
 }
 *_os << std::endl;
 std::vector<Node> nodes;
-for (RedIt n(_graph); n != INVALID; ++n) {
+for (RedNodeIt n(_graph); n != INVALID; ++n) {
 nodes.push_back(n);
 }
 if (label == 0) {
 IdMap<BGR, Node> id_map(_graph);
 _writer_bits::writeToken(*_os, it->first) << '\t';
 }
 *_os << std::endl;
 std::vector<Node> nodes;
-for (BlueIt n(_graph); n != INVALID; ++n) {
+for (BlueNodeIt n(_graph); n != INVALID; ++n) {
 nodes.push_back(n);
 }
 if (label == 0) {
 IdMap<BGR, Node> id_map(_graph);

changeset 1026	699c7eac2c6d
parent 1024	b84e68af8248
child 1030	4936be66d2f5