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

Rename and move stuff

This commit is contained in:
Andreas Fabri 2022-03-15 10:34:36 +01:00
parent b1926b715a
commit a6ae3b1ac1
3 changed files with 49 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Mesh_2/include/CGAL/Delaunay_mesh_face_base_2.h
View File

@ -19,29 +19,10 @@
#include <CGAL/Constrained_Delaunay_triangulation_face_base_2.h>
#include <CGAL/Has_timestamp.h>
#include <boost/property_map/property_map.hpp>
namespace CGAL {
template <typename CDT>
struct In_domain {
typedef typename CDT::Face_handle key_type;
typedef bool value_type;
typedef bool reference;
typedef boost::read_write_property_map_tag category;
friend bool get(In_domain, const key_type& k)
{
return k->is_in_domain();
}
friend void put(In_domain, const key_type& k, const value_type& v)
{
k->set_in_domain(v);
}
};
template <class Gt,
class Fb = Constrained_Delaunay_triangulation_face_base_2<Gt> >

2
Triangulation_2/examples/Triangulation_2/polygon_triangulation.cpp
View File

@ -45,7 +45,7 @@ int main( )
in_domain(in_domain_map);
//Mark facets that are inside the domain bounded by the polygon
CGAL::mark_domains(cdt, in_domain);
CGAL::mark_domain_in_triangulation(cdt, in_domain);
int count=0;
for (Face_handle f : cdt.finite_face_handles())

60
Triangulation_2/include/CGAL/mark_domains.h
View File

@ -9,27 +9,49 @@
//
// Author(s) : Andreas Fabri
#ifndef CGAL_MARK_DOMAINS_H
#define CGAL_MARK_DOMAINS_H
#ifndef CGAL_MARK_DOMAIN_IN_TRIANGULATION_H
#define CGAL_MARK_DOMAIN_IN_TRIANGULATION_H
#include <CGAL/license/Triangulation_2.h>
#include <list>
#include <deque>
#include <boost/property_map/property_map.hpp>
#include <CGAL/Unique_hash_map.h>
namespace CGAL {
namespace internal {
template <typename CDT, typename InDomainPmap>
template <typename CDT>
struct In_domain {
typedef typename CDT::Face_handle key_type;
typedef bool value_type;
typedef bool reference;
typedef boost::read_write_property_map_tag category;
friend bool get(In_domain, const key_type& k)
{
return k->is_in_domain();
}
friend void put(In_domain, const key_type& k, const value_type& v)
{
k->set_in_domain(v);
}
};
template <typename CDT, typename InDomainPmap>
void
mark_domains(CDT& ct,
Unique_hash_map<typename CDT::Face_handle,int>& nesting_level,
typename CDT::Face_handle start,
int index,
std::list<typename CDT::Edge>& border,
InDomainPmap ipm)
mark_domain_in_triangulation(CDT& ct,
Unique_hash_map<typename CDT::Face_handle,int>& nesting_level,
typename CDT::Face_handle start,
int index,
std::list<typename CDT::Edge>& border,
InDomainPmap ipm)
{
typedef typename CDT::Face_handle Face_handle;
typedef typename CDT::Edge Edge;
@ -60,6 +82,9 @@ mark_domains(CDT& ct,
}
}
} // namesapce internal
//explore set of facets connected with non constrained edges,
//and attribute to each such set a nesting level.
//We start from facets incident to the infinite vertex, with a nesting
@ -68,7 +93,7 @@ mark_domains(CDT& ct,
//Facets in the domain are those with an odd nesting level.
template <typename CDT, typename InDomainPmap>
void
mark_domains(CDT& cdt, InDomainPmap ipm)
mark_domain_in_triangulation(CDT& cdt, InDomainPmap ipm)
{
typedef typename CDT::Face_handle Face_handle;
typedef typename CDT::Edge Edge;
@ -80,17 +105,26 @@ mark_domains(CDT& cdt, InDomainPmap ipm)
}
std::list<Edge> border;
mark_domains(cdt, nesting_level, cdt.infinite_face(), 0, border, ipm);
internal::mark_domain_in_triangulation(cdt, nesting_level, cdt.infinite_face(), 0, border, ipm);
while(! border.empty()){
Edge e = border.front();
border.pop_front();
Face_handle n = e.first->neighbor(e.second);
if(nesting_level[n] == -1){
mark_domains(cdt, nesting_level, n, nesting_level[e.first]+1, border, ipm);
internal::mark_domain_in_triangulation(cdt, nesting_level, n, nesting_level[e.first]+1, border, ipm);
}
}
}
template <typename CDT, typename InDomainPmap>
void
mark_domain_in_triangulation(CDT& cdt)
{
internal::In_domain<CDT> in_domain;
mark_domain_in_triangulation(cdt, in_domain);
}
} // namespace CGAL
#endif // CGAL_MARK_DOMAINS_H
#endif // CGAL_MARK_DOMAIN_IN_TRIANGULATION_H