February 2009 - Olena-patches

3361: Update code related to Region Adjacency Graph.
by Guillaume Lazzara 12 Feb '09

12 Feb '09

* lazzara/irm/hsl_grad_and_wst.cc: perform a gradient on a HSL image and compute the watershed. * lazzara/irm/wst_rag.cc: Improve output and add a usage. * lazzara/irm/wst_rag_hsl.cc: new. Similar code to wst_rag.cc but the graph values are computed thanks to the HSL image. --- milena/sandbox/ChangeLog | 12 ++ milena/sandbox/lazzara/irm/hsl_grad_and_wst.cc | 97 ++++++++++++++ milena/sandbox/lazzara/irm/wst_rag.cc | 70 +++++++--- .../lazzara/irm/{wst_rag.cc => wst_rag_hsl.cc} | 140 +++++++++++++------- 4 files changed, 254 insertions(+), 65 deletions(-) create mode 100644 milena/sandbox/lazzara/irm/hsl_grad_and_wst.cc copy milena/sandbox/lazzara/irm/{wst_rag.cc => wst_rag_hsl.cc} (72%) diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index b90be00..d96c70e 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,15 @@ +2009-02-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Update code related to Region Adjacency Graph. + + * lazzara/irm/hsl_grad_and_wst.cc: perform a gradient on a HSL image + and compute the watershed. + + * lazzara/irm/wst_rag.cc: Improve output and add a usage. + + * lazzara/irm/wst_rag_hsl.cc: new. Similar code to wst_rag.cc but + the graph values are computed thanks to the HSL image. + 2009-02-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Cleanup pseudo-tree computation. diff --git a/milena/sandbox/lazzara/irm/hsl_grad_and_wst.cc b/milena/sandbox/lazzara/irm/hsl_grad_and_wst.cc new file mode 100644 index 0000000..f7b0335 --- /dev/null +++ b/milena/sandbox/lazzara/irm/hsl_grad_and_wst.cc @@ -0,0 +1,97 @@ +#include <mln/essential/2d.hh> +#include <mln/value/hsl.hh> +#include <mln/core/image/violent_cast_image.hh> +#include <mln/extract/all.hh> +#include <mln/value/label_16.hh> +#include <mln/value/int_u8.hh> +#include <mln/morpho/closing_area.hh> +#include <mln/io/dump/save.hh> + +mln::value::int_u8 foo(unsigned u) +{ + return u == 0 ? + 0 : // wshed line + 1 + (u - 1) % 255; // basin +} + + +namespace mln +{ + + struct hsl2rgb : Function_v2v<hsl2rgb> + { + typedef value::rgb8 result; + + value::rgb8 operator()(const value::hsl_f& v) const + { + value::rgb8 res((v.hue() / 360.0f) * 255.0f, + v.sat() * 255.0f, + v.lum()); + return res; + } + }; + +} + + + +int main(int, char *argv[]) +{ + using namespace mln; + + using value::rgb8; + using value::hsl_f; + using value::int_u8; + using value::label_16; + + typedef value::hsl_<short, short, short> hsl_s; + typedef image2d<rgb8> I; + typedef image2d<hsl_f> J; + + I input_; + io::ppm::load(input_, argv[1]); + J input = level::convert(hsl_f(), input_); + + std::cout << "input_rgb(p) = " << input_(point2d(310,0)) << " - input_hsl(p) = " << input(point2d(310,0)) + << " hsl2rgb(p) = " << hsl2rgb()(input(point2d(310,0))) + << std::endl; + std::cout << "input_rgb(p) = " << input_(point2d(311,0)) << " - input_hsl(p) = " << input(point2d(311,0)) + << " hsl2rgb(p) = " << hsl2rgb()(input(point2d(311,0))) + << std::endl; + + /// Compute the gradient on each component of the HSL image. + /// Then keep the max values in the three images. + image2d<float> grad_hue; + initialize(grad_hue, input); + data::fill(grad_hue, extract::hue(input)); + image2d<float> grad_sat; + initialize(grad_sat, input); + data::fill(grad_sat, extract::sat(input)); + image2d<float> grad_lum; + initialize(grad_lum, input); + data::fill(grad_lum, extract::lum(input)); + grad_hue = morpho::gradient(grad_hue, win_c4p()); + grad_sat = morpho::gradient(grad_sat, win_c4p()); + grad_lum = morpho::gradient(grad_lum, win_c4p()); + + image2d<value::int_u8> grad; + initialize(grad, grad_hue); + mln_piter_(image2d<value::int_u8>) p(grad.domain()); + for_all(p) + grad(p) = math::max(grad_hue(p), math::max(grad_sat(p), grad_lum(p))); + io::pgm::save(grad, "hsl2rgb_grad.pgm"); + + image2d<int_u8> clo = morpho::closing_area(grad, c4(), 10); + io::pgm::save(clo, "hsl2rgb_clo_a100.pgm"); + + label_16 nbasins; + image2d<label_16> wshed = morpho::meyer_wst(clo, c4(), nbasins); + io::dump::save(wshed, "hsl2rgb_wshed.dump"); + std::cout << "nbasins = " << nbasins << std::endl; + io::pgm::save(level::transform(wshed, convert::to_fun(foo)), + "hsl2rgb_wshed.pgm"); + + I out = level::transform(input, hsl2rgb()); + io::ppm::save(out, "hsl2rgb_out.ppm"); + +} diff --git a/milena/sandbox/lazzara/irm/wst_rag.cc b/milena/sandbox/lazzara/irm/wst_rag.cc index 3aa0935..e397ba7 100644 --- a/milena/sandbox/lazzara/irm/wst_rag.cc +++ b/milena/sandbox/lazzara/irm/wst_rag.cc @@ -20,6 +20,10 @@ #include <mln/extract/all.hh> + +// Given a color image and a wshed image, computes the component graph. +// Vertex values are computed thanks to a RGB image. + namespace mln { @@ -92,12 +96,13 @@ namespace mln } + // ima_v, image on graph vertices; value = mean color per vertex (watershed basin) template <typename I> inline - pw::image<fun::i2v::array<value::int_u8>, p_edges<util::graph, fun::i2v::array<mln_site(I)> > > - make_edge_graph_image(const I& ima_v, const util::graph& g) // image on graph vertices; value = mean color per vertex (watershed basin) + pw::image<fun::i2v::array<value::int_u8>, + p_edges<util::graph, fun::i2v::array<mln_site(I)> > > + make_edge_graph_image(const I& ima_v, const util::graph& g) { - // edge sites. typedef fun::i2v::array<mln_site(I)> edge_site_t; edge_site_t edge_site(g.e_nmax(), literal::origin); @@ -129,9 +134,9 @@ namespace mln // Cf. sandbox/theo/color/segment_rgb_pixels.cc util::array<vec3d_f> m_3f = labeling::compute(accu::mean<mln_value(I)>(), - input, // input color image - w, // watershed labeling - nbasins); + input, // input color image + w, // watershed labeling + nbasins); m_3f[0] = literal::zero; util::array<mln_value(I)> m; @@ -145,14 +150,17 @@ namespace mln return m; } + template <typename I, typename J> - pw::image<fun::i2v::array<mln_value(I)>, p_vertices<util::graph, fun::i2v::array<mln_site(I)> > > + pw::image<fun::i2v::array<mln_value(I)>, + p_vertices<util::graph, fun::i2v::array<mln_site(I)> > > make_vertex_graph_image(const util::graph& g, const I&input, const J& w, const mln_value(J)& nbasins) { typedef util::array<mln_site(I)> vertex_sites_t; vertex_sites_t site_values; - convert::from_to(labeling::compute(accu::center<mln_site(I)>(), w, nbasins), site_values); + convert::from_to(labeling::compute(accu::center<mln_site(I)>(), w, nbasins), + site_values); typedef fun::i2v::array<mln_site(J)> f_sites_t; f_sites_t sites; @@ -165,7 +173,8 @@ namespace mln typedef fun::i2v::array<mln_value(I)> vertex_values_t; vertex_values_t vertex_values; - convert::from_to(mean_color_values(input, w, nbasins), vertex_values); + convert::from_to(mean_color_values(input, w, nbasins), + vertex_values); mln_VAR(ima_v, (vertex_values | pv)); @@ -207,7 +216,9 @@ namespace mln template <typename I, typename V, typename E> inline image2d<mln_value(I)> - make_debug_graph_image(const I& input, const V& ima_v, const E& ima_e, unsigned box_size) + make_debug_graph_image(const I& input, + const V& ima_v, const E& ima_e, + unsigned box_size) { image2d<mln_value(I)> ima; initialize(ima, input); @@ -233,7 +244,7 @@ namespace mln } -int main(int, char *argv[]) +int main(int argc, char *argv[]) { using namespace mln; @@ -247,7 +258,19 @@ int main(int, char *argv[]) typedef image2d<rgb8> I; typedef image2d<label_16> J; - unsigned box_size = atoi(argv[3]); + if (argc < 5) + { + std::cout << argv[0] << " <input.ppm> <wsh-label16.dump> <nbasins> <box_size> <dist_max>" + << std::endl << std::endl; + + std::cout << "box_size: size of the component mean color box." << std::endl; + std::cout << "dist_max: merge two vertices if the associted edge value <= dist_max" + << std::endl; + + return 1; + } + + unsigned box_size = atoi(argv[4]); I input; io::ppm::load(input, argv[1]); @@ -256,16 +279,18 @@ int main(int, char *argv[]) J vol; io::dump::load(vol, argv[2]); - label_16 nbasins = 898; + label_16 nbasins = atoi(argv[3]); std::cout << "nbasins = " << nbasins << std::endl; util::graph g = make_graph(vol, c4(), nbasins); + // Compute value distances with a RGB image. mln_VAR(ima_v, make_vertex_graph_image(g, input, vol, nbasins)); mln_VAR(ima_e, make_edge_graph_image(ima_v, g)); //DEBUG -// io::ppm::save(make_debug_graph_image(input, ima_v, ima_e, box_size), "wst_rag_graph_image.ppm"); +// io::ppm::save(make_debug_graph_image(input, ima_v, ima_e, box_size), +// "wst_rag_graph_image.ppm"); mln_piter_(ima_e_t) e(ima_e.domain()); @@ -277,7 +302,7 @@ int main(int, char *argv[]) { unsigned v1 = e.element().v1(); unsigned v2 = e.element().v2(); - if (ima_e(e) <= (unsigned)(atoi(argv[4])) + if (ima_e(e) <= (unsigned)(atoi(argv[5])) && find_root(parent, v1) != find_root(parent, v2)) parent[find_root(parent, v1)] = find_root(parent, v2); } @@ -298,10 +323,19 @@ int main(int, char *argv[]) J vol2 = level::transform(vol, f); util::graph g2 = make_graph(vol2, c4(), nbasins2); + // Compute value distances with a RGB image. mln_VAR(ima_v2, make_vertex_graph_image(g2, input, vol2, nbasins2)); mln_VAR(ima_e2, make_edge_graph_image(ima_v2, g2)); - J vol2_ = morpho::elementary::dilation(vol2, c4()); - io::ppm::save(labeling::mean_values(input, vol2_, nbasins2), "wst_rag_mean_colors.ppm"); - io::ppm::save(make_debug_graph_image(input, ima_v2, ima_e2, box_size), "wst_rag_graph_image2.ppm"); + mln_VAR(vol2_, + morpho::elementary::dilation(extend(vol2 | (pw::value(vol2) == 0u), + vol2), + c8())); + + data::fill((vol2 | (pw::value(vol2) == 0u)).rw(), vol2_); + + io::ppm::save(labeling::mean_values(input, vol2, nbasins2), + "wst_rag_mean_colors.ppm"); + io::ppm::save(make_debug_graph_image(input, ima_v2, ima_e2, box_size), + "wst_rag_graph_image2.ppm"); } diff --git a/milena/sandbox/lazzara/irm/wst_rag.cc b/milena/sandbox/lazzara/irm/wst_rag_hsl.cc similarity index 72% copy from milena/sandbox/lazzara/irm/wst_rag.cc copy to milena/sandbox/lazzara/irm/wst_rag_hsl.cc index 3aa0935..156f1b3 100644 --- a/milena/sandbox/lazzara/irm/wst_rag.cc +++ b/milena/sandbox/lazzara/irm/wst_rag_hsl.cc @@ -1,24 +1,44 @@ #include <mln/essential/2d.hh> + + +#include <mln/core/alias/dpoint2d.hh> #include <mln/core/alias/vec3d.hh> -#include <mln/debug/draw_graph.hh> -#include <mln/util/graph.hh> +#include <mln/core/image/line_graph_elt_neighborhood.hh> + #include <mln/accu/center.hh> -#include <mln/io/dump/all.hh> -#include <mln/value/label_16.hh> -#include <mln/value/label_8.hh> -#include <mln/value/rgb8.hh> -#include <mln/value/rgb16.hh> #include <mln/accu/compute.hh> -#include <mln/core/alias/dpoint2d.hh> -#include <mln/draw/box.hh> -#include <mln/level/stretch.hh> + #include <mln/canvas/morpho/algebraic_union_find.hh> + +#include <mln/debug/draw_graph.hh> + +#include <mln/draw/box.hh> + +#include <mln/extract/all.hh> + #include <mln/fun/v2v/id.hh> -#include <mln/core/image/line_graph_elt_neighborhood.hh> -#include <mln/morpho/elementary/dilation.hh> + +#include <mln/io/dump/all.hh> + #include <mln/labeling/mean_values.hh> -#include <mln/extract/all.hh> +#include <mln/level/stretch.hh> + +#include <mln/morpho/elementary/dilation.hh> + +#include <mln/util/graph.hh> + +#include <mln/value/label_16.hh> +#include <mln/value/label_8.hh> +#include <mln/value/rgb16.hh> +#include <mln/value/rgb8.hh> + +#include <mln/value/hsl.hh> + + +// Given a color image and a wshed image, computes the component graph. +// Vertex values are computed thanks to a HSL image. + namespace mln { @@ -77,25 +97,24 @@ namespace mln } - - - template <typename V> - value::int_u8 dist(const V& c1, const V& c2) + value::int_u8 dist(const value::hsl_f& c1, const value::hsl_f& c2) { unsigned d = 0; - d += (math::diff_abs(c1.red(), c2.red()) + 2) / 3; - d += (math::diff_abs(c1.green(), c2.green()) + 2) / 3; - d += (math::diff_abs(c1.blue(), c2.blue()) + 2) / 3; + d += (math::diff_abs(c1.hue(), c2.hue()) + 2) / 3; + d += (math::diff_abs(c1.sat(), c2.sat()) + 2) / 3; + d += (math::diff_abs(c1.lum(), c2.lum()) + 2) / 3; if (d > 255) d = 255; return d; } + // ima_v, image on graph vertices; value = mean color per vertex (watershed basin) template <typename I> inline - pw::image<fun::i2v::array<value::int_u8>, p_edges<util::graph, fun::i2v::array<mln_site(I)> > > - make_edge_graph_image(const I& ima_v, const util::graph& g) // image on graph vertices; value = mean color per vertex (watershed basin) + pw::image<fun::i2v::array<value::int_u8>, + p_edges<util::graph, fun::i2v::array<mln_site(I)> > > + make_edge_graph_image(const I& ima_v, const util::graph& g) { // edge sites. @@ -128,31 +147,29 @@ namespace mln { // Cf. sandbox/theo/color/segment_rgb_pixels.cc - util::array<vec3d_f> m_3f = labeling::compute(accu::mean<mln_value(I)>(), - input, // input color image - w, // watershed labeling - nbasins); - m_3f[0] = literal::zero; + util::array<value::hsl_f> m_3f = labeling::compute(accu::mean<mln_value(I)>(), + input, // input color image + w, // watershed labeling + nbasins); + m_3f[0] = value::hsl_f(0,0,0);; util::array<mln_value(I)> m; convert::from_to(m_3f, m); - m[0] = literal::yellow; - - io::ppm::save(level::transform(w, - convert::to< fun::i2v::array<mln_value(I)> >(m)), - "wst_rag_wshd_color.ppm"); + m[0] = value::hsl_f(360,0.5,255); return m; } template <typename I, typename J> - pw::image<fun::i2v::array<mln_value(I)>, p_vertices<util::graph, fun::i2v::array<mln_site(I)> > > + pw::image<fun::i2v::array<mln_value(I)>, + p_vertices<util::graph, fun::i2v::array<mln_site(I)> > > make_vertex_graph_image(const util::graph& g, const I&input, const J& w, const mln_value(J)& nbasins) { typedef util::array<mln_site(I)> vertex_sites_t; vertex_sites_t site_values; - convert::from_to(labeling::compute(accu::center<mln_site(I)>(), w, nbasins), site_values); + convert::from_to(labeling::compute(accu::center<mln_site(I)>(), w, nbasins), + site_values); typedef fun::i2v::array<mln_site(J)> f_sites_t; f_sites_t sites; @@ -207,7 +224,9 @@ namespace mln template <typename I, typename V, typename E> inline image2d<mln_value(I)> - make_debug_graph_image(const I& input, const V& ima_v, const E& ima_e, unsigned box_size) + make_debug_graph_image(const I& input, + const V& ima_v, const E& ima_e, + unsigned box_size) { image2d<mln_value(I)> ima; initialize(ima, input); @@ -233,7 +252,7 @@ namespace mln } -int main(int, char *argv[]) +int main(int argc, char *argv[]) { using namespace mln; @@ -243,20 +262,35 @@ int main(int, char *argv[]) using value::label_8; using value::rgb16; using value::rgb8; + using value::hsl_f; - typedef image2d<rgb8> I; +// typedef image2d<rgb8> I; + typedef image2d<rgb8> K; + typedef image2d<hsl_f> I; typedef image2d<label_16> J; - unsigned box_size = atoi(argv[3]); + if (argc < 5) + { + std::cout << argv[0] << " <input.ppm> <wsh-label16.dump> <nbasins> <box_size> <dist_max>" + << std::endl << std::endl; + + std::cout << "box_size: size of the component mean color box." << std::endl; + std::cout << "dist_max: merge two vertices if the associted edge value <= dist_max" + << std::endl; - I input; - io::ppm::load(input, argv[1]); -// image2d<rgb16> input = level::convert(rgb16(), input_); + return 1; + } + + unsigned box_size = atoi(argv[4]); + + K input_; + io::ppm::load(input_, argv[1]); + I input = level::convert(hsl_f(), input_); J vol; io::dump::load(vol, argv[2]); - label_16 nbasins = 898; + label_16 nbasins = atoi(argv[3]); std::cout << "nbasins = " << nbasins << std::endl; util::graph g = make_graph(vol, c4(), nbasins); @@ -265,7 +299,8 @@ int main(int, char *argv[]) mln_VAR(ima_e, make_edge_graph_image(ima_v, g)); //DEBUG -// io::ppm::save(make_debug_graph_image(input, ima_v, ima_e, box_size), "wst_rag_graph_image.ppm"); + io::ppm::save(make_debug_graph_image(input, ima_v, ima_e, box_size), + "wst_rag_graph_image.ppm"); mln_piter_(ima_e_t) e(ima_e.domain()); @@ -277,7 +312,7 @@ int main(int, char *argv[]) { unsigned v1 = e.element().v1(); unsigned v2 = e.element().v2(); - if (ima_e(e) <= (unsigned)(atoi(argv[4])) + if (ima_e(e) <= (unsigned)(atoi(argv[5])) && find_root(parent, v1) != find_root(parent, v2)) parent[find_root(parent, v1)] = find_root(parent, v2); } @@ -298,10 +333,21 @@ int main(int, char *argv[]) J vol2 = level::transform(vol, f); util::graph g2 = make_graph(vol2, c4(), nbasins2); + + // Compute values distance on the HSL Image. mln_VAR(ima_v2, make_vertex_graph_image(g2, input, vol2, nbasins2)); mln_VAR(ima_e2, make_edge_graph_image(ima_v2, g2)); - J vol2_ = morpho::elementary::dilation(vol2, c4()); - io::ppm::save(labeling::mean_values(input, vol2_, nbasins2), "wst_rag_mean_colors.ppm"); - io::ppm::save(make_debug_graph_image(input, ima_v2, ima_e2, box_size), "wst_rag_graph_image2.ppm"); + mln_VAR(vol2_, + morpho::elementary::dilation(extend(vol2 | (pw::value(vol2) == 0u), + vol2), + c8())); + + data::fill((vol2 | (pw::value(vol2) == 0u)).rw(), vol2_); + + io::ppm::save(labeling::mean_values(input_, vol2, nbasins2), + "wst_rag_mean_colors.ppm"); + io::ppm::save(make_debug_graph_image(input_, ima_v2, ima_e2, box_size), + "wst_rag_graph_image2.ppm"); + } -- 1.5.6.5

