Olena-patches April 2009

olena-patches@lrde.epita.fr

11 participants
187 discussions

milena r3604: Add optional paramater for plot::save()

by Fabien Freling

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2009-04-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> Add optional paramater for plot::save(). * mln/io/plot/save.hh: Add optional parameter for save(). --- save.hh | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) Index: trunk/milena/mln/io/plot/save.hh =================================================================== --- trunk/milena/mln/io/plot/save.hh (revision 3603) +++ trunk/milena/mln/io/plot/save.hh (revision 3604) @@ -51,21 +51,27 @@ /*! Save a Milena 1D image in a plot file. * - * \param[out] ima A reference to the image to save. - * \param[in] filename The output file. + * \param[in] ima A reference to the image to save. + * \param[out] filename The output file. + * \param[in] start_value The start index value of the plot + * (optional). */ template <typename I> void save(image1d& ima, - const std::string& filename); + const std::string& filename, + int start_value = 0); /*! Save a Milena array in a plot file. * - * \param[out] ima A reference to the array to save. - * \param[in] filename The output file. + * \param[in] arr A reference to the array to save. + * \param[out] filename The output file. + * \param[in] start_value The start index value of the plot + * (optional). */ template <typename I> void save(util::array& arr, - const std::string& filename); + const std::string& filename, + int start_value = 0); # ifndef MLN_INCLUDE_ONLY @@ -73,26 +79,28 @@ template <typename I> inline - void save(image1d& ima, const std::string& filename) + void save(image1d& ima, const std::string& filename, + int start_value = 0) { trace::entering("mln::io::plot::save"); std::ofstream file_out(filename.c_str()); - for (unsigned i = 0; i < ima.ninds(); ++i) - file_out << i << ", " << ima.at_(i) << std::endl; + for (int i = 0; i < ima.ninds(); ++i) + file_out << start_value + i << ", " << ima.at_(i) << std::endl; trace::exiting("mln::io::plot::save"); } template <typename I> inline - void save(util::array& arr, const std::string& filename) + void save(util::array& arr, const std::string& filename, + int start_value = 0) { trace::entering("mln::io::plot::save"); std::ofstream file_out(filename.c_str()); - for (unsigned i = 0; i < arr.nelements(); ++i) - file_out << i << ", " << arr[i] << std::endl; + for (int i = 0; i < arr.nelements(); ++i) + file_out << start_value + i << ", " << arr[i] << std::endl; trace::exiting("mln::io::plot::save"); }

16 years, 1 month

r3603: Create plot files depending on labels

