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

add edge_weight property map

This commit is contained in:
Jane Tournois 2025-02-03 11:59:04 +01:00
parent c3cf48ca40
commit 0a8d61bbd1
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,8 @@
#include <CGAL/boost/graph/named_params_helper.h>
#include <boost/property_map/property_map.hpp>
#include <CGAL/boost/graph/properties.h>
#include <vector>
#include <unordered_map>
@ -66,6 +68,10 @@ namespace internal {
* @param vt target vertex
* @param mesh the mesh
* @param halfedge_sequence the sequence of halfedges that form the shortest path on `mesh`
* @param np an optional sequence of \ref bgl_namedparameters "Named Parameters" among the ones listed below
* ** edge_weight_map : @todo deal with input mesh with no internal pmap.
* default in boost is `get(boost::edge_weight, mesh)`
*
*/
template<typename Mesh,
typename OutputIterator,
@ -83,6 +89,12 @@ OutputIterator shortest_path_between_two_vertices(
using Pred_umap = std::unordered_map<vertex_descriptor, vertex_descriptor>;
using Pred_pmap = boost::associative_property_map<Pred_umap>;
using parameters::get_parameter;
using parameters::choose_parameter;
const auto w_map = choose_parameter(get_parameter(np, internal_np::edge_weight),
get(boost::edge_weight, mesh));
Pred_umap predecessor;
Pred_pmap pred_pmap(predecessor);
@ -91,7 +103,9 @@ OutputIterator shortest_path_between_two_vertices(
try
{
boost::dijkstra_shortest_paths(mesh, vs,
boost::predecessor_map(pred_pmap).visitor(vis));
boost::predecessor_map(pred_pmap)
.visitor(vis)
.weight_map(w_map));
}
catch (const std::exception& e){}

1
STL_Extension/include/CGAL/STL_Extension/internal/parameters_interface.h
View File

@ -28,6 +28,7 @@ CGAL_add_named_parameter(use_binary_mode_t, use_binary_mode, use_binary_mode)
CGAL_add_named_parameter(metis_options_t, METIS_options, METIS_options)
CGAL_add_named_parameter(vertex_partition_id_t, vertex_partition_id, vertex_partition_id_map)
CGAL_add_named_parameter(face_partition_id_t, face_partition_id, face_partition_id_map)
CGAL_add_named_parameter(edge_weight_t, edge_weight, edge_weight_map)
CGAL_add_named_parameter(vertex_output_iterator_t, vertex_output_iterator, vertex_output_iterator)
CGAL_add_named_parameter(face_output_iterator_t, face_output_iterator, face_output_iterator)