Merge branch 'master' into evaluate_prefix_new_algo

Author: alxkm

DIRECTORY.md

@@ -49,6 +49,7 @@
             * [SingleElement](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/SingleElement.java)
             * [SwapAdjacentBits](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/SwapAdjacentBits.java)
             * [TwosComplement](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/TwosComplement.java)
+            * [Xs3Conversion](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/bitmanipulation/Xs3Conversion.java)
           * ciphers
             * a5
               * [A5Cipher](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/ciphers/a5/A5Cipher.java)
@@ -597,6 +598,7 @@
             * [MaximumMinimumWindow](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/stacks/MaximumMinimumWindow.java)
             * [NextGreaterElement](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/stacks/NextGreaterElement.java)
             * [NextSmallerElement](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/stacks/NextSmallerElement.java)
+            * [PostfixEvaluator](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/stacks/PostfixEvaluator.java)
             * [PostfixToInfix](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/stacks/PostfixToInfix.java)
             * [PrefixEvaluator](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/stacks/PrefixEvaluator.java)
             * [PrefixToInfix](https://github.com/TheAlgorithms/Java/blob/master/src/main/java/com/thealgorithms/stacks/PrefixToInfix.java)
@@ -687,6 +689,7 @@
             * [SingleElementTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/SingleElementTest.java)
             * [SwapAdjacentBitsTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/SwapAdjacentBitsTest.java)
             * [TwosComplementTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/TwosComplementTest.java)
+            * [Xs3ConversionTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/bitmanipulation/Xs3ConversionTest.java)
           * ciphers
             * a5
               * [A5CipherTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/ciphers/a5/A5CipherTest.java)
@@ -1023,6 +1026,7 @@
             * [SkylineProblemTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/SkylineProblemTest.java)
             * [SudokuTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/SudokuTest.java)
             * [TestPrintMatrixInSpiralOrder](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/TestPrintMatrixInSpiralOrder.java)
+            * [TowerOfHanoiTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/TowerOfHanoiTest.java)
             * [TwoPointersTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/TwoPointersTest.java)
             * [WorstFitCPUTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/others/WorstFitCPUTest.java)
           * Recursion
@@ -1126,6 +1130,7 @@
             * [LargestRectangleTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/stacks/LargestRectangleTest.java)
             * [NextGreaterElementTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/stacks/NextGreaterElementTest.java)
             * [NextSmallerElementTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/stacks/NextSmallerElementTest.java)
+            * [PostfixEvaluatorTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/stacks/PostfixEvaluatorTest.java)
             * [PostfixToInfixTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/stacks/PostfixToInfixTest.java)
             * [PrefixEvaluatorTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/stacks/PrefixEvaluatorTest.java)
             * [PrefixToInfixTest](https://github.com/TheAlgorithms/Java/blob/master/src/test/java/com/thealgorithms/stacks/PrefixToInfixTest.java)

src/main/java/com/thealgorithms/bitmanipulation/Xs3Conversion.java

@@ -0,0 +1,58 @@
+package com.thealgorithms.bitmanipulation;
+
+/**
+ * This class provides methods to convert between XS-3 (Excess-3) and binary.
+ *
+ * Excess-3, also called XS-3, is a binary-coded decimal (BCD) code in which each decimal digit is represented by its corresponding 4-bit binary value plus 3.
+ *
+ * For more information, refer to the
+ * <a href="https://en.wikipedia.org/wiki/Excess-3">Excess-3</a> Wikipedia page.
+ *
+ * <b>Example usage:</b>
+ * <pre>
+ * int binary = Xs3Conversion.xs3ToBinary(0x4567);
+ * System.out.println("XS-3 0x4567 to binary: " + binary); // Output: 1234
+ *
+ * int xs3 = Xs3Conversion.binaryToXs3(1234);
+ * System.out.println("Binary 1234 to XS-3: " + Integer.toHexString(xs3)); // Output: 0x4567
+ * </pre>
+ */
+public final class Xs3Conversion {
+    private Xs3Conversion() {
+    }
+    /**
+     * Converts an XS-3 (Excess-3) number to binary.
+     *
+     * @param xs3 The XS-3 number.
+     * @return The corresponding binary number.
+     */
+    public static int xs3ToBinary(int xs3) {
+        int binary = 0;
+        int multiplier = 1;
+        while (xs3 > 0) {
+            int digit = (xs3 & 0xF) - 3; // Extract the last 4 bits (one XS-3 digit) and subtract 3
+            binary += digit * multiplier;
+            multiplier *= 10;
+            xs3 >>= 4; // Shift right by 4 bits to process the next XS-3 digit
+        }
+        return binary;
+    }
+
+    /**
+     * Converts a binary number to XS-3 (Excess-3).
+     *
+     * @param binary The binary number.
+     * @return The corresponding XS-3 number.
+     */
+    public static int binaryToXs3(int binary) {
+        int xs3 = 0;
+        int shift = 0;
+        while (binary > 0) {
+            int digit = (binary % 10) + 3; // Extract the last decimal digit and add 3
+            xs3 |= (digit << (shift * 4)); // Shift the digit to the correct XS-3 position
+            binary /= 10; // Remove the last decimal digit
+            shift++;
+        }
+        return xs3;
+    }
+}

src/main/java/com/thealgorithms/others/TowerOfHanoi.java

@@ -1,29 +1,65 @@
 package com.thealgorithms.others;
 
-import java.util.Scanner;
+import java.util.List;
 
+/**
+ * The {@code TowerOfHanoi} class provides a recursive solution to the Tower of Hanoi puzzle.
+ * This puzzle involves moving a set of discs from one pole to another, following specific rules:
+ * 1. Only one disc can be moved at a time.
+ * 2. A disc can only be placed on top of a larger disc.
+ * 3. All discs must start on one pole and end on another.
+ *
+ * This implementation recursively calculates the steps required to solve the puzzle and stores them
+ * in a provided list.
+ *
+ * <p>
+ * For more information about the Tower of Hanoi, see
+ * <a href="https://en.wikipedia.org/wiki/Tower_of_Hanoi">Tower of Hanoi on Wikipedia</a>.
+ * </p>
+ *
+ * The {@code shift} method takes the number of discs and the names of the poles,
+ * and appends the steps required to solve the puzzle to the provided list.
+ * Time Complexity: O(2^n) - Exponential time complexity due to the recursive nature of the problem.
+ * Space Complexity: O(n) - Linear space complexity due to the recursion stack.
+ * Wikipedia: https://en.wikipedia.org/wiki/Tower_of_Hanoi
+ */
 final class TowerOfHanoi {
+
     private TowerOfHanoi() {
     }
 
-    public static void shift(int n, String startPole, String intermediatePole, String endPole) {
-        // if n becomes zero the program returns thus ending the loop.
+    /**
+     * Recursively solve the Tower of Hanoi puzzle by moving discs between poles.
+     *
+     * @param n                The number of discs to move.
+     * @param startPole        The name of the start pole from which discs are moved.
+     * @param intermediatePole The name of the intermediate pole used as a temporary holding area.
+     * @param endPole          The name of the end pole to which discs are moved.
+     * @param result           A list to store the steps required to solve the puzzle.
+     *
+     *                         <p>
+     *                         This method is called recursively to move n-1 discs
+     *                         to the intermediate pole,
+     *                         then moves the nth disc to the end pole, and finally
+     *                         moves the n-1 discs from the
+     *                         intermediate pole to the end pole.
+     *                         </p>
+     *
+     *                         <p>
+     *                         Time Complexity: O(2^n) - Exponential time complexity due to the recursive nature of the problem.
+     *                         Space Complexity: O(n) - Linear space complexity due to the recursion stack.
+     *                         </p>
+     */
+    public static void shift(int n, String startPole, String intermediatePole, String endPole, List<String> result) {
         if (n != 0) {
-            // Shift function is called in recursion for swapping the n-1 disc from the startPole to
-            // the intermediatePole
-            shift(n - 1, startPole, endPole, intermediatePole);
-            System.out.format("Move %d from %s to %s%n", n, startPole, endPole); // Result Printing
-            // Shift function is called in recursion for swapping the n-1 disc from the
-            // intermediatePole to the endPole
-            shift(n - 1, intermediatePole, startPole, endPole);
-        }
-    }
+            // Move n-1 discs from startPole to intermediatePole
+            shift(n - 1, startPole, endPole, intermediatePole, result);
 
-    public static void main(String[] args) {
-        System.out.print("Enter number of discs on Pole 1: ");
-        Scanner scanner = new Scanner(System.in);
-        int numberOfDiscs = scanner.nextInt(); // input of number of discs on pole 1
-        shift(numberOfDiscs, "Pole1", "Pole2", "Pole3"); // Shift function called
-        scanner.close();
+            // Add the move of the nth disc from startPole to endPole
+            result.add(String.format("Move %d from %s to %s", n, startPole, endPole));
+
+            // Move the n-1 discs from intermediatePole to endPole
+            shift(n - 1, intermediatePole, startPole, endPole, result);
+        }
     }
 }

src/main/java/com/thealgorithms/stacks/PostfixEvaluator.java

@@ -0,0 +1,74 @@
+package com.thealgorithms.stacks;
+
+import java.util.Set;
+import java.util.Stack;
+
+/**
+ * Evaluate a postfix (Reverse Polish) expression using a stack.
+ *
+ * <p>Example: Expression "5 6 + 2 *" results in 22.
+ * <p>Applications: Used in calculators and expression evaluation in compilers.
+ *
+ * @author Hardvan
+ */
+public final class PostfixEvaluator {
+    private PostfixEvaluator() {
+    }
+
+    private static final Set<String> OPERATORS = Set.of("+", "-", "*", "/");
+
+    /**
+     * Evaluates the given postfix expression and returns the result.
+     *
+     * @param expression The postfix expression as a string with operands and operators separated by spaces.
+     * @return The result of evaluating the postfix expression.
+     * @throws IllegalArgumentException if the expression is invalid.
+     */
+    public static int evaluatePostfix(String expression) {
+        Stack<Integer> stack = new Stack<>();
+
+        for (String token : expression.split("\\s+")) {
+            if (isOperator(token)) {
+                int operand2 = stack.pop();
+                int operand1 = stack.pop();
+                stack.push(applyOperator(token, operand1, operand2));
+            } else {
+                stack.push(Integer.valueOf(token));
+            }
+        }
+
+        if (stack.size() != 1) {
+            throw new IllegalArgumentException("Invalid expression");
+        }
+
+        return stack.pop();
+    }
+
+    /**
+     * Checks if the given token is an operator.
+     *
+     * @param token The token to check.
+     * @return true if the token is an operator, false otherwise.
+     */
+    private static boolean isOperator(String token) {
+        return OPERATORS.contains(token);
+    }
+
+    /**
+     * Applies the given operator to the two operands.
+     *
+     * @param operator The operator to apply.
+     * @param a The first operand.
+     * @param b The second operand.
+     * @return The result of applying the operator to the operands.
+     */
+    private static int applyOperator(String operator, int a, int b) {
+        return switch (operator) {
+            case "+" -> a + b;
+            case "-" -> a - b;
+            case "*" -> a * b;
+            case "/" -> a / b;
+            default -> throw new IllegalArgumentException("Invalid operator");
+        };
+    }
+}

src/test/java/com/thealgorithms/bitmanipulation/Xs3ConversionTest.java

@@ -0,0 +1,65 @@
+package com.thealgorithms.bitmanipulation;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import org.junit.jupiter.api.Test;
+
+/**
+ * Unit tests for the Xs3Conversion class.
+ */
+public class Xs3ConversionTest {
+
+    /**
+     * Test the xs3ToBinary method with an XS-3 number.
+     */
+    @Test
+    public void testXs3ToBinary() {
+        int binary = Xs3Conversion.xs3ToBinary(0x4567);
+        assertEquals(1234, binary); // XS-3 0x4567 should convert to binary 1234
+    }
+
+    /**
+     * Test the binaryToXs3 method with a binary number.
+     */
+    @Test
+    public void testBinaryToXs3() {
+        int xs3 = Xs3Conversion.binaryToXs3(1234);
+        assertEquals(0x4567, xs3); // Binary 1234 should convert to XS-3 0x4567
+    }
+
+    /**
+     * Test the xs3ToBinary method with zero.
+     */
+    @Test
+    public void testXs3ToBinaryZero() {
+        int binary = Xs3Conversion.xs3ToBinary(0x0);
+        assertEquals(0, binary); // XS-3 0x0 should convert to binary 0
+    }
+
+    /**
+     * Test the binaryToXs3 method with zero.
+     */
+    @Test
+    public void testBinaryToXs3Zero() {
+        int xs3 = Xs3Conversion.binaryToXs3(0);
+        assertEquals(0x0, xs3); // Binary 0 should convert to XS-3 0x0
+    }
+
+    /**
+     * Test the xs3ToBinary method with a single digit XS-3 number.
+     */
+    @Test
+    public void testXs3ToBinarySingleDigit() {
+        int binary = Xs3Conversion.xs3ToBinary(0x5);
+        assertEquals(2, binary); // XS-3 0x5 should convert to binary 2
+    }
+
+    /**
+     * Test the binaryToXs3 method with a single digit binary number.
+     */
+    @Test
+    public void testBinaryToXs3SingleDigit() {
+        int xs3 = Xs3Conversion.binaryToXs3(2);
+        assertEquals(0x5, xs3); // Binary 2 should convert to XS-3 0x5
+    }
+}

src/test/java/com/thealgorithms/others/TowerOfHanoiTest.java

@@ -0,0 +1,50 @@
+package com.thealgorithms.others;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.jupiter.api.Test;
+
+public class TowerOfHanoiTest {
+
+    @Test
+    public void testHanoiWithOneDisc() {
+        List<String> result = new ArrayList<>();
+        TowerOfHanoi.shift(1, "Pole1", "Pole2", "Pole3", result);
+
+        // Expected output for 1 disc
+        List<String> expected = List.of("Move 1 from Pole1 to Pole3");
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void testHanoiWithTwoDiscs() {
+        List<String> result = new ArrayList<>();
+        TowerOfHanoi.shift(2, "Pole1", "Pole2", "Pole3", result);
+
+        // Expected output for 2 discs
+        List<String> expected = List.of("Move 1 from Pole1 to Pole2", "Move 2 from Pole1 to Pole3", "Move 1 from Pole2 to Pole3");
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void testHanoiWithThreeDiscs() {
+        List<String> result = new ArrayList<>();
+        TowerOfHanoi.shift(3, "Pole1", "Pole2", "Pole3", result);
+
+        // Expected output for 3 discs
+        List<String> expected = List.of("Move 1 from Pole1 to Pole3", "Move 2 from Pole1 to Pole2", "Move 1 from Pole3 to Pole2", "Move 3 from Pole1 to Pole3", "Move 1 from Pole2 to Pole1", "Move 2 from Pole2 to Pole3", "Move 1 from Pole1 to Pole3");
+        assertEquals(expected, result);
+    }
+
+    @Test
+    public void testHanoiWithZeroDiscs() {
+        List<String> result = new ArrayList<>();
+        TowerOfHanoi.shift(0, "Pole1", "Pole2", "Pole3", result);
+
+        // There should be no moves if there are 0 discs
+        assertTrue(result.isEmpty());
+    }
+}