Added the option to retry the search for solutions using the top 5 organisms from the last search in the initial organism list.

Author: Luaancz

SalemOptimizer/MainForm.Designer.cs

@@ -135,50 +135,60 @@ private async void btnFindSolution_Click(object sender, EventArgs e)
                 return;
             }
 
+            await FindSolution(false);
+        }
+
+        Organism[] bestOrganisms;
+
+        private async Task FindSolution(bool useLastBest)
+        {
             try
             {
                 btnFindSolution.Enabled = false;
+                btnRetryWithBest.Enabled = false;
                 btnStop.Enabled = true;
 
                 UseWaitCursor = true;
 
                 var problem =
                     new Problem()
-                    .Add(ProficiencyKind.ArtsAndCrafts,         nudArtsAndCrafts.Value)
-                    .Add(ProficiencyKind.CloakAndDagger,        nudCloakAndDagger.Value)
-                    .Add(ProficiencyKind.FaithAndWisdom,        nudFaithAndWisdom.Value)
-                    .Add(ProficiencyKind.FloraAndFauna,         nudFloraAndFauna.Value)
-                    .Add(ProficiencyKind.HammerAndNail,         nudHammerAndNail.Value)
-                    .Add(ProficiencyKind.HerbsAndSprouts,       nudHerbsAndSprouts.Value)
+                    .Add(ProficiencyKind.ArtsAndCrafts, nudArtsAndCrafts.Value)
+                    .Add(ProficiencyKind.CloakAndDagger, nudCloakAndDagger.Value)
+                    .Add(ProficiencyKind.FaithAndWisdom, nudFaithAndWisdom.Value)
+                    .Add(ProficiencyKind.FloraAndFauna, nudFloraAndFauna.Value)
+                    .Add(ProficiencyKind.HammerAndNail, nudHammerAndNail.Value)
+                    .Add(ProficiencyKind.HerbsAndSprouts, nudHerbsAndSprouts.Value)
                     .Add(ProficiencyKind.HuntingAndHideworking, nudHuntingAndHideworking.Value)
-                    .Add(ProficiencyKind.LawAndLore,            nudLawAndLore.Value)
-                    .Add(ProficiencyKind.MinesAndMountains,     nudMinesAndMountains.Value)
-                    .Add(ProficiencyKind.NaturalPhilosophy,     nudNaturalPhilosophy.Value)
-                    .Add(ProficiencyKind.PerenialPhilosophy,    nudPerenialPhilosophy.Value)
-                    .Add(ProficiencyKind.SparksAndEmbers,       nudSparksAndEmbers.Value)
-                    .Add(ProficiencyKind.StocksAndCultivars,    nudStocksAndCultivars.Value)
-                    .Add(ProficiencyKind.SugarAndSpice,         nudSugarAndSpice.Value)
-                    .Add(ProficiencyKind.ThreadAndNeedle,       nudThreadAndNeedle.Value);
+                    .Add(ProficiencyKind.LawAndLore, nudLawAndLore.Value)
+                    .Add(ProficiencyKind.MinesAndMountains, nudMinesAndMountains.Value)
+                    .Add(ProficiencyKind.NaturalPhilosophy, nudNaturalPhilosophy.Value)
+                    .Add(ProficiencyKind.PerenialPhilosophy, nudPerenialPhilosophy.Value)
+                    .Add(ProficiencyKind.SparksAndEmbers, nudSparksAndEmbers.Value)
+                    .Add(ProficiencyKind.StocksAndCultivars, nudStocksAndCultivars.Value)
+                    .Add(ProficiencyKind.SugarAndSpice, nudSugarAndSpice.Value)
+                    .Add(ProficiencyKind.ThreadAndNeedle, nudThreadAndNeedle.Value);
 
                 var availableInspirationals = lvInspirationals.CheckedItems.OfType<ListViewItem>().Select(i => ((Inspirational)i.Tag).Clone()).ToArray();
 
                 cancellationTokenSource = new CancellationTokenSource();
 
-                var solvers = Enumerable.Range(1, 4).Select(i => Task.Run(() => new Solver(problem, availableInspirationals, cancellationTokenSource.Token).Solve())).ToArray();
+                var solvers = Enumerable.Range(1, 4).Select(i => Task.Run(() => new Solver(problem, availableInspirationals, cancellationTokenSource.Token, useLastBest ? bestOrganisms : null).Solve())).ToArray();
 
                 var best = await Task.WhenAll(solvers);
 
                 // Aggregate the best results and fill them into the results control
-                var bestOfAll = 
+                var bestOfAll =
                     best
                     .SelectMany(i => i)
-                    .Select(i => new { Name = i.ToString(), Solution = i.Solution })
+                    .Select(i => new { Name = i.ToString(), Organism = i, Solution = i.Solution })
                     .GroupBy(i => i.Name)
                     .Select(i => i.First())
                     .OrderBy(i => i.Solution.CostTotal)
                     .Take(5)
                     .ToArray();
 
+                bestOrganisms = bestOfAll.Select(i => i.Organism.Clone()).ToArray();
+
                 lvSolutions.Items.Clear();
 
                 foreach (var organism in bestOfAll)
@@ -193,6 +203,7 @@ private async void btnFindSolution_Click(object sender, EventArgs e)
             finally
             {
                 btnFindSolution.Enabled = true;
+                btnRetryWithBest.Enabled = bestOrganisms != null;
                 btnStop.Enabled = false;
 
                 UseWaitCursor = false;
@@ -264,5 +275,17 @@ private void btnResetAll_Click(object sender, EventArgs e)
             nudSugarAndSpice.Value = 0;
             nudThreadAndNeedle.Value = 0;
         }
+
+        private async void btnRetryWithBest_Click(object sender, EventArgs e)
+        {
+            if (lvInspirationals.CheckedItems.Count == 0)
+            {
+                toolTipError.Show("You have to select at least one available inspirational.", lblInspirationals, 1000);
+
+                return;
+            }
+
+            await FindSolution(true);
+        }
     }
 }

SalemOptimizer/MainForm.cs

@@ -32,6 +32,6 @@
 // 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.2.2.0")]
-[assembly: AssemblyFileVersion("1.2.2.0")]
-[assembly: AssemblyInformationalVersion("22. 1. 2015")]
+[assembly: AssemblyVersion("1.3.0.0")]
+[assembly: AssemblyFileVersion("1.3.0.0")]
+[assembly: AssemblyInformationalVersion("23. 1. 2015")]

SalemOptimizer/Properties/AssemblyInfo.cs

@@ -12,12 +12,14 @@ public class Solver
         private readonly Problem problem;
         private readonly Inspirational[] availableInspirationals;
         private readonly CancellationToken cancellationToken;
+        private readonly Organism[] includedOrganisms;
 
-        public Solver(Problem problem, Inspirational[] availableInspirationals, CancellationToken cancellationToken)
+        public Solver(Problem problem, Inspirational[] availableInspirationals, CancellationToken cancellationToken, Organism[] includedOrganisms)
         {
             this.problem = problem;
             this.availableInspirationals = availableInspirationals;
             this.cancellationToken = cancellationToken;
+            this.includedOrganisms = includedOrganisms;
         }
 
         public Inspirational[] AvailableInspirationals { get { return availableInspirationals; } }
@@ -36,6 +38,8 @@ public Organism[] Solve()
                 leaderboard.AddOrganism(organism);
             }
 
+            if (includedOrganisms != null) organisms.AddRange(includedOrganisms.Select(i => i.Clone()));
+
             var best = default(Organism);
             var worst = default(Organism);
             var bestCost = double.MaxValue;