Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

cleanup-2008 2766: Fix projection.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Fix projection. * nature/proj.cc: . proj.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: nature/proj.cc --- nature/proj.cc (revision 2765) +++ nature/proj.cc (working copy) @@ -56,10 +56,11 @@ std::string name(argv[i]); name.erase(name.length() - 4); image1d<float> toto = proj_nat(ima); - image2d<float> tata (toto.nelements(), 1); + image2d<int_u8> tata (toto.nelements(), 1); mln_piter_(image1d<float>) p(toto.domain()); for (unsigned u = 0; u < toto.nelements(); ++u) - tata(point2d(u, 1)) = toto(point1d(u)); + if (toto.domain().has(point1d(u))) + tata(point2d(u, 1)) = (int_u8) ceil(toto(point1d(u))); io::pgm::save(cast_image <int_u8>(tata), name.append("_proj.pgm")); } }

16 years, 2 months

cleanup-2008 2765: Fix 1d to 2d problem.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Fix 1d to 2d problem. * nature/proj.cc: use an unsigned to iterate over the image. proj.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: nature/proj.cc --- nature/proj.cc (revision 2764) +++ nature/proj.cc (working copy) @@ -58,8 +58,8 @@ image1d<float> toto = proj_nat(ima); image2d<float> tata (toto.nelements(), 1); mln_piter_(image1d<float>) p(toto.domain()); - for_all(p) - tata(point2d((p.row(), 1))) = toto(p); - io::pgm::save(cast_image <int>(tata), name.append("_proj.pgm")); + for (unsigned u = 0; u < toto.nelements(); ++u) + tata(point2d(u, 1)) = toto(point1d(u)); + io::pgm::save(cast_image <int_u8>(tata), name.append("_proj.pgm")); } }

16 years, 2 months

