- Olena-patches

olena-2.0-451-gd86fc9a Improve time logging in Scribo.
by Guillaume Lazzara 02 Apr '13

02 Apr '13

* scribo/debug/logger.hh: Use a stack to handle several simultaneous logs. * scribo/binarization/sauvola_ms.hh: Fix an invalid time stop. * scribo/binarization/internal/local_threshold_core.hh, * src/binarization/sauvola.cc, * src/binarization/sauvola_ms.cc, * src/binarization/sauvola_ms_debug.cc: Rename time logging functions. --- milena/mln/util/timer.hh | 15 ++++- scribo/ChangeLog | 15 +++++ .../binarization/internal/local_threshold_core.hh | 8 +- scribo/scribo/binarization/sauvola_ms.hh | 21 +++---- scribo/scribo/debug/logger.hh | 59 +++++++------------ scribo/src/binarization/sauvola.cc | 4 +- scribo/src/binarization/sauvola_ms.cc | 4 +- scribo/src/binarization/sauvola_ms_debug.cc | 4 +- 8 files changed, 70 insertions(+), 60 deletions(-) diff --git a/milena/mln/util/timer.hh b/milena/mln/util/timer.hh index 4fbca3d..7afff72 100644 --- a/milena/mln/util/timer.hh +++ b/milena/mln/util/timer.hh @@ -1,4 +1,4 @@ -// Copyright (C) 2008, 2009, 2011 EPITA Research and Development +// Copyright (C) 2008, 2009, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -49,8 +49,11 @@ namespace mln timer(); + // Explicit copy constructor (in most cases should not be + // used...). + explicit timer(const timer&); + // Without impl. - timer(const timer&); void operator=(const timer&); ~timer(); @@ -102,6 +105,14 @@ namespace mln } inline + timer::timer(const timer& t) + { + running_ = t.running_; + start_ = t.start_; + time_ = t.time_; + } + + inline timer::~timer() { reset(); diff --git a/scribo/ChangeLog b/scribo/ChangeLog index a438ae0..d7e7547 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,18 @@ +2013-04-02 Guillaume Lazzara <lazzara(a)caroussel.lrde.epita.fr> + + Improve time logging in Scribo. + + * scribo/debug/logger.hh: Use a stack to handle several + simultaneous logs. + + * scribo/binarization/sauvola_ms.hh: Fix an invalid time stop. + + * scribo/binarization/internal/local_threshold_core.hh, + * src/binarization/sauvola.cc, + * src/binarization/sauvola_ms.cc, + * src/binarization/sauvola_ms_debug.cc: Rename time logging + functions. + 2013-03-26 Guillaume Lazzara <z(a)lrde.epita.fr> Small fixes in scribo. diff --git a/scribo/scribo/binarization/internal/local_threshold_core.hh b/scribo/scribo/binarization/internal/local_threshold_core.hh index 5de9761..16dc1be 100644 --- a/scribo/scribo/binarization/internal/local_threshold_core.hh +++ b/scribo/scribo/binarization/internal/local_threshold_core.hh @@ -127,7 +127,7 @@ namespace scribo mln_trace("scribo::binarization::internal::impl::generic::local_threshold_core"); mln_precondition(exact(input).is_valid()); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().start_time_logging(); int integral_scale_ratio = F::step; @@ -148,7 +148,7 @@ namespace scribo sub_domains[2].first(), sub_domains[2].second()); - scribo::debug::logger().stop_local_time_logging("image integrale -"); + scribo::debug::logger().stop_time_logging("image integrale -"); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG initialize(internal::debug_mean, input); @@ -159,7 +159,7 @@ namespace scribo initialize(internal::debug_alphacond, input); # endif // ! SCRIBO_LOCAL_THRESHOLD_DEBUG - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().start_time_logging(); window_size /= integral_scale_ratio; if (window_size % 2) @@ -171,7 +171,7 @@ namespace scribo window_size, integral_scale_ratio, f); - scribo::debug::logger().stop_local_time_logging("Binarization -"); + scribo::debug::logger().stop_time_logging("Binarization -"); } diff --git a/scribo/scribo/binarization/sauvola_ms.hh b/scribo/scribo/binarization/sauvola_ms.hh index 6a9751c..70df030 100644 --- a/scribo/scribo/binarization/sauvola_ms.hh +++ b/scribo/scribo/binarization/sauvola_ms.hh @@ -878,7 +878,7 @@ namespace scribo typedef image2d<mln::util::couple<double,double> > integral_t; // integral_t integral_sum_sum_2; - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().start_time_logging(); // Subsampling from scale 1 to 2. { @@ -891,8 +891,8 @@ namespace scribo sub_ima.append(fi.sub); } - scribo::debug::logger().stop_local_time_logging("1. subsampling and integral -"); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().stop_time_logging("1. subsampling and integral -"); + scribo::debug::logger().start_time_logging(); // Subsampling to scale 3 and 4. // @@ -903,8 +903,8 @@ namespace scribo sub_domains[i].first(), sub_domains[i].second())); - scribo::debug::logger().stop_local_time_logging("2. More subsampling -"); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().stop_time_logging("2. More subsampling -"); + scribo::debug::logger().start_time_logging(); // Compute threshold images. image2d<int_u8> e_2; @@ -963,8 +963,8 @@ namespace scribo integral_sum_sum_2); } - scribo::debug::logger().stop_local_time_logging("3. Multi-scale processing -"); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().stop_time_logging("3. Multi-scale processing -"); + scribo::debug::logger().start_time_logging(); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -980,8 +980,8 @@ namespace scribo // Propagate scale values. e_2 = transform::influence_zone_geodesic(e_2, c8()); - scribo::debug::logger().stop_local_time_logging("4. Influence Zone on Scale image -"); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().stop_time_logging("4. Influence Zone on Scale image -"); + scribo::debug::logger().start_time_logging(); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG @@ -1015,8 +1015,7 @@ namespace scribo image2d<bool> output = internal::multi_scale_binarization(input_1, e_2, t_ima, s); - scribo::debug::logger().stop_local_time_logging("5. Final binarization -"); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().stop_time_logging("5. Final binarization -"); return output; } diff --git a/scribo/scribo/debug/logger.hh b/scribo/scribo/debug/logger.hh index b65b04a..0b29aaf 100644 --- a/scribo/scribo/debug/logger.hh +++ b/scribo/scribo/debug/logger.hh @@ -31,6 +31,7 @@ #ifndef SCRIBO_CORE_LOGGER_HH # define SCRIBO_CORE_LOGGER_HH +# include <stack> # include <iostream> # include <ctype.h> # include <mln/core/concept/image.hh> @@ -139,24 +140,15 @@ namespace scribo /*! \brief Time Logging - This class provides two timers in order to performs - benchmarks inside a program. - - Local time logging is meant to be used for benchmarking a - small portion of code, whereas global time logging is meant - to benchmark a whole program. - - They can be used both at the same time. + This class provides timers in order to performs benchmarks + inside a program. Stopping time logging will output the computed time if Verbose mode is higher or equal to #Time. */ /// @{ - void start_local_time_logging(); - void stop_local_time_logging(const std::string& time_title); - - void start_global_time_logging(); - void stop_global_time_logging(const std::string& time_title); + void start_time_logging(); + void stop_time_logging(const std::string& time_title); /// @} @@ -171,6 +163,8 @@ namespace scribo logger_(); logger_(const logger_&); + ~logger_(); + template <unsigned n, typename I> void log_image_dispatch(const value::int_u<n>&, const Image<I>& ima, const char *name); @@ -209,8 +203,7 @@ namespace scribo std::string verbose_prefix_; std::ostream& stream_; - mln::util::timer t_local_; - mln::util::timer t_global_; + std::stack<mln::util::timer> t_locals_; }; } // end of namespace scribo::debug::internal @@ -264,6 +257,12 @@ namespace scribo abort(); } + inline + logger_::~logger_() + { + // If this is not True, then a timer has not been stopped! + mln_assertion(t_locals_.size() == 0); + } inline bool @@ -410,37 +409,23 @@ namespace scribo inline void - logger_::start_local_time_logging() + logger_::start_time_logging() { - t_local_.restart(); + t_locals_.push(mln::util::timer()); + t_locals_.top().restart(); } inline void - logger_::stop_local_time_logging(const std::string& time_title) + logger_::stop_time_logging(const std::string& time_title) { - t_local_.stop(); - if (verbose_mode_ >= Time) - std::cerr << time_title << " " << t_local_ << "s" << std::endl; - } - + mln_assertion(! t_locals_.empty()); - inline - void - logger_::start_global_time_logging() - { - t_global_.restart(); - } - - - inline - void - logger_::stop_global_time_logging(const std::string& time_title) - { - t_global_.stop(); + t_locals_.top().stop(); if (verbose_mode_ >= Time) - std::cerr << time_title << " " << t_global_ << "s" << std::endl; + std::cerr << time_title << " " << t_locals_.top() << "s" << std::endl; + t_locals_.pop(); } diff --git a/scribo/src/binarization/sauvola.cc b/scribo/src/binarization/sauvola.cc index aa66565..603b815 100644 --- a/scribo/src/binarization/sauvola.cc +++ b/scribo/src/binarization/sauvola.cc @@ -95,12 +95,12 @@ int main(int argc, char *argv[]) image2d<value::int_u8> input_1_gl = data::transform(input, mln::fun::v2v::rgb_to_luma<value::int_u8>()); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().start_time_logging(); // Binarize image2d<bool> out = scribo::binarization::sauvola(input_1_gl, w, k); - scribo::debug::logger().stop_local_time_logging("Binarized in"); + scribo::debug::logger().stop_time_logging("Binarized in"); io::magick::save(out, options.arg("output.*")); diff --git a/scribo/src/binarization/sauvola_ms.cc b/scribo/src/binarization/sauvola_ms.cc index 3b51dad..c81509c 100644 --- a/scribo/src/binarization/sauvola_ms.cc +++ b/scribo/src/binarization/sauvola_ms.cc @@ -138,13 +138,13 @@ int main(int argc, char *argv[]) mln::fun::v2v::rgb_to_luma<value::int_u8>()); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().start_time_logging(); // Binarize image2d<bool> output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s); - scribo::debug::logger().stop_local_time_logging("Binarized in"); + scribo::debug::logger().stop_time_logging("Binarized in"); if (options.is_enabled("negate")) io::magick::save(logical::not_(output), options.arg("output.*")); diff --git a/scribo/src/binarization/sauvola_ms_debug.cc b/scribo/src/binarization/sauvola_ms_debug.cc index d01a4a2..b940b43 100644 --- a/scribo/src/binarization/sauvola_ms_debug.cc +++ b/scribo/src/binarization/sauvola_ms_debug.cc @@ -172,13 +172,13 @@ int main(int argc, char *argv[]) input_1_gl = data::transform(input_1, mln::fun::v2v::rgb_to_luma<value::int_u8>()); - scribo::debug::logger().start_local_time_logging(); + scribo::debug::logger().start_time_logging(); // Binarize. image2d<bool> output = scribo::binarization::sauvola_ms(input_1_gl, w_1, s); - scribo::debug::logger().stop_local_time_logging("Binarized in"); + scribo::debug::logger().stop_time_logging("Binarized in"); # ifdef SCRIBO_LOCAL_THRESHOLD_DEBUG { -- 1.7.2.5