1 0

3360: Add new routines to extract HSL components.
by Guillaume Lazzara 12 Feb '09

12 Feb '09

* mln/extract/all.hh: include new includes. * mln/extract/hue.hh, * mln/extract/lum.hh, * mln/extract/sat.hh: new. Construct a fun_image from a hsl image and the appropriate meta function. * mln/extract/blue.hh: fix a wrong guard. --- milena/ChangeLog | 13 +++++++++++++ milena/mln/extract/all.hh | 7 +++++-- milena/mln/extract/blue.hh | 6 +++--- milena/mln/extract/{blue.hh => hue.hh} | 22 +++++++++++----------- milena/mln/extract/{blue.hh => lum.hh} | 22 +++++++++++----------- milena/mln/extract/{blue.hh => sat.hh} | 22 +++++++++++----------- 6 files changed, 54 insertions(+), 38 deletions(-) copy milena/mln/extract/{blue.hh => hue.hh} (80%) copy milena/mln/extract/{blue.hh => lum.hh} (80%) copy milena/mln/extract/{blue.hh => sat.hh} (80%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7cf4e5b..2d2199f 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,18 @@ 2009-02-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new routines to extract HSL components. + + * mln/extract/all.hh: include new includes. + + * mln/extract/hue.hh, + * mln/extract/lum.hh, + * mln/extract/sat.hh: new. Construct a fun_image from a hsl image and + the appropriate meta function. + + * mln/extract/blue.hh: fix a wrong guard. + +2009-02-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new meta functions to retrieve HSL components. * mln/fun/all.hh: include meta/all.hh. diff --git a/milena/mln/extract/all.hh b/milena/mln/extract/all.hh index eeea24d..cbcc8c6 100644 --- a/milena/mln/extract/all.hh +++ b/milena/mln/extract/all.hh @@ -38,13 +38,16 @@ namespace mln namespace extract { - } + } // end of namespace mln::extract -} +} // end of namespace mln # include <mln/extract/red.hh> # include <mln/extract/green.hh> # include <mln/extract/blue.hh> +# include <mln/extract/hue.hh> +# include <mln/extract/sat.hh> +# include <mln/extract/lum.hh> #endif // ! MLN_EXTRACT_ALL_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/blue.hh index 3315a25..327be89 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/blue.hh @@ -25,8 +25,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_BLUE_HH +# define MLN_EXTRACT_BLUE_HH /// \file mln/extract/blue.hh /// @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_BLUE_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/hue.hh similarity index 80% copy from milena/mln/extract/blue.hh copy to milena/mln/extract/hue.hh index 3315a25..8a38606 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/hue.hh @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_HUE_HH +# define MLN_EXTRACT_HUE_HH -/// \file mln/extract/blue.hh +/// \file mln/extract/hue.hh /// -/// Extract the blue component of an image. +/// Extract the hue component of an image. # include <mln/core/image/fun_image.hh> -# include <mln/fun/meta/blue.hh> +# include <mln/fun/meta/hue.hh> namespace mln { @@ -43,16 +43,16 @@ namespace mln { template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image& ima); + fun_image<meta::hue<mln_value(I)>,I> + hue(Image& ima); # ifndef MLN_INCLUDE_ONLY template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image& ima) + fun_image<meta::hue<mln_value(I)>,I> + hue(Image& ima) { - fun_image<meta::blue<mln_value(I)>,I> result(ima); + fun_image<meta::hue<mln_value(I)>,I> result(ima); return result; } @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_HUE_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/lum.hh similarity index 80% copy from milena/mln/extract/blue.hh copy to milena/mln/extract/lum.hh index 3315a25..21821b6 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/lum.hh @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_LUM_HH +# define MLN_EXTRACT_LUM_HH -/// \file mln/extract/blue.hh +/// \file mln/extract/lum.hh /// -/// Extract the blue component of an image. +/// Extract the lum component of an image. # include <mln/core/image/fun_image.hh> -# include <mln/fun/meta/blue.hh> +# include <mln/fun/meta/lum.hh> namespace mln { @@ -43,16 +43,16 @@ namespace mln { template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image& ima); + fun_image<meta::lum<mln_value(I)>,I> + lum(Image& ima); # ifndef MLN_INCLUDE_ONLY template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image& ima) + fun_image<meta::lum<mln_value(I)>,I> + lum(Image& ima) { - fun_image<meta::blue<mln_value(I)>,I> result(ima); + fun_image<meta::lum<mln_value(I)>,I> result(ima); return result; } @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_LUM_HH diff --git a/milena/mln/extract/blue.hh b/milena/mln/extract/sat.hh similarity index 80% copy from milena/mln/extract/blue.hh copy to milena/mln/extract/sat.hh index 3315a25..6c375b4 100644 --- a/milena/mln/extract/blue.hh +++ b/milena/mln/extract/sat.hh @@ -25,16 +25,16 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_EXTRACT_GREEN_HH -# define MLN_EXTRACT_GREEN_HH +#ifndef MLN_EXTRACT_SAT_HH +# define MLN_EXTRACT_SAT_HH -/// \file mln/extract/blue.hh +/// \file mln/extract/sat.hh /// -/// Extract the blue component of an image. +/// Extract the sat component of an image. # include <mln/core/image/fun_image.hh> -# include <mln/fun/meta/blue.hh> +# include <mln/fun/meta/sat.hh> namespace mln { @@ -43,16 +43,16 @@ namespace mln { template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image& ima); + fun_image<meta::sat<mln_value(I)>,I> + sat(Image& ima); # ifndef MLN_INCLUDE_ONLY template <typename I> - fun_image<meta::blue<mln_value(I)>,I> - blue(Image& ima) + fun_image<meta::sat<mln_value(I)>,I> + sat(Image& ima) { - fun_image<meta::blue<mln_value(I)>,I> result(ima); + fun_image<meta::sat<mln_value(I)>,I> result(ima); return result; } @@ -62,4 +62,4 @@ namespace mln } // end of namespace mln -#endif // ! MLN_EXTRACT_GREEN_HH +#endif // ! MLN_EXTRACT_SAT_HH -- 1.5.6.5

