Changeset - 7b2e8ac4935e
Parent rev.
Child rev.
[Not reviewed]
default
0 5 0
Jason Maltzen (jmaltzen) - 9 years ago 2015-12-25 03:17:40
jason.maltzen@unsanctioned.net
Save recipe generator state to allow resume across app runs. Periodically save current generated recipe list, instead of just saving on stop/pause.
5 files changed with 448 insertions and 70 deletions:
.hgignore
1
1
RecipeGenerator.cs
346
50
RecipeGeneratorWindow.cs
98
16
gtk-gui/gui.stetic
1
1
mac/build-mac-bundle.sh
2
2
0 comments (0 inline, 0 general)
.hgignore
➞
Show inline comments
...
 
@@ -7,2 +7,2 @@ obj/
 
.DS_Store
 
mac/build/DesertPaintLab.app
 
mac/bin
RecipeGenerator.cs
➞
Show inline comments
...
 
@@ -23,4 +23,6 @@
 
using System;
 
using System.IO;
 
using System.Collections.Generic;
 
using System.Collections.Concurrent;
 
using System.Text.RegularExpressions;
 
using System.Threading;
...
 
@@ -57,3 +59,3 @@ namespace DesertPaintLab
 
    {
 
        private class SearchNode
 
        protected class SearchNode
 
        {
...
 
@@ -61,2 +63,10 @@ namespace DesertPaintLab
 
            List<uint> reagents;
 
            public List<uint> Reagents
 
            {
 
                get
 
                {
 
                    return reagents;
 
                }
 
            }
 

			




	
	
	
		
 
            HashSet<uint> reagentInUse = new HashSet<uint>();


			




	...
	
		
 
@@ -75,4 +85,9 @@ namespace DesertPaintLab


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            public int InitialCount { get; private set; }


			




	
	
	
		
 
            public uint CurrentTargetQuantity { get; set; }


			




	
	
	
		
 
            public uint MaxQuantity { get; set; }


			




	
	
	
		
 
            public uint UsedQuantity { get; private set; }


			




	
	
	
		
 
            public uint CatalystCount { get; set; }


			




	
	
	
		
 

			




	
	
	
		
 
            uint maxReagents;


			




	...
	
		
 
@@ -90,5 +105,2 @@ namespace DesertPaintLab


			




	
	
	
		
 
            }


			




	
	
	
		
 
            public uint UsedQuantity { get; private set; }


			




	
	
	
		
 

			




	
	
	
		
 
            public uint CatalystCount { get; set; }


			




	
	
	
		
 

			




	...
	
		
 
@@ -127,9 +139,10 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            public int InitialCount { get; private set; }


			




	
	
	
		
 
            public List<uint> Reagents


			




	
	
	
		
 
            public SearchNode(List<Reagent> costSortedReagents)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                get


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    return reagents;


			




	
	
	
		
 
                }


			




	
	
	
		
 
                this.costSortedReagents = costSortedReagents;


			




	
	
	
		
 
                this.reagents = new List<uint>();


			




	
	
	
		
 
                this.reagents.Add(NextFreeReagent(0));


			




	
	
	
		
 
                InitialCount = 0;


			




	
	
	
		
 
                MaxReagents = 1;


			




	
	
	
		
 
                UsedQuantity = 0;


			




	
	
	
		
 
            }


			




	...
	
		
 