1 0

branch table-graph updated: olena-2.0-413-gf10be63
by git＠lrde.epita.fr 28 Mar '13

28 Mar '13

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 table-graph has been updated via f10be63c9871cbdd456e78291fdea6b3a64d4fc3 (commit) via ff30bf3cb0ef8af796d43204c7302587bc1231d0 (commit) via c430b36be19705f3e4499e0f3aded9306914e4f5 (commit) via 9265a9460ed39fa0b12b7bb5a67502dc8161cc6a (commit) from d527a6539a5718adce53ba4b979cd1e38359c6db (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 ----------------------------------------------------------------- f10be63 Small stylistic change in the implementation of adjacency matrices. ff30bf3 First version of alignment computation for table recognition. c430b36 Misc. changes in the table recognition application. 9265a94 Improve the handling of outputs in the table recognition application. ----------------------------------------------------------------------- Summary of changes: milena/mln/util/adjacency_matrix.hh | 6 +- scribo/src/contest/table-2013/src/new.cc | 219 ++++++++++++++++++++++++++---- 2 files changed, 196 insertions(+), 29 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-413-gf10be63 Small stylistic change in the implementation of adjacency matrices.
by Roland Levillain 28 Mar '13

28 Mar '13

* milena/mln/util/adjacency_matrix.hh (internal::adjacency_matrix_impl_selector<V, Q>::are_adjacent): Here. --- milena/mln/util/adjacency_matrix.hh | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/milena/mln/util/adjacency_matrix.hh b/milena/mln/util/adjacency_matrix.hh index b5bfb4e..f9f5312 100644 --- a/milena/mln/util/adjacency_matrix.hh +++ b/milena/mln/util/adjacency_matrix.hh @@ -227,9 +227,9 @@ namespace mln mln_precondition(e1 < adj_.nrows()); mln_precondition(e2 < adj_.nrows()); - if (e1 > e2) - return opt::at(adj_, e2, e1); - return opt::at(adj_, e1, e2); + return e1 > e2 + ? opt::at(adj_, e2, e1) + : opt::at(adj_, e1, e2); } template <typename V, typename Q> -- 1.7.2.5

