Changeset - d63ade4d8489
Parent rev.
Child rev.
[Not reviewed]
R_T10_1.6 default
0 5 0
Jason Maltzen - 3 years ago 2021-08-16 07:58:58
jason@hiddenachievement.com
Recipe generation no longer incorrectly skips some recipes when a catalyst is included. This should result in some less expensive receips, and more total recipes tested.
5 files changed with 239 insertions and 28 deletions:
Models/PaintRecipe.cs
21
Models/RecipeSearchNode.cs
53
2
Models/Settings.cs
3
2
Services/RecipeGenerator.cs
128
16
ViewModels/RecipeGeneratorViewModel.cs
34
8
0 comments (0 inline, 0 general)
Models/PaintRecipe.cs
➞
Show inline comments
...
 
@@ -271,8 +271,29 @@ namespace DesertPaintCodex.Models
 
                return cost;
 
            }
 
        }
 

			




	
	
	
		
 
        public uint Concentration


			




	
	
	
		
 
        {


			




	
	
	
		
 
            get


			




	
	
	
		
 
            {


			




	
	
	
		
 
                uint concentration = 0;


			




	
	
	
		
 
                foreach (ReagentQuantity ingredient in _recipe)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    string reagentName = ingredient.Name;


			




	
	
	
		
 
                    if (string.IsNullOrEmpty(reagentName))


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        continue;


			




	
	
	
		
 
                    }


			




	
	
	
		
 

			




	
	
	
		
 
                    Reagent reagent = ReagentService.GetReagent(reagentName);


			




	
	
	
		
 
                    if (reagent.IsCatalyst) continue;


			




	
	
	
		
 
                    concentration += ingredient.Quantity;


			




	
	
	
		
 
                }


			




	
	
	
		
 
                return concentration;


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public uint GetBulkCost(uint quantity)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            uint cost = 0;


			




	
	
	
		
 
            foreach (ReagentQuantity ingredient in _recipe)


			




        

    


    
    

    

        

                

                    Models/RecipeSearchNode.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -26,8 +26,12 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
        public uint FullQuantityDepth { get; set; }


			




	
	
	
		
 
        public uint FullQuantity { get; set; }


			




	
	
	
		
 
        public uint MinReagents { get; set; }


			




	
	
	
		
 

			




	
	
	
		
 
        public bool ShouldLog { get; private set; }


			




	
	
	
		
 

			




	
	
	
		
 
        public Action<string>? WriteLog = null;


			




	
	
	
		
 

			




	
	
	
		
 
        private uint _maxReagents;


			




	
	
	
		
 
        public uint MaxReagents


			




	
	
	
		
 
        {


			




	
	
	
		
 
            get => _maxReagents;


			




	...
	
		
 
@@ -70,8 +74,10 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            for (int i = 0; i < MaxReagents; ++i)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                CurrentWeights[i] = other.CurrentWeights[i];


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public RecipeSearchNode(List<Reagent> costSortedReagents, uint[] reagents)


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -107,8 +113,10 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            MinReagents = (uint) _nextReagentPos;


			




	
	
	
		
 
            MaxReagents = (uint) _nextReagentPos;


			




	
	
	
		
 
            CurrentWeights = new uint[MaxReagents];


			




	
	
	
		
 
            UsedQuantity = 0;


			




	
	
	
		
 

			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        // top-level search


			




	
	
	
		
 
        public RecipeSearchNode(List<Reagent> costSortedReagents, uint startReagent)


			




	...
	
		
 
@@ -131,8 +139,10 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            MinReagents = 1; // don't iterate up beyond the start reagent


			




	
	
	
		
 
            MaxReagents = 1;


			




	
	
	
		
 
            CurrentWeights = new uint[MaxReagents];


			




	
	
	
		
 
            UsedQuantity = 0;


			




	
	
	
		
 

			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public RecipeSearchNode(List<Reagent> costSortedReagents)


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -153,8 +163,16 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            MinReagents = 0;


			




	
	
	
		
 
            MaxReagents = 1;


			




	
	
	
		
 
            CurrentWeights = new uint[MaxReagents];


			




	
	
	
		
 
            UsedQuantity = 0;


			




	
	
	
		
 

			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void RefreshShouldLog()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            ShouldLog = false;


			




	
	
	
		
 
            // (ReagentCount == 5) && (GetReagent(0).Name == "Iron") && (GetReagent(1).Name == "Red Sand") && (GetReagent(2).Name == "Sulfur") && (GetReagent(3).Name == "Carrot") && (GetReagent(4).Name == "Copper");


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public Reagent GetReagent(int idx)


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -170,8 +188,9 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                --CatalystCount;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            _reagents[_nextReagentPos - 1] = _invalidReagent;


			




	
	
	
		
 
            --_nextReagentPos;


			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void ReplaceLastReagent(uint reagentIdx)


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -185,8 +204,9 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
            if (_costSortedReagents[(int)reagentIdx].IsCatalyst)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                ++CatalystCount;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public uint NextFreeReagent(uint startIdx)


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -234,9 +254,13 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                // invalid quantity


			




	
	
	
		
 
                return;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            UsedQuantity = 0;


			




	
	
	
		
 
            uint remainingReagents = ((uint)_nextReagentPos - CatalystCount);


			




	
	
	
		
 
            if (ShouldLog)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                WriteLog?.Invoke($" == initializing {this} @ quantity {CurrentTargetQuantity} with {CatalystCount} catalysts ==");


			




	
	
	
		
 
            }


			




	
	
	
		
 
            uint remainingReagents = ((uint)_nextReagentPos); // Remaining reagents, including catalysts


			




	
	
	
		
 
            uint remainingWeight = CurrentTargetQuantity - CatalystCount;


			




	
	
	
		
 
            for (int i = 0; i < _nextReagentPos; ++i)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                Reagent reagent = GetReagent(i);


			




	...
	
		
 
