From 3124e1978f5aba677d2bc200d6969b9c324e49de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B7=A6=E7=A8=8B=E4=BA=91?= Date: Sat, 9 Jan 2021 13:14:42 +0800 Subject: [PATCH] modify problems order --- src/class20/Code03_Coffee.java | 7 +++++-- .../Code01_MinPathSum.java} | 4 ++-- ...ferent.java => Code02_CoinsWayEveryPaperDifferent.java} | 2 +- ...02_CoinsWayNoLimit.java => Code03_CoinsWayNoLimit.java} | 2 +- ...Papper.java => Code04_CoinsWaySameValueSamePapper.java} | 2 +- .../Code03_MinCoinsNoLimit.java} | 4 ++-- src/{class21 => class22}/Code04_MinCoinsOnePaper.java | 2 +- .../Code01_SplitSumClosed.java} | 4 ++-- .../Code02_SplitSumClosedSizeHalf.java} | 4 ++-- .../Code05_NQueens.java => class23/Code03_NQueens.java} | 4 ++-- 10 files changed, 19 insertions(+), 16 deletions(-) rename src/{class20/Code04_MinPathSum.java => class21/Code01_MinPathSum.java} (97%) rename src/class21/{Code01_CoinsWayEveryPaperDifferent.java => Code02_CoinsWayEveryPaperDifferent.java} (97%) rename src/class21/{Code02_CoinsWayNoLimit.java => Code03_CoinsWayNoLimit.java} (98%) rename src/class21/{Code03_CoinsWaySameValueSamePapper.java => Code04_CoinsWaySameValueSamePapper.java} (98%) rename src/{class21/Code05_MinCoinsNoLimit.java => class22/Code03_MinCoinsNoLimit.java} (97%) rename src/{class21 => class22}/Code04_MinCoinsOnePaper.java (99%) rename src/{class22/Code03_SplitSumClosed.java => class23/Code01_SplitSumClosed.java} (97%) rename src/{class22/Code04_SplitSumClosedSizeHalf.java => class23/Code02_SplitSumClosedSizeHalf.java} (97%) rename src/{class22/Code05_NQueens.java => class23/Code03_NQueens.java} (97%) diff --git a/src/class20/Code03_Coffee.java b/src/class20/Code03_Coffee.java index 970cfe9..ff76791 100644 --- a/src/class20/Code03_Coffee.java +++ b/src/class20/Code03_Coffee.java @@ -112,7 +112,7 @@ public class Code03_Coffee { return Math.min(p1, p2); } - // 方法二，贪心+优良尝试改成动态规划 + // 贪心+优良尝试改成动态规划 public static int minTime2(int[] arr, int n, int a, int b) { PriorityQueue heap = new PriorityQueue(new MachineComparator()); for (int i = 0; i < arr.length; i++) { @@ -139,8 +139,9 @@ public class Code03_Coffee { for (int free = 0; free <= maxFree; free++) { int selfClean1 = Math.max(drinks[index], free) + wash; if (selfClean1 > maxFree) { - break; // 因为free后面的也都不用填了 + break; // 因为后面的也都不用填了 } + // index号杯子 决定洗 int restClean1 = dp[index + 1][selfClean1]; int p1 = Math.max(selfClean1, restClean1); // index号杯子 决定挥发 @@ -175,6 +176,7 @@ public class Code03_Coffee { int len = 5; int max = 9; int testTime = 50000; + System.out.println("测试开始"); for (int i = 0; i < testTime; i++) { int[] arr = randomArray(len, max); int n = (int) (Math.random() * 5) + 1; @@ -193,6 +195,7 @@ public class Code03_Coffee { break; } } + System.out.println("测试结束"); } diff --git a/src/class20/Code04_MinPathSum.java b/src/class21/Code01_MinPathSum.java similarity index 97% rename from src/class20/Code04_MinPathSum.java rename to src/class21/Code01_MinPathSum.java index 80d3e0b..0d9ea24 100644 --- a/src/class20/Code04_MinPathSum.java +++ b/src/class21/Code01_MinPathSum.java @@ -1,6 +1,6 @@ -package class20; +package class21; -public class Code04_MinPathSum { +public class Code01_MinPathSum { public static int minPathSum1(int[][] m) { if (m == null || m.length == 0 || m[0] == null || m[0].length == 0) { diff --git a/src/class21/Code01_CoinsWayEveryPaperDifferent.java b/src/class21/Code02_CoinsWayEveryPaperDifferent.java similarity index 97% rename from src/class21/Code01_CoinsWayEveryPaperDifferent.java rename to src/class21/Code02_CoinsWayEveryPaperDifferent.java index 7df1873..552e95e 100644 --- a/src/class21/Code01_CoinsWayEveryPaperDifferent.java +++ b/src/class21/Code02_CoinsWayEveryPaperDifferent.java @@ -1,6 +1,6 @@ package class21; -public class Code01_CoinsWayEveryPaperDifferent { +public class Code02_CoinsWayEveryPaperDifferent { public static int coinWays(int[] arr, int aim) { return process(arr, 0, aim); diff --git a/src/class21/Code02_CoinsWayNoLimit.java b/src/class21/Code03_CoinsWayNoLimit.java similarity index 98% rename from src/class21/Code02_CoinsWayNoLimit.java rename to src/class21/Code03_CoinsWayNoLimit.java index 0b3a5a0..820ced0 100644 --- a/src/class21/Code02_CoinsWayNoLimit.java +++ b/src/class21/Code03_CoinsWayNoLimit.java @@ -1,6 +1,6 @@ package class21; -public class Code02_CoinsWayNoLimit { +public class Code03_CoinsWayNoLimit { public static int coinsWay(int[] arr, int aim) { if (arr == null || arr.length == 0 || aim < 0) { diff --git a/src/class21/Code03_CoinsWaySameValueSamePapper.java b/src/class21/Code04_CoinsWaySameValueSamePapper.java similarity index 98% rename from src/class21/Code03_CoinsWaySameValueSamePapper.java rename to src/class21/Code04_CoinsWaySameValueSamePapper.java index fddbe7e..ad46f82 100644 --- a/src/class21/Code03_CoinsWaySameValueSamePapper.java +++ b/src/class21/Code04_CoinsWaySameValueSamePapper.java @@ -3,7 +3,7 @@ package class21; import java.util.HashMap; import java.util.Map.Entry; -public class Code03_CoinsWaySameValueSamePapper { +public class Code04_CoinsWaySameValueSamePapper { public static class Info { public int[] coins; diff --git a/src/class21/Code05_MinCoinsNoLimit.java b/src/class22/Code03_MinCoinsNoLimit.java similarity index 97% rename from src/class21/Code05_MinCoinsNoLimit.java rename to src/class22/Code03_MinCoinsNoLimit.java index 31e7c3d..d4c2641 100644 --- a/src/class21/Code05_MinCoinsNoLimit.java +++ b/src/class22/Code03_MinCoinsNoLimit.java @@ -1,6 +1,6 @@ -package class21; +package class22; -public class Code05_MinCoinsNoLimit { +public class Code03_MinCoinsNoLimit { public static int minCoins(int[] arr, int aim) { return process(arr, 0, aim); diff --git a/src/class21/Code04_MinCoinsOnePaper.java b/src/class22/Code04_MinCoinsOnePaper.java similarity index 99% rename from src/class21/Code04_MinCoinsOnePaper.java rename to src/class22/Code04_MinCoinsOnePaper.java index 7ad8a7e..5b6ab11 100644 --- a/src/class21/Code04_MinCoinsOnePaper.java +++ b/src/class22/Code04_MinCoinsOnePaper.java @@ -1,4 +1,4 @@ -package class21; +package class22; import java.util.HashMap; import java.util.Map.Entry; diff --git a/src/class22/Code03_SplitSumClosed.java b/src/class23/Code01_SplitSumClosed.java similarity index 97% rename from src/class22/Code03_SplitSumClosed.java rename to src/class23/Code01_SplitSumClosed.java index 85ce147..605c930 100644 --- a/src/class22/Code03_SplitSumClosed.java +++ b/src/class23/Code01_SplitSumClosed.java @@ -1,8 +1,8 @@ -package class22; +package class23; import java.util.TreeSet; -public class Code03_SplitSumClosed { +public class Code01_SplitSumClosed { public static int right(int[] arr) { if (arr == null || arr.length < 2) { diff --git a/src/class22/Code04_SplitSumClosedSizeHalf.java b/src/class23/Code02_SplitSumClosedSizeHalf.java similarity index 97% rename from src/class22/Code04_SplitSumClosedSizeHalf.java rename to src/class23/Code02_SplitSumClosedSizeHalf.java index 42d4d79..2930349 100644 --- a/src/class22/Code04_SplitSumClosedSizeHalf.java +++ b/src/class23/Code02_SplitSumClosedSizeHalf.java @@ -1,8 +1,8 @@ -package class22; +package class23; import java.util.TreeSet; -public class Code04_SplitSumClosedSizeHalf { +public class Code02_SplitSumClosedSizeHalf { public static int right(int[] arr) { if (arr == null || arr.length < 2) { diff --git a/src/class22/Code05_NQueens.java b/src/class23/Code03_NQueens.java similarity index 97% rename from src/class22/Code05_NQueens.java rename to src/class23/Code03_NQueens.java index 5bbe7f1..9264e0c 100644 --- a/src/class22/Code05_NQueens.java +++ b/src/class23/Code03_NQueens.java @@ -1,6 +1,6 @@ -package class22; +package class23; -public class Code05_NQueens { +public class Code03_NQueens { public static int num1(int n) { if (n < 1) {