1 0

olena-2.0-412-gff30bf3 First version of alignment computation for table recognition.
by Roland Levillain 28 Mar '13

28 Mar '13

* scribo/src/contest/table-2013/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 165 ++++++++++++++++++++++++++++++ 1 files changed, 165 insertions(+), 0 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index 962bf22..8949e15 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -21,6 +21,8 @@ #include <mln/value/all.hh> +#include <mln/util/adjacency_matrix.hh> + // INCLUDE TESSERACT #include <tesseract/baseapi.h> @@ -337,6 +339,68 @@ void draw_links_rl(const scribo::object_groups< image2d<unsigned> >& groups, } } + +// Alignment predicates. + +// Maximum alignment threshold at normal resoution (72 dpi) +const float align_eps = 1.5; + +inline +bool +left_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmin().col() - b2.pmin().col()) + < align_eps * scale_factor; +} + +inline +bool +vcenter_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pcenter().col() - b2.pcenter().col()) + < align_eps * scale_factor; +} + +inline +bool +right_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmax().col() - b2.pmax().col()) + < align_eps * scale_factor; +} + + +inline +bool +top_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmin().row() - b2.pmin().row()) + < align_eps * scale_factor; +} + +inline +bool +hcenter_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pcenter().row() - b2.pcenter().row()) + < align_eps * scale_factor; +} + +inline +bool +bottom_aligned(const box2d& b1, const box2d& b2, float scale_factor) +{ + return + math::abs(b1.pmax().row() - b2.pmax().row()) + < align_eps * scale_factor; +} + + /******************************** MAIN ****************************************/ int main(int argc, char** argv) { @@ -638,6 +702,106 @@ int main(int argc, char** argv) } } + /* FIXME: We could factor a lot by grouping these matrices and + arrays into a structure and giving them a number. */ + // Compute alignments. + typedef util::adjacency_matrix<unsigned> align_matrix; + align_matrix left_aligned_groups(groups.nelements()); + align_matrix vcenter_aligned_groups(groups.nelements()); + align_matrix right_aligned_groups(groups.nelements()); + align_matrix top_aligned_groups(groups.nelements()); + align_matrix hcenter_aligned_groups(groups.nelements()); + align_matrix bottom_aligned_groups(groups.nelements()); + // We rely on the fact that group (text boxes) are numbered in the + // raster order to determine whether an alignment has been set + // between two groups. + std::vector<bool> group_has_left_alignment(groups.nelements(), false); + std::vector<bool> group_has_vcenter_alignment(groups.nelements(), false); + std::vector<bool> group_has_right_alignment(groups.nelements(), false); + std::vector<bool> group_has_top_alignment(groups.nelements(), false); + std::vector<bool> group_has_hcenter_alignment(groups.nelements(), false); + std::vector<bool> group_has_bottom_alignment(groups.nelements(), false); + for (unsigned i = 1; i < groups.nelements(); ++i) + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + + if (!group_has_left_alignment[i] + && left_aligned(b1, b2, scale_factor)) + { + left_aligned_groups.add(i, j); + group_has_left_alignment[i] = true; + } + if (!group_has_vcenter_alignment[i] + && vcenter_aligned(b1, b2, scale_factor)) + { + vcenter_aligned_groups.add(i, j); + group_has_vcenter_alignment[i] = true; + } + if (!group_has_right_alignment[i] + && right_aligned(b1, b2, scale_factor)) + { + right_aligned_groups.add(i, j); + group_has_right_alignment[i] = true; + } + if (!group_has_top_alignment[i] && + top_aligned(b1, b2, scale_factor)) + { + top_aligned_groups.add(i, j); + group_has_top_alignment[i] = true; + } + if (!group_has_hcenter_alignment[i] && + hcenter_aligned(b1, b2, scale_factor)) + { + hcenter_aligned_groups.add(i, j); + group_has_hcenter_alignment[i] = true; + } + if (!group_has_bottom_alignment[i] && + bottom_aligned(b1, b2, scale_factor)) + { + bottom_aligned_groups.add(i, j); + group_has_bottom_alignment[i] = true; + } + } + // Visualization: alignments. + image2d<value::rgb8> alignments = + data::convert(value::rgb8(), bin_merged); + for (unsigned i = 1; i < groups.nelements(); ++i) + draw::box(alignments, groups(i).bbox(), literal::medium_gray); + for (unsigned i = 1; i < groups.nelements(); ++i) + for (unsigned j = i + 1; j < groups.nelements(); ++j) + { + const box2d& b1 = groups(i).bbox(); + const box2d& b2 = groups(j).bbox(); + + if (left_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pcenter().row(), b1.pmin().col()), + point2d(b2.pcenter().row(), b2.pmin().col()), + literal::red); + if (vcenter_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, b1.pcenter(), b2.pcenter(), literal::orange); + if (right_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pcenter().row(), b1.pmax().col()), + point2d(b2.pcenter().row(), b2.pmax().col()), + literal::green); + + if (top_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pmin().row(), b1.pcenter().col()), + point2d(b2.pmin().row(), b2.pcenter().col()), + literal::cyan); + if (hcenter_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, b1.pcenter(), b2.pcenter(), literal::yellow); + if (top_aligned_groups.are_adjacent(i, j)) + draw::line(alignments, + point2d(b1.pmax().row(), b1.pcenter().col()), + point2d(b2.pmax().row(), b2.pcenter().col()), + literal::magenta); + } + // Write images and close XML unsigned number = 0; write_image(bin, prefix, "bin", page, number); @@ -651,5 +815,6 @@ int main(int argc, char** argv) write_image(ima_groups, prefix, "groups", page, number); write_image(ima_valid, prefix, "valid", page, number); write_image(ima_cols_rows, prefix, "cols_rows", page, number); + write_image(alignments, prefix, "alignments", page, number); } } -- 1.7.2.5

