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

@@ -68,7 +68,7 @@ class ArrayDeque {
}
/* */
func pollFirst() -> Int {
func popFirst() -> Int {
let num = peekFirst()
//
front = index(i: front + 1)
@@ -77,7 +77,7 @@ class ArrayDeque {
}
/* */
func pollLast() -> Int {
func popLast() -> Int {
let num = peekLast()
queSize -= 1
return num
@@ -136,10 +136,10 @@ enum _ArrayDeque {
print("元素 1 队首入队后 deque = \(deque.toArray())")
/* */
let pollLast = deque.pollLast()
print("队尾出队元素 = \(pollLast),队尾出队后 deque = \(deque.toArray())")
let pollFirst = deque.pollFirst()
print("队首出队元素 = \(pollFirst),队首出队后 deque = \(deque.toArray())")
let popLast = deque.popLast()
print("队尾出队元素 = \(popLast),队尾出队后 deque = \(deque.toArray())")
let popFirst = deque.popFirst()
print("队首出队元素 = \(popFirst),队首出队后 deque = \(deque.toArray())")
/* */
let size = deque.size()

View File

@@ -46,7 +46,7 @@ class ArrayQueue {
/* */
@discardableResult
func poll() -> Int {
func pop() -> Int {
let num = peek()
//
front = (front + 1) % capacity()
@@ -94,8 +94,8 @@ enum _ArrayQueue {
print("队首元素 peek = \(peek)")
/* */
let poll = queue.poll()
print("出队元素 poll = \(poll),出队后 queue = \(queue.toArray())")
let pop = queue.pop()
print("出队元素 pop = \(pop),出队后 queue = \(queue.toArray())")
/* */
let size = queue.size()
@@ -108,7 +108,7 @@ enum _ArrayQueue {
/* */
for i in 0 ..< 10 {
queue.push(num: i)
queue.poll()
queue.pop()
print("\(i) 轮入队 + 出队后 queue = \(queue.toArray())")
}
}

View File

@@ -27,11 +27,11 @@ enum Deque {
print("队尾元素 peekLast = \(peekLast)")
/* */
// 使 Array pollFirst O(n)
let pollFirst = deque.removeFirst()
print("队首出队元素 pollFirst = \(pollFirst),队首出队后 deque = \(deque)")
let pollLast = deque.removeLast()
print("队尾出队元素 pollLast = \(pollLast),队尾出队后 deque = \(deque)")
// 使 Array popFirst O(n)
let popFirst = deque.removeFirst()
print("队首出队元素 popFirst = \(popFirst),队首出队后 deque = \(deque)")
let popLast = deque.removeLast()
print("队尾出队元素 popLast = \(popLast),队尾出队后 deque = \(deque)")
/* */
let size = deque.count

View File

@@ -71,7 +71,7 @@ class LinkedListDeque {
}
/* */
private func poll(isFront: Bool) -> Int {
private func pop(isFront: Bool) -> Int {
if isEmpty() {
fatalError("双向队列为空")
}
@@ -103,13 +103,13 @@ class LinkedListDeque {
}
/* */
func pollFirst() -> Int {
poll(isFront: true)
func popFirst() -> Int {
pop(isFront: true)
}
/* */
func pollLast() -> Int {
poll(isFront: false)
func popLast() -> Int {
pop(isFront: false)
}
/* 访 */
@@ -158,10 +158,10 @@ enum _LinkedListDeque {
print("元素 1 队首入队后 deque = \(deque.toArray())")
/* */
let pollLast = deque.pollLast()
print("队尾出队元素 = \(pollLast),队尾出队后 deque = \(deque.toArray())")
let pollFirst = deque.pollFirst()
print("队首出队元素 = \(pollFirst),队首出队后 deque = \(deque.toArray())")
let popLast = deque.popLast()
print("队尾出队元素 = \(popLast),队尾出队后 deque = \(deque.toArray())")
let popFirst = deque.popFirst()
print("队首出队元素 = \(popFirst),队首出队后 deque = \(deque.toArray())")
/* */
let size = deque.size()

View File

@@ -43,7 +43,7 @@ class LinkedListQueue {
/* */
@discardableResult
func poll() -> Int {
func pop() -> Int {
let num = peek()
//
front = front?.next
@@ -91,8 +91,8 @@ enum _LinkedListQueue {
print("队首元素 peek = \(peek)")
/* */
let poll = queue.poll()
print("出队元素 poll = \(poll),出队后 queue = \(queue.toArray())")
let pop = queue.pop()
print("出队元素 pop = \(pop),出队后 queue = \(queue.toArray())")
/* */
let size = queue.size()

View File

@@ -25,9 +25,9 @@ enum Queue {
print("队首元素 peek = \(peek)")
/* */
// 使 Array poll O(n)
// 使 Array pop O(n)
let pool = queue.removeFirst()
print("出队元素 poll = \(pool),出队后 queue = \(queue)")
print("出队元素 pop = \(pool),出队后 queue = \(queue)")
/* */
let size = queue.count