Olena-patches

olena-patches@lrde.epita.fr

9625 discussions

olena-ng 1539: Add support for Vcs back.

by Roland Levillain

https://svn.lrde.epita.fr/svn/oln/branches/olena-ng Index: ChangeLog from Roland Levillain <roland(a)lrde.epita.fr> Add support for Vcs back. * vcs/oln.rb: New. oln.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: vcs/oln.rb --- vcs/oln.rb (revision 1538) +++ vcs/oln.rb (working copy) @@ -6,7 +6,7 @@ protocol_version '0.1' def olena_commit! ( *args ) - common_commit!("1539: <%= title %>", *args) do |subject| + common_commit!("olena-ng 1539: <%= title %>", *args) do |subject| mail!(:to => %w[olena-patches(a)lrde.epita.fr], :subject => subject) end end

17 years, 1 month

milena r1537: Moves the io's tests

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Moves the io's tests. * tests/Makefile.am: Makefile update due to test moves. * tests/io/Makefile.am: Likewise. * tests/io/fits/Makefile.am: Likewise. * tests/io/pbm/Makefile.am: Likewise. * tests/io/pgm/Makefile.am: Likewise. * tests/io/ppm/Makefile.am: Likewise. * sandbox/garrigues/io_fits.cc: Remove. * tests/io/fits/io_fits.cc: New. * tests/io_pbm.cc: Rename as... * tests/io/pbm/pbm.cc: ...this. * tests/io_pgm.cc: Rename as... * tests/io/pgm/pgm.cc: ...this. * tests/io_pgm16.cc: Rename as... * tests/io/pgm/pgm16.cc: ...this. * tests/io_pgm19.cc: Rename as... * tests/io/pgm/pgm19.cc: ...this. * tests/io_pgm27.cc: Rename as... * tests/io/pgm/pgm27.cc: ...this. * tests/io_ppm.cc: Rename as... * tests/io/ppm/ppm.cc: ...this. * tests/io_ppm16.cc: Rename as... * tests/io/ppm/ppm16.cc: ...this. * tests/io_ppm23.cc: Rename as... * tests/io/ppm/ppm23.cc: ...this. * tests/new_io_pgm.cc: Remove, now into tests/io/pgm/pgm.cc. Fix style and doc. * mln/accu/compute.hh, * mln/io/ppm/load.hh: Fix. --- trunk/milena/mln/accu/compute.hh | 3 trunk/milena/tests/Makefile.am | 17 ----- trunk/milena/tests/io/Makefile.am | 8 ++ trunk/milena/tests/io/fits/Makefile.am | 7 ++ trunk/milena/tests/io/fits/io_fits.cc | 77 +++++++++++++++++++++++ trunk/milena/tests/io/pbm/Makefile.am | 7 ++ trunk/milena/tests/io/pbm/pbm.cc | 55 ++++++++++++++++ trunk/milena/tests/io/pgm/Makefile.am | 12 +++ trunk/milena/tests/io/pgm/pgm.cc | 62 ++++++++++++++++++ trunk/milena/tests/io/pgm/pgm16.cc | 95 ++++++++++++++++++++++++++++ trunk/milena/tests/io/pgm/pgm19.cc | 95 ++++++++++++++++++++++++++++ trunk/milena/tests/io/pgm/pgm27.cc | 95 ++++++++++++++++++++++++++++ trunk/milena/tests/io/ppm/Makefile.am | 12 +++ trunk/milena/tests/io/ppm/ppm.cc | 49 ++++++++++++++ trunk/milena/tests/io/ppm/ppm16.cc | 110 +++++++++++++++++++++++++++++++++ trunk/milena/tests/io/ppm/ppm23.cc | 110 +++++++++++++++++++++++++++++++++ 16 files changed, 796 insertions(+), 18 deletions(-) Index: trunk/milena/tests/io_pgm.cc (deleted) =================================================================== Index: trunk/milena/tests/io_pgm19.cc (deleted) =================================================================== Index: trunk/milena/tests/io_ppm23.cc (deleted) =================================================================== Index: trunk/milena/tests/new_io_pgm.cc (deleted) =================================================================== Index: trunk/milena/tests/io_pbm.cc (deleted) =================================================================== Index: trunk/milena/tests/io_ppm.cc (deleted) =================================================================== Index: trunk/milena/tests/io_ppm16.cc (deleted) =================================================================== Index: trunk/milena/tests/io_pgm27.cc (deleted) =================================================================== Index: trunk/milena/tests/io_pgm16.cc (deleted) =================================================================== Index: trunk/milena/tests/Makefile.am =================================================================== --- trunk/milena/tests/Makefile.am (revision 1536) +++ trunk/milena/tests/Makefile.am (revision 1537) @@ -68,13 +68,6 @@ image_if_value \ interpolated \ io_pbm \ - io_pgm16 \ - io_pgm19 \ - io_pgm27 \ - io_pgm \ - io_ppm16 \ - io_ppm23 \ - io_ppm \ \ labeling_algo \ labeling_estimate \ @@ -109,7 +102,6 @@ morpho_opening_area \ morpho_thinning \ \ - new_io_pgm \ norm_l2 \ \ pixel \ @@ -215,14 +207,6 @@ image_if_interval_SOURCES = image_if_interval.cc image_if_value_SOURCES = image_if_value.cc interpolated_SOURCES = interpolated.cc -io_pbm_SOURCES = io_pbm.cc -io_pgm16_SOURCES = io_pgm16.cc -io_pgm19_SOURCES = io_pgm19.cc -io_pgm27_SOURCES = io_pgm27.cc -io_pgm_SOURCES = io_pgm.cc -io_ppm16_SOURCES = io_ppm16.cc -io_ppm23_SOURCES = io_ppm23.cc -io_ppm_SOURCES = io_ppm.cc labeling_algo_SOURCES = labeling_algo.cc labeling_estimate_SOURCES = labeling_estimate.cc @@ -257,7 +241,6 @@ morpho_opening_area_SOURCES = morpho_opening_area.cc morpho_thinning_SOURCES = morpho_thinning.cc -new_io_pgm_SOURCES = new_io_pgm.cc norm_l2_SOURCES = norm_l2.cc pixel_SOURCES = pixel.cc Index: trunk/milena/tests/io/pgm/pgm27.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm27.cc (revision 0) +++ trunk/milena/tests/io/pgm/pgm27.cc (revision 1537) @@ -0,0 +1,95 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_pgm27.cc + * + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. + */ + + +#include <mln/core/image2d.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/level/transform.hh> +#include <mln/level/compare.hh> + + + using namespace mln; + +struct to27bits : mln::Function_v2v<to27bits> +{ + + typedef value::int_u<27> result; + result operator()(value::int_u8 v) const + { + result ret(v * 524288); + return ret; + } +}; + +struct to8bits : mln::Function_v2v<to8bits> +{ + + typedef value::int_u8 result; + result operator()(value::int_u<27> v) const + { + result ret(v / 524288); + return ret; + } +}; + +int main() +{ + using namespace mln; + using value::int_u8; + using value::int_u; + typedef value::int_u<27> int_u27; + + image2d<int_u8> + lena = io::pgm::load<int_u8>("../img/lena.pgm"); + image2d<int_u27> out(lena.domain()); + + level::transform(lena, to27bits(), out); + + io::pgm::save(out, "out27.pgm"); + + image2d<int_u27> lena2; + io::pgm::load(lena2, "out27.pgm"); + + image2d<int_u8> out2(lena.domain()); + + level::transform(lena2, to8bits(), out2); + + io::pgm::save(out2, "out8.pgm"); + + assert(out2 == lena); + +} Index: trunk/milena/tests/io/pgm/pgm19.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm19.cc (revision 0) +++ trunk/milena/tests/io/pgm/pgm19.cc (revision 1537) @@ -0,0 +1,95 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_pgm19.cc + * + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. + */ + +#include <mln/core/image2d.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/level/transform.hh> +#include <mln/level/compare.hh> + + + using namespace mln; + +struct to19bits : mln::Function_v2v<to19bits> +{ + + typedef value::int_u<19> result; + result operator()(value::int_u8 v) const + { + result ret(v * 524288); + return ret; + } +}; + +struct to8bits : mln::Function_v2v<to8bits> +{ + + typedef value::int_u8 result; + result operator()(value::int_u<19> v) const + { + result ret(v / 524288); + return ret; + } +}; + +int main() +{ + using namespace mln; + using value::int_u8; + using value::int_u; + typedef value::int_u<19> int_u19; + + border::thickness = 52; + + image2d<int_u8> + lena = io::pgm::load<int_u8>("../img/lena.pgm"); + image2d<int_u19> out(lena.domain()); + + level::transform(lena, to19bits(), out); + + io::pgm::save(out, "out19.pgm"); + + image2d<int_u19> + lena2 = io::pgm::load<int_u19>("out19.pgm"); + image2d<int_u8> out2(lena.domain()); + + level::transform(lena2, to8bits(), out2); + + io::pgm::save(out2, "out8.pgm"); + + assert(out2 == lena); + +} Index: trunk/milena/tests/io/pgm/pgm.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm.cc (revision 0) +++ trunk/milena/tests/io/pgm/pgm.cc (revision 1537) @@ -0,0 +1,62 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_pgm.cc + * + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. + */ + + +#include <mln/core/image2d.hh> + +#include <mln/value/int_u8.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +int main() +{ + using namespace mln; + using value::int_u8; + + { + image2d<int_u8> + lena = io::pgm::load<int_u8>("../img/lena.pgm"); + + io::pgm::save(lena, "out.pgm"); + } + + + { + image2d< value::int_u<8> > + lena; + io::pgm::load(lena, "../img/lena.pgm"); + + io::pgm::save(lena, "out.pgm"); + } + +} Index: trunk/milena/tests/io/pgm/Makefile.am =================================================================== --- trunk/milena/tests/io/pgm/Makefile.am (revision 1536) +++ trunk/milena/tests/io/pgm/Makefile.am (revision 1537) @@ -1,3 +1,15 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + pgm16 \ + pgm19 \ + pgm27 \ + pgm + +pgm16_SOURCES = pgm16.cc +pgm19_SOURCES = pgm19.cc +pgm27_SOURCES = pgm27.cc +pgm_SOURCES = pgm.cc + Index: trunk/milena/tests/io/pgm/pgm16.cc =================================================================== --- trunk/milena/tests/io/pgm/pgm16.cc (revision 0) +++ trunk/milena/tests/io/pgm/pgm16.cc (revision 1537) @@ -0,0 +1,95 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_pgm16.cc + * + * \brief Test on mln::io::pgm::load and mln::io::pgm::save. + */ + +#include <mln/core/image2d.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/value/int_u8.hh> +#include <mln/value/int_u16.hh> + +#include <mln/io/pgm/load.hh> +#include <mln/io/pgm/save.hh> + +#include <mln/level/transform.hh> + + + using namespace mln; + +struct to16bits : mln::Function_v2v<to16bits> +{ + + typedef value::int_u16 result; + result operator()(value::int_u8 v) const + { + result ret(v * 256); + return ret; + } +}; + +struct to8bits : mln::Function_v2v<to8bits> +{ + + typedef value::int_u8 result; + result operator()(value::int_u16 v) const + { + result ret(v / 256); + return ret; + } +}; + +int main() +{ + using namespace mln; + using value::int_u8; + using value::int_u16; + + win::rectangle2d rect(51, 51); + border::thickness = 52; + + image2d<int_u8> + lena = io::pgm::load<int_u8>("../img/lena.pgm"); + image2d<int_u16> out(lena.domain()); + + level::transform(lena, to16bits(), out); + + io::pgm::save(out, "out16.pgm"); + + image2d<int_u16> + lena2 = io::pgm::load<int_u16>("out16.pgm"); + image2d<int_u8> out2(lena.domain()); + + level::transform(lena2, to8bits(), out2); + + io::pgm::save(out2, "out8.pgm"); + + +} Index: trunk/milena/tests/io/fits/io_fits.cc =================================================================== --- trunk/milena/tests/io/fits/io_fits.cc (revision 0) +++ trunk/milena/tests/io/fits/io_fits.cc (revision 1537) @@ -0,0 +1,77 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/fits_load.cc + * + * \brief Test on mln::io::fits::load. + */ + +#include <mln/core/image2d_b.hh> + +#include <mln/level/compare.hh> +#include <mln/debug/println.hh> + +#include <mln/io/fits/load.hh> +#include <mln/io/pfm/save.hh> +#include <mln/io/pfm/load.hh> + +int main() +{ + using namespace mln; + { + image2d_b<float> + fits_in = io::fits::load("../../img/test.fits"); + + debug::println(fits_in); + + io::pfm::save(fits_in, "out.pfm"); + + image2d_b<float> + pfm = io::pfm::load("out.pfm"); + + io::pfm::save(fits_in, "out2.pfm"); + + image2d_b<float> + pfm2 = io::pfm::load("out2.pfm"); + + image2d_b<float>::fwd_piter p(fits_in.domain()); + for_all(p) + if (fits_in(p) != pfm(p)) + std::cout << "at " < + // lena = io::fits::load<int_u8>("../img/lena.fits"); + + // io::fits::save(lena, "out.fits"); + } +} Index: trunk/milena/tests/io/fits/Makefile.am =================================================================== --- trunk/milena/tests/io/fits/Makefile.am (revision 1536) +++ trunk/milena/tests/io/fits/Makefile.am (revision 1537) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + fits \ + +fits_SOURCES = fits.cc + +TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/io/Makefile.am =================================================================== --- trunk/milena/tests/io/Makefile.am (revision 1536) +++ trunk/milena/tests/io/Makefile.am (revision 1537) @@ -1,3 +1,11 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +SUBDIRS = \ + fits \ + pbm \ + pfm \ + pgm \ + pnm \ + ppm Index: trunk/milena/tests/io/ppm/ppm.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm.cc (revision 0) +++ trunk/milena/tests/io/ppm/ppm.cc (revision 1537) @@ -0,0 +1,49 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_ppm.cc + * + * \brief Test on mln::io::ppm::load and mln::io::ppm::save. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/rgb8.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> + + + + +int main() +{ + using namespace mln; + using value::rgb8; + + image2d<rgb8> lena = io::ppm::load("../img/lena.ppm"); + io::ppm::save(lena, "out.ppm"); +} Index: trunk/milena/tests/io/ppm/ppm23.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm23.cc (revision 0) +++ trunk/milena/tests/io/ppm/ppm23.cc (revision 1537) @@ -0,0 +1,110 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_ppm23.cc + * + * \brief Test on mln::io::ppm::load and mln::io::ppm::save. + */ + +#include <mln/core/image2d.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/value/rgb8.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/level/compare.hh> + + +using namespace mln; + +typedef value::rgb<23> rgb23; + +struct to23bits : mln::Function_v2v<to23bits> +{ + + typedef rgb23 result; + result operator()(value::rgb8 v) const + { + result ret(v.red().to_enc() * 256, + v.green().to_enc() * 256, + v.blue().to_enc() * 256); + return ret; + } +}; + +struct to8bits : mln::Function_v2v<to8bits> +{ + + typedef value::rgb8 result; + result operator()(rgb23 v) const + { + result ret(v.red().to_enc() / 256, + v.green().to_enc() / 256, + v.blue().to_enc() / 256); + return ret; + } +}; + +int main() +{ + using namespace mln; + using value::rgb8; + + typedef image2d<rgb8> I; + + + // load a 8bits image A + image2d<rgb8> + a = io::ppm::load<rgb8>("../img/lena.ppm"); + image2d<rgb23> b(a.domain()); + + image2d<rgb8>::fwd_piter p(b.domain()); + + // save it as a 23bits ppm image B + to23bits f; + for_all(p) + b(p) = f(a(p)); + io::ppm::save(b, "out23.ppm"); + + // reload B into C + image2d<rgb23> + c = io::ppm::load<rgb23>("out23.ppm"); + image2d<rgb8> d(a.domain()); + + + // save C as a 8bits ppm image D + to8bits g; + for_all(p) + d(p) = g(c(p)); + io::ppm::save(d, "out8.ppm"); + + // D should equals A + mln_assertion(d == a); + +} Index: trunk/milena/tests/io/ppm/ppm16.cc =================================================================== --- trunk/milena/tests/io/ppm/ppm16.cc (revision 0) +++ trunk/milena/tests/io/ppm/ppm16.cc (revision 1537) @@ -0,0 +1,110 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_ppm16.cc + * + * \brief Test on mln::io::ppm::load and mln::io::ppm::save. + */ + +#include <mln/core/image2d.hh> +#include <mln/win/rectangle2d.hh> + +#include <mln/value/rgb8.hh> +#include <mln/value/rgb16.hh> + +#include <mln/io/ppm/load.hh> +#include <mln/io/ppm/save.hh> + +#include <mln/level/compare.hh> + + +using namespace mln; + +struct to16bits : mln::Function_v2v<to16bits> +{ + + typedef value::rgb16 result; + result operator()(value::rgb8 v) const + { + result ret(v.red().to_enc() * 256, + v.green().to_enc() * 256, + v.blue().to_enc() * 256); + return ret; + } +}; + +struct to8bits : mln::Function_v2v<to8bits> +{ + + typedef value::rgb8 result; + result operator()(value::rgb16 v) const + { + result ret(v.red().to_enc() / 256, + v.green().to_enc() / 256, + v.blue().to_enc() / 256); + return ret; + } +}; + +int main() +{ + using namespace mln; + using value::rgb8; + using value::rgb16; + + typedef image2d<rgb8> I; + + + // load a 8bits image A + image2d<rgb8> + a = io::ppm::load<rgb8>("../img/lena.ppm"); + image2d<rgb16> b(a.domain()); + + image2d<rgb8>::fwd_piter p(b.domain()); + + // save it as a 16bits ppm image B + to16bits f; + for_all(p) + b(p) = f(a(p)); + io::ppm::save(b, "out16.ppm"); + + // reload B into C + image2d<rgb16> + c = io::ppm::load<rgb16>("out16.ppm"); + image2d<rgb8> d(a.domain()); + + + // save C as a 8bits ppm image D + to8bits g; + for_all(p) + d(p) = g(c(p)); + io::ppm::save(d, "out8.ppm"); + + // D should equals A + mln_assertion(d == a); + +} Index: trunk/milena/tests/io/ppm/Makefile.am =================================================================== --- trunk/milena/tests/io/ppm/Makefile.am (revision 1536) +++ trunk/milena/tests/io/ppm/Makefile.am (revision 1537) @@ -1,3 +1,15 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + ppm16 \ + ppm23 \ + ppm + +ppm16_SOURCES = ppm16.cc +ppm23_SOURCES = ppm23.cc +ppm_SOURCES = ppm.cc + + +TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/io/pbm/pbm.cc =================================================================== --- trunk/milena/tests/io/pbm/pbm.cc (revision 0) +++ trunk/milena/tests/io/pbm/pbm.cc (revision 1537) @@ -0,0 +1,55 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/io_pbm.cc + * + * \brief Test on mln::io::pbm::. + */ + +#include <mln/core/image2d.hh> +#include <mln/io/pbm/load.hh> +#include <mln/io/pbm/save.hh> + + +int main() +{ + using namespace mln; + + image2d<bool> pic = io::pbm::load("../img/picasso.pbm"); + io::pbm::save(pic, "pic.pbm"); +} + + +// sample binary image to test with xv, imview, and display +// to bring into the fore the binary image bug with raw pbm. + +// | | | | - +// | | - - - +// | - - - - +// - - - - - +// - - - - - +// - - - - - Index: trunk/milena/tests/io/pbm/Makefile.am =================================================================== --- trunk/milena/tests/io/pbm/Makefile.am (revision 1536) +++ trunk/milena/tests/io/pbm/Makefile.am (revision 1537) @@ -1,3 +1,10 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + pbm + +pbm_SOURCES = pbm.cc + +TESTS = $(check_PROGRAMS) Index: trunk/milena/mln/accu/compute.hh =================================================================== --- trunk/milena/mln/accu/compute.hh (revision 1536) +++ trunk/milena/mln/accu/compute.hh (revision 1537) @@ -51,7 +51,8 @@ * \param[in] input The input image. * * This routine runs: \n - * FIXME + * a.take(make::pix(input, p)); + * on all pixels on the images. * * \warning This routine does not perform a.init(). */ Index: trunk/milena/mln/io/ppm/load.hh =================================================================== Index: trunk/milena/sandbox/garrigues/io_fits.cc (deleted) ===================================================================

