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

Warnings; plus remove some tests.

This commit is contained in:
Guillaume Damiand 2020-04-24 08:46:03 +02:00
parent 92b207470b
commit 46ffea3f02
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Surface_mesh_topology/include/CGAL/Surface_mesh_topology/internal/Minimal_quadrangulation.h
View File

@ -573,7 +573,7 @@ protected:
/// Mark the edge containing adart in the original map.
void mark_original_edge(Original_dart_const_handle adart,
std::size_t amark)
Original_size_type amark)
{
get_original_map().mark(adart, amark);
if (!get_original_map().template is_free<2>(adart))
@ -582,7 +582,7 @@ protected:
}
/// Mark the edge containing adart in the reduced map (which is 2-closed)
void mark_reduced_edge(Dart_const_handle adart, std::size_t amark)
void mark_reduced_edge(Dart_const_handle adart, size_type amark)
{
get_local_map().mark(adart, amark);
get_local_map().mark(get_local_map().template beta<2>(adart), amark);

2
Surface_mesh_topology/test/Surface_mesh_topology/shortest_noncontractible_cycle_tests.cpp
View File

@ -355,7 +355,7 @@ bool unsew_edge_width_repeatedly_in_unweighted_gmap() {
std::cerr << "Fail unsew_edge_width_repeatedly_in_unweighted_gmap: Cannot locate file data/3torus.off\n";
return false;
}
std::vector<unsigned int> cycle_lengths;
std::vector<std::size_t> cycle_lengths;
std::size_t length;
do {
CGAL::Surface_mesh_topology::Curves_on_surface_topology<LCC_for_GMap_2> cst(lcc_gm);

26
Surface_mesh_topology/test/Surface_mesh_topology/test_shortest_cycle_non_contractible.cpp
View File

@ -72,8 +72,8 @@ bool test_weighted<LCC_CM>(const LCC_CM& map,
{
bool res=true;
// Cycle is the smallest non contractible cycle with unary weight on double-torus-2-d.off.
// Its length is 48.
// Cycle is the smallest non contractible cycle with unary weight on double-torus-2-b.off.
// Its length is 12.
// 1) We create a cycle parallel to this first one.
typename LCC_CM::Dart_const_handle dh=nullptr;
@ -91,7 +91,7 @@ bool test_weighted<LCC_CM>(const LCC_CM& map,
dh=map.next(dh);
// 2) Here dh is on the parallel of the first cycle. We mark darts of the cycle parallel
// to the first one. Its lenght is 96.
// to the first one. Its lenght is 24.
auto mark=map.get_new_mark();
std::size_t nbedges=0;
typename LCC_CM::Dart_const_handle dh2=dh;
@ -106,10 +106,10 @@ bool test_weighted<LCC_CM>(const LCC_CM& map,
}
while(dh2!=dh);
if (nbedges!=96)
if (nbedges!=24)
{
std::cout<<"[ERROR] in test_weighted: the length of the second cycle is wrong: "
<<nbedges<<"!=96"<<std::endl;
<<nbedges<<"!=24"<<std::endl;
res=false;
}
@ -141,7 +141,7 @@ bool test_weighted<LCC_CM>(const LCC_CM& map,
template<typename Mesh>
bool test_one_data_structure(const Mesh& mesh, std::size_t nbedges, double length,
std::size_t nbfaces, bool is_double_torus_2_d)
std::size_t nbfaces, bool is_double_torus_2_b)
{
bool res=true;
@ -157,7 +157,7 @@ bool test_one_data_structure(const Mesh& mesh, std::size_t nbedges, double lengt
res=false;
}
if (is_double_torus_2_d)
if (is_double_torus_2_b)
{
if (!test_weighted(mesh, cycle))
{ res=false; }
@ -197,7 +197,7 @@ bool test(const char* filename, std::size_t nbedges, double length, std::size_t
LCC_CM lcc_cm;
load_lcc(lcc_cm, filename);
if (!test_one_data_structure(lcc_cm, nbedges, length, nbfaces,
std::string(filename)=="data/double-torus-2-d.off"))
std::string(filename)=="data/double-torus-2-b.off"))
{
std::cout<<"[ERROR] for Linear_cell_complex_for_combinatorial_map."<<std::endl;
res=false;
@ -208,7 +208,7 @@ bool test(const char* filename, std::size_t nbedges, double length, std::size_t
LCC_GM lcc_gm;
load_lcc(lcc_gm, filename);
if (!test_one_data_structure(lcc_gm, nbedges, length, nbfaces,
std::string(filename)=="data/double-torus-2-d.off"))
std::string(filename)=="data/double-torus-2-b.off"))
{
std::cout<<"[ERROR] for Linear_cell_complex_for_generalized_map."<<std::endl;
res=false;
@ -219,7 +219,7 @@ bool test(const char* filename, std::size_t nbedges, double length, std::size_t
SM sm;
load_sm(sm, filename);
if (!test_one_data_structure(sm, nbedges, length, nbfaces,
std::string(filename)=="data/double-torus-2-d.off"))
std::string(filename)=="data/double-torus-2-b.off"))
{
std::cout<<"[ERROR] for Surface_mesh."<<std::endl;
res=false;
@ -230,7 +230,7 @@ bool test(const char* filename, std::size_t nbedges, double length, std::size_t
Poly poly;
load_sm(poly, filename);
if (!test_one_data_structure(poly, nbedges, length, nbfaces,
std::string(filename)=="data/double-torus-2-d.off"))
std::string(filename)=="data/double-torus-2-b.off"))
{
std::cout<<"[ERROR] for Polyhedron_3."<<std::endl;
res=false;
@ -251,8 +251,8 @@ int main()
if (!test("data/double-torus-2-b.off", 12, 5.41404, 6))
{ std::cout<<"[ERROR] for data/double-torus-2.off."<<std::endl; res=false; }
if (!test("data/double-torus-2-c.off", 24, 5.41404, 6))
{ std::cout<<"[ERROR] for data/double-torus-2.off."<<std::endl; res=false; }
// if (!test("data/double-torus-2-c.off", 24, 5.41404, 6))
// { std::cout<<"[ERROR] for data/double-torus-2.off."<<std::endl; res=false; }
// if (!test("data/double-torus-2-d.off", 48, 5.41404, 6))
// { std::cout<<"[ERROR] for data/double-torus-2.off."<<std::endl; res=false; }