moved to lang version 10

Author: dobriyanchik

src/ChaosSoft.GeneticAlgorithm/BulkGeneticEngine.cs

@@ -1,83 +1,82 @@
 using System;
 
-namespace ChaosSoft.GeneticAlgorithm
+namespace ChaosSoft.GeneticAlgorithm;
+
+/// <summary>
+/// Wrapper over <see cref="GeneticEngine{C, T}"/> to perform iterative evolution process
+/// with ability to subscribe to iteration events.
+/// </summary>
+/// <typeparam name="C">cromosome type</typeparam>
+/// <typeparam name="T">fitness measure type</typeparam>
+public class BulkGeneticEngine<C, T> : GeneticEngine<C, T> where C : IChromosome<C> where T : IComparable<T>
 {
+    private bool terminate = false;
+
     /// <summary>
-    /// Wrapper over <see cref="GeneticEngine{C, T}"/> to perform iterative evolution process
-    /// with ability to subscribe to iteration events.
+    /// Initializes a new instance of the <see cref="BulkGeneticEngine{C, T}"/> class 
+    /// based on initial population and fitness function.
     /// </summary>
-    /// <typeparam name="C">cromosome type</typeparam>
-    /// <typeparam name="T">fitness measure type</typeparam>
-    public class BulkGeneticEngine<C, T> : GeneticEngine<C, T> where C : IChromosome<C> where T : IComparable<T>
+    /// <param name="population">initial population for evolution process</param>
+    /// <param name="fitnessFunction">function to calculate chromosomes fitness</param>
+    public BulkGeneticEngine(Population<C> population, IFitness<C, T> fitnessFunction)
+        : base(population, fitnessFunction)
     {
-        private bool terminate = false;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="BulkGeneticEngine{C, T}"/> class 
-        /// based on initial population and fitness function.
-        /// </summary>
-        /// <param name="population">initial population for evolution process</param>
-        /// <param name="fitnessFunction">function to calculate chromosomes fitness</param>
-        public BulkGeneticEngine(Population<C> population, IFitness<C, T> fitnessFunction)
-            : base(population, fitnessFunction)
-        {
+    }
 
-        }
+    /// <summary>
+    /// Delegate for <see cref="OnIterate"/> event.
+    /// </summary>
+    /// <param name="engineInstance"></param>
+    public delegate void GeneticIterationEvent(BulkGeneticEngine<C, T> engineInstance);
 
-        /// <summary>
-        /// Delegate for <see cref="OnIterate"/> event.
-        /// </summary>
-        /// <param name="engineInstance"></param>
-        public delegate void GeneticIterationEvent(BulkGeneticEngine<C, T> engineInstance);
+    /// <summary>
+    /// Event called after each evolution step execution.
+    /// </summary>
+    public event GeneticIterationEvent OnIterate;
 
-        /// <summary>
-        /// Event called after each evolution step execution.
-        /// </summary>
-        public event GeneticIterationEvent OnIterate;
+    /// <summary>
+    /// Gets or sets evolution iteration.
+    /// </summary>
+    public int Iteration { get; protected set; } = 0;
 
-        /// <summary>
-        /// Gets or sets evolution iteration.
-        /// </summary>
-        public int Iteration { get; protected set; } = 0;
+    /// <summary>
+    /// Performs specified number of evolution steps (<see cref="GeneticEngine{C, T}.Evolve"/>) 
+    /// and calling <see cref="OnIterate"/> after each iteration. 
+    /// The operation could be terminated.
+    /// </summary>
+    /// <param name="iterations">number of iterations to perform</param>
+    public void Evolve(int iterations)
+    {
+        terminate = false;
 
-        /// <summary>
-        /// Performs specified number of evolution steps (<see cref="GeneticEngine{C, T}.Evolve"/>) 
-        /// and calling <see cref="OnIterate"/> after each iteration. 
-        /// The operation could be terminated.
-        /// </summary>
-        /// <param name="iterations">number of iterations to perform</param>
-        public void Evolve(int iterations)
+        for (int i = 0; i < iterations; i++)
         {
-            terminate = false;
-
-            for (int i = 0; i < iterations; i++)
+            if (terminate)
             {
-                if (terminate)
-                {
-                    break;
-                }
-
-                Evolve();
+                break;
             }
-        }
 
-        /// <summary>
-        /// Performs single evolution step (<see cref="GeneticEngine{C, T}.Evolve"/>) 
-        /// and calls <see cref="OnIterate"/> event.
-        /// </summary>
-        public override void Evolve()
-        {
-            base.Evolve();
+            Evolve();
+        }
+    }
 
-            Iteration++;
+    /// <summary>
+    /// Performs single evolution step (<see cref="GeneticEngine{C, T}.Evolve"/>) 
+    /// and calls <see cref="OnIterate"/> event.
+    /// </summary>
+    public override void Evolve()
+    {
+        base.Evolve();
 
-            OnIterate?.Invoke(this);
-        }
+        Iteration++;
 
-        /// <summary>
-        /// Terminates evolution process.
-        /// </summary>
-        public void Terminate() =>
-            terminate = true;
+        OnIterate?.Invoke(this);
     }