by Fabien Freling

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-04-03 Fabien Freling <fabien.freling(a)lrde.epita.fr> Create plot files depending on labels. * fabien/igr/Makefile: Add new targets. * fabien/igr/check.sh: Update. * fabien/igr/clo_vol.cc: Minor update, helped for debug. * fabien/igr/fun_labels.cc: Create plot files with labels value. * fabien/igr/fun_labels.sh: New script file for testing fun_labels. * fabien/igr/time_smooth/linear.cc: Update tumeur point. --- TODO | 4 - igr/Makefile | 13 +-- igr/check.sh | 12 +-- igr/clo_vol.cc | 14 +++ igr/fun_labels.cc | 163 ++++++++++++++++++++++++++++++++++++++++++++++ igr/fun_labels.sh | 20 +++++ igr/time_smooth/linear.cc | 8 +- 7 files changed, 211 insertions(+), 23 deletions(-) Index: trunk/milena/sandbox/fabien/igr/clo_vol.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/clo_vol.cc (revision 3602) +++ trunk/milena/sandbox/fabien/igr/clo_vol.cc (revision 3603) @@ -16,6 +16,13 @@ + + +#include <mln/canvas/morpho/attribute_filter.hh> +#include <mln/morpho/attribute/volume.hh> + + + /////////////////// // // // Main Function // @@ -53,9 +60,12 @@ } else { - image3d<int_u12> input; + typedef image3d<int_u12> I; + + I input; io::dump::load(input, argv[1]); - image3d<int_u12> clo = morpho::closing::volume(input, c6(), closure_lambda); + + I clo = morpho::closing::volume(input, c6(), closure_lambda); io::dump::save(clo, "clo_vol.dump"); } Index: trunk/milena/sandbox/fabien/igr/fun_labels.sh =================================================================== --- trunk/milena/sandbox/fabien/igr/fun_labels.sh (revision 0) +++ trunk/milena/sandbox/fabien/igr/fun_labels.sh (revision 3603) @@ -0,0 +1,20 @@ +#!/bin/zsh + +process_file () +{ + echo "Processing $3..." + input=$1 + dim=$2 + + ./grad $input $dim + for lambda_closing in 5000; do + echo " for lambda_closing = ${lambda_closing}"; + ./clo_vol grad.dump $dim ${lambda_closing} + nbasins=`./wst clo_vol.dump $dim` + echo " nbasins = $nbasins" +#../bin/dumpl32_to_colorize wst.dump $dim $nbasins colorize_${3}_${lambda_closing}.ppm + ./fun_labels wst.dump $dim $input $nbasins + done +} + +process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0052.dcm" 3 "52" Property changes on: trunk/milena/sandbox/fabien/igr/fun_labels.sh ___________________________________________________________________ Name: svn:executable + * Index: trunk/milena/sandbox/fabien/igr/check.sh =================================================================== --- trunk/milena/sandbox/fabien/igr/check.sh (revision 3602) +++ trunk/milena/sandbox/fabien/igr/check.sh (revision 3603) @@ -15,7 +15,7 @@ echo " nbasins = $nbasins" ../bin/dumpl32_to_colorize wst.dump $dim $nbasins results/colorize_${3}_${lambda_closing}.ppm median=`./med wst.dump $dim $input $nbasins` -#echo " median = $median" + echo " median = $median" threshold=$(($median / 2)) ../bin/dumpi12_to_pgm med.dump $dim results/median_${3}_${lambda_closing}.pgm ./thres med.dump $dim $threshold @@ -38,9 +38,9 @@ # rm *.dump } -process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0049.dcm" 2 "49" +#process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0049.dcm" 2 "49" process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0052.dcm" 3 "52" -process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0055.dcm" 2 "55" -process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0058.dcm" 2 "58" -process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0061.dcm" 3 "61" -process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0064.dcm" 3 "64" +#process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0055.dcm" 2 "55" +#process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0058.dcm" 2 "58" +#process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0061.dcm" 3 "61" +#process_file "/Users/HiSoKa/Work/IGR/souris18/irm/IM_0064.dcm" 3 "64" Index: trunk/milena/sandbox/fabien/igr/time_smooth/linear.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/time_smooth/linear.cc (revision 3602) +++ trunk/milena/sandbox/fabien/igr/time_smooth/linear.cc (revision 3603) @@ -66,11 +66,11 @@ // Outputs // // // ///////////// - io::plot::save(ima_arr(point2d(160, 120)), "ref_tumeur.plot"); - io::plot::save(ima_linear(point2d(160, 120)), "linear_tumeur.plot"); - io::plot::save(ima_arr(point2d(34, 94)), "ref_air.plot"); + //io::plot::save(ima_arr(point2d(160, 120)), "ref_tumeur.plot"); + io::plot::save(ima_linear(point2d(156, 114)), "linear_tumeur.plot"); + //io::plot::save(ima_arr(point2d(34, 94)), "ref_air.plot"); io::plot::save(ima_linear(point2d(34, 94)), "linear_air.plot"); - io::plot::save(ima_arr(point2d(122, 115)), "ref_poumon.plot"); + //io::plot::save(ima_arr(point2d(122, 115)), "ref_poumon.plot"); io::plot::save(ima_linear(point2d(122, 115)), "linear_poumon.plot"); return 0; Index: trunk/milena/sandbox/fabien/igr/fun_labels.cc =================================================================== --- trunk/milena/sandbox/fabien/igr/fun_labels.cc (revision 0) +++ trunk/milena/sandbox/fabien/igr/fun_labels.cc (revision 3603) @@ -0,0 +1,163 @@ +#include <iostream> +#include <sstream> +#include <mln/core/image/image2d.hh> +#include <mln/core/image/image3d.hh> +#include <mln/core/image/image_if.hh> +#include <mln/core/image/slice_image.hh> +#include <mln/core/routine/duplicate.hh> + +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/alias/window2d.hh> +#include <mln/core/alias/neighb3d.hh> +#include <mln/core/alias/window3d.hh> + +#include <mln/geom/nslis.hh> + +#include <mln/io/dump/all.hh> +#include <mln/io/dicom/load.hh> +#include <mln/io/plot/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u12.hh> +#include <mln/value/label_16.hh> +#include <mln/value/label_32.hh> + +#include <mln/accu/mean.hh> +#include <mln/accu/median_h.hh> +#include <mln/level/compute.hh> +#include <mln/pw/all.hh> +#include <mln/util/array.hh> +#include <mln/util/set.hh> + + + +using namespace mln; +using value::int_u8; +using value::int_u12; +using value::label_16; +using value::label_32; + + +template <typename I, typename L, typename V> +inline +void plot_label(I ima, L ima_labels, V lbl) +{ + I ima_spe = duplicate(ima | pw::value(ima_labels) == pw::cst(lbl)); + util::array<float> arr; + for (int i = 0; i < ima_spe.domain().pmin().sli(); ++i) + arr.append(0.0); + for (int sli = ima_spe.domain().pmin().sli(); sli <= ima_spe.domain().pmax().sli(); ++sli) + { + image2d<int_u12> tmp_slice = duplicate(slice(ima_spe, sli)); + accu::mean<int_u12> accu_mean; + float mean = level::compute(accu_mean, tmp_slice); + arr.append(mean); + } + for (int i = ima_spe.domain().pmax().sli() + 1; i <= ima.domain().pmax().sli(); ++i) + arr.append(0.0); + std::ostringstream slabel; + slabel << "label_" << lbl << ".plot"; + io::plot::save(arr, slabel.str()); +} + + +template <typename I, typename L> +inline +void plot_point(I ima, L ima_labels, point2d point, const char* desc) +{ + util::array<float> arr; + label_32 prev_lbl; + int start = 0; + int count = 1; + for (unsigned sli = 0; sli < geom::nslis(ima); ++sli) + { + image2d<int_u12> ima_slice = duplicate(slice(ima, sli)); + image2d<label_32> lbl_slice = duplicate(slice(ima_labels, sli)); + if (sli == 0) + prev_lbl = lbl_slice(point); + if (lbl_slice(point) != prev_lbl) + { + std::ostringstream slabel; + slabel << desc << "_" << count << "_label_" << prev_lbl << ".plot"; + count++; + io::plot::save(arr, slabel.str(), start); + arr.clear(); + start = sli + 1; + } + // Taking the mean value of the region. + accu::mean<int_u12> accu_mean; + float mean = level::compute(accu_mean, ima_slice | pw::value(lbl_slice) == pw::cst(lbl_slice(point))); + arr.append(mean); + prev_lbl = lbl_slice(point); + } + if (!arr.is_empty()) + { + std::ostringstream slabel; + slabel << desc << "_" << count << "_label_" << prev_lbl << ".plot"; + io::plot::save(arr, slabel.str(), start); + } +} + + +/////////////////// +// // +// Main Function // +// // +/////////////////// + + +int main(int argc, char *argv[]) +{ + typedef label_32 L; + + if (argc != 5) + { + std::cout << "Usage: " << argv[0] << " <ima.dump> <dimensions> <ima.dcm> <nbasins>" + << std::endl; + return 1; + } + + unsigned dim = atoi(argv[2]); + if (dim != 2 && dim != 3) + { + std::cout << "<dimensions> invalid" << std::endl; + return 1; + } + + L nlabels = atoi(argv[4]); + + if (dim == 2) + { + // FIXME + } + else + { + point2d p_tumeur(156, 114); + point2d p_air(34, 94); + point2d p_poumon(122, 115); + image3d<L> ima_labels; + io::dump::load(ima_labels, argv[1]); + image3d<int_u12> ima; + io::dicom::load(ima, argv[3]); + + plot_point(ima, ima_labels, p_tumeur, "tumeur"); + plot_point(ima, ima_labels, p_air, "air"); + plot_point(ima, ima_labels, p_poumon, "poumon"); + /*util::set<L> lbl_set; + for (int sli = 0; sli < geom::nslis(ima_labels); ++sli) + { + image2d<L> tmp_slice = duplicate(slice(ima_labels, sli)); + lbl_set.insert(tmp_slice(p_tumeur)); + lbl_set.insert(tmp_slice(p_air)); + lbl_set.insert(tmp_slice(p_poumon)); + } + + util::set_fwd_iter<L> siter(lbl_set); + for_all(siter) + { + plot_label(ima, ima_labels, siter.element()); + }*/ + } + + return 0; +} Index: trunk/milena/sandbox/fabien/igr/Makefile =================================================================== --- trunk/milena/sandbox/fabien/igr/Makefile (revision 3602) +++ trunk/milena/sandbox/fabien/igr/Makefile (revision 3603) @@ -1,12 +1,4 @@ -CXX = llvm-g++ -CXXFLAGS = -DNDEBUG -O4 - -DICOM_INC = -I/usr/local/include/gdcm-2.0 -DICOM_LIBS = -lgdcmCommon -lgdcmDICT -lgdcmDSED -lgdcmIOD -lgdcmMSFF -lgdcmexpat -lgdcmjpeg12 -lgdcmjpeg16 -lgdcmjpeg8 -lgdcmopenjpeg -lgdcmuuid -lgdcmzlib \ - -framework CoreFoundation -DICOM = ${DICOM_INC} ${DICOM_LIBS} - -MAGICK = `Magick++-config --cppflags --ldflags --libs` +include Makefile.rules seg2d: seg_vol_irm.hh seg2d.cc ${CXX} -I../../../ ${DICOM} ${CXXFLAGS} seg2d.cc -o seg2d @@ -50,6 +42,9 @@ first_slice_dicom: first_slice_dicom.cc ${CXX} -I../../../ ${DICOM} ${MAGICK} ${CXXFLAGS} -lm $^ -o first_slice_dicom +fun_labels: fun_labels.cc + ${CXX} -I../../../ ${DICOM} ${CXXFLAGS} $^ -o fun_labels + clean: rm -rf *.dump *.p?m *.plot *.log *.csv *.dSYM rm seg2d seg3d wsd2d wsd3d nbasins_finder grad clo_vol wst graph med thres matlab time_max first_slice_dicom Index: trunk/milena/sandbox/fabien/TODO =================================================================== --- trunk/milena/sandbox/fabien/TODO (revision 3602) +++ trunk/milena/sandbox/fabien/TODO (revision 3603) @@ -38,9 +38,9 @@ [ ] Profile for performance [X] ImageMagick support [ ] Integrate external libraries (GDCM, IM) -[ ] Send result images to lrde account +[X] Send result images to lrde account [X] Translate Matlab code [X] Subsample binary images [X] Fast projected histogram [ ] Triple histogram -[ ] Create plot for each kind of point with each method +[X] Create plot for each kind of point with each method

