diff options
author | tamasmeszaros <meszaros.q@gmail.com> | 2022-06-07 17:05:37 +0300 |
---|---|---|
committer | tamasmeszaros <meszaros.q@gmail.com> | 2022-06-07 17:08:09 +0300 |
commit | 86ebe946d9eb9e35326ab77cd20334b965b23822 (patch) | |
tree | e27f6b756eca253e05027b246922ddc2f7fd8b35 | |
parent | 4f8535d0d5b2c5a0e2577c5e88578bd2ce18c8d7 (diff) |
Make AStar use InvalidQueueID constant
-rw-r--r-- | src/libslic3r/AStar.hpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/libslic3r/AStar.hpp b/src/libslic3r/AStar.hpp index 61c82157b..b35b6a4af 100644 --- a/src/libslic3r/AStar.hpp +++ b/src/libslic3r/AStar.hpp @@ -53,7 +53,7 @@ template<class T> struct TracerTraits_ template<class T> 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> 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, float gval = std::numeric_limits<float>::infinity(), 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 prev_nd = qsucc_nd; - if (queue_id == decltype(qopen)::invalid_id()) + if (queue_id == InvalidQueueID) // was in closed or unqueued, rescheduling qopen.push(succ_id); else // was in open, updating |