+
+    /// <summary>
+    /// Terminates evolution process.
+    /// </summary>
+    public void Terminate() =>
+        terminate = true;
 }

src/ChaosSoft.GeneticAlgorithm/ChaosSoft.GeneticAlgorithm.csproj

@@ -1,6 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <LangVersion>10.0</LangVersion>
     <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <NuspecProperties>version=$(Version)</NuspecProperties>
   </PropertyGroup>

src/ChaosSoft.GeneticAlgorithm/ChromosomeComparer.cs

@@ -1,39 +1,38 @@
 using System;
 using System.Collections.Generic;
 
-namespace ChaosSoft.GeneticAlgorithm
+namespace ChaosSoft.GeneticAlgorithm;
+
+internal class ChromosomeComparer<C, T> : IComparer<C> where C : IChromosome<C> where T : IComparable<T>
 {
-    internal class ChromosomeComparer<C, T> : IComparer<C> where C : IChromosome<C> where T : IComparable<T>
+    private readonly Dictionary<C, T> _cache = new Dictionary<C, T>();
+    private readonly IFitness<C, T> _fitnessFunction;
+
+    public ChromosomeComparer(IFitness<C, T> fitnessFunction)
     {
-        private readonly Dictionary<C, T> _cache = new Dictionary<C, T>();
-        private readonly IFitness<C, T> _fitnessFunction;
+        _fitnessFunction = fitnessFunction;
+    }
 
-        public ChromosomeComparer(IFitness<C, T> fitnessFunction)
-        {
-            _fitnessFunction = fitnessFunction;
-        }
+    public int Compare(C chromosome, C anotherChromosome)
+    {
+        T chromosomeFit = Fit(chromosome);
+        T anotherChromosomeFit = Fit(anotherChromosome);
+        int comparisonResult = anotherChromosomeFit.CompareTo(chromosomeFit);
+        return comparisonResult;
+    }
 
-        public int Compare(C chromosome, C anotherChromosome)
-        {
-            T chromosomeFit = Fit(chromosome);
-            T anotherChromosomeFit = Fit(anotherChromosome);
-            int comparisonResult = anotherChromosomeFit.CompareTo(chromosomeFit);
-            return comparisonResult;
-        }
+    public T Fit(C chromosome)
+    {
+        bool chromosomeFitCached = _cache.TryGetValue(chromosome, out T chromosomeFit);
 
-        public T Fit(C chromosome)
+        if (!chromosomeFitCached)
         {
-            bool chromosomeFitCached = _cache.TryGetValue(chromosome, out T chromosomeFit);
-
-            if (!chromosomeFitCached)
-            {
-                chromosomeFit = _fitnessFunction.Calculate(chromosome);
-                _cache.Add(chromosome, chromosomeFit);
-            }
-
-            return chromosomeFit;
+            chromosomeFit = _fitnessFunction.Calculate(chromosome);
+            _cache.Add(chromosome, chromosomeFit);
         }
 
-        public void ClearCache() => _cache.Clear();
+        return chromosomeFit;
     }
+
+    public void ClearCache() => _cache.Clear();
 }