Skip to content

Commit 36b74bb

Browse files
fishercoder1534fishercoder1534
committed
refactor for format
1 parent c381d65 commit 36b74bb

File tree

17 files changed

+131
-51
lines changed

17 files changed

+131
-51
lines changed

‎src/main/java/com/fishercoder/solutions/_28.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77
public class _28 {
88
/**You could use substring as follows, or use two pointers to go through the haystack, if substring API call is not allowed.*/
99
public static int strStr(String haystack, String needle) {
10-
if (haystack == null || needle == null || haystack.length() < needle.length()) return -1;
10+
if (haystack == null || needle == null || haystack.length() < needle.length()) {
11+
return -1;
12+
}
1113

1214
for (int i = 0; i <= haystack.length() - needle.length(); i++) {
13-
if (haystack.substring(i, i + needle.length()).equals(needle)) return i;
15+
if (haystack.substring(i, i + needle.length()).equals(needle)) {
16+
return i;
17+
}
1418
}
1519
return -1;
1620
}

‎src/main/java/com/fishercoder/solutions/_280.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
public class _280 {
66
public void wiggleSort(int[] nums) {
77
for (int i = 1; i < nums.length; i++) {
8-
if ((i % 2 == 0 && nums[i] > nums[i - 1]) || (i % 2 == 1 && nums[i] < nums[i - 1])) swap(nums, i);
8+
if ((i % 2 == 0 && nums[i] > nums[i - 1]) || (i % 2 == 1 && nums[i] < nums[i - 1])) {
9+
swap(nums, i);
10+
}
911
}
1012
}
1113

‎src/main/java/com/fishercoder/solutions/_282.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,15 @@ public List<String> addOperators(String num, int target) {
2525

2626
private void dfs(List<String> res, StringBuilder sb, String num, int pos, int target, long prev, long multi) {
2727
if (pos == num.length()) {
28-
if (target == prev) res.add(sb.toString());
28+
if (target == prev) {
29+
res.add(sb.toString());
30+
}
2931
return;
3032
}
3133
for (int i = pos; i < num.length(); i++) {
32-
if (num.charAt(pos) == '0' && i != pos) break;
34+
if (num.charAt(pos) == '0' && i != pos) {
35+
break;
36+
}
3337
long curr = Long.parseLong(num.substring(pos, i + 1));
3438
int len = sb.length();
3539
if (pos == 0) {

‎src/main/java/com/fishercoder/solutions/_283.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,9 @@ public void moveZeroes(int[] nums) {
4848
while (j < nums.length && nums[j] == 0) {
4949
j++;
5050
}
51-
if (j >= nums.length) return;
52-
else {
51+
if (j >= nums.length) {
52+
return;
53+
} else {
5354
int temp = nums[j];
5455
nums[j] = nums[i];
5556
nums[i] = temp;

‎src/main/java/com/fishercoder/solutions/_286.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,9 @@ class BFSSolutionWithoutQueue {
3030
int[] dirs = new int[]{0, 1, 0, -1, 0};
3131

3232
public void wallsAndGates(int[][] rooms) {
33-
if (rooms == null || rooms.length == 0 || rooms[0].length == 0) return;
33+
if (rooms == null || rooms.length == 0 || rooms[0].length == 0) {
34+
return;
35+
}
3436
int m = rooms.length;
3537
int n = rooms[0].length;
3638
for (int i = 0; i < m; i++) {
@@ -61,13 +63,17 @@ class BFSSolutionWithAQueue {
6163
int[] dirs = new int[]{0, 1, 0, -1, 0};
6264

6365
public void wallsAndGates(int[][] rooms) {
64-
if (rooms == null || rooms.length == 0 || rooms[0].length == 0) return;
66+
if (rooms == null || rooms.length == 0 || rooms[0].length == 0) {
67+
return;
68+
}
6569
int m = rooms.length;
6670
int n = rooms[0].length;
6771
Queue<int[]> queue = new LinkedList();
6872
for (int i = 0; i < m; i++) {
6973
for (int j = 0; j < n; j++) {
70-
if (rooms[i][j] == 0) queue.offer(new int[]{i, j});
74+
if (rooms[i][j] == 0) {
75+
queue.offer(new int[]{i, j});
76+
}
7177
}
7278
}
7379

‎src/main/java/com/fishercoder/solutions/_287.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,17 @@ public int findDuplicate(int[] nums) {
3838
slow = nums[slow];
3939
fast = nums[nums[fast]];
4040

41-
if (slow == fast) break;
41+
if (slow == fast) {
42+
break;
43+
}
4244
}
4345

4446
while (true) {
4547
slow = nums[slow];
4648
finder = nums[finder];
47-
if (slow == finder) return slow;
49+
if (slow == finder) {
50+
return slow;
51+
}
4852
}
4953
}
5054
}

‎src/main/java/com/fishercoder/solutions/_288.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ public ValidWordAbbrSolution1(String[] dictionary) {
5656

5757
public boolean isUnique(String word) {
5858
String key = word.length() <= 2 ? word : (word.charAt(0) + String.valueOf(word.length() - 2) + word.charAt(word.length() - 1));
59-
if (!dict.containsKey(key)) return true;
60-
else return dict.get(key) != "" && dict.get(key).equals(word);
59+
if (!dict.containsKey(key)) {
60+
return true;
61+
} else {
62+
return dict.get(key) != "" && dict.get(key).equals(word);
63+
}
6164
}
6265
}
6366

@@ -83,10 +86,13 @@ public ValidWordAbbrSolution2(String[] dictionary) {
8386

8487
public boolean isUnique(String word) {
8588
String key = word.length() <= 2 ? word : (word.charAt(0) + String.valueOf(word.length() - 2) + word.charAt(word.length() - 1));
86-
if (!dict.containsKey(key)) return true;
87-
else {
89+
if (!dict.containsKey(key)) {
90+
return true;
91+
} else {
8892
Set<String> set = dict.get(key);
89-
if (set.size() != 1) return false;
93+
if (set.size() != 1) {
94+
return false;
95+
}
9096
Iterator<String> it = set.iterator();
9197
return it.next().equals(word);
9298
}

‎src/main/java/com/fishercoder/solutions/_289.java‎

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,30 @@ public void gameOfLife(int[][] board) {
3434
int liveCellsCount = 0;
3535
//count all its live cells
3636

37-
if (j + 1 < width && board[i][j + 1] == 1) liveCellsCount++;//right cell
38-
if (j - 1 >= 0 && board[i][j - 1] == 1) liveCellsCount++;//left cell
39-
if (i + 1 < height && board[i + 1][j] == 1) liveCellsCount++;//down cell
40-
if (i - 1 >= 0 && board[i - 1][j] == 1) liveCellsCount++;//up cell
41-
if (i - 1 >= 0 && j - 1 >= 0 && board[i - 1][j - 1] == 1) liveCellsCount++;//up left cell
42-
if (i - 1 >= 0 && j + 1 < width && board[i - 1][j + 1] == 1) liveCellsCount++;//up right cell
43-
if (i + 1 < height && j - 1 >= 0 && board[i + 1][j - 1] == 1) liveCellsCount++;//down left cell
44-
if (i + 1 < height && j + 1 < width && board[i + 1][j + 1] == 1) liveCellsCount++;//down right cell
37+
if (j + 1 < width && board[i][j + 1] == 1) {
38+
liveCellsCount++;//right cell
39+
}
40+
if (j - 1 >= 0 && board[i][j - 1] == 1) {
41+
liveCellsCount++;//left cell
42+
}
43+
if (i + 1 < height && board[i + 1][j] == 1) {
44+
liveCellsCount++;//down cell
45+
}
46+
if (i - 1 >= 0 && board[i - 1][j] == 1) {
47+
liveCellsCount++;//up cell
48+
}
49+
if (i - 1 >= 0 && j - 1 >= 0 && board[i - 1][j - 1] == 1) {
50+
liveCellsCount++;//up left cell
51+
}
52+
if (i - 1 >= 0 && j + 1 < width && board[i - 1][j + 1] == 1) {
53+
liveCellsCount++;//up right cell
54+
}
55+
if (i + 1 < height && j - 1 >= 0 && board[i + 1][j - 1] == 1) {
56+
liveCellsCount++;//down left cell
57+
}
58+
if (i + 1 < height && j + 1 < width && board[i + 1][j + 1] == 1) {
59+
liveCellsCount++;//down right cell
60+
}
4561

4662
if (board[i][j] == 1) {
4763
if (liveCellsCount > 3 || liveCellsCount < 2) {

‎src/main/java/com/fishercoder/solutions/_29.java‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,16 @@
88
public class _29 {
99

1010
public int divide(int dividend, int divisor) {
11-
if (divisor == 0 || (dividend == Integer.MIN_VALUE && divisor == -1))
11+
if (divisor == 0 || (dividend == Integer.MIN_VALUE && divisor == -1)) {
1212
return Integer.MAX_VALUE;
13+
}
1314
if (dividend != Integer.MIN_VALUE
14-
&& Math.abs(dividend) < Math.abs(divisor))
15+
&& Math.abs(dividend) < Math.abs(divisor)) {
1516
return 0;
16-
if (divisor == Integer.MIN_VALUE)
17+
}
18+
if (divisor == Integer.MIN_VALUE) {
1719
return (dividend == Integer.MIN_VALUE) ? 1 : 0;
20+
}
1821
//
1922
boolean flag = (dividend < 0) ^ (divisor < 0);
2023
dividend = -Math.abs(dividend);
@@ -31,8 +34,9 @@ public int divide(int dividend, int divisor) {
3134
}
3235
int result = 0;
3336
int index = 1;
34-
while (num[index] < 0)
37+
while (num[index] < 0) {
3538
++index;
39+
}
3640
index -= 1;
3741
while (dividend <= divisor) {
3842
while (dividend <= num[index]) {

‎src/main/java/com/fishercoder/solutions/_290.java‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,18 @@ public boolean wordPattern(String pattern, String str) {
2121
String[] words = str.split(" ");
2222
char[] patterns = pattern.toCharArray();
2323
Map<Character, String> map = new HashMap();
24-
if (patterns.length != words.length) return false;
24+
if (patterns.length != words.length) {
25+
return false;
26+
}
2527
for (int i = 0; i < patterns.length; i++) {
2628
if (map.containsKey(patterns[i])) {
27-
if (!map.get(patterns[i]).equals(words[i])) return false;
29+
if (!map.get(patterns[i]).equals(words[i])) {
30+
return false;
31+
}
2832
} else {
29-
if (map.containsValue(words[i])) return false;//this is for this case: "abba", "dog dog dog dog"
33+
if (map.containsValue(words[i])) {
34+
return false;//this is for this case: "abba", "dog dog dog dog"
35+
}
3036
map.put(patterns[i], words[i]);
3137
}
3238
}

0 commit comments

Comments
 (0)