@@ -250,2 +263,127 @@ namespace DesertPaintLab


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            public void SaveState(StreamWriter writer)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                writer.WriteLine("---SearchNode---");


			




	
	
	
		
 
                writer.WriteLine("MaxReagents: {0}", MaxReagents);


			




	
	
	
		
 
                writer.WriteLine("Reagents: {0}", reagents.Count);


			




	
	
	
		
 
                for (int i = 0; i < reagents.Count; ++i)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    uint idx = reagents[i];


			




	
	
	
		
 
                    uint weight = currentWeights[i];


			




	
	
	
		
 
                    writer.WriteLine("Reagent: {0},{1},{2}", idx, reagentInUse.Contains(idx) ? 1 : 0, weight);


			




	
	
	
		
 
                }


			




	
	
	
		
 
                // pulled from parent: List<Reagent> costSortedReagents;


			




	
	
	
		
 
                // new on construct: PaintRecipe testRecipe = null;


			




	
	
	
		
 
                writer.WriteLine("CurrentTargetQuantity: {0}", CurrentTargetQuantity);


			




	
	
	
		
 
                writer.WriteLine("MaxQuantity: {0}", MaxQuantity);


			




	
	
	
		
 
                writer.WriteLine("UsedQuantity: {0}", UsedQuantity);


			




	
	
	
		
 
                writer.WriteLine("CatalystCount: {0}", CatalystCount);


			




	
	
	
		
 
                writer.WriteLine("InitialCount: {0}", InitialCount);


			




	
	
	
		
 
                writer.WriteLine("---EndNode---");


			




	
	
	
		
 
                

			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            static Regex keyValueRegex = new Regex(@"(\w+)\:\s*(.*)\s*$");


			




	
	
	
		
 
            static Regex reagentPartsRegex = new Regex(@"(?<id>\d+),(?<inUse>\d+),(?<weight>\d+)");


			




	
	
	
		
 
            public bool LoadState(StreamReader reader)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                string line = reader.ReadLine();


			




	
	
	
		
 
                if (!line.Equals("---SearchNode---"))


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    return false;


			




	
	
	
		
 
                }


			




	
	
	
		
 

			




	
	
	
		
 
                bool success = true;


			




	
	
	
		
 
                Match match;


			




	
	
	
		
 
                int reagentIdx = 0;


			




	
	
	
		
 
                while ((line = reader.ReadLine()) != null)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    if (line.Equals("---EndNode---"))


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        break;


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    match = keyValueRegex.Match(line);


			




	
	
	
		
 
                    if (match.Success)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        switch (match.Groups[1].Value)


			




	
	
	
		
 
                        {


			




	
	
	
		
 
                            case "Reagents":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    int reagentCount = int.Parse(match.Groups[2].Value);


			




	
	
	
		
 
                                    reagents = new List<uint>(reagentCount);


			




	
	
	
		
 
                                    reagentInUse.Clear();


			




	
	
	
		
 
                                    reagentIdx = 0;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "Reagent":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    Match reagentInfo = reagentPartsRegex.Match(match.Groups[2].Value);


			




	
	
	
		
 
                                    if (reagentInfo.Success)


			




	
	
	
		
 
                                    {


			




	
	
	
		
 
                                        uint reagentId = uint.Parse(reagentInfo.Groups["id"].Value);


			




	
	
	
		
 
                                        int isInUse = int.Parse(reagentInfo.Groups["inUse"].Value);


			




	
	
	
		
 
                                        uint weight = uint.Parse(reagentInfo.Groups["weight"].Value);


			




	
	
	
		
 
                                        reagents.Add(reagentId);


			




	
	
	
		
 
                                        currentWeights[reagentIdx] = weight;


			




	
	
	
		
 
                                        if (isInUse != 0)


			




	
	
	
		
 
                                        {


			




	
	
	
		
 
                                            reagentInUse.Add(reagentId);


			




	
	
	
		
 
                                        }


			




	
	
	
		
 
                                    }


			




	
	
	
		
 
                                    else


			




	
	
	
		
 
                                    {


			




	
	
	
		
 
                                        success = false;


			




	
	
	
		
 
                                    }


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "CurrentTargetQuantity":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    uint value = uint.Parse(match.Groups[2].Value);


			




	
	
	
		
 
                                    CurrentTargetQuantity = value;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "MaxQuantity":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    uint value = uint.Parse(match.Groups[2].Value);


			




	
	
	
		
 
                                    MaxQuantity = value;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "MaxReagents":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    uint value = uint.Parse(match.Groups[2].Value);


			




	
	
	
		
 
                                    MaxReagents = value;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "UsedQuantity":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    uint value = uint.Parse(match.Groups[2].Value);


			




	
	
	
		
 
                                    UsedQuantity = value;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "CatalystCount":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    uint value = uint.Parse(match.Groups[2].Value);


			




	
	
	
		
 
                                    CatalystCount = value;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "InitialCount":


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    int value = int.Parse(match.Groups[2].Value);


			




	
	
	
		
 
                                    InitialCount = value;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            default:


			




	
	
	
		
 
                                success = false;


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                        }


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    else


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        success = false;


			




	
	
	
		
 
                        break;


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                }


			




	
	
	
		
 
                return success;


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -263,2 +401,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
        

			




	
	
	
		
 
        int runningThreads = 0;


			




	
	
	
		
 
        

			




	
	
	
		
 
        SortedDictionary<string, uint> recipeCosts = new SortedDictionary<string, uint>();


			




	...
	
		
 
