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

Fix OTR and T2

This commit is contained in:
Andreas Fabri 2019-01-18 10:34:47 +01:00
parent 0496d840ff
commit 4bb714fd7b
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Optimal_transportation_reconstruction_2/include/CGAL/OTR_2/Cost.h
View File

@ -48,7 +48,7 @@ public:
m_total_weight(0) m_total_weight(0)
{} {}
Cost(const FT norm, const FT tang) Cost(const FT norm = FT(0), const FT tang = FT(0))
: m_norm(norm), : m_norm(norm),
m_tang(tang), m_tang(tang),
m_max_norm(norm), m_max_norm(norm),
@ -56,17 +56,6 @@ public:
m_total_weight(0) m_total_weight(0)
{} {}
~Cost() {}
Cost& operator= (const Cost& cost)
{
m_norm = cost.norm();
m_tang = cost.tang();
m_max_norm = cost.max_norm();
m_max_tang = cost.max_tang();
return *this;
}
const FT norm() const { return m_norm; } const FT norm() const { return m_norm; }
const FT tang() const { return m_tang; } const FT tang() const { return m_tang; }

3
Triangulation_2/include/CGAL/Constrained_triangulation_2.h
View File

@ -171,9 +171,6 @@ public:
Constrained_triangulation_2(const Gt& gt = Gt()) : Triangulation(gt) { } Constrained_triangulation_2(const Gt& gt = Gt()) : Triangulation(gt) { }
Constrained_triangulation_2(const Constrained_triangulation_2& ct)
: Triangulation(ct) {}
Constrained_triangulation_2(std::list<Constraint>& lc, const Gt& gt=Gt()) Constrained_triangulation_2(std::list<Constraint>& lc, const Gt& gt=Gt())
: Triangulation_2<Gt,Tds>(gt) : Triangulation_2<Gt,Tds>(gt)
{ {