danturin #4
10
example.py
10
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()
|
||||
|
|
|
|||
|
|
@ -156,8 +156,8 @@ pub fn generate_routes_phase2<'a>(craft: Craft<'a>) -> Option<Vec<Craft<'a>>> {
|
|||
let mut queue = VecDeque::new();
|
||||
|
||||
// Todo: Return a vec of relevant functions, instead of the most quality one
|
||||
let mut top_route: Option<Craft<'a>> = Some(craft.clone()); // Default route, no hq on that one
|
||||
let mut top_routes: Vec<Craft<'a>> = vec![craft.clone()];
|
||||
let mut top_route: Craft<'a> = craft.clone(); // Default route, no hq on that one
|
||||
let mut top_routes: Vec<Craft<'a>> = vec![];
|
||||
|
||||
queue.push_back(craft);
|
||||
|
||||
|
|
@ -170,25 +170,21 @@ pub fn generate_routes_phase2<'a>(craft: Craft<'a>) -> Option<Vec<Craft<'a>>> {
|
|||
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 ?");
|
||||
#[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 = Some(craft);
|
||||
top_route = craft;
|
||||
}
|
||||
} else {
|
||||
queue.push_back(craft);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Let's not forget the best result
|
||||
top_routes.push(top_route);
|
||||
Some(top_routes)
|
||||
}
|
||||
Reference in New Issue