lemon-1.2: comparison lemon/lgf

equal deleted inserted replaced

-:f55be02578b0
+:dede6b043875
 Sections _sections;
 bool _use_nodes;
 bool _use_arcs;
+bool _skip_nodes;
+bool _skip_arcs;
 int line_num;
 std::istringstream line;
 public:
 ///
 /// Construct a directed graph reader, which reads from the given
 /// input stream.
 DigraphReader(std::istream& is, Digraph& digraph)
 : _is(&is), local_is(false), _digraph(digraph),
-	_use_nodes(false), _use_arcs(false) {}
+	_use_nodes(false), _use_arcs(false),
+	_skip_nodes(false), _skip_arcs(false) {}
 /// \brief Constructor
 ///
 /// Construct a directed graph reader, which reads from the given
 /// file.
 DigraphReader(const std::string& fn, Digraph& digraph)
 : _is(new std::ifstream(fn.c_str())), local_is(true), _digraph(digraph),
-	_use_nodes(false), _use_arcs(false) {}
+	_use_nodes(false), _use_arcs(false),
+	_skip_nodes(false), _skip_arcs(false) {}
 /// \brief Constructor
 ///
 /// Construct a directed graph reader, which reads from the given
 /// file.
 DigraphReader(const char* fn, Digraph& digraph)
 : _is(new std::ifstream(fn)), local_is(true), _digraph(digraph),
-	_use_nodes(false), _use_arcs(false) {}
+	_use_nodes(false), _use_arcs(false),
+	_skip_nodes(false), _skip_arcs(false) {}
 /// \brief Copy constructor
 ///
 /// The copy constructor transfers all data from the other reader,
 /// therefore the copied reader will not be usable more.
 DigraphReader(DigraphReader& other)
 : _is(other._is), local_is(other.local_is), _digraph(other._digraph),
-	_use_nodes(other._use_nodes), _use_arcs(other._use_arcs) {
+	_use_nodes(other._use_nodes), _use_arcs(other._use_arcs),
+	_skip_nodes(other._skip_nodes), _skip_arcs(other._skip_arcs) {
 other._is = 0;
 other.local_is = false;
 _node_index.swap(other._node_index);
 /// Use previously constructed arc set, and specify the arc
 /// label map and a functor which converts the label map values to
 /// std::string.
 template <typename Map, typename Converter>
 DigraphReader& useArcs(const Map& map,
-			    const Converter& converter = Converter()) {
+			   const Converter& converter = Converter()) {
 checkConcept<concepts::ReadMap<Arc, typename Map::Value>, Map>();
 LEMON_ASSERT(!_use_arcs, "Multiple usage of useArcs() member");
 _use_arcs = true;
 for (ArcIt a(_digraph); a != INVALID; ++a) {
 	_arc_index.insert(std::make_pair(converter(map[a]), a));
 }
+return *this;
+}
+/// \brief Skips the reading of node section
+///
+/// Omit the reading of the node section. This implies that each node
+/// map reading rule will be abanoned, and the nodes of the graph
+/// will not be constructed, which usually cause that the arc set
+/// could not be read due to lack of node name
+/// resolving. Therefore, the \c skipArcs() should be used too, or
+/// the useNodes() member function should be used to specify the
+/// label of the nodes.
+DigraphReader& skipNodes() {
+LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
+_skip_nodes = true;
+return *this;
+}
+/// \brief Skips the reading of arc section
+///
+/// Omit the reading of the arc section. This implies that each arc
+/// map reading rule will be abanoned, and the arcs of the graph
+/// will not be constructed.
+DigraphReader& skipArcs() {
+LEMON_ASSERT(!_skip_arcs, "Skip arcs already set");
+_skip_arcs = true;
 return *this;
 }
 /// @}
 LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
 if (!*_is) {
 	throw DataFormatError("Cannot find file");
 }
-bool nodes_done = false;
+bool nodes_done = _skip_nodes;
-bool arcs_done = false;
+bool arcs_done = _skip_arcs;
 bool attributes_done = false;
 std::set<std::string> extra_sections;
 line_num = 0;
 readLine();
 Sections _sections;
 bool _use_nodes;
 bool _use_edges;
+bool _skip_nodes;
+bool _skip_edges;
 int line_num;
 std::istringstream line;
 public:
 ///
 /// Construct a undirected graph reader, which reads from the given
 /// input stream.
 GraphReader(std::istream& is, Graph& graph)
 : _is(&is), local_is(false), _graph(graph),
-	_use_nodes(false), _use_edges(false) {}
+	_use_nodes(false), _use_edges(false),
+	_skip_nodes(false), _skip_edges(false) {}
 /// \brief Constructor
 ///
 /// Construct a undirected graph reader, which reads from the given
 /// file.
 GraphReader(const std::string& fn, Graph& graph)
 : _is(new std::ifstream(fn.c_str())), local_is(true), _graph(graph),
-	_use_nodes(false), _use_edges(false) {}
+	_use_nodes(false), _use_edges(false),
+	_skip_nodes(false), _skip_edges(false) {}
 /// \brief Constructor
 ///
 /// Construct a undirected graph reader, which reads from the given
 /// file.
 GraphReader(const char* fn, Graph& graph)
 : _is(new std::ifstream(fn)), local_is(true), _graph(graph),
-	_use_nodes(false), _use_edges(false) {}
+	_use_nodes(false), _use_edges(false),
+	_skip_nodes(false), _skip_edges(false) {}
 /// \brief Copy constructor
 ///
 /// The copy constructor transfers all data from the other reader,
 /// therefore the copied reader will not be usable more.
 GraphReader(GraphReader& other)
 : _is(other._is), local_is(other.local_is), _graph(other._graph),
-	_use_nodes(other._use_nodes), _use_edges(other._use_edges) {
+	_use_nodes(other._use_nodes), _use_edges(other._use_edges),
+	_skip_nodes(other._skip_nodes), _skip_edges(other._skip_edges) {
 other._is = 0;
 other.local_is = false;
 _node_index.swap(other._node_index);
 	_edge_index.insert(std::make_pair(converter(map[a]), a));
 }
 return *this;
 }
+/// \brief Skips the reading of node section
+///
+/// Omit the reading of the node section. This implies that each node
+/// map reading rule will be abanoned, and the nodes of the graph
+/// will not be constructed, which usually cause that the edge set
+/// could not be read due to lack of node name
+/// resolving. Therefore, the \c skipEdges() should be used too, or
+/// the useNodes() member function should be used to specify the
+/// label of the nodes.
+GraphReader& skipNodes() {
+LEMON_ASSERT(!_skip_nodes, "Skip nodes already set");
+_skip_nodes = true;
+return *this;
+}
+/// \brief Skips the reading of edge section
+///
+/// Omit the reading of the edge section. This implies that each edge
+/// map reading rule will be abanoned, and the edges of the graph
+/// will not be constructed.
+GraphReader& skipEdges() {
+LEMON_ASSERT(!_skip_edges, "Skip edges already set");
+_skip_edges = true;
+return *this;
+}
 /// @}
 private:
 bool readLine() {
 /// This function starts the batch processing
 void run() {
 LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
-bool nodes_done = false;
+bool nodes_done = _skip_nodes;
-bool edges_done = false;
+bool edges_done = _skip_edges;
 bool attributes_done = false;
 std::set<std::string> extra_sections;
 line_num = 0;
 readLine();

changeset 188	70694e6bdcac
parent 186	9159de5e9657
child 189	a63ed81c57ba