@@ -284,4 +424,5 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
        public RecipeGenerator()


			




	
	
	
		
 
        public RecipeGenerator(ReactionSet reactions)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            this.reactions = reactions;


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -304,2 +445,10 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
        public bool CanResume


			




	
	
	
		
 
        {


			




	
	
	
		
 
            get


			




	
	
	
		
 
            {


			




	
	
	
		
 
                return (!running && (searchQueue.Count > 0));


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private class ReagentCostSort : IComparer<Reagent>


			




	...
	
		
 
@@ -312,3 +461,3 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
        public void InitRecipes(SortedDictionary<string, PaintRecipe> recipes, ReactionSet reactions)


			




	
	
	
		
 
        public void InitRecipes(SortedDictionary<string, PaintRecipe> recipes)


			




	
	
	
		
 
        {


			




	...
	
		
 
@@ -318,7 +467,6 @@ namespace DesertPaintLab


			




	
	
	
		
 
            }


			




	
	
	
		
 
            this.reactions = reactions;


			




	
	
	
		
 
            foreach (PaintRecipe recipe in recipes.Values)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // TODO: copy?


			




	
	
	
		
 
                AddCheapestRecipe(recipe);


			




	
	
	
		
 
                PaintRecipe recipeCopy = new PaintRecipe(recipe);


			




	
	
	
		
 
                AddCheapestRecipe(recipeCopy);


			




	
	
	
		
 
            }


			




	...
	
		
 
@@ -326,18 +474,4 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
        public void BeginRecipeGeneration(ReactionSet reactions, uint maxQuantity, uint maxReagents, uint fullQuantityDepth, uint fullQuantity)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (running)


			




	
	
	
		
 
        private void InitSortedReagents()


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // Already running - don't start again


			




	
	
	
		
 
                return;


			




	
	
	
		
 
            }


			




	
	
	
		
 
            this.running = true;


			




	
	
	
		
 

			




	
	
	
		
 
            this.reactions = reactions;


			




	
	
	
		
 
            //this.maxQuantity = maxQuantity;


			




	
	
	
		
 
            this.maxReagents = maxReagents;


			




	
	
	
		
 
            this.fullQuantity = fullQuantity;


			




	
	
	
		
 
            this.fullQuantityDepth = fullQuantityDepth;


			




	
	
	
		
 

			




	
	
	
		
 
            // first, sort reagents by cost.


			




	
	
	
		
 
            costSortedReagents.Clear();


			




	...
	
		
 
@@ -352,2 +486,19 @@ namespace DesertPaintLab


			




	
	
	
		
 
            costSortedReagents.Sort(new ReagentCostSort());


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        public void BeginRecipeGeneration(uint maxQuantity, uint maxReagents, uint fullQuantityDepth, uint fullQuantity)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (running)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // Already running - don't start again


			




	
	
	
		
 
                return;


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            //this.maxQuantity = maxQuantity;


			




	
	
	
		
 
            this.maxReagents = maxReagents;


			




	
	
	
		
 
            this.fullQuantity = fullQuantity;


			




	
	
	
		
 
            this.fullQuantityDepth = fullQuantityDepth;


			




	
	
	
		
 

			




	
	
	
		
 
            // first, sort reagents by cost.


			




	
	
	
		
 
            InitSortedReagents();


			




	
	
	
		
 
            this.maxReagents = (uint)Math.Min(costSortedReagents.Count, this.maxReagents);


			




	...
	
		
 
@@ -370,2 +521,7 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            while (!searchQueue.IsEmpty)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                SearchNode node;


			




	
	
	
		
 
                searchQueue.TryDequeue(out node);


			




	
	
	
		
 
            }


			




	
	
	
		
 
            for (uint reagentIdx = 0; reagentIdx < costSortedReagents.Count; ++reagentIdx)


			




	...
	
		
 
