https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Roland Levillain <roland@lrde.epita.fr> Aesthetic changes w.r.t. domain names in graph-based images. * mln/core/graph_image.hh: s/g/pg/. * mln/core/line_graph_image.hh: s/g/plg/. graph_image.hh | 27 ++++++++++++++------------- line_graph_image.hh | 30 +++++++++++++++--------------- 2 files changed, 29 insertions(+), 28 deletions(-) Index: mln/core/graph_image.hh --- mln/core/graph_image.hh (revision 2141) +++ mln/core/graph_image.hh (working copy) @@ -53,7 +53,7 @@ template <typename P, typename V> struct data_< graph_image<P, V> > { - data_(const p_graph<P>& g, const std::vector<V>& val); + data_(const p_graph<P>& pg, const std::vector<V>& val); std::vector<V> val_; const p_graph<P> pg_; @@ -119,12 +119,12 @@ /// Constructors. /// \{ graph_image(); - graph_image(const p_graph<P>& g); - graph_image(const p_graph<P>& g, const std::vector<V>& val); + graph_image(const p_graph<P>& pg); + graph_image(const p_graph<P>& pg, const std::vector<V>& val); /// \} /// Initialize an empty image. - void init_(const p_graph<P>& g, const std::vector<V>& val); + void init_(const p_graph<P>& pg, const std::vector<V>& val); /// Read-only access of pixel value at point site \p p. rvalue operator()(const graph_psite<P>& p) const; @@ -183,12 +183,12 @@ { template <typename P, typename V> inline - data_< graph_image<P, V> >::data_(const p_graph<P>& g, + data_< graph_image<P, V> >::data_(const p_graph<P>& pg, const std::vector<V>& val) : val_ (val), - pg_ (g) + pg_ (pg) { - mln_precondition(g.nvertices() == val.size()); + mln_precondition(pg.nvertices() == val.size()); } } // end of namespace mln::internal @@ -205,25 +205,26 @@ template <typename P, typename V> inline - graph_image<P, V>::graph_image(const p_graph<P>& g) + graph_image<P, V>::graph_image(const p_graph<P>& pg) { - init_(g, std::vector<V>(g.nvertices())); + init_(pg, std::vector<V>(pg.nvertices())); } template <typename P, typename V> inline - graph_image<P, V>::graph_image(const p_graph<P>& g, const std::vector<V>& val) + graph_image<P, V>::graph_image(const p_graph<P>& pg, + const std::vector<V>& val) { - init_(g, val); + init_(pg, val); } template <typename P, typename V> inline void - graph_image<P, V>::init_(const p_graph<P>& g, const std::vector<V>& val) + graph_image<P, V>::init_(const p_graph<P>& pg, const std::vector<V>& val) { mln_precondition(! this->has_data()); - this->data_ = new internal::data_< graph_image<P, V> > (g, val); + this->data_ = new internal::data_< graph_image<P, V> > (pg, val); } /*---------------. Index: mln/core/line_graph_image.hh --- mln/core/line_graph_image.hh (revision 2141) +++ mln/core/line_graph_image.hh (working copy) @@ -67,7 +67,7 @@ template <typename P, typename V> struct data_< line_graph_image<P, V> > { - data_(const p_line_graph<P>& g, + data_(const p_line_graph<P>& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val); std::vector<V> vertex_val_; @@ -105,7 +105,7 @@ /// \brief Image based on a graph. /// - /// Values are stored on the vertices of the graph. + /// Values are stored on the edges of the graph. template <typename P, typename V> struct line_graph_image : public internal::image_primary_< p_line_graph<P>, line_graph_image<P, V> > @@ -137,14 +137,14 @@ /// Constructors. /// \{ line_graph_image(); - line_graph_image(const p_line_graph<P>& g); - line_graph_image(const p_line_graph<P>& g, + line_graph_image(const p_line_graph<P>& plg); + line_graph_image(const p_line_graph<P>& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val); /// \} /// Initialize an empty image. - void init_(const p_line_graph<P>& g, + void init_(const p_line_graph<P>& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val); @@ -210,15 +210,15 @@ { template <typename P, typename V> inline - data_< line_graph_image<P, V> >::data_(const p_line_graph<P>& g, + data_< line_graph_image<P, V> >::data_(const p_line_graph<P>& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val) : vertex_val_(vertex_val), edge_val_(edge_val), - plg_(g) + plg_(plg) { - mln_precondition(g.nvertices() == vertex_val.size()); - mln_precondition(g.nedges() == edge_val.size()); + mln_precondition(plg.nvertices() == vertex_val.size()); + mln_precondition(plg.nedges() == edge_val.size()); } } // end of namespace mln::internal @@ -235,30 +235,30 @@ template <typename P, typename V> inline - line_graph_image<P, V>::line_graph_image(const p_line_graph<P>& g) + line_graph_image<P, V>::line_graph_image(const p_line_graph<P>& plg) { - init_(g, std::vector<V>(g.nvertices()), std::vector<V>(g.nedges())); + init_(plg, std::vector<V>(plg.nvertices()), std::vector<V>(plg.nedges())); } template <typename P, typename V> inline - line_graph_image<P, V>::line_graph_image(const p_line_graph<P>& g, + line_graph_image<P, V>::line_graph_image(const p_line_graph<P>& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val) { - init_(g, vertex_val, edge_val); + init_(plg, vertex_val, edge_val); } template <typename P, typename V> inline void - line_graph_image<P, V>::init_(const p_line_graph<P>& g, + line_graph_image<P, V>::init_(const p_line_graph<P>& plg, const std::vector<V>& vertex_val, const std::vector<V>& edge_val) { mln_precondition(! this->has_data()); this->data_ = - new internal::data_< line_graph_image<P, V> >(g, vertex_val, edge_val); + new internal::data_< line_graph_image<P, V> >(plg, vertex_val, edge_val); } /*---------------.