16 years, 1 month

3602: Add some code for ICDAR.

by Guillaume Lazzara

* lazzara/icdar/binarization.cc: Use graphes and gradient for binarization. --- milena/sandbox/ChangeLog | 7 + milena/sandbox/lazzara/icdar/binarization.cc | 273 ++++++++++++++++++++++++++ 2 files changed, 280 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/lazzara/icdar/binarization.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 2f10d6b..70acc5a 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,10 @@ +2009-04-01 Guillaume Lazzara <z(a)lrde.epita.fr> + + Add some code for ICDAR. + + * lazzara/icdar/binarization.cc: Use graphes and gradient for + binarization. + 2009-04-01 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add a 1st threshold code. diff --git a/milena/sandbox/lazzara/icdar/binarization.cc b/milena/sandbox/lazzara/icdar/binarization.cc new file mode 100644 index 0000000..ade1695 --- /dev/null +++ b/milena/sandbox/lazzara/icdar/binarization.cc @@ -0,0 +1,273 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/site_set/box.hh> +#include <mln/data/fill.hh> +#include <mln/core/alias/dpoint2d.hh> +#include <mln/core/macros.hh> +#include <mln/core/concept/function.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/site_set/p_edges.hh> +#include <mln/core/site_set/p_vertices.hh> +#include <mln/io/essential.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/label_16.hh> +#include <mln/value/rgb8.hh> +#include <mln/morpho/elementary/gradient_internal.hh> +#include <mln/morpho/closing/volume.hh> +#include <mln/morpho/watershed/flooding.hh> +#include <mln/make/rag_and_labeled_wsl.hh> +#include <mln/util/graph.hh> +#include <mln/util/couple.hh> +#include <mln/debug/colorize.hh> +#include <mln/fun/i2v/array.hh> +#include <mln/labeling/compute.hh> +#include <mln/accu/center.hh> +#include <mln/accu/median_h.hh> +#include <mln/accu/mean.hh> +#include <mln/pw/cst.hh> +#include <mln/math/abs.hh> +#include <mln/literal/colors.hh> +#include <mln/debug/draw_graph.hh> + +namespace mln +{ + + struct edge_values : Function_vv2v<edge_values> + { + typedef value::int_u8 result; + typedef void mutable_result; + + value::int_u8 operator()(const value::int_u8& v1, + const value::int_u8& v2) const + { return math::abs(v1 - v2); } + + }; + + + template <typename I, typename V> + class edge_to_color : public Function_p2v< edge_to_color<I,V> > + { + public: + typedef V result; + + edge_to_color(const I& ima_e) : ima_e_(ima_e) + {} + + V + operator()(const unsigned& e) const + { return convert::to<V>(ima_e_.function()(e)); } + + private: + const I& ima_e_; + }; + + + namespace make + { + + template <typename G, typename P> + p_edges<G,pw::cst_ > + dummy_pedges(const Graph<G>& g_, const P& dummy_value) + { + trace::entering("dummy_pedges"); + + const G& g = exact(g_); + mln_precondition(g.is_valid()); + p_edges<G,pw::cst_ > pe(g, pw::cst(dummy_value)); + + trace::exiting("dummy_pedges"); + return pe; + } + + template <typename FVV, typename G, typename V2P, typename E2P, typename FVE> + pw::image<fun::i2v::array<mln_result(FVE)>,p_edges<G,E2P> > + edge_image(const pw::image<FVV,p_vertices<G,V2P> >& vertex_image, + const p_edges<G,E2P>& pe, + const Function_vv2v<FVE>& edge_value_) + { + trace::entering("edge_image"); + + const FVE& edge_value = exact(edge_value_); + mln_precondition(vertex_image.is_valid()); + mln_precondition(pe.is_valid()); + + typedef fun::i2v::array<mln_result(FVE)> edge_values_t; + edge_values_t edge_values(pe.nsites()); + + // image on graph edges + typedef pw::image<edge_values_t, p_edges<G,E2P> > ima_e_t; + ima_e_t ima_e = (edge_values | pe); + + mln_piter(ima_e_t) e(ima_e.domain()); + for_all(e) + ima_e(e) = edge_value(vertex_image.function()(e.element().v1()), + vertex_image.function()(e.element().v2())); + + trace::exiting("edge_image"); + return ima_e; + } + + + template <typename W, typename G> + inline + p_vertices<util::graph, fun::i2v::array<mln_site(W)> > + common_pvertices(const Image<W>& wst, const mln_value(W)& nbasins, + const Graph<G>& g_) + { + trace::entering("common_pvertices"); + + const G& g = exact(g_); + mln_precondition(g.is_valid()); + + typedef fun::i2v::array<mln_site(W)> vertex_sites_t; + vertex_sites_t vertex_sites; + convert::from_to(labeling::compute(accu::center<mln_site(W)>(), wst, nbasins), + vertex_sites); + + p_vertices<util::graph, vertex_sites_t> pv(g, vertex_sites); + + trace::exiting("common_pvertices"); + return pv; + } + + + template <typename A, typename G, typename F, typename I, typename W> + pw::image<fun::i2v::array<mln_value(I)>, p_vertices<G,F> > + vertex_image(const Accumulator<A>& accu, + const p_vertices<G,F>& pv, + const Image& input_, + const Image<W>& wst_, + const mln_value(W)& nbasins) + { + trace::entering("vertex_image"); + + const I& input = exact(input_); + const W& wst = exact(wst_); + mln_precondition(input.is_valid()); + mln_precondition(wst.is_valid()); + mln_precondition(pv.is_valid()); + + typedef fun::i2v::array<mln_value(I)> vertex_values_t; + vertex_values_t vertex_values; + convert::from_to(labeling::compute(accu, input, wst, nbasins), + vertex_values); + + pw::image<fun::i2v::array<mln_value(I)>, + p_vertices<util::graph, fun::i2v::array<mln_site(I)> > > + ima_vertex = vertex_values | pv; + + trace::exiting("vertex_image"); + return ima_vertex; + } + + + template <typename I, typename V, typename E> + inline + mln_concrete(I) + debug_graph_image(const Image& input_, + const Image<V>& ima_v_, const Image<E>& ima_e_, + unsigned box_size, const mln_value(I)& bg) + { + trace::entering("debug_graph_image"); + + const I& input = exact(input_); + const V& ima_v = exact(ima_v_); + const E& ima_e = exact(ima_e_); + + mln_precondition(input.is_valid()); + mln_precondition(ima_v.is_valid()); + mln_precondition(ima_e.is_valid()); + + mln_concrete(I) output; + initialize(output, input); + + data::fill(output, bg); + debug::draw_graph(output, ima_v.domain(), + pw::cst(150u), + edge_to_color<E, mln_value(I)>(ima_e)); + + dpoint2d tl(-box_size,-box_size); + dpoint2d br(box_size,box_size); + mln_piter(V) p(ima_v.domain()); + for_all(p) + { + box<mln_site(I)> b(p + tl, p + br); + b.crop_wrt(output.domain()); + data::fill((output | b).rw(), convert::to<mln_value(I)>(ima_v(p))); + } + + trace::exiting("debug_graph_image"); + return output; + } + + } // end of namespace mln::make + +} // end of namespace mln + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + using namespace value; + + if (argc < 2) + { + std::cout << argv[0] << " <input.pgm> " << std::endl; + return 1; + } + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + + image2d<int_u8> grad = morpho::elementary::gradient_internal(input, c4()); + io::pgm::save(grad, "binarization_grad.pgm"); + + image2d<int_u8> clo_vol = morpho::closing::volume(grad, c4(), 500); + io::pgm::save(clo_vol, "binarization_clo.pgm"); + + label_16 nbasins; + image2d<label_16> wst = morpho::watershed::flooding(clo_vol, c4(), nbasins); + io::ppm::save(debug::colorize(rgb8(), wst, nbasins), "binarization_wst.ppm"); + + + util::couple<util::graph, image2d<label_16> > + rag_data = make::rag_and_labeled_wsl(wst, c4(), nbasins); + + io::pgm::save(rag_data.second(), "binarization_lwsl.pgm"); + io::ppm::save(debug::colorize(rgb8(), rag_data.second(), nbasins), "binarization_lwsl.ppm"); + + p_vertices<util::graph, fun::i2v::array<point2d> > + pv = make::common_pvertices(wst, nbasins, rag_data.first()); + + pw::image<fun::i2v::array<int_u8>, + p_vertices<util::graph, fun::i2v::array<point2d> > > + ima_v = make::vertex_image(accu::mean<int_u8>(), pv, input, wst, nbasins); + + pw::image<fun::i2v::array<int_u8>, + p_edges<util::graph,pw::cst_<literal::origin_t> > > + ima_e = make::edge_image(ima_v, + make::dummy_pedges(rag_data.first(),literal::origin), + edge_values()); + + + io::pgm::save(make::debug_graph_image(input,ima_v, ima_e, 4, 0), "binarization_graph.ppm"); + + // FIXME: we should use the following line instead. We cannot since currently + // graph edges are numbered from 0 and we must use mln_max() - 1 as + // background id. + // + //label_16 nelts = rag.first().e_nmax(); + label_16 nelts = mln_max(label_16).prev(); + + util::array<int_u8> median_grad = labeling::compute(accu::meta::median_h(), + grad, + rag_data.second(), + nelts); + fun::i2v::array<int_u8> f; + convert::from_to(median_grad, f); + + image2d<int_u8> med = level::transform(rag_data.second(), f); + + io::pgm::save(med, "binarization_median_grad.pgm"); +} -- 1.5.6.5

