- Olena-patches

last-svn-commit-126-gca67a57 Store OCR results in the line_info structure.
by Guillaume Lazzara 25 May '10

25 May '10

* core/line_info.hh: Add a new attribute 'text'. * text/recognition.hh: Store results in the line_info structure. --- scribo/ChangeLog | 8 ++++++ scribo/core/line_info.hh | 28 ++++++++++++++++++++++- scribo/text/recognition.hh | 53 ++++++++++++------------------------------- 3 files changed, 50 insertions(+), 39 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 76decb5..4ce573a 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Store OCR results in the line_info structure. + + * core/line_info.hh: Add a new attribute 'text'. + + * text/recognition.hh: Store results in the line_info structure. + +2010-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve debug outputs in Sauvola and make binarization tools compile again. diff --git a/scribo/core/line_info.hh b/scribo/core/line_info.hh index 9ecf600..d0066c0 100644 --- a/scribo/core/line_info.hh +++ b/scribo/core/line_info.hh @@ -40,6 +40,7 @@ # include <mln/accu/stat/median_h.hh> # include <mln/accu/shape/bbox.hh> # include <mln/util/object_id.hh> +# include <mln/value/int_u.hh> # include <scribo/core/tag/component.hh> # include <scribo/core/tag/line.hh> @@ -124,6 +125,9 @@ namespace scribo bool indented() const; + const std::string& text() const; + void update_text(const std::string& str); + bool is_valid() const; @@ -232,6 +236,8 @@ namespace scribo bool indented_; + std::string text_; + // Line set holding this element. line_set<L> holder_; @@ -295,6 +301,8 @@ namespace scribo indented_ = other.indented(); + text_ = other.text(); + holder_ = other.holder(); } @@ -578,6 +586,21 @@ namespace scribo return indented_; } + template <typename L> + const std::string& + line_info<L>::text() const + { + return text_; + } + + + template <typename L> + void + line_info<L>::update_text(const std::string& str) + { + text_ = str; + } + template <typename L> bool @@ -833,7 +856,9 @@ namespace scribo else char_width_ = char_width.to_result(); - + // FIXME: There is a bug here when the input document is too + // large. The baselines indexes are too high for the type used + // in the median accumulator! baseline_ = absolute_baseline.to_result(); meanline_ = absolute_meanline.to_result(); x_height_ = absolute_baseline - absolute_meanline + 1; @@ -890,6 +915,7 @@ namespace scribo << ", orientation=" << info.orientation() << ", reading_orientation=" << info.reading_orientation() << ", indented=" << info.indented() + << ", text=" << info.text() << ")" << std::endl; } diff --git a/scribo/text/recognition.hh b/scribo/text/recognition.hh index fcc83dd..f8d8f4f 100644 --- a/scribo/text/recognition.hh +++ b/scribo/text/recognition.hh @@ -81,9 +81,7 @@ namespace scribo // template <typename L> void - recognition(const line_set<L>& lines, - const char *language, - const char *output_file = 0); + recognition(line_set<L>& lines, const char *language); /// Recognize text from an image. @@ -91,7 +89,7 @@ namespace scribo void recognition(const Image& line, const char *language, - const char *output_file = 0); + const std::string& output_file = 0); @@ -102,9 +100,7 @@ namespace scribo template <typename L> void - recognition(const line_set<L>& lines, - const char *language, - const char *output_file = 0) + recognition(line_set<L>& lines, const char *language) { trace::entering("scribo::text::recognition"); @@ -121,9 +117,6 @@ namespace scribo 0, 9, 0, 9, 0 }; w_window2d_int dmap_win = mln::make::w_window2d_int(vals); - std::ofstream file; - if (output_file != 0) - file.open(output_file); /// Use text bboxes with Tesseract for_all_lines(i, lines) @@ -141,7 +134,7 @@ namespace scribo box.enlarge(2); I text_ima(box); - data::fill(text_ima, true); + data::fill(text_ima, false); // Careful : background is set to 'False' const component_set<L>& comp_set = lines.components(); @@ -152,7 +145,7 @@ namespace scribo { unsigned comp_id = comps(e); data::fill(((text_ima | comp_set(comp_id).bbox()).rw() | (pw::value(lbl) == pw::cst(comp_id))).rw(), - false); + true); } /// Improve text quality. @@ -161,8 +154,6 @@ namespace scribo I text_ima_cleaned = text::clean(lines(i), text_ima); // mln::io::pbm::save(text_ima_cleaned, mln::debug::filename("line.pbm", debug_id++)); - // Setting objects to 'True' - logical::not_inplace(text_ima_cleaned); // Make sure there is no border. border::resize(text_ima_cleaned, 0); @@ -180,30 +171,16 @@ namespace scribo if (s != 0) { - std::cerr << s << std::endl; - if (output_file != 0) - { - std::string str(s); - str = str.substr(0, str.length() - 1); - file << lines(i).bbox().pmin().row() - << " " - << lines(i).bbox().pmin().col() - << " " - << lines(i).bbox().pmax().row() - << " " - << lines(i).bbox().pmax().col() - << " " - << str; - } + std::cerr << s << std::endl; + std::string str(s); + str = str.substr(0, str.length() - 2); + lines(i).update_text(str); } - // The string has been allocated by Tesseract. We must free it. + // The string has been allocated by Tesseract. It must be released. free(s); } - if (output_file != 0) - file.close(); - trace::exiting("scribo::text::recognition"); } @@ -212,7 +189,7 @@ namespace scribo void recognition(const Image& line_, const char *language, - const char *output_file = 0) + const std::string& output_file = 0) { trace::entering("scribo::text::recognition"); @@ -223,8 +200,8 @@ namespace scribo TessBaseAPI::InitWithLanguage(NULL, NULL, language, NULL, false, 0, NULL); std::ofstream file; - if (output_file != 0) - file.open(output_file); + if (!output_file.empty()) + file.open(output_file.c_str()); mln_domain(I) box = line.domain(); // Make sure characters are isolated from the borders. @@ -252,7 +229,7 @@ namespace scribo if (s != 0) { std::cout << s << std::endl; - if (output_file != 0) + if (!output_file.empty()) { std::string str(s); str = str.substr(0, str.length() - 1); @@ -271,7 +248,7 @@ namespace scribo // The string has been allocated by Tesseract. We must free it. free(s); - if (output_file != 0) + if (!output_file.empty()) file.close(); trace::exiting("scribo::text::recognition"); -- 1.5.6.5

1 0

last-svn-commit-125-g21af64a Improve debug outputs in Sauvola and make binarization tools compile again.
by Guillaume Lazzara 25 May '10

25 May '10

