refactor: Replace poll with pop in Queue and Deque (#415)

This commit is contained in:
Yudong Jin
2023-03-13 21:58:21 +08:00
committed by GitHub
parent 2d17ee8e92
commit 8aebbaad21
77 changed files with 261 additions and 261 deletions

View File

@ -71,7 +71,7 @@ class ArrayDeque {
}
/* 队首出队 */
public int pollFirst() {
public int popFirst() {
int num = peekFirst();
// 队首指针向后移动一位
front = index(front + 1);
@ -80,7 +80,7 @@ class ArrayDeque {
}
/* 队尾出队 */
public int pollLast() {
public int popLast() {
int num = peekLast();
queSize--;
return num;
@ -135,10 +135,10 @@ public class array_deque {
System.out.println("元素 1 队首入队后 deque = " + Arrays.toString(deque.toArray()));
/* 元素出队 */
int pollLast = deque.pollLast();
System.out.println("队尾出队元素 = " + pollLast + ",队尾出队后 deque = " + Arrays.toString(deque.toArray()));
int pollFirst = deque.pollFirst();
System.out.println("队首出队元素 = " + pollFirst + ",队首出队后 deque = " + Arrays.toString(deque.toArray()));
int popLast = deque.popLast();
System.out.println("队尾出队元素 = " + popLast + ",队尾出队后 deque = " + Arrays.toString(deque.toArray()));
int popFirst = deque.popFirst();
System.out.println("队首出队元素 = " + popFirst + ",队首出队后 deque = " + Arrays.toString(deque.toArray()));
/* 获取双向队列的长度 */
int size = deque.size();

View File

@ -49,7 +49,7 @@ class ArrayQueue {
}
/* 出队 */
public int poll() {
public int pop() {
int num = peek();
// 队首指针向后移动一位,若越过尾部则返回到数组头部
front = (front + 1) % capacity();
@ -94,8 +94,8 @@ public class array_queue {
System.out.println("队首元素 peek = " + peek);
/* 元素出队 */
int poll = queue.poll();
System.out.println("出队元素 poll = " + poll + ",出队后 queue = " + Arrays.toString(queue.toArray()));
int pop = queue.pop();
System.out.println("出队元素 pop = " + pop + ",出队后 queue = " + Arrays.toString(queue.toArray()));
/* 获取队列的长度 */
int size = queue.size();
@ -108,7 +108,7 @@ public class array_queue {
/* 测试环形数组 */
for (int i = 0; i < 10; i++) {
queue.push(i);
queue.poll();
queue.pop();
System.out.println("" + i + " 轮入队 + 出队后 queue = " + Arrays.toString(queue.toArray()));
}
}

View File

@ -30,10 +30,10 @@ public class deque {
System.out.println("元素 1 队首入队后 deque = " + deque);
/* 元素出队 */
int pollLast = deque.pollLast();
System.out.println("队尾出队元素 = " + pollLast + ",队尾出队后 deque = " + deque);
int pollFirst = deque.pollFirst();
System.out.println("队首出队元素 = " + pollFirst + ",队首出队后 deque = " + deque);
int popLast = deque.pollLast();
System.out.println("队尾出队元素 = " + popLast + ",队尾出队后 deque = " + deque);
int popFirst = deque.pollFirst();
System.out.println("队首出队元素 = " + popFirst + ",队首出队后 deque = " + deque);
/* 获取双向队列的长度 */
int size = deque.size();

View File

@ -71,7 +71,7 @@ class LinkedListDeque {
}
/* 出队操作 */
private Integer poll(boolean isFront) {
private Integer pop(boolean isFront) {
// 若队列为空,直接返回 null
if (isEmpty())
return null;
@ -102,13 +102,13 @@ class LinkedListDeque {
}
/* 队首出队 */
public Integer pollFirst() {
return poll(true);
public Integer popFirst() {
return pop(true);
}
/* 队尾出队 */
public Integer pollLast() {
return poll(false);
public Integer popLast() {
return pop(false);
}
/* 访问队首元素 */
@ -155,10 +155,10 @@ public class linkedlist_deque {
System.out.println("元素 1 队首入队后 deque = " + Arrays.toString(deque.toArray()));
/* 元素出队 */
int pollLast = deque.pollLast();
System.out.println("队尾出队元素 = " + pollLast + ",队尾出队后 deque = " + Arrays.toString(deque.toArray()));
int pollFirst = deque.pollFirst();
System.out.println("队首出队元素 = " + pollFirst + ",队首出队后 deque = " + Arrays.toString(deque.toArray()));
int popLast = deque.popLast();
System.out.println("队尾出队元素 = " + popLast + ",队尾出队后 deque = " + Arrays.toString(deque.toArray()));
int popFirst = deque.popFirst();
System.out.println("队首出队元素 = " + popFirst + ",队首出队后 deque = " + Arrays.toString(deque.toArray()));
/* 获取双向队列的长度 */
int size = deque.size();

View File

@ -45,7 +45,7 @@ class LinkedListQueue {
}
/* 出队 */
public int poll() {
public int pop() {
int num = peek();
// 删除头结点
front = front.next;
@ -90,8 +90,8 @@ public class linkedlist_queue {
System.out.println("队首元素 peek = " + peek);
/* 元素出队 */
int poll = queue.poll();
System.out.println("出队元素 poll = " + poll + ",出队后 queue = " + Arrays.toString(queue.toArray()));
int pop = queue.pop();
System.out.println("出队元素 pop = " + pop + ",出队后 queue = " + Arrays.toString(queue.toArray()));
/* 获取队列的长度 */
int size = queue.size();

View File

@ -26,8 +26,8 @@ public class queue {
System.out.println("队首元素 peek = " + peek);
/* 元素出队 */
int poll = queue.poll();
System.out.println("出队元素 poll = " + poll + ",出队后 queue = " + queue);
int pop = queue.poll();
System.out.println("出队元素 pop = " + pop + ",出队后 queue = " + queue);
/* 获取队列的长度 */
int size = queue.size();