Skip to content

Commit

Permalink
fix individual computation time (#624)
Browse files Browse the repository at this point in the history
* fix individual computation time

* minor fix
  • Loading branch information
maypink authored Apr 5, 2022
1 parent 7f66ef8 commit 992f30e
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions fedot/core/optimisers/gp_comp/evaluating.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,21 @@ def single_evaluating(reversed_individuals):
evaluated_individuals = []
num_of_successful_evals = 0
for ind in reversed_individuals:
individual = SimpleNamespace(**ind)
individual_context = SimpleNamespace(**ind)
start_time = timeit.default_timer()

graph = individual.ind.graph
if len(individual.pre_evaluated_objects) > 0:
graph = individual.pre_evaluated_objects[individual.ind_num]
individual.ind.fitness = calculate_objective(graph, individual.objective_function,
individual.is_multi_objective, individual.graph_generation_params)
individual.computation_time = timeit.default_timer() - start_time
if individual.ind.fitness is not None:
evaluated_individuals.append(individual.ind)
graph = individual_context.ind.graph
if len(individual_context.pre_evaluated_objects) > 0:
graph = individual_context.pre_evaluated_objects[individual_context.ind_num]
individual_context.ind.fitness = calculate_objective(graph, individual_context.objective_function,
individual_context.is_multi_objective,
individual_context.graph_generation_params)
individual_context.ind.computation_time = timeit.default_timer() - start_time
if individual_context.ind.fitness is not None:
evaluated_individuals.append(individual_context.ind)
num_of_successful_evals += 1
if individual.timer is not None and num_of_successful_evals > 0:
if individual.timer.is_time_limit_reached():
if individual_context.timer is not None and num_of_successful_evals > 0:
if individual_context.timer.is_time_limit_reached():
return evaluated_individuals
return evaluated_individuals

Expand Down

0 comments on commit 992f30e

Please sign in to comment.