cleanup-2008 2761: Add closing, udate filter parameters.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Add closing, udate filter parameters. * nature/closing.cc: New. * nature/gradient.cc: . * nature/histo_hsi.cc: . * nature/hom.cc: . * nature/opening.cc: . closing.cc | 59 +++++++++++++++++++++++++++++++ gradient.cc | 5 +- histo_hsi.cc | 39 +++++++++++--------- hom.cc | 110 ++++++++++++++++++++++++++++++++++++++++++++++++----------- opening.cc | 10 ++--- 5 files changed, 180 insertions(+), 43 deletions(-) Index: nature/closing.cc --- nature/closing.cc (revision 0) +++ nature/closing.cc (revision 0) @@ -0,0 +1,59 @@ +// 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. + +#include <mln/core/image/image2d.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/value/int_u8.hh> +#include <mln/morpho/closing.hh> + +int main(int argc, const char * argv[]) +{ + using namespace mln; + using value::int_u8; + + if (argc < 2) { + std::cerr << "usage: " << argv[0] << " in.pgm [other_files.pgm]" << std::endl; + return 1; + } + + for (int i = 1; i < argc; ++i) + { + image2d<int_u8> ima; + io::pgm::load(ima, argv[i]); + + win::rectangle2d rect(5, 5); + border::thickness = 11; + + std::string name(argv[i]); + name.erase(name.length() - 4); + io::pgm::save(morpho::closing(ima, rect), name.append("_opened.pgm")); + } +} Index: nature/gradient.cc --- nature/gradient.cc (revision 2760) +++ nature/gradient.cc (working copy) @@ -53,7 +53,8 @@ win::rectangle2d rect(5, 5); border::thickness = 5; - io::pgm::save( morpho::gradient(ima, rect), - "out.pgm" ); + std::string name(argv[i]); + name.erase(name.length() - 4); + io::pgm::save(morpho::gradient(ima, rect), name.append("_grad.pgm")); } } Index: nature/histo_hsi.cc --- nature/histo_hsi.cc (revision 2760) +++ nature/histo_hsi.cc (working copy) @@ -61,24 +61,28 @@ template <typename I> -void save_histo(Image<I> &i, std::string &name, unsigned width, unsigned height, unsigned npoints) +void save_histo(Image<I> &i, std::string &name) { I& ima = exact(i); - histo::data<u_t> h = histo::compute(ima); + histo::data<float01_8> h = histo::compute(ima); - double norm = (double) npoints / (double) height; + // Compute histo max + size_t max = 0; + mln_viter(mln::value::set<float01_8>) v(h.vset()); - image2d<bool> output(height + 1, width + 1, 0); + for_all(v) + if (h(v) > max) + max = h(v); + + image2d<bool> output(max, mln_card(float01_8), 0); level::fill(output, true); - mln_viter(mln::value::set<u_t>) v(h.vset()); for_all(v) - if (h(v) > 0) - for (u_t i = 0; i < h(v)/norm; ++i) + for (size_t i = 0; i < h(v); ++i) { // std::cout << height - i << ", " << (u_t)v << std::endl; - output(point2d(height - i, (u_t)v)) = false; + output(point2d(max - i - 1, (float01_8)v)) = false; } io::pbm::save(output, name); @@ -91,21 +95,19 @@ return 1; } - for (unsigned i = 1; i < argc; ++i) + for (int i = 1; i < argc; ++i) { image2d<rgb8> input; io::ppm::load(input, argv[i]); - unsigned npoints = input.ncols() * input.nrows(); - image2d<hsi_f> hsi = level::transform(input, fun::v2v::f_rgb_to_hsi_f); thru<mln::meta::hue<hsi_f>, image2d<hsi_f> > h(hsi); - cast_image_<u_t, thru<mln::meta::hue<hsi_f>, image2d<hsi_f> > > hue(h); + cast_image_<float01_8, thru<mln::meta::hue<hsi_f>, image2d<hsi_f> > > hue(h); std::string n(argv[i]); n.erase(n.length() - 4); - io::pgm::save(hue, n.append("_hue.pgm")); + // io::pgm::save(hue, n.append("_hue.pgm")); image2d<hsi_f>::piter p(hsi.domain()); float m = 0; @@ -120,8 +122,10 @@ std::string name(argv[i]); name.erase(name.length() - 4); - save_histo(hue, name.append("_hue.pbm"), 256, 360, npoints); + save_histo(hue, name.append("_hue.pbm")); + + /* thru<mln::meta::sat<hsi_f>, image2d<hsi_f> > s(hsi); cast_image_<u_t, thru<mln::meta::sat<hsi_f>, image2d<hsi_f> > > sat(s); @@ -162,5 +166,6 @@ name = argv[i]; name.erase(name.length() - 4); save_histo(inty, name.append("_inty.pbm"), 256, 256, npoints); + */ } } Index: nature/hom.cc --- nature/hom.cc (revision 2760) +++ nature/hom.cc (working copy) @@ -34,6 +34,7 @@ #include <mln/io/pbm/save.hh> #include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> # include <mln/core/alias/window2d.hh> @@ -56,39 +57,110 @@ for (int i = 1; i < argc; ++i) { - image2d<int_u8> ima; + typedef int_u8 int_t; + + image2d<int_t> ima; io::pgm::load(ima, argv[i]); // Compute the mean - int_u8 mean = estim::mean(ima); + int_t mean = estim::mean(ima); + + image2d<bool> imab = binarization::threshold(ima, mean); + + border::thickness = 10; window2d winout; window2d winin; - static const bool matout [] = {0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, - 1, 1, 1, 1, 1, 1, 0}; - - convert::from_to(matout, winout); - - static const bool matin [] = {0, 1, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, - 0, 1, 0, 0, 0, 0, 0, - 0, 1, 1, 1, 1, 1, 1, - 0, 0, 0, 0, 0, 0, 0}; +// static const bool matout [] = {0, 0, 0, 0, 0, 0, 0, +// 0, 0, 1, 0, 0, 0, 0, +// 0, 0, 1, 0, 0, 0, 0, +// 0, 0, 1, 0, 0, 0, 0, +// 0, 0, 1, 1, 1, 1, 0, +// 0, 0, 0, 0, 0, 0, 0, +// 0, 0, 0, 0, 0, 0, 0}; + +// static const bool matout [] = {0, 0, 0, 0, 0, +// 0, 1, 0, 0, 0, +// 0, 1, 0, 0, 0, +// 0, 1, 1, 1, 0, +// 0, 0, 0, 0, 0}; + + static const bool blmatout [] = {0, 0, 0, + 1, 0, 0, + 1, 1, 0}; + + + convert::from_to(blmatout, winout); + +// static const bool matin [] = {0, 0, 0, 1, 0, 0, 0, +// 0, 0, 0, 1, 0, 0, 0, +// 0, 0, 0, 1, 0, 0, 0, +// 0, 0, 0, 1, 1, 1, 1, +// 0, 0, 0, 0, 0, 0, 0, +// 0, 0, 0, 0, 0, 0, 0, +// 0, 0, 0, 0, 0, 0, 0}; + +// static const bool matin [] = {0, 0, 1, 0, 0, +// 0, 0, 1, 0, 0, +// 0, 0, 1, 1, 1, +// 0, 0, 0, 0, 0, +// 0, 0, 0, 0, 0}; + + static const bool blmatin [] = {0, 1, 0, + 0, 1, 1, + 0, 0, 0}; + + convert::from_to(blmatin, winin); + image2d<bool> bottom_left = morpho::hit_or_miss(imab, winout, winin); + + + static const bool brmatout [] = {0, 0, 0, + 0, 0, 1, + 0, 1, 1}; + + static const bool brmatin [] = {0, 1, 0, + 1, 1, 0, + 0, 0, 0}; + + convert::from_to(brmatout, winout); + convert::from_to(brmatin, winin); + image2d<bool> bottom_right = morpho::hit_or_miss(imab, winout, winin); + + static const bool urmatout [] = {0, 1, 1, + 0, 0, 1, + 0, 0, 0}; + + static const bool urmatin [] = {0, 0, 0, + 1, 1, 0, + 0, 1, 0}; + + convert::from_to(urmatout, winout); + convert::from_to(urmatin, winin); + image2d<bool> up_right = morpho::hit_or_miss(imab, winout, winin); + + + static const bool ulmatout [] = {1, 1, 0, + 1, 0, 0, + 0, 0, 0}; + + static const bool ulmatin [] = {0, 0, 0, + 0, 1, 1, + 0, 1, 0}; + + convert::from_to(ulmatout, winout); + convert::from_to(ulmatin, winin); + image2d<bool> up_left = morpho::hit_or_miss(imab, winout, winin); - convert::from_to(matin, winin); std::string name(argv[i]); name.erase(name.length() - 4); - io::pbm::save( morpho::hit_or_miss(binarization::threshold(ima, mean), winout, winin), + io::pbm::save( imab, name.append("_bin.pbm")); + + name = argv[i]; + name.erase(name.length() - 4); + io::pbm::save( up_left + up_right + bottom_right + bottom_left, name.append("_hom.pbm")); } } Index: nature/opening.cc --- nature/opening.cc (revision 2760) +++ nature/opening.cc (working copy) @@ -34,7 +34,6 @@ #include <mln/value/int_u8.hh> #include <mln/morpho/opening.hh> - int main(int argc, const char * argv[]) { using namespace mln; @@ -50,10 +49,11 @@ image2d<int_u8> ima; io::pgm::load(ima, argv[i]); - win::rectangle2d rect(1, 51); - border::thickness = 100; + win::rectangle2d rect(5, 5); + border::thickness = 11; - io::pgm::save( morpho::opening(ima, rect), - "out.pgm" ); + std::string name(argv[i]); + name.erase(name.length() - 4); + io::pgm::save(morpho::opening(ima, rect), name.append("_opened.pgm")); } }

16 years, 2 months

cleanup-2008 2755: Updating filters.

