From e7782962b7abb9a4be0785dc9217dac9ed2a9cd0 Mon Sep 17 00:00:00 2001
From: huihut <huihut@outlook.com>
Date: Thu, 12 Sep 2019 02:09:58 +0800
Subject: [PATCH] Update pack.cpp

Your PR can't be compiled, I modified some code.
1. Added the definition of T
2. Added delete heap variables
3. packIterative and printT separate two functions to uncouple code
---
 Problems/KnapsackProblem/pack.cpp | 74 ++++++++++++++++++-------------
 1 file changed, 44 insertions(+), 30 deletions(-)

diff --git a/Problems/KnapsackProblem/pack.cpp b/Problems/KnapsackProblem/pack.cpp
index fb751ec7..60f0d8b7 100644
--- a/Problems/KnapsackProblem/pack.cpp
+++ b/Problems/KnapsackProblem/pack.cpp
@@ -2,6 +2,8 @@
 #include <algorithm>
 using namespace std;
 
+int **T = NULL;		// 存储背包问题表格的数组指针
+
 // 返回两个值的最大值
 int max(int a, int b) {
 	return (a > b) ? a : b;
@@ -9,38 +11,22 @@ int max(int a, int b) {
 
 // 迭代法，能显示背包问题的表格
 int packIterative(int n, int W, int *w, int *v) {
+	
 	// 循环遍历n行
-	int T[i+1][j+1];
-	for (int i = 0; i <= n; ++i) {
+	for (int i = 1; i <= n; ++i)
+	{
 		// 循环遍历W列
-		for (int j = 0; j <= W; ++j) {
-			if (i == 0 || j == 0) {
-				T[i][j] = 0;
-			}
+		for (int j = 1; j <= W; ++j)
+		{
 			//第i个物品能装下，则比较包括第i个物品和不包括第i个物品，取其最大值
-			if ( w[i-1] <= j) {
-				T[i][j] = max(v[i-1] + T[i - 1][j - w[i]], T[i - 1][j]);
-			}
+			if (w[i] <= j)
+				T[i][j] = max(v[i] + T[i - 1][j - w[i]], T[i - 1][j]);
+
 			// 第i个物品不能装下，则递归装i-1个
-			else {
+			else
 				T[i][j] = T[i - 1][j];
-			}
 		}
 	}
-	
-	for (auto i = 0; i <= n; i++) {
-		// 打印行数
-		cout << i << ":\t";
-
-		// 打印W列
-		for (int w = 0; w <= W; w++)
-		{
-			cout << T[i][w] << "\t";
-		}
-
-		// 换行
-		cout << endl;
-	}
 	return T[n][W];
 }
 
@@ -51,15 +37,34 @@ int packRecursive(int n, int W, int *w, int *v) {
 		return 0;
 	}
 	// 第i个物品不能装下，则递归装i-1个
-	if (w[i] > W) {
+	if (w[n] > W) {
 		return packRecursive(n - 1, W, w, v);
 	}
 	//第i个物品能装下，则比较包括第i个物品和不包括第i个物品，取其最大值
 	else {
-		return max(v[i] + packRecursive(n - 1, W - w[n], w , v), packRecursive(n - 1, W, w, v));
+		return max(v[n] + packRecursive(n - 1, W - w[n], w, v), packRecursive(n - 1, W, w, v));
 	}
 }
 
+// 打印背包问题的表格
+void printT(int n, int W)
+{
+	// 打印n行
+	for (auto i = 0; i <= n; i++)
+	{
+		// 打印行数
+		cout << i << ":\t";
+
+		// 打印W列
+		for (int w = 0; w <= W; w++)
+		{
+			cout << T[i][w] << "\t";
+		}
+
+		// 换行
+		cout << endl;
+	}
+}
 
 int main() {
 	int *w = NULL;		// 存储每件物品重量的数组指针
@@ -94,8 +99,8 @@ int main() {
 
 	// 分配空间
 	// 对w和v分配n+1大小
-	w = new int[n+1];
-	v = new int[n+1];
+	w = new int[n + 1];
+	v = new int[n + 1];
 
 	// 对T分配n+1行，并初始化为0
 	T = new int *[n + 1]();
@@ -108,7 +113,7 @@ int main() {
 	// 输入背包的重量和价值
 	for (auto i = 1; i <= n; i++)
 	{
-		cout << "请输入第 " << i << " 个背包的重量和价值（用空格隔开）" << endl;
+		cout << "请输入第 " << i << " 个物品的重量和价值（用空格隔开）" << endl;
 		cin >> w[i] >> v[i];
 		if (cin.fail() || w[i] < 0 || v[i] < 0)
 		{
@@ -134,6 +139,8 @@ int main() {
 	{
 		// 迭代法，能显示背包问题的表格
 		cout << "能装下物品的最大价值为 " << packIterative(n, W, w, v) << endl;
+		cout << "------------------------------------------------" << endl;
+		printT(n, W);
 		break;
 	}
 	case 2:
@@ -151,6 +158,13 @@ int main() {
 
 	cout << "------------------------------------------------" << endl;
 
+	delete w;
+	delete v;
+	for (int i = 0; i <= n; ++i) {
+		delete[] T[i];
+	}
+	delete[] T;
+
 	system("pause");
 	return 0;
 }