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

Filter out irrelevant (<= 0) natural and regular neighbor coordinates 

- coord == 0 is possible in theory, but not interesting to output
- coord < 0 is not possible in theory, but since we do construction and use
  signed (polygon_area_2()) area computations, we could in theory get
  negative coordinates in output
This commit is contained in:
Mael Rouxel-Labbé 2019-01-14 11:20:16 +01:00
parent 14150ef95c
commit 48185ac153
2 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Interpolation/include/CGAL/natural_neighbor_coordinates_2.h
View File

@ -99,21 +99,28 @@ natural_neighbors_2(const Dt& dt,
Point_2 p1(v1->point()), p2(v2->point());
Coord_type coef1(0);
Coord_type coef2(0);
Equal_x_2 equal_x_2;
if(!equal_x_2(p1,p2))
{
coef1 = (p.x() - p2.x()) / (p1.x() - p2.x());
coef2 = 1 - coef1;
*out++ = std::make_pair(v1,coef1);
*out++ = std::make_pair(v2,coef2);
} else {
else
coef1 = (p.y() - p2.y()) / (p1.y() - p2.y());
coef2 = 1 - coef1;
*out++ = std::make_pair(v1,coef1);
*out++ = std::make_pair(v2,coef2);
if(coef1 == 0)
{
*out++ = std::make_pair(v2, Coord_type(1));
return make_triple(out, Coord_type(1), true);
}
Coord_type coef2 = 1 - coef1;
if(coef2 == 0)
{
*out++ = std::make_pair(v1, Coord_type(1));
return make_triple(out, Coord_type(1), true);
}
*out++ = std::make_pair(v1,coef1);
*out++ = std::make_pair(v2,coef2);
return make_triple(out, coef1+coef2, true);
}
@ -142,6 +149,7 @@ natural_neighbors_2(const Dt& dt,
EdgeIterator hole_begin, EdgeIterator hole_end)
{
CGAL_precondition(dt.dimension() == 2);
typedef typename Dt::Geom_traits Traits;
typedef typename Traits::FT Coord_type;
typedef typename Traits::Point_2 Point_2;
@ -187,8 +195,12 @@ natural_neighbors_2(const Dt& dt,
p);
area += polygon_area_2(vor.begin(), vor.end(), dt.geom_traits());
*out++ = std::make_pair(current,area);
area_sum += area;
if(area > 0)
{
*out++ = std::make_pair(current,area);
area_sum += area;
}
//update prev and hit:
prev = current;

14
Interpolation/include/CGAL/regular_neighbor_coordinates_2.h
View File

@ -131,9 +131,12 @@ regular_neighbor_coordinates_vertex_2(const Rt& rt,
*vor_vertices++ = vor[2];
area += polygon_area_2(vor.begin(), vor.end(), rt.geom_traits());
*out++= std::make_pair(current, area);
area_sum += area;
if(area > 0)
{
*out++= std::make_pair(current, area);
area_sum += area;
}
//update prev and hit:
prev = current;
@ -163,8 +166,11 @@ regular_neighbor_coordinates_vertex_2(const Rt& rt,
++fc;
}
*out++ = std::make_pair((*hidden_vertices_begin), area);
area_sum += area;
if(area > 0)
{
*out++ = std::make_pair((*hidden_vertices_begin), area);
area_sum += area;
}
}
return make_triple(out, area_sum, true);