by Alexandre Abraham

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Alexandre Abraham <abraham(a)lrde.epita.fr> Updating filters. * nature/erosion.cc: More user friendly. * nature/gradient.cc: . * nature/hom.cc: Now working. * nature/mco.cc: Now working on every images. * nature/opening.cc: . erosion.cc | 7 ++++--- gradient.cc | 2 +- hom.cc | 40 +++++++++++++++++++++++++++++++--------- mco.cc | 53 ++++++++++++++++++++++++++--------------------------- opening.cc | 2 +- 5 files changed, 63 insertions(+), 41 deletions(-) Index: nature/erosion.cc --- nature/erosion.cc (revision 2754) +++ nature/erosion.cc (working copy) @@ -45,7 +45,7 @@ return 1; } - for (unsigned i = 1; i < argc; ++i) + for (int i = 1; i < argc; ++i) { image2d<int_u8> ima; io::pgm::load(ima, argv[i]); @@ -53,7 +53,8 @@ win::hline2d f(31); border::thickness = 16; - io::pgm::save( morpho::erosion(ima, f), - "out.pgm" ); + std::string name(argv[i]); + name.erase(name.length() - 4); + io::pgm::save(morpho::erosion(ima, f), name.append("_eroded.pgm")); } } Index: nature/gradient.cc --- nature/gradient.cc (revision 2754) +++ nature/gradient.cc (working copy) @@ -45,7 +45,7 @@ return 1; } - for (unsigned i = 1; i < argc; ++i) + for (int i = 1; i < argc; ++i) { image2d<int_u8> ima; io::pgm::load(ima, argv[i]); Index: nature/hom.cc --- nature/hom.cc (revision 2754) +++ nature/hom.cc (working copy) @@ -35,7 +35,7 @@ #include <mln/value/int_u8.hh> - +# include <mln/core/alias/window2d.hh> #include <mln/level/transform.hh> #include <mln/binarization/threshold.hh> @@ -47,26 +47,48 @@ int main(int argc, const char * argv[]) { using namespace mln; - using value::int_u16; + using namespace value; if (argc < 2) { std::cerr << "usage: " << argv[0] << " in.pgm [other_files.pgm]" << std::endl; return 1; } - for (unsigned i = 1; i < argc; ++i) + for (int i = 1; i < argc; ++i) { - image2d<int_u16> ima; + image2d<int_u8> ima; io::pgm::load(ima, argv[i]); // Compute the mean - int_u16 mean = estim::mean(ima); - - win::rectangle2d rectout(3, 3); - win::rectangle2d rectin(5, 5); + int_u8 mean = estim::mean(ima); + window2d winout; + window2d winin; - io::pbm::save( morpho::hit_or_miss(binarization::threshold(ima, mean), rectout, rectin), - "out.pbm" ); + static const bool matout [] = {0, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, + 1, 0, 0, 0, 0, 0, 0, + 1, 1, 1, 1, 1, 1, 0}; + + convert::from_to(matout, winout); + + static const bool matin [] = {0, 1, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, + 0, 1, 0, 0, 0, 0, 0, + 0, 1, 1, 1, 1, 1, 1, + 0, 0, 0, 0, 0, 0, 0}; + + convert::from_to(matin, winin); + + + std::string name(argv[i]); + name.erase(name.length() - 4); + io::pbm::save( morpho::hit_or_miss(binarization::threshold(ima, mean), winout, winin), + name.append("_hom.pbm")); } } Index: nature/mco.cc --- nature/mco.cc (revision 2754) +++ nature/mco.cc (working copy) @@ -1,45 +1,44 @@ #include <iostream> -#include <mln/value/int_u.hh> #include <mln/core/image/image2d.hh> +#include <mln/core/image/cast_image.hh> +#include <mln/value/int_u16.hh> #include "co_occurence.hh" #include <mln/core/alias/dpoint2d.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/pgm/load.hh> +#include <mln/estim/min_max.hh> -int main () +int main(int argc, const char * argv[]) { using namespace mln; using namespace value; - typedef image2d< int_u<3> > I; - - int_u<3> vs[6][5] = { - - { 3, 3, 4, 4, 4 }, - { 2, 1, 1, 1, 1 }, - { 1, 4, 4, 4, 6 }, - { 1, 4, 3, 4, 1 }, - { 7, 4, 5, 3, 1 }, - { 7, 7, 1, 1, 0 } - - }; - - I ima(make::image2d(vs)); + if (argc < 2) { + std::cerr << "usage: " << argv[0] << " in.pgm [other_files.pgm]" << std::endl; + return 1; + } dpoint2d d(0, 1); - // std::cout << co_occurence(ima, d) << std::endl; + for (int i = 1; i < argc; ++i) + { + image2d<int_u8> ima; + io::pgm::load(ima, argv[i]); + + std::string name(argv[i]); + name.erase(name.length() - 4); image2d<unsigned> co(co_occurence(ima, d)); - unsigned cpt = 0; - + // Normalization + unsigned m, M; + estim::min_max(co, m, M); + double norm = 255./M; mln_piter_(image2d<unsigned>) p(co.domain()); for_all(p) - { - std::cout << p << " = " << co(p) << std::endl; - cpt += co(p); - } - - std::cout << cpt << std::endl; + co(p) *= norm; + io::pgm::save(cast_image<int_u<8> >(co), name.append("_mco.pgm")); + } } Index: nature/opening.cc --- nature/opening.cc (revision 2754) +++ nature/opening.cc (working copy) @@ -45,7 +45,7 @@ return 1; } - for (unsigned i = 1; i < argc; ++i) + for (int i = 1; i < argc; ++i) { image2d<int_u8> ima; io::pgm::load(ima, argv[i]);

16 years, 2 months

cleanup-2008 2760: Cleanup OCR preprocessing

by Jimmy Ma

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-02 Jimmy Ma <jimmy.ma(a)lrde.epita.fr> Cleanup OCR preprocessing. * garrigues/ocr/ocr_with_preprocess.cc, garrigues/ocr/ocr_without_preprocess.cc: Cleanup the call to tesseract. * garrigues/ocr/tesseract_wrap.hh: New. Provide a Tesseract wrapper which is also able to compute an approximate confidence value of the recognition based on tesseract internal data. --- ocr_with_preprocess.cc | 64 ++++++++++++++++++-------------- ocr_without_preprocess.cc | 24 ++++-------- tesseract_wrap.hh | 91 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 135 insertions(+), 44 deletions(-) Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_without_preprocess.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_without_preprocess.cc (revision 2759) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_without_preprocess.cc (revision 2760) @@ -53,7 +53,7 @@ #include <mln/labeling/regional_maxima.hh> #include <mln/morpho/dilation.hh> -#include <tesseract/baseapi.h> +#include "tesseract_wrap.hh" // _COMPILATION_ // g++ -DNDEBUG -O3 -I../../.. ocr.cc -L/usr/lib -ltesseract_full -lpthread @@ -61,19 +61,6 @@ // Call tesseract // lang: expected language -template <typename T> -char* tesseract(const char* lang, const mln::image2d<T>& input) -{ - TessBaseAPI::InitWithLanguage(NULL, NULL, lang, NULL, false, 0, NULL); - char* s = TessBaseAPI::TesseractRect( - (unsigned char*) input.buffer(), - sizeof (T), - input.ncols() * sizeof (T), - 0, 0, - input.ncols(), - input.nrows()); - return s; -} int main(int argc, char** argv) { @@ -92,7 +79,12 @@ io::pbm::load(input, argv[1]); - char* s = tesseract("fra", input); + { + image2d<int_u8> tmp = clone(cast_image<int_u8>(input)); + float score = 0; + char* s = tesseract("fra", tmp, &score); + std::cerr << "Tesseract result: (score " << score << ")" << std::endl; std::cout << s; - free(s); + delete[] s; + } } Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/tesseract_wrap.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/tesseract_wrap.hh (revision 0) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/tesseract_wrap.hh (revision 2760) @@ -0,0 +1,91 @@ +#ifndef TESSERACT_WRAP_HH +# define TESSERACT_WRAP_HH + +# include <cassert> + +# include <mln/core/image/image2d.hh> + +# include <tesseract/baseapi.h> + +struct TessWrap : public TessBaseAPI +{ + static int InitWithLanguage(const char* datapath, const char* outputbase, + const char* language, const char* configfile, + bool numeric_mode, int argc, char* argv[]) + { + return TessBaseAPI::InitWithLanguage(datapath, outputbase, + language, configfile, + numeric_mode, argc, argv); + } + + static char* TesseractRect(const unsigned char* imagedata, + int bytes_per_pixel, + int bytes_per_line, + int left, int top, int width, int height, + float* score) + { + int kMinRectSize = 10; // Quick and dirty... (value imported from tesseract src) + if (width < kMinRectSize || height < kMinRectSize) + return NULL; // Nothing worth doing. + + // Copy/Threshold the image to the tesseract global page_image. + CopyImageToTesseract(imagedata, bytes_per_pixel, bytes_per_line, + left, top, width, height); + + { // RecognizeToString + BLOCK_LIST* block_list = FindLinesCreateBlockList(); + PAGE_RES* page_res = Recognize(block_list, NULL); + + char* string; + int* lengths; + float* costs; + int* x0; + int* y0; + int* x1; + int* y1; + // Retrieve Tesseract internal data to compute the quality score. + int n = TessBaseAPI::TesseractExtractResult(&string, &lengths, &costs, &x0, &y0, &x1, &y1, page_res); + + float average_uncertainty = 0.f; + for (int i = 0; i < n; ++i) + average_uncertainty += costs[i]; + + if (n) + *score = average_uncertainty / n; + else + *score = -1; + + // Some memory cleanup + delete[] string; + delete[] lengths; + delete[] costs; + delete[] x0; + delete[] y0; + delete[] x1; + delete[] y1; + + return TesseractToText(page_res); + } + } +}; + +// Call tesseract +// lang: expected language +template <typename T> +char* tesseract(const char* lang, const mln::image2d<T>& input, float* score) +{ + assert(!score); + TessWrap::InitWithLanguage(NULL, NULL, lang, NULL, false, 0, NULL); + char* s = TessWrap::TesseractRect( + (unsigned char*) input.buffer(), + sizeof (T), + input.ncols() * sizeof (T), + 0, 0, + input.ncols(), + input.nrows(), + score); + return s; +} + + +#endif // ! TESSERACT_WRAP_HH Index: branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2759) +++ branches/cleanup-2008/milena/sandbox/garrigues/ocr/ocr_with_preprocess.cc (revision 2760) @@ -57,28 +57,24 @@ #include <mln/io/pbm/save.hh> #include <mln/logical/not.hh> -#include <tesseract/baseapi.h> - +#include "tesseract_wrap.hh" // _COMPILATION_ // g++ -DNDEBUG -O3 -I../../.. ocr.cc -L/usr/lib -ltesseract_full -lpthread - -// Call tesseract -// lang: expected language -template <typename T> -char* tesseract(const char* lang, const mln::image2d<T>& input) -{ - TessBaseAPI::InitWithLanguage(NULL, NULL, lang, NULL, false, 0, NULL); - char* s = TessBaseAPI::TesseractRect( - (unsigned char*) input.buffer(), - sizeof (T), - input.ncols() * sizeof (T), - 0, 0, - input.ncols(), - input.nrows()); - return s; +#if 0 +# define TEST(Var) \ + { \ + image2d<int_u8> tmp = clone(cast_image<int_u8>(Var)); \ + float score = 0.f; \ + char* s = tesseract("fra", tmp, &score); \ + std::cerr << #Var << ": " << score << std::endl << s; \ + delete[] s; \ } +#else +# define TEST(Var) +#endif + int main(int argc, char** argv) { @@ -96,20 +92,23 @@ mln::border::thickness = 0; io::pbm::load(input, argv[1]); + TEST(input); // Resize - std::cerr << "Enlarge the image" << std::endl; + //std::cerr << "Enlarge the image" << std::endl; image2d<int_u8> enlarged = enlarge(logical::not_(input), 2); //image2d<bool> enlarged = geom::resize(logical::not_(input), 4); - io::pgm::save(enlarged, "1_enlage.pgm"); + io::pgm::save(enlarged, "1_enlarge.pgm"); + TEST(enlarged); // Blur. - std::cerr << "Blur the enlarged image" << std::endl; + //std::cerr << "Blur the enlarged image" << std::endl; // image2d<int_u8> blur = linear::gaussian(fun::p2v::ternary(pw::value(enlarged), pw::cst(int_u8(255)), pw::cst(int_u8(0))) | enlarged.domain(), // 4); - image2d<int_u8> blur = linear::gaussian(enlarged, 1); + image2d<int_u8> blur = linear::gaussian(clone(enlarged), 1); io::pgm::save(blur, "2_gaussian.pgm"); + TEST(blur); // Crest. // image2d<bool> c = crest(enlarged, blur, c4()); @@ -120,7 +119,7 @@ // Threshold image2d<bool> binary; { - std::cerr << "Threshold the blur image" << std::endl; + //std::cerr << "Threshold the blur image" << std::endl; // // Compute the histogram. // histo::data<int_u8> h = histo::compute(blur); @@ -141,26 +140,35 @@ binary(p) = blur(p) > 100; io::pbm::save(binary, "3_threshold.pbm"); + TEST(binary); } // Skeleton - std::cerr << "Compute the skeleton" << std::endl; + //std::cerr << "Compute the skeleton" << std::endl; image2d<bool> skel = skeleton(binary, 4); io::pbm::save(skel, "4_skeleton.pbm"); + TEST(skel); // Dilation - std::cerr << "Dilate the skeleton" << std::endl; + //std::cerr << "Dilate the skeleton" << std::endl; win::octagon2d oct(7); for (unsigned i = 0; i < 1; i++) skel = morpho::dilation(skel, oct); io::pbm::save(skel, "5_dilation.pbm"); + TEST(skel); io::pbm::save(skel, argv[2]); - std::cerr << "Text recognition" << std::endl; - char* s = tesseract("fra", clone(logical::not_(skel))); - std::cerr << "Tesseract result:"<< std::endl; + //std::cerr << "Text recognition" << std::endl; + //char* s = tesseract("fra", clone(logical::not_(skel))); + { + image2d<int_u8> tmp = clone(cast_image<int_u8>(skel)); + float score = 0; + char* s = tesseract("fra", tmp, &score); + std::cerr << "Tesseract result: (score " << score << ")" << std::endl; std::cout << s; - free(s); + delete[] s; + } + }

16 years, 2 months

milena r2759: Fix the gaussian_2nd_derivative coef normalisation

by Florian Lesaint

URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena ChangeLog: 2008-11-02 Florian Lesaint <florian.lesaint(a)lrde.epita.fr> Fix the gaussian_2nd_derivative coef normalisation. and remove stretch since it can be a problem with float images. * linear/gaussian.hh: Here. --- gaussian.hh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) Index: branches/cleanup-2008/milena/mln/linear/gaussian.hh =================================================================== --- branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2758) +++ branches/cleanup-2008/milena/mln/linear/gaussian.hh (revision 2759) @@ -329,6 +329,7 @@ float exp2b0 = exp(2.0 * b0); float scale0 = 1 + exp2b0 - 2 * cos0 * expb0; + scale0 *= scale0 * scale0; float scaleA = a1 * sin0 * expb0 * (1 + expb0 * (2 * cos0 * (1 + exp2b0) + exp2b0 - 6)) + a0 * expb0 * (2 * expb0 * (2 - cos0 * cos0) * (1 - exp2b0) - cos0 * (1 - exp2b0 * exp2b0)); @@ -337,6 +338,7 @@ float exp2b1 = exp(2.0 * b1); float scale1 = 1 + exp2b1 - 2 * cos1 * expb1; + scale1 *= scale1 * scale1; float scaleC = c1 * sin1 * expb1 * (1 + expb1 * (2 * cos1 * (1 + exp2b1) + exp2b1 - 6)) + c0 * expb1 * (2 * expb1 * (2 - cos1 * cos1) * (1 - exp2b1) - cos1 * (1 - exp2b1 * exp2b1)); @@ -393,8 +395,8 @@ /* Convert the result image to the user-requested datatype. FIXME: We are making an unnecessary copy in case the user expects a ntg::float_s image. */ - level::stretch(work_img, out); - //level::paste(work_img, out); + //level::stretch(work_img, out); + level::paste(work_img, out); }