17 years, 1 month

milena r1536: svn ignore .deps directories

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> svn ignore .deps directories. --- 0 files changed Property changes on: trunk/milena/tests/arith ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/level ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/accu ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/win ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/display ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/fun/x2x ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/border ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/set ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/canvas/browsing ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/util ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/histo ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/draw ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/logical ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile + Makefile.in Makefile .deps Property changes on: trunk/milena/tests/norm ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile .deps + Makefile.in Makefile .deps .deps Property changes on: trunk/milena/tests ___________________________________________________________________ Name: svn:ignore - Makefile.in Makefile .deps + Makefile.in Makefile .deps .deps

17 years, 1 month

milena r1535: svn ignore .deps directories. Update makefiles

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> svn ignore .deps directories. Update makefiles. * milena/tests/Makefile.am: Move accu's checks... * milena/tests/accu/Makefile.am: ...here. --- Makefile.am | 9 +-------- accu/Makefile.am | 11 +++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) Index: trunk/milena/tests/accu/Makefile.am =================================================================== --- trunk/milena/tests/accu/Makefile.am (revision 1534) +++ trunk/milena/tests/accu/Makefile.am (revision 1535) @@ -1,3 +1,14 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- include $(top_srcdir)/milena/tests/tests.mk + +check_PROGRAMS = \ + all \ + min \ + nil + +all_SOURCES = all.cc +min_SOURCES = min.cc +nil_SOURCES = nil.cc + +TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/Makefile.am =================================================================== --- trunk/milena/tests/Makefile.am (revision 1534) +++ trunk/milena/tests/Makefile.am (revision 1535) @@ -4,6 +4,7 @@ SUBDIRS = \ arith \ + accu \ border \ canvas \ draw \ @@ -15,10 +16,6 @@ win check_PROGRAMS = \ - accu_all \ - accu_min \ - accu_nil \ - \ border_resize_image1d_1 \ border_resize_image1d_2 \ border_resize_image1d_3 \ @@ -167,10 +164,6 @@ w_window2d_int \ w_window3d_int -accu_all_SOURCES = accu_all.cc -accu_min_SOURCES = accu_min.cc -accu_nil_SOURCES = accu_nil.cc - border_resize_image1d_1_SOURCES = border_resize_image1d_1.cc border_resize_image1d_2_SOURCES = border_resize_image1d_2.cc border_resize_image1d_3_SOURCES = border_resize_image1d_3.cc

