Changeset 21200 for lang/cplusplus/boost-supplement

Timestamp:

10/13/08 00:29:21 (5 years ago)

Author:

mrkn

Message:

boost_supplement/graph/detail/line_input_iterator.hpp: line_input_iterator::operator++ must return *this.
boost_supplement/graph/read_lgl.hpp: change the name of the member variables according to google coding standard.

Location:

lang/cplusplus/boost-supplement/trunk

Files:

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

lang/cplusplus/boost-supplement/trunk/ChangeLog

@@ +1 @@
+2008-10-12  Kenta Murata  <mrkn@mrkn.jp>
+
+        * boost_supplement/graph/detail/line_input_iterator.hpp:
+        line_input_iterator::operator++ must return *this.
+
+        * boost_supplement/graph/read_lgl.hpp: change the name of the
+        member variables according to google coding standard.
+
+2008-10-10  Kenta Murata  <mrkn@mrkn.jp>
+
+        * boost_supplement/graph/read_lgl.hpp (lgl_reader): VertexNameMap
+        and EdgeWeightMap are kept by now reference.
+
 2008-08-12  Kenta Murata  <muraken@gmail.com>
 

lang/cplusplus/boost-supplement/trunk/boost_supplement/graph/detail/line_input_iterator.hpp

@@ -66 +66 @@
     {
       if (in_ != 0) next_line();
+      return *this;
     }
   
@@ -82 +83 @@
                          line_input_iterator<IS> const& b);
 };
-
-}}
 
 template<class InputStream>
@@ -108 +107 @@
 }
 
+}}
+
 #endif // ifndef BOOST_SUPPLEMENT_GRAPH_DETAIL_LINE_INPUT_ITERATOR_HPP_INCLUDED

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

@@ -23 +23 @@
 
   const boost::char_separator<char> SEP;
-  Graph* m_graph;
-  VertexNameMap m_vnm;
-  EdgeWeightMap m_ewm;
-  NameVertexMap m_nvm;
-  std::string m_base;
+  Graph* graph_;
+  VertexNameMap* vnm_;
+  EdgeWeightMap* ewm_;
+  NameVertexMap nvm_;
+  std::string base_;
 
   Vertex name_to_vertex(std::string const& n)
     {
-      typename NameVertexMap::iterator i = m_nvm.find(n);
-      if (i == m_nvm.end()) {
-        Vertex u = add_vertex(*m_graph);
-        m_vnm[u] = n;
-        m_nvm[n] = u;
+      typename NameVertexMap::iterator i = nvm_.find(n);
+      if (i == nvm_.end()) {
+        Vertex u = add_vertex(*graph_);
+        (*vnm_)[u] = n;
+        nvm_[n] = u;
         return u;
       }
@@ -55 +55 @@
           return;
         }
-        m_base = *tok_iter;
+        base_ = *tok_iter;
       }
       else {
-        Vertex u = name_to_vertex(m_base);
+        Vertex u = name_to_vertex(base_);
         Vertex v = name_to_vertex(tok1);
         if (tok_iter == tokens.end()) {
-          add_edge(u, v, *m_graph);
+          add_edge(u, v, *graph_);
         }
         else {
@@ -67 +67 @@
           double w = atof(tok2.c_str());
           // if (has_w && w > cutoff) continue;
-          add_edge(u, v, *m_graph);
-          m_ewm[edge(u, v, *m_graph).first] = w;
+          add_edge(u, v, *graph_);
+          (*ewm_)[edge(u, v, *graph_).first] = w;
         }
       }
@@ -74 +74 @@
   
 public:
-  lgl_reader(Graph& g, VertexNameMap n, EdgeWeightMap w)
+  lgl_reader(Graph& g, VertexNameMap& n, EdgeWeightMap& w)
     : SEP(" "),
-      m_graph(&g),
-      m_vnm(n),
-      m_ewm(w),
-      m_base("")
+      graph_(&g),
+      vnm_(&n),
+      ewm_(&w),
+      base_("")
     {}
 
@@ -85 +85 @@
   bool read(InputStream& is)
     {
-      m_graph->clear();
+      graph_->clear();
       for (line_input_iterator<InputStream> line_iter(is);
            line_iter != line_input_iterator<InputStream>();