Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

branch next-build-test updated: last-svn-commit-674-g557ac2f

by lazzara＠lrde.epita.fr

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-build-test has been updated via 557ac2f43b73eb2fc3a49d1d34975559873fabee (commit) via 236e8722e83acffc95360eba6b190b90519ef23d (commit) via 0ce764d574dff94e89d7c5d1f1d0e9c010a84707 (commit) via 8f3101526bd99273d1b71d467b044a07a8479d70 (commit) from 63c3277770ffaa3b4e398d55abda8c5d20dc9457 (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 ----------------------------------------------------------------- 557ac2f Add a new test for accu::stat:deviation. 236e872 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. 0ce764d mln/accu/stat/deviation.hh: Fix type of constructor argument. 8f31015 Remove a useless from_to overload. ----------------------------------------------------------------------- Summary of changes: milena/ChangeLog | 20 ++++++++++++++++ milena/mln/accu/stat/deviation.hh | 8 ++++-- milena/mln/convert/from_to.hxx | 4 --- milena/mln/convert/impl/from_unsigned_to_value.hh | 12 +-------- milena/tests/accu/stat/Makefile.am | 5 +++- .../qt_rgb_to_int_u.cc => accu/stat/deviation.cc} | 25 +++++++++++++------ scribo/ChangeLog | 4 +++ .../primitive/extract/separators_nonvisible.hh | 8 ++++- 8 files changed, 58 insertions(+), 28 deletions(-) copy milena/tests/{fun/v2v/qt_rgb_to_int_u.cc => accu/stat/deviation.cc} (75%) hooks/post-receive -- Olena, a generic and efficient image processing platform

14 years, 2 months

last-svn-commit-674-g557ac2f Add a new test for accu::stat:deviation.

by Guillaume Lazzara

* tests/accu/stat/Makefile.am: Add a new target. * tests/accu/stat/deviation.cc: New. --- milena/ChangeLog | 8 ++++++ milena/tests/accu/stat/Makefile.am | 5 +++- .../qt_rgb_to_int_u.cc => accu/stat/deviation.cc} | 25 +++++++++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) copy milena/tests/{fun/v2v/qt_rgb_to_int_u.cc => accu/stat/deviation.cc} (75%) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5ecbfb8..af606bd 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. + + * tests/accu/stat/Makefile.am: Add a new target. + + * tests/accu/stat/deviation.cc: New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/deviation.hh: Fix type of constructor argument. 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index c331db0..47197c0 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/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. # @@ -17,6 +18,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + deviation \ var \ min \ min_h \ @@ -27,6 +29,7 @@ check_PROGRAMS = \ mean \ rank +deviation_SOURCES = deviation.cc var_SOURCES = var.cc mean_SOURCES = mean.cc median_h_SOURCES = median_h.cc diff --git a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc b/milena/tests/accu/stat/deviation.cc similarity index 75% copy from milena/tests/fun/v2v/qt_rgb_to_int_u.cc copy to milena/tests/accu/stat/deviation.cc index 5b55d49..e39359e 100644 --- a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc +++ b/milena/tests/accu/stat/deviation.cc @@ -23,22 +23,31 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// \brief Tests on mln::accu::deviation. + #include <mln/core/image/image2d.hh> +#include <mln/debug/iota.hh> -#include <mln/fun/v2v/qt_rgb_to_int_u.hh> -#include <mln/value/qt/rgb32.hh> -#include <mln/value/int_u8.hh> +#include <mln/accu/stat/deviation.hh> +#include <mln/data/compute.hh> +#include <mln/io/pgm/save.hh> +#include <mln/data/convert.hh> +#include <mln/value/int_u8.hh> int main() { using namespace mln; + image2d<short> ima(3, 3); + debug::iota(ima); - fun::v2v::qt_rgb_to_int_u<8> f; - - value::qt::rgb32 vcolor(100, 200, 30); + accu::stat::deviation<int> dev(5); - value::int_u8 vgl = f(vcolor); + volatile float + ref = 2.5819f, + trunc_val = (unsigned(data::compute(dev, ima) * 10000.f) / 10000.f); - mln_assertion(vgl == 110); + mln_assertion(trunc_val == ref); } -- 1.5.6.5

14 years, 2 months

