Commit ca12212c authored by Guillaume Lazzara's avatar Guillaume Lazzara
Browse files

Rename histo::data as histo::array.

	* tests/core/other/var.cc,
	* tests/histo/compute.cc,
	* tests/histo/to_image1d.cc: rename here.

git-svn-id: https://svn.lrde.epita.fr/svn/oln/trunk@3167 4aad255d-cdde-0310-9447-f3009e2ae8c0
parent 4da17c47
2009-01-19 Guillaume Lazzara <z@lrde.epita.fr>
Rename histo::data as histo::array.
* tests/core/other/var.cc,
* tests/histo/compute.cc,
* tests/histo/to_image1d.cc: rename here.
2009-01-19 Guillaume Lazzara <z@lrde.epita.fr>
 
Improve soft heap interface.
......@@ -33,7 +33,7 @@
#include <mln/core/image/image2d.hh>
#include <mln/core/alias/window2d.hh>
#include <mln/core/alias/neighb2d.hh>
#include <mln/histo/data.hh>
#include <mln/histo/array.hh>
#include <mln/util/array.hh>
#include <mln/core/var.hh>
......@@ -73,7 +73,7 @@ void test_template()
mln_BKD_EITER(e, arr);
}
histo::data<bool> d;
histo::array<bool> d;
{
mln_VITER(v, d.vset());
}
......@@ -120,7 +120,7 @@ void test()
mln_BKD_EITER_(e, arr);
}
histo::data<bool> d;
histo::array<bool> d;
{
mln_VITER_(v, d.vset());
}
......
// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
......@@ -25,10 +26,9 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
/*! \file tests/histo/compute.cc
*
* \brief Tests on mln::accu::histo and mln::histo::data.
*/
/// \file tests/histo/compute.cc
///
/// Tests on mln::accu::histo and mln::histo::array.
#include <iterator>
#include <sstream>
......@@ -70,7 +70,7 @@ int main()
debug::iota(ima);
opt::at(ima, 0,0) = 2;
histo::data<int_u8> h = histo::compute(ima);
histo::array<int_u8> h = histo::compute(ima);
std::ostringstream oss;
oss << h;
mln_assertion(oss.str() == "2:2 3:1 4:1 5:1 6:1 7:1 8:1 9:1 ");
......@@ -86,7 +86,7 @@ int main()
image2d<int_s5> ima(3, 3);
debug::iota(ima);
histo::data<int_s5> h = histo::compute(ima);
histo::array<int_s5> h = histo::compute(ima);
mln_assertion(h.vset().nvalues() == 31);
for (unsigned i = 0; i <= 15; ++i) // values from -15 to 0
......
// Copyright (C) 2007, 2008 EPITA Research and Development Laboratory
// (LRDE
// Copyright (C) 2007, 2008, 2009 EPITA Research and Development
// Laboratory (LRDE)
//
// This file is part of the Olena Library. This library is free
// software; you can redistribute it and/or modify it under the terms
......@@ -28,7 +28,7 @@
/// \file tests/histo/to_image1d.cc
///
/// Tests on mln::accu::histo and mln::histo::data.
/// Tests on mln::accu::histo and mln::histo::array.
#include <iterator>
......@@ -68,7 +68,7 @@ int main()
debug::iota(ima);
ima(point2d(0,1)) = 255;
debug::println(ima);
histo::data<int_u8> h = histo::compute(ima);
histo::array<int_u8> h = histo::compute(ima);
std::cout << h << std::endl;
image1d<unsigned> ima2 = convert::to_image(h);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment