Fixed a bug

.gitignore

@@ -264,3 +264,5 @@ paket-files/
 __pycache__/
 *.pyc
 *.zip
+
+*nuget.exe

GeneticAlgorithm.UnitTests/SearchTests.cs

@@ -73,7 +73,7 @@ public void HistoryExistTest(bool includeHistory)
             var result = searchEngine.Search();
 
             if (includeHistory)
-                Assert.AreEqual(3, result.History.Count, "There should have been history");
+                Assert.AreEqual(2, result.History.Count, "There should have been history");
             else
                 Assert.AreEqual(0, result.History.Count, "There shouldn't be any history");
         }

GeneticAlgorithm.UnitTests/SearchUtilsTests.cs

@@ -26,7 +26,9 @@ public void ChooseBestTest()
             A.CallTo(() => chromosome2.Evaluate()).Returns(8);
             A.CallTo(() => chromosome3.Evaluate()).Returns(0.5);
 
-            var population = new[] {chromosome1, chromosome2, chromosome3};
+            var population = new Population(new[] {chromosome1, chromosome2, chromosome3});
+            foreach (var chromosome in population)
+                chromosome.Evaluation = chromosome.Chromosome.Evaluate();
             var best = population.ChooseBest();
 
             Assert.AreEqual(chromosome2, best);

GeneticAlgorithm/GeneticSearchEngine.cs

@@ -15,7 +15,7 @@ public class GeneticSearchEngine
         private readonly GeneticSearchOptions options;
 
         /// <summary>
-        /// This even is risen for every new generation. It's arguments are the population and their evaluations.
+        /// This even is risen once for every new generation. It's arguments are the population and their evaluations.
         /// </summary>
         public event Action<IChromosome[], double[]> OnNewGeneration; 
 
@@ -34,17 +34,20 @@ public GeneticSearchResult Search()
             var stopwatch = new Stopwatch();
             stopwatch.Start();
             history = new List<IChromosome[]>();
-            population = new Population(populationGenerator.GeneratePopulation(options.PopulationSize).ToArray());
-            if (options.IncludeAllHistory)
-                history.Add(population.GetChromosomes());
-
             int generation;
             for (generation = 0; generation < options.MaxGenerations; generation++)
             {
+                if (generation == 0)
+                    population = new Population(populationGenerator.GeneratePopulation(options.PopulationSize).ToArray());
+                else
+                    GenerateChildren();
                 EvaluatePopulation();
 
                 if (options.StopManagers.Any(stopManager => stopManager.ShouldStop(population.GetChromosomes(), population.GetEvaluations(), generation)))
+                {
+                    UpdateEventsAndHistory(population.GetChromosomes(), population.GetEvaluations());
                     break;
+                }
 
                 var populationToRenew = GetPopulationToRenew(generation);
                 if (populationToRenew > 0)
@@ -54,15 +57,11 @@ public GeneticSearchResult Search()
                 }
 
                 UpdateNewGeneration();
-
                 NormilizeEvaluations();
-                GenerateChildren();
-                if (options.IncludeAllHistory)
-                    history.Add(population.GetChromosomes());
             }
 
             stopwatch.Stop();
-            return new GeneticSearchResult(population.GetChromosomes(), history, stopwatch.Elapsed, generation);
+            return new GeneticSearchResult(population.ChooseBest(), population.GetChromosomes(), history, stopwatch.Elapsed, generation);
         }
 
         /// <summary>
@@ -78,7 +77,15 @@ private void UpdateNewGeneration()
             foreach (var populationRenwalManager in options.PopulationRenwalManagers)
                 populationRenwalManager.AddGeneration(chromosomes, evaluations);
 
+            UpdateEventsAndHistory(chromosomes, evaluations);
+        }
+
+        private void UpdateEventsAndHistory(IChromosome[] chromosomes, double[] evaluations)
+        {
             OnNewGeneration?.Invoke(chromosomes, evaluations);
+
+            if (options.IncludeAllHistory)
+                history.Add(population.GetChromosomes());
         }
 
         private void GenerateChildren()

GeneticAlgorithm/GeneticSearchResult.cs

@@ -6,13 +6,13 @@ namespace GeneticAlgorithm
 {
     public class GeneticSearchResult
     {
-        public GeneticSearchResult(IChromosome[] population, List<IChromosome[]> history, TimeSpan searchTime, int generations)
+        public GeneticSearchResult(IChromosome bestChromosome, IChromosome[] population, List<IChromosome[]> history, TimeSpan searchTime, int generations)
         {
             Population = population;
             History = history;
             SearchTime = searchTime;
             Generations = generations;
-            BestChromosome = population.ChooseBest();
+            BestChromosome = bestChromosome;
         }
 
         public IChromosome[] Population { get; }

GeneticAlgorithm/SearchUtils.cs

@@ -4,17 +4,17 @@ namespace GeneticAlgorithm
 {
     public static class SearchUtils
     {
-        public static IChromosome ChooseBest(this IChromosome[] population)
+        public static IChromosome ChooseBest(this Population population)
         {
             double bestEvaluation = -1;
             IChromosome bestChromosome = null;
             foreach (var chromosome in population)
             {
-                var evaluation = chromosome.Evaluate();
+                var evaluation = chromosome.Evaluation;
                 if (evaluation > bestEvaluation)
                 {
                     bestEvaluation = evaluation;
-                    bestChromosome = chromosome;
+                    bestChromosome = chromosome.Chromosome;
                 }
             }