Index: integre/ChangeLog from Giovanni Palma &lt;giovanni(a)lrde.epita.fr&gt; * ntg/enum/bin.hh: Add size. Index: olena/ChangeLog from Giovanni Palma &lt;giovanni(a)lrde.epita.fr&gt; * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0: Add file. * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1: Add file. * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2: Add file. * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3: Add file. * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4: Add file. * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: Add file. Index: integre/ntg/enum/bin.hh --- integre/ntg/enum/bin.hh Thu, 27 Nov 2003 11:26:27 +0100 burrus_n (oln/t/21_bin.hh 1.5.1.1 640) +++ integre/ntg/enum/bin.hh Tue, 23 Mar 2004 11:59:25 +0100 palma_g (oln/t/21_bin.hh 1.5.1.1 640) @@ -1,4 +1,4 @@ -// Copyright (C) 2001, 2002, 2003 EPITA Research and Development Laboratory +// Copyright (C) 2001, 2002, 2003, 2004 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 @@ -70,6 +70,9 @@ typedef bin unsigned_largest_type; typedef bin unsigned_cumul_type; typedef unsigned int integer_type; + + // Particular properties + enum { size = 1 }; }; } // end of internal. Index: olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5 --- olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5 Tue, 23 Mar 2004 13:53:56 +0100 palma_g () +++ olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5 Tue, 23 Mar 2004 13:46:52 +0100 palma_g (oln/k/16_out_olena_ 644) @@ -0,0 +1,31 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/convol/fast_gaussian.hh> +#include <oln/core/behavior.hh> +#include <ntg/all.hh> + +int main() +{ + oln::utils::key::value_type data_key[16] = {0x70, 0x53, 0xa8, 0x84, 0x81, + 0x4, 0xbc, 0x30, 0x71, 0x23, + 0x78, 0xba, 0xed, 0x6, 0xc6, + 0x9e}; + + oln::utils::key key(data_key); + + typedef oln::image2d<ntg::int_u8> im_type; + im_type im1(oln::load(rdata("lena256.pgm"))); + + if (oln::utils::md5(oln::convol::fast::gaussian(im1, 2)) == key) + std::cout << "OK" << std::endl; + else + { + std::cout << "FAIL" << std::endl; + return true; + } + return 0; + } Index: olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4 --- olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4 Tue, 23 Mar 2004 13:53:56 +0100 palma_g () +++ olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4 Tue, 23 Mar 2004 12:07:13 +0100 palma_g (oln/k/17_out_olena_ 644) @@ -0,0 +1,28 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/convol/fast_gaussian.hh> +#include <oln/core/behavior.hh> +#include <ntg/all.hh> + +int main() +{ +oln::utils::key::value_type data_key[16] = {0x56, 0x10, 0x9f, 0xa9, 0xec, 0x89, 0x99, 0x14, 0x42, 0x4a, 0xcf, 0x42, 0xa9, 0xa2, 0xe3, 0xf4}; + +oln::utils::key key(data_key); + + typedef oln::image2d<ntg:: +int_u8> im_type; + im_type im1(oln::load(rdata("lena256.pgm"))); + if (oln::utils::md5(oln::convol::fast::gaussian(im1, 2)) == key) + std::cout << "OK" << std::endl; +else + { + std::cout << "FAIL" << std::endl; + return true; + } + return 0; + } Index: olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3 --- olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3 Tue, 23 Mar 2004 13:53:56 +0100 palma_g () +++ olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3 Tue, 23 Mar 2004 12:07:03 +0100 palma_g (oln/k/18_out_olena_ 644) @@ -0,0 +1,28 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/convol/fast_gaussian.hh> +#include <oln/core/behavior.hh> +#include <ntg/all.hh> + +int main() +{ +oln::utils::key::value_type data_key[16] = {0x56, 0x10, 0x9f, 0xa9, 0xec, 0x89, 0x99, 0x14, 0x42, 0x4a, 0xcf, 0x42, 0xa9, 0xa2, 0xe3, 0xf4}; + +oln::utils::key key(data_key); + + typedef oln::image2d<ntg:: +int_u8> im_type; + im_type im1(oln::load(rdata("lena256.pgm"))); + if (oln::utils::md5(oln::convol::fast::gaussian(im1, 2)) == key) + std::cout << "OK" << std::endl; +else + { + std::cout << "FAIL" << std::endl; + return true; + } + return 0; + } Index: olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2 --- olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2 Tue, 23 Mar 2004 13:53:56 +0100 palma_g () +++ olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2 Tue, 23 Mar 2004 12:06:52 +0100 palma_g (oln/k/19_out_olena_ 644) @@ -0,0 +1,28 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/convol/fast_gaussian.hh> +#include <oln/core/behavior.hh> +#include <ntg/all.hh> + +int main() +{ +oln::utils::key::value_type data_key[16] = {0xc, 0xec, 0xc0, 0x4c, 0xf4, 0xd1, 0xab, 0xef, 0x1c, 0xd3, 0x9c, 0xa7, 0x4d, 0xd7, 0x28, 0x92}; + +oln::utils::key key(data_key); + + typedef oln::image2d<ntg:: +int_u8> im_type; + im_type im1(oln::load(rdata("lena256.pgm"))); + if (oln::utils::md5(oln::convol::fast::gaussian(im1, 2, oln::value_behavior<oln_value_type_(im_type)>(0))) == key) + std::cout << "OK" << std::endl; +else + { + std::cout << "FAIL" << std::endl; + return true; + } + return 0; + } Index: olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1 --- olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1 Tue, 23 Mar 2004 13:53:56 +0100 palma_g () +++ olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1 Tue, 23 Mar 2004 12:06:42 +0100 palma_g (oln/k/20_out_olena_ 644) @@ -0,0 +1,28 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/convol/fast_gaussian.hh> +#include <oln/core/behavior.hh> +#include <ntg/all.hh> + +int main() +{ +oln::utils::key::value_type data_key[16] = {0xc, 0xec, 0xc0, 0x4c, 0xf4, 0xd1, 0xab, 0xef, 0x1c, 0xd3, 0x9c, 0xa7, 0x4d, 0xd7, 0x28, 0x92}; + +oln::utils::key key(data_key); + + typedef oln::image2d<ntg:: +int_u8> im_type; + im_type im1(oln::load(rdata("lena256.pgm"))); + if (oln::utils::md5(oln::convol::fast::gaussian(im1, 2, oln::value_behavior<oln_value_type_(im_type)>(0))) == key) + std::cout << "OK" << std::endl; +else + { + std::cout << "FAIL" << std::endl; + return true; + } + return 0; + } Index: olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0 --- olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0 Tue, 23 Mar 2004 13:53:56 +0100 palma_g () +++ olena/tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0 Tue, 23 Mar 2004 12:06:31 +0100 palma_g (oln/k/21_out_olena_ 644) @@ -0,0 +1,28 @@ +// -*- c++ -*- +#include "data.hh" +#include <oln/utils/md5.hh> + +#include "check.hh" +#include <oln/basics2d.hh> +#include <oln/convol/fast_gaussian.hh> +#include <oln/core/behavior.hh> +#include <ntg/all.hh> + +int main() +{ +oln::utils::key::value_type data_key[16] = {0xc, 0xec, 0xc0, 0x4c, 0xf4, 0xd1, 0xab, 0xef, 0x1c, 0xd3, 0x9c, 0xa7, 0x4d, 0xd7, 0x28, 0x92}; + +oln::utils::key key(data_key); + + typedef oln::image2d<ntg:: +int_u8> im_type; + im_type im1(oln::load(rdata("lena256.pgm"))); + if (oln::utils::md5(oln::convol::fast::gaussian(im1, 2, oln::value_behavior<oln_value_type_(im_type)>(0))) == key) + std::cout << "OK" << std::endl; +else + { + std::cout << "FAIL" << std::endl; + return true; + } + return 0; + } -- Giovanni Palma EPITA - promo 2005 - membre d'EpX - LRDE Mob. : +33 (0)6 60 97 31 74