Merge pull request #5 from supix/devel

Bug fix on solution encoding.
supix · Apr 25, 2017 · 59f9937 · 59f9937
2 parents d993b59 + e231d2e
commit 59f9937
Show file tree

Hide file tree

Showing 39 changed files with 114 additions and 74 deletions.
diff --git a/docs/images/SampleSimpleWorkshift.png b/docs/images/SampleSimpleWorkshift.png
diff --git a/sources/NaturalShift.IntegrationTests/TestConsecutiveSlotAptitude.cs b/sources/NaturalShift.IntegrationTests/TestConsecutiveSlotAptitude.cs
@@ -19,10 +19,10 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.Model.ProblemModel.FluentInterfaces;
 using NaturalShift.SolvingEnvironment;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.IntegrationTests
 {
@@ -73,11 +73,17 @@ public void ZeroConsecutiveSlotAptitudeIsRespected()
 
             var solution = solvingEnvironment.Solve();
 
-            for (int item = 0; item < problem.Items; item++)
-                for (int day = 0; day < problem.Days - 1; day++)
-                    if ((solution.Allocations[item, day] >= fromSlot1) &&
-                        ((solution.Allocations[item, day] <= toSlot1)))
-                        Assert.That(solution.Allocations[item, day + 1], Is.Null.Or.Not.InRange(fromSlot2, toSlot2));
+            for (int day = 0; day < problem.Days - 1; day++)
+                for (int slot = fromSlot1; slot <= toSlot1; slot++)
+                {
+                    if (day < problem.Days - 2)
+                    {
+                        var chosenItem = solution.Allocations[day, slot];
+                        if (chosenItem.HasValue)
+                            for (int slot2 = fromSlot2; slot2 <= toSlot2; slot2++)
+                                Assert.That(solution.Allocations[day + 1, slot2], Is.Null.Or.Not.EqualTo(chosenItem));
+                    }
+                }
         }
     }
 }
diff --git a/sources/NaturalShift.IntegrationTests/TestSlotClosure.cs b/sources/NaturalShift.IntegrationTests/TestSlotClosure.cs
@@ -19,10 +19,10 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.Model.ProblemModel.FluentInterfaces;
 using NaturalShift.SolvingEnvironment;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.IntegrationTests
 {
@@ -72,9 +72,9 @@ public void ClosedSlotsAreEmpty()
 
             var solution = solvingEnvironment.Solve();
 
-            for (int item = 0; item < problem.Items; item++)
-                for (int day = fromDay; day <= toDay; day++)
-                    Assert.That(solution.Allocations[item, day], Is.Null.Or.Not.InRange(fromSlot, toSlot));
+            for (int day = fromDay; day <= toDay; day++)
+                for (int slot = fromSlot; slot <= toSlot; slot++)
+                    Assert.That(solution.Allocations[day, slot], Is.Null);
         }
     }
 }
diff --git a/sources/NaturalShift.IntegrationTests/TestUnavailableItem.cs b/sources/NaturalShift.IntegrationTests/TestUnavailableItem.cs
@@ -19,10 +19,10 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.Model.ProblemModel.FluentInterfaces;
 using NaturalShift.SolvingEnvironment;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.IntegrationTests
 {
@@ -81,9 +81,9 @@ public void UnavailableItemDoesntShift()
 
             var solution = solvingEnvironment.Solve();
 
-            for (int item = fromItem; item <= toItem; item++)
-                for (int day = fromDay; day <= toDay; day++)
-                    Assert.That(solution.Allocations[item, day], Is.Null.Or.Not.InRange(fromSlot, toSlot));
+            for (int day = fromDay; day <= toDay; day++)
+                for (int slot = fromSlot; slot <= toSlot; slot++)
+                    Assert.That(solution.Allocations[day, slot], Is.Null.Or.Not.InRange(fromItem, toItem));
         }
     }
 }
diff --git a/sources/NaturalShift.UnitTests/TestAllocationState.cs b/sources/NaturalShift.UnitTests/TestAllocationState.cs
@@ -19,11 +19,11 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using Moq;
 using NaturalShift.SolvingEnvironment.ItemSelectors;
 using NaturalShift.SolvingEnvironment.Matrix;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestComputationTerminationManager.cs b/sources/NaturalShift.UnitTests/TestComputationTerminationManager.cs
@@ -19,9 +19,9 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.SolvingEnvironment;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestIntRange.cs b/sources/NaturalShift.UnitTests/TestIntRange.cs
@@ -19,9 +19,9 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.Model.ProblemModel;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestMultiThreadedSolvingEnvironment.cs b/sources/NaturalShift.UnitTests/TestMultiThreadedSolvingEnvironment.cs
@@ -19,11 +19,11 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using Moq;
 using NaturalShift.Model.ProblemModel;
 using NaturalShift.SolvingEnvironment;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestProblem.cs b/sources/NaturalShift.UnitTests/TestProblem.cs
