Skip to content

Commit f681baa

Browse files
omer-gomer-g
committed
knapsack: corrects whitespace issue in config.json
corrects a few flake8 issues.
1 parent 80e1628 commit f681baa

3 files changed

Lines changed: 20 additions & 19 deletions

File tree

‎config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1574,6 +1574,6 @@
15741574
"topics": [
15751575
"algorithms"
15761576
]
1577-
}
1577+
}
15781578
]
15791579
}

‎exercises/knapsack/example.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ def solve_knapsack(max_weight, items):
33
for weight in range(1, max_weight + 1):
44
for i, item in enumerate(items, 1):
55
if item["weight"] <= weight:
6-
value_with_item = item["value"] + t[weight - item["weight"]][i - 1]
6+
value = item["value"] + t[weight - item["weight"]][i - 1]
77
value_without_item = t[weight][i - 1]
8-
t[weight][i] = max(value_with_item, value_without_item)
8+
t[weight][i] = max(value, value_without_item)
99
else:
1010
t[weight][i] = t[weight][i - 1]
1111
return t[max_weight][len(items)]

‎exercises/knapsack/knapsack_test.py‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ def test_no_items(self):
1010
self.assertEqual(solve_knapsack(100, []), 0)
1111

1212
def test_one_item_too_heavy(self):
13-
self.assertEqual(solve_knapsack(10, [{"weight":100, "value":1}]), 0)
13+
self.assertEqual(solve_knapsack(10, [{"weight": 100, "value": 1}]), 0)
1414

1515
def test_cannot_be_greedy_by_weight(self):
1616
self.assertEqual(solve_knapsack(10,
@@ -44,21 +44,22 @@ def test_eight_items(self):
4444
{"weight": 2, "value": 5}]), 900)
4545

4646
def test_fifteen_items(self):
47-
self.assertEqual(solve_knapsack(750, [{"weight": 70, "value": 135},
48-
{"weight": 73, "value": 139},
49-
{"weight": 77, "value": 149},
50-
{"weight": 80, "value": 150},
51-
{"weight": 82, "value": 156},
52-
{"weight": 87, "value": 163},
53-
{"weight": 90, "value": 173},
54-
{"weight": 94, "value": 184},
55-
{"weight": 98, "value": 192},
56-
{"weight": 106, "value": 201},
57-
{"weight": 110, "value": 210},
58-
{"weight": 113, "value": 214},
59-
{"weight": 115, "value": 221},
60-
{"weight": 118, "value": 229},
61-
{"weight": 120, "value": 240}]), 1458)
47+
self.assertEqual(solve_knapsack(750,
48+
[{"weight": 70, "value": 135},
49+
{"weight": 73, "value": 139},
50+
{"weight": 77, "value": 149},
51+
{"weight": 80, "value": 150},
52+
{"weight": 82, "value": 156},
53+
{"weight": 87, "value": 163},
54+
{"weight": 90, "value": 173},
55+
{"weight": 94, "value": 184},
56+
{"weight": 98, "value": 192},
57+
{"weight": 106, "value": 201},
58+
{"weight": 110, "value": 210},
59+
{"weight": 113, "value": 214},
60+
{"weight": 115, "value": 221},
61+
{"weight": 118, "value": 229},
62+
{"weight": 120, "value": 240}]), 1458)
6263

6364
# Utility functions
6465
def setUp(self):

0 commit comments

Comments
 (0)