last-svn-commit-672-gc03272f Add a new test for accu::stat:deviation.

by Guillaume Lazzara

* tests/accu/stat/Makefile.am: Add a new target. * tests/accu/stat/deviation.cc: New. --- milena/ChangeLog | 8 ++++++ milena/tests/accu/stat/Makefile.am | 5 +++- .../qt_rgb_to_int_u.cc => accu/stat/deviation.cc} | 25 +++++++++++++------ 3 files changed, 29 insertions(+), 9 deletions(-) copy milena/tests/{fun/v2v/qt_rgb_to_int_u.cc => accu/stat/deviation.cc} (75%) diff --git a/milena/ChangeLog b/milena/ChangeLog index f97ab68..0b6247e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Add a new test for accu::stat:deviation. + + * tests/accu/stat/Makefile.am: Add a new target. + + * tests/accu/stat/deviation.cc: New. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove a useless from_to overload. * mln/convert/from_to.hxx, diff --git a/milena/tests/accu/stat/Makefile.am b/milena/tests/accu/stat/Makefile.am index c331db0..47197c0 100644 --- a/milena/tests/accu/stat/Makefile.am +++ b/milena/tests/accu/stat/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. # @@ -17,6 +18,7 @@ include $(top_srcdir)/milena/tests/tests.mk check_PROGRAMS = \ + deviation \ var \ min \ min_h \ @@ -27,6 +29,7 @@ check_PROGRAMS = \ mean \ rank +deviation_SOURCES = deviation.cc var_SOURCES = var.cc mean_SOURCES = mean.cc median_h_SOURCES = median_h.cc diff --git a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc b/milena/tests/accu/stat/deviation.cc similarity index 75% copy from milena/tests/fun/v2v/qt_rgb_to_int_u.cc copy to milena/tests/accu/stat/deviation.cc index 5b55d49..e39359e 100644 --- a/milena/tests/fun/v2v/qt_rgb_to_int_u.cc +++ b/milena/tests/accu/stat/deviation.cc @@ -23,22 +23,31 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. +/// \file +/// +/// \brief Tests on mln::accu::deviation. + #include <mln/core/image/image2d.hh> +#include <mln/debug/iota.hh> -#include <mln/fun/v2v/qt_rgb_to_int_u.hh> -#include <mln/value/qt/rgb32.hh> -#include <mln/value/int_u8.hh> +#include <mln/accu/stat/deviation.hh> +#include <mln/data/compute.hh> +#include <mln/io/pgm/save.hh> +#include <mln/data/convert.hh> +#include <mln/value/int_u8.hh> int main() { using namespace mln; + image2d<short> ima(3, 3); + debug::iota(ima); - fun::v2v::qt_rgb_to_int_u<8> f; - - value::qt::rgb32 vcolor(100, 200, 30); + accu::stat::deviation<int> dev(5); - value::int_u8 vgl = f(vcolor); + volatile float + ref = 2.5819f, + trunc_val = (unsigned(data::compute(dev, ima) * 10000.f) / 10000.f); - mln_assertion(vgl == 110); + mln_assertion(trunc_val == ref); } -- 1.5.6.5

14 years, 2 months

last-svn-commit-673-g236e872 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ .../primitive/extract/separators_nonvisible.hh | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 6c4d48d..bfda4bd 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen .mk files in Scribo. * headers.mk, diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 460d10e..8aaeeec 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -322,7 +322,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } @@ -355,7 +357,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } } -- 1.5.6.5

14 years, 2 months

last-svn-commit-671-g9bd5d46 scribo/primitive/extract/separators_nonvisible.hh: Fix warnings.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 ++++ .../primitive/extract/separators_nonvisible.hh | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index be2365e..d3b3a65 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/primitive/extract/separators_nonvisible.hh: Fix warnings. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Regen .mk files in Scribo. * headers.mk, diff --git a/scribo/scribo/primitive/extract/separators_nonvisible.hh b/scribo/scribo/primitive/extract/separators_nonvisible.hh index 460d10e..8aaeeec 100644 --- a/scribo/scribo/primitive/extract/separators_nonvisible.hh +++ b/scribo/scribo/primitive/extract/separators_nonvisible.hh @@ -322,7 +322,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } @@ -355,7 +357,9 @@ namespace scribo angle = (angle * 180.0f) / math::pi; angle = angle * 20.0f + 1.0f; mln::draw::line(debug_angle_, p1, p2, - value::rgb8(angle, angle, angle)); + value::rgb8(unsigned(angle), + unsigned(angle), + unsigned(angle))); } } } -- 1.5.6.5