@@ -19,9 +19,9 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.Model.ProblemModel;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestProblemBuilder.cs b/sources/NaturalShift.UnitTests/TestProblemBuilder.cs
@@ -19,9 +19,9 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.Model.ProblemModel.FluentInterfaces;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestRouletteWheel.cs b/sources/NaturalShift.UnitTests/TestRouletteWheel.cs
@@ -19,9 +19,9 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.SolvingEnvironment.ItemSelectors;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestShiftMatrix.cs b/sources/NaturalShift.UnitTests/TestShiftMatrix.cs
@@ -19,9 +19,9 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using NaturalShift.SolvingEnvironment.Matrix;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift.UnitTests/TestSolvingEnvironmentBuilder.cs b/sources/NaturalShift.UnitTests/TestSolvingEnvironmentBuilder.cs
@@ -19,11 +19,11 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
 using Moq;
 using NaturalShift.Model.ProblemModel;
 using NaturalShift.SolvingEnvironment;
 using NUnit.Framework;
-using System;
 
 namespace NaturalShift.UnitTests
 {

diff --git a/sources/NaturalShift/Model/SolutionModel/ISolution.cs b/sources/NaturalShift/Model/SolutionModel/ISolution.cs
@@ -24,7 +24,7 @@ namespace NaturalShift.Model.SolutionModel
     public interface ISolution
     {
         /// <summary>
-        /// The matrix [item, day] whose value is the slot index covered (if any).
+        /// The matrix [day, slot] whose value is the item index covering the slot in the day (if any).
         /// </summary>
         int?[,] Allocations { get; }
 

diff --git a/sources/NaturalShift/Model/SolutionModel/Solution.cs b/sources/NaturalShift/Model/SolutionModel/Solution.cs
@@ -19,12 +19,20 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System.Collections.Generic;
 using System.Text;
 
 namespace NaturalShift.Model.SolutionModel
 {
     public class Solution : ISolution
     {
+        private readonly int numberOfItems;
+
+        public Solution(int numberOfItems)
+        {
+            this.numberOfItems = numberOfItems;
+        }
+
         public double Fitness { get; set; }
         public int?[,] Allocations { get; set; }
         public int EvaluatedSolutions { get; set; }
@@ -36,18 +44,39 @@ public override string ToString()
             sb.AppendLine(Fitness.ToString());
             sb.Append("Evaluated solutions: ");
             sb.AppendLine(EvaluatedSolutions.ToString());
-            for (int item = 0; item < Allocations.GetLength(0); item++)
+
+            for (int item = 0; item < numberOfItems; item++)
             {
-                for (int day = 0; day < Allocations.GetLength(1); day++)
+                for (int day = 0; day < Allocations.GetLength(0); day++)
                 {
-                    sb.Append(Allocations[item, day].HasValue ? Allocations[item, day].Value.ToString().PadLeft(3) : "  -");
-                    if (day < Allocations.GetLength(1) - 1)
-                        sb.Append(",");
+                    var shifts = new List<int>();
+                    for (int slot = 0; slot < Allocations.GetLength(1); slot++)
+                    {
+                        if (Allocations[day, slot] == item)
+                            shifts.Add(slot);
+                    }
+
+                    sb.Append(shiftsToString(shifts));
+
+                    if (day < Allocations.GetLength(0) - 1)
+                        sb.Append(", ");
                 }
                 sb.AppendLine();
             }
 
             return sb.ToString();
         }
+
+        private string shiftsToString(List<int> shifts)
+        {
+            if (shifts.Count == 0)
+                return " -";
+
+            if (shifts.Count == 1)
+                return shifts[0].ToString().PadLeft(2);
+
+            var joinedShifts = string.Join(",", shifts);
+            return string.Format("({0})", joinedShifts);
+        }
     }
 }
diff --git a/sources/NaturalShift/NaturalShift.nuspec b/sources/NaturalShift/NaturalShift.nuspec
@@ -8,10 +8,17 @@
     <owners>supix</owners>
     <licenseUrl>https://www.gnu.org/licenses/agpl-3.0.en.html</licenseUrl>
     <projectUrl>https://github.com/supix/NaturalShift</projectUrl>
-    <iconUrl>https://s12.postimg.org/mpp0zumf1/Logo.png</iconUrl>
+    <iconUrl>https://s17.postimg.org/s9ditc3an/Natural_Shift_Logo.png</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>XML documentation file is distributed along with the main assembly.</releaseNotes>
+    <releaseNotes> Bug fix on solution encoding.
+
+    Solution encoding allows for multiple slots
+    covered by the same item in the same day (which is possible in case of
+    compatible slots enabled in problem configuration).
+
+    Solution.ToString() method handles this case as well: for instance, if the
+    1st and 2nd slots are simultaneously covered, the solution shows the string `(1, 2)`.</releaseNotes>
     <copyright>Copyright 2016-2017</copyright>
     <tags>workshift shift fair arrangement shifter table night genetic</tags>
   </metadata>

diff --git a/sources/NaturalShift/Properties/AssemblyInfo.cs b/sources/NaturalShift/Properties/AssemblyInfo.cs
@@ -53,8 +53,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyFileVersion("1.0.2.0")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyFileVersion("1.0.3.0")]
 [assembly: InternalsVisibleTo("NaturalShift.UnitTests")]
 [assembly: InternalsVisibleTo("NaturalShift.IntegrationTests")]
 [assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")]
diff --git a/sources/NaturalShift/SolvingEnvironment/Chromosomes/ChromosomeProcessor.cs b/sources/NaturalShift/SolvingEnvironment/Chromosomes/ChromosomeProcessor.cs
@@ -19,11 +19,11 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
+using System;
+using System.Collections.Generic;
 using NaturalShift.SolvingEnvironment.Constraints;
 using NaturalShift.SolvingEnvironment.Matrix;
 using NaturalShift.SolvingEnvironment.MatrixEnumerators;
-using System;
-using System.Collections.Generic;
 
 namespace NaturalShift.SolvingEnvironment.Chromosomes
 {

diff --git a/sources/NaturalShift/SolvingEnvironment/ComputationTerminationManager.cs b/sources/NaturalShift/SolvingEnvironment/ComputationTerminationManager.cs
@@ -19,8 +19,8 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
-using NaturalShift.SolvingEnvironment.Utils;
 using System;
+using NaturalShift.SolvingEnvironment.Utils;
 
 namespace NaturalShift.SolvingEnvironment
 {

diff --git a/sources/NaturalShift/SolvingEnvironment/Constraints/ConsecutiveSlotAptitudeEnforcer.cs b/sources/NaturalShift/SolvingEnvironment/Constraints/ConsecutiveSlotAptitudeEnforcer.cs
@@ -19,8 +19,8 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
-using NaturalShift.SolvingEnvironment.Matrix;
 using System;
+using NaturalShift.SolvingEnvironment.Matrix;
 
 namespace NaturalShift.SolvingEnvironment.Constraints
 {

diff --git a/sources/NaturalShift/SolvingEnvironment/Constraints/ConstraintsBuilder.cs b/sources/NaturalShift/SolvingEnvironment/Constraints/ConstraintsBuilder.cs
@@ -19,8 +19,8 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
-using NaturalShift.Model.ProblemModel;
 using System.Collections.Generic;
+using NaturalShift.Model.ProblemModel;
 
 namespace NaturalShift.SolvingEnvironment.Constraints
 {

diff --git a/sources/NaturalShift/SolvingEnvironment/Constraints/CrossItemAptitudeEnforcer.cs b/sources/NaturalShift/SolvingEnvironment/Constraints/CrossItemAptitudeEnforcer.cs
@@ -19,8 +19,8 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
-using NaturalShift.SolvingEnvironment.Matrix;
 using System;
+using NaturalShift.SolvingEnvironment.Matrix;
 
 namespace NaturalShift.SolvingEnvironment.Constraints
 {

diff --git a/sources/NaturalShift/SolvingEnvironment/Constraints/MaxWorkingDaysEnforcer.cs b/sources/NaturalShift/SolvingEnvironment/Constraints/MaxWorkingDaysEnforcer.cs
@@ -19,8 +19,8 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
-using NaturalShift.SolvingEnvironment.Matrix;
 using System;
+using NaturalShift.SolvingEnvironment.Matrix;
 
 namespace NaturalShift.SolvingEnvironment.Constraints
 {

diff --git a/sources/NaturalShift/SolvingEnvironment/Fitness/BusySlotsAreGood.cs b/sources/NaturalShift/SolvingEnvironment/Fitness/BusySlotsAreGood.cs
@@ -19,9 +19,9 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
-using NaturalShift.SolvingEnvironment.Matrix;
 using System;
 using System.Diagnostics;
+using NaturalShift.SolvingEnvironment.Matrix;
 
 namespace NaturalShift.SolvingEnvironment.Fitness
 {

diff --git a/sources/NaturalShift/SolvingEnvironment/Fitness/CurrentAptitudeFulfilled.cs b/sources/NaturalShift/SolvingEnvironment/Fitness/CurrentAptitudeFulfilled.cs
@@ -19,10 +19,10 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // </copyright>
 //-----------------------------------------------------------------------
-using NaturalShift.SolvingEnvironment.Matrix;
 using System;
 using System.Diagnostics;
 using System.Linq;
+using NaturalShift.SolvingEnvironment.Matrix;
 
 namespace NaturalShift.SolvingEnvironment.Fitness
 {