Different log prints

JanPalasek · May 1, 2019 · b4608c7 · b4608c7
1 parent 996ffa3
commit b4608c7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/JobShopScheduling/JobShopGeneticAlgorithm.cs b/JobShopScheduling/JobShopGeneticAlgorithm.cs
@@ -25,10 +25,16 @@ public JobShopGeneticAlgorithm(JobShop jobShop)
 
         public void Run(int iterationsCount, bool adaptive = true)
         {
+            if (iterationsCount < 1)
+            {
+                return;
+            }
+
             ScheduleChromosome bestChromosome = null;
             for (int i = 0; i < iterationsCount; i++)
             {
                 var chromosome = RunOnce(adaptive);
+                Console.WriteLine();
 
                 if (bestChromosome == null)
                 {
@@ -38,9 +44,8 @@ public void Run(int iterationsCount, bool adaptive = true)
                 {
                     bestChromosome = chromosome.Fitness > bestChromosome.Fitness ? chromosome : bestChromosome;
                 }
-
-                Console.WriteLine($"Best chromosome for all iterations: {bestChromosome.ScheduleLength}");
             }
+            Console.WriteLine($"Best chromosome for all iterations: {bestChromosome.ScheduleLength}");
         }
 
         private ScheduleChromosome RunOnce(bool adaptive = true)
@@ -89,12 +94,12 @@ private ScheduleChromosome RunOnce(bool adaptive = true)
         private void Print(IPopulation population, TimeSpan totalTime)
         {
             var bestChromosome = (ScheduleChromosome)population.BestChromosome;
-            Console.WriteLine($"Generation: {population.GenerationsNumber}");
-            Console.WriteLine($"Best schedule length: {bestChromosome.ScheduleLength:F}");
+            Console.Write($"Generation: {population.GenerationsNumber}, ");
+            Console.Write($"Best schedule length: {bestChromosome.ScheduleLength:F}, ");
             var chromosomes = population.CurrentGeneration.Chromosomes.Cast<ScheduleChromosome>().ToList();
-            Console.WriteLine($"Average schedule length: {chromosomes.Average(x => x.ScheduleLength):F}");
-            Console.WriteLine($"Population std deviation: {chromosomes.StandardDeviation(x => (decimal)x.ScheduleLength.Value):F}");
-            Console.WriteLine($"Time evolving: {totalTime.TotalSeconds:F}");
+            Console.Write($"Average schedule length: {chromosomes.Average(x => x.ScheduleLength):F}, ");
+            Console.Write($"Population std deviation: {chromosomes.StandardDeviation(x => (decimal)x.ScheduleLength.Value):F}, ");
+            Console.Write($"Time evolving: {totalTime.TotalSeconds:F}");
             Console.WriteLine();
         }
 

diff --git a/JobShopScheduling/Program.cs b/JobShopScheduling/Program.cs
@@ -6,7 +6,7 @@ internal class Program
     {
         private static void Main(string[] args)
         {
-            JobShop jobShop = LoadJobShop("Examples/la19.in");
+            JobShop jobShop = LoadJobShop("Examples/ft06.in");
             //JobShop jobShop = GenerateJobShop();
 
             var jobShopGeneticAlgorithm = new JobShopGeneticAlgorithm(jobShop);