16 years, 2 months

3601: Add labeling::wrap routine.

by Guillaume Lazzara

* mln/labeling/wrap.hh: new routine. * tests/labeling/Makefile.am, * tests/labeling/wrap.cc: new test. --- milena/ChangeLog | 9 ++++ milena/mln/labeling/wrap.hh | 86 +++++++++++++++++++++++++++++++++++++ milena/tests/labeling/Makefile.am | 4 +- milena/tests/labeling/wrap.cc | 64 +++++++++++++++++++++++++++ 4 files changed, 162 insertions(+), 1 deletions(-) create mode 100644 milena/mln/labeling/wrap.hh create mode 100644 milena/tests/labeling/wrap.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index 7334d37..76e8920 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-04-01 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add labeling::wrap routine. + + * mln/labeling/wrap.hh: new routine. + + * tests/labeling/Makefile.am, + * tests/labeling/wrap.cc: new test. + +2009-04-01 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + Add a new routine to create a region adjacency graph. * mln/make/rag_and_labeled_wsl.hh: new routine. diff --git a/milena/mln/labeling/wrap.hh b/milena/mln/labeling/wrap.hh new file mode 100644 index 0000000..aa6478f --- /dev/null +++ b/milena/mln/labeling/wrap.hh @@ -0,0 +1,86 @@ +// 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 +// 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_LABELING_WRAP_HH +# define MLN_LABELING_WRAP_HH + +/// \file mln/labeling/wrap.hh +/// +/// Wrap labels such as 0 -> 0 and [1, lmax] maps to [1, +/// Lmax] (using modulus). + +# include <mln/core/concept/image.hh> +# include <mln/level/transform.hh> +# include <mln/fun/l2l/wrap.hh> +# include <mln/metal/converts_to.hh> +# include <mln/metal/is_a.hh> + +namespace mln +{ + + namespace labeling + { + + /// Wrap labels such as 0 -> 0 and [1, lmax] maps to [1, + /// Lmax] (using modulus). + /// + /// \param[in] value_type The type used to wrap the label type. + /// \param[in] input The label image. + /// + /// \return A new image with values wrapped with type V. + template <typename V, typename I> + mln_ch_value(I,V) + wrap(const V& value_type, const Image& input); + + + +# ifndef MLN_INCLUDE_ONLY + + template <typename V, typename I> + inline + mln_ch_value(I,V) + wrap(const V& value_type, const Image& input) + { + trace::entering("labeling::wrap"); + +// mlc_is_a(mln_value(I), value::Symbolic)::check(); + mln_precondition(exact(input).is_valid()); + + mln_ch_value(I,V) output = level::transform(input, fun::l2l::wrap<V>()); + + trace::exiting("labeling::wrap"); + return output; + } + +# endif // ! MLN_INCLUDE_ONLY + + } // end of namespace mln::labeling + +} // end of namespace mln + +#endif // ! MLN_LABELING_WRAP_HH diff --git a/milena/tests/labeling/Makefile.am b/milena/tests/labeling/Makefile.am index 6b3231f..f436f63 100644 --- a/milena/tests/labeling/Makefile.am +++ b/milena/tests/labeling/Makefile.am @@ -14,7 +14,8 @@ check_PROGRAMS = \ n_max \ regional_maxima \ regional_minima \ - relabel + relabel \ + wrap background_SOURCES = background.cc blobs_SOURCES = blobs.cc @@ -28,5 +29,6 @@ n_max_SOURCES = n_max.cc regional_maxima_SOURCES = regional_maxima.cc regional_minima_SOURCES = regional_minima.cc relabel_SOURCES = relabel.cc +wrap_SOURCES = wrap.cc TESTS = $(check_PROGRAMS) diff --git a/milena/tests/labeling/wrap.cc b/milena/tests/labeling/wrap.cc new file mode 100644 index 0000000..b5e8a71 --- /dev/null +++ b/milena/tests/labeling/wrap.cc @@ -0,0 +1,64 @@ +// 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 +// 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. + +/// \file tests/labeling/wrap.cc +/// +/// Test on mln::labeling::wrap. + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/make/image2d.hh> +#include <mln/labeling/wrap.hh> +#include <mln/level/compare.hh> + +#include <mln/debug/println.hh> + +#include "tests/data.hh" + + +int main() +{ + using namespace mln; + using value::int_u8; + using value::int_u16; + + int_u16 values[] = { 1, 1000, + 0, 65534 }; + + int_u8 ref_values[] = { 1, 235, + 0, 254 }; + + image2d<int_u16> ima = make::image2d(values); + image2d<int_u8> ima_ref = make::image2d(ref_values); + + image2d<int_u8> ima_wrapped = labeling::wrap(int_u8(), ima); + + mln_assertion(ima_ref == ima_wrapped); +} -- 1.5.6.5