1 0

olena-2.0-411-gc430b36 Misc. changes in the table recognition application.
by Roland Levillain 28 Mar '13

28 Mar '13

* scribo/src/contest/table-2013/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index 5d3bc11..962bf22 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -1,5 +1,4 @@ #undef MLN_WO_GLOBAL_VARS -#include "xml.hh" // INCLUDES OLENA #include <mln/binarization/all.hh> @@ -55,6 +54,7 @@ #include <scribo/text/merging.hh> #include "disjoint_set.hh" +#include "xml.hh" using namespace mln; @@ -451,7 +451,7 @@ int main(int argc, char** argv) I8 ima_groups = data::convert(value::rgb8(), tmp); I8 ima_valid = data::convert(value::rgb8(), tmp); - // Write links + // Draw links for (unsigned l = 1; l < merged_links.nelements(); ++l) { point2d p1 = scribo::primitive::link::internal::compute_anchor(merged_links.components(), l, scribo::anchor::MassCenter); @@ -640,7 +640,6 @@ int main(int argc, char** argv) // Write images and close XML unsigned number = 0; - write_image(bin, prefix, "bin", page, number); write_image(bin_without_separators, prefix, "bin_without_separators", page, number); write_image(denoised, prefix, "denoised", page, number); -- 1.7.2.5