16 years, 2 months

r2758: Big cleanup

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2758: Big cleanup URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-01 Maxime van Noppen <yabo(a)lrde.epita.fr> Big cleanup. * max_tree.hh: Factorize code in generic methods. * v2.cc: Comment and clean code. --- max_tree.hh | 218 +++++++++++++++++++++++++----------------------------------- v2.cc | 111 +++++++++++++++++++++++------- 2 files changed, 177 insertions(+), 152 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/max_tree.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 2757) +++ branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 2758) @@ -37,21 +37,16 @@ mln_ch_value(I, point) new_parent; mln_ch_value(I, point) zpar; - // image of volumes - image3d<unsigned> vol; - image3d<unsigned> nb_represent; - image3d<double> density; - //tags image3d<bool> is_active; - image3d< algebra::vec<3, double> > mean_color; max_tree_(const I& f, const N& nbh) - : f(f), nbh(nbh), vol(f.domain()), nb_represent(f.domain()), density(f.domain()), - is_active(f.domain()), mean_color(f.domain()), new_parent(f.domain()) + : f(f), nbh(nbh), is_active(f.domain()), new_parent(f.domain()) { run(); level::fill(is_active, true); + + new_parent = parent; } void run() @@ -94,11 +89,11 @@ point active_parent(const point& p) { - if(is_root(p)) - return p; - point node = parent(p); - while (not is_active(node)) - node = parent(node); + point node = new_parent(p); + + while (not is_active(node) && not is_root(node)) + node = new_parent(node); + return node; } @@ -108,163 +103,169 @@ zpar(p) = p; } - void area() + image3d<unsigned> compute_nb_represent() { - image2d<value::int_u16> area(f.domain()); - level::fill(area, 1); - mln_fwd_piter(S) p(s); - for_all(p) - { - if (parent(p) == p) - continue; - area(parent(p)) += area(p); - } - debug::println(area); - } + image3d<unsigned> nb_represent(f.domain()); - void volume() - { - level::fill(vol, 0); level::fill(nb_represent, 0); - - { mln_fwd_piter(S) p(s); for_all(p) { - vol(p) += 1; nb_represent(p) += f(p); - if (not is_root(p)) - { nb_represent(parent(p)) += nb_represent(p); - vol(parent(p)) += vol(p); } - density(parent(p)) = (nb_represent(parent(p)) - nb_represent(p)) / (double) (vol(parent(p)) - vol(p)); - } - } - - { - mln_fwd_piter(S) p(s); - for_all(p) - { - std::cerr << " Color " << p << std::endl - << " vol = " << vol(p) << " vertices" << std::endl - << " nb_represent = " << nb_represent(p) << std::endl - << " f = " << f(p) << std::endl - << " density = " << density(p) << " representant / vertices " << std::endl << std::endl; - } - } + return nb_represent; } - void density_fusion(float ratio) + image3d<unsigned> compute_volume() { - assert(ratio < 1); + image3d<unsigned> volume(f.domain()); + level::fill(volume, 0); mln_fwd_piter(S) p(s); - for_all(p) - { - if (density(active_parent(p)) > (1 - ratio) * density(p) && - density(active_parent(p)) < (1 + ratio) * density(p)) - is_active(p) = false; - } - } - - void density_closing(float lambda) - { - assert(ratio < 1); - mln_fwd_piter(S) p(s); for_all(p) { - if (density(p) < lambda) - is_active(p) = false; + volume(p) += 1; + if (not is_root(p)) + volume(parent(p)) += volume(p); } + + return volume; } - void compute_mean_color() + image3d< algebra::vec<3, double> > compute_mean_color() { - level::fill(mean_color, make::vec(0, 0, 0)); + image3d< algebra::vec<3, double> > mean_color(f.domain()); + + update_parents(); mln_fwd_piter(S) p(s); for_all(p) mean_color(p) = make::vec(p[0], p[1], p[2]); for_all(p) - mean_color(parent(p)) = (mean_color(parent(p)) + mean_color(p)) / 2.; + mean_color(new_parent(p)) = (mean_color(new_parent(p)) + mean_color(p)) / 2.; - for_all(p) - if (mean_color(p)[0] < 10 && mean_color(p)[1] < 10 && mean_color(p)[2] < 10) - std::cerr << "Warning " << p << " == " << mean_color(p) << std::endl; + return mean_color; } - // Cut components with less represents than lambda - void volume_fusion(int lambda) + template<typename X> + void lumberjack(const X& ima, const mln_value(X)& lambda) { + unsigned progress = 0; + unsigned step = s.nsites() / 100; + mln_fwd_piter(S) p(s); + for_all(p) { - if (vol(p) < lambda) + if (ima(p) < lambda) is_active(p) = false; + + ++progress; + if (progress % step == 0) + { + std::cout << "." << std::flush; + progress = 0; } } - void nb_represent_fusion(int lambda) + std::cout << std::endl; + } + + template<typename X> + void nuclear_fusion(const X& ima, const mln_value(X)& lambda) { + unsigned progress = 0; + unsigned step = s.nsites() / 100; + + update_parents(); + mln_fwd_piter(S) p(s); for_all(p) { - if (nb_represent(p) < lambda) + if (fabs(1 - ima(new_parent(p)) / ima(p)) < lambda) is_active(p) = false; + + ++progress; + if (progress % step == 0) + { + std::cout << "." << std::flush; + progress = 0; } } + std::cout << std::endl; + } + void color_fusion(int lambda) { + unsigned progress = 0; + unsigned step = s.nsites() / 100; + + update_parents(); + mln_fwd_piter(S) p(s); for_all(p) { - if (parent(p)[0] - p[0] < lambda && - parent(p)[1] - p[1] < lambda && - parent(p)[2] - p[2] < lambda) + if (new_parent(p)[0] - p[0] < lambda && + new_parent(p)[1] - p[1] < lambda && + new_parent(p)[2] - p[2] < lambda) is_active(p) = false; - } - } - point active_parent(const point& p) + ++progress; + if (progress % step == 0) { - point node = parent(p); - - while (not is_active(node) && not is_root(node)) - node = parent(node); - - return node; + std::cout << "." << std::flush; + progress = 0; + } + } + std::cout << std::endl; } void update_parents() { + unsigned progress = 0; + unsigned step = s.nsites() / 100; + + std::cout << "Update parents"; + mln_fwd_piter(S) p(s); for_all(p) + { new_parent(p) = active_parent(p); + + ++progress; + if (progress % step == 0) + { + std::cout << "." << std::flush; + progress = 0; + } + } + std::cout << std::endl; } template < typename J > - void to_ppm(const J& ima, const std::string& file, unsigned f) + void to_ppm(const J& ima, const std::string& file, unsigned f, + const image3d< algebra::vec<3, double> >& mean_color) { + update_parents(); + J out(ima.domain()); level::fill(out, value::rgb8(0, 0, 0)); mln_piter(J) p(ima.domain()); for_all(p) { - point3d p3 = point3d(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); - point3d node = new_parent(p3); + point3d node = new_parent(point3d(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f)); out(p) = value::rgb8(static_cast<unsigned char>(mean_color(node)[0] * f), static_cast<unsigned char>(mean_color(node)[1] * f), static_cast<unsigned char>(mean_color(node)[2] * f)); - //out(p) = value::rgb8(mean_color(node)[0] * f, mean_color(node)[1] * f, mean_color(node)[2] * f); } io::ppm::save(out, file); @@ -272,41 +273,9 @@ unsigned number_of_nodes() { - p_array<point> node; - - mln_fwd_piter(S) p(s); - for_all(p) - if (is_node(p)) - node.insert(p); - - std::cout << s.nsites() << std::endl; - std::cout << parent.domain().nsites() << std::endl; - std::cout << node.nsites() << std::endl; - return s.nsites(); } - void print_class_info() - { - int nb_class = 0; - - mln_fwd_piter(S) p(s); - - //std::cout.width(5); - std::cout.precision(2); - - std::cout << "Color\t\tId\t\tdensity\t\tvolume\t\tnb_represent" << std::endl; - - for_all(p) - { - if (is_active(p)) - { - std::cout << mean_color(p) << "\t\t" << nb_class << "\t\t" << density(p) << "\t\t" << vol(p) << "\t\t" << nb_represent(p) << std::endl; - ++nb_class; - } - } - } - bool is_root(const point& p) const { return parent(p) == p; @@ -334,7 +303,6 @@ zpar(r) = p; } } - }; Index: branches/cleanup-2008/milena/sandbox/classif/v2.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 2757) +++ branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 2758) @@ -38,45 +38,100 @@ return histo; } +template <typename I> +image3d< double > +compute_density(const I& weight, const I& volume) +{ + image3d< double > density(volume.domain()); + + mln_piter(I) p(volume.domain()); + for_all(p) + density(p) = weight(p) / volume(p); + + return density; +} + template <typename I, typename J, typename N> unsigned -compute_max_tree(const I& ima, const J& histo, const N& nbh, - const unsigned f, float lambda, float ratio) +process_max_tree(const I& ima, const J& histo, const N& nbh, + double density_lambda, unsigned volume_lambda, + unsigned nb_represent_lambda, unsigned color_lambda, + unsigned div_factor) { max_tree_<J,N> run(histo, nbh); - run.volume(); + // FIXME: write a compute() method with functor argument + image3d<unsigned> nb_represent = run.compute_nb_represent(); + image3d<unsigned> volume = run.compute_volume(); + image3d< algebra::vec<3, double> > mean_color = run.compute_mean_color(); + image3d<double> density = compute_density(nb_represent, volume); - std::cout << "step 1 - nb_represent fusion" << std::endl; - //run.nb_represent_fusion(lambda); - std::cout << "step 2 - volume fusion" << std::endl; - //run.volume_fusion(lambda); - std::cout << "step 3 - color fusion" << std::endl; - //run.color_fusion(lambda); - std::cout << "step 3 - density fusion" << std::endl; - //run.density_fusion(ratio); + // Density closing + if (density_lambda > 0.00001) + { + std::cout << "Density cutting" << std::endl; + run.nuclear_fusion(density, density_lambda); + } - std::cout << "step Update parents" << std::endl; - run.update_parents(); + // Volume cutting + if (volume_lambda != 0) + { + std::cout << "Volume cutting" << std::endl; + run.lumberjack(volume, volume_lambda); + } + + // Represent cutting + if (nb_represent_lambda != 0) + { + std::cout << "nb_represent cutting" << std::endl; + run.lumberjack(nb_represent, nb_represent_lambda); + } + + // Color fusion + if (color_lambda != 0) + { + std::cout << "Color fusion" << std::endl; + run.color_fusion(color_lambda); // FIXME: factorize the code with a functor + } - std::cout << "step Compute mean color" << std::endl; + // Compute mean color of active nodes + std::cout << "Compute mean color" << std::endl; run.compute_mean_color(); - std::cout << "step Print class info" << std::endl; - run.print_class_info(); + // Print informations on the filtered max tree + { + int nb_class = 0; + + mln_piter(image3d<unsigned>) p(nb_represent.domain()); + + std::cerr.precision(2); + + std::cerr << "Color\t\tId\t\tdensity\t\tvolume\t\tnb_represent" << std::endl; + + for_all(p) + if (run.is_active(p)) + { + std::cerr << mean_color(p) << "\t\t" << nb_class << "\t\t" << density(p) << "\t\t" << volume(p) << "\t\t" << nb_represent(p) << std::endl; + ++nb_class; + } - std::cout << "step Output image" << std::endl; - run.to_ppm(ima, "out.ppm", f); + std::cout << "Number of classes : " << nb_class << std::endl; + } + + + // Write the image w.r.t. the max tree + run.to_ppm(ima, "out.ppm", div_factor, mean_color); } bool usage(int argc, char ** argv) { - if (argc != 5) + if (argc != 7) { - std::cout << "usage: " << argv[0] << " image div_factor lambda ratio" << std::endl; + std::cout << "usage: " << argv[0] << " image div_factor density_lambda volume_lambda nb_represent_lambda color_lambda" << std::endl; return false; } + return true; } @@ -86,10 +141,14 @@ return 1; image2d<value::rgb8> ima; + ima = io::ppm::load<value::rgb8>(argv[1]); - const int div_factor = atoi(argv[2]); - const float lambda = atof(argv[3]); - const float ratio = atof(argv[4]); + + int div_factor = atoi(argv[2]); + float density_lambda = atof(argv[3]); + unsigned volume_lambda = atoi(argv[4]); + unsigned nb_represent_lambda = atoi(argv[5]); + unsigned color_lambda = atoi(argv[6]); //make histo image3d<unsigned> histo = fill_histo(ima, div_factor); @@ -98,8 +157,6 @@ accu::mean<unsigned, unsigned, unsigned> mean; image2d<unsigned> phisto = proj(histo, mean); - //debug::println(phisto); - - // Compute max_tree - compute_max_tree(ima, histo, c6(), div_factor, lambda, ratio); + // Process max_tree + process_max_tree(ima, histo, c6(), density_lambda, volume_lambda, nb_represent_lambda, color_lambda, div_factor); }

