Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-02 09:40:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r20686) -Codechange: Make init_BinaryHeap() a method.

Browse Source
This commit is contained in:
alberth 2010-08-29 13:42:38 +00:00
parent 2c962548e5
commit bc6a5a5e64
3 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pathfinder/npf/aystar.cpp
View File

@ -296,7 +296,7 @@ void init_AyStar(AyStar *aystar, Hash_HashProc hash, uint num_buckets)
* BinaryHeap allocates a block of 1024 nodes
* When that one gets full it reserves another one, till this number
* That is why it can stay this high */
init_BinaryHeap(&aystar->OpenListQueue, 102400);
aystar->OpenListQueue.Init(102400);
aystar->addstart = AyStarMain_AddStartNode;
aystar->main = AyStarMain_Main;

17
src/pathfinder/npf/queue.cpp
View File

@ -225,16 +225,19 @@ void *Queue::Pop()
return result;
}
void init_BinaryHeap(Queue *q, uint max_size)
/**
* Initializes a binary heap and allocates internal memory for maximum of
* max_size elements
*/
void Queue::Init(uint max_size)
{
assert(q != NULL);
q->max_size = max_size;
q->size = 0;
this->max_size = max_size;
this->size = 0;
/* We malloc memory in block of BINARY_HEAP_BLOCKSIZE
* It autosizes when it runs out of memory */
q->elements = CallocT<BinaryHeapNode*>((max_size - 1) / BINARY_HEAP_BLOCKSIZE + 1);
q->elements[0] = MallocT<BinaryHeapNode>(BINARY_HEAP_BLOCKSIZE);
q->blocks = 1;
this->elements = CallocT<BinaryHeapNode*>((max_size - 1) / BINARY_HEAP_BLOCKSIZE + 1);
this->elements[0] = MallocT<BinaryHeapNode>(BINARY_HEAP_BLOCKSIZE);
this->blocks = 1;
#ifdef QUEUE_DEBUG
printf("[BinaryHeap] Initial size of elements is %d nodes\n", BINARY_HEAP_BLOCKSIZE);
#endif

20
src/pathfinder/npf/queue.h
View File

@ -24,7 +24,14 @@ struct BinaryHeapNode {
};
/*
* Binary Heap
* For information, see:
* http://www.policyalmanac.org/games/binaryHeaps.htm
*/
struct Queue {
void Init(uint max_size);
bool Push(void *item, int priority);
void *Pop();
bool Delete(void *item, int priority);
@ -37,22 +44,9 @@ struct Queue {
BinaryHeapNode **elements;
};
/*
* Binary Heap
* For information, see:
* http://www.policyalmanac.org/games/binaryHeaps.htm
*/
/* The amount of elements that will be malloc'd at a time */
#define BINARY_HEAP_BLOCKSIZE_BITS 10
/**
* Initializes a binary heap and allocates internal memory for maximum of
* max_size elements
*/
void init_BinaryHeap(Queue *q, uint max_size);
/*
* Hash