@@ -380,15 +536,3 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            requestCancel = false;


			




	
	
	
		
 
            running = true;


			




	
	
	
		
 
            // Start the workers thread


			




	
	
	
		
 
            for (int i = 0; i < costSortedReagents.Count; ++i)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                Thread thr = new Thread(new ThreadStart(this.Generate));


			




	
	
	
		
 
                generatorThreads.Add(thr);


			




	
	
	
		
 
            }


			




	
	
	
		
 
            foreach (Thread thr in generatorThreads)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                thr.Start();


			




	
	
	
		
 
            }


			




	
	
	
		
 
        

			




	
	
	
		
 
            ResumeRecipeGeneration();


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -402,6 +546,18 @@ namespace DesertPaintLab


			




	
	
	
		
 
            }


			




	
	
	
		
 
            this.running = true;


			




	
	
	
		
 
            running = true;


			




	
	
	
		
 
            requestCancel = false;


			




	
	
	
		
 

			




	
	
	
		
 
            for (int i = 0; i < costSortedReagents.Count; ++i)


			




	
	
	
		
 
            //System.Console.WriteLine("Resuming recipe generation: pre-threads={0} reagent count={1} search queue={2}", runningThreads, costSortedReagents.Count, searchQueue.Count);


			




	
	
	
		
 
            runningThreads = 0; // presumably!


			




	
	
	
		
 

			




	
	
	
		
 
            int threadCount = Math.Min(costSortedReagents.Count, searchQueue.Count);


			




	
	
	
		
 
            if (threadCount == 0)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                if (Finished != null)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    Finished(this, null);


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            generatorThreads.Clear();


			




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


			




	
	
	
		
 
            {


			




	...
	
		
 
@@ -416,2 +572,134 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
        public bool SaveState(string file)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (running)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // can't save state while running


			




	
	
	
		
 
                return false;


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            using (StreamWriter writer = new StreamWriter(file, false))


			




	
	
	
		
 
            {


			




	
	
	
		
 
                writer.WriteLine("MaxReagents: {0}", maxReagents);


			




	
	
	
		
 
                writer.WriteLine("FullQuantityDepth: {0}", fullQuantityDepth);


			




	
	
	
		
 
                writer.WriteLine("FullQuantity: {0}", fullQuantity);


			




	
	
	
		
 
                writer.WriteLine("TotalReagents: {0}", totalReagents);


			




	
	
	
		
 
                writer.WriteLine("RecipeCount: {0}", recipeCount);


			




	
	
	
		
 
                foreach (KeyValuePair<string, PaintRecipe> pair in recipes)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    PaintRecipe recipe = pair.Value;


			




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


			




	
	
	
		
 
                    writer.WriteLine("BeginRecipe: {0}", colorName);


			




	
	
	
		
 
                    foreach (PaintRecipe.RecipeIngredient ingredient in recipe.Ingredients)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        writer.WriteLine("Ingredient: {0}={1}", ingredient.name, ingredient.quantity);


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    writer.WriteLine("EndRecipe: {0}", colorName);


			




	
	
	
		
 
                }


			




	
	
	
		
 
                writer.WriteLine("SearchNodes: {0}", searchQueue.Count);


			




	
	
	
		
 
                foreach (SearchNode node in searchQueue)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    node.SaveState(writer);


			




	
	
	
		
 
               }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            return true;


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        static Regex keyValueRegex = new Regex(@"(?<key>\w+)\:\s*(?<value>.+)\s*");


			




	
	
	
		
 
        static Regex ingredientRegex = new Regex(@"(?<ingredient>(\w+\s)*\w+)\s*=\s*(?<quantity>\d)\s*");


			




	
	
	
		
 
        public bool LoadState(string file)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            // cannot be running, and reactions must be set


			




	
	
	
		
 
            if (running)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                return false;


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            InitSortedReagents();


			




	
	
	
		
 
            bool success = true;


			




	
	
	
		
 

			




	
	
	
		
 
            PaintRecipe currentRecipe = null;


			




	
	
	
		
 
            Match match;


			




	
	
	
		
 
            string line;


			




	
	
	
		
 
            using (StreamReader reader = new StreamReader(file, false))


			




	
	
	
		
 
            {


			




	
	
	
		
 
                while (success && ((line = reader.ReadLine()) != null))


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    match = keyValueRegex.Match(line);


			




	
	
	
		
 
                    if (match.Success)


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        string value = match.Groups["value"].Value;


			




	
	
	
		
 
                        switch(match.Groups["key"].Value)


			




	
	
	
		
 
                        {


			




	
	
	
		
 
                            case "MaxReagents":


			




	
	
	
		
 
                                maxReagents = uint.Parse(value);


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "FullQuantityDepth":


			




	
	
	
		
 
                                fullQuantityDepth = uint.Parse(value);


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "FullQuantity":


			




	
	
	
		
 
                                fullQuantity = uint.Parse(value);


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "TotalReagents":


			




	
	
	
		
 
                                totalReagents = uint.Parse(value);


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "RecipeCount":


			




	
	
	
		
 
                                recipeCount = int.Parse(value);


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "BeginRecipe":


			




	
	
	
		
 
                                currentRecipe = new PaintRecipe();


			




	
	
	
		
 
                                currentRecipe.Reactions = reactions;


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "EndRecipe":


			




	
	
	
		
 
                                if (currentRecipe != null)


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    PaintColor color = currentRecipe.ReactedColor;


			




	
	
	
		
 
                                    uint cost = currentRecipe.Cost;


			




	
	
	
		
 
                                    recipes[color.Name] = currentRecipe; // replace


			




	
	
	
		
 
                                    recipeCosts[color.Name] = cost;


			




	
	
	
		
 
                                    currentRecipe = null;


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "Ingredient":


			




	
	
	
		
 
                                if (currentRecipe != null)


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    Match ingredientMatch = ingredientRegex.Match(match.Groups["value"].Value);


			




	
	
	
		
 
                                    if (ingredientMatch.Success)


			




	
	
	
		
 
                                    {


			




	
	
	
		
 
                                        uint quantity = uint.Parse(ingredientMatch.Groups["quantity"].Value);


			




	
	
	
		
 
                                        currentRecipe.AddReagent(ingredientMatch.Groups["ingredient"].Value, quantity);


			




	
	
	
		
 
                                    }


			




	
	
	
		
 
                                    else


			




	
	
	
		
 
                                    {


			




	
	
	
		
 
                                        success = false;


			




	
	
	
		
 
                                    }


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            case "SearchNodes":


			




	
	
	
		
 
                                int nodeCount = int.Parse(match.Groups["value"].Value);


			




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


			




	
	
	
		
 
                                {


			




	
	
	
		
 
                                    SearchNode node = new SearchNode(costSortedReagents);


			




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


			




	
	
	
		
 
                                    if (success)


			




	
	
	
		
 
                                    {


			




	
	
	
		
 
                                        searchQueue.Enqueue(node);


			




	
	
	
		
 
                                    }


			




	
	
	
		
 
                                }


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                            default:


			




	
	
	
		
 
                                success = false;


			




	
	
	
		
 
                                break;


			




	
	
	
		
 
                        }


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    else


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        success = false;


			




	
	
	
		
 
                        break;


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                }


			




	
	
	
		
 
                return success;


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        private void Generate()


			




	...
	
		
 
