lemon-0.x: comparison lemon/graph

equal deleted inserted replaced

-:8baf8faed29a
+:03614bc310bd
 /// \brief Gives back the edge by its label.
 ///
 /// It reads an label from the stream and gives back which edge belongs to
 /// it. It is possible only if there was read a "label" named edge map.
 void readLabel(std::istream& is, Edge& edge) const {
-return edgeset_reader.readLabel(is, edge);
+edgeset_reader.readLabel(is, edge);
 }
 private:
 LemonReader* reader;
 /// and it use the given reader as the default skipper.
 UGraphReader(std::istream& _is, Graph& _graph,
 		     const DefaultSkipper& _skipper = DefaultSkipper())
 : reader(new LemonReader(_is)), own_reader(true), skipper(_skipper),
 	nodeset_reader(*reader, _graph, std::string(), skipper),
-	u_edgeset_reader(*reader, _graph, nodeset_reader,
+	uedgeset_reader(*reader, _graph, nodeset_reader,
 			     std::string(), skipper),
 	node_reader(*reader, nodeset_reader, std::string()),
-	u_edge_reader(*reader, u_edgeset_reader, std::string()),
+	uedge_reader(*reader, uedgeset_reader, std::string()),
 	attribute_reader(*reader, std::string()) {}
 /// \brief Construct a new UGraphReader.
 ///
 /// Construct a new UGraphReader. It reads into the given graph
 UGraphReader(const std::string& _filename, Graph& _graph,
 		     const DefaultSkipper& _skipper = DefaultSkipper())
 : reader(new LemonReader(_filename)), own_reader(true),
 	skipper(_skipper),
 	nodeset_reader(*reader, _graph, std::string(), skipper),
-	u_edgeset_reader(*reader, _graph, nodeset_reader,
+	uedgeset_reader(*reader, _graph, nodeset_reader,
 			     std::string(), skipper),
 	node_reader(*reader, nodeset_reader, std::string()),
-	u_edge_reader(*reader, u_edgeset_reader, std::string()),
+	uedge_reader(*reader, uedgeset_reader, std::string()),
 	attribute_reader(*reader, std::string()) {}
 /// \brief Construct a new UGraphReader.
 ///
 /// Construct a new UGraphReader. It reads into the given graph
 /// and it use the given reader as the default skipper.
 UGraphReader(LemonReader& _reader, Graph& _graph,
 		     const DefaultSkipper& _skipper = DefaultSkipper())
 : reader(_reader), own_reader(false), skipper(_skipper),
 	nodeset_reader(*reader, _graph, std::string(), skipper),
-	u_edgeset_reader(*reader, _graph, nodeset_reader,
+	uedgeset_reader(*reader, _graph, nodeset_reader,
 			     std::string(), skipper),
 	node_reader(*reader, nodeset_reader, std::string()),
-	u_edge_reader(*reader, u_edgeset_reader, std::string()),
+	uedge_reader(*reader, uedgeset_reader, std::string()),
 	attribute_reader(*reader, std::string()) {}
 /// \brief Destruct the graph reader.
 ///
 /// Destruct the graph reader.
 /// \brief Give a new undirected edge map reading command to the reader.
 ///
 /// Give a new undirected edge map reading command to the reader.
 template <typename Map>
 UGraphReader& readUEdgeMap(std::string name, Map& map) {
-u_edgeset_reader.readUEdgeMap(name, map);
+uedgeset_reader.readUEdgeMap(name, map);
 return *this;
 }
 template <typename Map>
 UGraphReader& readUEdgeMap(std::string name, const Map& map) {
-u_edgeset_reader.readUEdgeMap(name, map);
+uedgeset_reader.readUEdgeMap(name, map);
 return *this;
 }
 /// \brief Give a new undirected edge map reading command to the reader.
 ///
 /// Give a new undirected edge map reading command to the reader.
 template <typename ItemReader, typename Map>
 UGraphReader& readUEdgeMap(std::string name, Map& map,
 const ItemReader& ir = ItemReader()) {
-u_edgeset_reader.readUEdgeMap(name, map, ir);
+uedgeset_reader.readUEdgeMap(name, map, ir);
 return *this;
 }
 template <typename ItemReader, typename Map>
 UGraphReader& readUEdgeMap(std::string name, const Map& map,
 const ItemReader& ir = ItemReader()) {
-u_edgeset_reader.readUEdgeMap(name, map, ir);
+uedgeset_reader.readUEdgeMap(name, map, ir);
 return *this;
 }
 /// \brief Give a new undirected edge map skipping command to the reader.
 ///
 /// Give a new undirected edge map skipping command to the reader.
 template <typename ItemReader>
 UGraphReader& skipUEdgeMap(std::string name,
 				       const ItemReader& ir = ItemReader()) {
-u_edgeset_reader.skipUMap(name, ir);
+uedgeset_reader.skipUMap(name, ir);
 return *this;
 }
 /// \brief Give a new edge map reading command to the reader.
 ///
 /// Give a new edge map reading command to the reader.
 template <typename Map>
 UGraphReader& readEdgeMap(std::string name, Map& map) {
-u_edgeset_reader.readEdgeMap(name, map);
+uedgeset_reader.readEdgeMap(name, map);
 return *this;
 }
 template <typename Map>
 UGraphReader& readEdgeMap(std::string name, const Map& map) {
-u_edgeset_reader.readEdgeMap(name, map);
+uedgeset_reader.readEdgeMap(name, map);
 return *this;
 }
 /// \brief Give a new edge map reading command to the reader.
 ///
 /// Give a new edge map reading command to the reader.
 template <typename ItemReader, typename Map>
 UGraphReader& readEdgeMap(std::string name, Map& map,
 const ItemReader& ir = ItemReader()) {
-u_edgeset_reader.readEdgeMap(name, map, ir);
+uedgeset_reader.readEdgeMap(name, map, ir);
 return *this;
 }
 template <typename ItemReader, typename Map>
 UGraphReader& readEdgeMap(std::string name, const Map& map,
 const ItemReader& ir = ItemReader()) {
-u_edgeset_reader.readEdgeMap(name, map, ir);
+uedgeset_reader.readEdgeMap(name, map, ir);
 return *this;
 }
 /// \brief Give a new edge map skipping command to the reader.
 ///
 /// Give a new edge map skipping command to the reader.
 template <typename ItemReader>
 UGraphReader& skipEdgeMap(std::string name,
 const ItemReader& ir = ItemReader()) {
-u_edgeset_reader.skipEdgeMap(name, ir);
+uedgeset_reader.skipEdgeMap(name, ir);
 return *this;
 }
 /// \brief Give a new labeled node reading command to the reader.
 ///
 /// \brief Give a new labeled edge reading command to the reader.
 ///
 /// Give a new labeled edge reading command to the reader.
 UGraphReader& readEdge(std::string name, Edge& edge) {
-u_edge_reader.readEdge(name, edge);
+uedge_reader.readEdge(name, edge);
 }
 /// \brief Give a new labeled undirected edge reading command to the
 /// reader.
 ///
 /// Give a new labeled undirected edge reading command to the reader.
 UGraphReader& readUEdge(std::string name, UEdge& edge) {
-u_edge_reader.readUEdge(name, edge);
+uedge_reader.readUEdge(name, edge);
 }
 /// \brief Give a new attribute reading command.
 ///
 ///  Give a new attribute reading command.
 }
 /// \brief Returns true if the reader can give back the items by its label.
 ///
-/// \brief Returns true if the reader can give back the items by its label.
+/// Returns true if the reader can give back the items by its label.
 bool isLabelReader() const {
 return nodeset_reader.isLabelReader() &&
-u_edgeset_reader.isLabelReader();
+uedgeset_reader.isLabelReader();
 }
 /// \brief Gives back the node by its label.
 ///
 /// It reads an label from the stream and gives back which node belongs to
 /// \brief Gives back the edge by its label
 ///
 /// It reads an label from the stream and gives back which edge belongs to
 /// it. It is possible only if there was read a "label" named edge map.
 void readLabel(std::istream& is, Edge& edge) const {
-return u_edgeset_reader.readLabel(is, edge);
+return uedgeset_reader.readLabel(is, edge);
 }
 /// \brief Gives back the undirected edge by its label.
 ///
 /// It reads an label from the stream and gives back which undirected edge
 /// belongs to it. It is possible only if there was read a "label" named
 /// edge map.
 void readLabel(std::istream& is, UEdge& uedge) const {
-return u_edgeset_reader.readLabel(is, uedge);
+return uedgeset_reader.readLabel(is, uedge);
 }
 private:
 bool own_reader;
 DefaultSkipper skipper;
 NodeSetReader<Graph, ReaderTraits> nodeset_reader;
-UEdgeSetReader<Graph, ReaderTraits> u_edgeset_reader;
+UEdgeSetReader<Graph, ReaderTraits> uedgeset_reader;
 NodeReader<Graph> node_reader;
-UEdgeReader<Graph> u_edge_reader;
+UEdgeReader<Graph> uedge_reader;
 AttributeReader<ReaderTraits> attribute_reader;
 };

changeset 2495	e4f8367beb41
parent 2391	14a343be7a5a
child 2502	9c23c3762bc5