16 years, 2 months

3600: Add a new routine to create a region adjacency graph.

by Guillaume Lazzara

* mln/make/rag_and_labeled_wsl.hh: new routine. * tests/make/Makefile.am, * tests/make/rag_and_labeled_wsl.cc: new test. --- milena/ChangeLog | 9 ++ milena/mln/make/rag_and_labeled_wsl.hh | 230 ++++++++++++++++++++++++++++++ milena/tests/make/Makefile.am | 2 + milena/tests/make/rag_and_labeled_wsl.cc | 90 ++++++++++++ 4 files changed, 331 insertions(+), 0 deletions(-) create mode 100644 milena/mln/make/rag_and_labeled_wsl.hh create mode 100644 milena/tests/make/rag_and_labeled_wsl.cc diff --git a/milena/ChangeLog b/milena/ChangeLog index e7cf8d9..7334d37 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2009-04-01 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Add a new routine to create a region adjacency graph. + + * mln/make/rag_and_labeled_wsl.hh: new routine. + + * tests/make/Makefile.am, + * tests/make/rag_and_labeled_wsl.cc: new test. + 2009-04-01 Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Several fixes. diff --git a/milena/mln/make/rag_and_labeled_wsl.hh b/milena/mln/make/rag_and_labeled_wsl.hh new file mode 100644 index 0000000..d80b954 --- /dev/null +++ b/milena/mln/make/rag_and_labeled_wsl.hh @@ -0,0 +1,230 @@ +// 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 +// 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. +// reasons why the executable file might be covered by the GNU General +// Public License. + +#ifndef MLN_MAKE_RAG_AND_ALBL_HH +# define MLN_MAKE_RAG_AND_ALBL_HH + +/// \file mln/make/rag_and_labeled_wsl.hh +/// +/// Create a region adjacency graph and a label image of the watershed line +/// from a watershed image. +/// +/// \sa morpho::watershed::flooding. +/// +/// \todo Do not use mln_max() as background label! + +# include <map> + +# include <mln/core/concept/image.hh> +# include <mln/core/concept/neighborhood.hh> +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/box2d.hh> +# include <mln/extension/adjust_fill.hh> +# include <mln/util/graph.hh> +# include <mln/util/couple.hh> + + +namespace mln +{ + + namespace make + { + + /// Create a region adjacency graph and a label image of the watershed line + /// from a watershed image. + /// + /// \param[in] wshd Watershed image. + /// \param[in] nbh Neighborhood + /// \param[in] nbasins Number of influence zone in \p wshd. + /// + /// \return A couple. First element is the graph, second element is an + /// image with a labeled watershed line. + template <typename I, typename N> + util::couple<util::graph,mln_concrete(I)> + rag_and_labeled_wsl(const Image& wshd_, + const Neighborhood<N>& nbh_, + const mln_value(I)& nbasins); + + + +# ifndef MLN_INCLUDE_ONLY + + + namespace internal + { + + template <typename I, typename N> + inline + void + rag_and_labeled_wsl_tests(const Image& wshd, + const Neighborhood<N>& nbh, + const mln_value(I)&) + { + mln_precondition(exact(wshd).is_valid()); + mln_precondition(exact(nbh).is_valid()); + (void) wshd; + (void) nbh; + } + + } // end of namespace mln::make::internal + + + namespace impl + { + + namespace generic + { + + template <typename I, typename N> + inline + util::couple<util::graph,mln_concrete(I)> + rag_and_labeled_wsl(const Image& wshd_, + const Neighborhood<N>& nbh_, + const mln_value(I)& nbasins) + { + trace::entering("make::impl::generic::rag_and_labeled_wsl"); + + internal::rag_and_labeled_wsl_tests(wshd_, nbh_, nbasins); + const I& wshd = exact(wshd_); + const N& nbh = exact(nbh_); + typedef mln_value(I) L; + + mln::image2d<bool> adj(mln::box2d(nbasins.next(), nbasins.next())); + data::fill(adj, false); + extension::adjust_fill(wshd, nbh, 0u); + + mln_concrete(I) output(wshd.domain()); + + // FIXME: we would like to not use mln_value() but 0 instead. + // We can't do that because graph edges are numbered from 0. + data::fill(output, mln_max(mln_value(I)).prev()); + + std::map<util::couple<L,L>, mln_value(I)> c2la; + util::array<util::couple<L,L> > la2c; + mln_value(I) nlabels = literal::zero; + + L l1, l2; + mln_piter(I) p(wshd.domain()); + mln_niter(N) n(nbh, p); + for_all(p) + { + if (wshd(p) != 0u) + continue; + // p is in the watershed line. + l1 = l2 = 0; + for_all(n) + if (wshd.has(n) && wshd(n) != 0u) + { + if (l1 == 0u) // First label to be stored. + l1 = wshd(n); + else + if (wshd(n) != l1) // Useless: && l2 == 0) + { // Second label to be stored. + mln_invariant(l2 == 0u); + l2 = wshd(n); + break; + } + } + if (l2 == 0u || l1 == 0u) + continue; + if (l2 < l1) + std::swap(l1, l2); + + // adjacency l1 l2 + util::couple<L,L> c = make::couple(l2,l1); + if (c2la.find(c) == c2la.end()) + { + c2la[c] = nlabels++; + la2c.append(c); + } + output(p) = c2la[c]; + + } + + // Construct graph. + util::graph g; + g.add_vertices(nbasins.next()); + for (unsigned i = 0; i < la2c.nelements(); ++i) + g.add_edge(la2c[i].first(), la2c[i].second()); + + trace::exiting("make::impl::generic::rag_and_labeled_wsl"); + return make::couple(g, output); + } + + } // end of namespace mln::make::impl::generic + + } // end of namespace mln::make::impl + + + + namespace internal + { + + template <typename I, typename N> + inline + util::couple<util::graph,mln_concrete(I)> + rag_and_labeled_wsl_dispatch(const Image& wshd, + const Neighborhood<N>& nbh, + const mln_value(I)& nbasins) + { + return make::impl::generic::rag_and_labeled_wsl(wshd, nbh, nbasins); + } + + } // end of namespace mln::make::internal + + + + // Facade + + template <typename I, typename N> + inline + util::couple<util::graph,mln_concrete(I)> + rag_and_labeled_wsl(const Image& wshd, + const Neighborhood<N>& nbh, + const mln_value(I)& nbasins) + { + trace::entering("make::rag_and_labeled_wsl"); + + internal::rag_and_labeled_wsl_tests(wshd, nbh, nbasins); + + util::couple<util::graph,mln_concrete(I)> + result = internal::rag_and_labeled_wsl_dispatch(wshd, nbh, nbasins); + + trace::exiting("make::rag_and_labeled_wsl"); + return result; + } + + +# endif // ! MLN_INCLUDE_ONLY + + + } // end of namespace mln::make + +} // end of namespace mln + + +#endif // ! MLN_MAKE_RAG_AND_ALBL_HH diff --git a/milena/tests/make/Makefile.am b/milena/tests/make/Makefile.am index bf96093..7e4c12b 100644 --- a/milena/tests/make/Makefile.am +++ b/milena/tests/make/Makefile.am @@ -10,6 +10,7 @@ check_PROGRAMS = \ image3d \ mat \ region_adjacency_graph \ + rag_and_labeled_wsl \ w_window \ w_window_directional @@ -20,6 +21,7 @@ image2d_SOURCES = image2d.cc image3d_SOURCES = image3d.cc mat_SOURCES = mat.cc region_adjacency_graph_SOURCES = region_adjacency_graph.cc +rag_and_labeled_wsl_SOURCES = rag_and_labeled_wsl.cc w_window_SOURCES = w_window.cc w_window_directional_SOURCES = w_window_directional.cc diff --git a/milena/tests/make/rag_and_labeled_wsl.cc b/milena/tests/make/rag_and_labeled_wsl.cc new file mode 100644 index 0000000..5abb031 --- /dev/null +++ b/milena/tests/make/rag_and_labeled_wsl.cc @@ -0,0 +1,90 @@ +// 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 +// 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. + +/// \file tests/make/rag_and_labeled_wsl.cc +/// +/// Tests on mln::make::rag_and_labeled_wsl + +#include <mln/core/alias/neighb2d.hh> + +#include <mln/util/graph.hh> + +#include <mln/value/label_8.hh> + +#include <mln/make/image2d.hh> +#include <mln/make/rag_and_labeled_wsl.hh> + +# include <mln/debug/println.hh> + +int main() +{ + using namespace mln; + + value::label_8 vals[16] = { 1, 0, 3, 3, + 1, 0, 0, 0, + 0, 0, 4, 4, + 2, 2, 0, 4 }; + + typedef image2d<value::label_8> wst_t; + wst_t ima = make::image2d(vals); + + util::couple<util::graph, wst_t> + res = make::rag_and_labeled_wsl(ima, c4(), 4u); + + // check that adjacency labels map edge labels. + mln_piter_(wst_t) p(res.second().domain()); + mln_niter_(neighb2d) n(c4(),p); + for_all(p) + if (res.second()(p) != mln_max(value::label_8)) + { + value::label_8 l1 = 0, l2 = 0; + for_all(n) + if (ima.has(n) && ima(n) != 0u) + { + if (l1 == 0u) // First label to be stored. + l1 = ima(n); + else + if (ima(n) != l1) // Useless: && l2 == 0) + { // Second label to be stored. + mln_invariant(l2 == 0u); + l2 = ima(n); + break; + } + } + if (l2 < l1) + std::swap(l1, l2); + mln_assertion(res.first().v1(res.second()(p)) == l1); + mln_assertion(res.first().v2(res.second()(p)) == l2); + } + + mln_assertion(res.first().e_nmax() == 4u); + mln_assertion(res.first().v_nmax() == 5u); + mln_assertion(res.first().v_nmax_nbh_edges(0) == 0); + for (unsigned i = 1; i < 4; ++i) + mln_assertion(res.first().v_nmax_nbh_edges(i) == 2); +} + -- 1.5.6.5

