mirror of https://github.com/CGAL/cgal
Add possibility to init the triangulation with a custom set of points
This commit is contained in:
parent
b538657fad
commit
e09c51c32a
|
|
@ -415,10 +415,15 @@ public:
|
||||||
Sample_vector vertices, samples;
|
Sample_vector vertices, samples;
|
||||||
select_samples(percentage, vertices, samples);
|
select_samples(percentage, vertices, samples);
|
||||||
|
|
||||||
PointMassList point_mass_list;
|
PointMassList vertices_mass_list;
|
||||||
Sample_vector_const_iterator it;
|
Sample_vector_const_iterator it;
|
||||||
for (it = vertices.begin(); it != vertices.end(); it++) {
|
for (it = vertices.begin(); it != vertices.end(); it++) {
|
||||||
point_mass_list.push_back(
|
vertices_mass_list.push_back(
|
||||||
|
std::make_pair((*it)->point(), (*it)->mass()));
|
||||||
|
}
|
||||||
|
PointMassList samples_mass_list;
|
||||||
|
for (it = samples.begin(); it != samples.end(); it++) {
|
||||||
|
samples_mass_list.push_back(
|
||||||
std::make_pair((*it)->point(), (*it)->mass()));
|
std::make_pair((*it)->point(), (*it)->mass()));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -426,7 +431,9 @@ public:
|
||||||
Mass_property_map mass_pmap;
|
Mass_property_map mass_pmap;
|
||||||
MassPoint mp;
|
MassPoint mp;
|
||||||
|
|
||||||
m_pwsrec->initialize(point_mass_list.begin(), point_mass_list.end(),
|
m_pwsrec->initialize_with_custom_vertices
|
||||||
|
(samples_mass_list.begin(), samples_mass_list.end(),
|
||||||
|
vertices_mass_list.begin(), vertices_mass_list.end(),
|
||||||
point_pmap, mass_pmap);
|
point_pmap, mass_pmap);
|
||||||
|
|
||||||
m_init_done = true;
|
m_init_done = true;
|
||||||
|
|
|
||||||
|
|
@ -380,6 +380,34 @@ public:
|
||||||
assign_samples(m_samples.begin(), m_samples.end());
|
assign_samples(m_samples.begin(), m_samples.end());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
template <class InputIterator>
|
||||||
|
void initialize_with_custom_vertices(InputIterator samples_start,
|
||||||
|
InputIterator samples_beyond,
|
||||||
|
InputIterator vertices_start,
|
||||||
|
InputIterator vertices_beyond,
|
||||||
|
PointPMap point_map,
|
||||||
|
MassPMap mass_map) {
|
||||||
|
point_pmap = point_map;
|
||||||
|
mass_pmap = mass_map;
|
||||||
|
clear();
|
||||||
|
insert_loose_bbox(m_bbox_x, m_bbox_y, 2 * m_bbox_size);
|
||||||
|
init(vertices_start, vertices_beyond);
|
||||||
|
|
||||||
|
std::vector<Sample_*> m_samples;
|
||||||
|
for (InputIterator it = samples_start; it != samples_beyond; it++) {
|
||||||
|
#ifdef CGAL_USE_PROPERTY_MAPS_API_V1
|
||||||
|
Point point = get(point_pmap, it);
|
||||||
|
FT mass = get( mass_pmap, it);
|
||||||
|
#else
|
||||||
|
Point point = get(point_pmap, *it);
|
||||||
|
FT mass = get( mass_pmap, *it);
|
||||||
|
#endif
|
||||||
|
Sample_* s = new Sample_(point, mass);
|
||||||
|
m_samples.push_back(s);
|
||||||
|
}
|
||||||
|
assign_samples(m_samples.begin(), m_samples.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
template <class Vector>
|
template <class Vector>
|
||||||
Vector random_vec(const FT scale) const
|
Vector random_vec(const FT scale) const
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue