From d8b1729d2213b7e00bf78d1223abf5268eefd8ad Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Fri, 3 Jan 2025 15:03:57 +1100 Subject: [PATCH] * evolve: Eliminate use of 'toolbox' global variable. --- evolve | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/evolve b/evolve index a4a2fa9d..174c7445 100755 --- a/evolve +++ b/evolve @@ -270,7 +270,7 @@ def run_final(best): json.dump(bundle, filehandle) -def run(): +def run(toolbox): """Run the evolution.""" if args.verbose: docstring = scenarios.supply_scenarios[args.supply_scenario].__doc__ @@ -331,15 +331,15 @@ if __name__ == '__main__': strategy = cma.Strategy(centroid=[0] * numparams, sigma=args.sigma, lambda_=args.lambda_) - toolbox = base.Toolbox() - toolbox.register("generate", strategy.generate, creator.Individual) - toolbox.register("update", strategy.update) - toolbox.register("evaluate", eval_func) + tbox = base.Toolbox() + tbox.register("generate", strategy.generate, creator.Individual) + tbox.register("update", strategy.update) + tbox.register("evaluate", eval_func) set_start_method('spawn') with Pool(args.ncpus if args.ncpus else None, initializer=init_worker, initargs=(args,)) as pool: - toolbox.register("map", pool.map) - run() + tbox.register("map", pool.map) + run(tbox) pool.close() pool.join()