ATITD-Tools/Desert-Paint-Lab Changeset

Changeset - 53db4d500e13

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Jason Maltzen (jmaltzen) - 9 years ago 2015-12-23 23:53:52
jason.maltzen@unsanctioned.net

Remove debug print output

1 file changed with 11 insertions and 11 deletions:

RecipeGenerator.cs

0 comments (0 inline, 0 general)

RecipeGenerator.cs

➞

Show inline comments

@@ ... / @@ -465,107 +465,107 @@ namespace DesertPaintLab @@
+            }
+        }
         // Add the cheapest recipe to the recipe list
         // returns the discarded recipe from the pair (or null if no original recipe to replace)
         private PaintRecipe AddCheapestRecipe(PaintRecipe recipe)
+        {
             PaintRecipe discarded = recipe;
             if (recipe.IsValid)
+            {
                 recipe.Reactions = reactions;
                 string colorName = Palette.FindNearest(recipe.ReactedColor);
                 //System.Console.WriteLine("Recipe: {0} {1}:", colorName, recipe.Cost);
                 //foreach (PaintRecipe.RecipeIngredient ingr in recipe.Ingredients)
                 //{
                 //    System.Console.WriteLine("    -> {0} {1}", ingr.quantity, ingr.name);
                 //}
                 uint cost;
                 lock (workerLock)
+                {
                     if (recipeCosts.TryGetValue(colorName, out cost))
+                    {
                         if (cost > recipe.Cost)
+                        {
                             discarded = recipes[colorName];
                             recipeCosts[colorName] = recipe.Cost;
                             recipes[colorName] = recipe;
                             if (NewRecipe != null)
+                            {
                                 NewRecipeEventArgs args = new NewRecipeEventArgs(colorName, recipe);
                                 NewRecipe(this, args);
+                            }
+                        }
+                    }
                     else
+                    {
                         discarded = null;
                         recipeCosts.Add(colorName, recipe.Cost);
                         recipes.Add(colorName, recipe);
                         if (NewRecipe != null)
+                        {
                             NewRecipeEventArgs args = new NewRecipeEventArgs(colorName, recipe);
                             NewRecipe(this, args);
+                        }
+                    }
+                }
+            }
             else
+            {
                 string msg = String.Format("Recipe is invalid ({0} ingredients)\n", recipe.Ingredients.Count);
                 foreach (PaintRecipe.RecipeIngredient ingr in recipe.Ingredients)
+                {
                     msg += String.Format("    -> {0} {1}", ingr.quantity, ingr.name);
+                }
                 lock (workerLock) {
                     Console.WriteLine(msg);
+                }
+            }
             //else
             //{
             //    string msg = String.Format("Recipe is invalid ({0} ingredients)\n", recipe.Ingredients.Count);
             //    foreach (PaintRecipe.RecipeIngredient ingr in recipe.Ingredients)
             //    {
             //        msg += String.Format("    -> {0} {1}", ingr.quantity, ingr.name);
             //    }
             //    lock (workerLock) {
             //        Console.WriteLine(msg);
             //    }
             //}
             return discarded;
+        }
         private bool Iterate(SearchNode node)
+        {
             // pick recipe quantities at current recipe ingredients/size
             if (NextRecipe(node))
+            {
                 lock(workerLock)
+                {
                     ++recipeCount;
+                }
                 //System.Console.WriteLine("Found next recipe at size {0} qty {1}", node.Reagents.Count, node.CurrentTargetQuantity);
                 return true;
+            }
             if (NextRecipeSize(node))
+            {
                 //System.Console.WriteLine("Found next recipee size {0}", node.CurrentTargetQuantity);
                 return true;
+            }
             // Search for next ingredient combo - all quantity combos for previous were searched
             //System.Console.WriteLine("Finding next ingredient combo");
             do
+            {
                 if (!node.AddNextReagent())
+                {
                     while ((node.Reagents.Count > node.InitialCount) && (node.LastReagent == (totalReagents-1)))
+                    {
                         node.RemoveLastReagent();
+                    }
                     if (node.Reagents.Count == node.InitialCount)
+                    {
                         // done
                         return false;
+                    }
                     uint nextReagent = node.NextFreeReagent(node.LastReagent);
                     while ((node.Reagents.Count > node.InitialCount) && (nextReagent >= totalReagents))
+                    {
                         // No more reagents to try at this level
                         node.RemoveLastReagent();
                         if (node.Reagents.Count > node.InitialCount)
+                        {
                             nextReagent = node.NextFreeReagent(node.LastReagent);
+                        }
+                    }

0 comments (0 inline, 0 general)