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

Codefix: Missing this-> in Kdtree (#13095)

pull/13165/head
SamuXarick 2024-12-10 17:30:55 +00:00 committed by GitHub
parent aa461fca68
commit 1e259b7f47
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/kdtree.hpp
View File

@ -84,7 +84,7 @@ class Kdtree {
} else if (count == 1) { } else if (count == 1) {
return this->AddNode(*begin); return this->AddNode(*begin);
} else if (count > 1) { } else if (count > 1) {
CoordT split_coord = SelectSplitCoord(begin, end, level); CoordT split_coord = this->SelectSplitCoord(begin, end, level);
It split = std::partition(begin, end, [&](T v) { return TxyFunc()(v, level % 2) < split_coord; }); It split = std::partition(begin, end, [&](T v) { return TxyFunc()(v, level % 2) < split_coord; });
size_t newidx = this->AddNode(*split); size_t newidx = this->AddNode(*split);
this->nodes[newidx].left = this->BuildSubtree(begin, split, level + 1); this->nodes[newidx].left = this->BuildSubtree(begin, split, level + 1);
@ -247,7 +247,7 @@ class Kdtree {
/* Coordinate of element splitting at this node */ /* Coordinate of element splitting at this node */
CoordT c = TxyFunc()(n.element, dim); CoordT c = TxyFunc()(n.element, dim);
/* This node's distance to target */ /* This node's distance to target */
DistT thisdist = ManhattanDistance(n.element, xy[0], xy[1]); DistT thisdist = this->ManhattanDistance(n.element, xy[0], xy[1]);
/* Assume this node is the best choice for now */ /* Assume this node is the best choice for now */
node_distance best = std::make_pair(n.element, thisdist); node_distance best = std::make_pair(n.element, thisdist);
@ -299,7 +299,7 @@ class Kdtree {
{ {
if (node_idx == INVALID_NODE) return 0; if (node_idx == INVALID_NODE) return 0;
const node &n = this->nodes[node_idx]; const node &n = this->nodes[node_idx];
return CountValue(element, n.left) + CountValue(element, n.right) + ((n.element == element) ? 1 : 0); return this->CountValue(element, n.left) + this->CountValue(element, n.right) + ((n.element == element) ? 1 : 0);
} }
void IncrementUnbalanced(size_t amount = 1) void IncrementUnbalanced(size_t amount = 1)
@ -331,12 +331,12 @@ class Kdtree {
if (level % 2 == 0) { if (level % 2 == 0) {
// split in dimension 0 = x // split in dimension 0 = x
CheckInvariant(n.left, level + 1, min_x, cx, min_y, max_y); this->CheckInvariant(n.left, level + 1, min_x, cx, min_y, max_y);
CheckInvariant(n.right, level + 1, cx, max_x, min_y, max_y); this->CheckInvariant(n.right, level + 1, cx, max_x, min_y, max_y);
} else { } else {
// split in dimension 1 = y // split in dimension 1 = y
CheckInvariant(n.left, level + 1, min_x, max_x, min_y, cy); this->CheckInvariant(n.left, level + 1, min_x, max_x, min_y, cy);
CheckInvariant(n.right, level + 1, min_x, max_x, cy, max_y); this->CheckInvariant(n.right, level + 1, min_x, max_x, cy, max_y);
} }
} }
@ -344,7 +344,7 @@ class Kdtree {
void CheckInvariant() const void CheckInvariant() const
{ {
#ifdef KDTREE_DEBUG #ifdef KDTREE_DEBUG
CheckInvariant(this->root, 0, std::numeric_limits<CoordT>::min(), std::numeric_limits<CoordT>::max(), std::numeric_limits<CoordT>::min(), std::numeric_limits<CoordT>::max()); this->CheckInvariant(this->root, 0, std::numeric_limits<CoordT>::min(), std::numeric_limits<CoordT>::max(), std::numeric_limits<CoordT>::min(), std::numeric_limits<CoordT>::max());
#endif #endif
} }
@ -368,7 +368,7 @@ public:
this->nodes.reserve(end - begin); this->nodes.reserve(end - begin);
this->root = this->BuildSubtree(begin, end, 0); this->root = this->BuildSubtree(begin, end, 0);
CheckInvariant(); this->CheckInvariant();
} }
/** /**
@ -404,7 +404,7 @@ public:
this->InsertRecursive(element, this->root, 0); this->InsertRecursive(element, this->root, 0);
this->IncrementUnbalanced(); this->IncrementUnbalanced();
} }
CheckInvariant(); this->CheckInvariant();
} }
} }
@ -423,7 +423,7 @@ public:
this->root = this->RemoveRecursive(element, this->root, 0); this->root = this->RemoveRecursive(element, this->root, 0);
this->IncrementUnbalanced(); this->IncrementUnbalanced();
} }
CheckInvariant(); this->CheckInvariant();
} }
/** Get number of elements stored in tree */ /** Get number of elements stored in tree */