@@ -245,8 +269,13 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    //Console.WriteLine("Init catalyst {0} weight 1", reagent.Name);


			




	
	
	
		
 
                    CurrentWeights[i] = 1;


			




	
	
	
		
 
                    ++UsedQuantity;


			




	
	
	
		
 
                    // This takes quantity but not weight (concentration)


			




	
	
	
		
 
                    if (ShouldLog)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        WriteLog?.Invoke($"    + 1 {reagent.Name} (catalyst)");


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                }


			




	
	
	
		
 
                else


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    uint reagentMaxWeight = reagent.RecipeMax;


			




	...
	
		
 
@@ -255,14 +284,19 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                        reagentMaxWeight = Math.Max(FullQuantity, reagentMaxWeight);


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    uint weight = Math.Min(remainingWeight - (remainingReagents-1), reagentMaxWeight);


			




	
	
	
		
 
                    //Console.WriteLine("Init reagent {0} weight {1}", reagent.Name, weight);


			




	
	
	
		
 
                    if (ShouldLog)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        WriteLog?.Invoke($"    + {weight} {reagent.Name} (remain: weight={remainingWeight} reagents={remainingReagents})");


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    remainingWeight -= weight;


			




	
	
	
		
 
                    CurrentWeights[i] = weight;


			




	
	
	
		
 
                    UsedQuantity += weight;


			




	
	
	
		
 
                }


			




	
	
	
		
 
                --remainingReagents;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void SetWeight(int idx, uint quantity)


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -431,8 +465,25 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
                    success = false;


			




	
	
	
		
 
                    break;


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            RefreshShouldLog();


			




	
	
	
		
 
            return success;


			




	
	
	
		
 
        }        

			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public override string ToString()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (_nextReagentPos == 0)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                return "No ingredients";


			




	
	
	
		
 
            }


			




	
	
	
		
 
            System.Text.StringBuilder sb = new System.Text.StringBuilder();


			




	
	
	
		
 
            sb.Append(_costSortedReagents[(int)_reagents[0]].Name);


			




	
	
	
		
 
            for (int idx = 1; idx < _nextReagentPos; ++idx)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                Reagent reagent = _costSortedReagents[(int)_reagents[idx]];


			




	
	
	
		
 
                sb.Append($", {reagent.Name}");


			




	
	
	
		
 
            }


			




	
	
	
		
 
            return sb.ToString();


			




	
	
	
		
 
        }


			




	
	
	
		
 
    }


			




	
	
	
		
 
}


			




	...
	
		
 
