From 28c98ef0f0cbbb2eea6b00e21a2faedcdcd3826c Mon Sep 17 00:00:00 2001 From: S-N-O-R-L-A-X Date: Mon, 12 Dec 2022 22:12:18 +0800 Subject: [PATCH 1/5] feat: add array_queue in ts --- .../chapter_stack_and_queue/array_queue.ts | 123 ++++++++++++++++++ 1 file changed, 123 insertions(+) create mode 100644 codes/typescript/chapter_stack_and_queue/array_queue.ts diff --git a/codes/typescript/chapter_stack_and_queue/array_queue.ts b/codes/typescript/chapter_stack_and_queue/array_queue.ts new file mode 100644 index 000000000..c232335d2 --- /dev/null +++ b/codes/typescript/chapter_stack_and_queue/array_queue.ts @@ -0,0 +1,123 @@ +/** + * File: array_queue.ts + * Created Time: 2022-12-11 + * Author: S-N-O-R-L-A-X (snorlax.xu@outlook.com) + */ + + +/* 基于环形数组实现的队列 */ +class ArrayQueue { + private queue: number[]; // 用于存储队列元素的数组 + private front: number = 0; // 头指针，指向队首 + private rear: number = 0; // 尾指针，指向队尾 + 1 + private CAPACITY: number = 1e5; + + constructor(capacity?: number) { + this.queue = new Array(capacity ?? this.CAPACITY); + } + + /* 获取队列的容量 */ + get capacity(): number { + return this.queue.length; + } + + /* 获取队列的长度 */ + get size(): number { + // 由于将数组看作为环形，可能 rear < front ，因此需要取余数 + return (this.capacity + this.rear - this.front) % this.capacity; + } + + /* 判断队列是否为空 */ + empty(): boolean { + return this.rear - this.front == 0; + } + + /* 入队 */ + offer(num: number): void { + if (this.size == this.capacity) { + console.log("队列已满"); + return; + } + // 尾结点后添加 num + this.queue[this.rear] = num; + // 尾指针向后移动一位，越过尾部后返回到数组头部 + this.rear = (this.rear + 1) % this.capacity; + } + + /* 出队 */ + poll(): number { + const num = this.peek(); + // 队头指针向后移动一位，若越过尾部则返回到数组头部 + this.front = (this.front + 1) % this.capacity; + return num; + } + + /* 访问队首元素 */ + peek(): number { + // 删除头结点 + if (this.empty()) + throw new Error("The queue is empty!"); + return this.queue[this.front]; + } + + /* 访问指定索引元素 */ + get(index: number): number { + if (index >= this.size) + throw new Error("Index out of bounds!"); + return this.queue[(this.front + index) % this.capacity]; + } + + /* 返回 Array */ + toArray(): number[] { + const siz = this.size; + const cap = this.capacity; + // 仅转换有效长度范围内的列表元素 + const arr = new Array(siz); + for (let i = 0, j = this.front; i < siz; i++, j++) { + arr[i] = this.queue[j % cap]; + } + return arr; + } +} + +/* 初始化队列 */ +const capacity = 10; +const queue = new ArrayQueue(capacity); + +/* 元素入队 */ +queue.offer(1); +queue.offer(3); +queue.offer(2); +queue.offer(5); +queue.offer(4); +console.log("队列 queue = "); +console.log(queue.toArray()); + +/* 访问队首元素 */ +const peek = queue.peek(); +console.log("队首元素 peek = " + peek); + +/* 访问指定索引元素 */ +const num = queue.get(2); +console.log("队列第 3 个元素为 num = " + num); + +/* 元素出队 */ +const poll = queue.poll(); +console.log("出队元素 poll = " + poll + "，出队后 queue = "); +console.log(queue.toArray()); + +/* 获取队列的长度 */ +const size = queue.size; +console.log("队列长度 size = " + size); + +/* 判断队列是否为空 */ +const empty = queue.empty(); +console.log("队列是否为空 = " + empty); + +/* 测试环形数组 */ +for (let i = 0; i < 10; i++) { + queue.offer(i); + queue.poll(); + console.log("第 " + i + " 轮入队 + 出队后 queue = "); + console.log(queue.toArray()); +} From 7b26491c78f68d8068eaf5709319fe61a30f4dfa Mon Sep 17 00:00:00 2001 From: S-N-O-R-L-A-X Date: Mon, 12 Dec 2022 22:13:10 +0800 Subject: [PATCH 2/5] feat: complement array_queue doc in ts --- docs/chapter_stack_and_queue/queue.md | 117 ++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/docs/chapter_stack_and_queue/queue.md b/docs/chapter_stack_and_queue/queue.md index c27058519..b9611a39f 100644 --- a/docs/chapter_stack_and_queue/queue.md +++ b/docs/chapter_stack_and_queue/queue.md @@ -724,6 +724,123 @@ comments: true === "TypeScript" ```typescript title="array_queue.ts" + + /* 基于环形数组实现的队列 */ + class ArrayQueue { + private queue: number[]; // 用于存储队列元素的数组 + private front: number = 0; // 头指针，指向队首 + private rear: number = 0; // 尾指针，指向队尾 + 1 + private CAPACITY: number = 1e5; + + constructor(capacity?: number) { + this.queue = new Array(capacity ?? this.CAPACITY); + } + + /* 获取队列的容量 */ + get capacity(): number { + return this.queue.length; + } + + /* 获取队列的长度 */ + get size(): number { + // 由于将数组看作为环形，可能 rear < front ，因此需要取余数 + return (this.capacity + this.rear - this.front) % this.capacity; + } + + /* 判断队列是否为空 */ + empty(): boolean { + return this.rear - this.front == 0; + } + + /* 入队 */ + offer(num: number): void { + if (this.size == this.capacity) { + console.log("队列已满"); + return; + } + // 尾结点后添加 num + this.queue[this.rear] = num; + // 尾指针向后移动一位，越过尾部后返回到数组头部 + this.rear = (this.rear + 1) % this.capacity; + } + + /* 出队 */ + poll(): number { + const num = this.peek(); + // 队头指针向后移动一位，若越过尾部则返回到数组头部 + this.front = (this.front + 1) % this.capacity; + return num; + } + + /* 访问队首元素 */ + peek(): number { + // 删除头结点 + if (this.empty()) + throw new Error("The queue is empty!"); + return this.queue[this.front]; + } + + /* 访问指定索引元素 */ + get(index: number): number { + if (index >= this.size) + throw new Error("Index out of bounds!"); + return this.queue[(this.front + index) % this.capacity]; + } + + /* 返回 Array */ + toArray(): number[] { + const siz = this.size; + const cap = this.capacity; + // 仅转换有效长度范围内的列表元素 + const arr = new Array(siz); + for (let i = 0, j = this.front; i < siz; i++, j++) { + arr[i] = this.queue[j % cap]; + } + return arr; + } + } + + /* 初始化队列 */ + const capacity = 10; + const queue = new ArrayQueue(capacity); + + /* 元素入队 */ + queue.offer(1); + queue.offer(3); + queue.offer(2); + queue.offer(5); + queue.offer(4); + console.log("队列 queue = "); + console.log(queue.toArray()); + + /* 访问队首元素 */ + const peek = queue.peek(); + console.log("队首元素 peek = " + peek); + + /* 访问指定索引元素 */ + const num = queue.get(2); + console.log("队列第 3 个元素为 num = " + num); + + /* 元素出队 */ + const poll = queue.poll(); + console.log("出队元素 poll = " + poll + "，出队后 queue = "); + console.log(queue.toArray()); + + /* 获取队列的长度 */ + const size = queue.size; + console.log("队列长度 size = " + size); + + /* 判断队列是否为空 */ + const empty = queue.empty(); + console.log("队列是否为空 = " + empty); + + /* 测试环形数组 */ + for (let i = 0; i < 10; i++) { + queue.offer(i); + queue.poll(); + console.log("第 " + i + " 轮入队 + 出队后 queue = "); + console.log(queue.toArray()); + } ``` From 39e508b3838b88047fa327778847729c57bd52ce Mon Sep 17 00:00:00 2001 From: S-N-O-R-L-A-X Date: Tue, 13 Dec 2022 00:00:06 +0800 Subject: [PATCH 3/5] feat: add array_queue in js --- .../chapter_stack_and_queue/array_queue.js | 123 ++++++++++++++++++ .../chapter_stack_and_queue/array_queue.ts | 2 + 2 files changed, 125 insertions(+) create mode 100644 codes/javascript/chapter_stack_and_queue/array_queue.js diff --git a/codes/javascript/chapter_stack_and_queue/array_queue.js b/codes/javascript/chapter_stack_and_queue/array_queue.js new file mode 100644 index 000000000..fa84fcea0 --- /dev/null +++ b/codes/javascript/chapter_stack_and_queue/array_queue.js @@ -0,0 +1,123 @@ +/** + * File: array_queue.js + * Created Time: 2022-12-13 + * Author: S-N-O-R-L-A-X (snorlax.xu@outlook.com) + */ + + +/* 基于环形数组实现的队列 */ +class ArrayQueue { + queue; // 用于存储队列元素的数组 + front = 0; // 头指针，指向队首 + rear = 0; // 尾指针，指向队尾 + 1 + CAPACITY = 1e5; + + constructor(capacity) { + this.queue = new Array(capacity ?? this.CAPACITY); + } + + /* 获取队列的容量 */ + get capacity() { + return this.queue.length; + } + + /* 获取队列的长度 */ + get size() { + // 由于将数组看作为环形，可能 rear < front ，因此需要取余数 + return (this.capacity + this.rear - this.front) % this.capacity; + } + + /* 判断队列是否为空 */ + empty() { + return this.rear - this.front == 0; + } + + /* 入队 */ + offer(num) { + if (this.size == this.capacity) { + console.log("队列已满"); + return; + } + // 尾结点后添加 num + this.queue[this.rear] = num; + // 尾指针向后移动一位，越过尾部后返回到数组头部 + this.rear = (this.rear + 1) % this.capacity; + } + + /* 出队 */ + poll() { + const num = this.peek(); + // 队头指针向后移动一位，若越过尾部则返回到数组头部 + this.front = (this.front + 1) % this.capacity; + return num; + } + + /* 访问队首元素 */ + peek() { + // 删除头结点 + if (this.empty()) + throw new Error("The queue is empty!"); + return this.queue[this.front]; + } + + /* 访问指定索引元素 */ + get(index) { + if (index >= this.size) + throw new Error("Index out of bounds!"); + return this.queue[(this.front + index) % this.capacity]; + } + + /* 返回 Array */ + toArray() { + const siz = this.size; + const cap = this.capacity; + // 仅转换有效长度范围内的列表元素 + const arr = new Array(siz); + for (let i = 0, j = this.front; i < siz; i++, j++) { + arr[i] = this.queue[j % cap]; + } + return arr; + } +} + +/* 初始化队列 */ +const capacity = 10; +const queue = new ArrayQueue(capacity); + +/* 元素入队 */ +queue.offer(1); +queue.offer(3); +queue.offer(2); +queue.offer(5); +queue.offer(4); +console.log("队列 queue = "); +console.log(queue.toArray()); + +/* 访问队首元素 */ +const peek = queue.peek(); +console.log("队首元素 peek = " + peek); + +/* 访问指定索引元素 */ +const num = queue.get(2); +console.log("队列第 3 个元素为 num = " + num); + +/* 元素出队 */ +const poll = queue.poll(); +console.log("出队元素 poll = " + poll + "，出队后 queue = "); +console.log(queue.toArray()); + +/* 获取队列的长度 */ +const size = queue.size; +console.log("队列长度 size = " + size); + +/* 判断队列是否为空 */ +const empty = queue.empty(); +console.log("队列是否为空 = " + empty); + +/* 测试环形数组 */ +for (let i = 0; i < 10; i++) { + queue.offer(i); + queue.poll(); + console.log("第 " + i + " 轮入队 + 出队后 queue = "); + console.log(queue.toArray()); +} diff --git a/codes/typescript/chapter_stack_and_queue/array_queue.ts b/codes/typescript/chapter_stack_and_queue/array_queue.ts index c232335d2..789d2d99f 100644 --- a/codes/typescript/chapter_stack_and_queue/array_queue.ts +++ b/codes/typescript/chapter_stack_and_queue/array_queue.ts @@ -121,3 +121,5 @@ for (let i = 0; i < 10; i++) { console.log("第 " + i + " 轮入队 + 出队后 queue = "); console.log(queue.toArray()); } + +export { }; \ No newline at end of file From a18ed3fd6d9a38f7484b4cccfacb2626e2759bde Mon Sep 17 00:00:00 2001 From: S-N-O-R-L-A-X Date: Tue, 13 Dec 2022 00:01:03 +0800 Subject: [PATCH 4/5] feat: complement array_queue doc in js --- docs/chapter_stack_and_queue/queue.md | 75 ++++++++++++++++++++++++++- 1 file changed, 74 insertions(+), 1 deletion(-) diff --git a/docs/chapter_stack_and_queue/queue.md b/docs/chapter_stack_and_queue/queue.md index b9611a39f..6b949c465 100644 --- a/docs/chapter_stack_and_queue/queue.md +++ b/docs/chapter_stack_and_queue/queue.md @@ -718,13 +718,86 @@ comments: true === "JavaScript" ```js title="array_queue.js" + /* 基于环形数组实现的队列 */ + class ArrayQueue { + queue; // 用于存储队列元素的数组 + front = 0; // 头指针，指向队首 + rear = 0; // 尾指针，指向队尾 + 1 + CAPACITY = 1e5; + constructor(capacity) { + this.queue = new Array(capacity ?? this.CAPACITY); + } + + /* 获取队列的容量 */ + get capacity() { + return this.queue.length; + } + + /* 获取队列的长度 */ + get size() { + // 由于将数组看作为环形，可能 rear < front ，因此需要取余数 + return (this.capacity + this.rear - this.front) % this.capacity; + } + + /* 判断队列是否为空 */ + empty() { + return this.rear - this.front == 0; + } + + /* 入队 */ + offer(num) { + if (this.size == this.capacity) { + console.log("队列已满"); + return; + } + // 尾结点后添加 num + this.queue[this.rear] = num; + // 尾指针向后移动一位，越过尾部后返回到数组头部 + this.rear = (this.rear + 1) % this.capacity; + } + + /* 出队 */ + poll() { + const num = this.peek(); + // 队头指针向后移动一位，若越过尾部则返回到数组头部 + this.front = (this.front + 1) % this.capacity; + return num; + } + + /* 访问队首元素 */ + peek() { + // 删除头结点 + if (this.empty()) + throw new Error("The queue is empty!"); + return this.queue[this.front]; + } + + /* 访问指定索引元素 */ + get(index) { + if (index >= this.size) + throw new Error("Index out of bounds!"); + return this.queue[(this.front + index) % this.capacity]; + } + + /* 返回 Array */ + toArray() { + const siz = this.size; + const cap = this.capacity; + // 仅转换有效长度范围内的列表元素 + const arr = new Array(siz); + for (let i = 0, j = this.front; i < siz; i++, j++) { + arr[i] = this.queue[j % cap]; + } + return arr; + } + } ``` === "TypeScript" ```typescript title="array_queue.ts" - + /* 基于环形数组实现的队列 */ class ArrayQueue { private queue: number[]; // 用于存储队列元素的数组 From 09f9c81eb2df5e3577cdf3c1b31de37d963e0e93 Mon Sep 17 00:00:00 2001 From: S-N-O-R-L-A-X Date: Wed, 14 Dec 2022 00:02:25 +0800 Subject: [PATCH 5/5] fix: use private variables --- .../chapter_stack_and_queue/array_queue.js | 30 ++++++------- docs/chapter_stack_and_queue/queue.md | 43 ------------------- 2 files changed, 15 insertions(+), 58 deletions(-) diff --git a/codes/javascript/chapter_stack_and_queue/array_queue.js b/codes/javascript/chapter_stack_and_queue/array_queue.js index fa84fcea0..89234952d 100644 --- a/codes/javascript/chapter_stack_and_queue/array_queue.js +++ b/codes/javascript/chapter_stack_and_queue/array_queue.js @@ -7,29 +7,29 @@ /* 基于环形数组实现的队列 */ class ArrayQueue { - queue; // 用于存储队列元素的数组 - front = 0; // 头指针，指向队首 - rear = 0; // 尾指针，指向队尾 + 1 - CAPACITY = 1e5; + #queue; // 用于存储队列元素的数组 + #front = 0; // 头指针，指向队首 + #rear = 0; // 尾指针，指向队尾 + 1 + #CAPACITY = 1e5; constructor(capacity) { - this.queue = new Array(capacity ?? this.CAPACITY); + this.#queue = new Array(capacity ?? this.CAPACITY); } /* 获取队列的容量 */ get capacity() { - return this.queue.length; + return this.#queue.length; } /* 获取队列的长度 */ get size() { // 由于将数组看作为环形，可能 rear < front ，因此需要取余数 - return (this.capacity + this.rear - this.front) % this.capacity; + return (this.capacity + this.#rear - this.#front) % this.capacity; } /* 判断队列是否为空 */ empty() { - return this.rear - this.front == 0; + return this.#rear - this.#front == 0; } /* 入队 */ @@ -39,16 +39,16 @@ class ArrayQueue { return; } // 尾结点后添加 num - this.queue[this.rear] = num; + this.#queue[this.#rear] = num; // 尾指针向后移动一位，越过尾部后返回到数组头部 - this.rear = (this.rear + 1) % this.capacity; + this.#rear = (this.#rear + 1) % this.capacity; } /* 出队 */ poll() { const num = this.peek(); // 队头指针向后移动一位，若越过尾部则返回到数组头部 - this.front = (this.front + 1) % this.capacity; + this.#front = (this.#front + 1) % this.capacity; return num; } @@ -57,14 +57,14 @@ class ArrayQueue { // 删除头结点 if (this.empty()) throw new Error("The queue is empty!"); - return this.queue[this.front]; + return this.#queue[this.#front]; } /* 访问指定索引元素 */ get(index) { if (index >= this.size) throw new Error("Index out of bounds!"); - return this.queue[(this.front + index) % this.capacity]; + return this.#queue[(this.#front + index) % this.capacity]; } /* 返回 Array */ @@ -73,8 +73,8 @@ class ArrayQueue { const cap = this.capacity; // 仅转换有效长度范围内的列表元素 const arr = new Array(siz); - for (let i = 0, j = this.front; i < siz; i++, j++) { - arr[i] = this.queue[j % cap]; + for (let i = 0, j = this.#front; i < siz; i++, j++) { + arr[i] = this.#queue[j % cap]; } return arr; } diff --git a/docs/chapter_stack_and_queue/queue.md b/docs/chapter_stack_and_queue/queue.md index 6b949c465..83634e208 100644 --- a/docs/chapter_stack_and_queue/queue.md +++ b/docs/chapter_stack_and_queue/queue.md @@ -872,49 +872,6 @@ comments: true return arr; } } - - /* 初始化队列 */ - const capacity = 10; - const queue = new ArrayQueue(capacity); - - /* 元素入队 */ - queue.offer(1); - queue.offer(3); - queue.offer(2); - queue.offer(5); - queue.offer(4); - console.log("队列 queue = "); - console.log(queue.toArray()); - - /* 访问队首元素 */ - const peek = queue.peek(); - console.log("队首元素 peek = " + peek); - - /* 访问指定索引元素 */ - const num = queue.get(2); - console.log("队列第 3 个元素为 num = " + num); - - /* 元素出队 */ - const poll = queue.poll(); - console.log("出队元素 poll = " + poll + "，出队后 queue = "); - console.log(queue.toArray()); - - /* 获取队列的长度 */ - const size = queue.size; - console.log("队列长度 size = " + size); - - /* 判断队列是否为空 */ - const empty = queue.empty(); - console.log("队列是否为空 = " + empty); - - /* 测试环形数组 */ - for (let i = 0; i < 10; i++) { - queue.offer(i); - queue.poll(); - console.log("第 " + i + " 轮入队 + 出队后 queue = "); - console.log(queue.toArray()); - } - ``` === "C"