@@ -420,2 +708,7 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            lock(workerLock)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                ++runningThreads;


			




	
	
	
		
 
            }


			




	
	
	
		
 

			




	
	
	
		
 
            bool ok = true;


			




	...
	
		
 
@@ -435,3 +728,3 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
                    while (ok = Iterate(node) && !requestCancel)


			




	
	
	
		
 
                    while ((ok = Iterate(node)) && !requestCancel)


			




	
	
	
		
 
                    {


			




	...
	
		
 
@@ -453,5 +746,6 @@ namespace DesertPaintLab


			




	
	
	
		
 
            {


			




	
	
	
		
 
                generatorThreads.Remove(Thread.CurrentThread);


			




	
	
	
		
 
                --runningThreads;


			




	
	
	
		
 
                //generatorThreads.Remove(Thread.CurrentThread);


			




	
	
	
		
 

			




	
	
	
		
 
                done = (generatorThreads.Count == 0);


			




	
	
	
		
 
                done = (runningThreads == 0);


			




	
	
	
		
 
            }


			




	...
	
		
 
@@ -459,2 +753,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
            {


			




	
	
	
		
 
                running = false;


			




	
	
	
		
 
                requestCancel = false;


			




	
	
	
		
 
                if (Finished != null)


			




	...
	
		
 
@@ -463,3 +759,2 @@ namespace DesertPaintLab


			




	
	
	
		
 
                }


			




	
	
	
		
 
                running = false;


			




	
	
	
		
 
            }


			




	...
	
		
 