\ No newline at end of file


			




        

    


    
    

    

        

                

                    Models/Settings.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -16,10 +16,11 @@ namespace DesertPaintCodex.Models


			




	
	
	
		
 
        }


			




	
	
	
		
 
        public bool TryGet(string key, out bool value)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            value = false;


			




	
	
	
		
 
            return _settings.TryGetValue(key.ToLower(), out string? valStr)


			




	
	
	
		
 
                && bool.TryParse(valStr, out value);


			




	
	
	
		
 
            bool found = _settings.TryGetValue(key.ToLower(), out string? valStr);


			




	
	
	
		
 
            found = found && bool.TryParse(valStr, out value);


			




	
	
	
		
 
            return found;


			




	
	
	
		
 

			




	
	
	
		
 
        }


			




	
	
	
		
 
        public void Set(string key, int value)


			




	
	
	
		
 
        {


			




        

    


    
    

    

        

                

                    Services/RecipeGenerator.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -92,8 +92,37 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
        {


			




	
	
	
		
 
            set => _log = value != null ? new StreamWriter(value) : null;


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void FlushLog()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            _log?.Flush();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void CloseLog()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            _log?.Close();


			




	
	
	
		
 
            _log = null;


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void WriteLog(string msg)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (_log == null) return;


			




	
	
	
		
 
            lock (_workerLock)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                _log.WriteLine(msg);


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void WriteLog(string msg, params object[] args)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (_log == null) return;


			




	
	
	
		
 
            lock(_workerLock)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                _log.WriteLine(msg, args);


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private class ReagentCostSort : IComparer<Reagent>


			




	
	
	
		
 
        {


			




	
	
	
		
 
            public int Compare(Reagent? reagent1, Reagent? reagent2)


			




	
	
	
		
 
            {


			




	...
	
		
 
@@ -164,8 +193,10 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 

			




	
	
	
		
 
            // 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))


			




	
	
	
		
 
            {


			




	...
	
		
 
@@ -195,8 +226,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                    MaxConcentration  = maxConcentration,


			




	
	
	
		
 
                    MinReagents       = minReagents,


			




	
	
	
		
 
                    MaxReagents       = maxReagents


			




	
	
	
		
 
                };


			




	
	
	
		
 
                initialNode.WriteLog = WriteLog;


			




	
	
	
		
 

			




	
	
	
		
 
                if (MinReagents > 1)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    while (NextReagentSetBreadthFirst(initialNode, 1, minReagents))


			




	...
	
		
 
@@ -204,8 +236,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                        if (initialNode.ReagentCount != minReagents) continue;


			




	
	
	
		
 
                        

			




	
	
	
		
 
                        //Console.WriteLine("Initial node at size {0}/{1} with recipe: {2}", initialNode.ReagentCount, minReagents, initialNode.TestRecipe.ToString());


			




	
	
	
		
 
                        RecipeSearchNode searchNode = new RecipeSearchNode(initialNode);


			




	
	
	
		
 
                        searchNode.WriteLog = WriteLog;


			




	
	
	
		
 
                        _searchQueue.Enqueue(searchNode);


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                }


			




	
	
	
		
 
                else


			




	...
	
		
 
@@ -215,9 +248,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            _recipeCount = 0;


			




	
	
	
		
 

			




	
	
	
		
 
            _log?.WriteLine("Begin recipe generation: MaxConcentration={0} MinReagents={1} MaxReagents={2} FullQuantity={3} FullQuantityDepth={4}", MaxConcentration, MinReagents, MaxReagents, FullQuantity, FullQuantityDepth);


			




	
	
	
		
 
            WriteLog("Begin recipe generation: MaxConcentration={0} MinReagents={1} MaxReagents={2} FullQuantity={3} FullQuantityDepth={4}", MaxConcentration, MinReagents, MaxReagents, FullQuantity, FullQuantityDepth);


			




	
	
	
		
 

			




	
	
	
		
 
            // start worker threads to do the actual work


			




	
	
	
		
 
            ResumeRecipeGeneration();


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -231,9 +264,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
            }


			




	
	
	
		
 
            _running = true;


			




	
	
	
		
 
            _requestCancel = false;


			




	
	
	
		
 

			




	
	
	
		
 
            _log?.WriteLine("Resuming recipe generation: pre-threads={0} reagent count={1} search queue={2}", _runningThreads, _costSortedReagents.Count, _searchQueue.Count);


			




	
	
	
		
 
            WriteLog("Resuming recipe generation: pre-threads={0} reagent count={1} search queue={2}", _runningThreads, _costSortedReagents.Count, _searchQueue.Count);


			




	
	
	
		
 
            _runningThreads = 0; // presumably!


			




	
	
	
		
 

			




	
	
	
		
 
            int threadCount = Math.Min(Math.Min(_costSortedReagents.Count, _searchQueue.Count), (int)MaxThreads);


			




	
	
	
		
 
            if (threadCount == 0)


			




	...
	
		
 
@@ -241,8 +274,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                Finished?.Invoke(this, EventArgs.Empty);


			




	
	
	
		
 
            }


			




	
	
	
		
 
            _generatorThreads.Clear();


			




	
	
	
		
 
            Console.WriteLine("Starting {0} generator threads.", threadCount);


			




	
	
	
		
 
            WriteLog($"===== Starting {threadCount} threads.");


			




	
	
	
		
 
            for (int i = 0; i < threadCount; ++i)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                Thread thr = new(Generate) {Priority = ThreadPriority.BelowNormal};


			




	
	
	
		
 
                _generatorThreads.Add(thr);


			




	...
	
		
 
@@ -380,8 +414,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                                    MinReagents       = MinReagents,


			




	
	
	
		
 
                                    MaxReagents       = MaxReagents,


			




	
	
	
		
 
                                    MaxConcentration  = MaxConcentration


			




	
	
	
		
 
                                };


			




	
	
	
		
 
                                node.WriteLog = WriteLog;


			




	
	
	
		
 
                                success                = success && node.LoadState(reader);


			




	
	
	
		
 
                                if (success)


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    _searchQueue.Enqueue(node);


			




	...
	
		
 