16 years, 2 months

r2757: Merge the filter chain

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2757: Merge the filter chain URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-01 Maxime van Noppen <yabo(a)lrde.epita.fr> Merge the filter chain. * max_tree.hh: Add a new_parent image to avoid computing them all * the time. * v2.cc: Define a filter chain order. --- max_tree.hh | 28 ++++++++++++++++++++-------- v2.cc | 21 ++++++++++++++++----- 2 files changed, 36 insertions(+), 13 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/max_tree.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 2756) +++ branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 2757) @@ -34,6 +34,7 @@ S s; mln_ch_value(I, bool) deja_vu; mln_ch_value(I, point) parent; + mln_ch_value(I, point) new_parent; mln_ch_value(I, point) zpar; // image of volumes @@ -47,7 +48,7 @@ max_tree_(const I& f, const N& nbh) : f(f), nbh(nbh), vol(f.domain()), nb_represent(f.domain()), density(f.domain()), - is_active(f.domain()), mean_color(f.domain()) + is_active(f.domain()), mean_color(f.domain()), new_parent(f.domain()) { run(); level::fill(is_active, true); @@ -231,6 +232,23 @@ } } + point active_parent(const point& p) + { + point node = parent(p); + + while (not is_active(node) && not is_root(node)) + node = parent(node); + + return node; + } + + void update_parents() + { + mln_fwd_piter(S) p(s); + for_all(p) + new_parent(p) = active_parent(p); + } + template < typename J > void to_ppm(const J& ima, const std::string& file, unsigned f) { @@ -241,13 +259,7 @@ for_all(p) { point3d p3 = point3d(ima(p).red() / f, ima(p).green() / f, ima(p).blue() / f); - - point3d node = p3; - if (not is_node(p3)) - node = parent(p3); - - while (not is_active(node)) - node = parent(node); + point3d node = new_parent(p3); out(p) = value::rgb8(static_cast<unsigned char>(mean_color(node)[0] * f), static_cast<unsigned char>(mean_color(node)[1] * f), Index: branches/cleanup-2008/milena/sandbox/classif/v2.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 2756) +++ branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 2757) @@ -45,18 +45,29 @@ { max_tree_<J,N> run(histo, nbh); - //run.number_of_nodes(); run.volume(); - run.volume_fusion(lambda); - run.density_fusion(ratio); + std::cout << "step 1 - nb_represent fusion" << std::endl; + //run.nb_represent_fusion(lambda); + std::cout << "step 2 - volume fusion" << std::endl; + //run.volume_fusion(lambda); + std::cout << "step 3 - color fusion" << std::endl; + //run.color_fusion(lambda); + std::cout << "step 3 - density fusion" << std::endl; + //run.density_fusion(ratio); + + std::cout << "step Update parents" << std::endl; + run.update_parents(); + + std::cout << "step Compute mean color" << std::endl; run.compute_mean_color(); - run.to_ppm(ima, "out.ppm", f); + std::cout << "step Print class info" << std::endl; run.print_class_info(); - //std::cout << " Number of nodes : " << run.number_of_nodes() << std::endl; + std::cout << "step Output image" << std::endl; + run.to_ppm(ima, "out.ppm", f); } bool usage(int argc, char ** argv)

