Skip to content

Commit 83e3d4a

Browse files
HardvanHardvan
authored
Merge branch 'master' into heap_element_improve
2 parents 55ecc18 + 6545688 commit 83e3d4a

40 files changed

+2098
-465
lines changed

‎DIRECTORY.md

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,12 +321,15 @@
321321
* [BinaryAddition](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/BinaryAddition.java)
322322
* [CoinChange](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/CoinChange.java)
323323
* [DigitSeparation](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/DigitSeparation.java)
324+
* [EgyptianFraction](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/EgyptianFraction.java)
324325
* [FractionalKnapsack](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/FractionalKnapsack.java)
325326
* [GaleShapley](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/GaleShapley.java)
326327
* [JobSequencing](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/JobSequencing.java)
328+
* [KCenters](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/KCenters.java)
327329
* [MergeIntervals](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/MergeIntervals.java)
328330
* [MinimizingLateness](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/MinimizingLateness.java)
329331
* [MinimumWaitingTime](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/MinimumWaitingTime.java)
332+
* [OptimalFileMerging](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/OptimalFileMerging.java)
330333
* [StockProfitCalculator](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/greedyalgorithms/StockProfitCalculator.java)
331334
* io
332335
* [BufferedReader](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/io/BufferedReader.java)
@@ -351,6 +354,7 @@
351354
* [BinaryPow](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/maths/BinaryPow.java)
352355
* [BinomialCoefficient](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/maths/BinomialCoefficient.java)
353356
* [Ceil](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/maths/Ceil.java)
357+
* [ChineseRemainderTheorem](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/maths/ChineseRemainderTheorem.java)
354358
* [CircularConvolutionFFT](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/maths/CircularConvolutionFFT.java)
355359
* [CollatzConjecture](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/maths/CollatzConjecture.java)
356360
* [Combinations](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/maths/Combinations.java)
@@ -568,6 +572,9 @@
568572
* [TernarySearch](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/searches/TernarySearch.java)
569573
* [UnionFind](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/searches/UnionFind.java)
570574
* [UpperBound](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/searches/UpperBound.java)
575+
* slidingwindow
576+
* [LongestSubstringWithoutRepeatingCharacters](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/slidingwindow/LongestSubstringWithoutRepeatingCharacters.java)
577+
* [MaxSumKSizeSubarray](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/slidingwindow/MaxSumKSizeSubarray.java)
571578
* sorts
572579
* [AdaptiveMergeSort](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/sorts/AdaptiveMergeSort.java)
573580
* [BeadSort](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/sorts/BeadSort.java)
@@ -828,9 +835,15 @@
828835
* [FibonacciHeapTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/heaps/FibonacciHeapTest.java)
829836
* [HeapElementTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/heaps/HeapElementTest.java)
830837
* [LeftistHeapTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/heaps/LeftistHeapTest.java)
838+
* [MinPriorityQueueTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/heaps/MinPriorityQueueTest.java)
831839
* lists
832840
* [CircleLinkedListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/CircleLinkedListTest.java)
841+
* [CountSinglyLinkedListRecursionTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/CountSinglyLinkedListRecursionTest.java)
833842
* [CreateAndDetectLoopTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/CreateAndDetectLoopTest.java)
843+
* [CursorLinkedListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/CursorLinkedListTest.java)
844+
* [MergeKSortedLinkedListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/MergeKSortedLinkedListTest.java)
845+
* [MergeSortedArrayListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/MergeSortedArrayListTest.java)
846+
* [MergeSortedSinglyLinkedListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/MergeSortedSinglyLinkedListTest.java)
834847
* [QuickSortLinkedListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/QuickSortLinkedListTest.java)
835848
* [ReverseKGroupTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/ReverseKGroupTest.java)
836849
* [RotateSinglyLinkedListsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/lists/RotateSinglyLinkedListsTest.java)
@@ -846,9 +859,9 @@
846859
* [QueueByTwoStacksTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/queues/QueueByTwoStacksTest.java)
847860
* [QueueTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/queues/QueueTest.java)
848861
* stacks
849-
* [LinkedListStackTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/stacks/LinkedListStackTest.java)
850862
* [StackArrayListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/stacks/StackArrayListTest.java)
851863
* [StackArrayTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/stacks/StackArrayTest.java)
864+
* [StackOfLinkedListTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/stacks/StackOfLinkedListTest.java)
852865
* trees
853866
* [BinaryTreeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/BinaryTreeTest.java)
854867
* [BoundaryTraversalTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/datastructures/trees/BoundaryTraversalTest.java)
@@ -938,12 +951,15 @@
938951
* [BinaryAdditionTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/BinaryAdditionTest.java)
939952
* [CoinChangeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/CoinChangeTest.java)
940953
* [DigitSeparationTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/DigitSeparationTest.java)
954+
* [EgyptianFractionTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/EgyptianFractionTest.java)
941955
* [FractionalKnapsackTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/FractionalKnapsackTest.java)
942956
* [GaleShapleyTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/GaleShapleyTest.java)
943957
* [JobSequencingTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/JobSequencingTest.java)
958+
* [KCentersTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/KCentersTest.java)
944959
* [MergeIntervalsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/MergeIntervalsTest.java)
945960
* [MinimizingLatenessTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/MinimizingLatenessTest.java)
946961
* [MinimumWaitingTimeTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/MinimumWaitingTimeTest.java)
962+
* [OptimalFileMergingTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/OptimalFileMergingTest.java)
947963
* [StockProfitCalculatorTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/greedyalgorithms/StockProfitCalculatorTest.java)
948964
* io
949965
* [BufferedReaderTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/io/BufferedReaderTest.java)
@@ -965,6 +981,7 @@
965981
* [BinaryPowTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/maths/BinaryPowTest.java)
966982
* [BinomialCoefficientTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/maths/BinomialCoefficientTest.java)
967983
* [CeilTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/maths/CeilTest.java)
984+
* [ChineseRemainderTheoremTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/maths/ChineseRemainderTheoremTest.java)
968985
* [CollatzConjectureTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/maths/CollatzConjectureTest.java)
969986
* [CombinationsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/maths/CombinationsTest.java)
970987
* [ConvolutionFFTTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/maths/ConvolutionFFTTest.java)
@@ -1151,6 +1168,9 @@
11511168
* [TestSearchInARowAndColWiseSortedMatrix](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/searches/TestSearchInARowAndColWiseSortedMatrix.java)
11521169
* [UnionFindTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/searches/UnionFindTest.java)
11531170
* [UpperBoundTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/searches/UpperBoundTest.java)
1171+
* slidingwindow
1172+
* [LongestSubstringWithoutRepeatingCharactersTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/slidingwindow/LongestSubstringWithoutRepeatingCharactersTest.java)
1173+
* [MaxSumKSizeSubarrayTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/slidingwindow/MaxSumKSizeSubarrayTest.java)
11541174
* sorts
11551175
* [AdaptiveMergeSortTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/sorts/AdaptiveMergeSortTest.java)
11561176
* [BeadSortTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/sorts/BeadSortTest.java)

