Ticket #91: 70694e6bdcac.patch

lemon/lgf_reader.h

@@ -479 +479 @@
     bool _use_nodes;
     bool _use_arcs;
 
+    bool _skip_nodes;
+    bool _skip_arcs;
+
     int line_num;
     std::istringstream line;
 
@@ -490 +493 @@
     /// 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
     ///
@@ -498 +502 @@
     /// 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
     ///
@@ -506 +511 @@
     /// 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
     ///
@@ -514 +520 @@
     /// 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;
@@ -837 +844 @@
     /// 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;
     }
 
@@ -1152 +1185 @@
         throw DataFormatError("Cannot find file");
       }
       
-      bool nodes_done = false;
-      bool arcs_done = false;
+      bool nodes_done = _skip_nodes;
+      bool arcs_done = _skip_arcs;
       bool attributes_done = false;
       std::set<std::string> extra_sections;
 
@@ -1295 +1328 @@
     bool _use_nodes;
     bool _use_edges;
 
+    bool _skip_nodes;
+    bool _skip_edges;
+
     int line_num;
     std::istringstream line;
 
@@ -1306 +1342 @@
     /// 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
     ///
@@ -1314 +1351 @@
     /// 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
     ///
@@ -1322 +1360 @@
     /// 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
     ///
@@ -1330 +1369 @@
     /// 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;
@@ -1706 +1746 @@
       for (EdgeIt a(_graph); a != INVALID; ++a) {
         _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;
     }
 
@@ -2012 +2078 @@
       
       LEMON_ASSERT(_is != 0, "This reader assigned to an other reader");
       
-      bool nodes_done = false;
-      bool edges_done = false;
+      bool nodes_done = _skip_nodes;
+      bool edges_done = _skip_edges;
       bool attributes_done = false;
       std::set<std::string> extra_sections;