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

synchronize manual and code

This commit is contained in:
Andreas Fabri 2013-11-28 16:28:43 +01:00
parent a46452da00
commit b9dca246d2
3 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Advancing_front_surface_reconstruction/examples/Advancing_front_surface_reconstruction/extract.cpp
View File

@ -14,9 +14,9 @@
#include <CGAL/Triangulation_data_structure_3.h>
#include <CGAL/Delaunay_triangulation_3.h>
#include <CGAL/AFSR_vertex_base_with_id_3.h>
#include <CGAL/Advancing_front_surface_reconstruction_vertex_base_3.h>
#include <CGAL/Triangulation_cell_base_3.h>
#include <CGAL/AFSR_cell_base_3.h>
#include <CGAL/Advancing_front_surface_reconstruction_cell_base_3.h>
#include <CGAL/Advancing_front_surface_reconstruction.h>
#include <CGAL/AFSR_options.h>
#include <CGAL/IO/Advancing_front_surface_reconstruction.h>
@ -30,10 +30,8 @@ typedef CGAL::Exact_predicates_inexact_constructions_kernel Kernel;
typedef Kernel::Point_3 Point;
typedef Kernel::Vector_3 Vector;
typedef CGAL::AFSR_vertex_base_with_id_3<Kernel> LVb;
typedef CGAL::Triangulation_cell_base_3<Kernel> Cb;
typedef CGAL::AFSR_cell_base_3<Cb> LCb;
typedef CGAL::Advancing_front_surface_reconstruction_vertex_base_3<Kernel> LVb;
typedef CGAL::Advancing_front_surface_reconstruction_cell_base_3<Kernel> LCb;
typedef CGAL::Triangulation_data_structure_3<LVb,LCb> Tds;
typedef CGAL::Delaunay_triangulation_3<Kernel,Tds> Triangulation_3;

22
Advancing_front_surface_reconstruction/include/CGAL/AFSR_cell_base_3.h → Advancing_front_surface_reconstruction/include/CGAL/Advancing_front_surface_reconstruction_cell_base_3.h
View File

