From ffb1c10a038433f289ea97a26f24d441de8f8906 Mon Sep 17 00:00:00 2001 From: Karol Piotrowski Date: Tue, 26 May 2020 22:05:43 +0000 Subject: [PATCH] =?UTF-8?q?Prze=C5=9Blij=20pliki=20do=20''?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gmo.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gmo.cpp b/gmo.cpp index c644d1e..59cac17 100644 --- a/gmo.cpp +++ b/gmo.cpp @@ -251,7 +251,7 @@ void crossover(string * parents,string * nextGen,int parentsNumber,int nextGenSi } -string * genetic_algorithm(string * population, int populationSize, int parentsNumber) { +void genetic_algorithm(string * population, int populationSize, int parentsNumber,string * outcome, int outcomeSize) { int iteration,i; for(iteration=0;iteration<5;iteration++) { @@ -269,23 +269,22 @@ string * genetic_algorithm(string * population, int populationSize, int parentsN } delete[] nextGen; } - string vegetablesForPlanting[20]; - ranking(population,vegetablesForPlanting,populationSize,20); - - return vegetablesForPlanting; + ranking(population,outcome,populationSize,outcomeSize); } int main() { srand(time(0)); + int i; int populationSize = 500; int parentsNumber = populationSize - 5; string * population = new string[populationSize]; generatePopulation(population,populationSize); - string * vegetablesForPlanting = genetic_algorithm(population, populationSize, parentsNumber); + string vegetablesForPlanting[20]; + genetic_algorithm(population, populationSize, parentsNumber,vegetablesForPlanting, 20);