1 0

3359: Add new meta functions to retrieve HSL components.
by Guillaume Lazzara 12 Feb '09

12 Feb '09

* mln/fun/all.hh: include meta/all.hh. * mln/fun/meta/all.hh: new. Includes meta/*.hh. * mln/fun/meta/hue.hh: add new specialization for value::hsl. * mln/fun/meta/lum.hh, * mln/fun/meta/sat.hh: new. Introduce new meta functions to retrieve HSL components. --- milena/ChangeLog | 14 +++++++++ milena/mln/fun/all.hh | 2 +- milena/mln/fun/{ => meta}/all.hh | 47 +++++++++++-------------------- milena/mln/fun/meta/hue.hh | 32 +++++++++++++++++++++- milena/mln/fun/meta/{hue.hh => lum.hh} | 35 +++++++++++------------ milena/mln/fun/meta/sat.hh | 34 ++++++++++++++++++++++- 6 files changed, 113 insertions(+), 51 deletions(-) copy milena/mln/fun/{ => meta}/all.hh (64%) copy milena/mln/fun/meta/{hue.hh => lum.hh} (74%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 126f352..7cf4e5b 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,19 @@ 2009-02-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Add new meta functions to retrieve HSL components. + + * mln/fun/all.hh: include meta/all.hh. + + * mln/fun/meta/all.hh: new. Includes meta/*.hh. + + * mln/fun/meta/hue.hh: add new specialization for value::hsl. + + * mln/fun/meta/lum.hh, + * mln/fun/meta/sat.hh: new. Introduce new meta functions to retrieve + HSL components. + +2009-02-12 Guillaume Lazzara <z(a)lrde.epita.fr> + Fix from_to overloads and add missing operators in value::hsl. * mln/convert/from_to.hxx: Update forward declarations to from_to diff --git a/milena/mln/fun/all.hh b/milena/mln/fun/all.hh index 62c6a45..8e9ddad 100644 --- a/milena/mln/fun/all.hh +++ b/milena/mln/fun/all.hh @@ -61,7 +61,7 @@ namespace mln # include <mln/fun/x2p/all.hh> # include <mln/fun/x2v/all.hh> # include <mln/fun/x2x/all.hh> - +# include <mln/fun/meta/all.hh> #endif // ! MLN_FUN_ALL_HH diff --git a/milena/mln/fun/all.hh b/milena/mln/fun/meta/all.hh similarity index 64% copy from milena/mln/fun/all.hh copy to milena/mln/fun/meta/all.hh index 62c6a45..23d7bc2 100644 --- a/milena/mln/fun/all.hh +++ b/milena/mln/fun/meta/all.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -25,43 +26,29 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_ALL_HH -# define MLN_FUN_ALL_HH - -/*! \file mln/fun/all.hh - * - * \brief File that includes all fun-related routines. - */ - +#ifndef MLN_FUN_META_ALL_HH +# define MLN_FUN_META_ALL_HH namespace mln { - /// Namespace of image processing routines related to functions. - namespace fun + namespace meta { - /// Internal namespace of functions. - namespace internal - { - } - } - -} + } // end of namespace mln::meta +} // end of namespace mln -# include <mln/fun/c.hh> -# include <mln/fun/ops.hh> -# include <mln/fun/i2v/all.hh> -# include <mln/fun/p2b/all.hh> -# include <mln/fun/p2v/all.hh> -# include <mln/fun/v2b/all.hh> -# include <mln/fun/v2v/all.hh> -# include <mln/fun/vv2v/all.hh> -# include <mln/fun/x2p/all.hh> -# include <mln/fun/x2v/all.hh> -# include <mln/fun/x2x/all.hh> +#include<mln/fun/meta/red.hh> +#include<mln/fun/meta/hue.hh> +#include<mln/fun/meta/lum.hh> +#include<mln/fun/meta/all.hh> +#include<mln/fun/meta/green.hh> +#include<mln/fun/meta/inty.hh> +#include<mln/fun/meta/blue.hh> +#include<mln/fun/meta/sat.hh> +#include<mln/fun/meta/to_enc.hh> +#endif // ! MLN_FUN_META_ALL_HH -#endif // ! MLN_FUN_ALL_HH diff --git a/milena/mln/fun/meta/hue.hh b/milena/mln/fun/meta/hue.hh index a1db15f..018348f 100644 --- a/milena/mln/fun/meta/hue.hh +++ b/milena/mln/fun/meta/hue.hh @@ -33,6 +33,7 @@ /// /// Meta function to retrieve/modify the color hue. +# include <mln/value/hsl.hh> # include <mln/value/hsi.hh> # include <mln/core/concept/meta_fun.hh> @@ -63,9 +64,21 @@ namespace mln H& write(value& h); }; + template <class H, class S, class L> + struct function< meta::hue< value::hsl_<H, S, L> > > + : public Function_v2w_w2v<function< meta::hue < value::hsl_<H, S, L> > > > + { + typedef value::hsl_<H, S, L> value; + + typedef H result; + H read(const value& h); + + typedef H& lresult; + H& write(value& h); + }; -# ifndef MLN_INCLUDE_ONLY +# ifndef MLN_INCLUDE_ONLY template <class H, class S, class I> inline @@ -84,6 +97,23 @@ namespace mln } + template <class H, class S, class L> + inline + H + function< meta::hue< value::hsl_<H, S, L> > >::read(const value& h) + { + return h.hue(); + } + + template <class H, class S, class L> + inline + H& + function< meta::hue< value::hsl_<H, S, L> > >::write(value& h) + { + return h.hue(); + } + + # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/fun/meta/hue.hh b/milena/mln/fun/meta/lum.hh similarity index 74% copy from milena/mln/fun/meta/hue.hh copy to milena/mln/fun/meta/lum.hh index a1db15f..2c987b9 100644 --- a/milena/mln/fun/meta/hue.hh +++ b/milena/mln/fun/meta/lum.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development -// Laboratory (LRDE) +// Copyright (C) 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -26,14 +26,14 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_FUN_META_HUE_HH -# define MLN_FUN_META_HUE_HH +#ifndef MLN_FUN_META_LUM_HH +# define MLN_FUN_META_LUM_HH -/// \file mln/fun/meta/hue.hh +/// \file mln/fun/meta/infy.hh /// -/// Meta function to retrieve/modify the color hue. +/// Meta function to retrieve/modify the color luminosity. -# include <mln/value/hsi.hh> +# include <mln/value/hsl.hh> # include <mln/core/concept/meta_fun.hh> namespace mln @@ -43,18 +43,19 @@ namespace mln { template <class H> - struct hue : impl< hue<H> > + struct lum : impl< lum<H> > { typedef H value; }; } // end of namespace mln::meta + template <class H, class S, class I> - struct function< meta::hue< value::hsi_<H, S, I> > > - : public Function_v2w_w2v<function< meta::hue < value::hsi_<H, S, I> > > > + struct function< meta::lum< value::hsl_<H, S, I> > > + : public Function_v2w_w2v<function< meta::lum < value::hsl_<H, S, I> > > > { - typedef value::hsi_<H, S, I> value; + typedef value::hsl_<H, S, I> value; typedef H result; H read(const value& h); @@ -66,27 +67,25 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - template <class H, class S, class I> inline H - function< meta::hue< value::hsi_<H, S, I> > >::read(const value& h) + function< meta::lum< value::hsl_<H, S, I> > >::read(const value& h) { - return h.hue(); + return h.lum(); } template <class H, class S, class I> inline H& - function< meta::hue< value::hsi_<H, S, I> > >::write(value& h) + function< meta::lum< value::hsl_<H, S, I> > >::write(value& h) { - return h.hue(); + return h.lum(); } - # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln -#endif // MLN_FUN_META_HUE_HH +#endif // MLN_FUN_META_LUM_HH diff --git a/milena/mln/fun/meta/sat.hh b/milena/mln/fun/meta/sat.hh index bf4c74a..16fe0fd 100644 --- a/milena/mln/fun/meta/sat.hh +++ b/milena/mln/fun/meta/sat.hh @@ -33,6 +33,7 @@ /// /// Meta function to retrieve/modify the color saturation. +# include <mln/value/hsl.hh> # include <mln/value/hsi.hh> # include <mln/core/concept/meta_fun.hh> @@ -65,8 +66,21 @@ namespace mln }; -# ifndef MLN_INCLUDE_ONLY + template <class H, class S, class L> + struct function< meta::sat< value::hsl_<H, S, L> > > + : public Function_v2w_w2v<function< meta::sat < value::hsl_<H, S, L> > > > + { + typedef value::hsl_<H, S, L> value; + typedef H result; + H read(const value& h); + + typedef H& lresult; + H& write(value& h); + }; + + +# ifndef MLN_INCLUDE_ONLY template <class H, class S, class I> inline @@ -85,6 +99,24 @@ namespace mln } + + template <class H, class S, class L> + inline + H + function< meta::sat< value::hsl_<H, S, L> > >::read(const value& h) + { + return h.sat(); + } + + template <class H, class S, class L> + inline + H& + function< meta::sat< value::hsl_<H, S, L> > >::write(value& h) + { + return h.sat(); + } + + # endif // ! MLN_INCLUDE_ONLY -- 1.5.6.5

