- Olena-patches

4231: mln/transform/hough.hh: Improve.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

--- milena/ChangeLog | 4 + milena/mln/transform/hough.hh | 159 ++++++++++++----------------------------- 2 files changed, 50 insertions(+), 113 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 51bcd4e..ae208c4 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,7 @@ +2009-07-01 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + + * mln/transform/hough.hh: Improve. + 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> Small fixes. diff --git a/milena/mln/transform/hough.hh b/milena/mln/transform/hough.hh index 65d4512..19ed1b0 100644 --- a/milena/mln/transform/hough.hh +++ b/milena/mln/transform/hough.hh @@ -30,12 +30,13 @@ /// /// Compute the hough transform. - # include <mln/core/image/image2d.hh> # include <mln/data/fill.hh> # include <mln/geom/nrows.hh> # include <mln/geom/ncols.hh> +# include <mln/geom/min_col.hh> +# include <mln/geom/min_row.hh> # include <mln/geom/bbox.hh> # include <mln/opt/at.hh> @@ -49,14 +50,6 @@ # include <mln/value/int_u8.hh> -//FIXME: to be removed. For debug purpose. -//#include <mln/data/convert.hh> -//#include <mln/value/rgb8.hh> -//#include <mln/draw/line.hh> -//#include <mln/literal/colors.hh> -//#include <mln/io/ppm/save.hh> - - namespace mln { @@ -67,8 +60,6 @@ namespace mln /// Objects used for computation must be set to 'true'. /// /// \param[in] input_ A binary image. - /// \param[in] min_angle Minimum angle which can be found. - /// \param[in] max_angle Maximum angle which can be found. /// /// \return A 2D image of float. Rows are used for the distance and /// columns are used for the angles. Angles go from 0 to 359. @@ -79,129 +70,71 @@ namespace mln // template <typename I> image2d<float> - hough(const Image& input_, int min_angle, int max_angle); + hough(const Image& input_); - /// \overload - template <typename I> - image2d<float> - hough(const Image& input); - # ifndef MLN_INCLUDE_ONLY + namespace internal + { + + + /// FIXME: we may prefer to have an angle value type. + double to_radians(double angle) + { + return angle * math::pi / 180.0f; + } + + + } // end of namespace mln::transform::internal + template <typename I> image2d<float> - hough(const Image& input_, int min_angle, int max_angle) + hough(const Image& input_) { trace::entering("mln::transform::hough"); - mln_precondition(min_angle < max_angle); const I& input = exact(input_); mlc_equal(mln_value(I), bool)::check(); mln_precondition(input.is_valid()); - math::round<int> rd; - double deg2rad = math::pi / 180.0f; - int range = rd(sqrt((double)(geom::ncols(input) * geom::ncols(input) - + geom::nrows(input) * geom::nrows(input)))); - - long temp = min_angle; - min_angle = 450 - max_angle; - max_angle = 450 - temp; - - // Pre-compute sin and cos values. - util::array<double> sin_cache(360), - cos_cache(360); - for (int omega = 0; omega < 360; ++omega) - { - sin_cache[omega] = math::sin((double)(omega * deg2rad)); - cos_cache[omega] = math::cos((double)(omega * deg2rad)); - } - - image2d<float> output(make::box2d(range,360)); - data::fill(output, 0); - - mln_piter(I) p(input.domain()); + def::coord + minrow = geom::min_row(input), + mincol = geom::min_col(input); + unsigned + ncols = geom::ncols(input), + nrows = geom::nrows(input); + int compt = 0; + int maxRho = (int)(sqrt((ncols * nrows) + + (ncols * nrows)) + + 0.5); + + image2d<float> accu(360, 2*maxRho); + data::fill(accu, 0.f); + + mln_piter(image2d<int>) p(input.domain()); for_all(p) - if (input(p)) // Is this site part of an objet? - { - - long teta1 = min_angle; - long teta2 = max_angle; - for (int omega = teta1; omega < teta2; ++omega) + if (input(p)) + for (int angle = 0 ; angle < 360 ; ++angle) { - long tetad = omega%360; - long r = rd(p.col() * sin_cache[tetad] - + p.row() * cos_cache[tetad]); - if (r > 0 && r < range) - output.at_(r, tetad) += 1; - } - - teta1 = min_angle + 180; - teta2 = max_angle + 180; - for (int omega = teta1; omega < teta2; ++omega) - { - long tetad = omega%360; - long r = rd(p.col() * sin_cache[tetad] - + p.row() * cos_cache[tetad]); - if (r > 0 && r < range) - output.at_(r, tetad) += 1; - } - - } - -// { -// point2d max_p(0,0); -// mln_piter_(image2d<float>) p(output.domain()); -// for_all(p) -// if (output(max_p) < output(p)) -// max_p = p; -// -// point2d b,e; -// b.col() = 0; -// b.row() = max_p.row()/cos(deg2rad*max_p.col()); -// if (b.row() < 0) -// { -// b.row() = 0; -// b.col() = max_p.row()/sin(deg2rad*max_p.col()); -// } else if (b.row() >= input.nrows()) -// { -// b.row() = input.nrows() - 1; -// b.col() = max_p.row() - b.row() * cos(deg2rad*max_p.col())/sin(deg2rad*max_p.col()); -// } -// -// e.col() = input.ncols() - 1; -// e.row() = max_p.row() - e.col() * sin(deg2rad*max_p.col()) / cos(deg2rad*max_p.col()); -// if (e.row() < 0) -// { -// e.row() = 0; -// e.col() = max_p.row()/sin(deg2rad*max_p.col()); -// } else if (e.row() >= input.nrows()) -// { -// e.row() = input.nrows() - 1; -// e.col() = max_p.row() - e.row() * cos(deg2rad*max_p.col())/sin(deg2rad*max_p.col()); -// } -// -// std::cout < toto = data::convert(value::rgb8(), input); -// draw::line(toto, b, e, literal::red); -// io::ppm::save(toto, "tmp_input.ppm"); -// } - trace::exiting("mln::transform::hough"); - return output; - } + double + theta = internal::to_radians(angle), + rho = (p.row() - minrow) * math::cos(theta) + + (p.col() - mincol) * math::sin(theta); + int + indexAngle = (int) (angle), + indexRho = (int)(rho + maxRho + 0.5); + ++opt::at(accu, indexAngle, indexRho); + } - template <typename I> - image2d<float> - hough(const Image& input) - { - return hough(input, -180, 180); + trace::exiting("mln::transform::hough"); + return accu; } + # endif // ! MLN_INCLUDE_ONLY } // end of namespace mln::transform -- 1.5.6.5

1 0

4230: Add new programs to extract data from microfilms.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