* binarization/internal/first_pass_functor.hh, * binarization/sauvola_ms.hh, * binarization/sauvola_threshold_image.hh: Add debug outputs if SCRIBO_SAUVOLA_DEBUG flag is set. * binarization/sauvola_ms_split.hh: Remove lambda argument. * binarization/sauvola_threshold_image_debug.hh: Add the threshold image as debug output. * src/binarization/Makefile.am: Add sauvola_ms_debug. * src/binarization/sauvola_ms_debug.cc: New. * src/binarization/fg_sauvola_ms.cc, * src/binarization/pgm_sauvola_ms.cc, * src/binarization/ppm_fg_sauvola_ms.cc, * src/binarization/ppm_sauvola_ms.cc, * src/binarization/ppm_sauvola_ms_split.cc, * src/binarization/sauvola_debug.cc, * src/binarization/sauvola_ms.cc, * src/binarization/sauvola_ms_split.cc: Make compile again. --- scribo/ChangeLog | 27 +++++ scribo/binarization/internal/first_pass_functor.hh | 31 +++++- scribo/binarization/sauvola_ms.hh | 98 ++++++----------- scribo/binarization/sauvola_ms_split.hh | 23 ++-- scribo/binarization/sauvola_threshold_image.hh | 115 +++++++++++++++++++- .../binarization/sauvola_threshold_image_debug.hh | 29 ++++-- scribo/src/binarization/Makefile.am | 11 ++- scribo/src/binarization/fg_sauvola_ms.cc | 17 ++-- scribo/src/binarization/pgm_sauvola_ms.cc | 7 +- scribo/src/binarization/ppm_fg_sauvola_ms.cc | 16 ++- scribo/src/binarization/ppm_sauvola_ms.cc | 13 ++- scribo/src/binarization/ppm_sauvola_ms_split.cc | 8 +- scribo/src/binarization/sauvola_debug.cc | 19 +++- scribo/src/binarization/sauvola_ms.cc | 15 ++- .../{sauvola_ms.cc => sauvola_ms_debug.cc} | 38 ++++++- scribo/src/binarization/sauvola_ms_split.cc | 6 +- 16 files changed, 329 insertions(+), 144 deletions(-) copy scribo/src/binarization/{sauvola_ms.cc => sauvola_ms_debug.cc} (74%) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index e44137e..76decb5 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,30 @@ +2010-05-25 Guillaume Lazzara <z(a)lrde.epita.fr> + + Improve debug outputs in Sauvola and make binarization tools + compile again. + + * binarization/internal/first_pass_functor.hh, + * binarization/sauvola_ms.hh, + * binarization/sauvola_threshold_image.hh: Add debug outputs if + SCRIBO_SAUVOLA_DEBUG flag is set. + + * binarization/sauvola_ms_split.hh: Remove lambda argument. + + * binarization/sauvola_threshold_image_debug.hh: Add the threshold + image as debug output. + + * src/binarization/Makefile.am: Add sauvola_ms_debug. + * src/binarization/sauvola_ms_debug.cc: New. + + * src/binarization/fg_sauvola_ms.cc, + * src/binarization/pgm_sauvola_ms.cc, + * src/binarization/ppm_fg_sauvola_ms.cc, + * src/binarization/ppm_sauvola_ms.cc, + * src/binarization/ppm_sauvola_ms_split.cc, + * src/binarization/sauvola_debug.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_split.cc: Make compile again. + 2010-05-04 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes for Nuxeo/XWiki. diff --git a/scribo/binarization/internal/first_pass_functor.hh b/scribo/binarization/internal/first_pass_functor.hh index 3455060..4d47d94 100644 --- a/scribo/binarization/internal/first_pass_functor.hh +++ b/scribo/binarization/internal/first_pass_functor.hh @@ -42,6 +42,13 @@ namespace scribo namespace internal { +# ifdef SCRIBO_SAUVOLA_DEBUG + // Global debug images. + extern image2d<value::int_u8> debug_k; + extern image2d<float> debug_s_n; + extern image2d<float> debug_k_l; +# endif // ! SCRIBO_SAUVOLA_DEBUG + using namespace mln; @@ -81,6 +88,13 @@ namespace scribo initialize(t_sub, input); initialize(parent, input); initialize(msk, input); + +# ifdef SCRIBO_SAUVOLA_DEBUG + initialize(debug_k, input); + initialize(debug_s_n, input); + initialize(debug_k_l, input); +# endif // ! SCRIBO_SAUVOLA_DEBUG + extension::fill(msk, false); initialize(card, input); @@ -96,9 +110,20 @@ namespace scribo unsigned p = pxl.offset(); - value::int_u8 t_p = sauvola_threshold_formula(mean, stddev, - K_, - SCRIBO_DEFAULT_SAUVOLA_R); +# ifdef SCRIBO_SAUVOLA_DEBUG + value::int_u8 + t_p = sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R, + debug_k.element(p), + debug_s_n.element(p), + debug_k_l.element(p)); +# else + value::int_u8 + t_p = sauvola_threshold_formula(mean, stddev, + K_, + SCRIBO_DEFAULT_SAUVOLA_R); +# endif // SCRIBO_SAUVOLA_DEBUG msk.element(p) = input.element(p) < t_p; diff --git a/scribo/binarization/sauvola_ms.hh b/scribo/binarization/sauvola_ms.hh index 621c638..0390180 100644 --- a/scribo/binarization/sauvola_ms.hh +++ b/scribo/binarization/sauvola_ms.hh @@ -54,9 +54,6 @@ # include <mln/extension/adjust.hh> -// FIXME: to be removed later... -# include <mln/io/pgm/save.hh> - # include <scribo/subsampling/integral_single_image.hh> # include <scribo/core/macros.hh> @@ -66,6 +63,14 @@ # include <scribo/canvas/integral_browsing.hh> +# ifdef SCRIBO_SAUVOLA_DEBUG +# include <mln/io/pgm/save.hh> +# include <mln/data/saturate.hh> +# include <mln/data/convert.hh> +# include <mln/arith/times.hh> +# endif // ! SCRIBO_SAUVOLA_DEBUG + + namespace scribo { @@ -116,9 +121,12 @@ namespace scribo using namespace mln; - // FIXME: to be removed later... +# ifdef SCRIBO_SAUVOLA_DEBUG char* scale_image_output = 0; - + char* k_image_output = 0; + char* s_n_image_output = 0; + char* k_l_image_output = 0; +# endif // ! SCRIBO_SAUVOLA_DEBUG template <typename V> V my_find_root(image2d<V>& parent, const V& x) @@ -906,9 +914,10 @@ namespace scribo // Propagate scale values. e_2 = transform::influence_zone_geodesic(e_2, c8()); - // FIXME: Remove or make it better... +# ifdef SCRIBO_SAUVOLA_DEBUG if (internal::scale_image_output) io::pgm::save(e_2, internal::scale_image_output); +# endif // ! SCRIBO_SAUVOLA_DEBUG // Binarize image2d<bool> @@ -921,67 +930,9 @@ namespace scribo } // end of namespace scribo::binarization::impl::generic - template <typename I> - mln_ch_value(I,bool) - sauvola_ms_rgb8(const Image& input_1_, unsigned w_1, - unsigned s, double K) - { - const I& input_1 = exact(input_1_); - - mln_ch_value(I, value::int_u8) gima; - gima = data::transform(input_1, mln::fun::v2v::rgb_to_int_u<8>()); - - mln_ch_value(I, bool) - output = generic::sauvola_ms(gima, w_1, s, K); - - return output; - } - - } // end of namespace scribo::binarization::impl - - // Dispatch - - namespace internal - { - - template <typename I> - mln_ch_value(I,bool) - sauvola_ms_dispatch(const mln_value(I)&, - const Image& input_1, unsigned w_1, - unsigned s, double K) - { - return impl::generic::sauvola_ms(input_1, w_1, s, K); - } - - - - template <typename I> - mln_ch_value(I,bool) - sauvola_ms_dispatch(const value::rgb8&, - const Image& input_1, unsigned w_1, - unsigned s, double K) - { - return impl::sauvola_ms_rgb8(input_1, w_1, s, K); - } - - - template <typename I> - mln_ch_value(I,bool) - sauvola_ms_dispatch(const Image& input_1, unsigned w_1, - unsigned s, double K) - { - typedef mln_value(I) V; - return sauvola_ms_dispatch(V(), input_1, w_1, s, K); - } - - - } // end of namespace scribo::binarization::internal - - - // Facade template <typename I> @@ -992,9 +943,26 @@ namespace scribo trace::entering("scribo::binarization::sauvola_ms"); mln_precondition(exact(input_1_).is_valid()); + // Gray level images ONLY. + mlc_is_not_a(mln_value(I), value::Vectorial)::check(); + mlc_is_not(mln_value(I), bool)::check(); mln_ch_value(I,bool) - output = internal::sauvola_ms_dispatch(input_1_, w_1, s, K); + output = impl::generic::sauvola_ms(exact(input_1_), w_1, s, K); + + +# ifdef SCRIBO_SAUVOLA_DEBUG + if (internal::k_image_output) + io::pgm::save(internal::debug_k, internal::k_image_output); + + if (internal::s_n_image_output) + io::pgm::save(data::saturate(value::int_u8(), internal::debug_s_n * 100), + internal::s_n_image_output); + if (internal::k_l_image_output) + io::pgm::save(data::saturate(value::int_u8(), internal::debug_k_l * 10), + internal::k_l_image_output); +# endif // ! SCRIBO_SAUVOLA_DEBUG + trace::exiting("scribo::binarization::sauvola_ms"); return output; diff --git a/scribo/binarization/sauvola_ms_split.hh b/scribo/binarization/sauvola_ms_split.hh index de8517c..ac06a39 100644 --- a/scribo/binarization/sauvola_ms_split.hh +++ b/scribo/binarization/sauvola_ms_split.hh @@ -54,24 +54,23 @@ namespace scribo /*! \brief Binarize a color image merging the binarization of each component using Sauvola's algorithm. - \param[in] input_1 A grayscale or a color image. + \param[in] input_1 A color image. \param[in] w_1 The window size used to compute stats. \param[in] s The scale factor used for the first subscaling. - \param[in] lambda_min_1 Size of the objects kept at scale 1. \param[in] min_ntrue A site is set to 'True' in the output if it is set to 'True' at least \p min_ntrue components. Possible values: 1, 2, 3. \param[in] K Sauvola's formula parameter. - \p w_1 and \p lambda_min_1 are expressed according to the image - at scale 0, i.e. the original size. + \p w_1 is expressed according to the image at scale 0, i.e. the + original size. \return A Boolean image. */ template <typename I> mln_ch_value(I, bool) sauvola_ms_split(const Image& input_1_, unsigned w_1, - unsigned s, unsigned lambda_min_1, unsigned min_ntrue, + unsigned s, unsigned min_ntrue, double K); @@ -80,7 +79,7 @@ namespace scribo template <typename I> mln_ch_value(I, bool) sauvola_ms_split(const Image& input_1_, unsigned w_1, - unsigned s, unsigned lambda_min_1, unsigned min_ntrue); + unsigned s, unsigned min_ntrue); @@ -90,7 +89,7 @@ namespace scribo template <typename I> mln_ch_value(I, bool) sauvola_ms_split(const Image& input_1_, unsigned w_1, - unsigned s, unsigned lambda_min_1, unsigned min_ntrue, + unsigned s, unsigned min_ntrue, double K) { trace::entering("scribo::binarization::sauvola_ms_split"); @@ -109,9 +108,9 @@ namespace scribo bin_t r_b, g_b, b_b; - r_b = impl::generic::sauvola_ms(r_i, w_1, s, lambda_min_1, K); - g_b = impl::generic::sauvola_ms(g_i, w_1, s, lambda_min_1, K); - b_b = impl::generic::sauvola_ms(b_i, w_1, s, lambda_min_1, K); + r_b = impl::generic::sauvola_ms(r_i, w_1, s, K); + g_b = impl::generic::sauvola_ms(g_i, w_1, s, K); + b_b = impl::generic::sauvola_ms(b_i, w_1, s, K); border::resize(r_b, input_1.border()); border::resize(g_b, input_1.border()); @@ -153,9 +152,9 @@ namespace scribo template <typename I> mln_ch_value(I, bool) sauvola_ms_split(const Image& input_1, unsigned w_1, - unsigned s, unsigned lambda_min_1, unsigned min_ntrue) + unsigned s, unsigned min_ntrue) { - return sauvola_ms_split(input_1, w_1, s, lambda_min_1, min_ntrue, + return sauvola_ms_split(input_1, w_1, s, min_ntrue, SCRIBO_DEFAULT_SAUVOLA_K); } diff --git a/scribo/binarization/sauvola_threshold_image.hh b/scribo/binarization/sauvola_threshold_image.hh index 88b3842..c45fc98 100644 --- a/scribo/binarization/sauvola_threshold_image.hh +++ b/scribo/binarization/sauvola_threshold_image.hh @@ -119,6 +119,15 @@ namespace scribo namespace internal { +# ifdef SCRIBO_SAUVOLA_DEBUG + // Declare debug images. + image2d<value::int_u8> debug_k; + image2d<float> debug_s_n; + image2d<float> debug_k_l; +# endif // ! SCRIBO_SAUVOLA_DEBUG + + + /*! \brief compute Sauvola's threshold applying directly the formula. \param[in] m_x_y Mean value. @@ -131,12 +140,96 @@ namespace scribo \return A threshold. */ +# ifdef SCRIBO_SAUVOLA_DEBUG + inline + double + sauvola_threshold_formula(const double m_x_y, const double s_x_y, + const double K, const double R, + value::int_u8& dbg_k, float& dbg_s_n, + float& dbg_k_l) +# else inline double sauvola_threshold_formula(const double m_x_y, const double s_x_y, const double K, const double R) +# endif // ! SCRIBO_SAUVOLA_DEBUG { - return m_x_y * (1.0 + K * ((s_x_y / R) - 1.0)); +// double s_N = s_x_y / 256; + double K_2 = K; +// double K_2 = exp(K * log(s_x_y / 256)); +// if (s_x_y < 30) +// K_2 = 0.01; +// else if (s_x_y < 80) +// K_2 = 0.1; +// else if (s_x_y > 80) +// K_2 = K; + + +// Results_0.1_0.34 +// +// if (s_N < 0.1f) +// { +// K_2 = 0.1f; +// dbg_k = 0; +// dbg_s_n = s_N; +// } +// else if (s_N > 0.34) +// { +// K_2 = 0.34; +// dbg_k = 255; +// dbg_s_n = s_N; +// } +// else +// { +// K_2 = s_N; +// dbg_k = 150; +// dbg_s_n = s_N; +// } + + +// const double k_min = 0.1f; +// const double k_max = 1.0f; +// const double s_1 = 0.05f; +// const double s_2 = 0.50f; + +// double k_b = (k_max - k_min) / (double)(s_2 - s_1); +// double k_a = 0.1f - s_1 * k_b; +// K_2 = k_a + k_b * s_N; + +// dbg_s_n = s_N; +// if (K_2 < k_min) +// dbg_k = 0; +// else if (K_2 > k_max) +// dbg_k = 255; +// else +// dbg_k = 150; + + + +// if (s_N < 0.1f) +// { +// K_2 = 0.1f; +// dbg_k = 0; +// dbg_s_n = s_N; +// dbg_k_l = 0.1; +// } +// else +// { +// // double K_L = ((long int)((s_N * 11) + 0.49999)) * s_N; +// double K_L = s_N * K / 3.0f; +// // K_2 = std::min(K_L, (double) 1.0); +// K_2 = K_L; +// if (K_L > 1.0f) +// dbg_k = 255; +// else +// dbg_k = 150; + +// dbg_s_n = s_N; +// dbg_k_l = K_L; +// } + + + return m_x_y * (1.0 + K_2 * ((s_x_y / R) - 1.0)); } @@ -146,9 +239,15 @@ namespace scribo double sauvola_threshold_formula(double m_x_y, double s_x_y) { - return sauvola_threshold_formula(m_x_y, s_x_y, - SCRIBO_DEFAULT_SAUVOLA_K, - SCRIBO_DEFAULT_SAUVOLA_R); +# ifdef SCRIBO_SAUVOLA_DEBUG +# warning "This overload of sauvola_threshold_formula is disabled in debug mode!" + std::cout << "This overload of sauvola_threshold_formula is disabled in debug mode!" << std::endl; + return 0; +# else + return sauvola_threshold_formula(m_x_y, s_x_y, + SCRIBO_DEFAULT_SAUVOLA_K, + SCRIBO_DEFAULT_SAUVOLA_R); +# endif // !SCRIBO_SAUVOLA_DEBUG } @@ -208,7 +307,11 @@ namespace scribo double s_x_y = std::sqrt((s_x_y_tmp - (m_x_y_tmp * m_x_y_tmp) / wh) / (wh - 1.f)); // Thresholding. +# ifdef SCRIBO_SAUVOLA_DEBUG + double t_x_y = sauvola_threshold_formula(m_x_y, s_x_y, K, R, debug_k(p), debug_s_n(p), debug_k_l(p)); +# else double t_x_y = sauvola_threshold_formula(m_x_y, s_x_y, K, R); +# endif // ! SCRIBO_SAUVOLA_DEBUG return t_x_y; } @@ -252,7 +355,11 @@ namespace scribo double s_x_y = std::sqrt((s_x_y_tmp - (m_x_y_tmp * m_x_y_tmp) / wh) / (wh - 1.f)); // Thresholding. +# ifdef SCRIBO_SAUVOLA_DEBUG + double t_x_y = sauvola_threshold_formula(m_x_y, s_x_y, K, R, debug_k(p), debug_s_n(p), debug_k_l(p)); +# else double t_x_y = sauvola_threshold_formula(m_x_y, s_x_y, K, R); +# endif // !SCRIBO_SAUVOLA_DEBUG return t_x_y; } diff --git a/scribo/binarization/sauvola_threshold_image_debug.hh b/scribo/binarization/sauvola_threshold_image_debug.hh index 359bb57..a507920 100644 --- a/scribo/binarization/sauvola_threshold_image_debug.hh +++ b/scribo/binarization/sauvola_threshold_image_debug.hh @@ -126,7 +126,7 @@ namespace scribo template <typename P, typename M, typename J> double compute_sauvola_threshold(const P& p, - M& mean, M& stddev, + M& mean, M& stddev, M& thres, const J& simple, const J& squared, int win_width, double K, double R) @@ -171,6 +171,8 @@ namespace scribo // Thresholding. double t_x_y = sauvola_threshold_formula(m_x_y, s_x_y, K, R); + thres(p) = t_x_y; + return t_x_y; } @@ -205,6 +207,7 @@ namespace scribo unsigned window_size, double K, Image<M>& mean_, Image<M>& stddev_, + Image<M>& thres_, Image<J>& simple_, Image<J>& squared_) { @@ -213,6 +216,7 @@ namespace scribo const I& input = exact(input_); M& mean = exact(mean_); M& stddev = exact(stddev_); + M& thres = exact(thres_); J& simple = exact(simple_); J& squared = exact(squared_); @@ -235,7 +239,7 @@ namespace scribo for(def::coord col = 0; col < ncols; ++col) output.at_(row, col) = internal::compute_sauvola_threshold(P(row, col), - mean, stddev, + mean, stddev, thres, simple, squared, window_size, K, SCRIBO_DEFAULT_SAUVOLA_R); @@ -255,12 +259,13 @@ namespace scribo unsigned window_size, double K, Image<M>& mean, Image<M>& stddev, + Image<M>& thres, Image<J>& simple, Image<J>& squared) { return impl::generic::sauvola_threshold_image_debug(input, window_size, K, - mean, stddev, + mean, stddev, thres, simple, squared); } @@ -272,6 +277,7 @@ namespace scribo unsigned window_size, double K, Image<M>& mean, Image<M>& stddev, + Image<M>& thres, Image<J>& simple, Image<J>& squared) { @@ -284,7 +290,7 @@ namespace scribo mln_ch_value(I, value::int_u8) output = impl::generic::sauvola_threshold_image_debug(gima, window_size, K, - mean, stddev, + mean, stddev, thres, simple, squared); trace::exiting("scribo::binarization::impl::sauvola_threshold_image_debug_rgb8"); @@ -309,12 +315,12 @@ namespace scribo const I& input, unsigned window_size, double K, - M& mean, M& stddev, + M& mean, M& stddev, M& thres, J& simple, J& squared) { return impl::sauvola_threshold_image_debug_gl(input, window_size, K, - mean, stddev, + mean, stddev, thres, simple, squared); } @@ -324,7 +330,7 @@ namespace scribo sauvola_threshold_image_debug_dispatch(const value::rgb8&, const I& input, unsigned window_size, double K, - M& mean, M& stddev, + M& mean, M& stddev, M& thres, J& simple, J& squared) { @@ -337,7 +343,7 @@ namespace scribo inline mln_ch_value(I, value::int_u8) sauvola_threshold_image_debug_dispatch(const mln_value(I)&, const I& input, - M& mean, M& stddev, + M& mean, M& stddev, M& thres, unsigned window_size, double K, J& simple, @@ -360,6 +366,7 @@ namespace scribo sauvola_threshold_image_debug(const Image& input, unsigned window_size, double K, Image<M>& mean, Image<M>& stddev, + Image<M>& thres, Image<J>& simple, Image<J>& squared) { @@ -376,6 +383,7 @@ namespace scribo K, exact(mean), exact(stddev), + exact(thres), exact(simple), exact(squared)); @@ -389,14 +397,15 @@ namespace scribo mln_ch_value(I, value::int_u8) sauvola_threshold_image_debug(const Image& input, unsigned window_size, double K, - Image<M>& mean, Image<M>& stddev) + Image<M>& mean, Image<M>& stddev, + Image<M>& thres) { mln_ch_value(I, double) simple = init_integral_image(input, scribo::internal::identity_), squared = init_integral_image(input, scribo::internal::square_); return sauvola_threshold_image_debug(input, window_size, K, - mean, stddev, + mean, stddev, thres, simple, squared); } diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index ccedd77..efc35dc 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -43,7 +44,7 @@ if HAVE_MAGICKXX sauvola \ sauvola_debug \ sauvola_ms \ - sauvola_ms_static \ + sauvola_ms_debug \ sauvola_ms_split fg_sauvola_ms_SOURCES = fg_sauvola_ms.cc @@ -71,6 +72,12 @@ if HAVE_MAGICKXX sauvola_ms_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) + sauvola_ms_debug_SOURCES = sauvola_ms_debug.cc + sauvola_ms_debug_CPPFLAGS = $(AM_CPPFLAGS) -DSCRIBO_SAUVOLA_DEBUG \ + $(MAGICKXX_CPPFLAGS) + sauvola_ms_debug_LDFLAGS = $(AM_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) + sauvola_ms_split_SOURCES = sauvola_ms_split.cc sauvola_ms_split_CPPFLAGS = $(AM_CPPFLAGS) \ diff --git a/scribo/src/binarization/fg_sauvola_ms.cc b/scribo/src/binarization/fg_sauvola_ms.cc index 9c606d6..cad605f 100644 --- a/scribo/src/binarization/fg_sauvola_ms.cc +++ b/scribo/src/binarization/fg_sauvola_ms.cc @@ -35,7 +35,7 @@ bool check_args(int argc, char * argv[]) { - if (argc != 7) + if (argc != 6) return false; int s = atoi(argv[4]); @@ -58,7 +58,6 @@ const char *args_desc[][2] = { "lambda", "Lambda used to split bg/fg." }, { "w", "Window size at scale 1. (Common value: 101)" }, { "s", "First subsampling ratio (Common value: 3)." }, - { "min_area", "Minimum object area at scale 1 (Common value: 67)" }, {0, 0} }; @@ -73,7 +72,7 @@ int main(int argc, char *argv[]) if (!check_args(argc, argv)) return scribo::debug::usage(argv, "Multi-Scale Binarization based on Sauvola's algorithm. Performs a binarization on each component of the color image and merges the results.", - "input.* output.pbm w s area_threshold", + "input.* output.pbm w s", args_desc); trace::entering("main"); @@ -86,18 +85,22 @@ int main(int argc, char *argv[]) // First subsampling scale. unsigned s = atoi(argv[4]); - // Lambda value - unsigned lambda_min_1 = atoi(argv[5]); - + // Load image2d<value::rgb8> input_1; io::magick::load(input_1, argv[1]); + // Split foreground/background image2d<value::rgb8> fg = scribo::preprocessing::split_bg_fg(input_1, lambda, 32).first(); + // Convert to Gray level image. + image2d<value::int_u8> + fg_gl = data::transform(fg, mln::fun::v2v::rgb_to_int_u<8>()); + + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms(fg, w_1, s, lambda_min_1, SCRIBO_DEFAULT_SAUVOLA_K); + output = scribo::binarization::sauvola_ms(fg_gl, w_1, s, SCRIBO_DEFAULT_SAUVOLA_K); io::pbm::save(output, argv[6]); } diff --git a/scribo/src/binarization/pgm_sauvola_ms.cc b/scribo/src/binarization/pgm_sauvola_ms.cc index fefdd6a..38ff2e6 100644 --- a/scribo/src/binarization/pgm_sauvola_ms.cc +++ b/scribo/src/binarization/pgm_sauvola_ms.cc @@ -93,10 +93,6 @@ int main(int argc, char *argv[]) else s = 3u; - // Lambda value - unsigned lambda_min_1 = 67; // FIXME: should be adapted to the - // window size. - double k; if (argc >= 6) k = atof(argv[5]); @@ -107,8 +103,7 @@ int main(int argc, char *argv[]) io::pgm::load(input_1, argv[1]); image2d<bool> - output = scribo::binarization::sauvola_ms(input_1, w_1, s, - lambda_min_1, k); + output = scribo::binarization::sauvola_ms(input_1, w_1, s, k); io::pbm::save(output, argv[2]); } diff --git a/scribo/src/binarization/ppm_fg_sauvola_ms.cc b/scribo/src/binarization/ppm_fg_sauvola_ms.cc index 65e8621..33a11ac 100644 --- a/scribo/src/binarization/ppm_fg_sauvola_ms.cc +++ b/scribo/src/binarization/ppm_fg_sauvola_ms.cc @@ -97,10 +97,6 @@ int main(int argc, char *argv[]) else s = 3u; - // Lambda value - unsigned lambda_min_1 = 67; // FIXME: should be adapted to the - // window size. - double k; if (argc >= 7) k = atof(argv[6]); @@ -108,15 +104,23 @@ int main(int argc, char *argv[]) k = 0.34f; - + // Load image2d<value::rgb8> input_1; io::ppm::load(input_1, argv[1]); + + // Split foreground/background image2d<value::rgb8> fg = scribo::preprocessing::split_bg_fg(input_1, lambda, 32).second(); + + // Convert to Gray level image. + image2d<value::int_u8> + fg_gl = data::transform(fg, mln::fun::v2v::rgb_to_int_u<8>()); + + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms(fg, w_1, s, lambda_min_1, k); + output = scribo::binarization::sauvola_ms(fg_gl, w_1, s, k); io::pbm::save(output, argv[2]); } diff --git a/scribo/src/binarization/ppm_sauvola_ms.cc b/scribo/src/binarization/ppm_sauvola_ms.cc index f2cbb6f..9e68b0e 100644 --- a/scribo/src/binarization/ppm_sauvola_ms.cc +++ b/scribo/src/binarization/ppm_sauvola_ms.cc @@ -93,22 +93,23 @@ int main(int argc, char *argv[]) else s = 3u; - // Lambda value - unsigned lambda_min_1 = 67; // FIXME: should be adapted to the - // window size. - double k; if (argc >= 6) k = atof(argv[5]); else k = 0.34f; + // Load image2d<value::rgb8> input_1; io::ppm::load(input_1, argv[1]); + // Convert to Gray level image. + image2d<value::int_u8> + input_1_gl = data::transform(input_1, mln::fun::v2v::rgb_to_int_u<8>()); + + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms(input_1, w_1, s, - lambda_min_1, k); + output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s, k); io::pbm::save(output, argv[2]); } diff --git a/scribo/src/binarization/ppm_sauvola_ms_split.cc b/scribo/src/binarization/ppm_sauvola_ms_split.cc index b1f10ea..84e4abf 100644 --- a/scribo/src/binarization/ppm_sauvola_ms_split.cc +++ b/scribo/src/binarization/ppm_sauvola_ms_split.cc @@ -101,9 +101,6 @@ int main(int argc, char *argv[]) else min_ntrue = 2; - // Lambda value - unsigned lambda_min_1 = 67; // FIXME: should be adapted to the - // window size. double k; if (argc >= 7) @@ -112,14 +109,15 @@ int main(int argc, char *argv[]) k = 0.34f; - + // Load image2d<value::rgb8> input_1; io::ppm::load(input_1, argv[1]); std::cout << "Using w=" << w_1 << " - s=" << s << " - min_ntrue=" << min_ntrue << " - k=" << k << std::endl; + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms_split(input_1, w_1, s, lambda_min_1, min_ntrue, k); + output = scribo::binarization::sauvola_ms_split(input_1, w_1, s, min_ntrue, k); io::pbm::save(output, argv[2]); } diff --git a/scribo/src/binarization/sauvola_debug.cc b/scribo/src/binarization/sauvola_debug.cc index 8bbc19c..b17dd13 100644 --- a/scribo/src/binarization/sauvola_debug.cc +++ b/scribo/src/binarization/sauvola_debug.cc @@ -28,6 +28,10 @@ #include <mln/io/pbm/save.hh> #include <mln/io/pgm/save.hh> +#include <mln/data/stretch.hh> +#include <mln/data/convert.hh> +#include <mln/data/saturate.hh> + #include <scribo/binarization/local_threshold.hh> #include <scribo/binarization/sauvola_threshold_image_debug.hh> #include <scribo/debug/usage.hh> @@ -82,9 +86,10 @@ int main(int argc, char *argv[]) io::magick::load(input, argv[1]); - image2d<value::int_u8> mean, stddev; + image2d<float> mean, stddev, thres; initialize(mean, input); initialize(stddev, input); + initialize(thres, input); image2d<value::int_u8> gima = data::transform(input, @@ -94,12 +99,18 @@ int main(int argc, char *argv[]) image2d<bool> out = local_threshold(gima, sauvola_threshold_image_debug(gima, w, k, - mean, stddev)); + mean, stddev, thres)); io::pbm::save(out, argv[2]); - io::pgm::save(mean, argv[3]); - io::pgm::save(stddev, argv[4]); + + io::pgm::save(data::stretch(value::int_u8(), mean), argv[3]); + io::pgm::save(data::stretch(value::int_u8(), stddev), argv[4]); + + io::pgm::save(data::saturate(value::int_u8(), mean), "mean_saturated.pgm"); + io::pgm::save(data::saturate(value::int_u8(), stddev), "stddev_saturated.pgm"); + + io::pgm::save(data::saturate(value::int_u8(), thres), "thres_saturated.pgm"); trace::exiting("main"); } diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 3983793..984ddee 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -34,7 +34,7 @@ bool check_args(int argc, char * argv[]) { - if (argc < 3 || argc > 7) + if (argc < 3 || argc > 6) return false; if (argc >= 5) @@ -75,7 +75,7 @@ int main(int argc, char *argv[]) if (!check_args(argc, argv)) return scribo::debug::usage(argv, "Multi-Scale Binarization based on Sauvola's algorithm.", - "input.* output.pbm <w> <s> <k> <scale.pgm>", + "input.* output.pbm <w> <s> <k>", args_desc); trace::entering("main"); @@ -100,14 +100,17 @@ int main(int argc, char *argv[]) else k = 0.34f; - if (argc >= 7) - scribo::binarization::internal::scale_image_output = argv[6]; - + // Load image2d<value::rgb8> input_1; io::magick::load(input_1, argv[1]); + // Convert to Gray level image. + image2d<value::int_u8> + input_1_gl = data::transform(input_1, mln::fun::v2v::rgb_to_int_u<8>()); + + // Binarize image2d<bool> - output = scribo::binarization::sauvola_ms(input_1, w_1, s, k); + output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s, k); io::pbm::save(output, argv[2]); } diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms_debug.cc similarity index 74% copy from scribo/src/binarization/sauvola_ms.cc copy to scribo/src/binarization/sauvola_ms_debug.cc index 3983793..80594dd 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -34,7 +34,7 @@ bool check_args(int argc, char * argv[]) { - if (argc < 3 || argc > 7) + if (argc < 3 || argc > 10) return false; if (argc >= 5) @@ -61,9 +61,23 @@ const char *args_desc[][2] = { "s", "First subsampling ratio (default: 3)." }, { "k", "Sauvola's formuale parameter (default: 0.34)" }, { "scale.pgm", "Image of scales used for binarization." }, + { "k_image.pgm", "Image of the parameter K used in the image." }, + { "sn_image.pgm", "Image of the parameter normalized standard deviation." }, + { "k_l_image.pgm", "Precise image of the parameter K used for each site." }, {0, 0} }; +namespace scribo +{ + namespace binarization + { + namespace internal + { + extern image2d<value::int_u8> debug_k; + } + } +} + @@ -75,7 +89,7 @@ int main(int argc, char *argv[]) if (!check_args(argc, argv)) return scribo::debug::usage(argv, "Multi-Scale Binarization based on Sauvola's algorithm.", - "input.* output.pbm <w> <s> <k> <scale.pgm>", + "input.* output.pbm <w> <s> <k> <scale.pgm> <k_image.pgm> <sn_image.pgm> <k_l_image.pgm", args_desc); trace::entering("main"); @@ -103,11 +117,29 @@ int main(int argc, char *argv[]) if (argc >= 7) scribo::binarization::internal::scale_image_output = argv[6]; + if (argc >= 8) + scribo::binarization::internal::k_image_output = argv[7]; + + if (argc >= 9) + scribo::binarization::internal::s_n_image_output = argv[8]; + + if (argc >= 10) + scribo::binarization::internal::k_l_image_output = argv[9]; + + + // Load image2d<value::rgb8> input_1; io::magick::load(input_1, argv[1]); + + // Convert to Gray level image. + image2d<value::int_u8> + input_1_gl = data::transform(input_1, mln::fun::v2v::rgb_to_int_u<8>()); + + + // Binarize. image2d<bool> - output = scribo::binarization::sauvola_ms(input_1, w_1, s, k); + output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s, k); io::pbm::save(output, argv[2]); } diff --git a/scribo/src/binarization/sauvola_ms_split.cc b/scribo/src/binarization/sauvola_ms_split.cc index af8b604..fc9e15c 100644 --- a/scribo/src/binarization/sauvola_ms_split.cc +++ b/scribo/src/binarization/sauvola_ms_split.cc @@ -101,10 +101,6 @@ int main(int argc, char *argv[]) else min_ntrue = 2; - // Lambda value - unsigned lambda_min_1 = 67; // FIXME: should be adapted to the - // window size. - double k; if (argc >= 7) k = atof(argv[6]); @@ -119,7 +115,7 @@ int main(int argc, char *argv[]) std::cout << "Using w=" << w_1 << " - s=" << s << " - min_ntrue=" << min_ntrue << " - k=" << k << std::endl; image2d<bool> - output = scribo::binarization::sauvola_ms_split(input_1, w_1, s, lambda_min_1, min_ntrue, k); + output = scribo::binarization::sauvola_ms_split(input_1, w_1, s, min_ntrue, k); io::pbm::save(output, argv[2]); } -- 1.5.6.5

1 0

branch features/maxtree updated: last-svn-commit-5-g7e6c289
by git＠lrde.epita.fr 21 May '10

21 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch features/maxtree has been updated via 7e6c28901e1f435aece4397023c422f2bab9e77e (commit) from 7d671b90984a791d6146eb5d510c1bf827ed073c (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 7e6c289 Add MLN_WO_GLOBAL_VARS directive that prevents globals vars to be ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 24 ++++++++++++++++++++++++ milena/mln/border/thickness.hh | 4 ++++ milena/mln/core/alias/dpoint1d.hh | 4 ++++ milena/mln/core/alias/dpoint2d.hh | 4 ++++ milena/mln/core/alias/dpoint3d.hh | 4 ++++ milena/mln/fun/v2v/hsl_to_rgb.hh | 3 +++ milena/mln/literal/black.hh | 4 ++++ milena/mln/literal/colors.hh | 4 ++++ milena/mln/literal/identity.hh | 4 ++++ milena/mln/literal/one.hh | 3 +++ milena/mln/literal/origin.hh | 6 +++++- milena/mln/literal/white.hh | 4 ++++ milena/mln/literal/zero.hh | 4 ++++ milena/mln/tag/init.hh | 4 ++++ milena/mln/trace/entering.hh | 3 +++ milena/mln/trace/quiet.hh | 5 ++++- milena/mln/trait/ch_value.hh | 8 ++++++++ milena/mln/util/ctree/node.hh | 14 ++++++++++++++ milena/mln/value/sign.hh | 10 +++++++--- 19 files changed, 111 insertions(+), 5 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-5-g7e6c289 Add MLN_WO_GLOBAL_VARS directive that prevents globals vars to be included.
by edwin carlinet 21 May '10

21 May '10

* mln/border/thickness.hh, * mln/core/alias/dpoint1d.hh, * mln/core/alias/dpoint2d.hh, * mln/core/alias/dpoint3d.hh, * mln/fun/v2v/hsl_to_rgb.hh, * mln/literal/black.hh, * mln/literal/colors.hh, * mln/literal/identity.hh, * mln/literal/one.hh, * mln/literal/origin.hh, * mln/literal/white.hh, * mln/literal/zero.hh, * mln/tag/init.hh, * mln/trace/entering.hh, * mln/trace/quiet.hh, * mln/trait/ch_value.hh, * mln/util/ctree/node.hh, * mln/value/sign.hh : Add MLN_WO_GLOBAL_VARS define. --- milena/ChangeLog | 24 ++++++++++++++++++++++++ milena/mln/border/thickness.hh | 4 ++++ milena/mln/core/alias/dpoint1d.hh | 4 ++++ milena/mln/core/alias/dpoint2d.hh | 4 ++++ milena/mln/core/alias/dpoint3d.hh | 4 ++++ milena/mln/fun/v2v/hsl_to_rgb.hh | 3 +++ milena/mln/literal/black.hh | 4 ++++ milena/mln/literal/colors.hh | 4 ++++ milena/mln/literal/identity.hh | 4 ++++ milena/mln/literal/one.hh | 3 +++ milena/mln/literal/origin.hh | 6 +++++- milena/mln/literal/white.hh | 4 ++++ milena/mln/literal/zero.hh | 4 ++++ milena/mln/tag/init.hh | 4 ++++ milena/mln/trace/entering.hh | 3 +++ milena/mln/trace/quiet.hh | 5 ++++- milena/mln/trait/ch_value.hh | 8 ++++++++ milena/mln/util/ctree/node.hh | 14 ++++++++++++++ milena/mln/value/sign.hh | 10 +++++++--- 19 files changed, 111 insertions(+), 5 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index bb30678..d07d036 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,27 @@ +2010-05-21 edwin carlinet <carlinet(a)lrde.epita.fr> + + Add MLN_WO_GLOBAL_VARS directive that prevents globals vars to be + included. + + * mln/border/thickness.hh, + * mln/core/alias/dpoint1d.hh, + * mln/core/alias/dpoint2d.hh, + * mln/core/alias/dpoint3d.hh, + * mln/fun/v2v/hsl_to_rgb.hh, + * mln/literal/black.hh, + * mln/literal/colors.hh, + * mln/literal/identity.hh, + * mln/literal/one.hh, + * mln/literal/origin.hh, + * mln/literal/white.hh, + * mln/literal/zero.hh, + * mln/tag/init.hh, + * mln/trace/entering.hh, + * mln/trace/quiet.hh, + * mln/trait/ch_value.hh, + * mln/util/ctree/node.hh, + * mln/value/sign.hh : Add MLN_WO_GLOBAL_VARS define. + 2010-05-04 edwin carlinet <carlinet(a)lrde.epita.fr> Tree build algorithms and tree management routines diff --git a/milena/mln/border/thickness.hh b/milena/mln/border/thickness.hh index cb1d913..1466e0c 100644 --- a/milena/mln/border/thickness.hh +++ b/milena/mln/border/thickness.hh @@ -43,8 +43,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + unsigned thickness = 3; +# endif // !MLN_WO_GLOBAL_VARS + # endif // !MLN_INCLUDE_ONLY } // end of namespace mln::border diff --git a/milena/mln/core/alias/dpoint1d.hh b/milena/mln/core/alias/dpoint1d.hh index 02da6b0..7ebd790 100644 --- a/milena/mln/core/alias/dpoint1d.hh +++ b/milena/mln/core/alias/dpoint1d.hh @@ -68,12 +68,16 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const dpoint1d before = dpoint1d( -1 ); const dpoint1d after = dpoint1d( +1 ); const dpoint1d ind_dec = before; const dpoint1d ind_inc = after; +# endif // !MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/alias/dpoint2d.hh b/milena/mln/core/alias/dpoint2d.hh index 2dbd864..1120154 100644 --- a/milena/mln/core/alias/dpoint2d.hh +++ b/milena/mln/core/alias/dpoint2d.hh @@ -71,6 +71,8 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const dpoint2d up = dpoint2d( -1, 0 ); const dpoint2d down = dpoint2d( +1, 0 ); const dpoint2d left = dpoint2d( 0, -1 ); @@ -81,6 +83,8 @@ namespace mln const dpoint2d down_left = dpoint2d( +1, -1 ); const dpoint2d down_right = dpoint2d( +1, +1 ); +# endif // !MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/core/alias/dpoint3d.hh b/milena/mln/core/alias/dpoint3d.hh index 3562aad..3d137fc 100644 --- a/milena/mln/core/alias/dpoint3d.hh +++ b/milena/mln/core/alias/dpoint3d.hh @@ -67,6 +67,8 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const dpoint3d sagittal_dec = dpoint3d( 0, 0, -1); const dpoint3d sagittal_inc = dpoint3d( 0, 0, +1); const dpoint3d axial_dec = dpoint3d( 0, -1, 0); @@ -74,6 +76,8 @@ namespace mln const dpoint3d coronal_dec = dpoint3d(-1, 0, 0); const dpoint3d coronal_inc = dpoint3d(+1, 0, 0); +# endif // !MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY diff --git a/milena/mln/fun/v2v/hsl_to_rgb.hh b/milena/mln/fun/v2v/hsl_to_rgb.hh index c26375e..7d66d31 100644 --- a/milena/mln/fun/v2v/hsl_to_rgb.hh +++ b/milena/mln/fun/v2v/hsl_to_rgb.hh @@ -85,11 +85,14 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + /// Global variables. /// \{ f_hsl_to_rgb_3x8_t f_hsl_to_rgb_3x8; f_hsl_to_rgb_3x16_t f_hsl_to_rgb_3x16; /// \} +# endif // !MLN_WO_GLOBAL_VARS /// This method implements the conversion from HSL to RGB as described by diff --git a/milena/mln/literal/black.hh b/milena/mln/literal/black.hh index 6ae33f7..ab05cae 100644 --- a/milena/mln/literal/black.hh +++ b/milena/mln/literal/black.hh @@ -55,8 +55,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const black_t& black = black_t(); +# endif + # ifdef MLN_NEW_VALUE_TYPES inline black_t::operator float() const diff --git a/milena/mln/literal/colors.hh b/milena/mln/literal/colors.hh index 8355174..d2f5ee2 100644 --- a/milena/mln/literal/colors.hh +++ b/milena/mln/literal/colors.hh @@ -152,6 +152,8 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const red_t& red = red_t(); const green_t& green = green_t(); @@ -180,6 +182,8 @@ namespace mln const olive_t& olive = olive_t(); +# endif + # endif } // end of namespace mln::literal diff --git a/milena/mln/literal/identity.hh b/milena/mln/literal/identity.hh index 535ee0a..f07081f 100644 --- a/milena/mln/literal/identity.hh +++ b/milena/mln/literal/identity.hh @@ -49,8 +49,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const identity_t& identity = identity_t(); +# endif // !MLN_WO_GLOBAL_VARS + # endif } // end of namespace mln::literal diff --git a/milena/mln/literal/one.hh b/milena/mln/literal/one.hh index 2db3551..94babc7 100644 --- a/milena/mln/literal/one.hh +++ b/milena/mln/literal/one.hh @@ -64,9 +64,12 @@ namespace mln return 1; } +# ifndef MLN_WO_GLOBAL_VARS const one_t& one = one_t(); +# endif // !MLN_WO_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::literal diff --git a/milena/mln/literal/origin.hh b/milena/mln/literal/origin.hh index 9313189..369ffff 100644 --- a/milena/mln/literal/origin.hh +++ b/milena/mln/literal/origin.hh @@ -50,9 +50,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const origin_t& origin = origin_t(); -# endif +# endif // !MLN_WO_GLOBAL_VARS + +# endif // !MLN_INCLUDE_ONLY } // end of namespace mln::literal diff --git a/milena/mln/literal/white.hh b/milena/mln/literal/white.hh index ada172d..9f19f3a 100644 --- a/milena/mln/literal/white.hh +++ b/milena/mln/literal/white.hh @@ -55,8 +55,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + const white_t& white = white_t(); +# endif + # ifdef MLN_NEW_VALUE_TYPES inline white_t::operator float() const diff --git a/milena/mln/literal/zero.hh b/milena/mln/literal/zero.hh index 07af50b..4d3a13b 100644 --- a/milena/mln/literal/zero.hh +++ b/milena/mln/literal/zero.hh @@ -64,8 +64,12 @@ namespace mln return 0; } +# ifndef MLN_WO_GLOBAL_VARS + const zero_t& zero = zero_t(); +# endif // !MLN_GLOBAL_VARS + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::literal diff --git a/milena/mln/tag/init.hh b/milena/mln/tag/init.hh index 455d2b5..c1db35c 100644 --- a/milena/mln/tag/init.hh +++ b/milena/mln/tag/init.hh @@ -54,6 +54,8 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + bbox_t bbox; border_t border; domain_t domain; @@ -61,6 +63,8 @@ namespace mln function_t function; image_t image; +# endif // !MLN_WO_GLOBAL_VARS + # endif // !MLN_INCLUDE_ONLY } // end of namespace mln::tag diff --git a/milena/mln/trace/entering.hh b/milena/mln/trace/entering.hh index 4afac25..d901971 100644 --- a/milena/mln/trace/entering.hh +++ b/milena/mln/trace/entering.hh @@ -53,9 +53,12 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + std::stack<std::clock_t> start_times; std::stack<std::string> scopes; +# endif // !MLN_WO_GLOBAL_VARS inline void entering(const std::string& scope) diff --git a/milena/mln/trace/quiet.hh b/milena/mln/trace/quiet.hh index c84a319..f76e8d2 100644 --- a/milena/mln/trace/quiet.hh +++ b/milena/mln/trace/quiet.hh @@ -57,6 +57,8 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + bool quiet = true; unsigned tab = 0; bool full_trace = false; @@ -68,9 +70,10 @@ namespace mln unsigned max_tab = 0; timeval start_time; bool is_quiet = quiet; - } // end of namespace mln::trace::internal +# endif // !MLN_WO_GLOBAL_VARS + # endif // !MLN_INCLUDE_ONLY } // end of namespace mln::trace diff --git a/milena/mln/trait/ch_value.hh b/milena/mln/trait/ch_value.hh index ae6e1d2..5dc3600 100644 --- a/milena/mln/trait/ch_value.hh +++ b/milena/mln/trait/ch_value.hh @@ -50,6 +50,7 @@ namespace mln template <typename G, typename F> class p_vertices; template <typename P, typename V, typename G> class vertex_image; template <typename P, typename V, typename G> class edge_image; + template <typename T, typename V> class attribute_image; template <typename I> class labeled_image; namespace pw { template <typename F, typename S> class image; } @@ -215,6 +216,13 @@ namespace mln typedef mln_ch_value(I,V) ret; }; + // Attribute image. + template <typename T, typename V1, typename V2> + struct ch_value_< attribute_image< tag::tree_<T>, tag::value_<V1> >, V2 > + { + typedef attribute_image<T, V2> ret; + }; + template < template <class, class> class M, typename T, typename S, typename V > diff --git a/milena/mln/util/ctree/node.hh b/milena/mln/util/ctree/node.hh index d22c48e..ebdc955 100644 --- a/milena/mln/util/ctree/node.hh +++ b/milena/mln/util/ctree/node.hh @@ -130,6 +130,12 @@ namespace mln bool operator!= (const node<T>& n1, const node<T>& n2); + /// Test if the node \p n1 is a descendant of \p n2 + /// + template <typename T> + bool + operator< (const node<T>& n1, const node<T>& n2); + } // end of namespace mln::util::ctree } // end of namespace mln::util @@ -273,6 +279,14 @@ namespace mln return n1.index() != n2.index(); } + template <typename T> + inline + bool + operator< (const node<T>& n1, const node<T>& n2) + { + return n1.index() > n2.index(); + } + } // end of namespace mln::util::ctree } // end of namespace mln::util diff --git a/milena/mln/value/sign.hh b/milena/mln/value/sign.hh index a59695d..bd69f39 100644 --- a/milena/mln/value/sign.hh +++ b/milena/mln/value/sign.hh @@ -108,6 +108,13 @@ namespace mln # ifndef MLN_INCLUDE_ONLY +# ifndef MLN_WO_GLOBAL_VARS + + const sign sign::zero = 0; + const sign sign::one = 1; + +# endif // !MLN_WO_GLOBAL_VARS + inline sign::sign() { @@ -172,9 +179,6 @@ namespace mln return *this; } - const sign sign::zero = 0; - - const sign sign::one = 1; inline std::ostream& operator<<(std::ostream& ostr, const sign& i) -- 1.5.6.5

1 0

[Olena] #230: Inplace arithmetic operators do not guaranty that the type of the target can hold the results
by Olena Trac 21 May '10

21 May '10

#230: Inplace arithmetic operators do not guaranty that the type of the target can hold the results -----------------------+---------------------------------------------------- Reporter: jacquelet | Owner: Olena Team Type: defect | Status: new Priority: major | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | -----------------------+---------------------------------------------------- #include <mln/core/image/image2d.hh> #include <mln/arith/times.hh> #include <mln/arith/minus.hh> #include <mln/value/int_u8.hh> int main() { using namespace mln; typedef mln::value::int_u8 t_int_u8; typedef mln::image2d<t_int_u8> t_img; typedef mln_trait_op_minus_(t_img,t_img) t_minus; typedef mln_trait_op_times_(t_minus,t_minus) t_times; t_img img1; t_img img2; t_img img3; t_minus minus; t_times times; // Loading images ... img3 = img1 - img2; // Does not compile as expected because img1 - img2 is of type t_minus. minus = img1 - img2; // Compile as expected. img3 = minus * minus; // Does not compile as expected because img1 * img2 is of type t_times times = minus * minus; // Compile as expected. // But ... img3 *= (minus - minus); // Compile... But should not! Inplace // operators do not guaranty that the type of // the target can hold the results (in term of // range). } -- Ticket URL: <https://trac.lrde.org/olena/ticket/230> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 1

branch exp/scribo-z updated: last-svn-commit-115-gce69474
by lazzara＠lrde.epita.fr 18 May '10

18 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch exp/scribo-z has been updated via ce69474de3375928b3bd460111356d419f6a966c (commit) from 7b922a208b3587cd49009a40570556a7489e6d67 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ce69474 * mln/io/magick/load.hh: set minimum resolution for PDF files to 300DPI. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 5 +++++ milena/mln/io/magick/load.hh | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-115-gce69474 * mln/io/magick/load.hh: set minimum resolution for PDF files to 300DPI.
by Guillaume Lazzara 18 May '10

18 May '10

--- milena/ChangeLog | 5 +++++ milena/mln/io/magick/load.hh | 12 +++++++++++- 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 11c9b18..c613c22 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,8 @@ +2010-05-18 Guillaume Lazzara <z(a)lrde.epita.fr> + + * mln/io/magick/load.hh: set minimum resolution for PDF files to + 300DPI. + 2010-04-30 Guillaume Lazzara <z(a)lrde.epita.fr> Add some code in my sandbox. diff --git a/milena/mln/io/magick/load.hh b/milena/mln/io/magick/load.hh index 11d17bd..dfe9197 100644 --- a/milena/mln/io/magick/load.hh +++ b/milena/mln/io/magick/load.hh @@ -123,7 +123,17 @@ namespace mln // abort(); //} - Magick::Image im_file(filename); + Magick::Image im_file; + im_file.ping(filename); + + // Force a minimum resolution of 300DPI for PDF document. + if (im_file.magick() == "PDF" + && (im_file.xResolution() < 300 || im_file.yResolution() < 300)) + im_file.density(Magick::Geometry(300, 300)); + + im_file.read(filename); + + im_file.modifyImage(); im_file.type(Magick::TrueColorType); int columns = im_file.columns(); -- 1.5.6.5

1 0

branch fix-graphs created: last-svn-commit-156-gd53b427
by git＠lrde.epita.fr 12 May '10

12 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch fix-graphs has been created at d53b4271ddc93c8fa098f4ef4c2fc7432f808357 (commit) - Log ----------------------------------------------------------------- d53b427 Miscellaneous changes in graphs and graph-based images. 17734ea Fix make::edge_image. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

branch next updated: last-svn-commit-154-g4c42b80
by git＠lrde.epita.fr 11 May '10

11 May '10

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 4c42b800077d0dda5fde111d0e4761661c9a52c3 (commit) from 68d80d9e1c6f2b66a45e6bb107c7697871386426 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- 4c42b80 Upload only branches master and next, in their own directories. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 7 +++++++ lrde-upload.sh | 36 +++++++++++++++++++++++++++++++++--- 2 files changed, 40 insertions(+), 3 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

last-svn-commit-156-gd53b427 Miscellaneous changes in graphs and graph-based images.
by Roland Levillain 11 May '10

11 May '10

* mln/util/graph.hh, * mln/util/line_graph.hh, * mln/core/image/vertex_image.hh, * mln/core/image/edge_image.hh: Fix the Doxygen documentation. * mln/util/vertex.hh: Aesthetic changes. * mln/util/edge.hh: Aesthetic changes. (util::edge<G>::invalidate): Remove dead code. * tests/morpho/line_graph_image_morpho.cc: Fix (non) Doxygen comments. --- milena/ChangeLog | 15 ++++++++++++ milena/mln/core/image/edge_image.hh | 8 +++--- milena/mln/core/image/vertex_image.hh | 8 +++--- milena/mln/util/edge.hh | 30 ++++++++++------------- milena/mln/util/graph.hh | 25 ++++++++++++-------- milena/mln/util/line_graph.hh | 20 ++++++++++----- milena/mln/util/vertex.hh | 26 ++++++++++++++------ milena/tests/morpho/line_graph_image_morpho.cc | 4 +- 8 files changed, 84 insertions(+), 52 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 050fb7c..900ebd8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,20 @@ 2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Miscellaneous changes in graphs and graph-based images. + + * mln/util/graph.hh, + * mln/util/line_graph.hh, + * mln/core/image/vertex_image.hh, + * mln/core/image/edge_image.hh: + Fix the Doxygen documentation. + * mln/util/vertex.hh: Aesthetic changes. + * mln/util/edge.hh: Aesthetic changes. + (util::edge<G>::invalidate): Remove dead code. + * tests/morpho/line_graph_image_morpho.cc: + Fix (non) Doxygen comments. + +2010-05-11 Roland Levillain <roland(a)lrde.epita.fr> + Fix make::edge_image. * mln/make/edge_image.hh: Fix Doxygen comments. diff --git a/milena/mln/core/image/edge_image.hh b/milena/mln/core/image/edge_image.hh index 7da1690..1c19b07 100644 --- a/milena/mln/core/image/edge_image.hh +++ b/milena/mln/core/image/edge_image.hh @@ -160,7 +160,7 @@ namespace mln /// Constructors. - /// @{ + /// \{ edge_image(); edge_image(const p_edges<G, site_function_t>& pe); edge_image(const Graph<G>& g, @@ -178,13 +178,13 @@ namespace mln template <typename FV> edge_image(const p_edges<G,site_function_t>& pe, const Function_v2v<FV>& edge_values); - /// @} + /// \} /// Value accessors/operators overloads. - /// @{ + /// \{ rvalue operator()(unsigned e_id) const; lvalue operator()(unsigned e_id); - /// @} + /// \} // Just to help g++-2.95... rvalue operator()(const psite& p) const; diff --git a/milena/mln/core/image/vertex_image.hh b/milena/mln/core/image/vertex_image.hh index 3ce7ed5..9ad31a7 100644 --- a/milena/mln/core/image/vertex_image.hh +++ b/milena/mln/core/image/vertex_image.hh @@ -167,7 +167,7 @@ namespace mln /// Constructors. - /// @{ + /// \{ vertex_image(); vertex_image(const p_vertices<G, site_function_t>& pv); vertex_image(const p_vertices<G, site_function_t>& pv, @@ -175,13 +175,13 @@ namespace mln template <typename FV> vertex_image(const p_vertices<G, site_function_t>& pv, const Function_v2v<FV>& vertex_values); - /// @} + /// \} /// Value accessors/operators overloads. - /// @{ + /// \{ rvalue operator()(unsigned v_id) const; lvalue operator()(unsigned v_id); - /// @} + /// \} // Just to help g++-2.95... diff --git a/milena/mln/util/edge.hh b/milena/mln/util/edge.hh index bfbceee..75a82c9 100644 --- a/milena/mln/util/edge.hh +++ b/milena/mln/util/edge.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -174,7 +175,7 @@ namespace mln namespace internal { - /// subject_impl specialization (Proxy) + /// subject_impl specialization (Proxy). /// \{ template <typename G, typename E> @@ -199,7 +200,7 @@ namespace mln }; template <typename G, typename E> - struct subject_impl< util::edge<G>, E > : + struct subject_impl< util::edge<G>, E > : subject_impl< const util::edge<G>, E > { void update_id(const util::edge_id_t& id); @@ -218,10 +219,6 @@ namespace mln # ifndef MLN_INCLUDE_ONLY - /*---------------------. - | Operators on edges. | - `---------------------*/ - namespace util { @@ -308,7 +305,6 @@ namespace mln void edge<G>::invalidate() { - //id_ = mln_max(unsigned); id_.invalidate(); } @@ -391,9 +387,9 @@ namespace mln namespace internal { - /*----------------------------------` - | subject_impl< const util::edge<G> | - \----------------------------------*/ + /*-----------------------------------------. + | subject_impl< const util::edge<G>, E >. | + `-----------------------------------------*/ template <typename G, typename E> inline @@ -460,14 +456,14 @@ namespace mln } - /*----------------------------------` - | subject_impl< util::edge<G> | - \----------------------------------*/ + /*-----------------------------------. + | subject_impl< util::edge<G>, E >. | + `-----------------------------------*/ template <typename G, typename E> inline void - subject_impl< util::edge<G>, E >::update_id(const util::edge_id_t& id) + subject_impl< util::edge<G>, E >::update_id(const util::edge_id_t& id) { return exact_().get_subject().update_id(id); } @@ -475,7 +471,7 @@ namespace mln template <typename G, typename E> inline void - subject_impl< util::edge<G>, E >::change_graph(const mlc_const(G)& g) + subject_impl< util::edge<G>, E >::change_graph(const mlc_const(G)& g) { return exact_().get_subject().change_graph(g); } @@ -483,7 +479,7 @@ namespace mln template <typename G, typename E> inline void - subject_impl< util::edge<G>, E >::invalidate() + subject_impl< util::edge<G>, E >::invalidate() { return exact_().get_subject().invalidate(); } diff --git a/milena/mln/util/graph.hh b/milena/mln/util/graph.hh index 2efec16..54d1c76 100644 --- a/milena/mln/util/graph.hh +++ b/milena/mln/util/graph.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -47,7 +48,7 @@ namespace mln namespace internal { - /// Data structure for \c mln::image2d<T>. + /// Data structure for mln::util::graph. template <> struct data<util::graph> { @@ -165,9 +166,11 @@ namespace mln /// \} /// Return the number of vertices in the graph. + // FIXME: Rename as nvertices. size_t v_nmax() const; /// Check whether a vertex id \p id_v exists in the graph. + // FIXME: Is the `_v' suffix really needed? bool has_v(const vertex_id_t& id_v) const; @@ -205,12 +208,12 @@ namespace mln const std::vector<util::ord_pair<vertex_id_t> >& edges() const; /// Return the number of edges in the graph. + // FIXME: Rename as nedges. size_t e_nmax() const; /// Return whether \p id_e is in the graph. - /// \@{ + // FIXME: Is the `_e' suffix really needed? bool has_e(const edge_id_t& id_e) const; - /// \@} /// Return the corresponding edge id if exists. If it is not, returns /// an invalid edge. @@ -287,9 +290,9 @@ namespace mln this->data_ = new mln::internal::data<util::graph>(nvertices); } - /*---------------. - | Vertex related | - `---------------*/ + /*--------------------------. + | Vertex-related services. | + `--------------------------*/ inline unsigned @@ -374,9 +377,9 @@ namespace mln } - /*--------------. - | Edges related | - `---------------*/ + /*-------------------------. + | Edges-related services. | + `-------------------------*/ inline edge_id_t @@ -388,6 +391,8 @@ namespace mln // Does this edge already exist in the graph? edge_data_t edge(id_v1, id_v2); + /* FIXME: This is not sound: the behavior of the algorithm + changes when NDEBUG is defined. */ # ifndef NDEBUG if (data_->edges_set_.find(edge) != data_->edges_set_.end ()) { diff --git a/milena/mln/util/line_graph.hh b/milena/mln/util/line_graph.hh index af11d02..f8104a4 100644 --- a/milena/mln/util/line_graph.hh +++ b/milena/mln/util/line_graph.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -28,7 +29,7 @@ /// \file /// -/// Definitions of undirected graphs. +/// Definition of an (undirected) line graph (adaptor). # include <mln/util/internal/graph_base.hh> # include <mln/util/internal/graph_iter.hh> @@ -49,7 +50,7 @@ namespace mln namespace internal { - /// Data structure for \c mln::image2d<T>. + /// Data structure for mln::util::line_graph<G>. template <typename G> struct data< util::line_graph<G> > { @@ -157,11 +158,14 @@ namespace mln /// \} /// Return the number of vertices in the graph. + // FIXME: Rename as nvertices. size_t v_nmax() const; - /// Check whether a vertex id \p id_v exists in the graph. + /// Check whether a vertex id \p id_v exists in the line graph. + // FIXME: Is the `_v' suffix really needed? bool has_v(const vertex_id_t& id_v) const; - /// Check whether an edge \p v exists in the graph. + + /// Check whether a vertex \p v exists in the line graph. template <typename G2> bool has(const util::vertex<G2>& v) const; @@ -188,12 +192,14 @@ namespace mln edge_t edge(const edge_id_t& e) const; /// Return the number of edges in the graph. + // FIXME: Rename as nedges. size_t e_nmax() const; - /// Return whether \p id_e is in the graph. + /// Return whether \p id_e is in the line graph. + // FIXME: Is the `_e' suffix really needed? bool has_e(const util::edge_id_t& id_e) const; - /// Return whether \p e is in the graph. + /// Return whether \p e is in the line graph. template <typename G2> bool has(const util::edge<G2>& e) const; diff --git a/milena/mln/util/vertex.hh b/milena/mln/util/vertex.hh index e1a151c..4f5f1b2 100644 --- a/milena/mln/util/vertex.hh +++ b/milena/mln/util/vertex.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2008, 2009 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2008, 2009, 2010 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -165,8 +165,8 @@ namespace mln namespace internal { + /// subject_impl specialization (Proxy). /// \{ - /// subject_impl specialization (Proxy) template <typename G, typename E> struct subject_impl< const util::vertex<G>, E > @@ -174,6 +174,8 @@ namespace mln // Can't be provided since there is an ambiguity with the iterator's // member. // +// FIXME: Check the above statement again, as a naive test does +// not exhibit its conclusion. // bool is_valid() const; const G& graph() const; @@ -191,7 +193,7 @@ namespace mln }; template <typename G, typename E> - struct subject_impl< util::vertex<G>, E > : + struct subject_impl< util::vertex<G>, E > : subject_impl< const util::vertex<G>, E > { void invalidate(); @@ -396,6 +398,10 @@ namespace mln namespace internal { + /*-------------------------------------------. + | subject_impl< const util::vertex<G>, E >. | + `-------------------------------------------*/ + template <typename G, typename E> inline const E& @@ -471,10 +477,14 @@ namespace mln } + /*-------------------------------------. + | subject_impl< util::vertex<G>, E >. | + `-------------------------------------*/ + template <typename G, typename E> inline E& - subject_impl< util::vertex<G>, E >::exact_() + subject_impl< util::vertex<G>, E >::exact_() { return internal::force_exact<E>(*this); } @@ -482,7 +492,7 @@ namespace mln template <typename G, typename E> inline void - subject_impl< util::vertex<G>, E >::invalidate() + subject_impl< util::vertex<G>, E >::invalidate() { exact_().get_subject().invalidate(); } @@ -490,7 +500,7 @@ namespace mln template <typename G, typename E> inline void - subject_impl< util::vertex<G>, E >::change_graph(const G& g) + subject_impl< util::vertex<G>, E >::change_graph(const G& g) { exact_().get_subject().change_graph(g); } @@ -498,7 +508,7 @@ namespace mln template <typename G, typename E> inline void - subject_impl< util::vertex<G>, E >::update_id(const util::vertex_id_t& id) + subject_impl< util::vertex<G>, E >::update_id(const util::vertex_id_t& id) { exact_().get_subject().update_id(id); }; diff --git a/milena/tests/morpho/line_graph_image_morpho.cc b/milena/tests/morpho/line_graph_image_morpho.cc index 21ce087..eb45055 100644 --- a/milena/tests/morpho/line_graph_image_morpho.cc +++ b/milena/tests/morpho/line_graph_image_morpho.cc @@ -77,8 +77,8 @@ int main() g.add_edge(3, 4); g.add_edge(4, 2); - /// Create the corresponding line graph. - /// Edges are now considered as vertices. + // Create the corresponding line graph. + // Edges are now considered as vertices. util::line_graph<util::graph> lg(g); // Points associated to the line graph vertices (edges in the graph). -- 1.5.6.5

1 0