From 26c2465328f81379047237b4bf54f134a73a7fd1 Mon Sep 17 00:00:00 2001 From: Subhradeep Bera <124783808+beradeep@users.noreply.github.com> Date: Tue, 19 Sep 2023 00:57:36 +0530 Subject: [PATCH] Moved StackPostfixNotation.java from the Others section to the Stack section (#4372) * Moved StackPostfixNotation.java from the Others section to the Stack section * Put all stack related algo in a separate stack directory in the algorithms directory. The stack directory under data-structures now only contains various implementations of the stack data structure. * formatted files --- .../stacks/BalancedBrackets.java | 2 +- .../stacks/CalculateMaxOfMin.java | 2 +- .../stacks/DecimalToAnyUsingStack.java | 2 +- .../stacks/DuplicateBrackets.java | 2 +- .../stacks/InfixToPostfix.java | 2 +- .../stacks/LargestRectangle.java | 2 +- .../stacks/MaximumMinimumWindow.java | 2 +- .../stacks/NextGraterElement.java | 2 +- .../stacks/NextSmallerElement.java | 2 +- .../stacks/PostfixToInfix.java | 2 +- .../StackPostfixNotation.java | 2 +- .../CalculateMaxOfMinTest.java | 17 ++++++++--------- .../StackPostfixNotationTest.java | 5 ++--- 13 files changed, 21 insertions(+), 23 deletions(-) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/BalancedBrackets.java (98%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/CalculateMaxOfMin.java (95%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/DecimalToAnyUsingStack.java (96%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/DuplicateBrackets.java (96%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/InfixToPostfix.java (97%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/LargestRectangle.java (95%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/MaximumMinimumWindow.java (98%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/NextGraterElement.java (97%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/NextSmallerElement.java (97%) rename src/main/java/com/thealgorithms/{datastructures => }/stacks/PostfixToInfix.java (98%) rename src/main/java/com/thealgorithms/{others => stacks}/StackPostfixNotation.java (98%) rename src/test/java/com/thealgorithms/{others => stacks}/CalculateMaxOfMinTest.java (79%) rename src/test/java/com/thealgorithms/{others => stacks}/StackPostfixNotationTest.java (90%) diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/BalancedBrackets.java b/src/main/java/com/thealgorithms/stacks/BalancedBrackets.java similarity index 98% rename from src/main/java/com/thealgorithms/datastructures/stacks/BalancedBrackets.java rename to src/main/java/com/thealgorithms/stacks/BalancedBrackets.java index d80502d88..a73697a7d 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/BalancedBrackets.java +++ b/src/main/java/com/thealgorithms/stacks/BalancedBrackets.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/CalculateMaxOfMin.java b/src/main/java/com/thealgorithms/stacks/CalculateMaxOfMin.java similarity index 95% rename from src/main/java/com/thealgorithms/datastructures/stacks/CalculateMaxOfMin.java rename to src/main/java/com/thealgorithms/stacks/CalculateMaxOfMin.java index df7279bb2..399b9efdc 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/CalculateMaxOfMin.java +++ b/src/main/java/com/thealgorithms/stacks/CalculateMaxOfMin.java @@ -7,7 +7,7 @@ * Program description - Given an integer array. The task is to find the maximum of the minimum of * the array */ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.*; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/DecimalToAnyUsingStack.java b/src/main/java/com/thealgorithms/stacks/DecimalToAnyUsingStack.java similarity index 96% rename from src/main/java/com/thealgorithms/datastructures/stacks/DecimalToAnyUsingStack.java rename to src/main/java/com/thealgorithms/stacks/DecimalToAnyUsingStack.java index ec6c8414d..0a206a8ba 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/DecimalToAnyUsingStack.java +++ b/src/main/java/com/thealgorithms/stacks/DecimalToAnyUsingStack.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/DuplicateBrackets.java b/src/main/java/com/thealgorithms/stacks/DuplicateBrackets.java similarity index 96% rename from src/main/java/com/thealgorithms/datastructures/stacks/DuplicateBrackets.java rename to src/main/java/com/thealgorithms/stacks/DuplicateBrackets.java index fb976360c..7daf2e060 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/DuplicateBrackets.java +++ b/src/main/java/com/thealgorithms/stacks/DuplicateBrackets.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; // 1. You are given a string exp representing an expression. // 2. Assume that the expression is balanced i.e. the opening and closing brackets match with each diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/InfixToPostfix.java b/src/main/java/com/thealgorithms/stacks/InfixToPostfix.java similarity index 97% rename from src/main/java/com/thealgorithms/datastructures/stacks/InfixToPostfix.java rename to src/main/java/com/thealgorithms/stacks/InfixToPostfix.java index b00922333..2cafdc940 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/InfixToPostfix.java +++ b/src/main/java/com/thealgorithms/stacks/InfixToPostfix.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/LargestRectangle.java b/src/main/java/com/thealgorithms/stacks/LargestRectangle.java similarity index 95% rename from src/main/java/com/thealgorithms/datastructures/stacks/LargestRectangle.java rename to src/main/java/com/thealgorithms/stacks/LargestRectangle.java index f076d5d6a..63f1d0b4f 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/LargestRectangle.java +++ b/src/main/java/com/thealgorithms/stacks/LargestRectangle.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/MaximumMinimumWindow.java b/src/main/java/com/thealgorithms/stacks/MaximumMinimumWindow.java similarity index 98% rename from src/main/java/com/thealgorithms/datastructures/stacks/MaximumMinimumWindow.java rename to src/main/java/com/thealgorithms/stacks/MaximumMinimumWindow.java index 88228000e..5eb895d94 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/MaximumMinimumWindow.java +++ b/src/main/java/com/thealgorithms/stacks/MaximumMinimumWindow.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Arrays; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/NextGraterElement.java b/src/main/java/com/thealgorithms/stacks/NextGraterElement.java similarity index 97% rename from src/main/java/com/thealgorithms/datastructures/stacks/NextGraterElement.java rename to src/main/java/com/thealgorithms/stacks/NextGraterElement.java index 294e436c2..0cf56349c 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/NextGraterElement.java +++ b/src/main/java/com/thealgorithms/stacks/NextGraterElement.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Arrays; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/NextSmallerElement.java b/src/main/java/com/thealgorithms/stacks/NextSmallerElement.java similarity index 97% rename from src/main/java/com/thealgorithms/datastructures/stacks/NextSmallerElement.java rename to src/main/java/com/thealgorithms/stacks/NextSmallerElement.java index b25e5346d..84263d986 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/NextSmallerElement.java +++ b/src/main/java/com/thealgorithms/stacks/NextSmallerElement.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Arrays; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/datastructures/stacks/PostfixToInfix.java b/src/main/java/com/thealgorithms/stacks/PostfixToInfix.java similarity index 98% rename from src/main/java/com/thealgorithms/datastructures/stacks/PostfixToInfix.java rename to src/main/java/com/thealgorithms/stacks/PostfixToInfix.java index 0d67a7939..0c674ec02 100644 --- a/src/main/java/com/thealgorithms/datastructures/stacks/PostfixToInfix.java +++ b/src/main/java/com/thealgorithms/stacks/PostfixToInfix.java @@ -1,4 +1,4 @@ -package com.thealgorithms.datastructures.stacks; +package com.thealgorithms.stacks; import java.util.Stack; diff --git a/src/main/java/com/thealgorithms/others/StackPostfixNotation.java b/src/main/java/com/thealgorithms/stacks/StackPostfixNotation.java similarity index 98% rename from src/main/java/com/thealgorithms/others/StackPostfixNotation.java rename to src/main/java/com/thealgorithms/stacks/StackPostfixNotation.java index 0e8ad58c4..d4b7c9222 100644 --- a/src/main/java/com/thealgorithms/others/StackPostfixNotation.java +++ b/src/main/java/com/thealgorithms/stacks/StackPostfixNotation.java @@ -1,4 +1,4 @@ -package com.thealgorithms.others; +package com.thealgorithms.stacks; import java.util.Scanner; import java.util.Stack; diff --git a/src/test/java/com/thealgorithms/others/CalculateMaxOfMinTest.java b/src/test/java/com/thealgorithms/stacks/CalculateMaxOfMinTest.java similarity index 79% rename from src/test/java/com/thealgorithms/others/CalculateMaxOfMinTest.java rename to src/test/java/com/thealgorithms/stacks/CalculateMaxOfMinTest.java index e80cf9127..4cb1f48dc 100644 --- a/src/test/java/com/thealgorithms/others/CalculateMaxOfMinTest.java +++ b/src/test/java/com/thealgorithms/stacks/CalculateMaxOfMinTest.java @@ -1,8 +1,7 @@ -package com.thealgorithms.others; +package com.thealgorithms.stacks; import static org.junit.jupiter.api.Assertions.*; -import com.thealgorithms.datastructures.stacks.CalculateMaxOfMin; import org.junit.jupiter.api.Test; public class CalculateMaxOfMinTest { @@ -11,48 +10,48 @@ public class CalculateMaxOfMinTest { void testForOneElement() { int[] a = {10, 20, 30, 50, 10, 70, 30}; int k = CalculateMaxOfMin.calculateMaxOfMin(a); - assertTrue(k == 70); + assertEquals(70, k); } @Test void testForTwoElements() { int[] a = {5, 3, 2, 6, 3, 2, 6}; int k = CalculateMaxOfMin.calculateMaxOfMin(a); - assertTrue(k == 6); + assertEquals(6, k); } @Test void testForThreeElements() { int[] a = {10, 10, 10, 10, 10, 10, 10}; int k = CalculateMaxOfMin.calculateMaxOfMin(a); - assertTrue(k == 10); + assertEquals(10, k); } @Test void testForFourElements() { int[] a = {70, 60, 50, 40, 30, 20}; int k = CalculateMaxOfMin.calculateMaxOfMin(a); - assertTrue(k == 70); + assertEquals(70, k); } @Test void testForFiveElements() { int[] a = {50}; int k = CalculateMaxOfMin.calculateMaxOfMin(a); - assertTrue(k == 50); + assertEquals(50, k); } @Test void testForSixElements() { int[] a = {1, 4, 7, 9, 2, 4, 6}; int k = CalculateMaxOfMin.calculateMaxOfMin(a); - assertTrue(k == 9); + assertEquals(9, k); } @Test void testForSevenElements() { int[] a = {-1, -5, -7, -9, -12, -14}; int k = CalculateMaxOfMin.calculateMaxOfMin(a); - assertTrue(k == -1); + assertEquals(-1, k); } } diff --git a/src/test/java/com/thealgorithms/others/StackPostfixNotationTest.java b/src/test/java/com/thealgorithms/stacks/StackPostfixNotationTest.java similarity index 90% rename from src/test/java/com/thealgorithms/others/StackPostfixNotationTest.java rename to src/test/java/com/thealgorithms/stacks/StackPostfixNotationTest.java index 9256e2bc4..4857529e4 100644 --- a/src/test/java/com/thealgorithms/others/StackPostfixNotationTest.java +++ b/src/test/java/com/thealgorithms/stacks/StackPostfixNotationTest.java @@ -1,8 +1,7 @@ -package com.thealgorithms.others; +package com.thealgorithms.stacks; import static java.util.Map.entry; -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.*; import java.util.Map; import org.junit.jupiter.api.Test;