diff --git a/Packages/Triangulation_3/TODO b/Packages/Triangulation_3/TODO index 90fded9c852..c831f90e159 100644 --- a/Packages/Triangulation_3/TODO +++ b/Packages/Triangulation_3/TODO @@ -2,19 +2,21 @@ negocier la doc de Filtered_exact... General - parametres template par defaut +- virer geom_traits exemples - demos - testsuite +- void a la place de GT dans cell_base - new Vertex/Cell create_cell T3 pour remove etc - trouver une interface avec T_2 qui permette d'eviter de reprogrammer tout le 2d dans le 3d -- virer geom_traits - purify TEST SUITE Doc - revoir tous les insert...(...) -- traits class +- traits class : Cartesian model of T_traits_3 +- parametres template - ameliorer user manual - verifier requirements sur la cell_base pour output/input stream - revoir les anciennes corrections de JF Dufourd diff --git a/Packages/Triangulation_3/changes.txt b/Packages/Triangulation_3/changes.txt index 30202d56513..0eabf173484 100644 --- a/Packages/Triangulation_3/changes.txt +++ b/Packages/Triangulation_3/changes.txt @@ -2,7 +2,7 @@ Version 1.61 (?? June 01) - default template parameters for all triangulation classes except hierarchy default used in the examples and test-suite - kernel traits used in the example(s) and test-suite -- example files included directly in the do +- example files included directly in the doc - Remove one "new Cell" in Triangulation_3. - Privatize some member functions of TDS. diff --git a/Packages/Triangulation_3/examples/Triangulation_3/Makefile b/Packages/Triangulation_3/examples/Triangulation_3/Makefile index d8e8013066b..0bfedcfceac 100644 --- a/Packages/Triangulation_3/examples/Triangulation_3/Makefile +++ b/Packages/Triangulation_3/examples/Triangulation_3/Makefile @@ -14,6 +14,8 @@ include $(CGAL_MAKEFILE) CXXFLAGS = -I../../include\ + -I../../../Kernel_basic/include \ + -I../../../Cartesian_kernel/include \ $(CGAL_CXXFLAGS)\ # -g diff --git a/Packages/Triangulation_3/examples/Triangulation_3/example1.C b/Packages/Triangulation_3/examples/Triangulation_3/example1.C index 3f141faa077..b3fe59330c8 100644 --- a/Packages/Triangulation_3/examples/Triangulation_3/example1.C +++ b/Packages/Triangulation_3/examples/Triangulation_3/example1.C @@ -23,22 +23,19 @@ #include #include -#include +#include #include #include #include -#include -#include -#include -#include #include -// for this simple example, using doubles is ok -// -typedef double NT; +////////////////////// +// chosing the number type +////////////////////// +// for this simple example, using doubles is ok // for more complicated examples with degenerate configurations, // using Filtered_exact number type is advised : // @@ -47,14 +44,17 @@ typedef double NT; // // typedef CGAL::Filtered_exact NT; -typedef CGAL::Cartesian Repr; -typedef CGAL::Triangulation_geom_traits_3 Gt; +typedef double NT; -typedef CGAL::Triangulation_vertex_base_pointer_3 Vb; -typedef CGAL::Triangulation_cell_base_3 Cb; +////////////////////// +// chosing the representation (cartesian or homogeneous) +////////////////////// -typedef CGAL::Triangulation_data_structure_3 TDS; -typedef CGAL::Triangulation_3 Triangulation; +typedef CGAL::Cartesian Gt; + +////////////////////// + +typedef CGAL::Triangulation_3 Triangulation; typedef Triangulation::Cell_handle Cell_handle; typedef Triangulation::Vertex_handle Vertex_handle;