1 0

3358: Fix from_to overloads and add missing operators in value::hsl.
by Guillaume Lazzara 12 Feb '09

12 Feb '09

* mln/convert/from_to.hxx: Update forward declarations to from_to overloads. * mln/value/hsl.hh: Add missing operators +,-,/,*. --- milena/ChangeLog | 9 ++ milena/mln/convert/from_to.hxx | 6 +- milena/mln/value/hsl.hh | 170 ++++++++++++++++++++++++++++++++++++---- 3 files changed, 166 insertions(+), 19 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7ffa783..126f352 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2009-02-12 Guillaume Lazzara <z(a)lrde.epita.fr> + + Fix from_to overloads and add missing operators in value::hsl. + + * mln/convert/from_to.hxx: Update forward declarations to from_to + overloads. + + * mln/value/hsl.hh: Add missing operators +,-,/,*. + 2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> Update apps/statues/ to catch up with recent changes of interface. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index 4649932..b0c09b5 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -170,14 +170,12 @@ namespace mln // rgb to hsl - template <typename H, typename S, typename L> void - from_to_(const value::rgb<16>& from, value::hsl_<H,S,L>& to); + from_to_(const value::rgb<16>& from, value::hsl_<float,float,float>& to); // rgb to hsl - template <typename H, typename S, typename L> void - from_to_(const value::rgb<8>& from, value::hsl_<H,S,L>& to); + from_to_(const value::rgb<8>& from, value::hsl_<float,float,float>& to); // C-array -> Image. diff --git a/milena/mln/value/hsl.hh b/milena/mln/value/hsl.hh index 0ac4087..fd84fba 100644 --- a/milena/mln/value/hsl.hh +++ b/milena/mln/value/hsl.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -30,6 +31,7 @@ /// Color class. /// /// \todo write a better doc. +/// \todo Cleanup/Revamp! #ifndef MLN_VALUE_HSL_HH # define MLN_VALUE_HSL_HH @@ -40,8 +42,6 @@ #include <mln/value/int_u.hh> #include <mln/algebra/vec.hh> -#include <mln/value/float01_8.hh> - // Used in from_to #include <mln/fun/v2v/rgb_to_hsl.hh> @@ -66,26 +66,90 @@ namespace mln namespace over_load { - // rgb to hsl - template <typename H, typename S, typename L> + // rgb to hsl_ void - from_to_(const value::rgb<16>& from, value::hsl_<H,S,L>& to); + from_to_(const value::rgb<16>& from, value::hsl_<float,float,float>& to); - // rgb to hsl - template <typename H, typename S, typename L> + // rgb to hsl_ void - from_to_(const value::rgb<8>& from, value::hsl_<H,S,L>& to); + from_to_(const value::rgb<8>& from, value::hsl_<float,float,float>& to); } // end of namespace mln::convert::over_load } // end of namespace mln::convert + + namespace trait + { + + template <typename H, typename S, typename L> + struct set_precise_binary_< op::plus, mln::value::hsl_<H,S,L>, mln::value::hsl_<H,S,L> > + { + typedef mln::value::hsl_<H,S,L> ret; + }; + + template <typename H, typename S, typename L> + struct set_precise_binary_< op::minus, mln::value::hsl_<H,S,L>, mln::value::hsl_<H,S,L> > + { + typedef mln::value::hsl_<H,S,L> ret; + }; + + template <typename H, typename S, typename L, typename S2> + struct set_precise_binary_< op::times, mln::value::hsl_<H,S,L>, mln::value::scalar_<S2> > + { + typedef mln::value::hsl_<H,S,L> ret; + }; + + template <typename H, typename S, typename L, typename S2> + struct set_precise_binary_< op::div, mln::value::hsl_<H,S,L>, mln::value::scalar_<S2> > + { + typedef mln::value::hsl_<H,S,L> ret; + }; + + + // FIXME : Is there any way more generic? a way to factor + // set_precise_binary_< op::div, mln::value::hsl_<H,S,L>, mln::value::scalar_<S> > + // and + // set_precise_binary_< op::div, mln::value::hsl_<H,S,L>, mln::value::int_u<m> > + // as for op::times. + + template <typename H, typename S, typename L, unsigned m> + struct set_precise_binary_< op::times, mln::value::hsl_<H,S,L>, mln::value::int_u<m> > + { + typedef mln::value::hsl_<H,S,L> ret; + }; + + template <typename H, typename S, typename L, unsigned m> + struct set_precise_binary_< op::div, mln::value::hsl_<H,S,L>, mln::value::int_u<m> > + { + typedef mln::value::hsl_<H,S,L> ret; + }; + + template <typename H, typename S, typename L> + struct value_< mln::value::hsl_<H,S,L> > + { + enum { + nbits = (sizeof (H) + sizeof (S) + sizeof (L)) * 8, + card = mln_value_card_from_(nbits) + }; + + typedef trait::value::nature::vectorial nature; + typedef trait::value::kind::color kind; + typedef mln_value_quant_from_(card) quant; + +// typedef algebra::vec<3, float> sum; + typedef mln::value::hsl_<H,S,L> sum; + }; + + } // end of namespace trait + + namespace value { template <typename E> - struct HSL + struct HSL : Object<E> { }; @@ -103,6 +167,13 @@ namespace mln { } + hsl_(const literal::zero_t&) + : hue_(0), + sat_(0), + lum_(0) + { + } + /// Constructor from component values. hsl_(const H& hue, const S& sat, const L& lum) : hue_(hue), @@ -122,6 +193,7 @@ namespace mln L& lum(); private: + //FIXME: Don't we want to store these values in a vector? H hue_; S sat_; L lum_; @@ -141,6 +213,35 @@ namespace mln template <typename H, typename S, typename L> std::ostream& operator<<(std::ostream& ostr, const hsl_<H,S,L>& c); + + /// Addition. + /// { + template <typename H, typename S, typename L> + hsl_<H,S,L> + operator+(const hsl_<H,S,L>& lhs, const hsl_<H,S,L>& rhs); + /// \} + + /// Subtraction. + /// \{ + template <typename H, typename S, typename L> + hsl_<H,S,L> + operator-(const hsl_<H,S,L>& lhs, const hsl_<H,S,L>& rhs); + /// \} + + /// Product. + /// \{ + template <typename H, typename S, typename L, typename S2> + hsl_<H,S,L> + operator*(const hsl_<H,S,L>& lhs, const mln::value::scalar_<S2>& s); + /// \} + + /// Division. + /// \{ + template <typename H, typename S, typename L, typename S2> + hsl_<H,S,L> + operator/(const hsl_<H,S,L>& lhs, const mln::value::scalar_<S2>& s); + /// \} + } // end of namespace mln::value @@ -221,6 +322,46 @@ namespace mln << ')'; } + + template <typename H, typename S, typename L> + hsl_<H,S,L> + operator+(const hsl_<H,S,L>& lhs, const hsl_<H,S,L>& rhs) + { + return hsl_<H,S,L>(lhs.hue() + rhs.hue(), + lhs.sat() + rhs.sat(), + lhs.lum() + rhs.lum()); + } + + + template <typename H, typename S, typename L> + hsl_<H,S,L> + operator-(const hsl_<H,S,L>& lhs, const hsl_<H,S,L>& rhs) + { + return hsl_<H,S,L>(lhs.hue() - rhs.hue(), + lhs.sat() - rhs.sat(), + lhs.lum() - rhs.lum()); + } + + + template <typename H, typename S, typename L, typename S2> + hsl_<H,S,L> + operator*(const hsl_<H,S,L>& lhs, const mln::value::scalar_<S2>& s) + { + return hsl_<H,S,L>(lhs.hue() * s, + lhs.sat() * s, + lhs.lum() * s); + } + + + template <typename H, typename S, typename L, typename S2> + hsl_<H,S,L> + operator/(const hsl_<H,S,L>& lhs, const mln::value::scalar_<S2>& s) + { + return hsl_<H,S,L>(lhs.hue() / s, + lhs.sat() / s, + lhs.lum() / s); + } + } // end of namespace mln::value @@ -230,17 +371,16 @@ namespace mln namespace over_load { - template <typename H, typename S, typename L> + inline void - from_to_(const value::rgb<16>& from, value::hsl_<H,S,L>& to) + from_to_(const value::rgb<16>& from, value::hsl_<float,float,float>& to) { to = fun::v2v::f_rgb_to_hsl_f(from); } - - template <typename H, typename S, typename L> + inline void - from_to_(const value::rgb<8>& from, value::hsl_<H,S,L>& to) + from_to_(const value::rgb<8>& from, value::hsl_<float,float,float>& to) { to = fun::v2v::f_rgb_to_hsl_f(from); } -- 1.5.6.5

