- Use Filtered_exact<MP_Float> in the demo/examples.

This commit is contained in:
Sylvain Pion 2001-07-03 11:51:03 +00:00
parent 1f0e281848
commit 921bbab3de
7 changed files with 32 additions and 70 deletions

View File

@ -1,3 +1,6 @@
Version 1.70 (3 July 01)
- Use Filtered_exact<MP_Float> in the demo/examples.
Version 1.69 (3 July 01) Version 1.69 (3 July 01)
- fix in read_cells - fix in read_cells
- cell constructions and deletions done by the TDS only + doc update. - cell constructions and deletions done by the TDS only + doc update.

View File

@ -34,6 +34,9 @@ int main()
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Filtered_exact.h>
#include <CGAL/MP_Float.h>
#include <CGAL/IO/Geomview_stream.h> #include <CGAL/IO/Geomview_stream.h>
#include <CGAL/IO/Triangulation_geomview_ostream_3.h> #include <CGAL/IO/Triangulation_geomview_ostream_3.h>
@ -42,15 +45,9 @@ int main()
#include <unistd.h> #include <unistd.h>
#include <list> #include <list>
typedef double NT;
// for this simple example, using doubles is ok
// for more complicated examples with degenerate configurations,
// using Filtered_exact number type is advised : // using Filtered_exact number type is advised :
//
// #include <CGAL/Filtered_Exact.h> typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
// #include <CGAL/MP_Float.h>
//
// typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;

View File

@ -34,6 +34,9 @@ int main()
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Filtered_exact.h>
#include <CGAL/MP_Float.h>
#include <CGAL/IO/Geomview_stream.h> #include <CGAL/IO/Geomview_stream.h>
#include <CGAL/IO/Triangulation_geomview_ostream_3.h> #include <CGAL/IO/Triangulation_geomview_ostream_3.h>
@ -62,15 +65,9 @@ public :
{} {}
}; };
typedef double NT;
// for this simple example, using doubles is ok
// for more complicated examples with degenerate configurations,
// using Filtered_exact number type is advised : // using Filtered_exact number type is advised :
//
// #include <CGAL/Filtered_exact.h> typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
// #include <CGAL/MP_Float.h>
//
// typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;

View File

@ -34,6 +34,9 @@ int main()
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Filtered_exact.h>
#include <CGAL/MP_Float.h>
#include <CGAL/IO/Geomview_stream.h> #include <CGAL/IO/Geomview_stream.h>
#include <CGAL/IO/Triangulation_geomview_ostream_3.h> #include <CGAL/IO/Triangulation_geomview_ostream_3.h>
@ -42,15 +45,9 @@ int main()
#include <unistd.h> #include <unistd.h>
#include <list> #include <list>
typedef double NT;
// for this simple example, using doubles is ok
// for more complicated examples with degenerate configurations,
// using Filtered_exact number type is advised : // using Filtered_exact number type is advised :
//
// #include <CGAL/Filtered_Exact.h> typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
// #include <CGAL/MP_Float.h>
//
// typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;

View File

@ -2,6 +2,8 @@
#include <CGAL/Cartesian.h> #include <CGAL/Cartesian.h>
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Filtered_exact.h>
#include <CGAL/MP_Float.h>
#include <cassert> #include <cassert>
@ -30,15 +32,9 @@ public :
{} {}
}; };
typedef double NT;
// for this simple example, using doubles is ok
// for more complicated examples with degenerate configurations,
// using Filtered_exact number type is advised : // using Filtered_exact number type is advised :
//
// #include <CGAL/Filtered_exact.h> typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
// #include <CGAL/MP_Float.h>
//
// typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;

View File

@ -4,40 +4,25 @@
#include <CGAL/Triangulation_data_structure_3.h> #include <CGAL/Triangulation_data_structure_3.h>
#include <CGAL/Delaunay_triangulation_3.h> #include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Triangulation_hierarchy_3.h> #include <CGAL/Triangulation_hierarchy_3.h>
#include <CGAL/Filtered_exact.h>
#include <CGAL/MP_Float.h>
#include <cassert> #include <cassert>
#include <vector> #include <vector>
//////////////////////
// chosing the number type
//////////////////////
// for this simple example, using doubles is ok though the points
// are in degenerate configutations, since their coordinates
// are very small integers
// for examples with data stored on a large number of bits,
// using Filtered_exact number type is advised : // using Filtered_exact number type is advised :
//
// #include <CGAL/Filtered_exact.h>
// #include <CGAL/MP_Float.h>
//
// typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
typedef double NT; typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
////////////////////// // chosing the representation (Cartesian or homogeneous)
// chosing the representation (cartesian or homogeneous)
//////////////////////
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;
////////////////////// typedef CGAL::Triangulation_vertex_base_3<K> Vb;
typedef CGAL::Triangulation_vertex_base_3<K> Vb;
typedef CGAL::Triangulation_hierarchy_vertex_base_3<Vb> Vbh; typedef CGAL::Triangulation_hierarchy_vertex_base_3<Vb> Vbh;
typedef CGAL::Triangulation_cell_base_3<void> Cb; typedef CGAL::Triangulation_cell_base_3<void> Cb;
typedef CGAL::Triangulation_data_structure_3<Vbh,Cb> Tds; typedef CGAL::Triangulation_data_structure_3<Vbh,Cb> Tds;
typedef CGAL::Delaunay_triangulation_3<K,Tds> Dt; typedef CGAL::Delaunay_triangulation_3<K,Tds> Dt;
typedef CGAL::Triangulation_hierarchy_3<Dt> Dh; typedef CGAL::Triangulation_hierarchy_3<Dt> Dh;
typedef Dh::Vertex_iterator Vertex_iterator; typedef Dh::Vertex_iterator Vertex_iterator;

View File

@ -2,6 +2,8 @@
#include <CGAL/Cartesian.h> #include <CGAL/Cartesian.h>
#include <CGAL/Triangulation_3.h> #include <CGAL/Triangulation_3.h>
#include <CGAL/Filtered_exact.h>
#include <CGAL/MP_Float.h>
#include <iostream> #include <iostream>
#include <fstream> #include <fstream>
@ -9,29 +11,14 @@
#include <list> #include <list>
#include <vector> #include <vector>
//////////////////////
// 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 : // using Filtered_exact number type is advised :
//
// #include <CGAL/Filtered_exact.h>
// #include <CGAL/MP_Float.h>
//
// typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
typedef double NT; typedef CGAL::Filtered_exact<double, CGAL::MP_Float> NT;
////////////////////// // chosing the representation (Cartesian or homogeneous)
// chosing the representation (cartesian or homogeneous)
//////////////////////
typedef CGAL::Cartesian<NT> K; typedef CGAL::Cartesian<NT> K;
//////////////////////
typedef CGAL::Triangulation_3<K> Triangulation; typedef CGAL::Triangulation_3<K> Triangulation;
typedef Triangulation::Cell_handle Cell_handle; typedef Triangulation::Cell_handle Cell_handle;