16 years, 2 months

3599: Several fixes.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Several fixes. * mln/morpho/leveling_filter.hh: Layout. (leveling_filter): Fix trace naming. Call facade instead of dispatch. * mln/canvas/morpho/attribute_filter.hh: Layout. (attribute_filter_fastest): Fix deja_vu border value. canvas/morpho/attribute_filter.hh | 7 ++++++- morpho/leveling_filter.hh | 30 ++++++++++++++++++++---------- 2 files changed, 26 insertions(+), 11 deletions(-) Index: mln/morpho/leveling_filter.hh --- mln/morpho/leveling_filter.hh (revision 3598) +++ mln/morpho/leveling_filter.hh (working copy) @@ -1,5 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// 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 @@ -26,8 +26,8 @@ // reasons why the executable file might be covered by the GNU General // Public License. -#ifndef MLN_MORPHO_LEVELING_FILTER_HH_ -# define MLN_MORPHO_LEVELING_FILTER_HH_ +#ifndef MLN_MORPHO_LEVELING_FILTER_HH +# define MLN_MORPHO_LEVELING_FILTER_HH /// \file mln/morpho/leveling_filter.hh /// @@ -44,8 +44,13 @@ # include <mln/canvas/morpho/attribute_filter.hh> -namespace mln { - namespace morpho { + +namespace mln +{ + + namespace morpho + { + template <typename I, typename N, typename A> mln_concrete(I) @@ -56,8 +61,10 @@ bool increasing); + # ifndef MLN_INCLUDE_ONLY + template <typename I, typename N, typename A> mln_concrete(I) leveling_filter(const Image& input, @@ -66,7 +73,7 @@ const typename A::result& lambda, bool increasing) { - trace::entering("morpho::opening::leveling_filter"); + trace::entering("morpho::leveling_filter"); mln_precondition(exact(input).is_valid()); @@ -76,16 +83,19 @@ trait::accumulator::when_pix::use_v))::check(); mln_concrete(I) output; - output = canvas::morpho::internal::attribute_filter_dispatch(input, nbh, a, lambda, increasing); + output = canvas::morpho::attribute_filter(input, nbh, a, lambda, increasing); - trace::exiting("morpho::opening::leveling_filter"); + trace::exiting("morpho::leveling_filter"); return output; } + # endif // ! MLN_INCLUDE_ONLY + } // end of namespace mln::morpho + } // end of namespace mln -#endif /* !MLN_MORPHO_LEVELING_FILTER_HH_ */ +#endif // ! MLN_MORPHO_LEVELING_FILTER_HH Index: mln/canvas/morpho/attribute_filter.hh --- mln/canvas/morpho/attribute_filter.hh (revision 3598) +++ mln/canvas/morpho/attribute_filter.hh (working copy) @@ -313,7 +313,7 @@ { initialize(deja_vu, input); data::fill(deja_vu, false); - extension::fill(deja_vu, true); // So the border is neutral. + extension::fill(deja_vu, false); // So the border is neutral. initialize(activity, input); data::fill(activity, true); @@ -381,6 +381,7 @@ trace::exiting("canvas::morpho::impl::attribute_filter_fastest"); return output; } + } // end of namespace mln::canvas::morpho::impl @@ -391,7 +392,9 @@ namespace internal { + // Dispatch to generic. + template <typename I, typename N, typename A> inline mln_concrete(I) @@ -409,7 +412,9 @@ return impl::generic::attribute_filter(input, nbh, s, a, lambda); } + // Dispatch to fastest. + template <typename I, typename N, typename A> inline mln_concrete(I)