@@ -419,20 +454,26 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                lock (_workerLock)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    ok = _searchQueue.TryDequeue(out node);


			




	
	
	
		
 
                }


			




	
	
	
		
 
                

			




	
	
	
		
 
                if (!ok) continue;


			




	
	
	
		
 

			




	
	
	
		
 
                if (!ok) break;


			




	
	
	
		
 
                

			




	
	
	
		
 
                Debug.Assert(node != null);


			




	
	
	
		
 

			




	
	
	
		
 
                node.WriteLog = WriteLog;


			




	
	
	
		
 
                

			




	
	
	
		
 
                if (Mode == SearchType.DepthFirst)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    uint targetQuantity = (node.ReagentCount <= FullQuantityDepth)


			




	
	
	
		
 
                        ? ((uint)node.ReagentCount * FullQuantity) 

			




	
	
	
		
 
                        : node.MaxConcentration + 1;


			




	
	
	
		
 
                    do {


			




	
	
	
		
 
                        --targetQuantity;


			




	
	
	
		
 
                        if (node.ShouldLog)


			




	
	
	
		
 
                        {


			




	
	
	
		
 
                            WriteLog($" == Initializing {node} for quantity {targetQuantity}");


			




	
	
	
		
 
                        }


			




	
	
	
		
 
                        node.InitForQuantity(targetQuantity);


			




	
	
	
		
 
                    } while (targetQuantity > MinConcentration && (node.CurrentTargetQuantity != node.UsedQuantity));


			




	
	
	
		
 
    

			




	
	
	
		
 
                    while ((ok = IterateDepthFirst(node)) && !_requestCancel)


			




	...
	
		
 
