Skip to content

Commit 92f3d69

Browse files
committed
fix: Fixed population intialization(actually fixes it)
- Fix behaviour which reusults in re-init of initial soln/populations in GA after init by a Random Search.
1 parent caf6895 commit 92f3d69

File tree

1 file changed

+20
-16
lines changed

1 file changed

+20
-16
lines changed

fliscopt/ga.py

+20-16
Original file line numberDiff line numberDiff line change
@@ -118,11 +118,12 @@ def run(self,domain,fitness_function,seed) -> tuple:
118118
solution, b_c, sc, r_nfe, s = RandomSearch(
119119
).run(self.domain, self.fitness_function, self.seed)
120120
nfe += r_nfe
121-
if len(self.init) > 0:
122-
solution = self.init
123121
else:
124-
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
125-
for i in range(len(self.domain))]
122+
if len(self.init) > 0:
123+
solution = self.init
124+
else:
125+
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
126+
for i in range(len(self.domain))]
126127

127128
population.append(solution)
128129

@@ -205,11 +206,12 @@ def run(self,domain,fitness_function,seed) -> tuple:
205206
solution, b_c, sc, r_nfe, s = RandomSearch(
206207
).run(self.domain, self.fitness_function, self.seed)
207208
nfe += r_nfe
208-
if len(self.init) > 0:
209-
solution = self.init
210209
else:
211-
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
212-
for i in range(len(self.domain))]
210+
if len(self.init) > 0:
211+
solution = self.init
212+
else:
213+
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
214+
for i in range(len(self.domain))]
213215

214216
population.append(solution)
215217

@@ -300,11 +302,12 @@ def run(self,domain,fitness_function,seed) -> tuple:
300302
solution, b_c, sc, r_nfe, s = RandomSearch(
301303
).run(self.domain, self.fitness_function,self.seed)
302304
nfe += r_nfe
303-
if len(self.init) > 0:
304-
solution = self.init
305305
else:
306-
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
307-
for i in range(len(self.domain))]
306+
if len(self.init) > 0:
307+
solution = self.init
308+
else:
309+
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
310+
for i in range(len(self.domain))]
308311

309312
population.append(solution)
310313

@@ -421,11 +424,12 @@ def run(self,domain,fitness_function,seed) -> tuple:
421424
solution, b_c, sc, r_nfe, s = RandomSearch(
422425
).run(self.domain, self.fitness_function,self.seed)
423426
nfe += r_nfe
424-
if len(self.init) > 0:
425-
solution = self.init
426427
else:
427-
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
428-
for i in range(len(self.domain))]
428+
if len(self.init) > 0:
429+
solution = self.init
430+
else:
431+
solution = [self.r_init.randint(self.domain[i][0], self.domain[i][1])
432+
for i in range(len(self.domain))]
429433

430434
population.append(solution)
431435

0 commit comments

Comments
 (0)