14 years, 2 months

last-svn-commit-672-g0ce764d mln/accu/stat/deviation.hh: Fix type of constructor argument.

by Guillaume Lazzara

--- milena/ChangeLog | 4 ++++ milena/mln/accu/stat/deviation.hh | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index f97ab68..5ecbfb8 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + * mln/accu/stat/deviation.hh: Fix type of constructor argument. + +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + Remove a useless from_to overload. * mln/convert/from_to.hxx, diff --git a/milena/mln/accu/stat/deviation.hh b/milena/mln/accu/stat/deviation.hh index 1f15100..ca57f23 100644 --- a/milena/mln/accu/stat/deviation.hh +++ b/milena/mln/accu/stat/deviation.hh @@ -64,7 +64,9 @@ namespace mln typedef T argument; typedef M result; - deviation(const T mean); + // Note: We may like to have an initial mean as precise as the + // sum type. So type S is prefered to type T here. + deviation(const S& mean); /// Manipulators. /// \{ @@ -89,7 +91,7 @@ namespace mln // parameter since in the core of the deviation::take method, // this accumulator takes data of type mln_sum(T). accu::math::sum<mln_sum(T),S> sum_; - T mean_; + S mean_; }; @@ -120,7 +122,7 @@ namespace mln template <typename T, typename S, typename M> inline - deviation<T,S,M>::deviation(const T mean) + deviation<T,S,M>::deviation(const S& mean) { init(); mean_ = mean; -- 1.5.6.5

14 years, 2 months

last-svn-commit-671-g8f31015 Remove a useless from_to overload.

by Guillaume Lazzara

* mln/convert/from_to.hxx, * mln/convert/impl/from_unsigned_to_value.hh: Remove overload converting unsigned to float. --- milena/ChangeLog | 8 ++++++++ milena/mln/convert/from_to.hxx | 4 ---- milena/mln/convert/impl/from_unsigned_to_value.hh | 12 ++---------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 549ea7b..f97ab68 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,11 @@ +2010-11-16 Guillaume Lazzara <z(a)lrde.epita.fr> + + Remove a useless from_to overload. + + * mln/convert/from_to.hxx, + * mln/convert/impl/from_unsigned_to_value.hh: Remove overload + converting unsigned to float. + 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> Regen mk files in Milena. diff --git a/milena/mln/convert/from_to.hxx b/milena/mln/convert/from_to.hxx index 24f974a..cc7cc15 100644 --- a/milena/mln/convert/from_to.hxx +++ b/milena/mln/convert/from_to.hxx @@ -311,10 +311,6 @@ namespace mln void from_to_(const Value<F>& from, Value<T>& to); - // unsigned -> float - void - from_to_(const unsigned& from, float& to); - // double-> Value template <typename V> void diff --git a/milena/mln/convert/impl/from_unsigned_to_value.hh b/milena/mln/convert/impl/from_unsigned_to_value.hh index fe09a3e..4d4fc3a 100644 --- a/milena/mln/convert/impl/from_unsigned_to_value.hh +++ b/milena/mln/convert/impl/from_unsigned_to_value.hh @@ -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. // @@ -119,15 +120,6 @@ namespace mln } - // Facades. - // unsigned-> float - void - from_to_(const unsigned& from, float& to) - { - to = from; - } - - } // end of namespace mln::convert::over_load -- 1.5.6.5

14 years, 2 months

last-svn-commit-670-gafdb77c Remove a useless from_to overload.

by Guillaume Lazzara

14 years, 2 months

last-svn-commit-594-gf3beb04 Update default value in an example

by Guillaume Lazzara