@@ -700,3 +995,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (running)


			




	
	
	
		
 
            if (generatorThreads.Count > 0)


			




	
	
	
		
 
            {


			




	...
	
		
 
@@ -706,2 +1001,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
                }


			




	
	
	
		
 
                generatorThreads.Clear();


			




	
	
	
		
 
            }


			




        

    


    
    

    

        

                

                    RecipeGeneratorWindow.cs
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -33,2 +33,7 @@ namespace DesertPaintLab


			




	
	
	
		
 
        bool running = false;


			




	
	
	
		
 
        bool pauseForCheckpoint = false;


			




	
	
	
		
 

			




	
	
	
		
 
        const long RECIPE_SAVE_INTERVAL = 30000; // msec between saving recipes


			




	
	
	
		
 
        const long CHECKPOINT_INTERVAL = 17000; // msec between saving out generator state


			




	
	
	
		
 
        const string STATE_FILE = "dp_generator_state";


			




	
	
	
		
 

			




	...
	
		
 
@@ -40,2 +45,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
        long lastStatusUpdate;


			




	
	
	
		
 
        long lastProfileSave;


			




	
	
	
		
 
        long lastCheckpoint;


			




	
	
	
		
 

			




	...
	
		
 
@@ -69,2 +76,4 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            colorStore.Clear();


			




	
	
	
		
 

			




	
	
	
		
 
            colorStore.SetSortColumnId(0, Gtk.SortType.Ascending);


			




	...
	
		
 
@@ -82,5 +91,27 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            countLabel.Text = String.Format("{0} / {1}", profile.Recipes.Count, Palette.Count);


			




	
	
	
		
 
            canceling = false;


			




	
	
	
		
 
            running = false;


			




	
	
	
		
 
            pauseForCheckpoint = false;


			




	
	
	
		
 

			




	
	
	
		
 
            generator = new RecipeGenerator(profile.Reactions);


			




	
	
	
		
 
            generator.InitRecipes(profile.Recipes);


			




	
	
	
		
 

			




	
	
	
		
 
            generator.Progress += OnProgress;


			




	
	
	
		
 
            generator.Finished += OnFinished;


			




	
	
	
		
 
            generator.NewRecipe += OnNewRecipe;


			




	
	
	
		
 

			




	
	
	
		
 
            string stateFile = System.IO.Path.Combine(profile.Directory, STATE_FILE);


			




	
	
	
		
 
            if (System.IO.File.Exists(stateFile))


			




	
	
	
		
 
            {


			




	
	
	
		
 
                generator.LoadState(stateFile);


			




	
	
	
		
 
                if (generator.CanResume)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    beginButton.Label = "Restart";


			




	
	
	
		
 
                    stopResumeButton.Label = "Resume";


			




	
	
	
		
 
                    stopResumeButton.Sensitive = true;


			




	
	
	
		
 
                }


			




	
	
	
		
 
            }


			




	
	
	
		
 
            countLabel.Text = String.Format("{0} / {1}", generator.Recipes.Count, Palette.Count);


			




	
	
	
		
 

			




	
	
	
		
 
            Destroyed += OnDestroyed;


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -114,4 +145,4 @@ namespace DesertPaintLab


			




	
	
	
		
 
            maxIngredientsSpinButton.Sensitive = false;


			




	
	
	
		
 
            ExportAction.Sensitive = false;


			




	
	
	
		
 
            SettingsAction.Sensitive = false;


			




	
	
	
		
 
            ExportToWikiAction.Sensitive = false;


			




	
	
	
		
 
            IngredientsAction.Sensitive = false;


			




	
	
	
		
 
            maxRecipeSpinButton.Sensitive = false;


			




	...
	
		
 
@@ -122,10 +153,4 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            generator = new RecipeGenerator();


			




	
	
	
		
 

			




	
	
	
		
 
            generator.InitRecipes(profile.Recipes, profile.Reactions);


			




	
	
	
		
 
            countLabel.Text = String.Format("{0} / {1}", generator.Recipes.Count, Palette.Count);


			




	
	
	
		
 

			




	
	
	
		
 
            generator.Progress += OnProgress;


			




	
	
	
		
 
            generator.Finished += OnFinished;


			




	
	
	
		
 
            generator.NewRecipe += OnNewRecipe;


			




	
	
	
		
 
            // TODO: hook up event notifications


			




	...
	
		
 