@@ -448,8 +489,12 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                        ? (FullQuantity * (uint)node.ReagentCount) 

			




	
	
	
		
 
                        : node.MaxConcentration;


			




	
	
	
		
 
                    do {


			




	
	
	
		
 
                        ++targetQuantity;


			




	
	
	
		
 
                        if (node.ShouldLog)


			




	
	
	
		
 
                        {


			




	
	
	
		
 
                            WriteLog($" == Initializing {node} for quantity {targetQuantity}");


			




	
	
	
		
 
                        }


			




	
	
	
		
 
                        node.InitForQuantity(targetQuantity);


			




	
	
	
		
 
                    } while ((targetQuantity < quantityLimit) && (node.CurrentTargetQuantity != node.UsedQuantity));


			




	
	
	
		
 
    

			




	
	
	
		
 
                    while ((ok = IterateBreadthFirst(node)) && !_requestCancel)


			




	...
	
		
 
@@ -461,9 +506,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    // stopped because cancel was requested - requeue the node in its current state for resume


			




	
	
	
		
 
                    _searchQueue.Enqueue(node);


			




	
	
	
		
 
                }


			




	
	
	
		
 
            } while (!_requestCancel && ok);


			




	
	
	
		
 
            } while (!_requestCancel);


			




	
	
	
		
 

			




	
	
	
		
 
            bool done;


			




	
	
	
		
 
            lock(_workerLock)


			




	
	
	
		
 
            {


			




	...
	
		
 
@@ -488,30 +533,45 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
            

			




	
	
	
		
 
            string colorName = PaletteService.FindNearest(recipe.ReactedColor);


			




	
	
	
		
 
            lock (_workerLock)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                uint newCost = recipe.Cost;


			




	
	
	
		
 
                if (_recipeCosts.TryGetValue(colorName, out var cost))


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    if (cost <= recipe.Cost) return;


			




	
	
	
		
 
                    if (cost < newCost)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        // WriteLog($"Skipping recipe (cost {newCost} > {cost}): {recipe}");


			




	
	
	
		
 
                        return;


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    PaintRecipe origRecipe = _recipes[colorName];


			




	
	
	
		
 
                    if (cost == newCost && recipe.Concentration >= origRecipe.Concentration)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        // Same cost, greater concentration - use the lower concentration recipe


			




	
	
	
		
 
                        WriteLog($"Skipping recipe (cost {newCost}, {recipe.Concentration} >= {origRecipe.Concentration}): {recipe}");


			




	
	
	
		
 
                        return;


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                        

			




	
	
	
		
 
                    _recipes[colorName].CopyFrom(recipe);


			




	
	
	
		
 
                    _recipeCosts[colorName] = recipe.Cost;


			




	
	
	
		
 
                    _log?.WriteLine("New recipe (cost {0}): {1}", recipe.Cost, recipe);


			




	
	
	
		
 
                    _recipes[colorName].CopyFrom(recipe); // Copy recipe because the one passed in should be const and will get overwritten


			




	
	
	
		
 
                    _recipeCosts[colorName] = newCost;


			




	
	
	
		
 
                    WriteLog($"Replacing recipe (cost {newCost} < {cost}): {recipe}");


			




	
	
	
		
 
                        

			




	
	
	
		
 
                    if (NewRecipe == null) return;


			




	
	
	
		
 
                        

			




	
	
	
		
 
                    NewRecipeEventArgs args = new(colorName, recipe);


			




	
	
	
		
 
                    NewRecipeEventArgs args = new(colorName, _recipes[colorName]);


			




	
	
	
		
 
                    NewRecipe(this, args);


			




	
	
	
		
 
                }


			




	
	
	
		
 
                else


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    // This would be an error!


			




	
	
	
		
 
                    _recipeCosts.Add(colorName, recipe.Cost);


			




	
	
	
		
 
                    _recipes.Add(colorName, new PaintRecipe(recipe));


			




	
	
	
		
 
                        

			




	
	
	
		
 
                    _recipeCosts.Add(colorName, newCost);


			




	
	
	
		
 
                    PaintRecipe newRecipe = new PaintRecipe(recipe); // Copy recipe because the one passed in should be const and will get overwritten


			




	
	
	
		
 
                    _recipes.Add(colorName, newRecipe);


			




	
	
	
		
 

			




	
	
	
		
 
                    WriteLog($"New recipe (cost {newCost}): {recipe}");


			




	
	
	
		
 

			




	
	
	
		
 
                    if (NewRecipe == null) return;


			




	
	
	
		
 
                        

			




	
	
	
		
 
                    NewRecipeEventArgs args = new(colorName, recipe);


			




	
	
	
		
 
                    NewRecipeEventArgs args = new(colorName, newRecipe);


			




	
	
	
		
 
                    NewRecipe(this, args);


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -600,25 +660,46 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                //System.Console.WriteLine("Found next recipe at size {0} qty {1}", node.ReagentCount, node.CurrentTargetQuantity);


			




	
	
	
		
 
                return true;


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            string origNodeVal = node.ToString();


			




	
	
	
		
 

			




	
	
	
		
 
            // Try next quantity


			




	
	
	
		
 
            uint newQuantity;


			




	
	
	
		
 
            uint quantityLimit = ((uint)node.ReagentCount <= FullQuantityDepth) ? ((uint)node.ReagentCount * FullQuantity) : node.MaxConcentration;


			




	
	
	
		
 
            do {


			




	
	
	
		
 
                newQuantity = node.CurrentTargetQuantity + 1;


			




	
	
	
		
 
                //Console.WriteLine("Try quantity {0}", newQuantity);


			




	
	
	
		
 
                if (newQuantity > quantityLimit) continue;


			




	
	
	
		
 
                

			




	
	
	
		
 

			




	
	
	
		
 
                if (node.ShouldLog)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    WriteLog($" == Initializing {node} for quantity {newQuantity}");


			




	
	
	
		
 
                }


			




	
	
	
		
 
                node.InitForQuantity(newQuantity);


			




	
	
	
		
 
                if (node.CurrentTargetQuantity <= node.UsedQuantity)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    //if (log != null) { lock(log) { log.WriteLine("Update quantity to {0}", node.CurrentTargetQuantity); } }


			




	
	
	
		
 
                    if (node.ShouldLog)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        WriteLog($"  == {node} quantity {newQuantity}");


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    return true;


			




	
	
	
		
 
                }


			




	
	
	
		
 
            } while (newQuantity < quantityLimit);


			




	
	
	
		
 

			




	
	
	
		
 
            bool ok = NextReagentSetBreadthFirst(node, node.MinReagents, node.MaxReagents);


			




	
	
	
		
 
            if (node.ShouldLog)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                if (ok)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    WriteLog($"==== {origNodeVal} next reagent set: {node} @ {node.CurrentTargetQuantity}");


			




	
	
	
		
 
                }


			




	
	
	
		
 
                else


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    WriteLog($"==== done with reagent set: {origNodeVal}");


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            return ok;


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private bool NextReagentSetBreadthFirst(RecipeSearchNode node, uint minReagents, uint maxReagents)


			




	...
	
		
 