1 0

r3357: Add connected filters dispatcher (not tested)..
by Frederic Bour 12 Feb '09

12 Feb '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk ChangeLog: 2009-02-12 Frederic Bour <bour(a)lrde.epita.fr> Add connected filters dispatcher (not tested).. * milena/sandbox/fred/Makefile: . * milena/sandbox/fred/connected_filter.hh: New. * milena/sandbox/fred/leveling_filter.hh: . * milena/sandbox/fred/mean.hh: . --- Makefile | 6 ++ connected_filter.hh | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++ leveling_filter.hh | 34 ++++++++------ mean.hh | 82 +++++++++++++++------------------- 4 files changed, 186 insertions(+), 59 deletions(-) Index: trunk/milena/sandbox/fred/connected_filter.hh =================================================================== --- trunk/milena/sandbox/fred/connected_filter.hh (revision 0) +++ trunk/milena/sandbox/fred/connected_filter.hh (revision 3357) @@ -0,0 +1,123 @@ +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory +// (LRDE) +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_CANVAS_MORPHO_CONNECTED_FILTER_HH +# define MLN_CANVAS_MORPHO_CONNECTED_FILTER_HH + +/// \file mln/canvas/morpho/connected_filter.hh +/// +/// Connected filters dispatch (algebraic & leveling filters). +/// + +# include "leveling_filter.hh" +# include <mln/canvas/morpho/algebraic_filter.hh> +# include <mln/trait/accumulators.hh> + +namespace mln { + namespace canvas { + namespace morpho { + + // Facade Fwd Declaration + template <typename I, typename N, typename A> + mln_concrete(I) + connected_filter(const Image& input, const Neighborhood<N>& nbh, + const Accumulator<A>& a, const typename A::result& lambda, bool increasing); + +# ifndef MLN_INCLUDE_ONLY + + // Dispatch. + namespace internal + { + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_none, + const Image& input, const Neighborhood<N>& nbh, + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing) + { + return algebraic_filter_dispatch(input, nbh, a, lambda, increasing); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_p, + const Image& input, const Neighborhood<N>& nbh, + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing) + { + return algebraic_filter_dispatch(input, nbh, a, lambda, increasing); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_v, + const Image& input, const Neighborhood<N>& nbh, + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing) + { + return leveling_filter_dispatch(input, nbh, a, lambda, increasing); + } + + template <typename I, typename N, typename A> + inline + mln_concrete(I) + connected_filter_dispatch(mln::trait::accumulator::when_pix::use_pix, + const Image& input, const Neighborhood<N>& nbh, + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing) + { + return leveling_filter_dispatch(input, nbh, a, lambda, increasing); + } + + } // end of namespace mln::canvas::morpho::internal + + +# endif // ! MLN_INCLUDE_ONLY + + // Facade. + + template <typename I, typename N, typename A> + mln_concrete(I) + connected_filter(const Image& input, const Neighborhood<N>& nbh, + const Accumulator<A>& a, const typename A::result& lambda, bool increasing) + { + return internal::connected_filter_dispatch(mln_trait_accu_when_pix(A)(), + input, nbh, a, lambda, increasing); + } + + + } // end of namespace mln::canvas::morpho + } // end of namespace mln::canvas +} // end of namespace mln + + +#endif // ! MLN_CANVAS_MORPHO_CONNECTED_FILTER_HH Index: trunk/milena/sandbox/fred/leveling_filter.hh =================================================================== --- trunk/milena/sandbox/fred/leveling_filter.hh (revision 3356) +++ trunk/milena/sandbox/fred/leveling_filter.hh (revision 3357) @@ -59,10 +59,11 @@ namespace morpho { // Facade Fwd Declaration - template < typename I, typename N, typename A, typename L> + template <typename I, typename N, typename A> mln_concrete(I) leveling_filter(const Image& input, const Neighborhood<N>& nbh, - const Accumulator<A>& a, L lambda, bool increasing); + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing); # ifndef MLN_INCLUDE_ONLY @@ -86,10 +87,11 @@ return parent(x) = find_root(parent, parent(x)); } - template < typename I, typename N, typename S, typename A, typename L> + template <typename I, typename N, typename S, typename A> mln_concrete(I) leveling_filter(const Image& input_, const Neighborhood<N>& nbh_, - const Site_Set<S>& s_, const Accumulator<A>& a_, L lambda) + const Site_Set<S>& s_, + const Accumulator<A>& a_, const typename A::result& lambda) { trace::entering("canvas::morpho::impl::generic::leveling_filter"); // FIXME: Test?! @@ -204,10 +206,11 @@ return parent.element(x) = find_root_fastest(parent, parent.element(x)); } - template < typename I, typename N, typename A, typename L> + template <typename I, typename N, typename A> mln_concrete(I) leveling_filter_fastest(const Image& input_, const Neighborhood<N>& nbh_, - const util::array<unsigned>& s, const Accumulator<A>& a_, L lambda) + const util::array<unsigned>& s, + const Accumulator<A>& a_, const typename A::result& lambda) { trace::entering("canvas::morpho::impl::leveling_fastest"); @@ -305,11 +308,12 @@ { // Leveling - template < typename I, typename N, typename A, typename L> + template <typename I, typename N, typename A> mln_concrete(I) leveling_filter_dispatch(metal::false_, const Image& input, const Neighborhood<N>& nbh, - const Accumulator<A>& a, L lambda, bool increasing) + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing) { p_array < mln_psite(I) > s = increasing ? @@ -318,11 +322,12 @@ return impl::generic::leveling_filter(input, nbh, s, a, lambda); } - template < typename I, typename N, typename A, typename L> + template <typename I, typename N, typename A> mln_concrete(I) leveling_filter_dispatch(metal::true_, const Image& input, const Neighborhood<N>& nbh, - const Accumulator<A>& a, L lambda, bool increasing) + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing) { util::array<unsigned> s = increasing ? @@ -331,11 +336,11 @@ return impl::leveling_filter_fastest(input, nbh, s, a, lambda); } - template < typename I, typename N, typename A, typename L> + template <typename I, typename N, typename A> inline mln_concrete(I) leveling_filter_dispatch(const Image& input, const Neighborhood<N>& nbh, - const Accumulator<A>& a, L lambda, bool increasing) + const Accumulator<A>& a, const typename A::result& lambda, bool increasing) { enum { @@ -357,11 +362,12 @@ // Facade. - template < typename I, typename N, typename A, typename L> + template <typename I, typename N, typename A> inline mln_concrete(I) leveling_filter(const Image& input, const Neighborhood<N>& nbh, - const Accumulator<A>& a, L lambda, bool increasing) + const Accumulator<A>& a, const typename A::result& lambda, + bool increasing) { //FIXME: Do we need to check input validity ? return internal::leveling_filter_dispatch(input, nbh, a, lambda, increasing); Index: trunk/milena/sandbox/fred/Makefile =================================================================== --- trunk/milena/sandbox/fred/Makefile (revision 3356) +++ trunk/milena/sandbox/fred/Makefile (revision 3357) @@ -8,6 +8,7 @@ CXX=g++ LD=g++ LDFLAGS= +RM=rm $(TARGET): $(OBJS) $(LD) $(LDFLAGS) -o $@ $(OBJS) @@ -17,3 +18,8 @@ %.o: %.hh $(CXX) $(CXXFLAGS) -c $< + +all: $(TARGET) + +clean: + $(RM) -f $(TARGET) *.o *~ \ No newline at end of file Index: trunk/milena/sandbox/fred/mean.hh =================================================================== --- trunk/milena/sandbox/fred/mean.hh (revision 3356) +++ trunk/milena/sandbox/fred/mean.hh (revision 3357) @@ -69,15 +69,10 @@ namespace internal { - template <typename T, - typename S = mln_sum(T), - typename M = S> - struct accu_mean_set_value : public mln::accu::mean<T, S, M> + template <typename T, typename S> + struct sum_set_value : public mln::accu::sum<T, S> { - typedef mln::accu::mean<T, S, M> super; - typedef typename super::result result; - - void set_value(const result& v); + void set_value(const S& s); }; } @@ -85,23 +80,21 @@ /// Morphological (i.e. for pixel and pixel values) accumulator calculating mean. /// Valid for leveling algorithm. template <typename I> - class mean: public mln::accu::internal::base<typename internal::accu_mean_set_value<mln_value(I)>::result, mean > + class mean: public mln::accu::internal::base<mln_sum(mln_value(I)), mean > { public: typedef util::pix argument; - typedef typename internal::accu_mean_set_value<mln_value(I)>::result result; - typedef typename internal::accu_mean_set_value<mln_value(I)>::q_result q_result; + typedef mln_value(I) value; + typedef mln_sum(value) result; mean(); - /// Manipulators. /// \{ void init(); - - void take(const mln_value(I)& v); + void take(const value& v); void take(const argument& t); - void take(const mean& m); + void take(const mean& other); void set_value(const result& r); /// \} @@ -110,37 +103,33 @@ result to_result() const; /// Check whether this accu is able to return a result. + /// Always true here. bool is_valid() const; protected: - /// The mean - internal::accu_mean_set_value<mln_value(I)> accu_; - }; - + accu::count<value> count_; + internal::sum_set_value<value,result> sum_; + }; # ifndef MLN_INCLUDE_ONLY namespace internal { - template <typename T, - typename S, - typename M> + template <typename T, typename S> void - accu_mean_set_value<T, S, M>::set_value(const typename internal::accu_mean_set_value<T, S, M>::result& v) + sum_set_value<T, S>::set_value(const S& s) { - // FIXME: bad - this->sum_.init(); - this->sum_.take(v * this->count_.to_result()); - } + this->s_ = s; + }; } template <typename I> inline - mean::mean () : - accu_ () + mean::mean() { + init(); } template <typename I> @@ -148,39 +137,41 @@ void mean::init () { - accu_.init(); + count_.init(); + sum_.init(); } template <typename I> inline void - mean::take (const mean& accu) + mean::take(const value& t) { - accu_.take(accu.accu_); + count_.take(t); + sum_.take(t); } template <typename I> inline void - mean::take (const util::pix& elt) + mean::take(const argument& t) { - take(elt.v()); - }; + take(t.v()); + } template <typename I> inline void - mean::take (const mln_value(I)& elt) + mean::take(const mean& other) { - accu_.take(elt); - }; + count_.take(other.count_); + sum_.take(other.sum_); + } template <typename I> - inline void - mean::set_value(const typename mean::result& r) + mean::set_value(const result& r) { - accu_.set_value(r); + sum_.set_value(r * count_.to_result()); }; template <typename I> @@ -188,16 +179,17 @@ typename mean::result mean::to_result() const { - return accu_.to_result(); - }; + unsigned n = count_.to_result(); + return sum_.to_result() / n; + } template <typename I> inline bool mean::is_valid() const { - return accu_.is_valid(); - }; + return count_.to_result() != 0; + } # endif // ! MLN_INCLUDE_ONLY

