From aba82637663385c737285dd72af9eb2c777f6b7f Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 22 Feb 2023 00:16:50 +0100 Subject: [PATCH 1/2] Bugfix(Speed) - Removes a useless chck --- example.py | 10 +++++----- src/solver.rs | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/example.py b/example.py index 5911657..a9c19ec 100644 --- a/example.py +++ b/example.py @@ -20,11 +20,11 @@ class feedMeDaddy: max_cp = 602 # Config - depth=10 - byregot_step=10 - desperate=False - threads=8 - verbose=0 + depth = 10 + byregot_step = 10 + desperate = False + threads = 8 + verbose = 0 el_daddy=feedMeDaddy() diff --git a/src/solver.rs b/src/solver.rs index c43243f..5aa79ce 100644 --- a/src/solver.rs +++ b/src/solver.rs @@ -156,7 +156,7 @@ pub fn generate_routes_phase2<'a>(craft: Craft<'a>) -> Option>> { let mut queue = VecDeque::new(); // Todo: Return a vec of relevant functions, instead of the most quality one - let mut top_route: Option> = Some(craft.clone()); // Default route, no hq on that one + let mut top_route: Craft<'a> = craft.clone(); // Default route, no hq on that one let mut top_routes: Vec> = vec![craft.clone()]; queue.push_back(craft); @@ -170,21 +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 { + // if let Some(top_route) = &mut top_route { #[cfg(not(feature="fast"))] - if top_route.quality>craft.recipe.quality{ + 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; + top_route = craft; } - } else { - println!("Why are we here ?"); - top_routes.push(craft.clone()); - top_route = Some(craft); - } + // } else { + // println!("Why are we here ?"); + // top_routes.push(craft.clone()); + // top_route = Some(craft); + // } } else { queue.push_back(craft); } -- 2.45.1 From 5e7d5eb81ff99fba05433c03f556f9741f0d6e7c Mon Sep 17 00:00:00 2001 From: Dandaedre Date: Wed, 22 Feb 2023 00:47:37 +0100 Subject: [PATCH 2/2] 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 -- 2.45.1