--- scribo/src/primitive/extract/lines_pattern.cc | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/scribo/src/primitive/extract/lines_pattern.cc b/scribo/src/primitive/extract/lines_pattern.cc index d2ad562..cb56b36 100644 --- a/scribo/src/primitive/extract/lines_pattern.cc +++ b/scribo/src/primitive/extract/lines_pattern.cc @@ -39,7 +39,8 @@ const char *args_desc[][2] = { { "input.pbm", "A binary image." }, { "length", " Minimum line length. (Common value : 51)" }, - { "delta", " Distance between the object pixel and the background pixel (Common value : 5)" }, + { "delta", " Distance between the object pixel and the background pixel" + "(Common value : 4)" }, {0, 0} }; @@ -63,6 +64,7 @@ int main(int argc, char *argv[]) h_lines = scribo::primitive::extract::lines_h_pattern(input, atoi(argv[2]), atoi(argv[3])); + image2d<bool> v_lines = scribo::primitive::extract::lines_v_pattern(input, atoi(argv[2]), -- 1.5.6.5

14 years, 2 months

last-svn-commit-644-gbb14430 scribo/core/document.hh: Introduce new document structure.

by Guillaume Lazzara

--- scribo/ChangeLog | 4 + scribo/scribo/core/document.hh | 162 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 166 insertions(+), 0 deletions(-) create mode 100644 scribo/scribo/core/document.hh diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 4372f54..3c66038 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,7 @@ +2010-09-02 Guillaume Lazzara <z(a)lrde.epita.fr> + + * scribo/core/document.hh: Introduce new document structure. + 2010-11-15 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/viewer/Makefile.am: Remove deprecated dependencies. diff --git a/scribo/scribo/core/document.hh b/scribo/scribo/core/document.hh new file mode 100644 index 0000000..93d9348 --- /dev/null +++ b/scribo/scribo/core/document.hh @@ -0,0 +1,162 @@ +// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// +// This file is part of Olena. +// +// Olena is free software: you can redistribute it and/or modify it under +// the terms of the GNU General Public License as published by the Free +// Software Foundation, version 2 of the License. +// +// Olena is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Olena. If not, see <http://www.gnu.org/licenses/>. +// +// As a special exception, you may use this file as part of a free +// software project without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to produce +// an executable, this file does not by itself cause the resulting +// executable to be covered by the GNU General Public License. This +// exception does not however invalidate any other reasons why the +// executable file might be covered by the GNU General Public License. + +#ifndef SCRIBO_CORE_DOCUMENT_HH +# define SCRIBO_CORE_DOCUMENT_HH + +/// \file +/// +/// \brief Describes document content. + +# include <mln/core/image/image2d.hh> +# include <mln/value/rgb8.hh> +# include <mln/io/magick/load.hh> + +# include <scribo/core/component_set.hh> +# include <scribo/core/line_set.hh> + +namespace scribo +{ + + template <typename L> + struct document + { + public: + + document(); + document(const char *filename); + + const char * filename() const; + + bool is_valid() const; + + const line_set<L>& text() const; + void set_text(const line_set<L>& line); + + const component_set<L>& elements() const; + void set_elements(const component_set<L>& elements); + + const mln::image2d<value::rgb8>& image() const; + + private: + void open(); + + const char *filename_; + mln::image2d<mln::value::rgb8> image_; + + line_set<L> lines_; + component_set<L> elements_; + }; + + + +# ifndef MLN_INCLUDE_ONLY + + + template <typename L> + document<L>::document() + { + } + + + template <typename L> + document<L>::document(const char *filename) + : filename_(filename) + { + open(); + } + + + template <typename L> + const char * + document<L>::filename() const + { + return filename_; + } + + + template <typename L> + void + document<L>::open() + { + mln::io::magick::load(image_, filename_); + } + + + template <typename L> + bool + document<L>::is_valid() const + { + return image_.is_valid(); + } + + + template <typename L> + const line_set<L>& + document<L>::text() const + { + return lines_; + } + + + template <typename L> + void + document<L>::set_text(const line_set<L>& line) + { + lines_ = line; + } + + + template <typename L> + const component_set<L>& + document<L>::elements() const + { + return elements_; + } + + + template <typename L> + void + document<L>::set_elements(const component_set<L>& elements) + { + elements_ = elements; + } + + + template <typename L> + const mln::image2d<value::rgb8>& + document<L>::image() const + { + return image_; + } + + +# endif // ! MLN_INCLUDE_ONLY + + +} // end of namespace scribo + + +#endif // ! SCRIBO_CORE_DOCUMENT_HH -- 1.5.6.5

14 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Olena-patches