From 5e7d5eb81ff99fba05433c03f556f9741f0d6e7c Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 22 Feb 2023 00:47:37 +0100 Subject: [PATCH] Cleanup(Solver) - Cleaned up some typos --- src/solver.rs | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/src/solver.rs b/src/solver.rs index 5aa79ce..f2b6d0d 100644 --- a/src/solver.rs +++ b/src/solver.rs @@ -157,7 +157,7 @@ pub fn generate_routes_phase2<'a>(craft: Craft<'a>) -> Option>> { // Todo: Return a vec of relevant functions, instead of the most quality one let mut top_route: Craft<'a> = craft.clone(); // Default route, no hq on that one - let mut top_routes: Vec> = vec![craft.clone()]; + let mut top_routes: Vec> = vec![]; queue.push_back(craft); @@ -170,25 +170,21 @@ pub fn generate_routes_phase2<'a>(craft: Craft<'a>) -> Option>> { let mut craft = _craft.clone(); craft.run_action(action.unwrap()); if action.unwrap() == &ACTIONS.byregot_blessing { - // if let Some(top_route) = &mut top_route { - #[cfg(not(feature="fast"))] - if top_route.quality>=craft.recipe.quality{ - top_routes.push(craft.clone()); // Me memory - } - if top_route.quality < craft.quality { - #[cfg(feature="fast")] - top_routes.push(craft.clone()); - top_route = craft; - } - // } else { - // println!("Why are we here ?"); - // top_routes.push(craft.clone()); - // top_route = Some(craft); - // } + #[cfg(not(feature="fast"))] + if top_route.quality>=craft.recipe.quality{ + top_routes.push(craft.clone()); // Me memory + } + if top_route.quality < craft.quality { + #[cfg(feature="fast")] + top_routes.push(craft.clone()); + top_route = craft; + } } else { queue.push_back(craft); } } } + // Let's not forget the best result + top_routes.push(top_route); Some(top_routes) } \ No newline at end of file