16 years, 2 months

cleanup-2008 2756: INIM: Classif: Work on density.

by Ugo Jardonnet

https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox Index: ChangeLog from Ugo Jardonnet <ugo.jardonnet(a)lrde.epita.fr> INIM: Classif: Work on density. * classif/max_tree.hh (density closing|fusion): Add. * classif/v2.cc: Add parameter. max_tree.hh | 40 +++++++++++++++++++++++++++++++++++++--- v2.cc | 36 +++++++++++------------------------- 2 files changed, 48 insertions(+), 28 deletions(-) Index: classif/max_tree.hh --- classif/max_tree.hh (revision 2755) +++ classif/max_tree.hh (working copy) @@ -91,6 +91,16 @@ } // end of run() + point active_parent(const point& p) + { + if(is_root(p)) + return p; + point node = parent(p); + while (not is_active(node)) + node = parent(node); + return node; + } + void make_set(const point& p) { parent(p) = p; @@ -124,13 +134,13 @@ vol(p) += 1; nb_represent(p) += f(p); - if (parent(p) != p) + if (not is_root(p)) { nb_represent(parent(p)) += nb_represent(p); vol(parent(p)) += vol(p); } - density(p) = nb_represent(p) / (double) vol(p); + density(parent(p)) = (nb_represent(parent(p)) - nb_represent(p)) / (double) (vol(parent(p)) - vol(p)); } } @@ -147,6 +157,31 @@ } } + void density_fusion(float ratio) + { + assert(ratio < 1); + + mln_fwd_piter(S) p(s); + for_all(p) + { + if (density(active_parent(p)) > (1 - ratio) * density(p) && + density(active_parent(p)) < (1 + ratio) * density(p)) + is_active(p) = false; + } + } + + void density_closing(float lambda) + { + assert(ratio < 1); + + mln_fwd_piter(S) p(s); + for_all(p) + { + if (density(p) < lambda) + is_active(p) = false; + } + } + void compute_mean_color() { level::fill(mean_color, make::vec(0, 0, 0)); @@ -214,7 +249,6 @@ while (not is_active(node)) node = parent(node); -write: out(p) = value::rgb8(static_cast<unsigned char>(mean_color(node)[0] * f), static_cast<unsigned char>(mean_color(node)[1] * f), static_cast<unsigned char>(mean_color(node)[2] * f)); Index: classif/v2.cc --- classif/v2.cc (revision 2755) +++ classif/v2.cc (working copy) @@ -40,45 +40,30 @@ template <typename I, typename J, typename N> unsigned -compute_max_tree(const I& ima, const J& histo, const N& nbh, const unsigned f, int lambda) +compute_max_tree(const I& ima, const J& histo, const N& nbh, + const unsigned f, float lambda, float ratio) { max_tree_<J,N> run(histo, nbh); -#if 0 - I out(ima.domain()); - mln_piter(I) p(ima.domain()); - for_all(p) - { - //color at ima(p) - point3d v = point3d(ima(p).red() / f, - ima(p).green() / f, - ima(p).blue() / f); - //node the class of color with same density as v - point3d pn = run.parent(v); - //out(p) = color pn - out(p) = value::rgb8(pn[0] * f, pn[1] * f, pn[2] * f); - } - io::ppm::save(out, "tmp.ppm"); -#endif //run.number_of_nodes(); - run.volume(); - run.nb_represent_fusion(lambda); + run.volume(); run.volume_fusion(lambda); - run.color_fusion(5); + run.density_fusion(ratio); run.compute_mean_color(); - run.print_class_info(); run.to_ppm(ima, "out.ppm", f); + run.print_class_info(); + //std::cout << " Number of nodes : " << run.number_of_nodes() << std::endl; } bool usage(int argc, char ** argv) { - if (argc != 4) + if (argc != 5) { - std::cout << "usage: " << argv[0] << " image div_factor lambda" << std::endl; + std::cout << "usage: " << argv[0] << " image div_factor lambda ratio" << std::endl; return false; } return true; @@ -92,7 +77,8 @@ image2d<value::rgb8> ima; ima = io::ppm::load<value::rgb8>(argv[1]); const int div_factor = atoi(argv[2]); - const int lambda = atoi(argv[3]); + const float lambda = atof(argv[3]); + const float ratio = atof(argv[4]); //make histo image3d<unsigned> histo = fill_histo(ima, div_factor); @@ -104,5 +90,5 @@ //debug::println(phisto); // Compute max_tree - compute_max_tree(ima, histo, c6(), div_factor, lambda); + compute_max_tree(ima, histo, c6(), div_factor, lambda, ratio); }