1 0

3356: Cleanup pseudo-tree computation.
by Thierry Geraud 11 Feb '09

11 Feb '09

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Cleanup pseudo-tree computation. * theo/esiee/laurent/ismm09/pseudo_tree.hh (compute_pseudo_tree): Move lca stuff.. (compute_lca): ...this new routine. Update pseudo_tree.hh | 49 +++++++++++++++++++++++-------------------------- 1 file changed, 23 insertions(+), 26 deletions(-) Index: theo/esiee/laurent/ismm09/pseudo_tree.hh --- theo/esiee/laurent/ismm09/pseudo_tree.hh (revision 3355) +++ theo/esiee/laurent/ismm09/pseudo_tree.hh (working copy) @@ -18,6 +18,8 @@ #include <mln/value/int_u8.hh> #include <mln/io/pgm/save.hh> #include <mln/level/stretch.hh> +#include <mln/level/compute.hh> +#include <mln/accu/max.hh> @@ -177,6 +179,20 @@ } + template <typename I, typename E, typename L> + lca_t<L, mln_ch_value(I, std::vector<mln_psite(I)>), E> + compute_lca(const I& epar, const util::array<E>& edge, L l_max) + { + std::vector<E> roots; + mln_VAR(chl, compute_children(epar, edge, l_max, roots)); + + // Connected domain so: + mln_invariant(roots.size() == 1); + E root = roots[0]; // THE root. + + lca_t<L,chl_t,E> lca(l_max, chl, roots); + return lca; + } // ################################################################### @@ -500,24 +516,9 @@ // Finalization. - A aa_max = mln_min(A); - - { - mln_VAR(aa_ext, aa.unmorph_().unmorph_()); - - - debug::println("aa ext (1):", aa_ext); + mln_VAR(lca, compute_lca(epar, edge, l_max)); - std::vector<E> roots; - mln_VAR(chl, compute_children(epar, edge, l_max, roots)); - - // Connected domain so: - mln_invariant(roots.size() == 1); - E root = roots[0]; // THE root. - - lca_t<L,chl_t,E> lca(l_max, chl, roots); - mln_piter(g_line_t) e(g_line.domain()); for_all(e) { @@ -532,14 +533,9 @@ // The attribute value propagates from the lca to the current edge // of the line: aa(e) = aa(e_); - if (aa(e) > aa_max) - aa_max = aa(e); } - debug::println("aa:", aa); - - debug::println("aa ext (2):", aa_ext); - + mln_VAR(aa_ext, aa.unmorph_().unmorph_()); { mln_VAR( aa_line, aa_ext | (pw::value(w) == 0) ); @@ -547,12 +543,15 @@ aa_line), c4().win()), aa_line); + debug::println("aa ext:", aa_ext); } - debug::println("aa ext (3):", aa_ext); + // Outputing. + { + A aa_max = level::compute(accu::max<A>(), aa); using value::int_u8; if (aa_max < 256) { @@ -585,9 +584,7 @@ // } -// debug::println("aa ext (4):", aa_ext); - - } +// debug::println("aa ext with basins:", aa_ext); }

