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

remove use of numeric_limits

This commit is contained in:
Sébastien Loriot 2016-06-28 18:43:56 +02:00
parent 54948a4b25
commit 29aacb5dc7
1 changed files with 69 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Reconstruction_triangulation_2.h
View File

@ -40,6 +40,7 @@
#include <boost/multi_index/identity.hpp>
#include <boost/multi_index/member.hpp>
#include <boost/container/deque.hpp>
#include <boost/optional.hpp>
// STL
#include <map>
@ -47,7 +48,6 @@
#include <vector>
#include <queue>
#include <iostream>
#include <limits>
#define CGAL_EPS 1e-15
@ -679,9 +679,9 @@ public:
}
Edge find_nearest_edge(const Point& point, Face_handle face) const {
FT min_dist2 = (std::numeric_limits<FT>::max)();
Edge nearest(Face_handle(), 0);
for (int i = 0; i < 3; ++i) {
Edge nearest(face, 0);
FT min_dist2 = compute_distance2(point, get_segment(nearest));
for (int i = 1; i < 3; ++i) {
Edge edge(face, i);
Segment segment = get_segment(edge);
FT dist2 = compute_distance2(point, segment);
@ -691,9 +691,6 @@ public:
}
}
if (nearest.first == Face_handle()) {
std::cout << "nearest edge not found" << std::endl;
}
return nearest;
}
@ -769,7 +766,9 @@ public:
}
// signed distance from t to the intersection of line(a,b) and line(t,s)
FT signed_distance_from_intersection(Vertex_handle a, Vertex_handle b,
// the pair::first is false if sign==-1 and true otherwise
std::pair<bool,boost::optional<FT> >
signed_distance_from_intersection(Vertex_handle a, Vertex_handle b,
Vertex_handle t, Vertex_handle s) const {
const Point& pa = a->point();
const Point& pb = b->point();
@ -779,29 +778,30 @@ public:
}
// signed distance from t to the intersection of line(a,b) and line(t,s)
FT compute_signed_distance_from_intersection(
// the pair::first is false if sign==-1 and true otherwise
std::pair<bool,boost::optional<FT> >
compute_signed_distance_from_intersection(
const Point& pa, const Point& pb, const Point& pt, const Point& ps) const
{
FT Dabt = compute_signed_distance(pa, pb, pt);
if (Dabt == FT(0))
return FT(0);
return std::make_pair(true,boost::make_optional(FT(0)));
Line lab = geom_traits().construct_line_2_object()(
pa, geom_traits().construct_vector_2_object()(pa, pb));
Line lts = geom_traits().construct_line_2_object()(
pt, geom_traits().construct_vector_2_object()(pt, ps));
FT Dqt = (std::numeric_limits<FT>::max)();
boost::optional<FT> Dqt;
typename CGAL::cpp11::result_of<typename Traits_::Intersect_2(Line, Line)>::type
result = intersection(lab, lts);
if (result)
if (const Point* iq = boost::get<Point>(&*result))
Dqt = CGAL::sqrt(geom_traits().compute_squared_distance_2_object()(*iq, pt));
if (result!=boost::none)
{
const Point* iq = boost::get<Point>(&(*result));
Dqt = CGAL::approximate_sqrt(geom_traits().compute_squared_distance_2_object()(*iq, pt));
}
if (Dabt < FT(0))
Dqt = -Dqt;
return Dqt;
return std::make_pair( (Dabt < FT(0) ? false : true) ,Dqt );
}
bool is_triangle_ccw(Vertex_handle a, Vertex_handle b, Vertex_handle c) const
@ -983,6 +983,26 @@ public:
std::cout <<"( " << (edge).priority() << ") ( " << a << " , " << b << " )" << std::endl;
}
bool is_p_infinity(const std::pair<bool,boost::optional<FT> >& p) const
{
return p.first && p.second==boost::none;
}
bool is_m_infinity(const std::pair<bool,boost::optional<FT> >& p) const
{
return !p.first && p.second==boost::none;
}
bool is_infinity(const std::pair<bool,boost::optional<FT> >& p) const
{
return p.second==boost::none;
}
std::pair<bool,boost::optional<FT> > m_infinity() const
{
return std::pair<bool,boost::optional<FT> >(0,boost::optional<FT>());
}
template <class Iterator> // value_type = Edge
bool make_collapsible(Edge& edge, Iterator begin, Iterator end, int verbose = 0)
{
@ -995,9 +1015,10 @@ public:
Edge ab = twin_edge(*it);
Vertex_handle a = source_vertex(ab);
Vertex_handle b = target_vertex(ab);
FT D = signed_distance_from_intersection(a, b, target, source);
if (D < FT(0)) {
multi_ind.insert(Rec_edge_2(ab, D));
std::pair<bool,boost::optional<FT> > D = signed_distance_from_intersection(a, b, target, source);
if (!D.first ) {
CGAL_assertion(D.second!=boost::none);
multi_ind.insert(Rec_edge_2(ab, *D.second));
}
}
@ -1019,23 +1040,37 @@ public:
Vertex_handle c = target_vertex(bc);
Vertex_handle d = target_vertex(cd);
FT Dac = -(std::numeric_limits<FT>::max)();
std::pair<bool,boost::optional<FT> > Dac=m_infinity();
if (a != c && is_triangle_ccw(a, b, c))
Dac = signed_distance_from_intersection(a, c, target, source);
FT Dbd = -(std::numeric_limits<FT>::max)();
std::pair<bool,boost::optional<FT> > Dbd=m_infinity();
if (b != d && is_triangle_ccw(b, c, d))
Dbd = signed_distance_from_intersection(b, d, target, source);
if (Dac == -(std::numeric_limits<FT>::max)() && Dbd ==
-(std::numeric_limits<FT>::max)())
if ( is_m_infinity(Dac) && is_m_infinity(Dbd) )
{
if (verbose > 0)
std::cerr << "--- No flips available ---" << std::endl;
return false;
}
if ((std::max)(Dac, Dbd) + CGAL_EPS < Dbc)
FT value = Dbc <= 0 ? 1 : 2*Dbc; // value used if Dbd or Dac are +infinity
if ( !is_infinity(Dac) )
{
if ( !is_infinity(Dbd))
value = (std::max)(*Dac.second * (Dac.first?1:-1),
*Dbd.second * (Dbd.first?1:-1) );
else
if ( !is_p_infinity(Dbd) )
value = *Dac.second * (Dac.first?1:-1);
}
else
if ( !is_infinity(Dbd) && !is_p_infinity(Dac))
value = *Dbd.second * (Dbd.first?1:-1);
// if ( max(Dac,Dbd)+CGAL_EPS < Dbc )
if (value + CGAL_EPS < Dbc)
{
/*
std::cerr.precision(10);
@ -1051,21 +1086,24 @@ public:
return false;
}
if (Dac > Dbd)
// if (Dac > Dbd)
if (is_p_infinity(Dac) || is_m_infinity(Dbd) ||
(!is_p_infinity(Dbd) && !is_m_infinity(Dac)
&& *Dac.second * (Dac.first?1:-1) > *Dbd.second * (Dbd.first?1:-1)))
{
(multi_ind.template get<0>()).erase(Rec_edge_2(ab));
Edge ac = flip(sb, edge, verbose);
if (Dac < FT(0)) {
multi_ind.insert(Rec_edge_2(ac, Dac));
if (!Dac.first) {
multi_ind.insert(Rec_edge_2(ac, - *Dac.second));
}
}
else
{
(multi_ind.template get<0>()).erase(Rec_edge_2(cd));
Edge bd = flip(sc, edge, verbose);
if (Dbd < FT(0)) {
multi_ind.insert(Rec_edge_2(bd, Dbd));
if (!Dbd.first) {
multi_ind.insert(Rec_edge_2(bd, - *Dbd.second));
}
}
nb_flips++;