Skip to content

Commit 6674d55

Browse files
fishercoder1534fishercoder1534
committed
refactor format
1 parent e14a598 commit 6674d55

File tree

13 files changed

+112
-43
lines changed

13 files changed

+112
-43
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
public class _100 {
1414
//recursion idea flows out naturally.
1515
public boolean isSameTree(TreeNode p, TreeNode q) {
16-
if (p == null || q == null) return p == q;
16+
if (p == null || q == null) {
17+
return p == q;
18+
}
1719
return p.val == q.val && isSameTree(p.left, q.left) && isSameTree(p.right, q.right);
1820
}
1921
}

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,19 @@ Given a binary tree, check whether it is a mirror of itself (ie, symmetric aroun
2727
public class _101 {
2828
//a very natural idea flows out using recursion. Cheers.
2929
public boolean isSymmetric(TreeNode root) {
30-
if(root == null) return true;
30+
if(root == null) {
31+
return true;
32+
}
3133
return isSymmetric(root.left, root.right);
3234
}
3335

3436
private boolean isSymmetric(TreeNode left, TreeNode right) {
35-
if(left == null || right == null) return left == right;
36-
if(left.val != right.val) return false;
37+
if(left == null || right == null) {
38+
return left == right;
39+
}
40+
if(left.val != right.val) {
41+
return false;
42+
}
3743
return isSymmetric(left.left, right.right) && isSymmetric(left.right, right.left);
3844
}
3945

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ public class _102 {
3333

3434
public List<List<Integer>> levelOrder(TreeNode root) {
3535
List<List<Integer>> result = new ArrayList<>();
36-
if (root == null) return result;
36+
if (root == null) {
37+
return result;
38+
}
3739
Queue<TreeNode> q = new LinkedList();
3840
q.offer(root);
3941
while (!q.isEmpty()) {
@@ -42,8 +44,12 @@ public List<List<Integer>> levelOrder(TreeNode root) {
4244
for (int i = 0; i < qSize; i++) {
4345
TreeNode curr = q.poll();
4446
thisLevel.add(curr.val);
45-
if (curr.left != null) q.offer(curr.left);
46-
if (curr.right != null) q.offer(curr.right);
47+
if (curr.left != null) {
48+
q.offer(curr.left);
49+
}
50+
if (curr.right != null) {
51+
q.offer(curr.right);
52+
}
4753
}
4854
result.add(thisLevel);
4955
}

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ public class _87 {
4444

4545
/**credit: https://discuss.leetcode.com/topic/19158/accepted-java-solution*/
4646
public boolean isScramble(String s1, String s2) {
47-
if (s1.equals(s2)) return true;
47+
if (s1.equals(s2)) {
48+
return true;
49+
}
4850

4951
int[] letters = new int[26];
5052
for (int i = 0; i < s1.length(); i++) {
@@ -53,12 +55,18 @@ public boolean isScramble(String s1, String s2) {
5355
}
5456

5557
for (int i : letters) {
56-
if (i != 0) return false;
58+
if (i != 0) {
59+
return false;
60+
}
5761
}
5862

5963
for (int i = 1; i < s1.length(); i++) {
60-
if (isScramble(s1.substring(0, i), s2.substring(0, i)) && isScramble(s1.substring(i), s2.substring(i))) return true;
61-
if (isScramble(s1.substring(0, i), s2.substring(s2.length()-i)) && isScramble(s1.substring(i), s2.substring(0, s2.length()-i))) return true;
64+
if (isScramble(s1.substring(0, i), s2.substring(0, i)) && isScramble(s1.substring(i), s2.substring(i))) {
65+
return true;
66+
}
67+
if (isScramble(s1.substring(0, i), s2.substring(s2.length()-i)) && isScramble(s1.substring(i), s2.substring(0, s2.length()-i))) {
68+
return true;
69+
}
6270
}
6371

6472
return false;

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

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,23 @@ public static void merge_O1_space(int[] nums1, int m, int[] nums2, int n) {
1414
int j = n-1;
1515
int k = m+n-1;
1616
while (i >= 0 && j >= 0) {
17-
if (nums1[i] > nums2[j]) nums1[k--] = nums1[i--];
18-
else nums1[k--] = nums2[j--];
17+
if (nums1[i] > nums2[j]) {
18+
nums1[k--] = nums1[i--];
19+
} else {
20+
nums1[k--] = nums2[j--];
21+
}
22+
}
23+
while (j >= 0) {
24+
nums1[k--] = nums2[j--];
1925
}
20-
while (j >= 0) nums1[k--] = nums2[j--];
2126
}
2227

2328
/**I used O(m) extra space to create a temp array, but this could be optimized.*/
2429
public static void merge(int[] nums1, int m, int[] nums2, int n) {
2530
int[] temp = new int[m];
26-
for(int i = 0; i < m; i++) temp[i] = nums1[i];
31+
for(int i = 0; i < m; i++) {
32+
temp[i] = nums1[i];
33+
}
2734
for(int i = 0, j = 0, k = 0; i < m || j < n;){
2835
if(i == m){
2936
for(; j < n;){

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,12 @@ public class _9 {
1414

1515
/**Purely my original solution: just reverse the entire number and compare with itself, return if they two are equal or not.*/
1616
public boolean isPalindrome(int x) {
17-
if(x == 0) return true;
18-
if(x < 0) return false;
17+
if(x == 0) {
18+
return true;
19+
}
20+
if(x < 0) {
21+
return false;
22+
}
1923
int rev = 0, tmp = x;
2024
while(tmp != 0){
2125
rev *= 10;

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ public static List<List<Integer>> subsetsWithDup(int[] nums) {
2525
List<List<Integer>> result = new ArrayList();
2626
List<Integer> empty = new ArrayList();
2727
result.add(empty);
28-
if (nums == null) return result;
28+
if (nums == null) {
29+
return result;
30+
}
2931
Arrays.sort(nums);
3032
for (int i = 0; i < nums.length; i++) {
3133
Set<List<Integer>> temp = new HashSet();
@@ -55,7 +57,9 @@ public List<List<Integer>> subsetsWithDup(int[] nums) {
5557
void backtrack(int[] nums, int start, List<Integer> curr, List<List<Integer>> result) {
5658
result.add(new ArrayList(curr));
5759
for (int i = start; i < nums.length; i++) {
58-
if (i > start && nums[i] == nums[i - 1]) continue;
60+
if (i > start && nums[i] == nums[i - 1]) {
61+
continue;
62+
}
5963
curr.add(nums[i]);
6064
backtrack(nums, i + 1, curr, result);
6165
curr.remove(curr.size() - 1);

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

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,21 @@ public class _91 {
2424
* In the end, dp[n] will be the end result.*/
2525

2626
public static int numDecodings_solution2(String s) {
27-
if(s == null || s.length() == 0) return 0;
27+
if(s == null || s.length() == 0) {
28+
return 0;
29+
}
2830
int[] dp = new int[s.length()+1];
2931
dp[0] = 1;
3032
dp[1] = (s.charAt(0) != '0') ? 1 : 0;
3133
for(int i = 2; i <= s.length(); i++){
3234
int first = Integer.valueOf(s.substring(i-1,i));
3335
int second = Integer.valueOf(s.substring(i-2, i));
34-
if(first > 0 && first <= 9) dp[i] += dp[i-1];
35-
if(second >= 10 && second <= 26) dp[i] += dp[i-2];
36+
if(first > 0 && first <= 9) {
37+
dp[i] += dp[i-1];
38+
}
39+
if(second >= 10 && second <= 26) {
40+
dp[i] += dp[i-2];
41+
}
3642
}
3743
return dp[s.length()];
3844
}
@@ -44,7 +50,9 @@ public static void main(String...args){
4450
/**My original accepted yet lengthy solution.*/
4551
public static int numDecodings_solution1(String s) {
4652

47-
if(s == null || s.length() == 0) return 0;
53+
if(s == null || s.length() == 0) {
54+
return 0;
55+
}
4856
Set<String> validStrings = new HashSet();
4957
validStrings.add("1");
5058
validStrings.add("2");
@@ -75,8 +83,11 @@ public static int numDecodings_solution1(String s) {
7583

7684
int n = s.length();
7785
int[] dp = new int[n];
78-
if(validStrings.contains(s.substring(0,1))) dp[0] = 1;
79-
else dp[0] = 0;
86+
if(validStrings.contains(s.substring(0,1))) {
87+
dp[0] = 1;
88+
} else {
89+
dp[0] = 0;
90+
}
8091

8192
for(int i = 1; i < n; i++){
8293
if(validStrings.contains(s.substring(i,i+1)) && validStrings.contains(s.substring(i-1,i+1))) {
@@ -88,13 +99,15 @@ public static int numDecodings_solution1(String s) {
8899
} else if(!validStrings.contains(s.substring(i,i+1)) && !validStrings.contains(s.substring(i-1,i+1))){
89100
return 0;
90101
} else if(!validStrings.contains(s.substring(i,i+1)) && validStrings.contains(s.substring(i-1,i+1))){
91-
if(i > 1) dp[i] = dp[i-2];
92-
else dp[i] = dp[i-1];
93-
} else dp[i] = dp[i-1];
102+
if(i > 1) {
103+
dp[i] = dp[i-2];
104+
} else {
105+
dp[i] = dp[i-1];
106+
}
107+
} else {
108+
dp[i] = dp[i - 1];
109+
}
94110
}
95-
96111
return dp[n-1];
97-
98112
}
99-
100113
}

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,9 @@ public ListNode reverseBetween(ListNode head, int m, int n) {
7575
nCnt++;
7676
}
7777

78-
if (nCnt > n)
78+
if (nCnt > n) {
7979
nCnt--;
80+
}
8081
// append next to the tail of the reversed part
8182
ListNode reversedPart = newRevHead;
8283
if (reversedPart != null) {
@@ -88,10 +89,11 @@ public ListNode reverseBetween(ListNode head, int m, int n) {
8889
}
8990

9091
// append the reversed part head to the node at position m-1
91-
if (node_prior_to_m != null)
92+
if (node_prior_to_m != null) {
9293
node_prior_to_m.next = newRevHead;
93-
else
94+
} else {
9495
pre.next = newRevHead;
96+
}
9597

9698
return pre.next;
9799
}

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,18 @@ public class _93 {
1717

1818
public List<String> restoreIpAddresses(String s) {
1919
List<String> allValidIpAddresses = new ArrayList<>();
20-
if (s == null || s.length() > 12 || s.length() < 4) return allValidIpAddresses;
20+
if (s == null || s.length() > 12 || s.length() < 4) {
21+
return allValidIpAddresses;
22+
}
2123
backtracking(s, new ArrayList<>(), allValidIpAddresses, 0);
2224
return allValidIpAddresses;
2325
}
2426

2527
private void backtracking(String s, ArrayList<String> bytes, List<String> result, int pos) {
2628
if (bytes.size() == 4) {
27-
if (pos != s.length()) return;
29+
if (pos != s.length()) {
30+
return;
31+
}
2832
StringBuilder stringBuilder = new StringBuilder();
2933
for (int i = 0; i < 4; i++) {
3034
stringBuilder.append(bytes.get(i));
@@ -37,15 +41,19 @@ private void backtracking(String s, ArrayList<String> bytes, List<String> result
3741

3842
for (int i = pos; i < pos+4 && i < s.length(); i++) {
3943
String oneByte = s.substring(pos, i+1);
40-
if (!isValid(oneByte)) continue;
44+
if (!isValid(oneByte)) {
45+
continue;
46+
}
4147
bytes.add(oneByte);
4248
backtracking(s, bytes, result, i+1);
4349
bytes.remove(bytes.size()-1);
4450
}
4551
}
4652

4753
private boolean isValid(String oneByte) {
48-
if (oneByte.charAt(0) == '0') return oneByte.equals("0");
54+
if (oneByte.charAt(0) == '0') {
55+
return oneByte.equals("0");
56+
}
4957
int num = Integer.valueOf(oneByte);
5058
return (num >= 0 && num < 256);
5159
}

0 commit comments

Comments
 (0)