@@ -148,6 +173,11 @@ namespace DesertPaintLab


			




	
	
	
		
 

			




	
	
	
		
 
            lastProfileSave = lastProgressUpdate;


			




	
	
	
		
 
            lastCheckpoint = lastProgressUpdate;


			




	
	
	
		
 

			




	
	
	
		
 
            running = true;


			




	
	
	
		
 
            stopResumeButton.Label = "Stop";


			




	
	
	
		
 
            canceling = false;


			




	
	
	
		
 
            pauseForCheckpoint = false;


			




	
	
	
		
 
            stopResumeButton.Label = "Pause";


			




	
	
	
		
 

			




	
	
	
		
 
            generator.BeginRecipeGeneration(profile.Reactions, (uint)maxRecipeSpinButton.ValueAsInt, (uint)maxIngredientsSpinButton.ValueAsInt, (uint)fullQuantityDepthSpinButton.ValueAsInt, (uint)fullQuantitySpinButton.ValueAsInt);


			




	
	
	
		
 
            generator.BeginRecipeGeneration((uint)maxRecipeSpinButton.ValueAsInt, (uint)maxIngredientsSpinButton.ValueAsInt, (uint)fullQuantityDepthSpinButton.ValueAsInt, (uint)fullQuantitySpinButton.ValueAsInt);


			




	
	
	
		
 
        }


			




	...
	
		
 
@@ -161,2 +191,3 @@ namespace DesertPaintLab


			




	
	
	
		
 
                    canceling = true;


			




	
	
	
		
 
                    pauseForCheckpoint = false;


			




	
	
	
		
 
                    generator.Stop();


			




	...
	
		
 
@@ -165,11 +196,16 @@ namespace DesertPaintLab


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    // this must be a resume


			




	
	
	
		
 
                    // Resume previous run


			




	
	
	
		
 
                    ExportToWikiAction.Sensitive = false;


			




	
	
	
		
 
                    IngredientsAction.Sensitive = false;


			




	
	
	
		
 
                    lastProgressUpdate = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;


			




	
	
	
		
 
                    lastStatusUpdate = lastProgressUpdate;


			




	
	
	
		
 
                    lastProfileSave = lastProgressUpdate;


			




	
	
	
		
 
                    lastCheckpoint = lastProgressUpdate;


			




	
	
	
		
 

			




	
	
	
		
 
                    canceling = false;


			




	
	
	
		
 
                        pauseForCheckpoint = false;


			




	
	
	
		
 
                    running = true;


			




	
	
	
		
 
        

			




	
	
	
		
 
                    stopResumeButton.Label = "Stop";


			




	
	
	
		
 
                    generator.BeginRecipeGeneration(profile.Reactions, (uint)maxRecipeSpinButton.ValueAsInt, (uint)maxIngredientsSpinButton.ValueAsInt, (uint)fullQuantityDepthSpinButton.ValueAsInt, (uint)fullQuantitySpinButton.ValueAsInt);


			




	
	
	
		
 
                    stopResumeButton.Label = "Pause";


			




	
	
	
		
 
                    generator.ResumeRecipeGeneration();


			




	
	
	
		
 
                }


			




	...
	
		
 
