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

Remove warnings.

This commit is contained in:
Stephen Kiazyk 2014-07-31 09:44:28 -04:00
parent c802f0d52c
commit 82c34d7cd9
7 changed files with 3 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polyhedron/demo/Polyhedron/Scene_polyhedron_shortest_path_item.cpp
View File

@ -240,7 +240,7 @@ void Scene_polyhedron_shortest_path_item::get_as_edge_point(Scene_polyhedron_sho
for (size_t i = 0; i < 3; ++i)
{
if (i != minCoord)
if (i != minIndex)
{
sum += inOutLocation.second[i];
}
@ -250,7 +250,7 @@ void Scene_polyhedron_shortest_path_item::get_as_edge_point(Scene_polyhedron_sho
for (size_t i = 0; i < 3; ++i)
{
if (i != minCoord)
if (i != minIndex)
{
coords[i] = inOutLocation.second[i] / coords[i];
}

12
Polyhedron_shortest_path/test/Polyhedron_shortest_path/Polyhedron_shortest_path_test.cpp
View File

@ -42,10 +42,7 @@ BOOST_AUTO_TEST_CASE( shortest_path_regular_tetrahedron )
typedef Traits::Barycentric_coordinate Barycentric_coordinate;
typedef Traits::FT FT;
typedef boost::graph_traits<Polyhedron_3> GraphTraits;
typedef GraphTraits::vertex_descriptor vertex_descriptor;
typedef GraphTraits::vertex_iterator vertex_iterator;
typedef GraphTraits::halfedge_descriptor halfedge_descriptor;
typedef GraphTraits::halfedge_iterator halfedge_iterator;
typedef GraphTraits::face_descriptor face_descriptor;
typedef GraphTraits::face_iterator face_iterator;
typedef CGAL::Polyhedron_shortest_path<Traits> Polyhedron_shortest_path;
@ -109,9 +106,7 @@ BOOST_AUTO_TEST_CASE( test_simple_saddle_vertex_mesh )
typedef GraphTraits::vertex_descriptor vertex_descriptor;
typedef GraphTraits::vertex_iterator vertex_iterator;
typedef GraphTraits::halfedge_descriptor halfedge_descriptor;
typedef GraphTraits::halfedge_iterator halfedge_iterator;
typedef GraphTraits::face_descriptor face_descriptor;
typedef GraphTraits::face_iterator face_iterator;
typedef CGAL::Polyhedron_shortest_path<Traits> Polyhedron_shortest_path;
typedef boost::property_map<Polyhedron_3, CGAL::vertex_point_t>::type VPM;
@ -300,15 +295,10 @@ BOOST_AUTO_TEST_CASE( test_boundary_mesh )
typedef Traits::Barycentric_coordinate Barycentric_coordinate;
typedef Traits::FT FT;
typedef Traits::Point_3 Point_3;
typedef Traits::Point_2 Point_2;
typedef Traits::Triangle_3 Triangle_3;
typedef Traits::Triangle_2 Triangle_2;
typedef Traits::Segment_2 Segment_2;
typedef boost::graph_traits<Polyhedron_3> GraphTraits;
typedef GraphTraits::vertex_descriptor vertex_descriptor;
typedef GraphTraits::vertex_iterator vertex_iterator;
typedef GraphTraits::halfedge_descriptor halfedge_descriptor;
typedef GraphTraits::halfedge_iterator halfedge_iterator;
typedef GraphTraits::face_descriptor face_descriptor;
typedef GraphTraits::face_iterator face_iterator;
typedef CGAL::Polyhedron_shortest_path<Traits> Polyhedron_shortest_path;
@ -380,8 +370,6 @@ BOOST_AUTO_TEST_CASE( test_boundary_mesh )
typedef boost::property_map<Polyhedron_3, CGAL::face_external_index_t>::type FaceIndexMap;
FaceIndexMap faceIndexMap(CGAL::get(CGAL::face_external_index, P));
face_descriptor face = *startFace;
Polyhedron_shortest_path shortestPaths(P, traits);
//shortestPaths.m_debugOutput = true;

15
Polyhedron_shortest_path/test/Polyhedron_shortest_path/Polyhedron_shortest_path_test_2.cpp
View File

@ -41,22 +41,13 @@ BOOST_AUTO_TEST_CASE( test_a_to_b_vs_b_t_a_distances )
typedef CGAL::Polyhedron_shortest_path_default_traits<Kernel, Polyhedron_3> Traits;
typedef Traits::Barycentric_coordinate Barycentric_coordinate;
typedef Traits::FT FT;
typedef Traits::Point_3 Point_3;
typedef Traits::Point_2 Point_2;
typedef Traits::Triangle_3 Triangle_3;
typedef Traits::Triangle_2 Triangle_2;
typedef Traits::Segment_2 Segment_2;
typedef boost::graph_traits<Polyhedron_3> GraphTraits;
typedef GraphTraits::vertex_descriptor vertex_descriptor;
typedef GraphTraits::vertex_iterator vertex_iterator;
typedef GraphTraits::halfedge_descriptor halfedge_descriptor;
typedef GraphTraits::halfedge_iterator halfedge_iterator;
typedef GraphTraits::face_descriptor face_descriptor;
typedef GraphTraits::face_iterator face_iterator;
typedef CGAL::Polyhedron_shortest_path<Traits> Polyhedron_shortest_path;
typedef boost::property_map<Polyhedron_3, CGAL::vertex_point_t>::type VPM;
typedef boost::property_map<Polyhedron_3, boost::vertex_external_index_t>::type VIM;
typedef boost::property_map<Polyhedron_3, boost::edge_external_index_t>::type EIM;
typedef boost::property_map<Polyhedron_3, CGAL::halfedge_external_index_t>::type HIM;
typedef boost::property_map<Polyhedron_3, CGAL::face_external_index_t>::type FIM;
@ -166,9 +157,6 @@ BOOST_AUTO_TEST_CASE( test_a_to_b_vs_b_t_a_distances )
}
else
{
CGAL::test::Sequence_item<Traits>& steItem = startToEndCollector.m_sequence[k];
CGAL::test::Sequence_item<Traits>& etsItem = endToStartCollector.m_sequence[j];
std::string names[2] = { "STE", "ETS" };
CGAL::test::Sequence_item<Traits> items[2] = { startToEndCollector.m_sequence[k], endToStartCollector.m_sequence[j] };
Polyhedron_shortest_path* pathStructures[2] = { &startToEndShortestPaths, &endToStartShortestPaths };
@ -257,9 +245,6 @@ BOOST_AUTO_TEST_CASE( test_a_to_b_vs_b_t_a_distances )
}
else
{
CGAL::test::Sequence_item<Traits>& steItem = startToEndCollector.m_sequence[k];
CGAL::test::Sequence_item<Traits>& etsItem = endToStartCollector.m_sequence[j];
std::string names[2] = { "STE", "ETS" };
CGAL::test::Sequence_item<Traits> items[2] = { startToEndCollector.m_sequence[k], endToStartCollector.m_sequence[j] };

5
Polyhedron_shortest_path/test/Polyhedron_shortest_path/Polyhedron_shortest_path_test_3.cpp
View File

@ -37,12 +37,7 @@ BOOST_AUTO_TEST_CASE( test_find_nearest_face_location_on_surface )
typedef Traits::FT FT;
typedef Traits::Point_3 Point_3;
typedef Traits::Triangle_3 Triangle_3;
typedef Traits::Segment_2 Segment_2;
typedef boost::graph_traits<Polyhedron_3> GraphTraits;
typedef GraphTraits::vertex_descriptor vertex_descriptor;
typedef GraphTraits::vertex_iterator vertex_iterator;
typedef GraphTraits::halfedge_descriptor halfedge_descriptor;
typedef GraphTraits::halfedge_iterator halfedge_iterator;
typedef GraphTraits::face_descriptor face_descriptor;
typedef GraphTraits::face_iterator face_iterator;
typedef CGAL::Polyhedron_shortest_path<Traits> Polyhedron_shortest_path;

4
Polyhedron_shortest_path/test/Polyhedron_shortest_path/Polyhedron_shortest_path_test_4.cpp
View File

@ -40,10 +40,6 @@ BOOST_AUTO_TEST_CASE( test_find_nearest_face_location_above_surface )
typedef Traits::Triangle_3 Triangle_3;
typedef Traits::Ray_3 Ray_3;
typedef boost::graph_traits<Polyhedron_3> GraphTraits;
typedef GraphTraits::vertex_descriptor vertex_descriptor;
typedef GraphTraits::vertex_iterator vertex_iterator;
typedef GraphTraits::halfedge_descriptor halfedge_descriptor;
typedef GraphTraits::halfedge_iterator halfedge_iterator;
typedef GraphTraits::face_descriptor face_descriptor;
typedef GraphTraits::face_iterator face_iterator;
typedef CGAL::Polyhedron_shortest_path<Traits> Polyhedron_shortest_path;

1
Polyhedron_shortest_path/test/Polyhedron_shortest_path/Polyhedron_shortest_path_traits_test.cpp
View File

@ -276,7 +276,6 @@ BOOST_AUTO_TEST_CASE( detect_is_saddle_vertex )
typedef CGAL::Polyhedron_shortest_path_default_traits<Kernel, Polyhedron_3> Traits;
typedef boost::graph_traits<Polyhedron_3> GraphTraits;
typedef GraphTraits::vertex_descriptor vertex_descriptor;
typedef GraphTraits::vertex_iterator vertex_iterator;
Traits traits;

6
Polyhedron_shortest_path/test/Polyhedron_shortest_path/TestMesh.cpp
View File

@ -162,9 +162,7 @@ void test_mesh_function()
std::vector<vertex_descriptor> vertices;
boost::tie(verticesStart, verticesEnd) = boost::vertices(P);
size_t currentId = 0;
for (vertex_iterator it = verticesStart; it != verticesEnd; ++it)
{
vertices.push_back(*it);
@ -194,8 +192,6 @@ void test_mesh_function()
for (size_t i = 0; i < numIterations; ++i)
{
bool found = false;
Face_location startLocation = next_location(startToEndShortestPaths, P, vertices);
Face_location endLocation = next_location(endToStartShortestPaths, P, vertices);