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

rename to dijkstra_shortest_path()

This commit is contained in:
Jane Tournois 2025-03-18 17:11:00 +01:00
parent 0e5ec52e31
commit bcac630220
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BGL/doc/BGL/Doxyfile.in
View File

@ -20,7 +20,7 @@ INPUT += ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/IO/polygon_mesh_io.h \
${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/METIS/partition_dual_graph.h \ ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/METIS/partition_dual_graph.h \
${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/alpha_expansion_graphcut.h \ ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/alpha_expansion_graphcut.h \
${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/graph_traits_inheritance_macros.h \ ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/graph_traits_inheritance_macros.h \
${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/shortest_path.h ${CGAL_PACKAGE_INCLUDE_DIR}/CGAL/boost/graph/dijkstra_shortest_path.h
EXAMPLE_PATH += ${CGAL_Surface_mesh_skeletonization_EXAMPLE_DIR} \ EXAMPLE_PATH += ${CGAL_Surface_mesh_skeletonization_EXAMPLE_DIR} \

4
BGL/examples/BGL_surface_mesh/shortest_path.cpp
View File

@ -2,7 +2,7 @@
#include <CGAL/Surface_mesh.h> #include <CGAL/Surface_mesh.h>
#include <CGAL/boost/graph/graph_traits_Surface_mesh.h> #include <CGAL/boost/graph/graph_traits_Surface_mesh.h>
#include <CGAL/boost/graph/shortest_path.h> #include <CGAL/boost/graph/dijkstra_shortest_path.h>
#include <CGAL/IO/polygon_mesh_io.h> #include <CGAL/IO/polygon_mesh_io.h>
@ -57,7 +57,7 @@ int main(int argc, char** argv)
} }
std::vector<halfedge_descriptor> halfedge_sequence; std::vector<halfedge_descriptor> halfedge_sequence;
CGAL::shortest_path_between_two_vertices(vs, vt, sm, CGAL::dijkstra_shortest_path(vs, vt, sm,
std::back_inserter(halfedge_sequence)); std::back_inserter(halfedge_sequence));
// dump // dump

2
BGL/include/CGAL/boost/graph/shortest_path.h → BGL/include/CGAL/boost/graph/dijkstra_shortest_path.h
View File

@ -107,7 +107,7 @@ namespace internal {
template<typename Graph, template<typename Graph,
typename OutputIterator, typename OutputIterator,
typename NamedParameters = parameters::Default_named_parameters> typename NamedParameters = parameters::Default_named_parameters>
OutputIterator shortest_path_between_two_vertices( OutputIterator dijkstra_shortest_path(
const typename boost::graph_traits<Graph>::vertex_descriptor vs,//source const typename boost::graph_traits<Graph>::vertex_descriptor vs,//source
const typename boost::graph_traits<Graph>::vertex_descriptor vt,//target const typename boost::graph_traits<Graph>::vertex_descriptor vt,//target
const Graph& g, const Graph& g,

5
Lab/demo/Lab/Scene_polyhedron_selection_item.cpp
View File

@ -5,7 +5,6 @@
#include <CGAL/Polygon_mesh_processing/compute_normal.h> #include <CGAL/Polygon_mesh_processing/compute_normal.h>
#include <CGAL/Polygon_mesh_processing/repair.h> #include <CGAL/Polygon_mesh_processing/repair.h>
#include <CGAL/Polygon_mesh_processing/shape_predicates.h> #include <CGAL/Polygon_mesh_processing/shape_predicates.h>
#include <boost/graph/dijkstra_shortest_paths.hpp>
#include <CGAL/boost/graph/helpers.h> #include <CGAL/boost/graph/helpers.h>
#include <CGAL/property_map.h> #include <CGAL/property_map.h>
#include <CGAL/Handle_hash_function.h> #include <CGAL/Handle_hash_function.h>
@ -31,7 +30,7 @@
#include "triangulate_primitive.h" #include "triangulate_primitive.h"
#include <CGAL/boost/graph/Face_filtered_graph.h> #include <CGAL/boost/graph/Face_filtered_graph.h>
#include <CGAL/Polygon_mesh_processing/measure.h> #include <CGAL/Polygon_mesh_processing/measure.h>
#include <CGAL/boost/graph/shortest_path.h> #include <CGAL/boost/graph/dijkstra_shortest_path.h>
#include <CGAL/boost/graph/properties.h> #include <CGAL/boost/graph/properties.h>
using namespace CGAL::Three; using namespace CGAL::Three;
@ -1496,7 +1495,7 @@ void Scene_polyhedron_selection_item_priv::computeAndDisplayPath()
{ {
fg_vertex_descriptor t(*it), s(*(it+1)); fg_vertex_descriptor t(*it), s(*(it+1));
CGAL::shortest_path_between_two_vertices(s, t, mesh, CGAL::dijkstra_shortest_path(s, t, mesh,
std::back_inserter(path_halfedges)); std::back_inserter(path_halfedges));
} }