@@ -181,6 +217,15 @@ namespace DesertPaintLab


			




	
	
	
		
 
            Gtk.Application.Invoke(delegate {


			




	
	
	
		
 
                generator.Wait();


			




	
	
	
		
 
                if (pauseForCheckpoint)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    pauseForCheckpoint = false;


			




	
	
	
		
 
                    generator.SaveState(System.IO.Path.Combine(profile.Directory, STATE_FILE));


			




	
	
	
		
 
                    generator.ResumeRecipeGeneration();


			




	
	
	
		
 
                }


			




	
	
	
		
 
                else


			




	
	
	
		
 
                {


			




	
	
	
		
 
                running = false;


			




	
	
	
		
 
                beginButton.Sensitive = true;


			




	
	
	
		
 
                ExportAction.Sensitive = true;


			




	
	
	
		
 
                SettingsAction.Sensitive = true;


			




	
	
	
		
 
                    ExportToWikiAction.Sensitive = true;


			




	
	
	
		
 
                    IngredientsAction.Sensitive = true;


			




	
	
	
		
 
                stopResumeButton.Sensitive = false;


			




	...
	
		
 
@@ -194,4 +239,11 @@ namespace DesertPaintLab


			




	
	
	
		
 
                {


			




	
	
	
		
 
                        generator.SaveState(System.IO.Path.Combine(profile.Directory, STATE_FILE));


			




	
	
	
		
 
                    stopResumeButton.Label = "Resume";


			




	
	
	
		
 
                    stopResumeButton.Sensitive = true;


			




	
	
	
		
 
                        beginButton.Label = "Restart";


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                    else


			




	
	
	
		
 
                    {


			




	
	
	
		
 
                        System.IO.File.Delete(System.IO.Path.Combine(profile.Directory, STATE_FILE));


			




	
	
	
		
 
                    }


			




	
	
	
		
 
                }


			




	...
	
		
 
@@ -230,2 +282,10 @@ namespace DesertPaintLab


			




	
	
	
		
 
                profile.SetRecipe(recipe);


			




	
	
	
		
 

			




	
	
	
		
 
                long progressTime = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;


			




	
	
	
		
 
                long delta = progressTime - lastProfileSave;


			




	
	
	
		
 
                if (delta >= RECIPE_SAVE_INTERVAL)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    profile.SaveRecipes();


			




	
	
	
		
 
                    lastProfileSave = progressTime;


			




	
	
	
		
 
                }


			




	
	
	
		
 
            });


			




	...
	
		
 
@@ -253,2 +313,10 @@ namespace DesertPaintLab


			




	
	
	
		
 
                //progressBar.Fraction = (double)((generator.RecipeCount / 10000) % 100) / 100.0;


			




	
	
	
		
 

			




	
	
	
		
 
                delta = progressTime - lastCheckpoint;


			




	
	
	
		
 
                if (delta > CHECKPOINT_INTERVAL)


			




	
	
	
		
 
                {


			




	
	
	
		
 
                    pauseForCheckpoint = true;


			




	
	
	
		
 
                    lastCheckpoint = progressTime;


			




	
	
	
		
 
                    generator.Stop();


			




	
	
	
		
 
                }


			




	
	
	
		
 
            });


			




	...
	
		
 
@@ -308,2 +376,16 @@ namespace DesertPaintLab


			




	
	
	
		
 
        }


			




	
	
	
		
 

			




	
	
	
		
 
        protected void OnDestroyed(object o, EventArgs args)


			




	
	
	
		
 
        {


			




	
	
	
		
 
            if (running)


			




	
	
	
		
 
            {


			




	
	
	
		
 
                // window closed while generator running: stop and save


			




	
	
	
		
 
                generator.Finished -= OnFinished;


			




	
	
	
		
 
                generator.Progress -= OnProgress;


			




	
	
	
		
 
                generator.NewRecipe -= OnNewRecipe;


			




	
	
	
		
 
                generator.Stop();


			




	
	
	
		
 
                generator.Wait();


			




	
	
	
		
 
                generator.SaveState(System.IO.Path.Combine(profile.Directory, STATE_FILE));


			




	
	
	
		
 
            }


			




	
	
	
		
 
        }


			




	
	
	
		
 
    }


			




        

    


    
    

    

        

                

                    gtk-gui/gui.stetic
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -8,3 +8,3 @@


			




	
	
	
		
 
    <widget-library name="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />


			




	
	
	
		
 
    <widget-library name="../bin/Debug/DesertPaintLab.exe" internal="true" />


			




	
	
	
		
 
    <widget-library name="../bin/Release/DesertPaintLab.exe" internal="true" />


			




	
	
	
		
 
  </import>


			




        

    


    
    

    

        

                

                    mac/build-mac-bundle.sh
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -21,4 +21,4 @@ fi


			




	
	
	
		
 

			




	
	
	
		
 
/usr/bin/defaults write bin/DesertPaintLab.app/Info.plist CFBundleShortVersionString ${VERSION}


			




	
	
	
		
 
/usr/bin/defaults write bin/DesertPaintLab.app/Info.plist CFBundleVersion ${VERSION}


			




	
	
	
		
 
/usr/bin/defaults write `pwd`/bin/DesertPaintLab.app/Contents/Info.plist CFBundleShortVersionString ${VERSION}


			




	
	
	
		
 
/usr/bin/defaults write `pwd`/bin/DesertPaintLab.app/Contents/Info.plist CFBundleVersion ${VERSION}


			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








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