diff --git a/Makefile.toml b/Makefile.toml
index 72dcc22..0c25cfa 100644
--- a/Makefile.toml
+++ b/Makefile.toml
@@ -30,8 +30,9 @@ ignore_errors = true
script = [
"mkdir -p coverage",
"mkdir -p coverage/html",
+"mkdir -p coverage/",
"CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage -Ccodegen-units=1 -Copt-level=0 -Coverflow-checks=off' LLVM_PROFILE_FILE='llvm/cargo-test-%p-%m.profraw' cargo test",
-"grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore '/*' -o coverage/html/"
+"grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore '/*' --ignore '*xiv_csolver.rs' --ignore '*python*.rs' -o coverage/html/",
]
[tasks.clean]
diff --git a/coverage/html/badges/flat.svg b/coverage/html/badges/flat.svg
index b482db6..a43354b 100644
--- a/coverage/html/badges/flat.svg
+++ b/coverage/html/badges/flat.svg
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/coverage/html/badges/flat_square.svg b/coverage/html/badges/flat_square.svg
index cc89b0d..7816a7a 100644
--- a/coverage/html/badges/flat_square.svg
+++ b/coverage/html/badges/flat_square.svg
@@ -1,13 +1,13 @@
\ 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 427f757..a58c41d 100644
--- a/coverage/html/badges/for_the_badge.svg
+++ b/coverage/html/badges/for_the_badge.svg
@@ -1,13 +1,13 @@
\ No newline at end of file
diff --git a/coverage/html/badges/plastic.svg b/coverage/html/badges/plastic.svg
index 5900c59..a3720ca 100644
--- a/coverage/html/badges/plastic.svg
+++ b/coverage/html/badges/plastic.svg
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/coverage/html/badges/social.svg b/coverage/html/badges/social.svg
index 8aeabdb..e26d0fc 100644
--- a/coverage/html/badges/social.svg
+++ b/coverage/html/badges/social.svg
@@ -1,6 +1,6 @@
\ No newline at end of file
diff --git a/python/src/xiv_csolver/example.py b/python/src/xiv_csolver/example.py
index cda7867..5148822 100644
--- a/python/src/xiv_csolver/example.py
+++ b/python/src/xiv_csolver/example.py
@@ -2,9 +2,9 @@ import xiv_csolver_lib
import rich
rich.inspect(xiv_csolver_lib)
-rich.inspect(xiv_csolver_lib.test_result)
-rich.inspect(xiv_csolver_lib.test_result())
rich.inspect(xiv_csolver_lib.test_result())
+rich.inspect(xiv_csolver_lib.test_info())
+rich.inspect(xiv_csolver_lib.test_final_results())
class FeedMeDaddy:
diff --git a/python/src/xiv_csolver/modules/solver.py b/python/src/xiv_csolver/modules/solver.py
index e10c52c..c4ec249 100644
--- a/python/src/xiv_csolver/modules/solver.py
+++ b/python/src/xiv_csolver/modules/solver.py
@@ -116,6 +116,7 @@ class Solver:
self.loggers = loggers
self.solutions = []
+ self.info = None
self.best_quality = None
self.least_steps = None
self.safe_50 = None
@@ -124,7 +125,7 @@ class Solver:
self.compute_all()
def solve(self) -> str:
- self.solutions = xcs.solve_from_python(self)
+ self.solutions,self.info = xcs.solve_from_python(self)
return self.solutions
def compute_all(self) -> True:
diff --git a/src/bin/xiv_csolver.rs b/src/bin/xiv_csolver.rs
index 9549faf..fe884ad 100644
--- a/src/bin/xiv_csolver.rs
+++ b/src/bin/xiv_csolver.rs
@@ -131,26 +131,26 @@ fn main() {
Some(ref res) => {
// Show best results
if args.verbose > 0 {
- println!("[Final] {} results were found:", res.len());
+ println!("[Final] {} results were found:", res.0.len());
#[cfg(feature = "verbose")]
if args.verbose > 1 {
xiv_csolver_lib::print_routes(&results);
}
}
+ println!("\n > SOLUTION [Least steps] <");
+ xiv_csolver_lib::find_fast_route(&res)
+ .unwrap()
+ .pretty_print();
+ println!("\n > SOLUTION [Most durability] <");
+ xiv_csolver_lib::find_safe_route(&res)
+ .unwrap()
+ .pretty_print();
+ println!("\n > SOLUTION [Most quality] < ");
+ xiv_csolver_lib::find_quality_route(&res)
+ .unwrap()
+ .pretty_print();
}
}
- println!("\n > SOLUTION [Least steps] <");
- xiv_csolver_lib::find_fast_route(&results)
- .unwrap()
- .pretty_print();
- println!("\n > SOLUTION [Most durability] <");
- xiv_csolver_lib::find_safe_route(&results)
- .unwrap()
- .pretty_print();
- println!("\n > SOLUTION [Most quality] < ");
- xiv_csolver_lib::find_quality_route(&results)
- .unwrap()
- .pretty_print();
// #[cfg(feature = "verbose")]
// if params.verbose>2{
diff --git a/src/io.rs b/src/io.rs
index e4214b7..4c24a90 100644
--- a/src/io.rs
+++ b/src/io.rs
@@ -1,15 +1,8 @@
//! The main IO module
-//! For now it contains the python bindings, the Args bindings (for clap) and the struct
+//! For now it contains the Args bindings (for clap) and the struct
//! needed to hold all parameters needed at runtime
-//!
-//! Moving the bindings and making them non mandatory is a WIP
-use crate::Craft;
use clap::Parser;
-use core::fmt::Display;
-
-// #[cfg(not(feature = "no_python"))]
-use pyo3::prelude::*;
/// The parameters needed at runtime, used since Args cannot easily be passed to python
#[derive(Debug, Clone, Copy)]
@@ -68,149 +61,6 @@ pub struct Args {
pub long: bool,
}
-/// A final stripped down version of a craft
-/// used for final print and talking with python
-/// TODO: Half of these parameter are unique and SHOULD NOT be replicated on every solution
-#[derive(Debug)]
-#[pyclass]
-pub struct SolverResult {
- /// The number of steps this particular craft takes
- #[pyo3(get)]
- pub steps: u32,
- /// The quality obtained at the end of the craft (absolute value)
- #[pyo3(get)]
- pub quality: u32,
- /// The amount of progression obtained at the end of the craft (absolute value)
- #[pyo3(get)]
- pub progression: u32,
- /// The remaining durability at the end of this craft
- #[pyo3(get)]
- pub durability: i32,
- /// The remaining crafting points at the end of this craft
- #[pyo3(get)]
- pub cp: i32,
- /// The total amount of crafting points the crafter had available (Deprecated)
- #[pyo3(get)]
- pub total_cp: u32,
- /// The total amount of progression needed to finish the craft (Deprecated)
- #[pyo3(get)]
- pub total_progression: u32,
- /// The total quality needed to make this craft 100% HQ (Deprecated)
- #[pyo3(get)]
- pub total_quality: u32,
- /// The total durability for this craft (Deprecated)
- #[pyo3(get)]
- pub total_durability: u32,
- /// The list of actions, as a string
- #[pyo3(get)]
- pub actions: Vec,
- /// The amount of solutions found during the first step of the solving (Used for debug) (Deprecated)
- #[pyo3(get)]
- pub step1_solutions: usize,
- /// The amount of solutions found at the end of the second step of solving (Used for debug) (Deprecated)
- #[pyo3(get)]
- pub step2_solutions: usize,
- #[pyo3(get)]
- /// Wether a 100% HQ solution was found (Deprecated)
- pub found_100_percent: bool,
-}
-
-/// Pretty display for SolverResult
-impl Display for SolverResult {
- fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> Result<(), std::fmt::Error> {
- write!(f, "{:?}", self.actions)
- }
-}
-
-impl SolverResult {
- /// Create a SolverResult from a solution
- /// Using this returns a solution, usable by Python
- pub fn from_craft(
- craft: &Craft,
- step1_solutions: usize,
- step2_solutions: usize,
- found_100_percent: bool,
- ) -> SolverResult {
- let mut actions = craft
- .actions
- .iter()
- .map(|action| format!("{}", action.short_name))
- .collect::>();
- // Todo: Stop adding these by hand
- let arg = (craft.recipe.progress as f32 - craft.progression as f32)
- / craft.get_base_progression() as f32;
- if 0.0 < arg && arg < 1.2 {
- actions.push("basicSynth2".to_string());
- }
- if 1.2 <= arg && arg < 1.8 {
- actions.push("carefulSynthesis".to_string());
- }
- if 1.8 <= arg && arg < 2.0 {
- actions.push("observe".to_string());
- actions.push("focusedSynthesis".to_string());
- }
- SolverResult {
- steps: craft.step_count,
- progression: craft.progression,
- quality: craft.quality,
- durability: craft.durability,
- actions: actions,
- step1_solutions,
- step2_solutions,
- found_100_percent,
- total_progression: craft.recipe.progress,
- total_quality: craft.recipe.quality,
- total_durability: craft.recipe.durability,
- cp: craft.cp,
- total_cp: craft.stats.max_cp,
- }
- }
-}
-
-#[pymethods]
-impl SolverResult {
- /// Default method to create an empty solution, only used for debug purposes
- /// to test wether the import worked
- /// ```py
- /// import xiv_csolver_lib
- /// print(xiv_csolver_lib.default())
- /// ```
- #[staticmethod]
- pub fn default() -> Self {
- Self {
- steps: 0,
- progression: 0,
- quality: 0,
- durability: 0,
- total_progression: 0,
- total_quality: 0,
- total_durability: 0,
- actions: vec!["Act1".to_string(), "Act2".to_string()],
- step1_solutions: 0,
- step2_solutions: 0,
- found_100_percent: false,
- cp: 0,
- total_cp: 0,
- }
- }
-
- /// Implement a pretty_print method
- /// Mainly used for debug purposes
- pub fn pretty_print(&self) {
- println!(
- "Quality: [{}/{}] | Durability: [{}/{}] | Cp : [{}/{}] | Steps : {}",
- self.quality,
- self.total_quality,
- self.durability,
- self.total_durability,
- self.cp,
- self.total_cp,
- self.steps
- );
- println!("{:?}", self.actions);
- }
-}
-
impl Parameters {
/// Create parameters from the arguments parsed by clap
pub fn from_args(args: &Args) -> Self {
@@ -224,116 +74,10 @@ impl Parameters {
}
}
-////// Python Bindings //////
-
-/// A Python module implemented in Rust.
-#[cfg(not(feature = "no_python"))]
-#[pymodule]
-fn xiv_csolver_lib(_py: Python, m: &PyModule) -> PyResult<()> {
- m.add_function(wrap_pyfunction!(test_result, m)?)?;
- m.add_function(wrap_pyfunction!(solve_from_python, m)?)?;
- Ok(())
-}
-
-/// A test result, useful for debugging, all values are set to zero as per the
-/// [`default`](crate::io::SolverResult::default)
-/// ```
-/// # use xiv_csolver_lib::io::SolverResult;
-/// SolverResult {
-/// steps: 0,
-/// progression: 0,
-/// quality: 0,
-/// durability: 0,
-/// total_progression: 0,
-/// total_quality: 0,
-/// total_durability: 0,
-/// actions: vec!["Act1".to_string(), "Act2".to_string()],
-/// step1_solutions: 0,
-/// step2_solutions: 0,
-/// found_100_percent: false,
-/// cp: 0,
-/// total_cp: 0,
-/// };
-/// ```
-#[cfg(not(feature = "no_python"))]
-#[pyfunction]
-pub fn test_result() -> SolverResult {
- SolverResult::default()
-}
-
-/// Create a stat struct stats with the base values
-#[cfg(not(feature = "no_python"))]
-use crate::{solve_craft, Recipe, Stats};
-
-/// Solve a craft from parameters given by python
-/// The values are all obtained by a `&PyAny`, wich must guaranty that several attributes are
-/// accesible by `__getattr__`
-///
-/// ```python
-/// import xiv_craft_solver, rich
-///
-/// class FeedingClass:
-/// durability = 70
-/// progress = 3900
-/// quality = 10920
-/// progress_divider = 130
-/// quality_divider = 115
-/// progress_modifier = 80
-/// quality_modifier = 70
-/// craftsmanship = 4041
-/// control = 3959
-/// max_cp = 602
-/// # Config
-/// depth = 10
-/// byregot_step = 10
-/// desperate = False
-/// threads = 8
-/// verbose = 0
-/// crafting_feeder = FeedingClass()
-/// rich.inspect(xiv_csolver_lib.solve_from_python(crafting_feeder))
-/// ```
-
-#[cfg(not(feature = "no_python"))]
-#[pyfunction]
-pub fn solve_from_python(py: Python<'_>, values: &PyAny) -> PyResult