[Olena-patches] r3941: Add a new distance for edges

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-06-01 Fabien Freling &lt;fabien.freling(a)lrde.epita.fr&gt; Add a new distance for edges. * fabien/igr/Makefile: Update targets. * fabien/igr/dist_edges.cc: Add new distance. * fabien/igr/mean_median_label.cc: Generate mean image (draft). --- Makefile | 3 dist_edges.cc | 51 +++++++++++--- mean_median_label.cc | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 220 insertions(+), 10 deletions(-) Index: trunk/milena/sandbox/fabien/igr/mean_median_label.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/mean_median_label.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/mean_median_label.cc (revision 3941) @@ -0,0 +1,176 @@ +#include <algorithm> + +#include <mln/core/image/image1d.hh> +#include <mln/core/alias/window1d.hh> +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/routine/duplicate.hh> +#include <mln/core/routine/extend.hh> +#include <mln/core/var.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u12.hh> +#include <mln/value/label_16.hh> +#include <mln/value/rgb8.hh> + +#include <mln/accu/sum.hh> +#include <mln/accu/mean.hh> +#include <mln/accu/image/all.hh> +#include <mln/accu/stat/deviation.hh> +#include <mln/arith/div.hh> +#include <mln/data/fill.hh> +#include <mln/data/paste.hh> +#include <mln/debug/quiet.hh> +#include <mln/convert/from_to.hh> +#include <mln/fun/v2v/fit.hh> +#include <mln/labeling/compute.hh> +#include <mln/labeling/wrap.hh> +#include <mln/data/compute.hh> +#include <mln/data/convert.hh> +#include <mln/data/stretch.hh> +#include <mln/make/image2d.hh> +#include <mln/make/w_window1d.hh> +#include <mln/math/diff_abs.hh> +#include <mln/morpho/dilation.hh> +#include <mln/morpho/erosion.hh> +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/pw/all.hh> +#include <mln/util/array.hh> +#include <mln/win/segment1d.hh> + +#include <mln/world/inter_pixel/display_edge.hh> +#include <mln/world/inter_pixel/compute.hh> +#include <mln/world/inter_pixel/immerse.hh> +#include <mln/world/inter_pixel/neighb2d.hh> +#include <mln/world/inter_pixel/all.hh> + +#include <mln/labeling/colorize.hh> +#include <mln/debug/println.hh> +#include <mln/trace/quiet.hh> + +#include "plot_points/int2rgb.hh" + + +using namespace mln; +using value::int_u8; +using value::int_u12; +using value::label_16; + +const float saturation = 1.0; + + + +namespace mln +{ + + template <typename I> + void io_save_edges_int_u12(const I& input, + value::int_u8 bg, + const std::string& filename) + { + mlc_equal(mln_value(I), value::int_u12)::check(); + mln_ch_value(I, value::int_u8) output; + initialize(output, input); + arith::div_cst(input, 16, output); + io::pgm::save(world::inter_pixel::display_edge(output.unmorph_(), + bg, + 3), + filename); + } + +} // end of namespace mln + + + + + + + +int usage(const char* bin) +{ + std::cout << "Usage: " << bin << " input.dump wst.dump" << std::endl; + return 1; +} + +int main(int argc, char* argv[]) +{ + if (argc != 3) + return usage(argv[0]); + + + // Initialization. + typedef float input_type; + image2d<input_type> input; + io::dump::load(input, argv[1]); + + image2d<label_16> wst; + io::dump::load(input`, argv[1]); + + + // Mean distance. + + accu::mean<E_TYPE> accu_mean; + util::array<float> means = labeling::compute(accu_mean, e, wst, nbasins); + + // Display. + { + typedef image_if<image2d<float>, world::inter_pixel::is_separator> Fsx; + Fsx ima_means; + initialize(ima_means, wst); + data::paste(wst, ima_means); + for (unsigned i = 1; i < means.nelements(); ++i) + data::fill((ima_means | pw::value(ima_means) == pw::cst(i)).rw(), means[i]); + mln_VAR(display_means, world::inter_pixel::display_edge(ima_means.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_means), "means.pgm"); + } + + typedef accu::mean<int_u12,float,int_u12> A; + util::array<int_u12> m = labeling::compute(A(), d, wst, nbasins); + + { + util::array<int_u8> m_(nbasins.next()); + m_[0] = 1; // watershed line <=> 1 + for (unsigned l = 1; l <= nbasins; ++l) + { + m_[l] = m[l] / 16; + if (m_[l] < 2) m_[l] == 2; + // basin <=> 2..255 + } + mln_VAR(d_m, level::transform(wst, m_)); + mln_VAR(out, world::inter_pixel::display_edge(d_m.unmorph_(), + 0, // background <=> 0 + 3)); + io::pgm::save(out, "dist_mean.pgm"); + } + + + + // Deviation. + util::array<accu::stat::deviation<float> > arr_dev; + for (unsigned i = 0; i < means.nelements(); ++i) + arr_dev.append(accu::stat::deviation<float> (means[i])); + util::array<float> deviations = labeling::compute(arr_dev, e, wst, nbasins); + + // Display. + { + typedef image_if<image2d<float>, world::inter_pixel::is_separator> Fsx; + Fsx ima_dev; + initialize(ima_dev, wst); + data::paste(wst, ima_dev); + for (unsigned i = 1; i < deviations.nelements(); ++i) + data::fill((ima_dev | pw::value(ima_dev) == pw::cst(i)).rw(), deviations[i]); + mln_VAR(display_dev, world::inter_pixel::display_edge(ima_dev.unmorph_(), 0.0, 3)); + io::pgm::save(level::stretch(int_u8(), display_dev), "dev.pgm"); + } + + + return 0; +} Index: trunk/milena/sandbox/fabien/igr/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/Makefile (revision 3940) +++ trunk/milena/sandbox/fabien/igr/Makefile (revision 3941) @@ -71,6 +71,9 @@ wst_edges: wst_edges.cc ${CXX} -I../../../ ${CXXFLAGS} $^ -o wst_edges +mean_median_label: mean_median_label.cc + ${CXX} -I../../../ ${CXXFLAGS} $^ -o mean_median_label + ##################### clean: Index: trunk/milena/sandbox/fabien/igr/dist_edges.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/dist_edges.cc (revision 3940) +++ trunk/milena/sandbox/fabien/igr/dist_edges.cc (revision 3941) @@ -4,8 +4,8 @@ #include <mln/core/image/image2d.hh> #include <mln/core/alias/neighb2d.hh> #include <mln/core/image/image3d.hh> -#include <mln/core/image/slice_image.hh> -#include <mln/core/image/image_if.hh> +#include <mln/core/image/dmorph/slice_image.hh> +#include <mln/core/image/dmorph/image_if.hh> #include <mln/core/routine/duplicate.hh> #include <mln/core/routine/extend.hh> @@ -75,7 +75,7 @@ int_u12 operator()(const util::array<V>& v1, const util::array<V>& v2) const { - float res = 0.f; + double res = 0.f; for (unsigned i = 0; i < v1.nelements(); ++i) res += std::min(v1[i], v2[i]); @@ -85,10 +85,10 @@ accu::sum<V> accu_sum; convert::from_to(v1, tmp_ima); - float sum_v1 = data::compute(accu_sum, tmp_ima); + double sum_v1 = data::compute(accu_sum, tmp_ima); convert::from_to(v2, tmp_ima2); - float sum_v2 = data::compute(accu_sum, tmp_ima2); + double sum_v2 = data::compute(accu_sum, tmp_ima2); if (sum_v1 == 0 && sum_v2 == 0) return 1; @@ -110,13 +110,13 @@ int_u12 operator()(const util::array<V>& v1, const util::array<V>& v2) const { - float res = 0.f; + double res = 0.f; for (unsigned i = 0; i < v1.nelements(); ++i) { unsigned maxi = std::max(v1[i], v2[i]); if (maxi != 0u) - res += float(std::min(v1[i], v2[i])) / float(std::max(v1[i], v2[i])); + res += double(std::min(v1[i], v2[i])) / double(std::max(v1[i], v2[i])); else res += 1; } @@ -138,9 +138,9 @@ int_u12 operator()(const util::array<V>& v1, const util::array<V>& v2) const { - float res = 0.f; - float min = 0; - float max = 0; + double res = 0.f; + double min = 0; + double max = 0; for (unsigned i = 0; i < v1.nelements(); ++i) { @@ -159,6 +159,35 @@ } dist3; +struct dist4_t : Function_vv2v<dist4_t> +{ + typedef int_u12 result; + + template <typename V> + int_u12 operator()(const util::array<V>& v1, + const util::array<V>& v2) const + { + double res = 0.f; + double maxi; + + for (unsigned i = 0; i < v1.nelements(); ++i) + { + maxi = std::max(v1[i], v2[i]); + if (maxi) + res += (double) math::diff_abs(v1[i], v2[i]) / maxi; + else + res += 1; + } + + res = res / v1.nelements(); + //res = 1 - res; + res = res * 4095; + + return (int) res; + } +} dist4; + + @@ -205,6 +234,8 @@ edges = world::inter_pixel::compute(imax, dist2); else if (dist_type == 3) edges = world::inter_pixel::compute(imax, dist3); + else if (dist_type == 4) + edges = world::inter_pixel::compute(imax, dist4); io_save_edges_int_u12(edges, 0, "dist.pgm");