GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-18 04:15:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make AStar use InvalidQueueID constant

Browse Source
This commit is contained in:
tamasmeszaros 2022-06-07 16:05:37 +02:00
parent 4f8535d0d5
commit 86ebe946d9
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/libslic3r/AStar.hpp
View File

@ -53,7 +53,7 @@ template<class T> struct TracerTraits_
template<class T> template<class T>
using TracerNodeT = typename TracerTraits_<remove_cvref_t<T>>::Node; using TracerNodeT = typename TracerTraits_<remove_cvref_t<T>>::Node;
constexpr size_t Unassigned = size_t(-1); constexpr auto Unassigned = std::numeric_limits<size_t>::max();
template<class Tracer> template<class Tracer>
struct QNode // Queue node. Keeps track of scores g, and h struct QNode // Queue node. Keeps track of scores g, and h
@ -69,7 +69,11 @@ struct QNode // Queue node. Keeps track of scores g, and h
size_t p = Unassigned, size_t p = Unassigned,
float gval = std::numeric_limits<float>::infinity(), float gval = std::numeric_limits<float>::infinity(),
float hval = 0.f) float hval = 0.f)
: node{std::move(n)}, parent{p}, queue_id{Unassigned}, g{gval}, h{hval} : node{std::move(n)}
, parent{p}
, queue_id{InvalidQueueID}
, g{gval}
, h{hval}
{} {}
}; };
@ -154,7 +158,7 @@ bool search_route(const Tracer &tracer,
// The cache needs to be updated either way // The cache needs to be updated either way
prev_nd = qsucc_nd; prev_nd = qsucc_nd;
if (queue_id == decltype(qopen)::invalid_id()) if (queue_id == InvalidQueueID)
// was in closed or unqueued, rescheduling // was in closed or unqueued, rescheduling
qopen.push(succ_id); qopen.push(succ_id);
else // was in open, updating else // was in open, updating