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

Remove OTR_NO_TOLERANCE macro

This commit is contained in:
Simon Giraudot 2017-12-21 10:54:17 +01:00
parent bb13a0e7ef
commit 403420a6d8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Optimal_transportation_reconstruction_2/include/CGAL/Optimal_transportation_reconstruction_2.h
View File

@ -45,8 +45,6 @@
#include <boost/iterator/transform_iterator.hpp> #include <boost/iterator/transform_iterator.hpp>
#include <boost/type_traits/is_float.hpp> #include <boost/type_traits/is_float.hpp>
#define OTR_NO_TOLERANCE (FT)(-1.)
namespace CGAL { namespace CGAL {
@ -233,7 +231,7 @@ public:
m_alpha(0.5), m_alpha(0.5),
m_ghost(1.0), m_ghost(1.0),
m_relocation(relocation), m_relocation(relocation),
m_tolerance (OTR_NO_TOLERANCE), m_tolerance (FT(-1.)),
point_pmap(point_map), point_pmap(point_map),
mass_pmap(mass_map) mass_pmap(mass_map)
{ {
@ -671,7 +669,7 @@ public:
bool is_above_tolerance (const Rec_edge_2& pedge) bool is_above_tolerance (const Rec_edge_2& pedge)
{ {
if (m_tolerance == OTR_NO_TOLERANCE) if (m_tolerance == (FT)(-1.))
return false; return false;
double cost = std::sqrt (pedge.after() / pedge.total_weight()); double cost = std::sqrt (pedge.after() / pedge.total_weight());
return cost > m_tolerance; return cost > m_tolerance;
@ -1504,7 +1502,7 @@ public:
collapse was possible. collapse was possible.
*/ */
bool run_until(std::size_t np) { bool run_until(std::size_t np) {
m_tolerance = OTR_NO_TOLERANCE; m_tolerance = (FT)(-1.);
CGAL::Real_timer timer; CGAL::Real_timer timer;
if (m_verbose > 0) if (m_verbose > 0)
std::cerr << "reconstruct until " << np << " V"; std::cerr << "reconstruct until " << np << " V";
@ -1537,7 +1535,7 @@ public:
edge collapse was possible. edge collapse was possible.
*/ */
bool run(const unsigned steps) { bool run(const unsigned steps) {
m_tolerance = OTR_NO_TOLERANCE; m_tolerance = (FT)(-1.);
CGAL::Real_timer timer; CGAL::Real_timer timer;
if (m_verbose > 0) if (m_verbose > 0)
std::cerr << "reconstruct " << steps; std::cerr << "reconstruct " << steps;
@ -1824,6 +1822,4 @@ public:
}; };
} // namespace } // namespace
#undef OTR_NO_TOLERANCE
#endif // CGAL_OPTIMAL_TRANSPORTATION_RECONSTRUCTION_2_H_ #endif // CGAL_OPTIMAL_TRANSPORTATION_RECONSTRUCTION_2_H_