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

unsigned -> unsigned int

This commit is contained in:
Sébastien Loriot 2018-10-30 14:02:16 +01:00
parent 82ab4013b5
commit 8018acbf18
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Optimal_transportation_reconstruction_2/demo/Optimal_transportation_reconstruction_2/render.cpp
View File

@ -335,7 +335,7 @@ void R_s_k_2::draw_relevance(const float line_width, const int nb)
MultiIndex mindex; MultiIndex mindex;
FT min_value = (std::numeric_limits<FT>::max)(); FT min_value = (std::numeric_limits<FT>::max)();
FT max_value = -(std::numeric_limits<FT>::max)(); FT max_value = -(std::numeric_limits<FT>::max)();
unsigned nb_initial = 0; unsigned int nb_initial = 0;
for (Finite_edges_iterator ei = m_dt.finite_edges_begin(); ei != m_dt.finite_edges_end(); ++ei) for (Finite_edges_iterator ei = m_dt.finite_edges_begin(); ei != m_dt.finite_edges_end(); ++ei)
{ {
Edge edge = *ei; Edge edge = *ei;

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

@ -839,7 +839,7 @@ public:
bool random_pedge(Rec_edge_2& pedge) { bool random_pedge(Rec_edge_2& pedge) {
for (unsigned i = 0; i < 10; ++i) { for (unsigned int i = 0; i < 10; ++i) {
Edge edge = m_dt.random_finite_edge(); Edge edge = m_dt.random_finite_edge();
if (m_dt.is_pinned(edge)) if (m_dt.is_pinned(edge))
continue; continue;
@ -992,7 +992,7 @@ public:
Face_handle copy_face( Face_handle copy_face(
Face_handle f0, Face_handle f1, Vertex_handle_map& vmap) const Face_handle f0, Face_handle f1, Vertex_handle_map& vmap) const
{ {
for (unsigned i = 0; i < 3; ++i) { for (unsigned int i = 0; i < 3; ++i) {
Vertex_handle v0i = f0->vertex(i); Vertex_handle v0i = f0->vertex(i);
Vertex_handle v1i = vmap[v0i]; Vertex_handle v1i = vmap[v0i];
f1->set_vertex(i, v1i); f1->set_vertex(i, v1i);
@ -1014,7 +1014,7 @@ public:
cf->set_neighbor(i, cfi); cf->set_neighbor(i, cfi);
} }
for (unsigned j = 0; j < 2; ++j) { for (unsigned int j = 0; j < 2; ++j) {
i = (i + 1) % 3; i = (i + 1) % 3;
Face_handle fi = f->neighbor(i); Face_handle fi = f->neighbor(i);
Face_handle cfi = fmap[fi]; Face_handle cfi = fmap[fi];
@ -1049,8 +1049,8 @@ public:
outer_faces.push_back(outer); outer_faces.push_back(outer);
} }
for (unsigned i = 0; i < outer_faces.size(); ++i) { for (unsigned int i = 0; i < outer_faces.size(); ++i) {
unsigned j = (i + 1) % outer_faces.size(); unsigned int j = (i + 1) % outer_faces.size();
outer_faces[i]->set_neighbor(2, outer_faces[j]); outer_faces[i]->set_neighbor(2, outer_faces[j]);
outer_faces[j]->set_neighbor(1, outer_faces[i]); outer_faces[j]->set_neighbor(1, outer_faces[i]);
} }
@ -1534,15 +1534,15 @@ public:
`false` if the algorithm was prematurely ended because no more `false` if the algorithm was prematurely ended because no more
edge collapse was possible. edge collapse was possible.
*/ */
bool run(const unsigned steps) { bool run(const unsigned int steps) {
m_tolerance = (FT)(-1.); 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;
timer.start(); timer.start();
unsigned performed = 0; unsigned int performed = 0;
for (unsigned i = 0; i < steps; ++i) { for (unsigned int i = 0; i < steps; ++i) {
bool ok = decimate(); bool ok = decimate();
if (!ok) if (!ok)
break; break;
@ -1579,7 +1579,7 @@ public:
std::cerr << "reconstruct under tolerance " << tolerance; std::cerr << "reconstruct under tolerance " << tolerance;
timer.start(); timer.start();
unsigned performed = 0; unsigned int performed = 0;
while (decimate ()) while (decimate ())
performed++; performed++;