1 0

olena-2.0-410-g9265a94 Improve the handling of outputs in the table recognition application.
by Roland Levillain 28 Mar '13

28 Mar '13

* src/contest/table-2013/src/new.cc: Here. --- scribo/src/contest/table-2013/src/new.cc | 49 ++++++++++++++++-------------- 1 files changed, 26 insertions(+), 23 deletions(-) diff --git a/scribo/src/contest/table-2013/src/new.cc b/scribo/src/contest/table-2013/src/new.cc index a40ed07..5d3bc11 100644 --- a/scribo/src/contest/table-2013/src/new.cc +++ b/scribo/src/contest/table-2013/src/new.cc @@ -83,13 +83,13 @@ void draw_adjacency_boxes(const std::vector<short>& balance, // Write image2d<bool> images void write_image(const image2d<bool>& ima, + const std::string prefix, const char* name, const unsigned page, - unsigned& number, - std::ostringstream& path) + unsigned& number) { - path.str(""); - path << "output/p" << page + std::ostringstream path; + path << "output/" << prefix << "_p" << page << "_" << number << "_" << name << ".pbm"; io::pbm::save(ima, path.str()); @@ -98,13 +98,13 @@ void write_image(const image2d<bool>& ima, // Write image2d<value::rbg8> images void write_image(const image2d<value::rgb8>& ima, + const std::string prefix, const char* name, const unsigned page, - unsigned& number, - std::ostringstream& path) + unsigned& number) { - path.str(""); - path << "output/p" << page + std::ostringstream path; + path << "output/" << prefix << "_p" << page << "_" << number << "_" << name << ".ppm"; io::ppm::save(ima, path.str()); @@ -346,9 +346,10 @@ int main(int argc, char** argv) typedef image2d<bool> IB; typedef scribo::component_set< image2d<unsigned> > CS; - if (argc != 2 && argc != 3) + if (argc != 3 && argc != 4) { - std::cerr << "usage: " << argv[0] << "input.pdf [scale]"; + std::cerr << "usage: " << argv[0] << " input.pdf output-prefix [scale]" + << std::endl; exit(1); } @@ -358,7 +359,7 @@ int main(int argc, char** argv) const float default_scale = 1.0; // Magnification factor. - const float scale_factor = argc == 3 ? strtof(argv[2], 0) : default_scale; + const float scale_factor = argc == 4 ? strtof(argv[3], 0) : default_scale; // Loading and binarization XML xml("final.xml", argv[1]); @@ -367,6 +368,9 @@ int main(int argc, char** argv) unsigned dpi = default_res * scale_factor; io::pdf::load(pdf, argv[1], dpi); + // Filename prefix. + std::string prefix(argv[2]); + // Iterate over all pages for (unsigned page = 0; page < pdf.nelements(); ++page) { @@ -635,19 +639,18 @@ int main(int argc, char** argv) } // Write images and close XML - std::ostringstream path; unsigned number = 0; - write_image(bin, "bin", page, number, path); - write_image(bin_without_separators, "bin_without_separators", page, number, path); - write_image(denoised, "denoised", page, number, path); - write_image(reverse, "reverse", page, number, path); - write_image(reverse_selection, "", page, number, path); - write_image(bin_merged, "reverse_selection", page, number, path); - write_image(comp, "bin_merged", page, number, path); - write_image(ima_links, "components", page, number, path); - write_image(ima_groups, "groups", page, number, path); - write_image(ima_valid, "valid", page, number, path); - write_image(ima_cols_rows, "cols_rows", page, number, path); + write_image(bin, prefix, "bin", page, number); + write_image(bin_without_separators, prefix, "bin_without_separators", page, number); + write_image(denoised, prefix, "denoised", page, number); + write_image(reverse, prefix, "reverse", page, number); + write_image(reverse_selection, prefix, "", page, number); + write_image(bin_merged, prefix, "reverse_selection", page, number); + write_image(comp, prefix, "bin_merged", page, number); + write_image(ima_links, prefix, "components", page, number); + write_image(ima_groups, prefix, "groups", page, number); + write_image(ima_valid, prefix, "valid", page, number); + write_image(ima_cols_rows, prefix, "cols_rows", page, number); } } -- 1.7.2.5

1 0

branch origin/sandbox/anthony created: olena-2.0-401-g7936694
by git＠lrde.epita.fr 28 Mar '13

28 Mar '13

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 origin/sandbox/anthony has been created at 793669454e02565d98983df63057e20838b02991 (commit) - Log ----------------------------------------------------------------- 7936694 Remove many false positives (intersecting boxes) ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-401-g7936694 Remove many false positives (intersecting boxes)
by Anthony Seure 28 Mar '13

28 Mar '13

--- scribo/sandbox/icdar_13_table/src/new.cc | 35 +++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/scribo/sandbox/icdar_13_table/src/new.cc b/scribo/sandbox/icdar_13_table/src/new.cc index bcf127e..d52ac15 100644 --- a/scribo/sandbox/icdar_13_table/src/new.cc +++ b/scribo/sandbox/icdar_13_table/src/new.cc @@ -58,6 +58,13 @@ using namespace mln; +// Check if two boxes intersected +bool intersect(const box2d& b1, const box2d& b2) +{ + return ((unsigned) abs(b1.pcenter().col() - b2.pcenter().col()) * 2 < b1.width() + b2.width() + && (unsigned) abs(b1.pcenter().row() - b2.pcenter().row()) * 2 < b1.height() + b2.height()); +} + // Draw weighted boxes (red < orange < cyan < green) // 1 link < 2 links < 3 links < 3+ links template<typename T, typename L> @@ -581,6 +588,9 @@ int main(int argc, char** argv) descendants[columns_set.find(j)].insert(j); } + std::vector<box2d> columns; + std::set<unsigned> not_valid; + // Visualization: columns. image2d<value::rgb8> ima_columns = data::convert(value::rgb8(), bin_merged); for (unsigned i = 0; i < groups.nelements(); ++i) @@ -590,9 +600,32 @@ int main(int argc, char** argv) for (group_set::const_iterator j = descendants[i].begin(); j != descendants[i].end(); ++j) column_box.merge(groups(*j).bbox()); - draw::box(ima_columns, column_box, literal::red); + draw::box(ima_columns, column_box, literal::green); + columns.push_back(column_box); } + for (unsigned i = 0; i < columns.size(); ++i) + { + for (unsigned j = 0; j < columns.size(); ++j) + { + if (i != j) + { + const box2d& c1 = columns[i]; + const box2d& c2 = columns[j]; + + if (intersect(c1, c2) || intersect(c2, c1)) + { + not_valid.insert(i); + not_valid.insert(j); + } + } + } + } + + for (unsigned i = 0; i < columns.size(); ++i) + if (not_valid.find(i) != not_valid.end()) + draw::box(ima_columns, columns[i], literal::red); + // Write images and close XML std::ostringstream path; unsigned number = 0; -- 1.7.2.5

1 0

branch unstable/scribo updated: olena-2.0-450-g055f40a
by git＠lrde.epita.fr 28 Mar '13

28 Mar '13

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 unstable/scribo has been updated via 055f40a10996f1d64c9c2577f395a46409b49e2c (commit) from a74409363a9941dec0c4a86205cb5f22bdc2dab2 (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 ----------------------------------------------------------------- 055f40a doc/Makefile.am: Add a missing dependency. ----------------------------------------------------------------------- Summary of changes: ChangeLog | 4 ++++ doc/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena-2.0-450-g055f40a doc/Makefile.am: Add a missing dependency.
by Guillaume Lazzara 28 Mar '13

28 Mar '13

--- ChangeLog | 4 ++++ doc/Makefile.am | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f26f566..806acdb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-03-28 Guillaume Lazzara <z(a)lrde.epita.fr> + + * doc/Makefile.am: Add a missing dependency. + 2013-03-27 Guillaume Lazzara <z(a)lrde.epita.fr> * configure.ac: Allow tarballs with long filenames. diff --git a/doc/Makefile.am b/doc/Makefile.am index 2c9e81b..36a14aa 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -80,6 +80,8 @@ REFMAN_deps = $(srcdir)/footer.html \ $(srcdir)/get_sources.dox \ $(srcdir)/subdoc_footer.html \ contributors.html \ + lrde_olena.html + $(REFMAN_IMAGES) EXTRA_DIST += $(REFMAN_deps) -- 1.7.2.5

1 0