ATITD-Tools/Desert-Paint-Codex Changeset

Changeset - d6859ea7177f

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen - 3 years ago 2021-09-10 00:02:16
jason@hiddenachievement.com

Add some sanity checks on min/max concentration and min/max reagents in recipe generation. Also, clear out the search queue when generation has finished so the queue isn't loaded next time. This fixes the start/resume button state when entering the recipe generator after a prior run had finished.

1 file changed with 12 insertions and 0 deletions:

Services/RecipeGenerator.cs

0 comments (0 inline, 0 general)

Services/RecipeGenerator.cs

➞

Show inline comments

@@ ... / @@ -173,32 +173,38 @@ namespace DesertPaintCodex.Services @@
         //                per-reagent value
         public void BeginRecipeGeneration(uint minConcentration, uint maxConcentration, uint minReagents, uint maxReagents, uint fullQuantityDepth, uint fullQuantity)
+        {
             if (_running)
+            {
                 // Already running - don't start again
                 return;
+            }
             MinConcentration = minConcentration;
             MaxConcentration = maxConcentration;
             MinReagents = minReagents;
             MaxReagents = maxReagents;
             FullQuantity = fullQuantity;
             FullQuantityDepth = fullQuantityDepth;
             // Sanity check
             if (MinConcentration < 10) MinConcentration = 10;
             if (MaxConcentration < MinConcentration) MaxConcentration = MinConcentration;
             if (MinReagents < 1) MinReagents = 1;
             if (MaxReagents < MinReagents) MaxReagents = MinReagents;
             // first, sort reagents by cost.
             InitSortedReagents();
             _totalReagents = (uint)_costSortedReagents.Count;
             // Pre-populate recipes list with:
             // 1) 1-ingredient recipes @ min concentration for all enabled ingredients with a count >= min concentration
             // 2) any previously-generated recipes
             WriteLog($"===================== BEGIN RECIPE GENERATION ========================== {DateTime.Now}");
             WriteLog("Pre-populating basic recipes.");
             int enabledReagentCount = 0;
             PaintRecipe recipe = new();
             foreach (var reagent in _costSortedReagents.Where(reagent => reagent.Enabled))
+            {
                 if (!reagent.IsCatalyst && ((reagent.RecipeMax >= minConcentration) || ((FullQuantityDepth > 0) && (FullQuantity >= minConcentration))))
+                {
@@ ... / @@ -508,32 +514,38 @@ namespace DesertPaintCodex.Services @@
                     _searchQueue.Enqueue(node);
+                }
             } while (!_requestCancel);
             bool done;
             lock(_workerLock)
+            {
                 --_runningThreads;
                 //generatorThreads.Remove(Thread.CurrentThread);
                 done = (_runningThreads == 0);
+            }
             if (!done) return;
             _running       = false;
             if (!_requestCancel && !_searchQueue.IsEmpty)
+            {
                 Debug.WriteLine($"Recipe generation complete, but search queue isn't empty {_searchQueue.Count}.");
                 WriteLog($"Recipe generation complete, but search queue isn't empty {_searchQueue.Count}.");
                 _searchQueue.Clear();
+            }
             _requestCancel = false;
             Finished?.Invoke(this, EventArgs.Empty);
+        }
         // Add the cheapest recipe to the recipe list
         // returns the discarded recipe from the pair (or null if no original recipe to replace)
         private void AddCheapestRecipe(PaintRecipe recipe)
+        {
             if (!recipe.IsValidForConcentration(MinConcentration)) return;
             string colorName = PaletteService.FindNearest(recipe.ReactedColor);
             lock (_workerLock)
+            {
                 uint newCost = recipe.Cost;
                 if (_recipeCosts.TryGetValue(colorName, out var cost))
+                {

0 comments (0 inline, 0 general)