diff --git a/genetic_selection/gscv.py b/genetic_selection/gscv.py index 1b49756..95e6e14 100644 --- a/genetic_selection/gscv.py +++ b/genetic_selection/gscv.py @@ -32,6 +32,7 @@ from deap import base from deap import creator from deap import tools +from tqdm.auto import tqdm creator.create("Fitness", base.Fitness, weights=(1.0, -1.0, -1.0)) @@ -45,6 +46,7 @@ def _eaFunction(population, toolbox, cxpb, mutpb, ngen, ngen_no_change=None, sta # Evaluate the individuals with an invalid fitness invalid_ind = [ind for ind in population if not ind.fitness.valid] + invalid_ind = tqdm(invalid_ind) if verbose else invalid_ind fitnesses = toolbox.map(toolbox.evaluate, invalid_ind) for ind, fit in zip(invalid_ind, fitnesses): ind.fitness.values = fit @@ -71,6 +73,7 @@ def _eaFunction(population, toolbox, cxpb, mutpb, ngen, ngen_no_change=None, sta # Evaluate the individuals with an invalid fitness invalid_ind = [ind for ind in offspring if not ind.fitness.valid] + invalid_ind = tqdm(invalid_ind) if verbose else invalid_ind fitnesses = toolbox.map(toolbox.evaluate, invalid_ind) for ind, fit in zip(invalid_ind, fitnesses): ind.fitness.values = fit diff --git a/requirements.txt b/requirements.txt index 9f8ad93..b491aee 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,4 @@ scikit-learn>=0.23 deap>=1.0.2 numpy multiprocess +tqdm \ No newline at end of file diff --git a/setup.py b/setup.py index 6a5853e..8fb0047 100644 --- a/setup.py +++ b/setup.py @@ -37,5 +37,5 @@ ], packages=find_packages(), python_requires='>=3.6', - install_requires=['scikit-learn>=0.23', 'deap>=1.0.2', 'numpy', 'multiprocess'], + install_requires=['scikit-learn>=0.23', 'deap>=1.0.2', 'numpy', 'multiprocess', 'tqdm'], )