16 years, 2 months

r2754: Allow to chain filters

by Maxime van Noppen

From: Maxime van Noppen <yabo(a)lrde.epita.fr> To: olena-patches(a)lrde.epita.fr Subject: r2754: Allow to chain filters URL: https://svn.lrde.epita.fr/svn/oln/branches/cleanup-2008/milena/sandbox ChangeLog: 2008-11-01 Maxime van Noppen <yabo(a)lrde.epita.fr> Allow to chain filters. * max_tree.hh: Here. * v2.cc: Chain filters. --- max_tree.hh | 24 +++++++++++++++++++----- v2.cc | 5 +++++ 2 files changed, 24 insertions(+), 5 deletions(-) Index: branches/cleanup-2008/milena/sandbox/classif/max_tree.hh =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 2753) +++ branches/cleanup-2008/milena/sandbox/classif/max_tree.hh (revision 2754) @@ -50,6 +50,7 @@ is_active(f.domain()), mean_color(f.domain()) { run(); + level::fill(is_active, true); } void run() @@ -165,8 +166,6 @@ // Cut components with less represents than lambda void volume_fusion(int lambda) { - level::fill(is_active, true); - mln_fwd_piter(S) p(s); for_all(p) { @@ -177,8 +176,6 @@ void nb_represent_fusion(int lambda) { - level::fill(is_active, true); - mln_fwd_piter(S) p(s); for_all(p) { @@ -187,6 +184,18 @@ } } + void color_fusion(int lambda) + { + mln_fwd_piter(S) p(s); + for_all(p) + { + if (parent(p)[0] - p[0] < lambda && + parent(p)[1] - p[1] < lambda && + parent(p)[2] - p[2] < lambda) + is_active(p) = false; + } + } + template < typename J > void to_ppm(const J& ima, const std::string& file, unsigned f) { @@ -237,11 +246,16 @@ mln_fwd_piter(S) p(s); + //std::cout.width(5); + std::cout.precision(2); + + std::cout << "Color\t\tId\t\tdensity\t\tvolume\t\tnb_represent" << std::endl; + for_all(p) { if (is_active(p)) { - std::cout << "Class " << nb_class << " : " << p << std::endl; + std::cout << mean_color(p) << "\t\t" << nb_class << "\t\t" << density(p) << "\t\t" << vol(p) << "\t\t" << nb_represent(p) << std::endl; ++nb_class; } } Index: branches/cleanup-2008/milena/sandbox/classif/v2.cc =================================================================== --- branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 2753) +++ branches/cleanup-2008/milena/sandbox/classif/v2.cc (revision 2754) @@ -62,8 +62,13 @@ //run.number_of_nodes(); run.volume(); + run.nb_represent_fusion(lambda); + run.volume_fusion(lambda); + run.color_fusion(5); + run.compute_mean_color(); + run.print_class_info(); run.to_ppm(ima, "out.ppm", f); //std::cout << " Number of nodes : " << run.number_of_nodes() << std::endl;

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