@@ -628,8 +709,12 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 

			




	
	
	
		
 
            // next reagent in last position


			




	
	
	
		
 
            // if at end, pop reagent


			




	
	
	
		
 
            //Console.WriteLine("Finding new recipe after quantity {0}/{1} used {2}", newQuantity, node.MaxConcentration, node.UsedQuantity);


			




	
	
	
		
 
            if (node.ShouldLog)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                WriteLog($" == Initializing {node} for quantity {node.MinConcentration + node.CatalystCount}");


			




	
	
	
		
 
            }


			




	
	
	
		
 
            node.InitForQuantity(node.MinConcentration + node.CatalystCount); // reset quantity


			




	
	
	
		
 
            int currentDepth = node.ReagentCount;


			




	
	
	
		
 
            bool recipeFound;


			




	
	
	
		
 
            do {


			




	...
	
		
 
@@ -690,8 +775,9 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                        }


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    //Console.WriteLine("Catalysts: {0} Reagents: {1} Min: {2}", node.CatalystCount, node.ReagentCount, node.MinReagents);


			




	
	
	
		
 
                } while ((node.CatalystCount >= node.ReagentCount) && (node.ReagentCount >= minReagents)); // make sure to skip all-catalyst combinations


			




	
	
	
		
 

			




	
	
	
		
 
                if (recipeFound)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    break;


			




	
	
	
		
 
                }


			




	...
	
		
 
