Skip to content

Commit 4347f5b

Browse files
authored
refactor: InfixToPostfix (#5401)
1 parent 64ff9b2 commit 4347f5b

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

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

+9-7
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,15 @@
11
package com.thealgorithms.stacks;
22

33
import java.util.Stack;
4+
import java.util.regex.Matcher;
5+
import java.util.regex.Pattern;
46

57
public final class InfixToPostfix {
68
private InfixToPostfix() {
79
}
810

9-
public static void main(String[] args) throws Exception {
10-
assert "32+".equals(infix2PostFix("3+2"));
11-
assert "123++".equals(infix2PostFix("1+(2+3)"));
12-
assert "34+5*6-".equals(infix2PostFix("(3+4)*5-6"));
13-
}
14-
1511
public static String infix2PostFix(String infixExpression) throws Exception {
16-
if (!BalancedBrackets.isBalanced(infixExpression)) {
12+
if (!BalancedBrackets.isBalanced(filterBrackets(infixExpression))) {
1713
throw new Exception("invalid expression");
1814
}
1915
StringBuilder output = new StringBuilder();
@@ -55,4 +51,10 @@ private static int precedence(char operator) {
5551
return -1;
5652
}
5753
}
54+
55+
private static String filterBrackets(String input) {
56+
Pattern pattern = Pattern.compile("[^(){}\\[\\]<>]");
57+
Matcher matcher = pattern.matcher(input);
58+
return matcher.replaceAll("");
59+
}
5860
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.thealgorithms.stacks;
2+
3+
import static org.junit.jupiter.api.Assertions.assertEquals;
4+
import static org.junit.jupiter.api.Assertions.assertThrows;
5+
6+
import java.util.stream.Stream;
7+
import org.junit.jupiter.params.ParameterizedTest;
8+
import org.junit.jupiter.params.provider.Arguments;
9+
import org.junit.jupiter.params.provider.MethodSource;
10+
11+
class InfixToPostfixTest {
12+
13+
@ParameterizedTest
14+
@MethodSource("provideValidExpressions")
15+
void testValidExpressions(String infix, String expectedPostfix) throws Exception {
16+
assertEquals(expectedPostfix, InfixToPostfix.infix2PostFix(infix));
17+
}
18+
19+
private static Stream<Arguments> provideValidExpressions() {
20+
return Stream.of(Arguments.of("3+2", "32+"), Arguments.of("1+(2+3)", "123++"), Arguments.of("(3+4)*5-6", "34+5*6-"));
21+
}
22+
23+
@ParameterizedTest
24+
@MethodSource("provideInvalidExpressions")
25+
void testInvalidExpressions(String infix, String expectedMessage) {
26+
Exception exception = assertThrows(Exception.class, () -> InfixToPostfix.infix2PostFix(infix));
27+
assertEquals(expectedMessage, exception.getMessage());
28+
}
29+
30+
private static Stream<Arguments> provideInvalidExpressions() {
31+
return Stream.of(Arguments.of("((a+b)*c-d", "invalid expression"));
32+
}
33+
}

0 commit comments

Comments
 (0)