1 0

[PATCH 4/4] Update apps/statues/ to catch up with recent changes of interface.
by Roland Levillain 11 Feb '09

11 Feb '09

* apps/statues/mesh-complex-max-curv-segm.cc, * apps/statues/mesh-complex-max-curv.cc, * apps/statues/mesh-complex-segm.cc, * apps/statues/trimesh/misc.hh: Adjust to the new interface of mln::morpho::closing_area and the renaming of mln::level as mln::data. * apps/statues/Makefile.am: Adjust comments. --- milena/ChangeLog | 12 ++++++++++++ milena/apps/statues/Makefile.am | 6 +++++- milena/apps/statues/mesh-complex-max-curv-segm.cc | 7 +++---- milena/apps/statues/mesh-complex-max-curv.cc | 8 ++++---- milena/apps/statues/mesh-complex-segm.cc | 5 ++--- milena/apps/statues/trimesh/misc.hh | 10 ++++++---- 6 files changed, 32 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a33b571..7ffa783 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,17 @@ 2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> + Update apps/statues/ to catch up with recent changes of interface. + + * apps/statues/mesh-complex-max-curv-segm.cc, + * apps/statues/mesh-complex-max-curv.cc, + * apps/statues/mesh-complex-segm.cc, + * apps/statues/trimesh/misc.hh: + Adjust to the new interface of mln::morpho::closing_area and the + renaming of mln::level as mln::data. + * apps/statues/Makefile.am: Adjust comments. + +2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> + Add a shortcut for planar 1-complex-based images. * mln/core/alias/complex_image.hh (mln::int_u8_1complex_image2d): diff --git a/milena/apps/statues/Makefile.am b/milena/apps/statues/Makefile.am index b0225c8..e132895 100644 --- a/milena/apps/statues/Makefile.am +++ b/milena/apps/statues/Makefile.am @@ -68,12 +68,16 @@ TESTS += test-mesh-max-curv noinst_HEADERS = trimesh/misc.hh EXTRA_DIST = trimesh/README -# A small test exercising the curvature computation routines ported +# A small program exercising the curvature computation routines ported # from Trimesh to Milena. bin_PROGRAMS += mesh-complex-max-curv mesh_complex_max_curv_SOURCES = mesh-complex-max-curv.cc TESTS += test-mesh-complex-max-curv +# FIXME: Write a program showing the local minima (and maxima) of +# scalar-valued complex-based mesh (to see the curvature extrema). +# ... + # Segmentation program working on precomputed meshes with curvatures data. bin_PROGRAMS += mesh-complex-segm mesh_complex_segm_SOURCES = mesh-complex-segm.cc diff --git a/milena/apps/statues/mesh-complex-max-curv-segm.cc b/milena/apps/statues/mesh-complex-max-curv-segm.cc index 8a0537e..e52d990 100644 --- a/milena/apps/statues/mesh-complex-max-curv-segm.cc +++ b/milena/apps/statues/mesh-complex-max-curv-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -131,8 +131,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input(input.domain()); - mln::morpho::closing_area(input, adj_edges_nbh, lambda, closed_input); + ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); /*------. | WST. | @@ -168,7 +167,7 @@ int main(int argc, char* argv[]) `---------*/ mln::rgb8_2complex_image3df output(wshed.domain()); - mln::level::fill(output, mln::literal::white); + mln::data::fill(output, mln::literal::white); // FIXME: Use a colorize functor instead. // Choose random colors for each basin number. diff --git a/milena/apps/statues/mesh-complex-max-curv.cc b/milena/apps/statues/mesh-complex-max-curv.cc index 0a75da5..5c93d7d 100644 --- a/milena/apps/statues/mesh-complex-max-curv.cc +++ b/milena/apps/statues/mesh-complex-max-curv.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -42,7 +42,7 @@ #include <mln/morpho/closing_area.hh> #include <mln/morpho/meyer_wst.hh> -#include <mln/level/fill.hh> +#include <mln/data/fill.hh> #include <mln/literal/zero.hh> #include <mln/math/max.hh> @@ -103,7 +103,7 @@ int main(int argc, char* argv[]) // Compute the max curvature at each vertex. ima_t max_curv(input.domain()); - mln::level::fill(max_curv, mln::literal::zero); + mln::data::fill(max_curv, mln::literal::zero); mln::p_n_faces_fwd_piter<D, G> v(max_curv.domain(), 0); for_all(v) max_curv(v) = mln::math::max(mln::math::sqr(curv.first(v)), @@ -141,7 +141,7 @@ int main(int argc, char* argv[]) the only values accepted a an RGB floating-point component in the OFF file format. */ ima_t output(max_curv.domain()); - mln::level::fill(output, mln::literal::zero); + mln::data::fill(output, mln::literal::zero); std::pair<float, float> min_max(acc); // FIXME: Taken from mln/level/stretch.hh (this should be factored). float min = min_max.first; diff --git a/milena/apps/statues/mesh-complex-segm.cc b/milena/apps/statues/mesh-complex-segm.cc index 80f87a1..b67d7f6 100644 --- a/milena/apps/statues/mesh-complex-segm.cc +++ b/milena/apps/statues/mesh-complex-segm.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -106,8 +106,7 @@ int main(int argc, char* argv[]) adj_edges_nbh_t; adj_edges_nbh_t adj_edges_nbh; - ima_t closed_input(input.domain()); - mln::morpho::closing_area(input, adj_edges_nbh, lambda, closed_input); + ima_t closed_input = mln::morpho::closing_area(input, adj_edges_nbh, lambda); /*------. | WST. | diff --git a/milena/apps/statues/trimesh/misc.hh b/milena/apps/statues/trimesh/misc.hh index 78af913..a9f0fce 100644 --- a/milena/apps/statues/trimesh/misc.hh +++ b/milena/apps/statues/trimesh/misc.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -39,6 +39,8 @@ # include <mln/norm/l2.hh> +# include <mln/data/fill.hh> + /** See http://gcc.gnu.org/onlinedocs/gcc-4.3.2/gcc/Other-Builtins.html for a definition of __builtin_expect. @@ -166,7 +168,7 @@ namespace mln typedef complex_image< D, G, vec3f > normal_t; normal_t normal(mesh); - level::fill(normal, literal::zero); + data::fill(normal, literal::zero); mln::p_n_faces_fwd_piter<D, G> f(mesh, 2); // A neighborhood where neighbors are the set of 0-faces @@ -263,8 +265,8 @@ namespace mln output_t output(mesh, mesh); corner_area_t& corner_area = output.first; point_area_t& point_area = output.second; - level::fill(corner_area, literal::zero); - level::fill(point_area, literal::zero); + data::fill(corner_area, literal::zero); + data::fill(point_area, literal::zero); mln::p_n_faces_fwd_piter<D, G> f(mesh, 2); // A neighborhood where neighbors are the set of 0-faces -- 1.6.1.2

1 0

[PATCH 3/4] Add a shortcut for planar 1-complex-based images.
by Roland Levillain 11 Feb '09

11 Feb '09

* mln/core/alias/complex_image.hh (mln::int_u8_1complex_image2d): New typedef. --- milena/ChangeLog | 7 +++++++ milena/mln/core/alias/complex_image.hh | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 55260fd..a33b571 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> + Add a shortcut for planar 1-complex-based images. + + * mln/core/alias/complex_image.hh (mln::int_u8_1complex_image2d): + New typedef. + +2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> + Add a shortcut for planar 1-complex geometry. * mln/core/alias/complex_geometry.hh diff --git a/milena/mln/core/alias/complex_image.hh b/milena/mln/core/alias/complex_image.hh index 0d8e379..31aa50c 100644 --- a/milena/mln/core/alias/complex_image.hh +++ b/milena/mln/core/alias/complex_image.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -30,6 +30,9 @@ /// \file mln/core/alias/complex_image.hh /// \brief Definition of mln::complex_image aliases. +/// +/// As C++ does not allow template typedefs (yet), using shortcuts for +/// very long image names is handy. # include <mln/core/image/complex_image.hh> # include <mln/core/alias/complex_geometry.hh> @@ -41,6 +44,19 @@ namespace mln { /*------------------------------. + | 2-d plane 1-complex aliases. | + `------------------------------*/ + + /// \brief Type alias for an 8-bit gray-level image based on a + /// 1-complex, where 0-faces are located at discrete (integer) + /// 2-dimensional points. + typedef + mln::complex_image<1, mln::discrete_plane_1complex_geometry, + mln::value::int_u8> + int_u8_1complex_image2d; + + + /*------------------------------. | 2-d plane 2-complex aliases. | `------------------------------*/ -- 1.6.1.2

1 0

[PATCH 2/4] Add a shortcut for planar 1-complex geometry.
by Roland Levillain 11 Feb '09

11 Feb '09

