Skip to content

Commit ed0aeb6

Browse files
morpheus-ossmorpheus-oss
committed
Updated for code coverage
Updated for code coverage with testcase fixes
1 parent 2a7719a commit ed0aeb6

4 files changed

Lines changed: 170 additions & 15 deletions

File tree

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
.idea/codeStyles/**
22
.idea/**
33

4-
Leetcode/target/**
4+
Leetcode/target/**
5+
6+
Leetcode/target/classes/**

‎Leetcode/src/main/java/dev/leetcode/StringProblems.java‎

Lines changed: 86 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1765,9 +1765,73 @@ int myAtoi(String s) {
17651765
* It is guaranteed for each appearance of the character '*', there will be a previous valid
17661766
* character to match.
17671767
*/
1768-
boolean isMatch(String s, String p) {
1768+
/*
1769+
enum Result {
1770+
TRUE, FALSE
1771+
}
1772+
1773+
Result[][] regexMemo;
1774+
public boolean isMatch(String s, String p) {
1775+
regexMemo = new Result[s.length()+1][p.length()+1];
1776+
return regexMatch(0, 0, s, p);
1777+
}
1778+
1779+
private boolean regexMatch(int itext, int ipattern, String text, String pattern) {
1780+
if (regexMemo[itext][ipattern] != null) {
1781+
return regexMemo[itext][ipattern] == Result.TRUE;
1782+
}
1783+
1784+
boolean ans = false;
1785+
if (ipattern == pattern.length()) {
1786+
ans = itext == text.length();
1787+
} else {
1788+
boolean firstMatch = (itext < text.length() &&
1789+
(pattern.charAt(ipattern) == text.charAt(itext) ||
1790+
pattern.charAt(ipattern) == '.' ));
1791+
if (ipattern+1 < pattern.length() && pattern.charAt(ipattern+1) == '*') {
1792+
ans = regexMatch(itext, ipattern+2, text, pattern) ||
1793+
(firstMatch && regexMatch(itext+1, ipattern, text, pattern));
1794+
} else {
1795+
ans = regexMatch(itext+1, ipattern, text, pattern);
1796+
}
1797+
}
1798+
1799+
regexMemo[itext][ipattern] = ans ? Result.TRUE : Result.FALSE;
1800+
return ans;
1801+
}
1802+
*/
1803+
enum Result {
1804+
TRUE, FALSE
1805+
}
1806+
1807+
Result[][] regexMemo;
1808+
1809+
public boolean isMatch(String text, String pattern) {
1810+
regexMemo = new Result[text.length() + 1][pattern.length() + 1];
1811+
return regexMatch(0, 0, text, pattern);
1812+
}
17691813

1770-
return false;
1814+
public boolean regexMatch(int itxt, int ipat, String text, String pattern) {
1815+
if (regexMemo[itxt][ipat] != null) {
1816+
return regexMemo[itxt][ipat] == Result.TRUE;
1817+
}
1818+
boolean ans;
1819+
if (ipat == pattern.length()){
1820+
ans = itxt == text.length();
1821+
} else{
1822+
boolean first_match = (itxt < text.length() &&
1823+
(pattern.charAt(ipat) == text.charAt(itxt) ||
1824+
pattern.charAt(ipat) == '.'));
1825+
1826+
if (ipat + 1 < pattern.length() && pattern.charAt(ipat+1) == '*'){
1827+
ans = (regexMatch(itxt, ipat+2, text, pattern) ||
1828+
first_match && regexMatch(itxt+1, ipat, text, pattern));
1829+
} else {
1830+
ans = first_match && regexMatch(itxt+1, ipat+1, text, pattern);
1831+
}
1832+
}
1833+
regexMemo[itxt][ipat] = ans ? Result.TRUE : Result.FALSE;
1834+
return ans;
17711835
}
17721836

17731837
/**
@@ -1821,19 +1885,21 @@ String addBinary(String a, String b) {
18211885
StringBuilder builder = new StringBuilder();
18221886
int carryOver = 0;
18231887
int maxLength = Math.max(a.length(), b.length());
1888+
// To keep both the strings' length same
18241889
a = "0".repeat(maxLength - a.length()).concat(a);
18251890
b = "0".repeat(maxLength - b.length()).concat(b);
18261891

1827-
for (int i = maxLength - 1; i >= 0; i++) {
1828-
int chA = a.charAt(i) - '0';
1829-
int chB = b.charAt(i) - '0';
1830-
if ((chA+chB+carryOver) > 1) {
1831-
carryOver = 1;
1832-
builder.append('0');
1833-
} else {
1834-
builder.append('0' + (chA+chB+carryOver));
1835-
}
1892+
for (int i = maxLength - 1; i >= 0; i--) {
1893+
1894+
int sum = carryOver;
1895+
1896+
sum += a.charAt(i) - '0';
1897+
sum += b.charAt(i) - '0';
1898+
1899+
builder.append(sum % 2);
1900+
carryOver = sum / 2;
18361901
}
1902+
if (carryOver > 0) builder.append(carryOver);
18371903

18381904
return builder.reverse().toString();
18391905
}
@@ -1877,6 +1943,10 @@ List<List<String>> groupAnagrams(String[] strs) {
18771943
map.get(sortedString).add(word);
18781944
}
18791945

1946+
if (map.isEmpty()) {
1947+
return List.of(List.of());
1948+
}
1949+
18801950
return new ArrayList<>(map.values());
18811951
}
18821952

@@ -1969,5 +2039,9 @@ int titleToNumber(String columnTitle) {
19692039
return titleNum;
19702040
}
19712041

1972-
2042+
public static void main(String[] args) {
2043+
StringProblems problems = new StringProblems();
2044+
List<List<String>> group = problems.groupAnagrams(new String[]{"eat","tea","tan","ate","nat","bat"});
2045+
System.out.println(group);
2046+
}
19732047
}

‎Leetcode/src/test/java/dev/leetcode/StringProblemsTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,11 @@ public void testAddBinary() {
179179
public void testGroupAnagrams() {
180180
List<Pair<List<List<String>>, List<String>>> tests = List.of(
181181
Pair.with(
182-
List.of(List.of("bat"), List.of("nat", "tan"), List.of("ate", "eat", "tea")),
182+
List.of(List.of("eat", "tea", "ate"), List.of("bat"), List.of("tan", "nat")),
183183
List.of("eat","tea","tan","ate","nat","bat")
184184
),
185185
Pair.with(
186-
List.of(List.of("")), List.of()
186+
List.of(List.of()), List.of()
187187
),
188188
Pair.with(
189189
List.of(List.of("a")),

‎pom.xml‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<maven.compiler.source>21</maven.compiler.source>
1717
<maven.compiler.target>21</maven.compiler.target>
1818
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
19+
1920
</properties>
2021

2122
<dependencies>
@@ -37,5 +38,83 @@
3738
</dependency>
3839
</dependencies>
3940

41+
<build>
42+
<plugins>
43+
<plugin>
44+
<groupId>org.apache.maven.plugins</groupId>
45+
<artifactId>maven-compiler-plugin</artifactId>
46+
<version>3.10.1</version>
47+
<configuration>
48+
<source>${maven.compiler.source}</source>
49+
<target>${maven.compiler.target}</target>
50+
<encoding>${project.build.sourceEncoding}</encoding>
51+
</configuration>
52+
</plugin>
53+
54+
<plugin>
55+
<groupId>org.jacoco</groupId>
56+
<artifactId>jacoco-maven-plugin</artifactId>
57+
<version>0.8.7</version>
58+
<executions>
59+
<execution>
60+
<id>default-prepare-agent</id>
61+
<goals>
62+
<goal>prepare-agent</goal>
63+
</goals>
64+
<configuration>
65+
<destFile>${project.build.directory}/coverage-reports/jacoco.exec</destFile>
66+
<propertyName>surefireArgLine</propertyName>
67+
</configuration>
68+
</execution>
69+
<execution>
70+
<id>default-report</id>
71+
<phase>test</phase>
72+
<goals>
73+
<goal>report</goal>
74+
</goals>
75+
<configuration>
76+
<dataFile>${project.build.directory}/coverage-reports/jacoco.exec</dataFile>
77+
<outputDirectory>${project.reporting.outputDirectory}/jacoco</outputDirectory>
78+
</configuration>
79+
</execution>
80+
<execution>
81+
<id>default-check</id>
82+
<goals>
83+
<goal>check</goal>
84+
</goals>
85+
<configuration>
86+
<rules>
87+
<rule>
88+
<element>BUNDLE</element>
89+
<limits>
90+
<limit>
91+
<counter>COMPLEXITY</counter>
92+
<value>COVEREDRATIO</value>
93+
<minimum>0.70</minimum>
94+
</limit>
95+
</limits>
96+
</rule>
97+
</rules>
98+
</configuration>
99+
</execution>
100+
</executions>
101+
</plugin>
102+
103+
<plugin>
104+
<groupId>org.apache.maven.plugins</groupId>
105+
<artifactId>maven-surefire-plugin</artifactId>
106+
<version>2.22.2</version>
107+
<configuration>
108+
<testFailureIgnore>true</testFailureIgnore>
109+
<forkCount>2</forkCount>
110+
<reuseForks>true</reuseForks>
111+
<!--suppress UnresolvedMavenProperty -->
112+
<argLine>${surefireArgLine}</argLine>
113+
</configuration>
114+
</plugin>
115+
116+
</plugins>
117+
</build>
118+
40119

41120
</project>

0 commit comments

Comments
 (0)