Skip to content
Open
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions es/separable_natural_es.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import numpy as np
from . import lib


def optimize(func, mu, sigma,
learning_rate_mu=None, learning_rate_sigma=None, population_size=None,
max_iter=2000,
Expand Down Expand Up @@ -45,13 +46,13 @@ def optimize(func, mu, sigma,
z = np.vstack([z, mu - sigma * s])
s = np.vstack([s, -s])

generations_list = [generation] * len(z)
individual_list = range(len(z))
if parallel_threads is None:
fitness = np.fromiter((func(zi) for zi in z), np.float)
fitness = np.fromiter((func(zi, gi, ii) for zi, gi, ii in zip(z, generations_list, individual_list)), np.float)
else:
pool = mp.Pool(processes=parallel_threads)
fitness = np.fromiter(pool.map(func, z), np.float)
pool.close()
pool.join()
with mp.Pool(processes=parallel_threads) as pool:
fitness = np.fromiter(pool.starmap(func, zip(z, generations_list, individual_list)), np.float)

ni = np.logical_not(np.isnan(fitness))
z = z[ni]
Expand Down Expand Up @@ -87,4 +88,3 @@ def optimize(func, mu, sigma,
'history_sigma': history_sigma,
'history_fitness': history_fitness,
'history_pop': history_pop}