modify selTournamentDCD bounds checking

zggl · Oct 18, 2019 · 87449b6 · 87449b6
1 parent 99223a8
commit 87449b6
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/deap/tools/emo.py b/deap/tools/emo.py
@@ -158,12 +158,12 @@ def selTournamentDCD(individuals, k):
     :param k: The number of individuals to select.
     :returns: A list of selected individuals.
     """
-
-    if len(individuals) % 4 != 0:
-        raise ValueError("selTournamentDCD: individuals length must be a multiple of 4")
-
-    if k % 4 != 0:
-        raise ValueError("selTournamentDCD: number of individuals to select must be a multiple of 4")
+    
+    if k > len(individuals): 
+        raise ValueError("selTournamentDCD: k must be less than or equal to individuals length")
+   
+    if k == len(individuals) and k % 4 != 0:
+        raise ValueError("selTournamentDCD: k must be divisible by four if k == len(individuals)")
 
     def tourn(ind1, ind2):
         if ind1.fitness.dominates(ind2.fitness):