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

Merge branch 'Triangulation_3-fix_delaunay_cell_base-jtournoi' into releases/CGAL-4.5-branch 

- fix Delaunay_triangulation_cell_base_3, which was not compiling
- add testing for this class
This commit is contained in:
Jane Tournois 2014-10-06 12:17:59 +02:00
parent 926d0fefc8 545fe18310
commit 2b7c05a1cc
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Triangulation_3/include/CGAL/Delaunay_triangulation_cell_base_3.h
View File

@ -32,12 +32,14 @@
namespace CGAL {
template < typename GT, typename Cb = Triangulation_ds_cell_base_3<> >
class Triangulation_cell_base_3
class Delaunay_triangulation_cell_base_3
: public Triangulation_cell_base_3<GT, Cb>
{
public:
typedef GT Geom_traits;
typedef typename Geom_traits::Point_3 Point_3;
typename Geom_traits::Point_3
Point_3
circumcenter(const Geom_traits& gt = Geom_traits()) const
{
return gt.construct_circumcenter_3_object()(this->vertex(0)->point(),

11
Triangulation_3/test/Triangulation_3/test_delaunay_3.cpp
View File

@ -21,6 +21,9 @@
#define CGAL_NO_DEPRECATION_WARNINGS
#include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/Triangulation_data_structure_3.h>
#include <CGAL/Triangulation_vertex_base_3.h>
#include <CGAL/Delaunay_triangulation_cell_base_3.h>
#include <CGAL/Triangulation_cell_base_with_circumcenter_3.h>
bool del=true;
@ -40,6 +43,14 @@ int main()
_test_cls_delaunay_3( Cls() );
_test_cls_delaunay_3( Cls_with_epec() );
typedef CGAL::Triangulation_data_structure_3<
CGAL::Triangulation_vertex_base_3<K>,
CGAL::Delaunay_triangulation_cell_base_3<K> > Tds_Delaunay_Cb;
typedef CGAL::Delaunay_triangulation_3<
EPIC, Tds_Delaunay_Cb> Cls_with_Delaunay_Cb;
_test_cls_delaunay_3( Cls_with_Delaunay_Cb() );
#ifdef CGAL_LINKED_WITH_TBB
typedef CGAL::Spatial_lock_grid_3<
CGAL::Tag_priority_blocking> Lock_ds;