16 years, 2 months

3598: Add a 1st threshold code.

by Thierry Geraud

https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox Index: ChangeLog from Thierry Geraud <thierry.geraud(a)lrde.epita.fr> Add a 1st threshold code. * theo/icdar/dibco/main.cc: New. First threshold attempt. * theo/icdar/hsc/boxes.cc (param): Set to a reasonable value. (tmp_pgm): Save this temp image. * theo/exec/subsample.cc: New. exec/subsample.cc | 43 ++++++++++++ icdar/dibco/main.cc | 184 ++++++++++++++++++++++++++++++++++++++++++++++++++++ icdar/hsc/boxes.cc | 11 ++- 3 files changed, 236 insertions(+), 2 deletions(-) Index: theo/icdar/dibco/main.cc --- theo/icdar/dibco/main.cc (revision 0) +++ theo/icdar/dibco/main.cc (revision 0) @@ -0,0 +1,184 @@ +// 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 +// 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. + +/// \file theo/icdar/dibco/main.cc +/// +/// Simple thresholding of a gray-level document. + +# include <mln/io/pgm/load.hh> +# include <mln/io/pgm/save.hh> +# include <mln/io/pbm/save.hh> + +# include <mln/debug/println.hh> +# include <mln/fun/l2l/wrap.hh> +# include <mln/level/transform.hh> + +# include <mln/core/image/image1d.hh> +# include <mln/core/alias/neighb1d.hh> + +# include <mln/core/image/image2d.hh> +# include <mln/core/alias/neighb2d.hh> + +# include <mln/core/routine/duplicate.hh> +# include <mln/core/image/image_if.hh> +# include <mln/pw/all.hh> + +# include <mln/histo/compute.hh> +# include <mln/debug/histo.hh> +# include <mln/convert/from_to.hh> + +# include <mln/morpho/elementary/gradient_internal.hh> +# include <mln/morpho/elementary/gradient_external.hh> +# include <mln/morpho/closing/height.hh> +# include <mln/morpho/closing/volume.hh> +# include <mln/morpho/watershed/flooding.hh> + +# include <mln/linear/gaussian_1d.hh> +# include <mln/labeling/regional_minima.hh> +# include <mln/labeling/compute.hh> +# include <mln/value/label_8.hh> +# include <mln/accu/center.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pgm output.pbm" << std::endl + << " ICDAR'2009: DIBCO." << std::endl; + std::abort(); +} + + +namespace mln +{ + + int + find_threshold(const histo::array<value::int_u8>& h) + { + + const float sigma = 5; // FIXME: hard-coded! + + util::array<point1d> c; + value::label_8 n; + + { + image1d<unsigned> h_, hs_; + image1d<value::label_8> l; + + convert::from_to(h, h_); + hs_ = linear::gaussian_1d(h_, sigma, 0); + l = labeling::regional_minima(hs_, c2(), n); + + { +// debug::println("l", l); +// debug::histo(h, "tmp_h.txt"); + +// std::ofstream file("tmp_hs.txt"); +// mln_piter_(box1d) p(h_.domain()); +// for_all(p) +// file << p.ind() << ' ' << hs_(p) << std::endl; +// file.close(); + } + + accu::center<point1d, point1d> a; + c = labeling::compute(a, l, n); + + c[0] = point1d(0); // Force a neutral value for the non-label value (0). + + // std::cout << "c = " << c << std::endl; + } + + + int threshold; + + { + std::vector<int> v; + for (unsigned i = 0; i <= n; ++i) + v.push_back(c[i].ind()); + std::sort(v.begin(), v.end()); + + for (unsigned i = 0; i <= n; ++i) + if (v[i] != 0) + { + threshold = v[i]; + break; + } + + std::cout << "threshold = " << threshold << std::endl; + } + + return threshold; + } + + +} // ! mln + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 3) + usage(argv); + + image2d<int_u8> input; + io::pgm::load(input, argv[1]); + + typedef int_u8 V; + histo::array<V> h; + + image2d<int_u8> g; + g = morpho::elementary::gradient_internal(input, c4()); + io::pgm::save(g, "tmp_g.pgm"); + + g = morpho::closing::height(g, c4(), 3); // FIXME: hard-coded! + + unsigned nbasins; + image2d<unsigned> w = morpho::watershed::flooding(g, c4(), nbasins); + + io::pgm::save(level::transform(w, + fun::l2l::wrap<int_u8>()), + "tmp_w.pgm"); + + h = histo::compute(g | (pw::value(w) == pw::cst(0))); + + unsigned threshold = find_threshold(h); + +// output = duplicate((pw::value(g) > pw::cst(threshold)) | input.domain()); + + io::pbm::save((pw::value(g) > pw::cst(threshold)) | input.domain(), + "tmp_g.pbm"); + + image2d<bool> output; + output = duplicate((pw::value(g) > pw::cst(threshold) + && pw::value(w) == pw::cst(0)) | input.domain()); + + io::pbm::save(output, argv[2]); +} Index: theo/icdar/hsc/boxes.cc --- theo/icdar/hsc/boxes.cc (revision 3597) +++ theo/icdar/hsc/boxes.cc (working copy) @@ -44,6 +44,9 @@ #include <mln/logical/not.hh> #include <mln/io/dump/save.hh> +#include <mln/io/pgm/save.hh> +#include <mln/fun/l2l/wrap.hh> + int usage(const char *name) { @@ -74,8 +77,8 @@ text = filter::small_components(text,4); mln::util::array<unsigned> - left_link = text::grouping::group_with_single_left_link(text, 100), - right_link = text::grouping::group_with_single_right_link(text, 100); + left_link = text::grouping::group_with_single_left_link(text, 30), + right_link = text::grouping::group_with_single_right_link(text, 30); std::cout << "BEFORE - nbboxes = " << nbboxes << std::endl; @@ -94,6 +97,10 @@ io::dump::save(grouped_text.label_image(), argv[2]); + io::pgm::save(level::transform(grouped_text.label_image(), + fun::l2l::wrap<value::int_u8>()), + "tmp.pgm"); + scribo::debug::save_textbboxes_image(input, grouped_text.bboxes(), literal::red, scribo::make::debug_filename("boxes.ppm")); Index: theo/exec/subsample.cc --- theo/exec/subsample.cc (revision 0) +++ theo/exec/subsample.cc (revision 0) @@ -0,0 +1,43 @@ +#include "filetype.hh" + +#include <mln/world/binary_2d/subsample.hh> + + + +void usage(char* argv[]) +{ + std::cerr << "usage: " << argv[0] << " input.pbm n output.pgm" << std::endl + << " Subsampling." << std::endl + << " n >= 2." << std::endl; + std::abort(); +} + + + +int main(int argc, char* argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc != 4) + usage(argv); + + + trace::entering("main"); + + int n = std::atoi(argv[2]); + if (n < 2) + { + std::cerr << "bad n!" << std::endl; + usage(argv); + } + + + image2d<bool> ima; + io::pbm::load(ima, argv[1]); + io::pgm::save(world::binary_2d::subsample(ima, + n), + argv[3]); + + trace::exiting("main"); +}

16 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches April 2009