mirror of
https://github.com/krahets/hello-algo.git
synced 2025-11-02 04:31:55 +08:00
refactor: Replace poll with pop in Queue and Deque (#415)
This commit is contained in:
@ -72,7 +72,7 @@ public:
|
||||
}
|
||||
|
||||
/* 队首出队 */
|
||||
int pollFirst() {
|
||||
int popFirst() {
|
||||
int num = peekFirst();
|
||||
// 队首指针向后移动一位
|
||||
front = index(front + 1);
|
||||
@ -81,7 +81,7 @@ public:
|
||||
}
|
||||
|
||||
/* 队尾出队 */
|
||||
int pollLast() {
|
||||
int popLast() {
|
||||
int num = peekLast();
|
||||
queSize--;
|
||||
return num;
|
||||
@ -139,11 +139,11 @@ int main() {
|
||||
PrintUtil::printVector(deque->toVector());
|
||||
|
||||
/* 元素出队 */
|
||||
int pollLast = deque->pollLast();
|
||||
cout << "队尾出队元素 = " << pollLast << ",队尾出队后 deque = ";
|
||||
int popLast = deque->popLast();
|
||||
cout << "队尾出队元素 = " << popLast << ",队尾出队后 deque = ";
|
||||
PrintUtil::printVector(deque->toVector());
|
||||
int pollFirst = deque->pollFirst();
|
||||
cout << "队首出队元素 = " << pollFirst << ",队首出队后 deque = ";
|
||||
int popFirst = deque->popFirst();
|
||||
cout << "队首出队元素 = " << popFirst << ",队首出队后 deque = ";
|
||||
PrintUtil::printVector(deque->toVector());
|
||||
|
||||
/* 获取双向队列的长度 */
|
||||
|
||||
@ -56,7 +56,7 @@ public:
|
||||
}
|
||||
|
||||
/* 出队 */
|
||||
void poll() {
|
||||
void pop() {
|
||||
int num = peek();
|
||||
// 队首指针向后移动一位,若越过尾部则返回到数组头部
|
||||
front = (front + 1) % queCapacity;
|
||||
@ -102,8 +102,8 @@ int main() {
|
||||
cout << "队首元素 peek = " << peek << endl;
|
||||
|
||||
/* 元素出队 */
|
||||
queue->poll();
|
||||
cout << "出队元素 poll = " << peek << ",出队后 queue = ";
|
||||
queue->pop();
|
||||
cout << "出队元素 pop = " << peek << ",出队后 queue = ";
|
||||
PrintUtil::printVector(queue->toVector());
|
||||
|
||||
/* 获取队列的长度 */
|
||||
@ -117,7 +117,7 @@ int main() {
|
||||
/* 测试环形数组 */
|
||||
for (int i = 0; i < 10; i++) {
|
||||
queue->push(i);
|
||||
queue->poll();
|
||||
queue->pop();
|
||||
cout << "第 " << i << " 轮入队 + 出队后 queue = ";
|
||||
PrintUtil::printVector(queue->toVector());
|
||||
}
|
||||
|
||||
@ -79,7 +79,7 @@ public:
|
||||
}
|
||||
|
||||
/* 出队操作 */
|
||||
int poll(bool isFront) {
|
||||
int pop(bool isFront) {
|
||||
// 若队列为空,直接返回 -1
|
||||
if (isEmpty())
|
||||
return -1;
|
||||
@ -110,13 +110,13 @@ public:
|
||||
}
|
||||
|
||||
/* 队首出队 */
|
||||
int pollFirst() {
|
||||
return poll(true);
|
||||
int popFirst() {
|
||||
return pop(true);
|
||||
}
|
||||
|
||||
/* 队尾出队 */
|
||||
int pollLast() {
|
||||
return poll(false);
|
||||
int popLast() {
|
||||
return pop(false);
|
||||
}
|
||||
|
||||
/* 访问队首元素 */
|
||||
@ -166,11 +166,11 @@ int main() {
|
||||
PrintUtil::printVector(deque->toVector());
|
||||
|
||||
/* 元素出队 */
|
||||
int pollLast = deque->pollLast();
|
||||
cout << "队尾出队元素 = " << pollLast << ",队尾出队后 deque = ";
|
||||
int popLast = deque->popLast();
|
||||
cout << "队尾出队元素 = " << popLast << ",队尾出队后 deque = ";
|
||||
PrintUtil::printVector(deque->toVector());
|
||||
int pollFirst = deque->pollFirst();
|
||||
cout << "队首出队元素 = " << pollFirst << ",队首出队后 deque = ";
|
||||
int popFirst = deque->popFirst();
|
||||
cout << "队首出队元素 = " << popFirst << ",队首出队后 deque = ";
|
||||
PrintUtil::printVector(deque->toVector());
|
||||
|
||||
/* 获取双向队列的长度 */
|
||||
|
||||
@ -52,7 +52,7 @@ public:
|
||||
}
|
||||
|
||||
/* 出队 */
|
||||
void poll() {
|
||||
void pop() {
|
||||
int num = peek();
|
||||
// 删除头结点
|
||||
ListNode *tmp = front;
|
||||
@ -101,8 +101,8 @@ int main() {
|
||||
cout << "队首元素 peek = " << peek << endl;
|
||||
|
||||
/* 元素出队 */
|
||||
queue->poll();
|
||||
cout << "出队元素 poll = " << peek << ",出队后 queue = ";
|
||||
queue->pop();
|
||||
cout << "出队元素 pop = " << peek << ",出队后 queue = ";
|
||||
PrintUtil::printVector(queue->toVector());
|
||||
|
||||
/* 获取队列的长度 */
|
||||
|
||||
Reference in New Issue
Block a user