* mln/core/alias/complex_geometry.hh (mln::discrete_plane_1complex_geometry): New typedef. --- milena/ChangeLog | 7 +++++++ milena/mln/core/alias/complex_geometry.hh | 6 ++++++ 2 files changed, 13 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 0d2e7ed..55260fd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> + Add a shortcut for planar 1-complex geometry. + + * mln/core/alias/complex_geometry.hh + (mln::discrete_plane_1complex_geometry): New typedef. + +2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> + Fix and factor mln::point3df and mln::point3d. * mln/core/alias/point3df.hh (mln::point3df): Move typedef... diff --git a/milena/mln/core/alias/complex_geometry.hh b/milena/mln/core/alias/complex_geometry.hh index e9ce8de..79c7db1 100644 --- a/milena/mln/core/alias/complex_geometry.hh +++ b/milena/mln/core/alias/complex_geometry.hh @@ -40,6 +40,12 @@ namespace mln { + /// \brief Type alias for the geometry of a 1-complex (e.g., a + /// graph) located in a discrete 2-dimensional plane (with integer + /// coordinates). + typedef mln::geom::complex_geometry<1, point2d> + discrete_plane_1complex_geometry; + /// \brief Type alias for the geometry of a 2-complex located in a /// discrete 2-dimensional plane (with integer coordinates). typedef mln::geom::complex_geometry<2, point2d> -- 1.6.1.2

1 0

[PATCH 1/4] Fix and factor mln::point3df and mln::point3d.
by Roland Levillain 11 Feb '09

11 Feb '09

* mln/core/alias/point3df.hh (mln::point3df): Move typedef... * mln/core/alias/point3d.hh: ...here. * mln/core/alias/point3df.hh: Remove file. * mln/core/alias/all.hh: Remove inclusion of mln/core/alias/point3df.hh. * mln/core/alias/complex_geometry.hh: Adjust. --- milena/ChangeLog | 11 ++ milena/mln/core/alias/all.hh | 1 - milena/mln/core/alias/complex_geometry.hh | 4 +- milena/mln/core/alias/point3d.hh | 7 +- milena/mln/core/alias/point3df.hh | 216 ----------------------------- 5 files changed, 19 insertions(+), 220 deletions(-) delete mode 100644 milena/mln/core/alias/point3df.hh diff --git a/milena/ChangeLog b/milena/ChangeLog index 7172cfb..0d2e7ed 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,14 @@ +2009-02-11 Roland Levillain <roland(a)lrde.epita.fr> + + Fix and factor mln::point3df and mln::point3d. + + * mln/core/alias/point3df.hh (mln::point3df): Move typedef... + * mln/core/alias/point3d.hh: ...here. + * mln/core/alias/point3df.hh: Remove file. + * mln/core/alias/all.hh: Remove inclusion of + mln/core/alias/point3df.hh. + * mln/core/alias/complex_geometry.hh: Adjust. + 2009-02-11 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Minor fixes. diff --git a/milena/mln/core/alias/all.hh b/milena/mln/core/alias/all.hh index a7dde7f..e79a358 100644 --- a/milena/mln/core/alias/all.hh +++ b/milena/mln/core/alias/all.hh @@ -51,7 +51,6 @@ #include <mln/core/alias/point2d.hh> #include <mln/core/alias/point2d_h.hh> #include <mln/core/alias/point3d.hh> -#include <mln/core/alias/point3df.hh> #include <mln/core/alias/vec3d.hh> #include <mln/core/alias/w_window1d_float.hh> #include <mln/core/alias/w_window1d_int.hh> diff --git a/milena/mln/core/alias/complex_geometry.hh b/milena/mln/core/alias/complex_geometry.hh index 2ba0362..e9ce8de 100644 --- a/milena/mln/core/alias/complex_geometry.hh +++ b/milena/mln/core/alias/complex_geometry.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of the Olena Library. This library is free // software; you can redistribute it and/or modify it under the terms @@ -34,7 +34,7 @@ # include <mln/geom/complex_geometry.hh> # include <mln/core/alias/point2d.hh> -# include <mln/core/alias/point3df.hh> +# include <mln/core/alias/point3d.hh> namespace mln diff --git a/milena/mln/core/alias/point3d.hh b/milena/mln/core/alias/point3d.hh index 7ffac8f..acbf721 100644 --- a/milena/mln/core/alias/point3d.hh +++ b/milena/mln/core/alias/point3d.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory // (LRDE) // // This file is part of the Olena Library. This library is free @@ -48,6 +48,11 @@ namespace mln */ typedef point<grid::cube, def::coord> point3d; + /*! \brief Type alias for a point defined on the 3D square grid with + * floating-point coordinates. + */ + typedef point<grid::cube, def::coordf> point3df; + namespace internal { diff --git a/milena/mln/core/alias/point3df.hh b/milena/mln/core/alias/point3df.hh deleted file mode 100644 index 4fed640..0000000 --- a/milena/mln/core/alias/point3df.hh +++ /dev/null @@ -1,216 +0,0 @@ -// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory -// (LRDE) -// -// This file is part of the Olena Library. This library is free -// software; you can redistribute it and/or modify it under the terms -// of the GNU General Public License version 2 as published by the -// Free Software Foundation. -// -// This library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -// General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this library; see the file COPYING. If not, write to -// the Free Software Foundation, 51 Franklin Street, Fifth Floor, -// Boston, MA 02111-1307, USA. -// -// As a special exception, you may use this file as part of a free -// software library without restriction. Specifically, if other files -// instantiate templates or use macros or inline functions from this -// file, or you compile this file and link it with other files to -// produce an executable, this file does not by itself cause the -// resulting executable to be covered by the GNU General Public -// License. This exception does not however invalidate any other -// reasons why the executable file might be covered by the GNU General -// Public License. - -#ifndef MLN_CORE_ALIAS_POINT3DF_HH -# define MLN_CORE_ALIAS_POINT3DF_HH - -/*! \file mln/core/alias/point3df.hh - * - * \brief Definition of the mln::point3df alias and of its construction - * routine. - */ - -/* FIXME: Factor with mln/core/alias/point3d.hh (these two files are - almost identical). */ - -# include <mln/core/point.hh> -# include <mln/core/def/coordf.hh> -// For site_const_impl and site_mutable_impl: -# include <mln/core/concept/site_proxy.hh> -# include <mln/core/internal/force_exact.hh> - -namespace mln -{ - - /*! \brief Type alias for a point defined on the 3D square grid with - * floating-point coordinates. - */ - typedef point<grid::cube, def::coordf> point3df; - - namespace internal - { - - // Specialization. - - template <typename C, typename E> - struct subject_impl< const point<grid::cube, C>, E > - { - typedef C coordf; - enum { dim = 3 }; - - typedef const C& row_t; - const C& row() const; - - typedef const C& col_t; - const C& col() const; - - typedef const C& sli_t; - const C& sli() const; - - const C& operator[](unsigned i) const; - const C& last_coord() const; - private: - const E& exact_() const; - }; - - - // Specialization for point<M,C>. - - template <typename C, typename E> - struct subject_impl< point<grid::cube, C>, E > : - subject_impl< const point<grid::cube, C>, E > - { - private: - typedef subject_impl< const point<grid::cube, C>, E > super_; - E& exact_(); - public: - - using super_::row; - C& row(); - - using super_::col; - C& col(); - - using super_::sli; - C& sli(); - - using super_::operator[]; - C& operator[](unsigned i); - }; - - - -# ifndef MLN_INCLUDE_ONLY - - // subject_impl - - template <typename C, typename E> - inline - const C& - subject_impl< const point<grid::cube, C>, E >::row() const - { - return exact_().get_subject().row(); - } - - template <typename C, typename E> - inline - const C& - subject_impl< const point<grid::cube, C>, E >::col() const - { - return exact_().get_subject().col(); - } - - template <typename C, typename E> - inline - const C& - subject_impl< const point<grid::cube, C>, E >::sli() const - { - return exact_().get_subject().sli(); - } - - template <typename C, typename E> - inline - const C& - subject_impl< const point<grid::cube, C>, E >::operator[](unsigned i) const - { - mln_precondition(i < 3); - return exact_().get_subject()[i]; - } - - template <typename C, typename E> - inline - const C& - subject_impl< const point<grid::cube, C>, E >::last_coord() const - { - return this->col(); - } - - template <typename C, typename E> - inline - const E& - subject_impl< const point<grid::cube, C>, E >::exact_() const - { - return internal::force_exact<const E>(*this); - } - - // subject_impl - - template <typename C, typename E> - inline - C& - subject_impl< point<grid::cube, C>, E >::row() - { - return exact_().get_subject().row(); - } - - template <typename C, typename E> - inline - C& - subject_impl< point<grid::cube, C>, E >::col() - { - return exact_().get_subject().col(); - } - - template <typename C, typename E> - inline - C& - subject_impl< point<grid::cube, C>, E >::sli() - { - return exact_().get_subject().sli(); - } - - template <typename C, typename E> - inline - C& - subject_impl< point<grid::cube, C>, E >::operator[](unsigned i) - { - mln_precondition(i < 3); - return exact_().get_subject()[i]; - } - - template <typename C, typename E> - inline - E& - subject_impl< point<grid::cube, C>, E >::exact_() - { - return internal::force_exact<E>(*this); - } - -# endif // ! MLN_INCLUDE_ONLY - - } // end of namespace mln::internal - - -} // end of namespace mln - -// FIXME: File mln/core/alias/dpoint3df does not exist yet. -# if 0 -# include <mln/core/alias/dpoint3df.hh> -# endif - -#endif // ! MLN_CORE_ALIAS_POINT3DF_HH -- 1.6.1.2

1 0