* lazzara/afp/micro_films/Makefile: New. * lazzara/afp/micro_films/demat_mf_afp.sh: New script running various programs. * lazzara/afp/micro_films/keep_background.cc, * lazzara/afp/micro_films/extract_mf.cc, * lazzara/afp/micro_films/split_image.cc: new dedicated programs for microfilms data extraction. --- milena/sandbox/ChangeLog | 14 ++ milena/sandbox/lazzara/afp/micro_films/Makefile | 8 ++ .../lazzara/afp/micro_films/demat_mf_afp.sh | 52 ++++++++ .../sandbox/lazzara/afp/micro_films/extract_mf.cc | 126 ++++++++++++++++++++ .../lazzara/afp/micro_films/keep_background.cc | 85 +++++++++++++ .../sandbox/lazzara/afp/micro_films/split_image.cc | 80 +++++++++++++ 6 files changed, 365 insertions(+), 0 deletions(-) create mode 100644 milena/sandbox/lazzara/afp/micro_films/Makefile create mode 100755 milena/sandbox/lazzara/afp/micro_films/demat_mf_afp.sh create mode 100644 milena/sandbox/lazzara/afp/micro_films/extract_mf.cc create mode 100644 milena/sandbox/lazzara/afp/micro_films/keep_background.cc create mode 100644 milena/sandbox/lazzara/afp/micro_films/split_image.cc diff --git a/milena/sandbox/ChangeLog b/milena/sandbox/ChangeLog index 5ec4781..216b67c 100644 --- a/milena/sandbox/ChangeLog +++ b/milena/sandbox/ChangeLog @@ -1,3 +1,17 @@ +2009-07-01 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + + Add new programs to extract data from microfilms. + + * lazzara/afp/micro_films/Makefile: New. + + * lazzara/afp/micro_films/demat_mf_afp.sh: New script running various + programs. + + * lazzara/afp/micro_films/keep_background.cc, + * lazzara/afp/micro_films/extract_mf.cc, + * lazzara/afp/micro_films/split_image.cc: new dedicated programs for + microfilms data extraction. + 2009-07-03 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add some utils to handle objects detection with mean color attribute. diff --git a/milena/sandbox/lazzara/afp/micro_films/Makefile b/milena/sandbox/lazzara/afp/micro_films/Makefile new file mode 100644 index 0000000..4c81cc0 --- /dev/null +++ b/milena/sandbox/lazzara/afp/micro_films/Makefile @@ -0,0 +1,8 @@ +CXXFLAGS = -I../../../../ -I. -I../../../../../ -I../../../bin -O3 -DNDEBUG + +PROGRAMS = \ + extract_mf \ + split_image \ + keep_background + +all: $(PROGRAMS) diff --git a/milena/sandbox/lazzara/afp/micro_films/demat_mf_afp.sh b/milena/sandbox/lazzara/afp/micro_films/demat_mf_afp.sh new file mode 100755 index 0000000..99f71d4 --- /dev/null +++ b/milena/sandbox/lazzara/afp/micro_films/demat_mf_afp.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +PATH_TO_BIN=/lrde/stockholm/lazzara/svn/olena/git/oln/milena/sandbox/bin +PATH_TO_SCRIBO=/lrde/stockholm/lazzara/svn/olena/git/build/scribo/src + +if [ $# -ne 2 ]; then + echo "Usage: $0 <input.pgm> <initial rotation>" + exit 1 +fi + +input=$PWD/$1 +bname=`basename $1 .pgm` +mkdir -p $bname +cd $bname + + +echo "* Running pre-processing algorithms on $1." +${PATH_TO_SCRIBO}/binarization/simple $input ${bname}.pbm +${PATH_TO_BIN}/morpho/closing/structural_rectangle2d ${bname}.pbm 21 21 ${bname}_clo.pbm +./../keep_background ${bname}_clo.pbm ${bname}_bg.pbm +${PATH_TO_BIN}/morpho/dilation_rectangle2d ${bname}_bg.pbm 70 70 ${bname}_clo_dil.pbm +${PATH_TO_SCRIBO}/negate ${bname}_clo_dil.pbm ${bname}_clo_dil_i.pbm + +echo "* Splitting $1 into several documents." +./../extract_mf $input ${bname}.pbm ${bname}_clo_dil_i.pbm "$2" + +echo "* Processing extracted documents" +for f in mf_*_.pgm; do + echo " - Processing $f..." + + fbname=`basename $f .pgm` + +# Compute two different binary versions. + echo " # Binarization." + ${PATH_TO_BIN}/level_objects $f 100 ${fbname}_level.pgm + ${PATH_TO_SCRIBO}/binarization/simple ${fbname}_level.pgm ${fbname}_level.pbm + + ${PATH_TO_SCRIBO}/binarization/simple $f ${fbname}.pbm + +# '_level' or '' according to which binary version you want to use. +use_level='' + + ${PATH_TO_BIN}/logical/not ${fbname}${use_level}.pbm ${fbname}${use_level}_i.pbm + + echo " # Filtering." + ${PATH_TO_SCRIBO}/filter/small_objects ${fbname}${use_level}_i.pbm 3 ${fbname}${use_level}_small.pbm + ${PATH_TO_SCRIBO}/filter/thin_objects ${fbname}${use_level}_small.pbm 3 ${fbname}${use_level}_small_thin.pbm + + echo " # Text extraction." + ${PATH_TO_SCRIBO}/extract_text_double_link ${fbname}${use_level}_small_thin.pbm 100 100 "${fbname}_text" +done + diff --git a/milena/sandbox/lazzara/afp/micro_films/extract_mf.cc b/milena/sandbox/lazzara/afp/micro_films/extract_mf.cc new file mode 100644 index 0000000..6587d1d --- /dev/null +++ b/milena/sandbox/lazzara/afp/micro_films/extract_mf.cc @@ -0,0 +1,126 @@ +// Copyright (C) 2009 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. + + +/// \file +/// +/// + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/imorph/labeled_image.hh> +#include <mln/core/image/dmorph/image_if.hh> +#include <mln/core/alias/neighb2d.hh> +#include <mln/core/var.hh> + +#include <mln/data/fill.hh> +#include <mln/debug/filename.hh> +#include <mln/io/pbm/all.hh> +#include <mln/io/pgm/all.hh> +#include <mln/labeling/blobs.hh> +#include <mln/labeling/background.hh> +#include <mln/labeling/n_max.hh> + +#include <mln/value/label_16.hh> + +#include <mln/geom/rotate.hh> +#include <mln/data/fill.hh> +#include <mln/logical/not.hh> + +#include <tools/usage.hh> +#include <scribo/preprocessing/unskew.hh> +#include <scribo/filter/small_objects.hh> + +#include <mln/data/compare.hh> + + +const char *args_desc[][2] = +{ + { "input.pgm", "A gray level image." }, + { "input.pbm", "A binary image." }, + { "mask.pbm", "A binary image. Objects are set to 'true'. Will be used to split input.pbm into several images." }, + { "rot", "Initial rotation in degrees." }, + { 0, 0 } +}; + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc != 5) + return tools::usage(argv, + "Extract an image for each object in the input image.", + "input.pgm input.pbm mask.pbm rot", + args_desc, "Gray level images extracted from the input."); + + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); + + image2d<bool> input_bw; + io::pbm::load(input_bw, argv[2]); + + image2d<bool> mask; + io::pbm::load(mask, argv[3]); + + value::label_16 nlabels; + typedef image2d<value::label_16> lbl_t; + lbl_t lbl_ = labeling::blobs(mask, c8(), nlabels); + labeled_image<lbl_t> lbl(lbl_, nlabels); + + debug::internal::filename_prefix = "mf"; + + + value::label_16 nbglabels; + lbl_t lbl_bg = labeling::background(input_bw, c8(), nbglabels); + + // Should be always true... + value::label_16 bg = lbl_bg(point2d(0,0)); + // ... but not as robust as the line below. +// value::label_16 bg = labeling::n_max(lbl_bg, nbglabels, 2)[1]; + + logical::not_inplace(input_bw); + + for (unsigned i = 1; i <= lbl.nlabels(); ++i) + { + io::pbm::save(input_bw | lbl.bbox(i), debug::filename(".pbm", i)); + mln_VAR(tmp_bw, input_bw | lbl.bbox(i)); + data::fill((tmp_bw | (pw::value(lbl_bg) == pw::cst(bg))).rw(), false); + + mln_VAR(cleaned, + scribo::preprocessing::unskew(geom::rotate(tmp_bw, atoi(argv[4])))); + + double angle = cleaned.second(); + +// io::pbm::save(cleaned.first(), debug::filename("object.pbm")); + mln_VAR(cell, input | lbl.bbox(i)); + data::fill((cell | (pw::value(lbl_bg) == pw::cst(bg))).rw(), + mln_max(value::int_u8)); + io::pgm::save(geom::rotate(cell, angle + atoi(argv[4]), + mln_max(value::int_u8)), + debug::filename(".pgm", i)); + } + +} diff --git a/milena/sandbox/lazzara/afp/micro_films/keep_background.cc b/milena/sandbox/lazzara/afp/micro_films/keep_background.cc new file mode 100644 index 0000000..78373ad --- /dev/null +++ b/milena/sandbox/lazzara/afp/micro_films/keep_background.cc @@ -0,0 +1,85 @@ +// Copyright (C) 2009 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. + + +/// \file +/// +/// Keep the background from a binary image. + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/pw/all.hh> +#include <mln/core/image/dmorph/image_if.hh> + +#include <mln/data/fill.hh> +#include <mln/io/pbm/all.hh> +#include <mln/labeling/blobs.hh> + +#include <mln/logical/not.hh> + +#include <mln/value/label_16.hh> + +#include <tools/usage.hh> + + +const char *args_desc[][2] = +{ + { "input.pbm", "A binary image. Objects are set to 'true'." }, + { 0, 0 } +}; + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc != 3) + return tools::usage(argv, + "Extract the background from a binary image.", + "input.pbm output.pbm", + args_desc, "A binary image. Background is set to 'false'."); + + image2d<bool> input; + io::pbm::load(input, argv[1]); + + logical::not_inplace(input); + + typedef value::label_16 V; + V nlabels; + image2d<V> lbl = labeling::blobs(input, c8(), nlabels); + + image2d<bool> output; + initialize(output, input); + + V bg_lbl = lbl(literal::origin); + + data::fill(output, false); + data::fill((output | (pw::value(lbl) == pw::cst(bg_lbl))).rw(), true); + + io::pbm::save(output, argv[2]); +} + diff --git a/milena/sandbox/lazzara/afp/micro_films/split_image.cc b/milena/sandbox/lazzara/afp/micro_films/split_image.cc new file mode 100644 index 0000000..b0c71c7 --- /dev/null +++ b/milena/sandbox/lazzara/afp/micro_films/split_image.cc @@ -0,0 +1,80 @@ +// Copyright (C) 2009 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. + + +/// \file +/// +/// Split an image into several smaller image based on the objects. + +#include <mln/core/image/image2d.hh> +#include <mln/core/image/imorph/labeled_image.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/data/fill.hh> +#include <mln/debug/filename.hh> +#include <mln/io/pbm/all.hh> +#include <mln/io/pgm/all.hh> +#include <mln/labeling/blobs.hh> +#include <mln/value/int_u8.hh> + +#include <tools/usage.hh> + + +const char *args_desc[][2] = +{ + { "input.pgm", "A gray level image." }, + { "mask.pbm", "A binary image. Objects are set to 'true'. Will be used to split input.pbm into several images." }, + { 0, 0 } +}; + + + +int main(int argc, char *argv[]) +{ + using namespace mln; + + if (argc != 3) + return tools::usage(argv, + "Extract an image for each object in the input image.", + "input.pgm mask.pbm", + args_desc, "Gray level images extracted from the input."); + + image2d<value::int_u8> input; + io::pgm::load(input, argv[1]); + + image2d<bool> mask; + io::pbm::load(mask, argv[2]); + + value::int_u8 nlabels; + typedef image2d<value::int_u8> lbl_t; + lbl_t lbl_ = labeling::blobs(mask, c8(), nlabels); + labeled_image<lbl_t> lbl(lbl_, nlabels); + + debug::internal::filename_prefix = "split"; + + for (unsigned i = 1; i < lbl.nlabels(); ++i) + io::pgm::save(input | lbl.bbox(i), debug::filename("object.pgm")); + +} -- 1.5.6.5

1 0

4229: Small fixes.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

* mln/core/image/dmorph/sub_image.hh: add missing 'const'. * mln/core/image/imorph/tr_image.hh: add missing members. * mln/core/site_set/p_vertices.hh: add a more generic constructor. * mln/labeling/blobs.hh: revamp warning output. * mln/labeling/n_max.hh: add an overload. * mln/make/edge_image.hh: fix namespace ambiguities. --- milena/ChangeLog | 16 ++++++++++++++++ milena/mln/core/image/dmorph/sub_image.hh | 12 ++++++------ milena/mln/core/image/imorph/tr_image.hh | 24 ++++++++++++++++++++++++ milena/mln/core/site_set/p_vertices.hh | 16 ++++++++++++++++ milena/mln/labeling/blobs.hh | 6 +++--- milena/mln/labeling/n_max.hh | 24 ++++++++++++++++++++++++ milena/mln/make/edge_image.hh | 14 +++++++------- 7 files changed, 96 insertions(+), 16 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 7bc9e0a..51bcd4e 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,21 @@ 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Small fixes. + + * mln/core/image/dmorph/sub_image.hh: add missing 'const'. + + * mln/core/image/imorph/tr_image.hh: add missing members. + + * mln/core/site_set/p_vertices.hh: add a more generic constructor. + + * mln/labeling/blobs.hh: revamp warning output. + + * mln/labeling/n_max.hh: add an overload. + + * mln/make/edge_image.hh: fix namespace ambiguities. + +2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/topo/skeleton/crest.hh: Fix a warning. 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/mln/core/image/dmorph/sub_image.hh b/milena/mln/core/image/dmorph/sub_image.hh index c54b612..9155b09 100644 --- a/milena/mln/core/image/dmorph/sub_image.hh +++ b/milena/mln/core/image/dmorph/sub_image.hh @@ -53,7 +53,7 @@ namespace mln template <typename I, typename S> struct data< sub_image<I,S> > { - data(I& ima, const S& pset); + data(const I& ima, const S& pset); I ima_; S domain_; @@ -109,10 +109,10 @@ namespace mln sub_image(); /// Constructor. - sub_image(I& ima, const S& pset); + sub_image(const I& ima, const S& pset); /// Initialization. - void init_(I& ima, const S& pset); + void init_(const I& ima, const S& pset); /// Give the definition domain. const S& domain() const; @@ -164,7 +164,7 @@ namespace mln template <typename I, typename S> inline - data< sub_image<I,S> >::data(I& ima, const S& pset) + data< sub_image<I,S> >::data(const I& ima, const S& pset) : ima_(ima), domain_(pset) { @@ -183,7 +183,7 @@ namespace mln template <typename I, typename S> inline - sub_image<I,S>::sub_image(I& ima, const S& pset) + sub_image<I,S>::sub_image(const I& ima, const S& pset) { init_(ima, pset); } @@ -191,7 +191,7 @@ namespace mln template <typename I, typename S> inline void - sub_image<I,S>::init_(I& ima, const S& pset) + sub_image<I,S>::init_(const I& ima, const S& pset) { mln_precondition(! this->is_valid()); this->data_ = new internal::data< sub_image<I,S> >(ima, pset); diff --git a/milena/mln/core/image/imorph/tr_image.hh b/milena/mln/core/image/imorph/tr_image.hh index 530f8ab..cfe5b08 100644 --- a/milena/mln/core/image/imorph/tr_image.hh +++ b/milena/mln/core/image/imorph/tr_image.hh @@ -136,7 +136,14 @@ namespace mln mln_value(I) operator()(const psite& p) const; mln_value(I) operator()(const psite& p); + /// Set the transformation. void set_tr(T& tr); + + /// Return the underlying transformation. + const T& tr() const; + + /// Return the domain morpher. + const S& domain() const; }; @@ -225,6 +232,23 @@ namespace mln template <typename S, typename I, typename T> inline + const T& + tr_image<S,I,T>::tr() const + { + return this->data_->tr_; + } + + template <typename S, typename I, typename T> + inline + const S& + tr_image<S,I,T>::domain() const + { + return this->data_->s_; + } + + + template <typename S, typename I, typename T> + inline tr_image<S,I,T> transposed_image(const Site_Set<S>& s, const Image& ima, const Function_v2v<T>& t) diff --git a/milena/mln/core/site_set/p_vertices.hh b/milena/mln/core/site_set/p_vertices.hh index 367f3f4..f8a73d7 100644 --- a/milena/mln/core/site_set/p_vertices.hh +++ b/milena/mln/core/site_set/p_vertices.hh @@ -1,3 +1,4 @@ + // Copyright (C) 2008, 2009 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. @@ -111,6 +112,9 @@ namespace mln p_vertices(const Graph<G>& gr, const Function<F2>& f); /// \} + /// Copy constructor. + template <typename F2> + p_vertices(const p_vertices<G,F2>& other); /// Associated types. /// \{ @@ -252,6 +256,18 @@ namespace mln } template <typename G, typename F> + template <typename F2> + inline + p_vertices<G,F>::p_vertices(const p_vertices<G,F2>& other) + { + mln_precondition(other.is_valid()); + mlc_converts_to(F2,F)::check(); + + g_ = other.graph(); + convert::from_to(other.function(), f_); + } + + template <typename G, typename F> inline unsigned p_vertices<G,F>::nsites() const diff --git a/milena/mln/labeling/blobs.hh b/milena/mln/labeling/blobs.hh index ccbcde4..bfb7b4c 100644 --- a/milena/mln/labeling/blobs.hh +++ b/milena/mln/labeling/blobs.hh @@ -1,4 +1,5 @@ -// Copyright (C) 2007, 2008, 2009 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2007, 2008, 2009 EPITA Research and Development +// Laboratory (LRDE) // // This file is part of Olena. // @@ -102,8 +103,7 @@ namespace mln if (nlabels == mln_max(L)) { trace::warning("labeling aborted! Too many labels \ - for this label type: nlabels > \ - max(label_type)."); +for this label type: nlabels > max(label_type)."); return output; } diff --git a/milena/mln/labeling/n_max.hh b/milena/mln/labeling/n_max.hh index 4be453c..f17f619 100644 --- a/milena/mln/labeling/n_max.hh +++ b/milena/mln/labeling/n_max.hh @@ -27,6 +27,8 @@ # define MLN_LABELING_N_MAX_HH # include <mln/core/concept/image.hh> +# include <mln/accu/math/count.hh> +# include <mln/labeling/compute.hh> # include <mln/util/array.hh> /// \file @@ -48,6 +50,11 @@ namespace mln n_max(const util::array<V>& in_arr, unsigned n); + template <typename L> + util::array<mln_value(L)> + n_max(const Image<L>& lbl, const mln_value(L)& nlabels, unsigned n); + + # ifndef MLN_INCLUDE_ONLY template <typename L, typename V> @@ -79,6 +86,23 @@ namespace mln return output; } + + template <typename L> + util::array<mln_value(L)> + n_max(const Image<L>& lbl, const mln_value(L)& nlabels, unsigned n) + { + mln_precondition(exact(lbl).is_valid()); + + typedef accu::math::count<mln_site(L)> accu_t; + accu_t accu; + + util::array<mln_result(accu_t)> + counts = labeling::compute(accu, lbl, nlabels); + + return n_max<mln_value(L)>(counts, n); + } + + # endif // !MLN_INCLUDE_ONLY } // end of namespace mln::labeling diff --git a/milena/mln/make/edge_image.hh b/milena/mln/make/edge_image.hh index c19a2dd..7732e7b 100644 --- a/milena/mln/make/edge_image.hh +++ b/milena/mln/make/edge_image.hh @@ -83,7 +83,7 @@ namespace mln // template <typename P, typename V, typename G, typename FP, typename FV> mln::edge_image<mln_result(FP),mln_result(FV),G> - edge_image(const vertex_image<P,V,G>& v_ima_, + edge_image(const mln::vertex_image<P,V,G>& v_ima_, const p_edges<G,FP> pe, const Function_vv2v<FV>& fv_); @@ -100,7 +100,7 @@ namespace mln // template <typename P, typename V, typename G, typename FV> mln::edge_image<void,mln_result(FV),G> - edge_image(const vertex_image<P,V,G>& v_ima_, + edge_image(const mln::vertex_image<P,V,G>& v_ima_, const Function_vv2v<FV>& fv_); @@ -145,14 +145,14 @@ namespace mln template <typename P, typename V, typename G, typename FP, typename FV> mln::edge_image<mln_result(FP),mln_result(FV),G> - edge_image(const vertex_image<P,V,G>& v_ima_, + edge_image(const mln::vertex_image<P,V,G>& v_ima_, const p_edges<G,FP> pe, const Function_vv2v<FV>& fv_) { trace::entering("make::edge_image"); const FV& fv = exact(fv_); - const vertex_image<P,V,G>& v_ima = exact(v_ima_); + const mln::vertex_image<P,V,G>& v_ima = exact(v_ima_); mln_precondition(v_ima.is_valid()); typedef mln::edge_image<mln_result(FP),mln_result(FV),G> edge_ima_t; @@ -170,16 +170,16 @@ namespace mln template <typename P, typename V, typename G, typename FV> mln::edge_image<void,mln_result(FV),G> - edge_image(const vertex_image<P,V,G>& v_ima_, + edge_image(const mln::vertex_image<P,V,G>& v_ima_, const Function_vv2v<FV>& fv_) { trace::entering("make::edge_image"); const FV& fv = exact(fv_); - const vertex_image<P,V,G>& v_ima = exact(v_ima_); + const mln::vertex_image<P,V,G>& v_ima = exact(v_ima_); mln_precondition(v_ima.is_valid()); - p_edges<G> pe(v_ima.graph()); + p_edges<G> pe(v_ima.domain().graph()); typedef mln::edge_image<void,mln_result(FV),G> edge_ima_t; edge_ima_t ima_e(pe); -- 1.5.6.5

1 0

4228: mln/topo/skeleton/crest.hh: Fix a warning.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

--- milena/ChangeLog | 4 ++++ milena/mln/topo/skeleton/crest.hh | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index d3786a3..7bc9e0a 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/topo/skeleton/crest.hh: Fix a warning. + +2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: Fix output domain. 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> diff --git a/milena/mln/topo/skeleton/crest.hh b/milena/mln/topo/skeleton/crest.hh index 7ffa7e8..f1501bf 100644 --- a/milena/mln/topo/skeleton/crest.hh +++ b/milena/mln/topo/skeleton/crest.hh @@ -116,7 +116,7 @@ namespace mln mln_niter(N) n(nbh, p); for_all(p) { - if (!input(p) || dist_map(p) < 0) + if (!input(p) || dist_map(p) < static_cast<mln_value(D)>(0)) continue; unsigned nb_eq = 0; -- 1.5.6.5

1 0

4227: mln/geom/rotate.hh: Fix output domain.
by Guillaume Lazzara 03 Jul '09

03 Jul '09

--- milena/ChangeLog | 4 +++ milena/mln/geom/rotate.hh | 66 ++++++++++++++++++++++++++++++++++---------- 2 files changed, 55 insertions(+), 15 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 5fa5f9c..d3786a3 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,9 @@ 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * mln/geom/rotate.hh: Fix output domain. + +2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * tests/morpho/closing/approx/Makefile.am: add test outputs to CLEANFILES. diff --git a/milena/mln/geom/rotate.hh b/milena/mln/geom/rotate.hh index e3a5094..34f9e9b 100644 --- a/milena/mln/geom/rotate.hh +++ b/milena/mln/geom/rotate.hh @@ -32,6 +32,7 @@ # include <mln/core/concept/image.hh> # include <mln/core/concept/site_set.hh> +# include <mln/core/concept/box.hh> # include <mln/core/routine/extend.hh> @@ -58,20 +59,22 @@ namespace mln /// Perform a rotation from the center of an image. /// - /// \param[in] input_ An image. + /// \param[in] input An image. /// \param[in] angle An angle in degrees. - /// \param[in] extension_ Function, image or value which will be used + /// \param[in] extension Function, image or value which will be used /// as extension. This extension allows to map /// values to sites which where not part /// of the domain before the rotation. - /// \param[in] output_domain_ The domain of the output image. + /// \param[in] output_domain The domain of the output image. An + /// invalid domain, causes the routine + /// to use the rotated input_ domain. /// - /// \return An image with the same domain as \p input_. + /// \return An image with the same domain as \p input. // template <typename I, typename Ext, typename S> mln_concrete(I) - rotate(const Image& input_, double angle, - const Ext& extension_, const Site_Set<S>& output_domain); + rotate(const Image& input, double angle, + const Ext& extension, const Site_Set<S>& output_domain); /// \overload @@ -87,6 +90,7 @@ namespace mln rotate(const Image& input_, double angle); + # ifndef MLN_INCLUDE_ONLY @@ -99,27 +103,59 @@ namespace mln const I& input = exact(input_); const S& output_domain = exact(output_domain_); + const mln_exact(Ext)& extension = exact(extensions_); + // Do not check that output_domain_ is valid. If it is not, + // further in this routine, we define a default domain. mln_precondition(input.is_valid()); mln_precondition(angle >= -360.0f && angle <= 360.0f); - mlc_converts_to(Ext, mln_value(I))::check(); - /// FIXME: A precondition is probably missing for the extension value. + mlc_converts_to(mln_exact(Ext), mln_value(I))::check(); + mlc_is_a(S,Box)::check(); + // FIXME: A precondition is probably missing for the extension value. mln_site(I) c = geom::bbox(input).center(); - fun::x2x::translation<2,double> + typedef fun::x2x::translation<2,double> trans_t; + trans_t t(-1 * c.to_vec()), t_1(c.to_vec()); typedef fun::x2x::rotation<2,double> rot_t; rot_t rot(math::pi * angle / 180.f, literal::origin); + typedef + fun::x2x::composed<trans_t, fun::x2x::composed<rot_t, trans_t> > + comp_transf_t; + + comp_transf_t comp_transf = compose(t_1, compose(rot, t)); + + S b = output_domain; + // Automatically adjusting the output domain if needed. + if (!output_domain.is_valid()) + { + typedef mln_site(I) P; + P + rpmin = P(comp_transf(input.domain().pmin().to_vec())), + rpmax = P(comp_transf(input.domain().pmax().to_vec())); + + for (unsigned i = 0; i < mln_site_(I)::dim; ++i) + if (rpmax[i] < rpmin[i]) + std::swap(rpmax[i], rpmin[i]); + + b = mln_box(I)(rpmin, rpmax); + } + + typedef + tr_image<mln_box(I), extension_val<const I>, comp_transf_t> tr_t; + + tr_t tr = transposed_image(b, extend(input, extension_), comp_transf); + + typedef mln_site(I) P; + P rpmin = P(rot(input.domain().pmin().to_vec())); + mln_concrete(I) output; - initialize(output, input); + initialize(output, tr); - data::paste(transposed_image(output_domain_, - extend(input, extension_), - compose(t_1, compose(rot, t))), - output); + data::paste(tr, output); trace::exiting("geom::rotate"); return output; @@ -130,7 +166,7 @@ namespace mln mln_concrete(I) rotate(const Image& input, double angle, const Ext& extension) { - return rotate(input, angle, extension, exact(input).domain()); + return rotate(input, angle, extension, mln_box(I)()); } -- 1.5.6.5

1 0

r4226: Add some utils to handle objects detection with mean color attribute
by Edwin Carlinet 03 Jul '09

03 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-07-03 Edwin Carlinet <carlinet(a)lrde.epita.fr> Add some utils to handle objects detection with mean color attribute. * edwin/exec/give_me_the_curve.cc, * edwin/exec/plot.conf: Util to trace attribute evolution along the branch. * edwin/exec/mask_colorize.cc: Color labeling from a mask image. * edwin/exec/max_delta_colormean_obj.cc: Retrieve components that maximes the distance between the mean color of components. * edwin/mln/morpho/tree/propagate.hh: Minor fixes. --- exec/give_me_the_curve.cc | 92 ++++++++++++++++++++++++++++++++++++++++ exec/mask_colorize.cc | 78 +++++++++++++++++++++++++++++++++ exec/max_delta_colormean_obj.cc | 18 ++++++- exec/plot.conf | 3 + mln/morpho/tree/propagate.hh | 5 +- 5 files changed, 192 insertions(+), 4 deletions(-) Index: trunk/milena/sandbox/edwin/exec/plot.conf =================================================================== --- trunk/milena/sandbox/edwin/exec/plot.conf (revision 0) +++ trunk/milena/sandbox/edwin/exec/plot.conf (revision 4226) @@ -0,0 +1,3 @@ +set terminal png; +set output "plot.png" +plot "data.txt" Index: trunk/milena/sandbox/edwin/exec/give_me_the_curve.cc =================================================================== --- trunk/milena/sandbox/edwin/exec/give_me_the_curve.cc (revision 0) +++ trunk/milena/sandbox/edwin/exec/give_me_the_curve.cc (revision 4226) @@ -0,0 +1,92 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/morpho/tree/data.hh> +#include <mln/data/sort_psites.hh> + +#include <mln/io/pgm/load.hh> + +#include <iostream> +#include <fstream> +#include <cstdlib> +#include <cstring> +#include <unistd.h> + +void usage(char** argv) +{ + + std::cout << "Usage: " << argv[0] << " in:source.pgm in:attribute.pgm [out:data.txt]" + << std::endl + << "Compute the tree from 'source' and display the values of" + << " 'attribute' along the branch." + << std::endl; + abort(); +} + + +int main(int argc, char** argv) +{ + using namespace mln; + using value::int_u8; + + if (argc < 3) + usage(argv); + + const char * finput = argv[1]; + const char * fattribute = argv[2]; + const char * fdata = (argc >= 4) ? argv[3] : "data.txt"; + + // Image loadin'. + typedef image2d<value::int_u8> I; + I input, a; + io::pgm::load(input, finput); + io::pgm::load(a, fattribute); + + // Tree construction. + typedef p_array<mln_psite_(I)> S; + typedef morpho::tree::data<I, S> T; + + S s = data::sort_psites_decreasing(input); + T tree(input, s, c4()); + + // Display branches + + while (true) + { + unsigned x, y; + + std::cout << "x y: "; + std::cout.flush(); + std::cin >> x; + std::cin >> y; + + if (std::cin.fail()) + { + std::cout << "Parse error." + << std::endl; + continue; + } + + mln_psite_(T) p(x, y); + std::ofstream data(fdata); + + while (!tree.is_root(p)) + { + data << a(p) << std::endl; + p = tree.parent(p); + } + data.close(); + + system("gnuplot plot.conf"); + if (fork() == 0) + { + setsid(); + //umask(0); + execlp("display", "display", "plot.png", 0); + exit(0); + } + } +} + + + Index: trunk/milena/sandbox/edwin/exec/mask_colorize.cc =================================================================== --- trunk/milena/sandbox/edwin/exec/mask_colorize.cc (revision 0) +++ trunk/milena/sandbox/edwin/exec/mask_colorize.cc (revision 4226) @@ -0,0 +1,78 @@ +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> +#include <mln/value/rgb8.hh> + +#include <mln/io/pbm/load.hh> +#include <mln/io/pgm/load.hh> +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/labeling/colorize.hh> +#include <mln/labeling/blobs.hh> + +using namespace mln; +using value::int_u16; +using value::int_u8; +using value::rgb8; + +bool check_extension(const char* filename, const char* extension) +{ + return strncmp(filename + strlen(filename) - strlen(extension), + extension, strlen(extension)) == 0; +} + +void usage(char** argv) +{ + std::cout << "Usage: " << argv[0] << " in:mask.pgm in:source.(pgm|ppm) [out:colorize.ppm]" + << std::endl; + abort(); +} + +template <typename M, typename I> +void +process(const Image<M>& mask, const Image& ref, const char* foutput) +{ + int_u16 nlabels; + + mln_ch_value(I, int_u16) labels = labeling::blobs(mask, c4(), nlabels); + + typedef mln_ch_value(I, rgb8) O; + O out = labeling::colorize(rgb8(), labels, nlabels); + + io::ppm::save(out, foutput); +} + + +int main(int argc, char** argv) +{ + if (argc < 3) + usage(argv); + + const char* finput = argv[1]; + const char* freference = argv[2]; + const char* foutput = (argc >= 4) ? argv[3] : "colorize.ppm"; + + image2d<bool> input; + io::pbm::load(input, finput); + + if (check_extension(freference, ".pgm")) + { + image2d<int_u8> ref; + io::pgm::load(ref, freference); + process(input, ref, foutput); + } + else if (check_extension(freference, ".ppm")) + { + image2d<rgb8> ref; + io::ppm::load(ref, freference); + process(input, ref, foutput); + } + else + usage(argv); +} + + + Index: trunk/milena/sandbox/edwin/exec/max_delta_colormean_obj.cc =================================================================== --- trunk/milena/sandbox/edwin/exec/max_delta_colormean_obj.cc (revision 4225) +++ trunk/milena/sandbox/edwin/exec/max_delta_colormean_obj.cc (revision 4226) @@ -33,6 +33,7 @@ #include <mln/morpho/tree/compute_attribute_image.hh> #include <mln/morpho/tree/components.hh> #include <mln/morpho/tree/propagate.hh> +#include <mln/morpho/tree/propagate_representative.hh> #include <mln/accu/stat/mean.hh> @@ -42,7 +43,10 @@ #include <mln/io/pgm/load.hh> #include <mln/io/ppm/load.hh> #include <mln/io/pbm/save.hh> +#include <mln/io/pgm/save.hh> +#include <mln/io/ppm/save.hh> +#include <mln/math/diff_abs.hh> #include "color_distance.hh" #include <iostream> @@ -81,13 +85,18 @@ O out = morpho::tree::compute_attribute_image_from(accu::stat::mean<mln_value(S)>(), tree, source); + io::pgm::save(data::convert(value::int_u8(), out), "mean.pgm"); + // Compute delta image. mln_ch_value(typename T::function, int_u8) dist; initialize(dist, tree.f()); mln_up_node_piter(T) n(tree); for_all(n) - dist(n) = out(tree.parent(n)) - out(n); + { + mln_assertion(tree.f(tree.parent(n)) > tree.f(n)); + dist(n) = math::diff_abs(out(tree.parent(n)), out(n)); + } return dist; } @@ -102,6 +111,8 @@ O out = morpho::tree::compute_attribute_image_from(accu::stat::mean<mln_value(S)>(), tree, source); + io::ppm::save(data::convert(value::rgb8(), out), "mean.ppm"); + // Compute delta image. mln_ch_value(typename T::function, int_u8) dist; initialize(dist, tree.f()); @@ -147,7 +158,7 @@ typedef p_array<mln_psite_(I)> S; typedef morpho::tree::data<I, S> T; - S s = data::sort_psites_increasing(input); + S s = data::sort_psites_decreasing(input); T tree(input, s, c4()); // Attribute computation. @@ -169,6 +180,9 @@ else usage(argv); // Type not handled. + morpho::tree::propagate_representative(tree, delta); + io::pgm::save(delta, "distance.pgm"); + // Get the max components of the delta image. p_array<mln_psite_(I)> obj = morpho::tree::get_components(tree, delta); Index: trunk/milena/sandbox/edwin/mln/morpho/tree/propagate.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/propagate.hh (revision 4225) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/propagate.hh (revision 4226) @@ -56,13 +56,14 @@ */ template <typename A, typename T> inline - A propagate_components(const Image<A>& attr_image, + mln_concrete(A) + propagate_components(const Image<A>& attr_image, const T& tree, const p_array< mln_psite(A) >& component_list, const mln_value(A)& null) { const A& a = exact(attr_image); - A out; + mln_concrete(A) out; initialize(out, a); mln::data::fill(out, null);

1 0

r4225: Retrieval of components whose maximize mean color difference
by Edwin Carlinet 01 Jul '09

01 Jul '09

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena/sandbox ChangeLog: 2009-07-01 Edwin Carlinet <carlinet(a)lrde.epita.fr> Retrieval of components whose maximize mean color difference. * edwin/exec/color_distance.hh: Some routines about color distances. * edwin/exec/max_delta_colormean_obj.cc: Main file for components retrieval with respect to their mean color difference. * edwin/mln/morpho/tree/components.hh: Minor fixes. --- exec/color_distance.hh | 80 +++++++++++++++++ exec/max_delta_colormean_obj.cc | 179 ++++++++++++++++++++++++++++++++++++++++ mln/morpho/tree/components.hh | 15 ++- 3 files changed, 268 insertions(+), 6 deletions(-) Index: trunk/milena/sandbox/edwin/exec/color_distance.hh =================================================================== --- trunk/milena/sandbox/edwin/exec/color_distance.hh (revision 0) +++ trunk/milena/sandbox/edwin/exec/color_distance.hh (revision 4225) @@ -0,0 +1,80 @@ +//Copyright (C) 2009 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. + +// From theo's sandbox ~theo/color/filter_meandist_rgb_pixels.cc + + +#ifndef COLOR_DISTANCE_HH +# define COLOR_DISTANCE_HH + +#include <mln/value/rgb8.hh> +#include <mln/math/diff_abs.hh> + +namespace mln +{ + + value::int_u8 dist_mean(const value::rgb8& c1, const value::rgb8& c2) + { + unsigned d = 0; + d += (math::diff_abs(c1.red(), c2.red()) + 2) / 3; + d += (math::diff_abs(c1.green(), c2.green()) + 2) / 3; + d += (math::diff_abs(c1.blue(), c2.blue()) + 2) / 3; + if (d > 255) + d = 255; + return d; + } + + value::int_u8 dist_sat(const value::rgb8& c1, const value::rgb8& c2) + { + unsigned d = 0; + d += math::diff_abs(c1.red(), c2.red()); + d += math::diff_abs(c1.green(), c2.green()); + d += math::diff_abs(c1.blue(), c2.blue()); + if (d > 255) + d = 255; + return d; + } + + value::int_u8 dist_max(const value::rgb8& c1, const value::rgb8& c2) + { + unsigned d = 0, d_; + d_ = math::diff_abs(c1.red(), c2.red()); + if (d_ > d) d = d_; + d_ = math::diff_abs(c1.green(), c2.green()); + if (d_ > d) d = d_; + d_ = math::diff_abs(c1.blue(), c2.blue()); + if (d_ > d) d = d_; + return d; + } + + + +# ifndef MLN_INCLUDE_ONLY + +# endif // ! MLN_INCLUDE_ONLY + +} // end of namespace mln. + +#endif // ! COLOR_DISTANCE_HH Index: trunk/milena/sandbox/edwin/exec/max_delta_colormean_obj.cc =================================================================== --- trunk/milena/sandbox/edwin/exec/max_delta_colormean_obj.cc (revision 0) +++ trunk/milena/sandbox/edwin/exec/max_delta_colormean_obj.cc (revision 4225) @@ -0,0 +1,179 @@ +//Copyright (C) 2009 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. + +#include <mln/core/image/image2d.hh> +#include <mln/core/alias/neighb2d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/rgb8.hh> + +#include <mln/morpho/tree/data.hh> +#include <mln/morpho/tree/compute_attribute_image.hh> +#include <mln/morpho/tree/components.hh> +#include <mln/morpho/tree/propagate.hh> + +#include <mln/accu/stat/mean.hh> + +#include <mln/data/sort_psites.hh> +#include <mln/data/convert.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/ppm/load.hh> +#include <mln/io/pbm/save.hh> + + +#include "color_distance.hh" +#include <iostream> +#include <cstring> + +using namespace mln; +using value::int_u8; + + +void usage(char** argv) +{ + std::cout << "Usage: " << argv[0] << " in:input.pgm in:source(.pgm|.ppm) [out:attribute.pbm]" + << std::endl + << "Compute the mean attribute image from 'source' values using 'input'" + " min tree structure. Then, compute the delta image d (parent(n) - n) and retrieve" + " components that maximizes the delta. The retrieved components are stored through a mask" + " where objects are set to 1 and background to 0 in 'attribute.pbm'." + << std::endl; + + abort(); +} + +const char* get_extension(const char* filename) +{ + return (filename + strlen(filename) - 3); +} + + +template <typename T, typename S> +inline +mln_ch_value(typename T::function, int_u8) +compute_delta_mean(const value::int_u8&, const T& tree, const Image<S>& source) +{ + + typedef mln_ch_value(typename T::function, mln_sum(mln_value(S))) O; + O out = morpho::tree::compute_attribute_image_from(accu::stat::mean<mln_value(S)>(), + tree, source); + + // Compute delta image. + mln_ch_value(typename T::function, int_u8) dist; + initialize(dist, tree.f()); + + mln_up_node_piter(T) n(tree); + for_all(n) + dist(n) = out(tree.parent(n)) - out(n); + + return dist; +} + +template <typename T, typename S> +inline +mln_ch_value(typename T::function, int_u8) +compute_delta_mean(const value::rgb8&, const T& tree, const Image<S>& source) +{ + + typedef mln_ch_value(typename T::function, mln_sum(mln_value(S))) O; + O out = morpho::tree::compute_attribute_image_from(accu::stat::mean<mln_value(S)>(), + tree, source); + + // Compute delta image. + mln_ch_value(typename T::function, int_u8) dist; + initialize(dist, tree.f()); + + mln_up_node_piter(T) n(tree); + for_all(n) + { + // Fixme: rewrite distance routines with vector instead of convert ? + dist(n) = dist_mean(convert::to<value::rgb8>(out(tree.parent(n))), convert::to<value::rgb8>(out(n))); + } + + return dist; +} + +template <typename T, typename S> +inline +mln_ch_value(typename T::function, int_u8) +compute_delta_mean(const T& tree, const Image<S>& source) +{ + return compute_delta_mean(mln_value(S) (), tree, source); +} + + + +int main(int argc, char** argv) +{ + + + if (argc < 3) + usage(argv); + + const char* finput = argv[1]; + const char* fsource = argv[2]; + const char* foutput = argc > 3 ? argv[3] : "mask.pbm"; + + // Image loadin'. + typedef image2d<value::int_u8> I; + I input; + io::pgm::load(input, finput); + + + // Tree construction. + typedef p_array<mln_psite_(I)> S; + typedef morpho::tree::data<I, S> T; + + S s = data::sort_psites_increasing(input); + T tree(input, s, c4()); + + // Attribute computation. + mln_ch_value_(I, int_u8) delta; + + const char* extension = get_extension(fsource); + if (strcmp(extension, "pgm") == 0) + { + image2d<value::int_u8> src; + io::pgm::load(src, fsource); + delta = compute_delta_mean(tree, src); + } + else if (strcmp(extension, "ppm") == 0) + { + image2d<value::rgb8> src; + io::ppm::load(src, fsource); + delta = compute_delta_mean(tree, src); + } + else + usage(argv); // Type not handled. + + // Get the max components of the delta image. + p_array<mln_psite_(I)> obj = morpho::tree::get_components(tree, delta); + + typedef mln_ch_value_(I, bool) O; + O out = morpho::tree::set_value_to_components(tree, obj, true, false); + + io::pbm::save(out, foutput); +} Index: trunk/milena/sandbox/edwin/mln/morpho/tree/components.hh =================================================================== --- trunk/milena/sandbox/edwin/mln/morpho/tree/components.hh (revision 4224) +++ trunk/milena/sandbox/edwin/mln/morpho/tree/components.hh (revision 4225) @@ -49,7 +49,9 @@ namespace mln { + namespace morpho { + namespace tree { /** @@ -237,7 +239,6 @@ p = max_arr[arr_pos]; if (a(p) == 0) break; - std::cout << p << " " << a(p) << std::endl; components.insert(p); morpho::tree::propagate_node_to_descendants(p, tree, activity, false, nb_leaves); morpho::tree::propagate_node_to_ancestors(p, tree, activity, false); @@ -262,7 +263,7 @@ trace::entering("mln::morpho::tree::get_components"); const A& a = exact(attr_image); - mln_precondition(tree.f().domain() == a.domain()); + mln_precondition(tree.f().domain() == a.domain()); // May be to strong. mln_precondition(a.is_valid()); p_array< mln_psite(A) > components = @@ -280,7 +281,7 @@ trace::entering("mln::morpho::tree::get_components"); const A& a = exact(attr_image); - mln_precondition(tree.f().domain() == a.domain()); + mln_precondition(tree.f().domain() == a.domain()); // May be to strong. mln_precondition(a.is_valid()); p_array< mln_psite(A) > components; @@ -300,7 +301,7 @@ const A& a = exact(attr_image); const P2B& predicate = exact(pred); - mln_precondition(tree.f().domain() == a.domain()); + mln_precondition(tree.f().domain() == a.domain()); // May be to strong. mln_precondition(a.is_valid()); p_array< mln_psite(A) > components = @@ -310,10 +311,12 @@ return components; } +# endif /* !MLN_INCLUDE_ONLY */ + } // end of namespace mln::morpho::tree + } // end of namespace mln::morpho -} // end of namespace mln -# endif /* !MLN_INCLUDE_ONLY */ +} // end of namespace mln #endif /* !MLN_MORPHO_TREE_COMPONENTS_HH_ */

1 0

« Build successful »
by Roland Levillain 30 Jun '09

30 Jun '09

https://buildfarm.lrde.org/buildfarm/oln/ Recent Builds: * (Jun 30 17:53) rev=[4224] success #264: build successful [...] Linux dallas 2.6.18-4-686 #1 SMP Wed May 9 23:03:12 UTC 2007 i686 GNU/Linux Woohoo. The release seems close! We still need to clean up a few things: - fix builds on other hosts/platforms; - choose a license for the documentation; - ensure some files are up to date (NEWS, INSTALL, etc.); - prepare an announce [1]; - etc. I'll check the remaining tickets tomorrow. Notes: [1] Like this one: https://www.lrde.epita.fr/pipermail/vaucanson/2009q2/000860.html

1 0

4224: tests/morpho/closing/approx/Makefile.am: add test outputs to CLEANFILES.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

--- milena/ChangeLog | 5 +++++ milena/tests/morpho/closing/approx/Makefile.am | 7 +++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index a8e29fe..5fa5f9c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,10 @@ 2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + * tests/morpho/closing/approx/Makefile.am: add test outputs to + CLEANFILES. + +2009-06-30 Guillaume Lazzara <guillaume.lazzara(a)lrde.epita.fr> + Regen headers.mk and unit-tests.mk. * milena/headers.mk, diff --git a/milena/tests/morpho/closing/approx/Makefile.am b/milena/tests/morpho/closing/approx/Makefile.am index 8afb5a9..c9eb6b6 100644 --- a/milena/tests/morpho/closing/approx/Makefile.am +++ b/milena/tests/morpho/closing/approx/Makefile.am @@ -25,3 +25,10 @@ check_PROGRAMS = \ structural_SOURCES = structural.cc TESTS = $(check_PROGRAMS) + + +# FIXME: each test should clean its output, temporary output should +# not be cleaned up by make. +CLEANFILES = \ + out.pbm \ + ref.pbm -- 1.5.6.5

1 0

4223: tests/preprocessing/unskew.cc: fix test.
by Guillaume Lazzara 30 Jun '09

30 Jun '09

--- scribo/ChangeLog | 4 ++++ scribo/tests/preprocessing/unskew.cc | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 71d982b..f11cfa1 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * tests/preprocessing/unskew.cc: fix test. + +2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> + * preprocessing/unskew.hh: Fix an ambiguity. 2009-06-39 Guillaume Lazzara <lazzara(a)lrde.epita.fr> diff --git a/scribo/tests/preprocessing/unskew.cc b/scribo/tests/preprocessing/unskew.cc index 832ae3d..9c84951 100644 --- a/scribo/tests/preprocessing/unskew.cc +++ b/scribo/tests/preprocessing/unskew.cc @@ -40,5 +40,5 @@ int main(int argc, char *argv[]) image2d<bool> ima; io::pbm::load(ima, SCRIBO_IMG_DIR "/text_to_group.pbm"); - io::pbm::save(scribo::preprocessing::unskew(ima), "unskew.pbm"); + io::pbm::save(scribo::preprocessing::unskew(ima).first(), "unskew.pbm"); } -- 1.5.6.5

1 0