17 years, 1 month

1534: Move the Olena-NG components from trunk/ to branches/olena-ng/.

by Roland Levillain

Please report any problem related to this move. TIA! URL: https://svn.lrde.epita.fr/svn/oln Move the Olena-NG components from trunk/ to branches/olena-ng/. trunk/ChangeLog Move the Olena-NG components elsewhere. * dynamic/, * extended/, * metalic/, * olena/, * static/: Remove directories. * configure.ac: Adjust. * Makefile.am (SUBDIRS): Remove metalic, extended, static, olena and dynamic. * TODO: Remove irrelevant entries. * NEWS: Add information on the 0.11 release. More on the upcoming 1.0 release. branches/olena-ng/ChangeLog Move Milena out of the Olena-NG tree. * milena/: Remove directory. * configure.ac: Adjust. * Makefile.am (SUBDIRS): Remove milena. * TODO: Remove irrelevant entries. * NEWS: Add information on the 0.11 release. Index: /trunk/ChangeLog =================================================================== --- /trunk/ChangeLog (revision 1526) +++ /trunk/ChangeLog (revision 1534) @@ -1,2 +1,19 @@ +2007-11-26 Roland Levillain <roland(a)lrde.epita.fr> + + Move the Olena-NG components elsewhere. + + * dynamic/, + * extended/, + * metalic/, + * olena/, + * static/: + Remove directories. + * configure.ac: Adjust. + * Makefile.am (SUBDIRS): Remove metalic, extended, static, olena + and dynamic. + * TODO: Remove irrelevant entries. + * NEWS: Add information on the 0.11 release. + More on the upcoming 1.0 release. + 2007-11-23 Simon Nivault <simon.nivault(a)lrde.epita.fr> Index: branches/olena-ng/ChangeLog =================================================================== --- branches/olena-ng/ChangeLog (.../trunk/ChangeLog) (revision 1533) +++ branches/olena-ng/ChangeLog (.../branches/olena-ng/ChangeLog) (revision 1534) @@ -1,3 +1,13 @@ +2007-11-26 Roland Levillain <roland(a)lrde.epita.fr> + + Move Milena out of the Olena-NG tree. + + * milena/: Remove directory. + * configure.ac: Adjust. + * Makefile.am (SUBDIRS): Remove milena. + * TODO: Remove irrelevant entries. + * NEWS: Add information on the 0.11 release. + 2007-11-23 Simon Nivault <simon.nivault(a)lrde.epita.fr> Remove creation of makefile in tests/make. Index: /trunk/configure.ac =================================================================== --- /trunk/configure.ac (revision 1526) +++ /trunk/configure.ac (revision 1534) @@ -47,12 +47,4 @@ -## ----------------------------- ## -## Concept C++ compiler set up. ## -## ----------------------------- ## - -AC_ARG_VAR([CONCEPTCXX], [Concept C++ compiler]) -AC_CHECK_PROGS([CONCEPTCXX], [conceptg++ conceptc++]) - - ## -------------- ## ## Dependencies. ## @@ -62,16 +54,4 @@ OLN_WITH_FREEIMAGEPLUS AM_CONDITIONAL([FREEIMAGEPLUS], [test x$oln_have_freeimageplus = xyes]) - - -## ------- ## -## Tests. ## -## ------- ## - -AC_CONFIG_FILES([ - metalic/tests/Makefile - extended/tests/Makefile - static/tests/Makefile - olena/tests/Makefile -]) @@ -86,24 +66,14 @@ AC_CONFIG_FILES([ Makefile - metalic/Makefile - metalic/mlc/Makefile - extended/Makefile - extended/xtd/Makefile - static/Makefile - static/stc/Makefile - static/samples/Makefile - static/samples/mini-oln/Makefile - static/samples/mini-oln/concept-c++/Makefile - static/samples/mini-std/Makefile - static/samples/mini-std/cpp/Makefile - static/samples/mini-std/cpp2/Makefile milena/Makefile milena/doc/Makefile - olena/Makefile - olena/oln/Makefile - olena/img/Makefile - dynamic/Makefile ]) -# FIXME: Should be performed through oln.m4 macros. + + +## ------- ## +## Tests. ## +## ------- ## + +# FIXME: Should be performed through oln.m4 macros? AC_CONFIG_FILES([ milena/tests/Makefile @@ -162,16 +132,4 @@ milena/tests/labeling/Makefile ]) -AC_CONFIG_FILES([ - olena/tests/algorithms/Makefile - olena/tests/check/Makefile - olena/tests/check/defs - olena/tests/core/Makefile - olena/tests/io/Makefile - olena/tests/morphers/Makefile - olena/tests/sanity/Makefile - olena/tests/value/Makefile -]) -AC_CONFIG_FILES([olena/tests/sanity/check], - [chmod +x olena/tests/sanity/check]) AC_OUTPUT Index: branches/olena-ng/configure.ac =================================================================== --- branches/olena-ng/configure.ac (.../trunk/configure.ac) (revision 1533) +++ branches/olena-ng/configure.ac (.../branches/olena-ng/configure.ac) (revision 1534) @@ -74,7 +74,21 @@ olena/tests/Makefile ]) +# FIXME: Should be performed through oln.m4 macros. +AC_CONFIG_FILES([ + olena/tests/algorithms/Makefile + olena/tests/check/Makefile + olena/tests/check/defs + olena/tests/core/Makefile + olena/tests/io/Makefile + olena/tests/morphers/Makefile + olena/tests/sanity/Makefile + olena/tests/value/Makefile +]) +AC_CONFIG_FILES([olena/tests/sanity/check], + [chmod +x olena/tests/sanity/check]) + ## --------------- ## ## Configuration. ## ## --------------- ## @@ -97,81 +111,10 @@ static/samples/mini-std/Makefile static/samples/mini-std/cpp/Makefile static/samples/mini-std/cpp2/Makefile - milena/Makefile - milena/doc/Makefile olena/Makefile olena/oln/Makefile olena/img/Makefile dynamic/Makefile ]) -# FIXME: Should be performed through oln.m4 macros. -AC_CONFIG_FILES([ - milena/tests/Makefile - milena/tests/norm/Makefile - milena/tests/geom/Makefile - milena/tests/literal/Makefile - milena/tests/level/Makefile - milena/tests/level/naive/Makefile - milena/tests/level/approx/Makefile - milena/tests/draw/Makefile - milena/tests/arith/Makefile - milena/tests/canvas/Makefile - milena/tests/canvas/browsing/Makefile - milena/tests/canvas/morpho/Makefile - milena/tests/math/Makefile - milena/tests/border/Makefile - milena/tests/logical/Makefile - milena/tests/trait/Makefile - milena/tests/trait/image/Makefile - milena/tests/trait/value/Makefile - milena/tests/trait/op/Makefile - milena/tests/histo/Makefile - milena/tests/tag/Makefile - milena/tests/debug/Makefile - milena/tests/metal/Makefile - milena/tests/metal/math/Makefile - milena/tests/metal/make/Makefile - milena/tests/accu/Makefile - milena/tests/linear/Makefile - milena/tests/linear/local/Makefile - milena/tests/value/Makefile - milena/tests/value/concept/Makefile - milena/tests/value/builtin/Makefile - milena/tests/convert/Makefile - milena/tests/estim/Makefile - milena/tests/pw/Makefile - milena/tests/fun/Makefile - milena/tests/fun/i2v/Makefile - milena/tests/fun/x2x/Makefile - milena/tests/fun/p2b/Makefile - milena/tests/fun/p2v/Makefile - milena/tests/fun/v2v/Makefile - milena/tests/set/Makefile - milena/tests/win/Makefile - milena/tests/trace/Makefile - milena/tests/morpho/Makefile - milena/tests/io/Makefile - milena/tests/io/pfm/Makefile - milena/tests/io/pgm/Makefile - milena/tests/io/fits/Makefile - milena/tests/io/pnm/Makefile - milena/tests/io/ppm/Makefile - milena/tests/io/pbm/Makefile - milena/tests/util/Makefile - milena/tests/display/Makefile - milena/tests/labeling/Makefile -]) -AC_CONFIG_FILES([ - olena/tests/algorithms/Makefile - olena/tests/check/Makefile - olena/tests/check/defs - olena/tests/core/Makefile - olena/tests/io/Makefile - olena/tests/morphers/Makefile - olena/tests/sanity/Makefile - olena/tests/value/Makefile -]) -AC_CONFIG_FILES([olena/tests/sanity/check], - [chmod +x olena/tests/sanity/check]) AC_OUTPUT Index: /trunk/Makefile.am =================================================================== --- /trunk/Makefile.am (revision 1409) +++ /trunk/Makefile.am (revision 1534) @@ -3,3 +3,3 @@ ACLOCAL_AMFLAGS = -I build-aux -SUBDIRS = build-aux metalic extended static milena olena dynamic +SUBDIRS = build-aux milena Index: branches/olena-ng/Makefile.am =================================================================== --- branches/olena-ng/Makefile.am (.../trunk/Makefile.am) (revision 1533) +++ branches/olena-ng/Makefile.am (.../branches/olena-ng/Makefile.am) (revision 1534) @@ -2,4 +2,4 @@ ACLOCAL_AMFLAGS = -I build-aux -SUBDIRS = build-aux metalic extended static milena olena dynamic +SUBDIRS = build-aux metalic extended static olena dynamic Index: /trunk/TODO =================================================================== --- /trunk/TODO (revision 689) +++ /trunk/TODO (revision 1534) @@ -1,3 +1,3 @@ -See also the TODO in oln-proto-1.0 and oln-proto-stl-style. +See also the TODOs in oln-proto-1.0 and oln-proto-stl-style. @@ -56,8 +56,6 @@ -** Update the address of the FSF in Copyright notices (write a script) - ** Check dates for every copyright header -Use the repository of Olena 0.10 (and previous) and Olena proto-1.0 to +Use the repository of Olena 0.11 (and previous) and Olena proto-1.0 to find when files have been created and modified. This task could be a part of the code review process. @@ -72,5 +70,8 @@ standard error. -** Add the UPGRADING file from oln-0.10 and complete it +** Add the UPGRADING file from Olena 0.11 and complete it +N.B.: This file is generated. +We might want to break the pseudo-compatibility with Olena 0.x, and +get rid of UPGRADING. Index: branches/olena-ng/TODO =================================================================== --- branches/olena-ng/TODO (.../trunk/TODO) (revision 1533) +++ branches/olena-ng/TODO (.../branches/olena-ng/TODO) (revision 1534) @@ -1,4 +1,4 @@ -See also the TODO in oln-proto-1.0 and oln-proto-stl-style. +See also the TODOs in oln-proto-1.0 and oln-proto-stl-style. * Clean up @@ -58,7 +58,7 @@ ** Update the address of the FSF in Copyright notices (write a script) ** Check dates for every copyright header -Use the repository of Olena 0.10 (and previous) and Olena proto-1.0 to +Use the repository of Olena 0.11 (and previous) and Olena proto-1.0 to find when files have been created and modified. This task could be a part of the code review process. @@ -71,7 +71,10 @@ The tests should print nothing on the stantard output, nor on the standard error. -** Add the UPGRADING file from oln-0.10 and complete it +** Add the UPGRADING file from Olena 0.11 and complete it +N.B.: This file is generated. +We might want to break the pseudo-compatibility with Olena 0.x, and +get rid of UPGRADING. Local Variables: Index: /trunk/NEWS =================================================================== --- /trunk/NEWS (revision 466) +++ /trunk/NEWS (revision 1534) @@ -1,5 +1,33 @@ Olena 1.0 - * SCOOP 2 paradigm. + * Rewritten from scratch. + * First release of the Olena Platform with Milena as the + central library. + * Milena uses a simplified version of the SCOOP 2 paradigm, to + improve the speed of compilation and the ease of development + while still providing very good run-time performances. + + +Olena 0.11 February 21, 2007 + + * The whole Olena distribution compiles with the GNU C++ + Compiler (G++) 4.0 and 4.1. The compatibility with previous + versions of the compiler has been broken. + + * Revamp of Swilena. + The Swilena wrappers have been repaired, as they had become + incompatible with recent versions of SWIG, G++, Python and Ruby. + Moreover, a lot of small bugs have been fixed in Swilena. + The test suite of Rblena, the Ruby wrappers for Olena, has + been completed and is comparable to Pylena's (the Python + wrappers for Olena). + + * Libtool. + The whole package uses GNU Libtool to handle libraries. + Swilena benefits this, and uses Libtool to create shared + libraries upon which SWIG wrappers are built. + + * Miscellaneous corrections in Olena and Integre, as well as in + their test suites. Index: branches/olena-ng/NEWS =================================================================== --- branches/olena-ng/NEWS (.../trunk/NEWS) (revision 1533) +++ branches/olena-ng/NEWS (.../branches/olena-ng/NEWS) (revision 1534) @@ -1,8 +1,31 @@ -Olena 1.0 +Olena-NG - * SCOOP 2 paradigm. + * This version of Olena makes use of the SCOOP 2 paradigm. +Olena 0.11 February 21, 2007 + + * The whole Olena distribution compiles with the GNU C++ + Compiler (G++) 4.0 and 4.1. The compatibility with previous + versions of the compiler has been broken. + + * Revamp of Swilena. + The Swilena wrappers have been repaired, as they had become + incompatible with recent versions of SWIG, G++, Python and Ruby. + Moreover, a lot of small bugs have been fixed in Swilena. + The test suite of Rblena, the Ruby wrappers for Olena, has + been completed and is comparable to Pylena's (the Python + wrappers for Olena). + + * Libtool. + The whole package uses GNU Libtool to handle libraries. + Swilena benefits this, and uses Libtool to create shared + libraries upon which SWIG wrappers are built. + + * Miscellaneous corrections in Olena and Integre, as well as in + their test suites. + + Olena 0.10 April 15, 2004 * New documentation system.

