diff --git a/Packages/Triangulation_2/test/Triangulation_2_newd/example_3.C b/Packages/Triangulation_2/test/Triangulation_2_newd/example_3.C index 1f5c70288bb..db0b80dfc92 100644 --- a/Packages/Triangulation_2/test/Triangulation_2_newd/example_3.C +++ b/Packages/Triangulation_2/test/Triangulation_2_newd/example_3.C @@ -18,7 +18,14 @@ CGAL_BEGIN_NAMESPACE -template +struct TDS_Bidon { + typedef int Vertex_handle; + typedef int Face_handle; +}; + + + +template class Vertex_base : public Triangulation_vertex_base_2 { public: @@ -46,7 +53,7 @@ private: }; -template +template class Face_base : public Triangulation_face_base_2 { public: @@ -82,7 +89,7 @@ CGAL_END_NAMESPACE // // A user defined Vertex -template +template class My_vertex : public CGAL::Vertex_base { public: @@ -108,17 +115,17 @@ typedef CGAL::Cartesian K; typedef My_vertex MyVb; typedef CGAL::Vertex_base Vb; typedef CGAL::Face_base Fb; -typedef CGAL::Triangulation_data_structure_2 Tds; -// typedef CGAL::Triangulation_data_structure_2 Tds; +//typedef CGAL::Triangulation_data_structure_2 Tds; +typedef CGAL::Triangulation_data_structure_2 Tds; typedef CGAL::Triangulation_2 Triangulation; -typedef Gt::Point_2 Point; +typedef K::Point_2 Point; typedef Triangulation::Face_handle Face_handle; typedef Triangulation::Vertex_handle Vertex_handle; typedef Triangulation::Finite_faces_iterator Face_iterator; -typedef Triangulation::Finite_Vertices_iterator Vertex_iterator; -typedef Triangulation::Finite_edges _iterator Edge_iterator; +typedef Triangulation::Finite_vertices_iterator Vertex_iterator; +typedef Triangulation::Finite_edges_iterator Edge_iterator; int main() @@ -143,6 +150,9 @@ int main() v_iter++){ v_iter->set_vh(vertex); v_iter->set_fh(face); + vertex = v_iter; + face = v_iter->face(); + v_iter->set_wahou(v_iter); } for (Face_iterator f_iter = T.faces_begin(); @@ -153,9 +163,11 @@ int main() } - Vertex_iterator v_it = T.finite_vertices_begin(); - std::cerr << v_it->get_vh()->point()<<"\n"; - + for (Vertex_iterator v_it = T.finite_vertices_begin(); + v_it != T.finite_vertices_end(); + v_it++){ + std::cerr << v_it->point() << " " << v_it->get_wahou()->point()<<"\n"; + } return 0; } diff --git a/Packages/Triangulation_2/test/Triangulation_2_newd/example_4.C b/Packages/Triangulation_2/test/Triangulation_2_newd/example_4.C index a346faad1fc..d62c04f2ca2 100644 --- a/Packages/Triangulation_2/test/Triangulation_2_newd/example_4.C +++ b/Packages/Triangulation_2/test/Triangulation_2_newd/example_4.C @@ -3,13 +3,13 @@ // try a general example (not in CGAL), first #include -struct Bidon { +struct TDS_Bidon { typedef int Vertex_handle; }; //template -template +template class Vertex_base { public: