mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codefix: Replace magic number in Kdtree (#13098)

pull/13094/head
SamuXarick 2024-11-19 20:34:25 +00:00 committed by GitHub
parent 6c09dcdd66
commit 85e9f5745a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/kdtree.hpp
View File

@ -42,7 +42,8 @@ class Kdtree {
node(T element) : element(element), left(INVALID_NODE), right(INVALID_NODE) { } node(T element) : element(element), left(INVALID_NODE), right(INVALID_NODE) { }
}; };
static const size_t INVALID_NODE = SIZE_MAX; ///< Index value indicating no-such-node static const size_t INVALID_NODE = SIZE_MAX; ///< Index value indicating no-such-node
static const size_t MIN_REBALANCE_THRESHOLD = 8; ///< Arbitrary value for "not worth rebalancing"
std::vector<node> nodes; ///< Pool of all nodes in the tree std::vector<node> nodes; ///< Pool of all nodes in the tree
std::vector<size_t> free_list; ///< List of dead indices in the nodes vector std::vector<size_t> free_list; ///< List of dead indices in the nodes vector
@ -98,7 +99,7 @@ class Kdtree {
bool Rebuild(const T *include_element, const T *exclude_element) bool Rebuild(const T *include_element, const T *exclude_element)
{ {
size_t initial_count = this->Count(); size_t initial_count = this->Count();
if (initial_count < 8) return false; // arbitrary value for "not worth rebalancing" if (initial_count < MIN_REBALANCE_THRESHOLD) return false;
T root_element = this->nodes[this->root].element; T root_element = this->nodes[this->root].element;
std::vector<T> elements = this->FreeSubtree(this->root); std::vector<T> elements = this->FreeSubtree(this->root);
@ -310,8 +311,8 @@ class Kdtree {
bool IsUnbalanced() const bool IsUnbalanced() const
{ {
size_t count = this->Count(); size_t count = this->Count();
if (count < 8) return false; if (count < MIN_REBALANCE_THRESHOLD) return false;
return this->unbalanced > this->Count() / 4; return this->unbalanced > count / 4;
} }
/** Verify that the invariant is true for a sub-tree, assert if not */ /** Verify that the invariant is true for a sub-tree, assert if not */