From 0a5526697681c5878d860114499de78d9dc60a02 Mon Sep 17 00:00:00 2001 From: pdlotko Date: Wed, 8 Nov 2017 12:52:40 +0000 Subject: making unit tests for bitmap cubical complexes more efficient. git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/periodic_cubical_complex_fix@2854 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 34a3668417fd55715ebe7873ba8bf1a14d5dbd8f --- src/Bitmap_cubical_complex/test/Bitmap_test.cpp | 29 +++++++++++++------------ 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'src/Bitmap_cubical_complex/test/Bitmap_test.cpp') diff --git a/src/Bitmap_cubical_complex/test/Bitmap_test.cpp b/src/Bitmap_cubical_complex/test/Bitmap_test.cpp index 7c01b7d4..4af699e9 100644 --- a/src/Bitmap_cubical_complex/test/Bitmap_test.cpp +++ b/src/Bitmap_cubical_complex/test/Bitmap_test.cpp @@ -1342,10 +1342,10 @@ BOOST_AUTO_TEST_CASE(check_if_boundary_of_boundary_is_zero_non_periodic_case_3_d std::vector data(27, 0); int number_of_all_elements = (2 * sizes[0] + 1) * (2 * sizes[1] + 1) * (2 * sizes[2] + 1); + std::vector elems_in_boundary(number_of_all_elements, 0); Bitmap_cubical_complex_base ba(sizes, data); for (Bitmap_cubical_complex_base::All_cells_iterator it = ba.all_cells_iterator_begin(); - it != ba.all_cells_iterator_end(); ++it) { - std::vector elems_in_boundary(number_of_all_elements, 0); + it != ba.all_cells_iterator_end(); ++it) { int i = 1; Bitmap_cubical_complex_base::Boundary_range bdrange = ba.boundary_range(*it); for (Bitmap_cubical_complex_base::Boundary_iterator bd = bdrange.begin(); bd != bdrange.end(); ++bd) { @@ -1375,10 +1375,10 @@ BOOST_AUTO_TEST_CASE(check_if_boundary_of_boundary_is_zero_non_periodic_case_4_d std::vector data(81, 0); int number_of_all_elements = (2 * sizes[0] + 1) * (2 * sizes[1] + 1) * (2 * sizes[2] + 1) * (2 * sizes[3] + 1); + std::vector elems_in_boundary(number_of_all_elements, 0); Bitmap_cubical_complex_base ba(sizes, data); for (Bitmap_cubical_complex_base::All_cells_iterator it = ba.all_cells_iterator_begin(); - it != ba.all_cells_iterator_end(); ++it) { - std::vector elems_in_boundary(number_of_all_elements, 0); + it != ba.all_cells_iterator_end(); ++it) { int i = 1; Bitmap_cubical_complex_base::Boundary_range bdrange = ba.boundary_range(*it); for (Bitmap_cubical_complex_base::Boundary_iterator bd = bdrange.begin(); bd != bdrange.end(); ++bd) { @@ -1407,10 +1407,10 @@ BOOST_AUTO_TEST_CASE(check_if_boundary_of_boundary_is_zero_periodic_case_2d) { std::vector data(9, 0); int number_of_all_elements = (2 * sizes[0]) * (2 * sizes[1]); // *(2*sizes[2]); + std::vector elems_in_boundary(number_of_all_elements, 0); Bitmap_cubical_complex_periodic_boundary_conditions ba(sizes, data, directions_of_periodicity); for (Bitmap_cubical_complex_periodic_boundary_conditions::All_cells_iterator it = ba.all_cells_iterator_begin(); - it != ba.all_cells_iterator_end(); ++it) { - std::vector elems_in_boundary(number_of_all_elements, 0); + it != ba.all_cells_iterator_end(); ++it) { int i = 1; // std::cout << "Element : " << *it << std::endl; @@ -1449,11 +1449,11 @@ BOOST_AUTO_TEST_CASE(check_if_boundary_of_boundary_is_zero_periodic_case_3d) { int number_of_all_elements = (2 * sizes[0]) * (2 * sizes[1]) * (2 * sizes[2]); Bitmap_cubical_complex_periodic_boundary_conditions ba(sizes, data, directions_of_periodicity); + std::vector elems_in_boundary(number_of_all_elements, 0); for (Bitmap_cubical_complex_periodic_boundary_conditions::All_cells_iterator it = ba.all_cells_iterator_begin(); it != ba.all_cells_iterator_end(); ++it) { // std::cout << "Element : " << *it << std::endl; - - std::vector elems_in_boundary(number_of_all_elements, 0); + int i = 1; Bitmap_cubical_complex_periodic_boundary_conditions_base::Boundary_range bdrange = ba.boundary_range(*it); @@ -1489,10 +1489,10 @@ BOOST_AUTO_TEST_CASE(check_if_boundary_of_boundary_is_zero_periodic_case_4d) { std::vector data(81, 0); int number_of_all_elements = (2 * sizes[0]) * (2 * sizes[1]) * (2 * sizes[2]) * (2 * sizes[3]); + std::vector elems_in_boundary(number_of_all_elements, 0); Bitmap_cubical_complex_periodic_boundary_conditions ba(sizes, data, directions_of_periodicity); for (Bitmap_cubical_complex_periodic_boundary_conditions::All_cells_iterator it = ba.all_cells_iterator_begin(); - it != ba.all_cells_iterator_end(); ++it) { - std::vector elems_in_boundary(number_of_all_elements, 0); + it != ba.all_cells_iterator_end(); ++it) { int i = 1; Bitmap_cubical_complex_periodic_boundary_conditions_base::Boundary_range bdrange = ba.boundary_range(*it); @@ -1525,9 +1525,9 @@ BOOST_AUTO_TEST_CASE(compute_incidence_between_cells_test) { int number_of_all_elements = (2 * sizes[0] + 1) * (2 * sizes[1] + 1) * (2 * sizes[1] + 1); Bitmap_cubical_complex_base ba(sizes, data); + std::vector elems_in_boundary(number_of_all_elements, 0); for (Bitmap_cubical_complex_base::All_cells_iterator it = ba.all_cells_iterator_begin(); - it != ba.all_cells_iterator_end(); ++it) { - std::vector elems_in_boundary(number_of_all_elements, 0); + it != ba.all_cells_iterator_end(); ++it) { Bitmap_cubical_complex_base::Boundary_range bdrange = ba.boundary_range(*it); for (Bitmap_cubical_complex_base::Boundary_iterator bd = bdrange.begin(); bd != bdrange.end(); ++bd) { Bitmap_cubical_complex_base::Boundary_range second_bdrange = ba.boundary_range(*bd); @@ -1555,9 +1555,10 @@ BOOST_AUTO_TEST_CASE(compute_incidence_between_cells_test_periodic_boundary_cond int number_of_all_elements = (2 * sizes[0]) * (2 * sizes[1]) * (2 * sizes[2]); Bitmap_cubical_complex_periodic_boundary_conditions ba(sizes, data, directions_of_periodicity); + + std::vector elems_in_boundary(number_of_all_elements, 0); for (Bitmap_cubical_complex_periodic_boundary_conditions::All_cells_iterator it = ba.all_cells_iterator_begin(); - it != ba.all_cells_iterator_end(); ++it) { - std::vector elems_in_boundary(number_of_all_elements, 0); + it != ba.all_cells_iterator_end(); ++it) { Bitmap_cubical_complex_periodic_boundary_conditions_base::Boundary_range bdrange = ba.boundary_range(*it); for (Bitmap_cubical_complex_periodic_boundary_conditions::Boundary_iterator bd = bdrange.begin(); bd != bdrange.end(); ++bd) { -- cgit v1.2.3