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

Uniformize namespaces

This commit is contained in:
Mael Rouxel-Labbé 2019-10-03 15:30:16 +02:00
parent 7b887e79ea
commit e63d20cf22
5 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/Surface_mesh_shortest_path.h
View File

@ -292,10 +292,12 @@ private:
typedef typename Traits::Point_2 Point_2;
typedef typename Traits::Vector_2 Vector_2;
typedef SMSP::internal::Cone_tree_node<Traits> Cone_tree_node;
typedef SMSP::internal::Cone_expansion_event<Traits> Cone_expansion_event;
typedef Surface_mesh_shortest_paths_3::internal::Cone_tree_node<Traits> Cone_tree_node;
typedef Surface_mesh_shortest_paths_3::internal::Cone_expansion_event<Traits> Cone_expansion_event;
typedef std::priority_queue<Cone_expansion_event*, std::vector<Cone_expansion_event*>, SMSP::internal::Cone_expansion_event_min_priority_queue_comparator<Traits> > Expansion_priqueue;
typedef std::priority_queue<Cone_expansion_event*,
std::vector<Cone_expansion_event*>,
Surface_mesh_shortest_paths_3::internal::Cone_expansion_event_min_priority_queue_comparator<Traits> > Expansion_priqueue;
typedef std::pair<Cone_tree_node*, FT> Node_distance_pair;
private:
@ -494,7 +496,7 @@ private:
static Triangle_3 triangle_from_halfedge(halfedge_descriptor edge, const Triangle_mesh& tm, Vertex_point_map vertexPointMap)
{
return SMSP::internal::triangle_from_halfedge<Triangle_3, Triangle_mesh, Vertex_point_map>(edge, tm, vertexPointMap);
return Surface_mesh_shortest_paths_3::internal::triangle_from_halfedge<Triangle_3, Triangle_mesh, Vertex_point_map>(edge, tm, vertexPointMap);
}
Triangle_3 triangle_from_face(face_descriptor f) const
@ -1742,7 +1744,7 @@ private:
halfedge_descriptor oppositeHalfedge = opposite(he, m_graph);
if(!CGAL::is_border(oppositeHalfedge, m_graph))
{
std::size_t oppositeIndex = SMSP::internal::edge_index(oppositeHalfedge, m_graph);
std::size_t oppositeIndex = Surface_mesh_shortest_paths_3::internal::edge_index(oppositeHalfedge, m_graph);
FT oppositeLocationCoords[3] = { FT(0), FT(0), FT(0) };
oppositeLocationCoords[oppositeIndex] = cbcw(location, (associatedEdge + 1) % 3);
@ -2546,7 +2548,7 @@ public:
halfedge_descriptor he = next(hinit, tm);
face_descriptor locationFace = face(he, tm);
std::size_t edgeIndex = SMSP::internal::edge_index(he, tm);
std::size_t edgeIndex = Surface_mesh_shortest_paths_3::internal::edge_index(he, tm);
FT coords[3] = { FT(0), FT(0), FT(0) };
@ -2577,7 +2579,7 @@ public:
{
typename Traits::Construct_barycentric_coordinates cbc(traits.construct_barycentric_coordinates_object());
face_descriptor locationFace = face(he, tm);
std::size_t edgeIndex = SMSP::internal::edge_index(he, tm);
std::size_t edgeIndex = Surface_mesh_shortest_paths_3::internal::edge_index(he, tm);
const FT oneMinusT(FT(1) - t);

4
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_expansion_event.h
View File

@ -24,7 +24,7 @@
#include <CGAL/license/Surface_mesh_shortest_path.h>
namespace CGAL {
namespace SMSP {
namespace Surface_mesh_shortest_paths_3 {
namespace internal {
template<class Traits>
@ -83,7 +83,7 @@ public:
};
} // namespace internal
} // namespace SMSP
} // namespace Surface_mesh_shortest_paths_3
} // namespace CGAL
#endif // CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_CONE_EXPANSION_EVENT_H

4
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/Cone_tree.h
View File

@ -34,7 +34,7 @@
#include <CGAL/number_utils.h>
namespace CGAL {
namespace SMSP {
namespace Surface_mesh_shortest_paths_3 {
namespace internal {
template<class Traits>
@ -434,7 +434,7 @@ public:
};
} // namespace internal
} // namespace SMSP
} // namespace Surface_mesh_shortest_paths_3
} // namespace CGAL
#endif // CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_CONE_TREE_H

4
Surface_mesh_shortest_path/include/CGAL/Surface_mesh_shortest_path/internal/misc_functions.h
View File

@ -29,7 +29,7 @@
#include <CGAL/boost/graph/iterator.h>
namespace CGAL {
namespace SMSP {
namespace Surface_mesh_shortest_paths_3 {
namespace internal {
template <class Triangle_3, class Triangle_mesh, class VertexPointMap>
@ -74,7 +74,7 @@ size_t edge_index(typename boost::graph_traits<Triangle_mesh>::halfedge_descript
}
} // namespace internal
} // namespace SMSP
} // namespace Surface_mesh_shortest_paths_3
} // namespace CGAL
#endif // CGAL_SURFACE_MESH_SHORTEST_PATH_INTERNAL_MISC_H

2
Surface_mesh_shortest_path/test/Surface_mesh_shortest_path/Surface_mesh_shortest_path_test_4.cpp
View File

@ -94,7 +94,7 @@ int main(int argc, char* argv[])
size_t faceIndex = random.get_int(0, static_cast<int>(facesList.size()));
face_descriptor face = facesList[faceIndex];
Triangle_3 faceTriangle = CGAL::SMSP::internal::triangle_from_halfedge<Triangle_3, Polyhedron_3, VPM>(halfedge(face, polyhedron), polyhedron, vertexPointMap);
Triangle_3 faceTriangle = CGAL::Surface_mesh_shortest_paths_3::internal::triangle_from_halfedge<Triangle_3, Polyhedron_3, VPM>(halfedge(face, polyhedron), polyhedron, vertexPointMap);
Barycentric_coordinates location = CGAL::test::random_coordinates<Traits>(random);