songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added more tests for iterators, removed debug code

This commit is contained in:
Nico Kruithof 2013-03-20 08:14:59 +01:00
parent 9c05224ab7
commit d6f0982c87
2 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Periodic_2_triangulation_2/include/CGAL/Periodic_2_triangulation_2.h
View File

@ -580,10 +580,12 @@ public:
/// Returns edges_end() if t.number_of_vertices()=0. /// Returns edges_end() if t.number_of_vertices()=0.
/// \n NGHK: Implemented /// \n NGHK: Implemented
Edge_iterator edges_begin() const { Edge_iterator edges_begin() const {
// NGHK: Iterates over all edges, not the ones in the unique cover
return _tds.edges_begin(); return _tds.edges_begin();
} }
/// Past the end Edge_iterator. /// Past the end Edge_iterator.
/// NGHK: Implemented /// NGHK: Implemented
// NGHK: Iterates over all edges, not the ones in the unique cover
Edge_iterator edges_end() const { Edge_iterator edges_end() const {
return _tds.edges_end(); return _tds.edges_end();
} }

47
Periodic_2_triangulation_2/test/Periodic_2_triangulation_2/include/interface_test.h
View File

@ -182,16 +182,55 @@ void test_iterators() {
Vertex_handle vh2 = t.insert(Point(0.7, 0.7)); Vertex_handle vh2 = t.insert(Point(0.7, 0.7));
CGAL_USE(vh2); CGAL_USE(vh2);
// vertices
size_t size = 0;
for (typename T::Vertex_iterator vit = t_const.vertices_begin(); for (typename T::Vertex_iterator vit = t_const.vertices_begin();
vit != t_const.vertices_end(); ++vit) { vit != t_const.vertices_end(); ++vit) {
++size;
} }
CGAL_assertion(size == t_const.number_of_stored_vertices());
size = 0;
for (typename T::Unique_vertex_iterator uvit = t_const.unique_vertices_begin();
uvit != t_const.unique_vertices_end(); ++uvit) {
++size;
}
CGAL_assertion(size == t_const.number_of_vertices());
size = 0;
for (typename T::Vertex_iterator vit = t_const.all_vertices_begin();
vit != t_const.all_vertices_end(); ++vit) {
++size;
}
CGAL_assertion(size == t_const.number_of_stored_vertices());
// edges
size = 0;
for (typename T::Edge_iterator eit = t_const.edges_begin(); for (typename T::Edge_iterator eit = t_const.edges_begin();
eit != t_const.edges_end(); ++eit) { eit != t_const.edges_end(); ++eit) {
++size;
} }
CGAL_assertion(size == t_const.number_of_stored_edges());
size = 0;
for (typename T::Edge_iterator eit = t_const.all_edges_begin();
eit != t_const.all_edges_end(); ++eit) {
++size;
}
CGAL_assertion(size == t_const.number_of_stored_edges());
// faces
size = 0;
for (typename T::Face_iterator fit = t_const.faces_begin(); for (typename T::Face_iterator fit = t_const.faces_begin();
fit != t_const.faces_end(); ++fit) { fit != t_const.faces_end(); ++fit) {
++size;
} }
CGAL_assertion(size == t_const.number_of_stored_faces());
size = 0;
for (typename T::All_faces_iterator fit = t_const.all_faces_begin();
fit != t_const.all_faces_end(); ++fit) {
++size;
}
CGAL_assertion(size == t_const.number_of_stored_faces());
/// Geometric iterators
for (typename T::Periodic_point_iterator ppit = t_const.periodic_points_begin(); for (typename T::Periodic_point_iterator ppit = t_const.periodic_points_begin();
ppit != t_const.periodic_points_end(); ++ppit) { ppit != t_const.periodic_points_end(); ++ppit) {
} }
@ -403,8 +442,8 @@ template <class T>
void test_io(T &pt1) { void test_io(T &pt1) {
bool ex = false; // Exact predicates bool ex = false; // Exact predicates
std::cout << "I/O" << std::endl; // std::cout << "I/O" << std::endl;
std::cout << " ascii" << std::endl; // std::cout << " ascii" << std::endl;
std::stringstream ss1; std::stringstream ss1;
ss1 << pt1; ss1 << pt1;
@ -415,7 +454,7 @@ void test_io(T &pt1) {
assert(CGAL::is_ascii(ss1)); assert(CGAL::is_ascii(ss1));
if (!ex) assert(pt1 == pt1r); if (!ex) assert(pt1 == pt1r);
std::cout << " binary" << std::endl; // std::cout << " binary" << std::endl;
pt1r.clear(); pt1r.clear();
// There are problems with the IO of exact number types in binary mode. // There are problems with the IO of exact number types in binary mode.
if (!ex) { if (!ex) {
@ -429,7 +468,7 @@ void test_io(T &pt1) {
assert(pt1 == pt1r); assert(pt1 == pt1r);
} }
std::cout << " pretty" << std::endl; // std::cout << " pretty" << std::endl;
pt1r.clear(); pt1r.clear();
std::stringstream ss1p; std::stringstream ss1p;