@@ -701,9 +787,16 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
                    //if (log != null) { lock(log) { log.WriteLine("Increased depth to {0}/{1} [no recipe]", currentDepth, node.MaxReagents); } }


			




	
	
	
		
 
                }


			




	
	
	
		
 
            } while (currentDepth <= maxReagents);


			




	
	
	
		
 

			




	
	
	
		
 
            if (!recipeFound) return false;


			




	
	
	
		
 
            if (!recipeFound)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                if (node.ShouldLog)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    WriteLog($" == no more recipes for {node}");


			




	
	
	
		
 
                }


			




	
	
	
		
 
                return false;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            

			




	
	
	
		
 
            node.InitForQuantity(node.MinConcentration+node.CatalystCount); // minimum quantity for this recipe


			




	
	
	
		
 
            

			




	
	
	
		
 
            node.TestRecipe ??= new PaintRecipe();


			




	...
	
		
 
@@ -724,8 +817,12 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
            for (int i = 0; i < node.ReagentCount; ++i)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                node.TestRecipe.AddReagent(node.GetReagent(i).Name, node.CurrentWeights[i]);


			




	
	
	
		
 
            }


			




	
	
	
		
 
            if (node.ShouldLog)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                WriteLog($"   -> {node.TestRecipe}");


			




	
	
	
		
 
            }


			




	
	
	
		
 
            AddCheapestRecipe(node.TestRecipe);


			




	
	
	
		
 
            //if (log != null) { lock(log) { log.WriteLine("Tested recipe: {0}", node.TestRecipe); } }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	...
	
		
 
@@ -736,16 +833,21 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
            if (remainingWeight < MinConcentration)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // not possible to make a valid recipe


			




	
	
	
		
 
                //Console.WriteLine("Insufficient remaining weight");


			




	
	
	
		
 
                if (node.ShouldLog)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    WriteLog($" ***** Not enough remaining weight in recipe {node} at target quantity {node.CurrentTargetQuantity} catalysts {node.CatalystCount} min concentration {MinConcentration}");


			




	
	
	
		
 
                }


			




	
	
	
		
 
                return false;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            //uint remainingReagents = (uint)node.Reagents.Count - node.CatalystCount;


			




	
	
	
		
 

			




	
	
	
		
 
            uint depth = (uint)node.ReagentCount;


			




	
	
	
		
 
            uint weightToConsume = 0;


			




	
	
	
		
 
            uint spaceBelow = 0;


			




	
	
	
		
 
            int reagentsBelow = 0;


			




	
	
	
		
 
            // Start from the end of the current reagent list and work to the front


			




	
	
	
		
 
            for (int i = (int)depth-1 ; i >= 0; --i)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                uint currentWeight = node.CurrentWeights[i];


			




	
	
	
		
 

			




	...
	
		
 
