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

fix warnings

This commit is contained in:
Sébastien Loriot 2022-10-25 14:07:07 +02:00
parent 9179a2d41b
commit 601c5d099f
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Mesh_2/include/CGAL/Mesh_2/Mesh_global_optimizer_2.h
View File

@ -108,7 +108,7 @@ public:
} }
} }
Mesh_optimization_return_code operator()(const int nb_iterations) Mesh_optimization_return_code operator()(const std::size_t nb_iterations)
{ {
running_time_.reset(); running_time_.reset();
running_time_.start(); running_time_.start();
@ -141,7 +141,7 @@ public:
bool convergence_stop = false; bool convergence_stop = false;
// Iterate // Iterate
int i = -1; std::size_t i = -1;
while ( ++i < nb_iterations && ! is_time_limit_reached() ) while ( ++i < nb_iterations && ! is_time_limit_reached() )
{ {
this->before_move(); this->before_move();

6
Mesh_2/include/CGAL/lloyd_optimize_mesh_2.h
View File

@ -190,7 +190,7 @@ lloyd_optimize_mesh_2(CDT& cdt, const CGAL_NP_CLASS& np = parameters::default_va
template<typename CDT> template<typename CDT>
Mesh_optimization_return_code Mesh_optimization_return_code
lloyd_optimize_mesh_2_impl(CDT& cdt, lloyd_optimize_mesh_2_impl(CDT& cdt,
const int max_iterations, const std::size_t max_iterations,
const double convergence_ratio, const double convergence_ratio,
const double freeze_bound, const double freeze_bound,
const double time_limit, const double time_limit,
@ -206,7 +206,7 @@ lloyd_optimize_mesh_2(CDT& cdt, const CGAL_NP_CLASS& np = parameters::default_va
template<typename CDT, typename InputIterator> template<typename CDT, typename InputIterator>
Mesh_optimization_return_code Mesh_optimization_return_code
lloyd_optimize_mesh_2_impl(CDT& cdt, lloyd_optimize_mesh_2_impl(CDT& cdt,
const int max_iterations, const std::size_t max_iterations,
const double convergence_ratio, const double convergence_ratio,
const double freeze_bound, const double freeze_bound,
const double time_limit, const double time_limit,
@ -231,7 +231,7 @@ lloyd_optimize_mesh_2(CDT& cdt, const CGAL_NP_CLASS& np = parameters::default_va
#endif #endif
// 1000 iteration max to avoid infinite loop // 1000 iteration max to avoid infinite loop
int nb_iterations = (0 == max_iterations) std::size_t nb_iterations = (0 == max_iterations)
? 1000 ? 1000
: max_iterations; : max_iterations;

14
Mesh_2/test/Mesh_2/test_double_map.cpp
View File

@ -12,7 +12,7 @@ typedef CGAL::Double_map<int, int> Map;
int main(int argc, char** argv) int main(int argc, char** argv)
{ {
unsigned int number_of_elements = 500; int number_of_elements = 500;
#ifdef CGAL_USE_BOOST_BIMAP #ifdef CGAL_USE_BOOST_BIMAP
std::cerr << "(Using the \"Boost.Bimap implementation\" of <CGAL/Double_map.h>...)\n\n"; std::cerr << "(Using the \"Boost.Bimap implementation\" of <CGAL/Double_map.h>...)\n\n";
@ -58,14 +58,14 @@ int main(int argc, char** argv)
assert(f.empty() && f2.empty()); assert(f.empty() && f2.empty());
/* AUTOMATIC CHECKS */ /* AUTOMATIC CHECKS */
std::cerr << "Filling f with " << number_of_elements << " random integers...\n"; std::cerr << "Filling f with " << number_of_elements << " random integers...\n";
for(unsigned int n=0; n<number_of_elements; n++) for(int n=0; n<number_of_elements; n++)
{ {
int i=CGAL::get_default_random().get_int(0,1000); int i=CGAL::get_default_random().get_int(0,1000);
f.insert(i, i*i); f.insert(i, i*i);
} }
std::cerr << "Check f.size<=" << number_of_elements << ".\n"; std::cerr << "Check f.size<=" << number_of_elements << ".\n";
assert(f.size()<=number_of_elements); assert(f.size()<=std::size_t(number_of_elements));
std::cerr << "Assignment f2=f...\n"; std::cerr << "Assignment f2=f...\n";
f2 = f; // check the assignment f2 = f; // check the assignment
@ -123,18 +123,18 @@ int main(int argc, char** argv)
assert(f3.empty()); assert(f3.empty());
std::cerr << "Filling f with f(i)=i*i, i=0.." << number_of_elements-1 << "...\n"; std::cerr << "Filling f with f(i)=i*i, i=0.." << number_of_elements-1 << "...\n";
for(unsigned int n=0; n<number_of_elements; n++) for(int n=0; n<number_of_elements; n++)
{ {
f.insert(n, n*n); f.insert(n, n*n);
} }
std::cerr << "Check size: " std::cerr << "Check size: "
<< "f.size()=" << f.size() << "\n"; << "f.size()=" << f.size() << "\n";
assert(f.size()==number_of_elements); assert(f.size()==std::size_t(number_of_elements));
std::cerr << "Emptying f...\n"; std::cerr << "Emptying f...\n";
i2=0; i2=0;
unsigned int counter = 0; int counter = 0;
while(!f.empty()) while(!f.empty())
{ {
int i = f.front()->second; int i = f.front()->second;
@ -152,7 +152,7 @@ int main(int argc, char** argv)
assert(counter==number_of_elements); assert(counter==number_of_elements);
std::cerr << "Filling f with f(i)=i*i, i=0.." << number_of_elements -1 << "...\n"; std::cerr << "Filling f with f(i)=i*i, i=0.." << number_of_elements -1 << "...\n";
for(unsigned int n=0; n<number_of_elements; n++) for(int n=0; n<number_of_elements; n++)
{ {
f.insert(n, n*n); f.insert(n, n*n);
} }