diff --git a/Makefile.toml b/Makefile.toml index 92956fa..72dcc22 100644 --- a/Makefile.toml +++ b/Makefile.toml @@ -21,7 +21,7 @@ script = [ [tasks.fmt] script_runner = "@shell" script = [ -"cargo +nightly fmt -- --config format_code_in_doc_comments=true" +"cargo +nightly fmt -- --config format_code_in_doc_comments=true --config imports_granularity=Module" ] [tasks.testcov] diff --git a/coverage/html/badges/flat.svg b/coverage/html/badges/flat.svg index 4c9dba0..cbcfb5c 100644 --- a/coverage/html/badges/flat.svg +++ b/coverage/html/badges/flat.svg @@ -1,6 +1,6 @@ - coverage: 56% + xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 69%"> + coverage: 69% @@ -16,8 +16,8 @@ coverage - - 56% + + 69% \ No newline at end of file diff --git a/coverage/html/badges/flat_square.svg b/coverage/html/badges/flat_square.svg index efc26f9..36d4829 100644 --- a/coverage/html/badges/flat_square.svg +++ b/coverage/html/badges/flat_square.svg @@ -1,13 +1,13 @@ - coverage: 56% + xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 69%"> + coverage: 69% coverage - 56% + 69% \ No newline at end of file diff --git a/coverage/html/badges/for_the_badge.svg b/coverage/html/badges/for_the_badge.svg index 0956090..0cfc978 100644 --- a/coverage/html/badges/for_the_badge.svg +++ b/coverage/html/badges/for_the_badge.svg @@ -1,13 +1,13 @@ - COVERAGE: 56% + xmlns:xlink="http://www.w3.org/1999/xlink" width="142.5" height="28" role="img" aria-label="COVERAGE: 69%"> + COVERAGE: 69% COVERAGE - 56% + 69% \ No newline at end of file diff --git a/coverage/html/badges/plastic.svg b/coverage/html/badges/plastic.svg index 16fde0e..68d3549 100644 --- a/coverage/html/badges/plastic.svg +++ b/coverage/html/badges/plastic.svg @@ -1,6 +1,6 @@ - coverage: 56% + xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="18" role="img" aria-label="coverage: 69%"> + coverage: 69% @@ -18,8 +18,8 @@ coverage - - 56% + + 69% \ No newline at end of file diff --git a/coverage/html/badges/social.svg b/coverage/html/badges/social.svg index f5e0951..45c8c46 100644 --- a/coverage/html/badges/social.svg +++ b/coverage/html/badges/social.svg @@ -1,6 +1,6 @@ - Coverage: 56% + xmlns:xlink="http://www.w3.org/1999/xlink" width="99" height="20" role="img" aria-label="Coverage: 69%"> + Coverage: 69% @@ -20,8 +20,8 @@ Coverage - - 56% + + 69% \ No newline at end of file diff --git a/src/craft.rs b/src/craft.rs index cbffb01..9f4cd95 100644 --- a/src/craft.rs +++ b/src/craft.rs @@ -210,6 +210,33 @@ impl<'a> Craft<'a> { }, ) } + + /// Create a "Three start" craft, testing only + pub fn three_star() -> Craft<'a> { + Self::new( + crate::specs::Recipe { + durability: 70, + progress: 3900, + quality: 10920, + progress_divider: 130, + quality_divider: 115, + progress_modifier: 80, + quality_modifier: 70, + }, + crate::specs::Stats { + craftsmanship: 4041, + control: 3971, + max_cp: 595, + }, + crate::io::Parameters { + threads: 8, + verbose: 2, + depth: 8, + desperate: false, + byregot_step: 10, + }, + ) + } } #[cfg(test)] diff --git a/src/lib.rs b/src/lib.rs index 96c4de4..b83a71f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -96,12 +96,9 @@ #![warn(missing_docs)] -use crate::io::SolverResult; -use crate::{ - craft::Craft, - io::Parameters, - specs::{Recipe, Stats}, -}; +use crate::craft::Craft; +use crate::io::{Parameters, SolverResult}; +use crate::specs::{Recipe, Stats}; use std::sync::{Arc, Mutex}; use threadpool::ThreadPool; diff --git a/src/solver.rs b/src/solver.rs index 3ed2fe6..bbce062 100644 --- a/src/solver.rs +++ b/src/solver.rs @@ -16,7 +16,7 @@ pub fn next_action_picker_1<'a>(craft: &Craft<'a>) -> Vec> { let mut available_actions = Vec::>::new(); let mut forbidden_actions = Vec::>::new(); - // Optimize the first three steps for massive time save + // Optimize the first four steps for massive time save if craft.step_count == 0 { return action_vec![ACTIONS.muscle_memory]; } @@ -65,7 +65,7 @@ pub fn next_action_picker_1<'a>(craft: &Craft<'a>) -> Vec> { } // For long first run - if craft.step_count > 8 { + if craft.step_count > 8 && craft.buffs.waste_not == 0 { available_actions.append(&mut action_vec![ACTIONS.waste_not_ii, ACTIONS.waste_not]) }; @@ -246,3 +246,254 @@ pub fn generate_routes_phase2<'a>(craft: Craft<'a>) -> Option>> { top_routes.push(top_route); Some(top_routes) } + +#[cfg(test)] +mod test { + use crate::solver::{generate_routes_phase1, next_action_picker_1, ACTIONS}; + + #[test] + pub fn test_first_step() { + let mut craft = crate::craft::Craft::three_star(); + // Try a failed craft + craft.success = crate::specs::Success::Failure; + let vact = next_action_picker_1(&craft); + assert_eq!(vact, vec![None]); + craft.success = crate::specs::Success::Pending; + + // Try the first 4 steps + let vact = next_action_picker_1(&craft); + assert_eq!(vact, action_vec![ACTIONS.muscle_memory]); + craft.run_action(&ACTIONS.muscle_memory); + + let vact = next_action_picker_1(&craft); + assert_eq!(vact, action_vec![ACTIONS.manipulation]); + craft.run_action(&ACTIONS.manipulation); + + let vact = next_action_picker_1(&craft); + assert_eq!(vact, action_vec![ACTIONS.veneration]); + craft.run_action(&ACTIONS.veneration); + + let vact = next_action_picker_1(&craft); + assert_eq!(vact, action_vec![ACTIONS.waste_not_ii, ACTIONS.groundwork]); + craft.run_action(&ACTIONS.waste_not_ii); + + // Try the steps 5-8, deterministically + let vact = next_action_picker_1(&craft); + assert_eq!(vact, action_vec![ACTIONS.groundwork]); + craft.run_action(&ACTIONS.careful_synthesis); + + let vact = next_action_picker_1(&craft); + assert_eq!( + vact, + action_vec![ + ACTIONS.groundwork, + ACTIONS.basic_synthesis, + ACTIONS.careful_synthesis, + ACTIONS.delicate_synthesis + ] + ); + craft.run_action(&ACTIONS.careful_synthesis); + + let vact = next_action_picker_1(&craft); + assert_eq!( + vact, + action_vec![ + ACTIONS.groundwork, + ACTIONS.basic_synthesis, + ACTIONS.careful_synthesis, + ACTIONS.delicate_synthesis + ] + ); + craft.run_action(&ACTIONS.careful_synthesis); + + let vact = next_action_picker_1(&craft); + assert_eq!( + vact, + action_vec![ + ACTIONS.groundwork, + ACTIONS.basic_synthesis, + ACTIONS.careful_synthesis, + ACTIONS.delicate_synthesis + ] + ); + craft.run_action(&ACTIONS.careful_synthesis); + + // Check odd parameters + craft.buffs.waste_not = 0; + craft.progression = 0; + let vact = next_action_picker_1(&craft); + assert_eq!( + vact, + action_vec![ + ACTIONS.basic_synthesis, + ACTIONS.careful_synthesis, + ACTIONS.prudent_synthesis, + ACTIONS.delicate_synthesis + ] + ); + craft.run_action(&ACTIONS.delicate_synthesis); + + let vact = next_action_picker_1(&craft); + assert_eq!( + vact, + action_vec![ + ACTIONS.basic_synthesis, + ACTIONS.careful_synthesis, + ACTIONS.prudent_synthesis, + ACTIONS.delicate_synthesis, + ACTIONS.waste_not_ii, + ACTIONS.waste_not + ] + ); + + craft.args.desperate = true; + let vact = next_action_picker_1(&craft); + assert_eq!( + vact, + action_vec![ + ACTIONS.basic_synthesis, + ACTIONS.careful_synthesis, + ACTIONS.prudent_synthesis, + ACTIONS.delicate_synthesis, + ACTIONS.groundwork, + ACTIONS.masters_mend, + ACTIONS.waste_not_ii, + ACTIONS.waste_not + ] + ); + } + + #[test] + pub fn test_routes_p1() { + let craft = crate::craft::Craft::three_star(); + let mut routes1 = generate_routes_phase1(craft); + + for route in routes1.iter() { + println!("{:?}", route.actions); + } + // Literrally any change will break it + // An eq should be implmented to just check a vector of vector versus a route + assert_eq!(routes1.len(), 9); + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.waste_not_ii, + &ACTIONS.groundwork, + &ACTIONS.delicate_synthesis, + &ACTIONS.delicate_synthesis + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.waste_not_ii, + &ACTIONS.groundwork, + &ACTIONS.delicate_synthesis, + &ACTIONS.basic_synthesis, + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.waste_not_ii, + &ACTIONS.groundwork, + &ACTIONS.careful_synthesis + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.waste_not_ii, + &ACTIONS.groundwork, + &ACTIONS.basic_synthesis + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.groundwork, + &ACTIONS.delicate_synthesis, + &ACTIONS.delicate_synthesis + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.groundwork, + &ACTIONS.delicate_synthesis, + &ACTIONS.basic_synthesis + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.groundwork, + &ACTIONS.prudent_synthesis + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.groundwork, + &ACTIONS.careful_synthesis + ] + ); + + let route = routes1.pop().unwrap(); + assert_eq!( + route.actions, + vec![ + &ACTIONS.muscle_memory, + &ACTIONS.manipulation, + &ACTIONS.veneration, + &ACTIONS.groundwork, + &ACTIONS.basic_synthesis + ] + ); + + let route = routes1.pop(); + match route { + None => (), + Some(..) => panic!(), + } + } +}