Changes according to refactoring of genetic algorithm