‎src/main/java/com/thealgorithms/datastructures/heaps/GenericHeap.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@ public class GenericHeap<T extends Comparable<T>> {
99
HashMap<T, Integer> map = new HashMap<>();
1010

1111
public void add(T item) {
12+
if (item == null) {
13+
throw new IllegalArgumentException("Cannot insert null into the heap.");
14+
}
15+
1216
this.data.add(item);
1317
map.put(item, this.data.size() - 1); //
1418
upHeapify(this.data.size() - 1);

‎src/main/java/com/thealgorithms/datastructures/heaps/MinPriorityQueue.java

Lines changed: 84 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,49 @@
11
package com.thealgorithms.datastructures.heaps;
22

33
/**
4-
* Minimum Priority Queue It is a part of heap data structure A heap is a
5-
* specific tree based data structure in which all the nodes of tree are in a
6-
* specific order. that is the children are arranged in some respect of their
7-
* parents, can either be greater or less than the parent. This makes it a min
8-
* priority queue or max priority queue.
4+
* A MinPriorityQueue is a specialized data structure that maintains the
5+
* min-heap property, where the smallest element has the highest priority.
96
*
10-
* <p>
7+
* <p>In a min-priority queue, every parent node is less than or equal
8+
* to its child nodes, which ensures that the smallest element can
9+
* always be efficiently retrieved.</p>
1110
*
12-
* <p>
13-
* Functions: insert, delete, peek, isEmpty, print, heapSort, sink
11+
* <p>Functions:</p>
12+
* <ul>
13+
* <li><b>insert(int key)</b>: Inserts a new key into the queue.</li>
14+
* <li><b>delete()</b>: Removes and returns the highest priority value (the minimum).</li>
15+
* <li><b>peek()</b>: Returns the highest priority value without removing it.</li>
16+
* <li><b>isEmpty()</b>: Checks if the queue is empty.</li>
17+
* <li><b>isFull()</b>: Checks if the queue is full.</li>
18+
* <li><b>heapSort()</b>: Sorts the elements in ascending order.</li>
19+
* <li><b>print()</b>: Prints the current elements in the queue.</li>
20+
* </ul>
1421
*/
1522
public class MinPriorityQueue {
1623

1724
private final int[] heap;
1825
private final int capacity;
1926
private int size;
2027

21-
// class the constructor and initializes the capacity
22-
MinPriorityQueue(int c) {
28+
/**
29+
* Initializes a new MinPriorityQueue with a specified capacity.
30+
*
31+
* @param c the maximum number of elements the queue can hold
32+
*/
33+
public MinPriorityQueue(int c) {
2334
this.capacity = c;
2435
this.size = 0;
2536
this.heap = new int[c + 1];
2637
}
2738

28-
// inserts the key at the end and rearranges it
29-
// so that the binary heap is in appropriate order
39+
/**
40+
* Inserts a new key into the min-priority queue.
41+
*
42+
* @param key the value to be inserted
43+
*/
3044
public void insert(int key) {
3145
if (this.isFull()) {
32-
return;
46+
throw new IllegalStateException("MinPriorityQueue is full. Cannot insert new element.");
3347
}
3448
this.heap[this.size + 1] = key;
3549
int k = this.size + 1;
@@ -44,89 +58,98 @@ public void insert(int key) {
4458
this.size++;
4559
}
4660

47-
// returns the highest priority value
61+
/**
62+
* Retrieves the highest priority value (the minimum) without removing it.
63+
*
64+
* @return the minimum value in the queue
65+
* @throws IllegalStateException if the queue is empty
66+
*/
4867
public int peek() {
68+
if (isEmpty()) {
69+
throw new IllegalStateException("MinPriorityQueue is empty. Cannot peek.");
70+
}
4971
return this.heap[1];
5072
}
5173

52-
// returns boolean value whether the heap is empty or not
74+
/**
75+
* Checks whether the queue is empty.
76+
*
77+
* @return true if the queue is empty, false otherwise
78+
*/
5379
public boolean isEmpty() {
54-
return 0 == this.size;
80+
return size == 0;
5581
}
5682

57-
// returns boolean value whether the heap is full or not
83+
/**
84+
* Checks whether the queue is full.
85+
*
86+
* @return true if the queue is full, false otherwise
87+
*/
5888
public boolean isFull() {
59-
return this.size == this.capacity;
89+
return size == capacity;
6090
}
6191

62-
// prints the heap
92+
/**
93+
* Prints the elements of the queue.
94+
*/
6395
public void print() {
64-
for (int i = 1; i <= this.capacity; i++) {
96+
for (int i = 1; i <= this.size; i++) {
6597
System.out.print(this.heap[i] + " ");
6698
}
6799
System.out.println();
68100
}
69101

70-
// heap sorting can be done by performing
71-
// delete function to the number of times of the size of the heap
72-
// it returns reverse sort because it is a min priority queue
102+
/**
103+
* Sorts the elements in the queue using heap sort.
104+
*/
73105
public void heapSort() {
74-
for (int i = 1; i < this.capacity; i++) {
106+
for (int i = 1; i <= this.size; i++) {
75107
this.delete();
76108
}
77109
}
78110

79-
// this function reorders the heap after every delete function
111+
/**
112+
* Reorders the heap after a deletion to maintain the heap property.
113+
*/
80114
private void sink() {
81115
int k = 1;
82-
while (2 * k <= this.size || 2 * k + 1 <= this.size) {
83-
int minIndex;
84-
if (this.heap[2 * k] >= this.heap[k]) {
85-
if (2 * k + 1 <= this.size && this.heap[2 * k + 1] >= this.heap[k]) {
86-
break;
87-
} else if (2 * k + 1 > this.size) {
88-
break;
89-
}
116+
while (2 * k <= this.size) {
117+
int minIndex = k; // Assume current index is the minimum
118+
119+
if (2 * k <= this.size && this.heap[2 * k] < this.heap[minIndex]) {
120+
minIndex = 2 * k; // Left child is smaller
90121
}
91-
if (2 * k + 1 > this.size) {
92-
minIndex = this.heap[2 * k] < this.heap[k] ? 2 * k : k;
93-
} else {
94-
if (this.heap[k] > this.heap[2 * k] || this.heap[k] > this.heap[2 * k + 1]) {
95-
minIndex = this.heap[2 * k] < this.heap[2 * k + 1] ? 2 * k : 2 * k + 1;
96-
} else {
97-
minIndex = k;
98-
}
122+
if (2 * k + 1 <= this.size && this.heap[2 * k + 1] < this.heap[minIndex]) {
123+
minIndex = 2 * k + 1; // Right child is smaller
99124
}
125+
126+
if (minIndex == k) {
127+
break; // No swap needed, heap property is satisfied
128+
}
129+
130+
// Swap with the smallest child
100131
int temp = this.heap[k];
101132
this.heap[k] = this.heap[minIndex];
102133
this.heap[minIndex] = temp;
103-
k = minIndex;
134+
135+
k = minIndex; // Move down to the smallest child
104136
}
105137
}
106138

107-
// deletes the highest priority value from the heap
139+
/**
140+
* Deletes and returns the highest priority value (the minimum) from the queue.
141+
*
142+
* @return the minimum value from the queue
143+
* @throws IllegalStateException if the queue is empty
144+
*/
108145
public int delete() {
146+
if (isEmpty()) {
147+
throw new IllegalStateException("MinPriorityQueue is empty. Cannot delete.");
148+
}
109149
int min = this.heap[1];
110-
this.heap[1] = this.heap[this.size];
111-
this.heap[this.size] = min;
150+
this.heap[1] = this.heap[this.size]; // Move last element to the root
112151
this.size--;
113152
this.sink();
114153
return min;
115154
}
116-
117-
public static void main(String[] args) {
118-
// testing
119-
MinPriorityQueue q = new MinPriorityQueue(8);
120-
q.insert(5);
121-
q.insert(2);
122-
q.insert(4);
123-
q.insert(1);
124-
q.insert(7);
125-
q.insert(6);
126-
q.insert(3);
127-
q.insert(8);
128-
q.print(); // [ 1, 2, 3, 5, 7, 6, 4, 8 ]
129-
q.heapSort();
130-
q.print(); // [ 8, 7, 6, 5, 4, 3, 2, 1 ]
131-
}
132155
}

0 commit comments

Comments
 (0)