8000 1，完成丑数计算。 · ownermz/javaalgorithm@cc4af48 · GitHub
[go: up one dir, main page]
Skip to content {"props":{"docsUrl":"https://docs.github.com/get-started/accessibility/keyboard-shortcuts"}}

Commit cc4af48

Browse files
author
shengshijun
committed
1，完成丑数计算。
2，完成同位词判断。
1 parent 0c24da6 commit cc4af48

File tree

3 files changed

+16
-18
lines changed

3 files changed

+16
-18
lines changed

‎src/main/java/ssj/algorithm/math/MathUtil.java

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ public static <T extends Comparable<T>> T min(T... arr) {
9090

9191
T min_value = arr[0];
9292
for (T ele : arr) {
93-
if (min_value.compareTo(ele) < 0) {
93+
if (min_value.compareTo(ele) > 0) {
9494
min_value = ele;
9595
}
9696
}
@@ -201,30 +201,22 @@ public static int uglyNumber(int index) {
201201
while (cur_index < index) {
202202
ugly_numbers[cur_index] = min(ugly_numbers[multiply2_index] * 2, ugly_numbers[multiply3_index] * 3, ugly_numbers[multiply5_index] * 5);
203203

204-
System.out.println("************************");
205-
while (ugly_numbers[multiply2_index] * 2 < ugly_numbers[cur_index]) {
204+
while (ugly_numbers[multiply2_index] * 2 <= ugly_numbers[cur_index]) {
206205
multiply2_index++;
207206
}
208207

209208

210-
while (ugly_numbers[multiply3_index] * 3 < ugly_numbers[cur_index]) {
209+
while (ugly_numbers[multiply3_index] * 3 <= ugly_numbers[cur_index]) {
211210
multiply3_index++;
212211
}
213212

214-
while (ugly_numbers[multiply5_index] * 5 < ugly_numbers[cur_index]) {
213+
while (ugly_numbers[multiply5_index] * 5 <= ugly_numbers[cur_index]) {
215214
multiply5_index++;
216215
}
217216

218-
System.out.println(ugly_numbers[multiply2_index]);
219-
System.out.println(ugly_numbers[multiply3_index]);
220-
System.out.println(ugly_numbers[multiply5_index]);
221-
System.out.println();
222-
System.out.println();
223-
224217
cur_index++;
225218
}
226-
return ugly_numbers[index];
227-
219+
return ugly_numbers[index - 1];
228220
}
229221

230222
public int closestBig(int origion) {

‎src/main/java/ssj/algorithm/string/StringUntil.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,13 @@ public static boolean uniqueChar(String s) {
6565
return true;
6666
}
6767

68-
public static boolean permutation(String s1, String s2) {
68+
/**
69+
* 判断是不是变位词。
70+
* @param s1
71+
* @param s2
72+
* @return
73+
*/
74+
public static boolean isPermutation(String s1, String s2) {
6975
if (s1 == null && s2 == null) {
7076
return true;
7177
} else if (s1 == null || s2 == null) {

‎src/test/java/ssj/algorithm/string/StringUtilTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,14 @@ public void testDiff() {
2222

2323
@Test
2424
public void testPermutation() {
25-
assertTrue(StringUntil.permutation("I am a chinese", "eseinch a ma I"));
26-
assertFalse(StringUntil.permutation("I am a chinese", "esainch a ma I"));
25+
assertTrue(StringUntil.isPermutation("I am a chinese", "eseinch a ma I"));
26+
assertFalse(StringUntil.isPermutation("I am a chinese", "esainch a ma I"));
2727
}
2828

2929
@Test
3030
public void testQuickPermutation() {
31-
assertTrue(StringUntil.permutation("I am a chinese", "eseinch a ma I"));
32-
assertFalse(StringUntil.permutation("I am a chinese", "esainch a ma I"));
31+
assertTrue(StringUntil.isPermutation("I am a chinese", "eseinch a ma I"));
32+
assertFalse(StringUntil.isPermutation("I am a chinese", "esainch a ma I"));
3333
}
3434

3535
@Test

0 commit comments

Comments
 (0)
0