17 years, 1 month

svn:ignore's

by Roland Levillain

Lorsque vous créez un répertoire ou que vous en êtes le mainteneur, merci de penser aux fichier que Subversion doit ignorer paisiblement. Notamment, les fichiers `Makefile.in' et `Makefile'. Vcs (et svn-wrapper aussi, probablement) fournissent un raccourci bien pratique pour ça : svn ignore path/to/directory/Makefile{.in,} Ça ajoute lesdits fichiers à la propriété `svn:ignore' de `path/to/directory'. Merci d'avance !

17 years, 1 month

milena r1533: Move accu's tests into accu directory

by Matthieu Garrigues

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-26 Matthieu Garrigues <garrigues(a)lrde.epita.fr> Move accu's tests into accu directory. * tests/accu/all.cc: Rename as... * tests/accu_all.cc: ...this. * tests/accu/min.cc: Rename as... * tests/accu_min.cc: ...this. * tests/accu/nil.cc: Rename as... * tests/accu_nil.cc: ...this. --- all.cc | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ min.cc | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ nil.cc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 164 insertions(+) Index: trunk/milena/tests/accu_nil.cc (deleted) =================================================================== Index: trunk/milena/tests/accu_min.cc (deleted) =================================================================== Index: trunk/milena/tests/accu_all.cc (deleted) =================================================================== Index: trunk/milena/tests/accu/nil.cc =================================================================== --- trunk/milena/tests/accu/nil.cc (revision 0) +++ trunk/milena/tests/accu/nil.cc (revision 1533) @@ -0,0 +1,46 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/accu/nil.cc + * + * \brief Tests on mln::accu::nil. + */ + +#include <mln/core/image2d.hh> +#include <mln/value/int_u8.hh> + +#include <mln/accu/nil.hh> +#include <mln/level/compute.hh> + + +int main() +{ + using namespace mln; + image2d<value::int_u8> ima(3, 3); + accu::nil a; + level::compute<accu::nil>(ima); +} Index: trunk/milena/tests/accu/min.cc =================================================================== --- trunk/milena/tests/accu/min.cc (revision 0) +++ trunk/milena/tests/accu/min.cc (revision 1533) @@ -0,0 +1,62 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/accu/min.cc + * + * \brief Tests on mln::accu::min. + */ + +#include <mln/core/image2d.hh> +#include <mln/debug/iota.hh> + +#include <mln/accu/nil.hh> +#include <mln/accu/min.hh> +#include <mln/accu/p.hh> +#include <mln/accu/v.hh> +#include <mln/accu/compute.hh> + +#include <mln/level/compute.hh> + + +int main() +{ + using namespace mln; + image2d<int> ima(3, 3); + debug::iota(ima); + mln_assertion(level::compute< accu::min >(ima) == 1); + mln_assertion(level::compute< accu::min_<int> >(ima) == 1); + +// accu::compute< accu::nil >(ima); // No-op. + +// accu::compute< accu::min >(ima); + + std::cout << accu::compute< accu::val<accu::min> >(ima) + << std::endl; + +// std::cout << accu::compute< accu::min >(ima) +// << std::endl; +} Index: trunk/milena/tests/accu/all.cc =================================================================== --- trunk/milena/tests/accu/all.cc (revision 0) +++ trunk/milena/tests/accu/all.cc (revision 1533) @@ -0,0 +1,56 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file tests/accu/all.cc + * + * \brief Tests on all files in mln/accu. + */ + +#include <mln/accu/all.hh> +#include <mln/core/point2d.hh> +#include <mln/value/set.hh> + + +int main() +{ + using namespace mln; + using namespace mln::accu; + + + bbox<point2d> b; + count_<int> c; + histo< value::set<bool> > h; + max_<int> ma; + mean_<int> me; + // median< value::set<bool> > med; // FIXME: bool has no min so workaround! + min_<int> mi; + // min_h< value::set<bool> > mh; // OK: do not work since bool has no min/max :) + min_max_<int> mm; + nil n; + pair_< min_<int>, max_<int> > p; + sum_<int> s; +}

17 years, 1 month

milena r1532: Update in mln::util

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-23 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update in mln::util. * mln/util/all.hh: Add all headers. * mln/util/branch_iter.hh, * mln/util/branch_iter_ind.hh, * mln/util/graph.hh, * mln/util/ordpair.hh: Check typo. --- all.hh | 8 ++++++++ branch_iter.hh | 2 +- branch_iter_ind.hh | 11 ++--------- 3 files changed, 11 insertions(+), 10 deletions(-) Index: trunk/milena/mln/util/graph.hh =================================================================== Index: trunk/milena/mln/util/all.hh =================================================================== --- trunk/milena/mln/util/all.hh (revision 1531) +++ trunk/milena/mln/util/all.hh (revision 1532) @@ -42,11 +42,19 @@ } +# include <mln/util/branch_iter.hh> +# include <mln/util/branch_iter_ind.hh> # include <mln/util/eat.hh> # include <mln/util/graph.hh> # include <mln/util/ignore.hh> # include <mln/util/nil.hh> +# include <mln/util/ordpair.hh> # include <mln/util/pix.hh> # include <mln/util/tracked_ptr.hh> +# include <mln/util/tree_fast.hh> +# include <mln/util/tree_fast_to_image.hh> +# include <mln/util/tree.hh> +# include <mln/util/tree_to_fast.hh> +# include <mln/util/tree_to_image.hh> #endif // ! MLN_UTIL_ALL_HH Index: trunk/milena/mln/util/branch_iter_ind.hh =================================================================== --- trunk/milena/mln/util/branch_iter_ind.hh (revision 1531) +++ trunk/milena/mln/util/branch_iter_ind.hh (revision 1532) @@ -173,7 +173,7 @@ else { s_.top().pos_++; - if (s_.top().list_->size() == s_.top().pos_) + if (s_.top().list_->size() == (unsigned)s_.top().pos_) { s_.pop(); next(); @@ -181,16 +181,9 @@ } else { - mln_assertion(s_.top().list_->size() > s_.top().pos_); + mln_assertion(s_.top().list_->size() > (unsigned)s_.top().pos_); if (s_.top().previous_ != 0) mln_assertion(s_.top().previous_ == (*(s_.top().list_))[s_.top().pos_ - 1]); - // if (s_.top().previous_ > 0) -// { -// if(previous_ == (*(s_.top().first))[s_.top().second - 1]) -// { -// std::cout << -// } -// } n_ = (*(s_.top().list_))[s_.top().pos_]; s_.top().previous_ = n_; Index: trunk/milena/mln/util/branch_iter.hh =================================================================== --- trunk/milena/mln/util/branch_iter.hh (revision 1531) +++ trunk/milena/mln/util/branch_iter.hh (revision 1532) @@ -47,7 +47,7 @@ /*! \brief Basic 2D image class. * * The parameter \c T is the type of node's data. branch_iter is used to pre-order walk a branch. - + * */ template <typename T> class branch_iter Index: trunk/milena/mln/util/ordpair.hh ===================================================================

17 years, 1 month

milena r1530: Clean util subdirectory tests

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-23 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Clean util subdirectory tests. * tests/util/Makefile.am: Update tests file. * tests/util/branch_iter_ind.cc: New. * tests/util/eat.cc: New. * tests/util/graph.cc: New. * tests/util/ordpair.cc: New. * tests/util/tree_delete_node.cc: Remove. * tests/util/util_ordpair.cc: Remove. --- Makefile.am | 16 +++++++++- branch_iter_ind.cc | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++ eat.cc | 46 +++++++++++++++++++++++++++++ graph.cc | 58 +++++++++++++++++++++++++++++++++++++ ordpair.cc | 48 ++++++++++++++++++++++++++++++ 5 files changed, 250 insertions(+), 1 deletion(-) Index: trunk/milena/tests/util/util_ordpair.cc (deleted) =================================================================== Index: trunk/milena/tests/util/tree_delete_node.cc (deleted) =================================================================== Index: trunk/milena/tests/util/ordpair.cc =================================================================== --- trunk/milena/tests/util/ordpair.cc (revision 0) +++ trunk/milena/tests/util/ordpair.cc (revision 1530) @@ -0,0 +1,48 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file util/ordpair.cc + * + * \brief Tests on mln::util::ordpair. + */ + +#include <mln/core/point2d.hh> +#include <mln/util/ordpair.hh> + + + +int main() +{ + using namespace mln; + + point2d p1(5,6), p2(5,7), p3(4,2); + + mln_assertion(util::ordpair (p2, p1) == util::ordpair (p1, p2)); + mln_assertion(util::ordpair (p1, p3) < util::ordpair (p1, p2)); + mln_assertion(util::ordpair (p1, p2) <= util::ordpair (p1, p2)); + mln_assertion(util::ordpair (p1, p3) <= util::ordpair (p1, p2)); +} Index: trunk/milena/tests/util/graph.cc =================================================================== --- trunk/milena/tests/util/graph.cc (revision 0) +++ trunk/milena/tests/util/graph.cc (revision 1530) @@ -0,0 +1,58 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/util/graph.cc + * + * \brief test of mln::util::graph + * + */ + +#include <mln/util/graph.hh> + +int main () +{ + using namespace mln; + + util::graph<void> g; + + g.add_node (); // 0 + g.add_node (); // 1 + g.add_node (); // 2 + g.add_node (); // 3 + g.add_node (); // 4 + g.add_node (); // 5 + g.add_edge (0, 1); + g.add_edge (0, 2); + g.add_edge (3, 4); + g.add_edge (4, 5); + g.add_edge (5, 4); + g.add_edge (1, 0); + g.add_edge (5, 3); + g.add_edge (2, 1); + g.consistency (); +} Index: trunk/milena/tests/util/Makefile.am =================================================================== --- trunk/milena/tests/util/Makefile.am (revision 1529) +++ trunk/milena/tests/util/Makefile.am (revision 1530) @@ -1,12 +1,26 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- + check_PROGRAMS = \ branch_iter \ branch_iter_ind \ -graph +eat \ +graph \ +ordpair \ +tree \ +tree_fast \ +tree_fast_to_image \ +tree_to_image + branch_iter_SOURCES = branch_iter.cc branch_iter_ind_SOURCES = branch_iter_ind.cc +eat_SOURCES = eat.cc graph_SOURCES = graph.cc +ordpair_SOURCES = ordpair.cc +tree_SOURCES = tree.cc +tree_fast_SOURCES = tree_fast.cc +tree_fast_to_image_SOURCES = tree_to_image.cc +tree_to_image_SOURCES = tree_to_image.cc TESTS = $(check_PROGRAMS) Index: trunk/milena/tests/util/eat.cc =================================================================== --- trunk/milena/tests/util/eat.cc (revision 0) +++ trunk/milena/tests/util/eat.cc (revision 1530) @@ -0,0 +1,46 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/util/eat.cc + * + * \brief test of mln::util::eat + * + */ + +#include <mln/util/eat.hh> + +int main () +{ + using namespace mln; + + int a = 42; + util::eat e(a); + +// // FIXME +// mln_assertion(false); +} Index: trunk/milena/tests/util/branch_iter_ind.cc =================================================================== --- trunk/milena/tests/util/branch_iter_ind.cc (revision 0) +++ trunk/milena/tests/util/branch_iter_ind.cc (revision 1530) @@ -0,0 +1,83 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/util/branch_iter_ind.cc + * + * \brief test of mln::util::branch_iter_ind + * + */ + +#include <mln/core/image2d.hh> +#include <mln/util/tree.hh> +#include <mln/util/branch_iter_ind.hh> + +int main() +{ + using namespace mln; + + util::node<int> n(11); + util::tree<int> t(&n); + util::node<int>* f = n.add_child(21); + util::node<int>* g = f->add_child(31); + + f->add_child(32); + g->add_child(41)->add_child(51)->add_child(61)->add_child(71)->add_child(81)->add_child(91); + g->add_child(42); + f->add_child(33); + f->add_child(34); + n.add_child(22); + + util::branch<int> b(t, n); + + std::vector< util::node<int>* >::iterator it; + util::branch_iter_ind<int> p(b); + + int prev; + int current; + for(p.start(), prev = util::node<int>(p).elt(), p.next(); + p.is_valid(); + prev = util::node<int>(p).elt(), p.next()) + { + current = util::node<int>(p).elt (); + + // children + if (prev + 10 == current) + continue; + + // brother + if (prev + 1 == current) + continue; + + // parent + if (prev > current) + continue; + + mln_assertion (false); + } + +}

17 years, 1 month

milena r1529: Update util tests subdirectory

by Guillaume Duhamel

URL: https://svn.lrde.epita.fr/svn/oln/trunk/milena ChangeLog: 2007-11-23 Guillaume Duhamel <guillaume.duhamel(a)lrde.epita.fr> Update util tests subdirectory. * tests/branch_iter.cc: Remove. * tests/util/branch_iter.cc: New. * tests/tree.cc: Remove. * tests/util/tree.cc: New. * tests/tree_delete_node.cc: Remove. * tests/util/tree_delete_node.cc: New. * tests/tree_fast.cc: Remove. * tests/util/tree_fast.cc: New. * tests/tree_fast_to_image.cc: Remove. * tests/util/tree_fast_to_image.cc: New. * tests/tree_to_image.cc: Remove. * tests/util/tree_to_image.cc: New. * tests/util_ordpair.cc: Remove. * tests/util/util_ordpair.cc: New. * tests/util/Makefile.am: Update somes tests. * tests/level/fill.cc: Erase comment header. --- level/fill.cc | 21 ------ util/Makefile.am | 10 +++ util/branch_iter.cc | 83 ++++++++++++++++++++++++++ util/tree.cc | 62 +++++++++++++++++++ util/tree_delete_node.cc | 69 +++++++++++++++++++++ util/tree_fast.cc | 61 +++++++++++++++++++ util/tree_fast_to_image.cc | 142 +++++++++++++++++++++++++++++++++++++++++++++ util/tree_to_image.cc | 136 +++++++++++++++++++++++++++++++++++++++++++ util/util_ordpair.cc | 48 +++++++++++++++ 9 files changed, 611 insertions(+), 21 deletions(-) Index: trunk/milena/tests/util_ordpair.cc (deleted) =================================================================== Index: trunk/milena/tests/tree.cc (deleted) =================================================================== Index: trunk/milena/tests/tree_delete_node.cc (deleted) =================================================================== Index: trunk/milena/tests/tree_fast.cc (deleted) =================================================================== Index: trunk/milena/tests/branch_iter.cc (deleted) =================================================================== Index: trunk/milena/tests/tree_fast_to_image.cc (deleted) =================================================================== Index: trunk/milena/tests/tree_to_image.cc (deleted) =================================================================== Index: trunk/milena/tests/level/fill.cc =================================================================== --- trunk/milena/tests/level/fill.cc (revision 1528) +++ trunk/milena/tests/level/fill.cc (revision 1529) @@ -34,10 +34,6 @@ #include <mln/core/sub_image.hh> #include <mln/level/fill.hh> -#include <mln/debug/println.hh> -//#include <mln/value/props.hh> - - int main() { using namespace mln; @@ -54,23 +50,6 @@ box_fwd_piter_<point2d> p(ima.domain()); for_all (p) mln_assertion (ima(p) == u); - } -// { -// const unsigned size = 10000; -// image2d<unsigned char> ima(size, size); -// for (unsigned i = 0; i < 5; ++i) -// level::fill(ima, uc); -// box_fwd_piter_<point2d> p(ima.domain()); -// for_all (p) -// mln_assertion (ima(p) == uc); -// } - -// { -// // do *not* compile so that's great since ima is not mutable -// sub_image< const image2d<int>, box2d > ima; -// level::fill(ima, 0); -// } - } Index: trunk/milena/tests/util/tree_fast.cc =================================================================== --- trunk/milena/tests/util/tree_fast.cc (revision 0) +++ trunk/milena/tests/util/tree_fast.cc (revision 1529) @@ -0,0 +1,61 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/util/tree_fast.cc + * + * \brief test of mln::util::tree_fast + * + */ + +#include <mln/util/tree_fast.hh> + +int main () +{ + using namespace mln; + + unsigned elt1 = 1; + unsigned elt2 = 2; + unsigned elt3 = 3; + unsigned elt4 = 4; + unsigned elt5 = 5; + unsigned elt6= 42; + + util::tree_fast<unsigned> tree_fast(elt1); + mln_assertion(tree_fast.has (elt1)); + tree_fast.add_child(tree_fast.search(elt1), elt2); + mln_assertion(tree_fast.has (elt2)); + tree_fast.add_child(tree_fast.search(elt1), elt3); + mln_assertion(tree_fast.has (elt3)); + tree_fast.add_child(tree_fast.search(elt2), elt4); + mln_assertion(tree_fast.has (elt4)); + tree_fast.add_child(tree_fast.search(elt2), elt5); + mln_assertion(tree_fast.has (elt5)); + tree_fast.add_parent(elt6); + mln_assertion(tree_fast.has (elt6)); + mln_assertion(tree_fast.search(elt6) == tree_fast.root_); +} Index: trunk/milena/tests/util/util_ordpair.cc =================================================================== --- trunk/milena/tests/util/util_ordpair.cc (revision 0) +++ trunk/milena/tests/util/util_ordpair.cc (revision 1529) @@ -0,0 +1,48 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! \file util/ordpair.cc + * + * \brief Tests on mln::util::ordpair. + */ + +#include <mln/core/point2d.hh> +#include <mln/util/ordpair.hh> + + + +int main() +{ + using namespace mln; + + point2d p1(5,6), p2(5,7), p3(4,2); + + mln_assertion(util::ordpair (p2, p1) == util::ordpair (p1, p2)); + mln_assertion(util::ordpair (p1, p3) < util::ordpair (p1, p2)); + mln_assertion(util::ordpair (p1, p2) <= util::ordpair (p1, p2)); + mln_assertion(util::ordpair (p1, p3) <= util::ordpair (p1, p2)); +} Index: trunk/milena/tests/util/tree.cc =================================================================== --- trunk/milena/tests/util/tree.cc (revision 0) +++ trunk/milena/tests/util/tree.cc (revision 1529) @@ -0,0 +1,62 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/util/tree.cc + * + * \brief test of mln::util::tree + * + */ + +#include <mln/util/tree.hh> + +int main () +{ + using namespace mln; + + unsigned elt1 = 1; + unsigned elt2 = 2; + unsigned elt3 = 3; + unsigned elt4 = 4; + unsigned elt5 = 5; + unsigned elt6= 42; + + util::node<unsigned> node(elt1); + util::node<unsigned>* node2 = node.add_child(elt2); + node.add_child(elt3); + mln_assertion(node2); + node2->add_child(elt4); + node2->add_child(elt5); + util::node<unsigned>* node3 = node.search(elt4); + mln_assertion(node3); + node3 = node2->search(elt1); + mln_assertion(!node3); + util::tree<unsigned>* tre = new util::tree<unsigned>(&node); + mln_assertion(tre); + tre->add_tree_up(elt6); + mln_assertion (tre->check_consistency()); +} Index: trunk/milena/tests/util/branch_iter.cc =================================================================== --- trunk/milena/tests/util/branch_iter.cc (revision 0) +++ trunk/milena/tests/util/branch_iter.cc (revision 1529) @@ -0,0 +1,83 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/util/branch_iter.cc + * + * \brief test of mln::util::branch_iter + * + */ + +#include <mln/core/image2d.hh> +#include <mln/util/tree.hh> +#include <mln/util/branch_iter.hh> + +int main() +{ + using namespace mln; + + util::node<int> n(11); + util::tree<int> t(&n); + util::node<int>* f = n.add_child(21); + util::node<int>* g = f->add_child(31); + + f->add_child(32); + g->add_child(41)->add_child(51)->add_child(61)->add_child(71)->add_child(81)->add_child(91); + g->add_child(42); + f->add_child(33); + f->add_child(34); + n.add_child(22); + + util::branch<int> b(t, n); + + std::vector< util::node<int>* >::iterator it; + util::branch_iter<int> p(b); + + int prev; + int current; + for(p.start(), prev = util::node<int>(p).elt(), p.next(); + p.is_valid(); + prev = util::node<int>(p).elt(), p.next()) + { + current = util::node<int>(p).elt (); + + // children + if (prev + 10 == current) + continue; + + // brother + if (prev + 1 == current) + continue; + + // parent + if (prev > current) + continue; + + mln_assertion (false); + } + +} Index: trunk/milena/tests/util/tree_fast_to_image.cc =================================================================== --- trunk/milena/tests/util/tree_fast_to_image.cc (revision 0) +++ trunk/milena/tests/util/tree_fast_to_image.cc (revision 1529) @@ -0,0 +1,142 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/tree_fast_to_image.cc + * + * \brief test of mln::util::tree_fast_to_image + * + */ + +#include <mln/core/contract.hh> +#include <mln/core/image2d.hh> +#include <mln/core/p_set.hh> +#include <mln/value/int_u8.hh> +#include <mln/level/stretch.hh> +#include <mln/io/pgm/save.hh> +#include <vector> +#include <mln/util/tree_fast_to_image.hh> +#include <mln/util/tree_fast.hh> + +template <typename P, typename V> +struct fllt_node +{ + V value; + mln::p_set points; + mln::p_set holes; +}; + + +template <typename P, typename V> +bool operator==(const mln::p_set& lhs, const mln::p_set& rhs) +{ + std::size_t n = lhs.npoints (); + mln::p_set tmp; + + if (n != rhs.npoints ()) + return false; + +// for (std::size_t i = 0; i < n; ++i) +// if () + +} + +template <typename P, typename V> +bool operator==(const struct fllt_node<P,V>& lhs, const struct fllt_node<P,V>& rhs) +{ + if (lhs.value != rhs.value) + return false; + + /// FIXME + + if (!(lhs.points == rhs.points)) + return false; + + if (!(lhs.holes == rhs.holes)) + return false; + + return true; +} + +int main (void) +{ + using namespace mln; + using value::int_u8; + + typedef p_set<point2d > I; + typedef fllt_node<point2d, int_u8> T; + + T s1; + T s2; + T s3; + T s4; + T s5; + T s6; + T s7; + + for (int i = 0; i < 100; ++i) + for (int j = 0; j < 100; ++j) + s1.points.insert(point2d(i, j)); + s1.value = 60; + for (int i = 200; i < 300; ++i) + for (int j = 0; j < 100; ++j) + s2.points.insert(point2d(i, j)); + s2.value = 100; + for (int i = 0; i < 100; ++i) + for (int j = 0; j < 100; ++j) + s3.points.insert(point2d(i, j)); + s3.value = 110; + for (int i = 260; i < 290; ++i) + for (int j = 0; j < 50; ++j) + s4.points.insert(point2d(i, j)); + s4.value = 170; + for (int i = 200; i < 210; ++i) + for (int j = 0; j < 50; ++j) + s5.points.insert(point2d(i, j)); + s5.value = 180; + for (int i = 270; i < 280; ++i) + for (int j = 50; j < 60; ++j) + s6.points.insert(point2d(i, j)); + s6.value = 210; + for (int i = 0; i < 300; ++i) + for (int j = 0; j < 200; ++j) + s7.points.insert(point2d(i, j)); + s7.value = 10; + + util::tree_fast<T> tree(s1); + tree.add_child(tree.root_, s2); + tree.add_child(tree.search(s1), s3); + tree.add_child(tree.search(s2), s4); + tree.add_child(tree.search(s2), s5); + tree.add_child(tree.search(s4), s6); + tree.add_parent(s7); + image2d<int_u8> out (300,300); + util::tree_fast_to_image(tree, out); + io::pgm::save(out, "out.pgm"); + std::cout << "out.pgm generate" + << std::endl; +} Index: trunk/milena/tests/util/tree_to_image.cc =================================================================== --- trunk/milena/tests/util/tree_to_image.cc (revision 0) +++ trunk/milena/tests/util/tree_to_image.cc (revision 1529) @@ -0,0 +1,136 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/tree_to_image.cc + * + * \brief test of mln::util::tree_to_image + * + */ + +#include <mln/util/tree.hh> +#include <mln/core/contract.hh> +#include <mln/core/image2d.hh> +#include <mln/core/p_set.hh> +#include <mln/value/int_u8.hh> +#include <mln/level/stretch.hh> +#include <mln/level/fill.hh> +#include <mln/level/compare.hh> +#include <mln/io/pgm/save.hh> +#include <vector> +#include <mln/util/tree_to_image.hh> +#include <mln/debug/println.hh> + +template <typename P, typename V> +struct fllt_node +{ + V value; + mln::p_set points; + mln::p_set holes; +}; + + +int main (void) +{ + using namespace mln; + using value::int_u8; + + typedef fllt_node<point2d , int_u8> I; + + image2d<int_u8> output (16, 16); + + I s1; + I s2; + I s3; + I s4; + I s5; + I s6; + I s7; + + for (int i = 0; i < 4; ++i) + for (int j = 0; j < 4; ++j) + s1.points.insert(point2d(i, j)); + s1.value = 60; + for (int i = 8; i < 16; ++i) + for (int j = 0; j < 4; ++j) + s2.points.insert(point2d(i, j)); + s1.value = 100; + for (int i = 0; i < 4; ++i) + for (int j = 0; j < 4; ++j) + s3.points.insert(point2d(i, j)); + s3.value = 110; + for (int i = 10; i < 12; ++i) + for (int j = 0; j < 2; ++j) + s4.points.insert(point2d(i, j)); + s4.value = 170; + for (int i = 8; i < 14; ++i) + for (int j = 0; j < 2; ++j) + s5.points.insert(point2d(i, j)); + s5.value = 180; + for (int i = 13; i < 15; ++i) + for (int j = 2; j < 4; ++j) + s6.points.insert(point2d(i, j)); + s6.value = 210; + for (int i = 0; i < 16; ++i) + for (int j = 0; j < 8; ++j) + s7.points.insert(point2d(i, j)); + s7.value = 10; + + util::node node(s1); + node.add_child(s2); + node.add_child(s3); + node.add_child(s4); + node.add_child(s5); + node.add_child(s6); + util::tree tree (&node); + tree.add_tree_up(s7); + util::tree_to_image(tree, output); + + int_u8 vs[16][16] = { + + {110, 110, 110, 110, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {110, 110, 110, 110, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {110, 110, 110, 110, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {110, 110, 110, 110, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + { 10, 10, 10, 10, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + { 10, 10, 10, 10, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + { 10, 10, 10, 10, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + { 10, 10, 10, 10, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {180, 180, 16, 16, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {180, 180, 16, 16, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {180, 180, 16, 16, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {180, 180, 16, 16, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {180, 180, 16, 16, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + {180, 180, 210, 210, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + { 16, 16, 210, 210, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0}, + { 16, 16, 16, 16, 10, 10, 10, 10, 0, 0, 0, 0, 0, 0, 0, 0} + + }; + + image2d<int_u8> ref (make::image2d(vs)); + mln_assertion(ref == output); +} Index: trunk/milena/tests/util/Makefile.am =================================================================== --- trunk/milena/tests/util/Makefile.am (revision 1528) +++ trunk/milena/tests/util/Makefile.am (revision 1529) @@ -1,3 +1,13 @@ ## Process this file through Automake to create Makefile.in -*- Makefile -*- +check_PROGRAMS = \ +branch_iter \ +branch_iter_ind \ +graph + +branch_iter_SOURCES = branch_iter.cc +branch_iter_ind_SOURCES = branch_iter_ind.cc +graph_SOURCES = graph.cc + +TESTS = $(check_PROGRAMS) include $(top_srcdir)/milena/tests/tests.mk Index: trunk/milena/tests/util/tree_delete_node.cc =================================================================== --- trunk/milena/tests/util/tree_delete_node.cc (revision 0) +++ trunk/milena/tests/util/tree_delete_node.cc (revision 1529) @@ -0,0 +1,69 @@ +// Copyright (C) 2007 EPITA Research and Development Laboratory +// +// This file is part of the Olena Library. This library is free +// software; you can redistribute it and/or modify it under the terms +// of the GNU General Public License version 2 as published by the +// Free Software Foundation. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this library; see the file COPYING. If not, write to +// the Free Software Foundation, 51 Franklin Street, Fifth Floor, +// Boston, MA 02111-1307, USA. +// +// As a special exception, you may use this file as part of a free +// software library without restriction. Specifically, if other files +// instantiate templates or use macros or inline functions from this +// file, or you compile this file and link it with other files to +// produce an executable, this file does not by itself cause the +// resulting executable to be covered by the GNU General Public +// License. This exception does not however invalidate any other +// reasons why the executable file might be covered by the GNU General +// Public License. + +/*! + * \file tests/tree_delete_node.cc + * + * \brief test of mln::util::tree + * + */ + +#include <mln/util/tree.hh> +#include <mln/core/contract.hh> + +int main (void) +{ + using namespace mln; + + unsigned elt1 = 1; + unsigned elt2 = 2; + unsigned elt3 = 3; + unsigned elt4 = 4; + unsigned elt5 = 5; + unsigned elt6= 42; + + util::node<unsigned> node(elt1); + util::node<unsigned>* node2 = node.add_child(elt2); + node.add_child(elt3); +// util::node<unsigned>* node2 = node.search(elt2); + mln_assertion(node2); + node2->add_child(elt4); + node2->add_child(elt5); + util::node<unsigned>* node3 = node.search(elt4); + mln_assertion(node3); + node3 = node2->search(elt1); + mln_assertion(!node3); + util::tree<unsigned>* tre = new util::tree<unsigned>(&node); + mln_assertion(tre); + tre->add_tree_up(elt6); + mln_assertion (tre->check_consistency()); + std::cout << "before delete" << std::endl; + node.print (0); + std::cout << "after delete" << std::endl; + node2->delete_node(); + node.print (0); +}

17 years, 1 month

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