@ -1,17 +1,19 @@
#ifndef CGAL_AFSR_CELL_BASE_3_H
#define CGAL_AFSR_CELL_BASE_3_H
#ifndef CGAL_ADVANCING_FRONT_SURFACE_RECONSTRUCTION_CELL_BASE_3_H
#define CGAL_ADVANCING_FRONT_SURFACE_RECONSTRUCTION_CELL_BASE_3_H
#include <CGAL/Triangulation_cell_base_3.h>
namespace CGAL {
template < class CellBase >
class AFSR_cell_base_3 : public CellBase
template < class Kernel, class CellBase = Triangulation_cell_base_3<Kernel> >
class Advancing_front_surface_reconstruction_cell_base_3 : public CellBase
{
public:
template < typename TDS2 >
struct Rebind_TDS {
typedef typename CellBase::template Rebind_TDS<TDS2>::Other Cb2;
typedef AFSR_cell_base_3<Cb2> Other;
typedef Advancing_front_surface_reconstruction_cell_base_3<Cb2> Other;
};
typedef typename CellBase::Vertex_handle Vertex_handle;
@ -39,7 +41,7 @@ private:
public:
AFSR_cell_base_3()
Advancing_front_surface_reconstruction_cell_base_3()
: CellBase(),
_smallest_radius_facet_tab(NULL), selected_facet(0)
#ifdef AFSR_LAZY
@ -53,7 +55,7 @@ public:
#endif
}
AFSR_cell_base_3(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3)
Advancing_front_surface_reconstruction_cell_base_3(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3)
: CellBase( v0, v1, v2, v3),
_smallest_radius_facet_tab(NULL), selected_facet(0)
#ifdef AFSR_LAZY
@ -67,7 +69,7 @@ public:
#endif
}
AFSR_cell_base_3(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3,
Advancing_front_surface_reconstruction_cell_base_3(Vertex_handle v0, Vertex_handle v1, Vertex_handle v2, Vertex_handle v3,
Cell_handle n0, Cell_handle n1, Cell_handle n2, Cell_handle n3)
: CellBase(v0, v1, v2, v3,
n0, n1, n2, n3),
@ -85,7 +87,7 @@ public:
//-------------------- DESTRUCTOR -----------------------------------
inline ~AFSR_cell_base_3()
inline ~Advancing_front_surface_reconstruction_cell_base_3()
{
if (_smallest_radius_facet_tab != NULL)
delete[] _smallest_radius_facet_tab;
@ -221,4 +223,4 @@ public:
} // namespace CGAL
#endif // CGAL_AFSR_CELL_BASE_3_H
#endif // CGAL_ADVANCING_FRONT_SURFACE_RECONSTRUCTION_CELL_BASE_3_H

30
Advancing_front_surface_reconstruction/include/CGAL/AFSR_vertex_base_with_id_3.h → Advancing_front_surface_reconstruction/include/CGAL/Advancing_front_surface_reconstruction_vertex_base_3.h
View File

@ -1,5 +1,5 @@
#ifndef CGAL_AFSR_VERTEX_BASE_WITH_ID_3_H
#define CGAL_AFSR_VERTEX_BASE_WITH_ID_3_H
#ifndef CGAL_ADVANCING_FRONT_SURFACE_RECONSTRUCTION_VERTEX_BASE_WITH_ID_3_H
#define CGAL_ADVANCING_FRONT_SURFACE_RECONSTRUCTION_VERTEX_BASE_WITH_ID_3_H
#include <CGAL/Triangulation_vertex_base_3.h>
@ -15,14 +15,14 @@
namespace CGAL {
template <class K, class VertexBase = Triangulation_vertex_base_3<K> >
class AFSR_vertex_base_with_id_3 : public VertexBase
class Advancing_front_surface_reconstruction_vertex_base_3 : public VertexBase
{
public:
template < typename TDS2 >
struct Rebind_TDS {
typedef typename VertexBase::template Rebind_TDS<TDS2>::Other Vb2;
typedef AFSR_vertex_base_with_id_3<K,Vb2> Other;
typedef Advancing_front_surface_reconstruction_vertex_base_3<K,Vb2> Other;
};
@ -155,7 +155,7 @@ public:
}
AFSR_vertex_base_with_id_3()
Advancing_front_surface_reconstruction_vertex_base_3()
: VertexBase(), _mark(-1),
_post_mark(-1),
ie_first(interior_edges.end()), ie_last(interior_edges.end()),
@ -164,7 +164,7 @@ public:
_incident_border = new_border();
}
AFSR_vertex_base_with_id_3(const Point & p)
Advancing_front_surface_reconstruction_vertex_base_3(const Point & p)
: VertexBase(p), _mark(-1),
_post_mark(-1),
ie_first(interior_edges.end()), ie_last(interior_edges.end()),
@ -173,7 +173,7 @@ public:
_incident_border = new_border();
}
AFSR_vertex_base_with_id_3(const Point & p, Cell_handle f)
Advancing_front_surface_reconstruction_vertex_base_3(const Point & p, Cell_handle f)
: VertexBase(p, f), _mark(-1),
_post_mark(-1),
ie_first(interior_edges.end()), ie_last(interior_edges.end()),
@ -182,7 +182,7 @@ public:
_incident_border = new_border();
}
AFSR_vertex_base_with_id_3(Cell_handle f)
Advancing_front_surface_reconstruction_vertex_base_3(Cell_handle f)
: VertexBase(f), _mark(-1),
_post_mark(-1),
ie_first(interior_edges.end()), ie_last(interior_edges.end()),
@ -191,7 +191,7 @@ public:
_incident_border = new_border();
}
AFSR_vertex_base_with_id_3(const AFSR_vertex_base_with_id_3& other)
Advancing_front_surface_reconstruction_vertex_base_3(const Advancing_front_surface_reconstruction_vertex_base_3& other)
: VertexBase(), _mark(-1),
_post_mark(-1),
ie_first(interior_edges.end()), ie_last(interior_edges.end()),
@ -201,7 +201,7 @@ public:
}
//-------------------- DESTRUCTOR -----------------------------------
~AFSR_vertex_base_with_id_3()
~Advancing_front_surface_reconstruction_vertex_base_3()
{
if (_incident_border != NULL)
{
@ -538,20 +538,20 @@ public:
template <class K, class VertexBase>
boost::object_pool<typename AFSR_vertex_base_with_id_3<K,VertexBase>::Next_border_elt> AFSR_vertex_base_with_id_3<K,VertexBase>::nbe_pool;
boost::object_pool<typename Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::Next_border_elt> Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::nbe_pool;
template <class K, class VertexBase>
boost::object_pool<typename AFSR_vertex_base_with_id_3<K,VertexBase>::Intern_successors_type> AFSR_vertex_base_with_id_3<K,VertexBase>::ist_pool;
boost::object_pool<typename Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::Intern_successors_type> Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::ist_pool;
template <class K, class VertexBase>
std::list<typename AFSR_vertex_base_with_id_3<K,VertexBase>::Vertex_handle> AFSR_vertex_base_with_id_3<K,VertexBase>::interior_edges;
std::list<typename Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::Vertex_handle> Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::interior_edges;
template <class K, class VertexBase>
std::list<typename AFSR_vertex_base_with_id_3<K,VertexBase>::Incidence_request_elt> AFSR_vertex_base_with_id_3<K,VertexBase>::incidence_requests;
std::list<typename Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::Incidence_request_elt> Advancing_front_surface_reconstruction_vertex_base_3<K,VertexBase>::incidence_requests;
} // namespace CGAL
#endif // CGALAFSR_VERTEX_BASE_3_H
#endif // CGAL_ADVANCING_FRONT_SURFACE_RECONSTRUCTION_VERTEX_BASE_3_H