mirror of https://github.com/CGAL/cgal
Misc minor changes
This commit is contained in:
Mael Rouxel-Labbé
parent
11c3a490d1
commit
0106de5fd0
|
|
@ -5,7 +5,8 @@
|
|||
#include <CGAL/Triangulation_vertex_base_2.h>
|
||||
|
||||
template < class GT, class Vb >
|
||||
class My_vertex_base : public Vb
|
||||
class My_vertex_base
|
||||
: public Vb
|
||||
{
|
||||
public:
|
||||
typedef typename Vb::Vertex_handle Vertex_handle;
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
#include <CGAL/Periodic_2_Delaunay_triangulation_traits_2.h>
|
||||
#include <CGAL/point_generators_2.h>
|
||||
|
||||
#include <vector>
|
||||
#include <cassert>
|
||||
#include <vector>
|
||||
|
||||
typedef CGAL::Exact_predicates_inexact_constructions_kernel K;
|
||||
typedef CGAL::Periodic_2_Delaunay_triangulation_traits_2<K> GT;
|
||||
|
|
|
|||
|
|
@ -33,11 +33,13 @@ int main()
|
|||
// check that the info was correctly set.
|
||||
Delaunay::Finite_vertices_iterator vit;
|
||||
for (vit = T.finite_vertices_begin(); vit != T.finite_vertices_end(); ++vit)
|
||||
{
|
||||
if( points[ vit->info() ].first != vit->point() )
|
||||
{
|
||||
std::cerr << "Error different info" << std::endl;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
std::cout << "OK" << std::endl;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -18,7 +18,8 @@ typedef Delaunay::Point Point;
|
|||
//a functor that returns a std::pair<Point,unsigned>.
|
||||
//the unsigned integer is incremented at each call to
|
||||
//operator()
|
||||
struct Auto_count : public std::unary_function<const Point&, std::pair<Point, unsigned> >
|
||||
struct Auto_count
|
||||
: public std::unary_function<const Point&, std::pair<Point, unsigned> >
|
||||
{
|
||||
mutable unsigned i;
|
||||
Auto_count() : i(0) {}
|
||||
|
|
@ -47,11 +48,13 @@ int main()
|
|||
// check that the info was correctly set.
|
||||
Delaunay::Finite_vertices_iterator vit;
|
||||
for (vit = T.finite_vertices_begin(); vit != T.finite_vertices_end(); ++vit)
|
||||
{
|
||||
if( points[ vit->info() ] != vit->point() )
|
||||
{
|
||||
std::cerr << "Error different info" << std::endl;
|
||||
exit(EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
std::cout << "OK" << std::endl;
|
||||
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -39,9 +39,8 @@ int main()
|
|||
// Standard insertion
|
||||
t.start();
|
||||
for (int i = 0 ; i < n ; i++)
|
||||
{
|
||||
PT1.insert(pts[i]);
|
||||
}
|
||||
|
||||
t.stop();
|
||||
std::cout << " Time: " << t.time() << " sec. (Standard insertion)" << std::endl;
|
||||
t.reset();
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
#include <CGAL/license/Periodic_2_triangulation_2.h>
|
||||
|
||||
|
||||
#include <CGAL/Periodic_2_triangulation_2.h>
|
||||
#include <CGAL/iterator.h>
|
||||
|
||||
|
|
@ -35,7 +34,6 @@
|
|||
#include <boost/mpl/and.hpp>
|
||||
#endif //CGAL_TRIANGULATION_2_DONT_INSERT_RANGE_OF_POINTS_WITH_INFO
|
||||
|
||||
|
||||
namespace CGAL
|
||||
{
|
||||
|
||||
|
|
@ -44,7 +42,8 @@ class Gt,
|
|||
class Tds = Triangulation_data_structure_2 <
|
||||
Periodic_2_triangulation_vertex_base_2<Gt>,
|
||||
Periodic_2_triangulation_face_base_2<Gt> > >
|
||||
class Periodic_2_Delaunay_triangulation_2 : public Periodic_2_triangulation_2<Gt, Tds>
|
||||
class Periodic_2_Delaunay_triangulation_2
|
||||
: public Periodic_2_triangulation_2<Gt, Tds>
|
||||
{
|
||||
typedef Periodic_2_Delaunay_triangulation_2<Gt, Tds> Self;
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -63,7 +63,8 @@ template < class Gt,
|
|||
class Tds = Triangulation_data_structure_2 <
|
||||
Periodic_2_triangulation_vertex_base_2<Gt>,
|
||||
Periodic_2_triangulation_face_base_2<Gt> > >
|
||||
class Periodic_2_triangulation_2: public Triangulation_cw_ccw_2
|
||||
class Periodic_2_triangulation_2
|
||||
: public Triangulation_cw_ccw_2
|
||||
{
|
||||
typedef Periodic_2_triangulation_2<Gt, Tds> Self;
|
||||
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ class Periodic_2_triangulation_face_base_2
|
|||
{
|
||||
typedef Fb Base;
|
||||
typedef typename Base::Triangulation_data_structure Tds;
|
||||
|
||||
public:
|
||||
typedef Gt Geom_traits;
|
||||
typedef Tds Triangulation_data_structure;
|
||||
|
|
|
|||
|
|
@ -40,13 +40,14 @@ class Periodic_2_triangulation_vertex_base_2
|
|||
{
|
||||
typedef Vb Base;
|
||||
typedef typename Vb::Triangulation_data_structure Tds;
|
||||
|
||||
public:
|
||||
typedef Gt Geom_traits;
|
||||
typedef typename Gt::Point_2 Point;
|
||||
typedef Tds Triangulation_data_structure;
|
||||
typedef typename Tds::Face_handle Face_handle;
|
||||
typedef typename Tds::Vertex_handle Vertex_handle;
|
||||
|
||||
typedef typename Tds::Vertex_handle Vertex_handle;
|
||||
typedef typename Tds::Face_handle Face_handle;
|
||||
typedef typename Gt::Point_2 Point;
|
||||
typedef Periodic_2_offset_2 Offset;
|
||||
|
||||
template < typename Tds2 >
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ public:
|
|||
// Hence, if the kernel has members and we use filtered traits, then
|
||||
// the members will be default constructed here...
|
||||
|
||||
// Problem 2: we have built filtered traits in P3Tfiltered_traits_3 and now
|
||||
// Problem 2: we have built filtered traits in P3Tfiltered_traits_2 and now
|
||||
// we also need those two...
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
|
||||
#include <CGAL/license/Periodic_2_triangulation_2.h>
|
||||
|
||||
#include <CGAL/internal/Static_filters/tools.h>
|
||||
#include <CGAL/Profile_counter.h>
|
||||
#include <CGAL/internal/Static_filters/Static_filter_error.h>
|
||||
#include <CGAL/internal/Static_filters/tools.h>
|
||||
|
|
|
|||
Loading…
Reference in New Issue