modify problems order

pull/6/head
左程云 5 years ago
parent 8f8a26a40a
commit 3124e1978f

@ -112,7 +112,7 @@ public class Code03_Coffee {
return Math.min(p1, p2); return Math.min(p1, p2);
} }
// 方法二,贪心+优良尝试改成动态规划 // 贪心+优良尝试改成动态规划
public static int minTime2(int[] arr, int n, int a, int b) { public static int minTime2(int[] arr, int n, int a, int b) {
PriorityQueue<Machine> heap = new PriorityQueue<Machine>(new MachineComparator()); PriorityQueue<Machine> heap = new PriorityQueue<Machine>(new MachineComparator());
for (int i = 0; i < arr.length; i++) { for (int i = 0; i < arr.length; i++) {
@ -139,8 +139,9 @@ public class Code03_Coffee {
for (int free = 0; free <= maxFree; free++) { for (int free = 0; free <= maxFree; free++) {
int selfClean1 = Math.max(drinks[index], free) + wash; int selfClean1 = Math.max(drinks[index], free) + wash;
if (selfClean1 > maxFree) { if (selfClean1 > maxFree) {
break; // 因为free后面的也都不用填了 break; // 因为后面的也都不用填了
} }
// index号杯子 决定洗
int restClean1 = dp[index + 1][selfClean1]; int restClean1 = dp[index + 1][selfClean1];
int p1 = Math.max(selfClean1, restClean1); int p1 = Math.max(selfClean1, restClean1);
// index号杯子 决定挥发 // index号杯子 决定挥发
@ -175,6 +176,7 @@ public class Code03_Coffee {
int len = 5; int len = 5;
int max = 9; int max = 9;
int testTime = 50000; int testTime = 50000;
System.out.println("测试开始");
for (int i = 0; i < testTime; i++) { for (int i = 0; i < testTime; i++) {
int[] arr = randomArray(len, max); int[] arr = randomArray(len, max);
int n = (int) (Math.random() * 5) + 1; int n = (int) (Math.random() * 5) + 1;
@ -193,6 +195,7 @@ public class Code03_Coffee {
break; break;
} }
} }
System.out.println("测试结束");
} }

@ -1,6 +1,6 @@
package class20; package class21;
public class Code04_MinPathSum { public class Code01_MinPathSum {
public static int minPathSum1(int[][] m) { public static int minPathSum1(int[][] m) {
if (m == null || m.length == 0 || m[0] == null || m[0].length == 0) { if (m == null || m.length == 0 || m[0] == null || m[0].length == 0) {

@ -1,6 +1,6 @@
package class21; package class21;
public class Code01_CoinsWayEveryPaperDifferent { public class Code02_CoinsWayEveryPaperDifferent {
public static int coinWays(int[] arr, int aim) { public static int coinWays(int[] arr, int aim) {
return process(arr, 0, aim); return process(arr, 0, aim);

@ -1,6 +1,6 @@
package class21; package class21;
public class Code02_CoinsWayNoLimit { public class Code03_CoinsWayNoLimit {
public static int coinsWay(int[] arr, int aim) { public static int coinsWay(int[] arr, int aim) {
if (arr == null || arr.length == 0 || aim < 0) { if (arr == null || arr.length == 0 || aim < 0) {

@ -3,7 +3,7 @@ package class21;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map.Entry; import java.util.Map.Entry;
public class Code03_CoinsWaySameValueSamePapper { public class Code04_CoinsWaySameValueSamePapper {
public static class Info { public static class Info {
public int[] coins; public int[] coins;

@ -1,6 +1,6 @@
package class21; package class22;
public class Code05_MinCoinsNoLimit { public class Code03_MinCoinsNoLimit {
public static int minCoins(int[] arr, int aim) { public static int minCoins(int[] arr, int aim) {
return process(arr, 0, aim); return process(arr, 0, aim);

@ -1,4 +1,4 @@
package class21; package class22;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map.Entry; import java.util.Map.Entry;

@ -1,8 +1,8 @@
package class22; package class23;
import java.util.TreeSet; import java.util.TreeSet;
public class Code03_SplitSumClosed { public class Code01_SplitSumClosed {
public static int right(int[] arr) { public static int right(int[] arr) {
if (arr == null || arr.length < 2) { if (arr == null || arr.length < 2) {

@ -1,8 +1,8 @@
package class22; package class23;
import java.util.TreeSet; import java.util.TreeSet;
public class Code04_SplitSumClosedSizeHalf { public class Code02_SplitSumClosedSizeHalf {
public static int right(int[] arr) { public static int right(int[] arr) {
if (arr == null || arr.length < 2) { if (arr == null || arr.length < 2) {

@ -1,6 +1,6 @@
package class22; package class23;
public class Code05_NQueens { public class Code03_NQueens {
public static int num1(int n) { public static int num1(int n) {
if (n < 1) { if (n < 1) {
Loading…
Cancel
Save