Changeset 22565 for lang/cplusplus/boost-supplement

Timestamp:

11/02/08 13:21:19 (5 years ago)

Author:

mrkn

Message:

boost_supplement/graph/read_lgl.hpp (boost_supplement::detail::lgl_reader::read): conserving vertex order.

Location:

lang/cplusplus/boost-supplement/trunk

Files:

• ChangeLog (modified) (1 diff)
• boost_supplement/graph/read_lgl.hpp (modified) (5 diffs)

lang/cplusplus/boost-supplement/trunk/ChangeLog

@@ +1 @@
+2008-11-02  Kenta Murata  <mrkn@mrkn.jp>
+
+        * boost_supplement/graph/read_lgl.hpp (boost_supplement::detail::lgl_reader::read): conserving vertex order.
+
 2008-10-13  Kenta Murata  <mrkn@mrkn.jp>
 

lang/cplusplus/boost-supplement/trunk/boost_supplement/graph/read_lgl.hpp

@@ -9 +9 @@
 #include <boost_supplement/graph/detail/line_input_iterator.hpp>
 
+#include <list>
 #include <map>
 
@@ -28 +29 @@
   NameVertexMap nvm_;
   std::string base_;
+  std::list<std::string> lines_;
 
   Vertex name_to_vertex(std::string const& n)
@@ -41 +43 @@
     }
 
-  void process_line(std::string const& line)
+  void process_line_1(std::string const& line)
+    {
+      using namespace std;
+      using namespace boost;
+
+      tokenizer tokens(line, SEP);
+      tokenizer::iterator tok_iter = tokens.begin();
+      string tok1(*tok_iter++);
+      if ("#" == tok1) {
+        if (tok_iter == tokens.end()) {
+          // TODO: Syntax error
+          return;
+        }
+        name_to_vertex(*tok_iter);
+      }
+    }
+
+  void process_line_2(std::string const& line)
     {
       using namespace std;
@@ -79 +98 @@
       vnm_(&n),
       ewm_(&w),
-      base_("")
+      base_(""),
+      lines_()
     {}
 
@@ -86 +106 @@
     {
       graph_->clear();
+      // pass 1: adding vertices
       for (line_input_iterator<InputStream> line_iter(is);
            line_iter != line_input_iterator<InputStream>();
            ++line_iter) {
-        process_line(*line_iter);
+        process_line_1(*line_iter);
+        lines_.push_back(*line_iter);
+      }
+      // pass 2: adding edges
+      for (std::list<std::string>::iterator line_iter = lines_.begin();
+           line_iter != lines_.end(); ++line_iter) {
+        process_line_2(*line_iter);
       }