Skip to content

Commit ddb89b8

Browse files
committed
Typo in TournamentSelection: "random_permuations" should be "random_permutations" #669
1 parent 28789d3 commit ddb89b8

File tree

5 files changed

+16
-19
lines changed

5 files changed

+16
-19
lines changed

pymoo/algorithms/moo/ctaea.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from pymoo.util.display.multi import MultiObjectiveOutput
1515
from pymoo.util.dominator import Dominator
1616
from pymoo.util.function_loader import load_function
17-
from pymoo.util.misc import has_feasible, random_permuations
17+
from pymoo.util.misc import has_feasible, random_permutations
1818
from pymoo.util.nds.non_dominated_sorting import NonDominatedSorting
1919

2020

@@ -63,7 +63,7 @@ def _do(self, problem, Hm, n_select, n_parents, **kwargs):
6363
n_random = n_select * n_parents * self.pressure
6464
n_perms = math.ceil(n_random / n_pop)
6565
# get random permutations and reshape them
66-
P = random_permuations(n_perms, n_pop)[:n_random]
66+
P = random_permutations(n_perms, n_pop)[:n_random]
6767
P = np.reshape(P, (n_select * n_parents, self.pressure))
6868
if Pc <= Pd:
6969
# Choose from DA

pymoo/algorithms/moo/pinsga2.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,22 @@
1-
import numpy as np
21
import sys
3-
42
from abc import ABC, abstractmethod
3+
4+
import numpy as np
5+
56
from pymoo.algorithms.base.genetic import GeneticAlgorithm
7+
from pymoo.algorithms.moo.nsga2 import binary_tournament
68
from pymoo.docs import parse_doc_string
79
from pymoo.operators.crossover.sbx import SBX
810
from pymoo.operators.mutation.pm import PM
9-
from pymoo.operators.survival.rank_and_crowding import RankAndCrowding
1011
from pymoo.operators.sampling.rnd import FloatRandomSampling
11-
from pymoo.operators.selection.tournament import compare, TournamentSelection
12+
from pymoo.operators.selection.tournament import TournamentSelection
13+
from pymoo.operators.survival.rank_and_crowding import RankAndCrowding
1214
from pymoo.termination.default import DefaultMultiObjectiveTermination
13-
from pymoo.util.display.multi import MultiObjectiveOutput
14-
from pymoo.util.dominator import Dominator
15-
from pymoo.util.vf_dominator import VFDominator
16-
from pymoo.util.misc import has_feasible
17-
from pymoo.util.reference_direction import select_points_with_maximum_distance
1815
from pymoo.util import value_functions as mvf
16+
from pymoo.util.display.multi import MultiObjectiveOutput
1917
from pymoo.util.nds.non_dominated_sorting import NonDominatedSorting
20-
21-
from pymoo.algorithms.moo.nsga2 import binary_tournament
22-
from pymoo.algorithms.moo.nsga2 import RankAndCrowdingSurvival
18+
from pymoo.util.reference_direction import select_points_with_maximum_distance
19+
from pymoo.util.vf_dominator import VFDominator
2320

2421

2522
# =========================================================================================================

pymoo/operators/selection/rnd.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import numpy as np
44

55
from pymoo.core.selection import Selection
6-
from pymoo.util.misc import random_permuations
6+
from pymoo.util.misc import random_permutations
77

88

99
class RandomSelection(Selection):
@@ -16,7 +16,7 @@ def _do(self, _, pop, n_select, n_parents, **kwargs):
1616
n_perms = math.ceil(n_random / len(pop))
1717

1818
# get random permutations and reshape them
19-
P = random_permuations(n_perms, len(pop))[:n_random]
19+
P = random_permutations(n_perms, len(pop))[:n_random]
2020

2121
return np.reshape(P, (n_select, n_parents))
2222

pymoo/operators/selection/tournament.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import numpy as np
44

55
from pymoo.core.selection import Selection
6-
from pymoo.util.misc import random_permuations
6+
from pymoo.util.misc import random_permutations
77

88

99
class TournamentSelection(Selection):
@@ -42,7 +42,7 @@ def _do(self, _, pop, n_select, n_parents=1, **kwargs):
4242
n_perms = math.ceil(n_random / len(pop))
4343

4444
# get random permutations and reshape them
45-
P = random_permuations(n_perms, len(pop))[:n_random]
45+
P = random_permutations(n_perms, len(pop))[:n_random]
4646
P = np.reshape(P, (n_select * n_parents, self.pressure))
4747

4848
# compare using tournament function

pymoo/util/misc.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ def parameter_less_constraints(F, CV, F_max=None):
5858
return F
5959

6060

61-
def random_permuations(n, l, concat=True):
61+
def random_permutations(n, l, concat=True):
6262
P = []
6363
for i in range(n):
6464
P.append(np.random.permutation(l))

0 commit comments

Comments
 (0)