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

add np and return output iterator

This commit is contained in:
Jane Tournois 2025-01-31 15:54:05 +01:00
parent c935b7625f
commit c3cf48ca40
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,7 +57,8 @@ 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, halfedge_sequence); CGAL::shortest_path_between_two_vertices(vs, vt, sm,
std::back_inserter(halfedge_sequence));
// dump // dump
std::cout << "Shortest path between vertices " << i0 << " and " << i1 std::cout << "Shortest path between vertices " << i0 << " and " << i1

20
BGL/include/CGAL/boost/graph/shortest_path.h
View File

@ -14,6 +14,9 @@
#include <boost/graph/dijkstra_shortest_paths.hpp> #include <boost/graph/dijkstra_shortest_paths.hpp>
#include <CGAL/Named_function_parameters.h>
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/property_map/property_map.hpp> #include <boost/property_map/property_map.hpp>
#include <vector> #include <vector>
#include <unordered_map> #include <unordered_map>
@ -64,12 +67,15 @@ namespace internal {
* @param mesh the mesh * @param mesh the mesh
* @param halfedge_sequence the sequence of halfedges that form the shortest path on `mesh` * @param halfedge_sequence the sequence of halfedges that form the shortest path on `mesh`
*/ */
template<typename Mesh> template<typename Mesh,
void shortest_path_between_two_vertices( typename OutputIterator,
typename NamedParameters = parameters::Default_named_parameters>
OutputIterator shortest_path_between_two_vertices(
const typename boost::graph_traits<Mesh>::vertex_descriptor vs,//source const typename boost::graph_traits<Mesh>::vertex_descriptor vs,//source
const typename boost::graph_traits<Mesh>::vertex_descriptor vt,//target const typename boost::graph_traits<Mesh>::vertex_descriptor vt,//target
const Mesh& mesh, const Mesh& mesh,
std::vector<typename boost::graph_traits<Mesh>::halfedge_descriptor>& halfedge_sequence) OutputIterator halfedge_sequence_oit,
const NamedParameters& np = parameters::default_values())
{ {
using vertex_descriptor = typename boost::graph_traits<Mesh>::vertex_descriptor; using vertex_descriptor = typename boost::graph_traits<Mesh>::vertex_descriptor;
using halfedge_descriptor = typename boost::graph_traits<Mesh>::halfedge_descriptor; using halfedge_descriptor = typename boost::graph_traits<Mesh>::halfedge_descriptor;
@ -87,10 +93,7 @@ void shortest_path_between_two_vertices(
boost::dijkstra_shortest_paths(mesh, vs, boost::dijkstra_shortest_paths(mesh, vs,
boost::predecessor_map(pred_pmap).visitor(vis)); boost::predecessor_map(pred_pmap).visitor(vis));
} }
catch (const std::exception& e) catch (const std::exception& e){}
{
std::cout << e.what() << std::endl;
}
// Walk back from target to source and collect vertices along the way // Walk back from target to source and collect vertices along the way
struct vertex_on_path struct vertex_on_path
@ -128,8 +131,9 @@ void shortest_path_between_two_vertices(
const std::pair<halfedge_descriptor, bool> const std::pair<halfedge_descriptor, bool>
h = halfedge((path_it + 1)->vertex, path_it->vertex, mesh); h = halfedge((path_it + 1)->vertex, path_it->vertex, mesh);
if (h.second) if (h.second)
halfedge_sequence.push_back(h.first); *halfedge_sequence_oit++ = h.first;
} }
return halfedge_sequence_oit;
} }
} // namespace CGAL } // namespace CGAL