Skip to content

Change cp.sum(*iterable, **kwargs) to cp.sum(iterable, **kwargs) #756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change cp.sum(*iterable, **kwargs) to cp.sum(iterable, **kwargs) #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions cpmpy/expressions/python_builtins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,14 @@ def min(*iterable, **kwargs):
return Minimum(iterable)


def sum(*iterable, **kwargs):
def sum(iterable, **kwargs):
"""
sum() overwrites the python built-in to support decision variables.

if iterable does not contain CPMpy expressions, the built-in is called
checks if all constants and uses built-in sum() in that case
"""
if len(iterable) == 1:
iterable = tuple(iterable[0]) # Fix generator polling
iterable = tuple(iterable) # convert iterable (possibly generator) to tuple
if not builtins.any(isinstance(elem, Expression) for elem in iterable):
return builtins.sum(iterable, **kwargs)

Expand Down
3 changes: 2 additions & 1 deletion tests/test_expressions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,7 +618,8 @@ def test_sum(self):
self.assertEqual(str(gt), str(cp.sum(self.x)))
self.assertEqual(str(gt), str(cp.sum(list(self.x))))
self.assertEqual(str(gt), str(cp.sum(v for v in self.x)))
self.assertEqual(str(gt), str(cp.sum(self.x[0], self.x[1], self.x[2])))
with self.assertRaises(TypeError): # Python sum does not accept sum(1,2,3)
cp.sum(self.x[0], self.x[1], self.x[2])

def test_max(self):
gt = Maximum(self.x)
Expand Down
Loading