Skip to content

Commit 31a3975

Browse files
ahmedfgadahmedfgad
committed
More updates
1 parent 83a1635 commit 31a3975

File tree

7 files changed

+451
-142
lines changed

7 files changed

+451
-142
lines changed

‎pygad/helper/unique.py‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -603,11 +603,15 @@ def find_two_duplicates(self,
603603
return None, gene
604604

605605
def unpack_gene_space(self,
606+
range_min,
607+
range_max,
606608
num_values_from_inf_range=100):
607609
"""
608610
Unpack the gene_space for the purpose of selecting a value that solves the duplicates.
609611
This is by replacing each range by a list of values.
610612
It accepts:
613+
range_min: The range minimum value.
614+
range_min: The range maximum value.
611615
num_values_from_inf_range: For infinite range of float values, a fixed number of values equal to num_values_from_inf_range is selected using the numpy.linspace() function.
612616
It returns the unpacked gene space.
613617
"""
@@ -662,8 +666,8 @@ def unpack_gene_space(self,
662666
gene_space_unpacked[space_idx] = [space]
663667
elif space is None:
664668
# Randomly generate the value using the mutation range.
665-
gene_space_unpacked[space_idx] = numpy.arange(start=self.random_mutation_min_val,
666-
stop=self.random_mutation_max_val)
669+
gene_space_unpacked[space_idx] = numpy.arange(start=range_min,
670+
stop=range_max)
667671
elif type(space) is range:
668672
# Convert the range to a list.
669673
gene_space_unpacked[space_idx] = list(space)
@@ -720,8 +724,8 @@ def unpack_gene_space(self,
720724
none_indices = numpy.where(numpy.array(gene_space_unpacked[space_idx]) == None)[0]
721725
if len(none_indices) > 0:
722726
for idx in none_indices:
723-
random_value = numpy.random.uniform(low=self.random_mutation_min_val,
724-
high=self.random_mutation_max_val,
727+
random_value = numpy.random.uniform(low=range_min,
728+
high=range_max,
725729
size=1)[0]
726730
gene_space_unpacked[space_idx][idx] = random_value
727731

‎pygad/kerasga/kerasga.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@ def model_weights_as_matrix(model, weights_vector):
3737

3838
return weights_matrix
3939

40-
def predict(model, solution, data):
40+
def predict(model, solution, data, verbose=1):
4141
# Fetch the parameters of the best solution.
4242
solution_weights = model_weights_as_matrix(model=model,
4343
weights_vector=solution)
4444
_model = tensorflow.keras.models.clone_model(model)
4545
_model.set_weights(solution_weights)
46-
predictions = _model.predict(data)
46+
predictions = _model(data)
4747

4848
return predictions
4949

‎pygad/pygad.py‎

Lines changed: 177 additions & 63 deletions
Large diffs are not rendered by default.

‎pygad/utils/mutation.py‎

Lines changed: 92 additions & 30 deletions
Large diffs are not rendered by default.

‎tests/test_crossover_mutation.py‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ def test_random_mutation_manual_call2():
189189
# assert comp_sorted[0] == 0
190190

191191
def test_random_mutation_manual_call3():
192+
# Use random_mutation_min_val & random_mutation_max_val as numbers.
192193
random_mutation_min_val = 888
193194
random_mutation_max_val = 999
194195
result, ga_instance = output_crossover_mutation(mutation_type="random",
@@ -204,14 +205,31 @@ def test_random_mutation_manual_call3():
204205
comp_sorted = sorted(comp.copy())
205206
comp_sorted = numpy.abs(numpy.unique(comp))
206207

207-
# The other 1 added to include the last value in the range.
208-
# assert len(comp_sorted) in range(1, 1 + 1 + ga_instance.mutation_num_genes)
209-
# assert comp_sorted[0] == 0
210-
211208
value_space = list(range(random_mutation_min_val, random_mutation_max_val))
212209
for value in comp_sorted:
213210
assert value in value_space
214211

212+
def test_random_mutation_manual_call4():
213+
# Use random_mutation_min_val & random_mutation_max_val as lists.
214+
random_mutation_min_val = [888]*10
215+
random_mutation_max_val = [999]*10
216+
result, ga_instance = output_crossover_mutation(mutation_type="random",
217+
random_mutation_min_val=random_mutation_min_val,
218+
random_mutation_max_val=random_mutation_max_val,
219+
mutation_by_replacement=True)
220+
ga_instance.mutation_num_genes = 10
221+
222+
temp_offspring = numpy.array(initial_population[0:1])
223+
offspring = ga_instance.random_mutation(offspring=temp_offspring.copy())
224+
225+
comp = offspring
226+
comp_sorted = sorted(comp.copy())
227+
comp_sorted = numpy.abs(numpy.unique(comp))
228+
229+
value_space = list(range(random_mutation_min_val[0], random_mutation_max_val[0]))
230+
for value in comp_sorted:
231+
assert value in value_space
232+
215233
if __name__ == "__main__":
216234
print()
217235
test_no_crossover_no_mutation()
@@ -253,3 +271,6 @@ def test_random_mutation_manual_call3():
253271
test_random_mutation_manual_call3()
254272
print()
255273

274+
test_random_mutation_manual_call4()
275+
print()
276+

‎tests/test_gene_space.py‎

Lines changed: 114 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,37 @@ def fitness_func(ga, solution, idx):
6565
num_outside = 0
6666
if ga_instance.gene_space_nested == True:
6767
for gene_idx in range(ga_instance.num_genes):
68+
69+
if type(ga_instance.init_range_low) in ga_instance.supported_int_float_types:
70+
range_min_init = ga_instance.init_range_low
71+
range_max_init = ga_instance.init_range_high
72+
else:
73+
range_min_init = ga_instance.init_range_low[gene_idx]
74+
range_max_init = ga_instance.init_range_high[gene_idx]
75+
if type(ga_instance.random_mutation_min_val) in ga_instance.supported_int_float_types:
76+
range_min_mutation = ga_instance.random_mutation_min_val
77+
range_max_mutation = ga_instance.random_mutation_max_val
78+
else:
79+
range_min_mutation = ga_instance.random_mutation_min_val[gene_idx]
80+
range_max_mutation = ga_instance.random_mutation_max_val[gene_idx]
81+
6882
all_gene_values = ga_instance.solutions[:, gene_idx]
6983
if type(ga_instance.gene_space[gene_idx]) in [list, tuple, range, numpy.ndarray]:
7084
current_gene_space = list(ga_instance.gene_space[gene_idx])
71-
for val in all_gene_values:
72-
if val in current_gene_space:
73-
# print(val, current_gene_space)
85+
# print("current_gene_space", current_gene_space)
86+
for val_idx, val in enumerate(all_gene_values):
87+
if None in current_gene_space:
88+
if (val in current_gene_space) or (val >= range_min_init and val < range_max_init) or (val >= range_min_mutation and val < range_max_mutation):
89+
pass
90+
else:
91+
# print("###########")
92+
# print(gene_idx, val)
93+
# print(current_gene_space)
94+
# print(range_min_mutation, range_max_mutation)
95+
# print("\n\n")
96+
num_outside += 1
97+
elif val in current_gene_space:
98+
# print("val, current_gene_space", val, current_gene_space)
7499
pass
75100
else:
76101
# print(gene_idx, val, current_gene_space)
@@ -98,14 +123,51 @@ def fitness_func(ga, solution, idx):
98123
pass
99124
else:
100125
num_outside += 1
126+
elif ga_instance.gene_space[gene_idx] is None:
127+
for val in all_gene_values:
128+
# print(val)
129+
if (val >= range_min_init and val < range_max_init) or (val >= range_min_mutation and val < range_max_mutation):
130+
pass
131+
else:
132+
# print("###########")
133+
# print(gene_idx, val)
134+
# print(ga_instance.gene_space[gene_idx])
135+
# print(range_min_init, range_max_init)
136+
# print(range_min_mutation, range_max_mutation)
137+
# print("\n\n")
138+
num_outside += 1
101139
else:
102140
for gene_idx in range(ga_instance.num_genes):
141+
142+
if type(ga_instance.init_range_low) in ga_instance.supported_int_float_types:
143+
range_min_init = ga_instance.init_range_low
144+
range_max_init = ga_instance.init_range_high
145+
else:
146+
range_min_init = ga_instance.init_range_low[gene_idx]
147+
range_max_init = ga_instance.init_range_high[gene_idx]
148+
if type(ga_instance.random_mutation_min_val) in ga_instance.supported_int_float_types:
149+
range_min_mutation = ga_instance.random_mutation_min_val
150+
range_max_mutation = ga_instance.random_mutation_max_val
151+
else:
152+
range_min_mutation = ga_instance.random_mutation_min_val[gene_idx]
153+
range_max_mutation = ga_instance.random_mutation_max_val[gene_idx]
154+
103155
all_gene_values = ga_instance.solutions[:, gene_idx]
104156
# print("all_gene_values", gene_idx, all_gene_values)
105157
if type(ga_instance.gene_space) in [list, tuple, range, numpy.ndarray]:
106158
current_gene_space = list(ga_instance.gene_space)
107159
for val in all_gene_values:
108-
if val in current_gene_space:
160+
if None in current_gene_space:
161+
if (val in current_gene_space) or (val >= range_min_init and val < range_max_init) or (val >= range_min_mutation and val < range_max_mutation):
162+
pass
163+
else:
164+
# print("###########")
165+
# print(gene_idx, val)
166+
# print(current_gene_space)
167+
# print(range_min_mutation, range_max_mutation)
168+
# print("\n\n")
169+
num_outside += 1
170+
elif val in current_gene_space:
109171
pass
110172
else:
111173
num_outside += 1
@@ -144,6 +206,11 @@ def test_gene_space_list():
144206

145207
assert num_outside == 0
146208

209+
def test_gene_space_list_None():
210+
num_outside, _ = number_respect_gene_space(gene_space=[30, None, 40, 50, None, 60, 70, None, None, None])
211+
212+
assert num_outside == 0
213+
147214
def test_gene_space_numpy():
148215
num_outside, _ = number_respect_gene_space(gene_space=numpy.array(list(range(10))))
149216

@@ -318,6 +385,38 @@ def test_nested_gene_space_list2():
318385

319386
assert num_outside == 0
320387

388+
def test_nested_gene_space_list3_None():
389+
num_outside, ga_instance = number_respect_gene_space(gene_space=[[0, None],
390+
[1, 2],
391+
[2, None],
392+
[3, 4],
393+
[None, 5],
394+
None,
395+
[None, 7],
396+
[None, None],
397+
[8, 9],
398+
None],
399+
mutation_by_replacement=True)
400+
401+
assert num_outside == 0
402+
403+
def test_nested_gene_space_list4_None_custom_mutation_range():
404+
num_outside, ga_instance = number_respect_gene_space(gene_space=[[0, None],
405+
[1, 2],
406+
[2, None],
407+
[3, 4],
408+
[None, 5],
409+
None,
410+
[None, 7],
411+
[None, None],
412+
[8, 9],
413+
None],
414+
random_mutation_min_val=20,
415+
random_mutation_max_val=40,
416+
mutation_by_replacement=True)
417+
418+
assert num_outside == 0
419+
321420
def test_nested_gene_space_mix():
322421
num_outside, ga_instance = number_respect_gene_space(gene_space=[[0, 1, 2, 3, 4],
323422
numpy.arange(5, 10),
@@ -329,7 +428,8 @@ def test_nested_gene_space_mix():
329428
numpy.arange(35, 40),
330429
numpy.arange(40, 45),
331430
[45, 46, 47, 48, 49]],
332-
gene_type=int)
431+
gene_type=int,
432+
mutation_by_replacement=True)
333433

334434
assert num_outside == 0
335435

@@ -344,7 +444,7 @@ def test_nested_gene_space_mix_nested_gene_type():
344444
numpy.arange(35, 40),
345445
numpy.arange(40, 45),
346446
[45, 46, 47, 48, 49]],
347-
gene_type=[int, float, numpy.float64, [float, 3], [float, 4], numpy.int16, [numpy.float32, 1], int, float, [float, 3]])
447+
gene_type=[int, float, numpy.float64, [float, 3], int, numpy.int16, [numpy.float32, 1], int, float, [float, 3]])
348448
# print(ga_instance.population)
349449

350450
assert num_outside == 0
@@ -434,6 +534,8 @@ def test_nested_gene_space_nested_gene_type_adaptive_mutation():
434534

435535
test_gene_space_list()
436536
print()
537+
test_gene_space_list_None()
538+
print()
437539
test_gene_space_list_nested_gene_type()
438540
print()
439541

@@ -478,6 +580,12 @@ def test_nested_gene_space_nested_gene_type_adaptive_mutation():
478580
test_nested_gene_space_list2()
479581
print()
480582

583+
test_nested_gene_space_list3_None()
584+
print()
585+
586+
test_nested_gene_space_list4_None_custom_mutation_range()
587+
print()
588+
481589
test_nested_gene_space_mix()
482590
print()
483591

‎tests/test_gene_space_allow_duplicate_genes.py‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -379,39 +379,39 @@ def test_nested_gene_space_mix_initial_population_single_gene_type():
379379
assert num_outside == 0
380380

381381
if __name__ == "__main__":
382-
# print()
383-
# test_gene_space_range()
384-
# print()
385-
# test_gene_space_range_nested_gene_type()
386-
# print()
387-
388-
# test_gene_space_numpy_arange()
389-
# print()
390-
# test_gene_space_numpy_arange_nested_gene_type()
391-
# print()
392-
393-
# test_gene_space_list()
394-
# print()
395-
# test_gene_space_list_nested_gene_type()
396-
# print()
397-
398-
# test_gene_space_list_single_value()
399-
# print()
400-
# test_gene_space_list_single_value_nested_gene_type()
401-
# print()
402-
403-
# test_gene_space_numpy()
404-
# print()
405-
# test_gene_space_numpy_nested_gene_type()
406-
# print()
407-
408-
# test_gene_space_dict_without_step()
409-
# print()
410-
# test_gene_space_dict_without_step_nested_gene_type()
411-
# print()
412-
413-
# test_gene_space_dict_with_step()
414-
# print()
382+
print()
383+
test_gene_space_range()
384+
print()
385+
test_gene_space_range_nested_gene_type()
386+
print()
387+
388+
test_gene_space_numpy_arange()
389+
print()
390+
test_gene_space_numpy_arange_nested_gene_type()
391+
print()
392+
393+
test_gene_space_list()
394+
print()
395+
test_gene_space_list_nested_gene_type()
396+
print()
397+
398+
test_gene_space_list_single_value()
399+
print()
400+
test_gene_space_list_single_value_nested_gene_type()
401+
print()
402+
403+
test_gene_space_numpy()
404+
print()
405+
test_gene_space_numpy_nested_gene_type()
406+
print()
407+
408+
test_gene_space_dict_without_step()
409+
print()
410+
test_gene_space_dict_without_step_nested_gene_type()
411+
print()
412+
413+
test_gene_space_dict_with_step()
414+
print()
415415
test_gene_space_dict_with_step_nested_gene_type()
416416
print()
417417

0 commit comments

Comments
 (0)