diff options
| author | yexo <yexo@openttd.org> | 2010-02-25 11:52:04 +0000 |
|---|---|---|
| committer | yexo <yexo@openttd.org> | 2010-02-25 11:52:04 +0000 |
| commit | 1a89a5fc92f9e1d10b5e298c67d14e8614068742 (patch) | |
| tree | 9f57de326bdfe958467509c919672927dbea8c27 | |
| parent | 433e1d884cebf8ccf8c0db10cb0edf0e1f3426f0 (diff) | |
| download | openttd-1a89a5fc92f9e1d10b5e298c67d14e8614068742.tar.xz | |
(svn r19247) -Codechange: Rename methods to fit better to common style (skidd13)
| -rw-r--r-- | src/misc/binaryheap.hpp | 8 | ||||
| -rw-r--r-- | src/pathfinder/yapf/nodelist.hpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/misc/binaryheap.hpp b/src/misc/binaryheap.hpp index d9f8c424d..7168cd03c 100644 --- a/src/misc/binaryheap.hpp +++ b/src/misc/binaryheap.hpp @@ -148,7 +148,7 @@ public: * * @return The number of items in the queue */ - FORCEINLINE uint Size() const { return this->items; } + FORCEINLINE uint Length() const { return this->items; } /** * Test if the priority queue is empty. @@ -192,7 +192,7 @@ public: * * @param new_item The pointer to the new item */ - FORCEINLINE void Push(T *new_item) + FORCEINLINE void Include(T *new_item) { if (this->IsFull()) { this->capacity *= 2; @@ -233,7 +233,7 @@ public: * * @param index The position of the item in the heap */ - FORCEINLINE void RemoveByIdx(uint index) + FORCEINLINE void Remove(uint index) { if (index < this->items) { assert(index != 0); @@ -261,7 +261,7 @@ public: * @param item The reference to the item * @return The index of the item or zero if not found */ - FORCEINLINE uint FindLinear(const T &item) const + FORCEINLINE uint FindIndex(const T &item) const { if (this->IsEmpty()) return 0; for (T **ppI = this->data + 1, **ppLast = ppI + this->items; ppI <= ppLast; ppI++) { diff --git a/src/pathfinder/yapf/nodelist.hpp b/src/pathfinder/yapf/nodelist.hpp index 6ac3b944c..87b262897 100644 --- a/src/pathfinder/yapf/nodelist.hpp +++ b/src/pathfinder/yapf/nodelist.hpp @@ -93,7 +93,7 @@ public: { assert(m_closed.Find(item.GetKey()) == NULL); m_open.Push(item); - m_open_queue.Push(&item); + m_open_queue.Include(&item); if (&item == m_new_node) { m_new_node = NULL; } @@ -130,8 +130,8 @@ public: FORCEINLINE Titem_& PopOpenNode(const Key& key) { Titem_& item = m_open.Pop(key); - int idxPop = m_open_queue.FindLinear(item); - m_open_queue.RemoveByIdx(idxPop); + uint idxPop = m_open_queue.FindIndex(item); + m_open_queue.Remove(idxPop); return item; } |