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

simplify the code

This commit is contained in:
Andreas Fabri 2025-03-20 10:25:05 +01:00
parent 94801e8826
commit 8a749c5b61
2 changed files with 11 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,7 @@ int main(int argc, char** argv)
} }
} }
std::vector<halfedge_descriptor> halfedge_sequence; std::list<halfedge_descriptor> halfedge_sequence;
CGAL::dijkstra_shortest_path(vs, vt, sm, CGAL::dijkstra_shortest_path(vs, vt, sm,
std::back_inserter(halfedge_sequence)); std::back_inserter(halfedge_sequence));
@ -68,12 +68,13 @@ int main(int argc, char** argv)
auto vpmap = get(CGAL::vertex_point, sm); auto vpmap = get(CGAL::vertex_point, sm);
std::ofstream out("shortest_path.polylines.txt"); std::ofstream out("shortest_path.polylines.txt");
out << halfedge_sequence.size() << " " << get(vpmap, source(halfedge_sequence.front(),sm));
for (const halfedge_descriptor he : halfedge_sequence) for (const halfedge_descriptor he : halfedge_sequence)
{ {
const vertex_descriptor v0 = source(he, sm); const vertex_descriptor v = target(he, sm);
const vertex_descriptor v1 = target(he, sm); out << " " << get(vpmap, v);
out << "2 " << get(vpmap, v0) << " " << get(vpmap, v1) << std::endl;
} }
out << std::endl;
out.close(); out.close();
return EXIT_SUCCESS; return EXIT_SUCCESS;

40
BGL/include/CGAL/boost/graph/dijkstra_shortest_path.h
View File

@ -146,42 +146,14 @@ OutputIterator dijkstra_shortest_path(
} }
catch (const internal::Dijkstra_end_exception& ){} catch (const internal::Dijkstra_end_exception& ){}
// Walk back from target to source and collect vertices along the way std::list<halfedge_descriptor> path;
struct vertex_on_path
{
vertex_descriptor vertex;
bool is_constrained;
};
std::vector<vertex_descriptor> constrained_vertices = { vs };
vertex_descriptor t = vt; vertex_descriptor t = vt;
std::vector<vertex_on_path> path; do {
do path.push_front(halfedge(relaxed_edges_map[t],g));
{
const bool is_new_vertex = (constrained_vertices.end()
== std::find(constrained_vertices.begin(), constrained_vertices.end(), t));
vertex_on_path vop;
vop.vertex = t;
vop.is_constrained = !is_new_vertex;
path.push_back(vop);
t = get(pred_pmap, t); t = get(pred_pmap, t);
} }while (t != vs);
while (t != vs); for(auto he : path){
*halfedge_sequence_oit++ = he;
// Add the last vertex
vertex_on_path vop;
vop.vertex = constrained_vertices.back();
vop.is_constrained = true;
path.push_back(vop);
// Display path
for (auto path_it = path.begin(); path_it != path.end() - 1; ++path_it)
{
const auto map_it = vis.relaxed_edges.find(path_it->vertex);
if (map_it != vis.relaxed_edges.end())
*halfedge_sequence_oit++ = halfedge(map_it->second, g);
} }
return halfedge_sequence_oit; return halfedge_sequence_oit;
} }