@@ -821,8 +923,18 @@ namespace DesertPaintCodex.Services


			




	
	
	
		
 
        {


			




	
	
	
		
 
            _requestCancel = true;


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void ResetQueue()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            lock (_workerLock)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // Don't reset the queue ever while running


			




	
	
	
		
 
                if (_running) return;


			




	
	
	
		
 
                _searchQueue.Clear();


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void Reset()


			




	
	
	
		
 
        {


			




	
	
	
		
 
            foreach (PaintRecipe recipe in _recipes.Values)


			




	
	
	
		
 
            {


			




        

    


    
    

    

        

                

                    ViewModels/RecipeGeneratorViewModel.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -125,10 +125,10 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 

			




	
	
	
		
 
            SettingsService.Get("Generator.Logging", out bool logGenerator, false);


			




	
	
	
		
 
            if (logGenerator)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                string logDir = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments);


			




	
	
	
		
 
                _generator.Log = System.IO.Path.Combine(logDir, "dpl_generator.txt");


			




	
	
	
		
 
                string logDir = DesertPaintCodex.Util.FileUtils.AppDataPath;


			




	
	
	
		
 
                _generator.Log = System.IO.Path.Combine(logDir, "recipe_generator_log.txt");


			




	
	
	
		
 
            }


			




	
	
	
		
 
            

			




	
	
	
		
 
            if (ribbonMode)


			




	
	
	
		
 
            {


			




	...
	
		
 
@@ -152,9 +152,17 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
            ReagentService.SaveProfileReagents(_profile.ReagentFile);


			




	
	
	
		
 
            SaveSettings(_ribbonMode ? "Ribbon" : "Paint");


			




	
	
	
		
 
            _updateTimer.Start();


			




	
	
	
		
 
            SelectedView = 1;


			




	
	
	
		
 
            

			




	
	
	
		
 

			




	
	
	
		
 
            _generator.CloseLog();


			




	
	
	
		
 
            SettingsService.Get("Generator.Logging", out bool logGenerator, false);


			




	
	
	
		
 
            if (logGenerator)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                string logDir = DesertPaintCodex.Util.FileUtils.AppDataPath;


			




	
	
	
		
 
                _generator.Log = System.IO.Path.Combine(logDir, "recipe_generator_log.txt");


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            _generator.BeginRecipeGeneration(


			




	
	
	
		
 
                _minConcentration, 

			




	
	
	
		
 
                (uint)MaxConcentration, 

			




	
	
	
		
 
                1, 

			




	...
	
		
 
@@ -170,9 +178,11 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
            IsRunning    = false;


			




	
	
	
		
 
            IsInProgress = false;


			




	
	
	
		
 
            _updateTimer.Stop();


			




	
	
	
		
 
            _profile.SaveRecipes();


			




	
	
	
		
 
            

			




	
	
	
		
 
            _generator.ResetQueue();


			




	
	
	
		
 
            SaveState();


			




	
	
	
		
 

			




	
	
	
		
 
            CanClear = true;


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void Pause()


			




	...
	
		
 
@@ -188,9 +198,17 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
            IsPaused  = false;


			




	
	
	
		
 
            IsRunning = true;


			




	
	
	
		
 
            _updateTimer.Start();


			




	
	
	
		
 
            SelectedView = 1;


			




	
	
	
		
 
            

			




	
	
	
		
 

			




	
	
	
		
 
            _generator.CloseLog();


			




	
	
	
		
 
            SettingsService.Get("Generator.Logging", out bool logGenerator, false);


			




	
	
	
		
 
            if (logGenerator)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                string logDir = DesertPaintCodex.Util.FileUtils.AppDataPath;


			




	
	
	
		
 
                _generator.Log = System.IO.Path.Combine(logDir, "recipe_generator_log.txt");


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            _generator.ResumeRecipeGeneration();


			




	
	
	
		
 

			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	...
	
		
 
@@ -301,21 +319,29 @@ namespace DesertPaintCodex.ViewModels


			




	
	
	
		
 
        

			




	
	
	
		
 
        

			




	
	
	
		
 
        private void OnGeneratorStopped(object? sender, EventArgs args)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            SaveState();


			




	
	
	
		
 
            

			




	
	
	
		
 
            if (_saving)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                SaveState();


			




	
	
	
		
 

			




	
	
	
		
 
                _generator.ResumeRecipeGeneration();


			




	
	
	
		
 
                _lastSave = DateTime.Now;


			




	
	
	
		
 
                _saving = false;


			




	
	
	
		
 
                return;


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            if (IsPaused) return;


			




	
	
	
		
 
            _generator.FlushLog();


			




	
	
	
		
 

			




	
	
	
		
 
            if (IsPaused)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                SaveState();


			




	
	
	
		
 
                _generator.CloseLog();


			




	
	
	
		
 
                return;


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            End();


			




	
	
	
		
 
            _generator.CloseLog();


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void Update(object? sender, EventArgs e)


			




	
	
	
		
 
        {


			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: opal4.opalstack.com-164750
    
    
        This site is powered by
            Kallithea 0.6.2,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support