Skip to content

Commit aa9e66f

Browse files
committed
fix: change in equality, fix in test case for new Queue API
1 parent 515f423 commit aa9e66f

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

src/_DataStructures_/Queue/index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ class Queue extends SinglyLinkedLists {
1212

1313
dequeue() {
1414
const node = this.removeFromBeginning();
15-
return node.data;
15+
return node ? node.data : node;
1616
}
1717

1818
peek() {
1919
const node = this.getFirst();
20-
return node.data;
20+
return node ? node.data : node;
2121
}
2222

2323
length() {

src/_DataStructures_/Queue/weave/index.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ function weaveQueues(first, second) {
44
const weaved = new Queue();
55

66
while (first.peek() || second.peek()) {
7-
if (first.peek() !== undefined) {
8-
weaved.add(first.remove());
7+
if (first.peek()) {
8+
weaved.enqueue(first.dequeue());
99
}
1010

11-
if (second.peek() !== undefined) {
12-
weaved.add(second.remove());
11+
if (second.peek()) {
12+
weaved.enqueue(second.dequeue());
1313
}
1414
}
1515
return weaved;

src/_DataStructures_/Queue/weave/weave.test.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,18 @@ describe('Weave two queues using weaveQueues()', () => {
1010
const q1 = new Queue();
1111
const q2 = new Queue();
1212

13-
q1.add('Hello');
14-
q2.add(1);
15-
q1.add('World');
16-
q2.add(2);
17-
q2.add(3);
13+
q1.enqueue('Hello');
14+
q2.enqueue(1);
15+
q1.enqueue('World');
16+
q2.enqueue(2);
17+
q2.enqueue(3);
1818

1919
const q3 = weaveQueues(q1, q2);
2020

21-
expect(q3.remove()).toEqual('Hello');
22-
expect(q3.remove()).toEqual(1);
23-
expect(q3.remove()).toEqual('World');
24-
expect(q3.remove()).toEqual(2);
25-
expect(q3.remove()).toEqual(3);
21+
expect(q3.dequeue()).toEqual('Hello');
22+
expect(q3.dequeue()).toEqual(1);
23+
expect(q3.dequeue()).toEqual('World');
24+
expect(q3.dequeue()).toEqual(2);
25+
expect(q3.dequeue()).toEqual(3);
2626
});
2727
});

0 commit comments

Comments
 (0)