Merge branch 'release/2.2.3'

Author: giacomelli

.gitignore

@@ -1,5 +1,5 @@
 # Build Folders (you can keep bin if you'd like, to store dlls and pdbs)
-[Bb]in/
+
 [Oo]bj/
 
 # mstest test results
@@ -88,7 +88,6 @@ csx
 AppPackages/
 
 # Others
-[Bb]in
 [Oo]bj
 sql
 TestResults
@@ -118,14 +117,6 @@ opencoverCoverage.xml
 *.nupkg
 stylecop-report.violations.xml
 stylecop-report.xml
-src/GeneticSharp.Extensions/ExpressionTree/ExpressionTreeChromosome.cs
-src/GeneticSharp.Extensions/Hangman/HangmanChromosome.cs
-src/GeneticSharp.Extensions/Hangman/HangmanEnglishFitness.cs
-src/GeneticSharp.Extensions/Numberlink/NumberlinkChromosome.cs
-src/GeneticSharp.Extensions/Numberlink/NumberlinkFitness.cs
-src/GeneticSharp.Extensions/Numberlink/NumberlinkSquare.cs
-src/GeneticSharp.Runner.ConsoleApp/Samples/HangmanSampleController.cs
-src/GeneticSharp.Runner.GtkApp/Samples/NumberlinkSampleController.cs
 dupFinder-report.xml
 Issue9Sample.sln.GhostDoc.xml
 /build

src/GeneticSharp.Domain.UnitTests/Chromosomes/BinaryChromosomeBaseTest.cs

@@ -9,7 +9,7 @@ namespace GeneticSharp.Domain.UnitTests.Chromosomes
 	public class BinaryChromosomeBaseTest
 	{
 		[Test]
-		public void FlipBit_Index_ValueFlip()
+		public void FlipGene_Index_ValueFlip()
 		{
 			var target = new BinaryChromosomeStub (2);
 			target.ReplaceGenes (0, new Gene[] {

src/GeneticSharp.Domain.UnitTests/Chromosomes/FloatingPointChromosomeTest.cs

@@ -83,6 +83,26 @@ public void Constructor_FromZeroToZero_Double()
 
 			Assert.AreEqual(0, actual);
 		}
-	}
+
+        [Test]
+        public void FlipGene_Index_ValueFlip()
+        {
+            RandomizationProvider.Current = Substitute.For<IRandomization>();
+            RandomizationProvider.Current.GetDouble(0, 0).Returns(0);
+            var target = new FloatingPointChromosome(0, 0, 2);
+
+            target.FlipGene(0);
+            Assert.AreEqual("10000000000000000000000000000000", target.ToString());
+
+            target.FlipGene(1);
+            Assert.AreEqual("11000000000000000000000000000000", target.ToString());
+
+            target.FlipGene(31);
+            Assert.AreEqual("11000000000000000000000000000001", target.ToString());
+
+            target.FlipGene(30);
+            Assert.AreEqual("11000000000000000000000000000011", target.ToString());
+        }
+    }
 }
 

src/GeneticSharp.Domain.UnitTests/Chromosomes/IntegerChromosomeTest.cs

@@ -49,6 +49,31 @@ public void CreateNew_NoArgs_NewInstance()
             var actual = target.ToInteger();
             Assert.AreEqual(-2, actual);
         }
+
+        [Test]
+        public void FlipGene_Index_ValueFlip()
+        {
+            RandomizationProvider.Current = Substitute.For<IRandomization>();
+            RandomizationProvider.Current.GetInt(0, 3).Returns(-2);
+
+            var target = new IntegerChromosome(0, 3);
+            Assert.AreEqual("11111111111111111111111111111110", target.ToString());
+
+            target.FlipGene(0);
+            Assert.AreEqual("01111111111111111111111111111110", target.ToString());
+
+            target.FlipGene(1);
+            Assert.AreEqual("00111111111111111111111111111110", target.ToString());
+
+            target.FlipGene(10);
+            Assert.AreEqual("00111111110111111111111111111110", target.ToString());
+
+            target.FlipGene(31);
+            Assert.AreEqual("00111111110111111111111111111111", target.ToString());
+
+            target.FlipGene(30);
+            Assert.AreEqual("00111111110111111111111111111101", target.ToString());
+        }
     }
 }
 

src/GeneticSharp.Domain/Chromosomes/BinaryChromosomeBase.cs

@@ -27,7 +27,7 @@ protected BinaryChromosomeBase(int length)
 		/// <remarks>>
 		/// If gene's value is 0, the it will be flip to 1 and vice-versa.</remarks>
 		/// <param name="index">The gene index.</param>
-		public void FlipGene (int index)	
+		public virtual void FlipGene (int index)	
 		{
 			var value = (int) GetGene (index).Value;
 

src/GeneticSharp.Domain/Chromosomes/IntegerChromosome.cs

@@ -29,7 +29,6 @@ public IntegerChromosome(int minValue, int maxValue) : base(32)
 			CreateGenes();
 		}
 
-		#region implemented abstract members of ChromosomeBase
 		/// <summary>
 		/// Generates the gene.
 		/// </summary>
@@ -51,8 +50,6 @@ public override IChromosome CreateNew()
 			return new IntegerChromosome(m_minValue, m_maxValue);
 		}
 
