Skip to content

Commit 2021d12

Browse files
committed
minor edits
1 parent 54dc223 commit 2021d12

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

prtpy/objectives.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
"""
22
Define various optimization objectives for a partition algorithm.
33
4-
>>> objectives = [MaximizeSmallestSum, MaximizeKSmallestSums(2), MinimizeLargestSum, MinimizeKLargestSums(2), MinimizeDifference]
4+
>>> objectives = [MaximizeSmallestSum, MaximizeKSmallestSums(2), MinimizeLargestSum, MinimizeKLargestSums(2), MinimizeDifference, MinimizeDistAvg]
55
>>> for o in objectives: print(o.value_to_minimize(sums=[1,2,3,4,5], are_sums_in_ascending_order=True))
66
-1
77
-3
88
5
99
9
1010
4
11+
3.0
1112
>>> objectives.append(MaximizeSmallestWeightedSum([1, 1, 1, 3, 4]))
1213
>>> for o in objectives: print(o.value_to_minimize(sums=[2,4,1,5,3]))
1314
-1
1415
-3
1516
5
1617
9
1718
4
19+
3.0
1820
-0.75
1921
"""
2022

@@ -201,6 +203,4 @@ def lower_bound(self, sums:list, sum_of_remaining_items:float, are_sums_in_ascen
201203

202204
if __name__ == "__main__":
203205
import doctest
204-
205-
(failures, tests) = doctest.testmod(report=True)
206-
print("{} failures, {} tests".format(failures, tests))
206+
print(doctest.testmod())

prtpy/partitioning/complete_greedy.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424

2525
def anytime(
26-
binner: Binner, numbins: int, items: List[any], relative_value: List[any] = None,
26+
binner: Binner, numbins: int, items: List[int], relative_value: List[int] = None,
2727
objective: obj.Objective = obj.MinimizeDifference,
2828
use_lower_bound: bool = True,
2929
# Prune branches whose lower bound (= optimistic value) is at least as large as the current minimum.
@@ -310,7 +310,6 @@ def anytime(
310310

311311
if __name__ == "__main__":
312312
import doctest, sys
313-
314313
(failures, tests) = doctest.testmod(report=True, optionflags=doctest.FAIL_FAST)
315314
print("{} failures, {} tests".format(failures, tests))
316315
if failures > 0:

0 commit comments

Comments
 (0)