Skip to content
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

NumPy arrays compatibility #759

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

NumPy arrays compatibility #759

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
29 changes: 26 additions & 3 deletions deap/tools/crossover.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,18 @@ def cxOnePoint(ind1, ind2):
"""
size = min(len(ind1), len(ind2))
cxpoint = random.randint(1, size - 1)
ind1[cxpoint:], ind2[cxpoint:] = ind2[cxpoint:], ind1[cxpoint:]

# Check if the inputs are numpy arrays
if type(ind1).__module__ == 'numpy' and type(ind2).__module__ == 'numpy':
# Use copies to avoid issues with numpy arrays
ind1[cxpoint:], ind2[cxpoint:] = (
ind2[cxpoint:].copy(),
ind1[cxpoint:].copy()
)

else:
# Default behaviour for lists
ind1[cxpoint:], ind2[cxpoint:] = ind2[cxpoint:], ind1[cxpoint:]

return ind1, ind2

Expand All @@ -53,8 +64,20 @@ def cxTwoPoint(ind1, ind2):
else: # Swap the two cx points
cxpoint1, cxpoint2 = cxpoint2, cxpoint1

ind1[cxpoint1:cxpoint2], ind2[cxpoint1:cxpoint2] \
= ind2[cxpoint1:cxpoint2], ind1[cxpoint1:cxpoint2]
# Check if the inputs are numpy arrays
if type(ind1).__module__ == 'numpy' and type(ind2).__module__ == 'numpy':
# Use copies to avoid issues with numpy arrays
ind1[cxpoint1:cxpoint2], ind2[cxpoint1:cxpoint2] = (
ind2[cxpoint1:cxpoint2].copy(),
ind1[cxpoint1:cxpoint2].copy()
)

else:
# Default behavior for lists
ind1[cxpoint1:cxpoint2], ind2[cxpoint1:cxpoint2] = (
ind2[cxpoint1:cxpoint2],
ind1[cxpoint1:cxpoint2]
)

return ind1, ind2

Expand Down