-		#endregion
-
 		/// <summary>
 		/// Converts the chromosome to its integer representation.
 		/// </summary>
@@ -75,6 +72,20 @@ public override string ToString()
         {
             return String.Join("", GetGenes().Reverse().Select(g => (bool) g.Value ? "1" : "0").ToArray());
         }
+
+        /// <summary>
+        /// Flips the gene.
+        /// </summary>
+        /// <remarks>>
+        /// If gene's value is 0, the it will be flip to 1 and vice-versa.</remarks>
+        /// <param name="index">The gene index.</param>
+        public override void FlipGene(int index)
+        {
+            var realIndex = Math.Abs(31 - index);
+            var value = (bool)GetGene(realIndex).Value;
+
+            ReplaceGene(realIndex, new Gene(!value));
+        }
     }
 }
 

src/GeneticSharp.Domain/Crossovers/PartiallyMappedCrossover.cs

@@ -13,7 +13,7 @@ namespace GeneticSharp.Domain.Crossovers
     /// The partially-mapped crossover operator was suggested by Gold- berg and Lingle (1985). 
     /// It passes on ordering and value information from the parent tours to the offspring tours. 
     /// A portion of one parent’s string is mapped onto a portion of the other parent’s string and the remaining information is exchanged.
-    /// <see href="http://lev4projdissertation.googlecode.com/svn-history/r100/trunk/reading/read/aiRev99.pdf">Genetic Algorithms for the Travelling Salesman Problem - A Review of Representations and Operators</see>
+    /// <see href="http://www.dca.fee.unicamp.br/~gomide/courses/EA072/artigos/Genetic_Algorithm_TSPR_eview_Larranaga_1999.pdf">Genetic Algorithms for the Travelling Salesman Problem - A Review of Representations and Operators</see>
     /// </remarks>
     /// </summary>
     [DisplayName("Partially Mapped (PMX)")]
@@ -44,26 +44,26 @@ protected override IList<IChromosome> PerformCross(IList<IChromosome> parents)
                 throw new CrossoverException(this, "The Partially Mapped Crossover (PMX) can be only used with ordered chromosomes. The specified chromosome has repeated genes.");
             }
 
-            // Chosse the thow parents.
+            // Choose the thow parents.
             var parent1 = parents[0];
             var parent2 = parents[1];
 
             // Create, sort and define the cut point indexes.
             var cutPointsIndexes = RandomizationProvider.Current.GetUniqueInts(2, 0, parent1.Length);
             Array.Sort(cutPointsIndexes);
             var firstCutPointIndex = cutPointsIndexes[0];
-            var secondCutPointIdnex = cutPointsIndexes[1];
+            var secondCutPointIndex = cutPointsIndexes[1];
 
             // Parent1 creates the mapping section.
             var parent1Genes = parent1.GetGenes();
-            var parent1MappingSection = parent1Genes.Skip(firstCutPointIndex).Take((secondCutPointIdnex - firstCutPointIndex) + 1).ToArray();
+            var parent1MappingSection = parent1Genes.Skip(firstCutPointIndex).Take((secondCutPointIndex - firstCutPointIndex) + 1).ToArray();
 
             // Parent12 creates the mapping section.
             var parent2Genes = parent2.GetGenes();
-            var parent2MappingSection = parent2Genes.Skip(firstCutPointIndex).Take((secondCutPointIdnex - firstCutPointIndex) + 1).ToArray();
+            var parent2MappingSection = parent2Genes.Skip(firstCutPointIndex).Take((secondCutPointIndex - firstCutPointIndex) + 1).ToArray();
 
             // The new offsprings are created and 
-            // their genes ar replaced starat in the first cut point index
+            // their genes ar replaced start in the first cut point index
             // and using the genes in the mapping section from parent 1 e 2.
             var offspring1 = parent1.CreateNew();
             var offspring2 = parent2.CreateNew();
@@ -75,16 +75,16 @@ protected override IList<IChromosome> PerformCross(IList<IChromosome> parents)
 
             for (int i = 0; i < length; i++)
             {
-                if (i >= firstCutPointIndex && i <= secondCutPointIdnex)
+                if (i >= firstCutPointIndex && i <= secondCutPointIndex)
                 {
                     continue;
                 }
 
-                var geneForUffspring1 = GetGeneNotInMappingSection(parent1Genes[i], parent2MappingSection, parent1MappingSection);
-                offspring1.ReplaceGene(i, geneForUffspring1);
+                var geneForOffspring1 = GetGeneNotInMappingSection(parent1Genes[i], parent2MappingSection, parent1MappingSection);
+                offspring1.ReplaceGene(i, geneForOffspring1);
 
-                var geneForoffspring2 = GetGeneNotInMappingSection(parent2Genes[i], parent1MappingSection, parent2MappingSection);
-                offspring2.ReplaceGene(i, geneForoffspring2);
+                var geneForOffspring2 = GetGeneNotInMappingSection(parent2Genes[i], parent1MappingSection, parent2MappingSection);
+                offspring2.ReplaceGene(i, geneForOffspring2);
             }
 
             return new List<IChromosome>() { offspring1, offspring2 };