Compare commits
16 Commits
| Author | SHA1 | Date |
|---|---|---|
|
|
0600681ec8 | |
|
|
ff4428ebef | |
|
|
d0cacd765c | |
|
|
89856681f7 | |
|
|
099ea3fcba | |
|
|
6ce1bc1e71 | |
|
|
75495dc2c5 | |
|
|
4808b5f82f | |
|
|
9a958fd804 | |
|
|
b0cf27f624 | |
|
|
406bc0e515 | |
|
|
539a14a4fc | |
|
|
fc5cce934a | |
|
|
ee24bdd0af | |
|
|
d5ff22d026 | |
|
|
cce631261b |
|
|
@ -0,0 +1,9 @@
|
||||||
|
[bumpversion]
|
||||||
|
current_version = 0.1.8
|
||||||
|
tag = True
|
||||||
|
|
||||||
|
[bumpversion:file:python/pyproject.toml]
|
||||||
|
|
||||||
|
[bumpversion:file:Cargo.toml]
|
||||||
|
|
||||||
|
[bumpversion:file:pyproject.toml]
|
||||||
|
|
@ -163,3 +163,4 @@ dmypy.json
|
||||||
|
|
||||||
# Cython debug symbols
|
# Cython debug symbols
|
||||||
cython_debug/
|
cython_debug/
|
||||||
|
Cargo.lock
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "xiv_csolver"
|
name = "xiv_csolver"
|
||||||
version = "0.1.7"
|
version = "0.1.8"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
authors = ["谭俊健","Dandaedre","Vkyfox"]
|
authors = ["谭俊健","Dandaedre","Vkyfox"]
|
||||||
description = "Small XIV solver library in rust, with python and rust bindings"
|
description = "Small XIV solver library in rust, with python and rust bindings"
|
||||||
|
|
@ -19,7 +19,7 @@ toml = "0.5.9"
|
||||||
clap = {version = "4.1.6", features = ["derive"]}
|
clap = {version = "4.1.6", features = ["derive"]}
|
||||||
threadpool = "1.8.1"
|
threadpool = "1.8.1"
|
||||||
# For python bindings TODO: make it optionnal
|
# For python bindings TODO: make it optionnal
|
||||||
pyo3 = { version = "0.18.0", features = ["extension-module"] }
|
pyo3 = { version = "0.18.1", features= ["extension-module"]}
|
||||||
|
|
||||||
# [target.'cfg(not(no_python))'.dependencies]
|
# [target.'cfg(not(no_python))'.dependencies]
|
||||||
# pyo3 = { version = "0.18.0", features = ["extension-module"] }
|
# pyo3 = { version = "0.18.0", features = ["extension-module"] }
|
||||||
|
|
@ -36,7 +36,8 @@ opt-level = 3
|
||||||
lto = true
|
lto = true
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
default = []
|
extension-module = ["pyo3/extension-module"]
|
||||||
|
default = ["extension-module"]
|
||||||
verbose = []
|
verbose = []
|
||||||
no_python = [] # Removes the python bindings
|
no_python = [] # Removes the python bindings
|
||||||
fast = [] # Remove some under optimisations that try to find other routes
|
fast = [] # Remove some under optimisations that try to find other routes
|
||||||
|
|
@ -49,3 +50,4 @@ crate-type = ["cdylib","rlib"]
|
||||||
[[bin]]
|
[[bin]]
|
||||||
name = "xiv_csolver_cli"
|
name = "xiv_csolver_cli"
|
||||||
path = "src/bin/xiv_csolver.rs"
|
path = "src/bin/xiv_csolver.rs"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,232 @@
|
||||||
|
// Add this webhook in Gitea:
|
||||||
|
// http://192.168.1.37:8080/gitea-webhook/post
|
||||||
|
|
||||||
|
pipeline {
|
||||||
|
agent { label 'rust_no_docker' }
|
||||||
|
|
||||||
|
environment {
|
||||||
|
CARGO_TERM_COLOR = 'always'
|
||||||
|
RUST_BACKTRACE = '1'
|
||||||
|
VENV = '.venv'
|
||||||
|
}
|
||||||
|
|
||||||
|
stages {
|
||||||
|
stage('Checkout') {
|
||||||
|
steps {
|
||||||
|
checkout scm
|
||||||
|
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
git submodule sync --recursive
|
||||||
|
git submodule update --init --recursive
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Setup Rust') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
if ! command -v rustup >/dev/null 2>&1; then
|
||||||
|
echo "ERROR: rustup is not installed on this worker." >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Ensuring stable Rust is available..."
|
||||||
|
|
||||||
|
rustup toolchain install stable \
|
||||||
|
--profile minimal \
|
||||||
|
--component rustfmt \
|
||||||
|
--component clippy
|
||||||
|
|
||||||
|
rustup default stable
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Using:"
|
||||||
|
rustc --version
|
||||||
|
cargo --version
|
||||||
|
rustfmt --version
|
||||||
|
cargo clippy --version
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Setup Python') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
if ! command -v uv >/dev/null 2>&1; then
|
||||||
|
echo "uv not found — installing it..."
|
||||||
|
|
||||||
|
if ! command -v cargo-binstall >/dev/null 2>&1; then
|
||||||
|
echo "cargo-binstall not found — installing it..."
|
||||||
|
cargo install cargo-binstall
|
||||||
|
fi
|
||||||
|
|
||||||
|
cargo binstall --no-confirm uv
|
||||||
|
else
|
||||||
|
echo "uv already installed."
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Using:"
|
||||||
|
uv --version
|
||||||
|
|
||||||
|
rm -rf "${VENV}"
|
||||||
|
|
||||||
|
echo "Creating Python virtual environment..."
|
||||||
|
uv venv "${VENV}"
|
||||||
|
|
||||||
|
echo "Installing Maturin..."
|
||||||
|
uv pip install \
|
||||||
|
--python "${VENV}/bin/python" \
|
||||||
|
"maturin>=0.14,<0.15"
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Python:"
|
||||||
|
"${VENV}/bin/python" --version
|
||||||
|
|
||||||
|
echo "Maturin:"
|
||||||
|
"${VENV}/bin/maturin" --version
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Format') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
echo "Checking Rust formatting..."
|
||||||
|
cargo fmt --all -- --check
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Rust Check') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
echo "Checking Rust targets..."
|
||||||
|
|
||||||
|
cargo check \
|
||||||
|
--all-targets \
|
||||||
|
--all-features
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Rust Tests') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
echo "Running Rust tests..."
|
||||||
|
|
||||||
|
cargo test \
|
||||||
|
--all-targets \
|
||||||
|
--all-features
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Clippy') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
echo "Running Clippy..."
|
||||||
|
|
||||||
|
cargo clippy \
|
||||||
|
--all-targets \
|
||||||
|
--all-features
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build CLI') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
echo "Building xiv_csolver CLI..."
|
||||||
|
|
||||||
|
cargo build \
|
||||||
|
--release \
|
||||||
|
--bin xiv_csolver_cli
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "CLI build completed."
|
||||||
|
|
||||||
|
if [ -f target/release/xiv_csolver_cli ]; then
|
||||||
|
ls -lh target/release/xiv_csolver_cli
|
||||||
|
fi
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stage('Build Python Bindings') {
|
||||||
|
steps {
|
||||||
|
sh '''
|
||||||
|
set -eu
|
||||||
|
|
||||||
|
echo "Building Python extension through Maturin..."
|
||||||
|
|
||||||
|
"${VENV}/bin/maturin" build \
|
||||||
|
--release
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Python binding build completed."
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
post {
|
||||||
|
success {
|
||||||
|
publishChecks(
|
||||||
|
conclusion: 'SUCCESS',
|
||||||
|
name: 'Rust/Python CI',
|
||||||
|
summary: 'xiv_csolver passed all CI checks.',
|
||||||
|
text: 'Formatting, Rust checks, tests, Clippy, CLI build, and Python binding build completed successfully.',
|
||||||
|
title: 'Build Successful'
|
||||||
|
)
|
||||||
|
|
||||||
|
echo '✅ xiv_csolver passed all CI checks.'
|
||||||
|
}
|
||||||
|
|
||||||
|
failure {
|
||||||
|
publishChecks(
|
||||||
|
conclusion: 'FAILURE',
|
||||||
|
name: 'Rust/Python CI',
|
||||||
|
summary: 'xiv_csolver failed CI.',
|
||||||
|
text: 'Formatting, Rust compilation, tests, Clippy, CLI build, or Maturin binding build failed. Check the Jenkins log.',
|
||||||
|
title: 'Build Failed'
|
||||||
|
)
|
||||||
|
|
||||||
|
echo '❌ xiv_csolver CI failed.'
|
||||||
|
}
|
||||||
|
|
||||||
|
unstable {
|
||||||
|
publishChecks(
|
||||||
|
conclusion: 'ACTION_REQUIRED',
|
||||||
|
name: 'Rust/Python CI',
|
||||||
|
summary: 'xiv_csolver CI is unstable.',
|
||||||
|
text: 'The Jenkins build completed with an unstable status.',
|
||||||
|
title: 'Build Unstable'
|
||||||
|
)
|
||||||
|
|
||||||
|
echo '⚠️ xiv_csolver CI is unstable.'
|
||||||
|
}
|
||||||
|
|
||||||
|
always {
|
||||||
|
sh '''
|
||||||
|
echo "Cleaning Python CI environment..."
|
||||||
|
rm -rf .venv
|
||||||
|
'''
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -18,10 +18,11 @@ script = [
|
||||||
"twine upload releases/xiv_csolver_lib*.whl --repository gitea",
|
"twine upload releases/xiv_csolver_lib*.whl --repository gitea",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tasks.format]
|
[tasks.fmt]
|
||||||
install_crate = "rustfmt"
|
script_runner = "@shell"
|
||||||
command = "cargo"
|
script = [
|
||||||
args = ["fmt", "--", "--emit=files"]
|
"cargo +nightly fmt -- --config format_code_in_doc_comments=true --config imports_granularity=Module"
|
||||||
|
]
|
||||||
|
|
||||||
[tasks.testcov]
|
[tasks.testcov]
|
||||||
script_runner = "@shell"
|
script_runner = "@shell"
|
||||||
|
|
@ -29,8 +30,9 @@ ignore_errors = true
|
||||||
script = [
|
script = [
|
||||||
"mkdir -p coverage",
|
"mkdir -p coverage",
|
||||||
"mkdir -p coverage/html",
|
"mkdir -p coverage/html",
|
||||||
"CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' LLVM_PROFILE_FILE='llvm/cargo-test-%p-%m.profraw' cargo test",
|
"mkdir -p coverage/",
|
||||||
"grcov . --binary-path ./target/debug/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore '/*' -o coverage/html/"
|
"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 '/*' --ignore '*xiv_csolver.rs' --ignore '*python*.rs' -o coverage/html/",
|
||||||
]
|
]
|
||||||
|
|
||||||
[tasks.clean]
|
[tasks.clean]
|
||||||
|
|
|
||||||
|
|
@ -5,7 +5,7 @@ Originaly written by [RikaKagurasaka](https://github.com/RikaKagurasaka/xiv_craf
|
||||||
it now is widely improved and provides python bindings for a GUI (or anything else really)
|
it now is widely improved and provides python bindings for a GUI (or anything else really)
|
||||||
|
|
||||||
|
|
||||||

|

|
||||||
|
|
||||||
### Basic RUST CLI Usage
|
### Basic RUST CLI Usage
|
||||||
Everything is done through the regular cargo interface
|
Everything is done through the regular cargo interface
|
||||||
|
|
|
||||||
8
Todo.md
|
|
@ -16,6 +16,14 @@
|
||||||
### Features
|
### Features
|
||||||
🟩 (GUI) Refactor code
|
🟩 (GUI) Refactor code
|
||||||
🟩 (GUI) Restore GUI state
|
🟩 (GUI) Restore GUI state
|
||||||
|
🟩 (GUI) Bugfix the gui and clean it up
|
||||||
|
🟩 (LIB) Restructure code, cleanup the mess
|
||||||
|
🟩 (LIB) Have an autoretry
|
||||||
|
🟩 (LIB) Have the autoretry be smart and/or threaded with interrupts
|
||||||
|
🟩 (LIB) Cleanup the Toml to have one unique Food/Receipe/Craftsman with the gui
|
||||||
|
🟩 (LIB) Be more aggressive with the mem optimisations
|
||||||
|
🟩 (LIB) Have a thread interrupt mode for fast mode
|
||||||
|
🟩 (LIB) Cleanup features (verbose doesn't really make sense)
|
||||||
|
|
||||||
# Roadmap
|
# Roadmap
|
||||||
## v1.0.0
|
## v1.0.0
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg"
|
<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 22%">
|
xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 99%">
|
||||||
<title>coverage: 22%</title>
|
<title>coverage: 99%</title>
|
||||||
<linearGradient id="s" x2="0" y2="100%">
|
<linearGradient id="s" x2="0" y2="100%">
|
||||||
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
<stop offset="0" stop-color="#bbb" stop-opacity=".1"/>
|
||||||
<stop offset="1" stop-opacity=".1"/>
|
<stop offset="1" stop-opacity=".1"/>
|
||||||
|
|
@ -10,14 +10,14 @@
|
||||||
</clipPath>
|
</clipPath>
|
||||||
<g clip-path="url(#r)">
|
<g clip-path="url(#r)">
|
||||||
<rect width="61" height="20" fill="#555"/>
|
<rect width="61" height="20" fill="#555"/>
|
||||||
<rect x="61" width="35" height="20" fill="#e05d44"/>
|
<rect x="61" width="35" height="20" fill="#97ca00"/>
|
||||||
<rect width="96" height="20" fill="url(#s)"/>
|
<rect width="96" height="20" fill="url(#s)"/>
|
||||||
</g>
|
</g>
|
||||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110">
|
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110">
|
||||||
<text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text>
|
<text aria-hidden="true" x="315" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text>
|
||||||
<text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text>
|
<text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text>
|
||||||
<text aria-hidden="true" x="775" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">22%</text>
|
<text aria-hidden="true" x="775" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">99%</text>
|
||||||
<text x="775" y="140" transform="scale(.1)" fill="#fff" textLength="250">22%</text>
|
<text x="775" y="140" transform="scale(.1)" fill="#fff" textLength="250">99%</text>
|
||||||
</g>
|
</g>
|
||||||
<script xmlns=""/>
|
<script xmlns=""/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 1.3 KiB |
|
|
@ -1,13 +1,13 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg"
|
<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 22%">
|
xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="20" role="img" aria-label="coverage: 99%">
|
||||||
<title>coverage: 22%</title>
|
<title>coverage: 99%</title>
|
||||||
<g shape-rendering="crispEdges">
|
<g shape-rendering="crispEdges">
|
||||||
<rect width="61" height="20" fill="#555"/>
|
<rect width="61" height="20" fill="#555"/>
|
||||||
<rect x="61" width="35" height="20" fill="#e05d44"/>
|
<rect x="61" width="35" height="20" fill="#97ca00"/>
|
||||||
</g>
|
</g>
|
||||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110">
|
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110">
|
||||||
<text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text>
|
<text x="315" y="140" transform="scale(.1)" fill="#fff" textLength="510">coverage</text>
|
||||||
<text x="775" y="140" transform="scale(.1)" fill="#fff" textLength="250">22%</text>
|
<text x="775" y="140" transform="scale(.1)" fill="#fff" textLength="250">99%</text>
|
||||||
</g>
|
</g>
|
||||||
<script xmlns=""/>
|
<script xmlns=""/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 712 B After Width: | Height: | Size: 712 B |
|
|
@ -1,13 +1,13 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg"
|
<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink" width="142.5" height="28" role="img" aria-label="COVERAGE: 22%">
|
xmlns:xlink="http://www.w3.org/1999/xlink" width="142.5" height="28" role="img" aria-label="COVERAGE: 99%">
|
||||||
<title>COVERAGE: 22%</title>
|
<title>COVERAGE: 99%</title>
|
||||||
<g shape-rendering="crispEdges">
|
<g shape-rendering="crispEdges">
|
||||||
<rect width="91" height="28" fill="#555"/>
|
<rect width="91" height="28" fill="#555"/>
|
||||||
<rect x="91" width="51.5" height="28" fill="#e05d44"/>
|
<rect x="91" width="51.5" height="28" fill="#97ca00"/>
|
||||||
</g>
|
</g>
|
||||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="100">
|
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="100">
|
||||||
<text fill="#fff" x="455" y="175" transform="scale(.1)" textLength="670">COVERAGE</text>
|
<text fill="#fff" x="455" y="175" transform="scale(.1)" textLength="670">COVERAGE</text>
|
||||||
<text fill="#fff" x="1167.5" y="175" font-weight="bold" transform="scale(.1)" textLength="275">22%</text>
|
<text fill="#fff" x="1167.5" y="175" font-weight="bold" transform="scale(.1)" textLength="275">99%</text>
|
||||||
</g>
|
</g>
|
||||||
<script xmlns=""/>
|
<script xmlns=""/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 739 B After Width: | Height: | Size: 739 B |
|
|
@ -1,6 +1,6 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg"
|
<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="18" role="img" aria-label="coverage: 22%">
|
xmlns:xlink="http://www.w3.org/1999/xlink" width="96" height="18" role="img" aria-label="coverage: 99%">
|
||||||
<title>coverage: 22%</title>
|
<title>coverage: 99%</title>
|
||||||
<linearGradient id="s" x2="0" y2="100%">
|
<linearGradient id="s" x2="0" y2="100%">
|
||||||
<stop offset="0" stop-color="#fff" stop-opacity=".7"/>
|
<stop offset="0" stop-color="#fff" stop-opacity=".7"/>
|
||||||
<stop offset=".1" stop-color="#aaa" stop-opacity=".1"/>
|
<stop offset=".1" stop-color="#aaa" stop-opacity=".1"/>
|
||||||
|
|
@ -12,14 +12,14 @@
|
||||||
</clipPath>
|
</clipPath>
|
||||||
<g clip-path="url(#r)">
|
<g clip-path="url(#r)">
|
||||||
<rect width="61" height="18" fill="#555"/>
|
<rect width="61" height="18" fill="#555"/>
|
||||||
<rect x="61" width="35" height="18" fill="#e05d44"/>
|
<rect x="61" width="35" height="18" fill="#97ca00"/>
|
||||||
<rect width="96" height="18" fill="url(#s)"/>
|
<rect width="96" height="18" fill="url(#s)"/>
|
||||||
</g>
|
</g>
|
||||||
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110">
|
<g fill="#fff" text-anchor="middle" font-family="Verdana,Geneva,DejaVu Sans,sans-serif" text-rendering="geometricPrecision" font-size="110">
|
||||||
<text aria-hidden="true" x="315" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text>
|
<text aria-hidden="true" x="315" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="510">coverage</text>
|
||||||
<text x="315" y="130" transform="scale(.1)" fill="#fff" textLength="510">coverage</text>
|
<text x="315" y="130" transform="scale(.1)" fill="#fff" textLength="510">coverage</text>
|
||||||
<text aria-hidden="true" x="775" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">22%</text>
|
<text aria-hidden="true" x="775" y="140" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="250">99%</text>
|
||||||
<text x="775" y="130" transform="scale(.1)" fill="#fff" textLength="250">22%</text>
|
<text x="775" y="130" transform="scale(.1)" fill="#fff" textLength="250">99%</text>
|
||||||
</g>
|
</g>
|
||||||
<script xmlns=""/>
|
<script xmlns=""/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 1.4 KiB |
|
|
@ -1,6 +1,6 @@
|
||||||
<svg xmlns="http://www.w3.org/2000/svg"
|
<svg xmlns="http://www.w3.org/2000/svg"
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink" width="99" height="20" role="img" aria-label="Coverage: 22%">
|
xmlns:xlink="http://www.w3.org/1999/xlink" width="99" height="20" role="img" aria-label="Coverage: 99%">
|
||||||
<title>Coverage: 22%</title>
|
<title>Coverage: 99%</title>
|
||||||
<style>a:hover #llink{fill:url(#b);stroke:#ccc}a:hover #rlink{fill:#4183c4}</style>
|
<style>a:hover #llink{fill:url(#b);stroke:#ccc}a:hover #rlink{fill:#4183c4}</style>
|
||||||
<linearGradient id="a" x2="0" y2="100%">
|
<linearGradient id="a" x2="0" y2="100%">
|
||||||
<stop offset="0" stop-color="#fcfcfc" stop-opacity="0"/>
|
<stop offset="0" stop-color="#fcfcfc" stop-opacity="0"/>
|
||||||
|
|
@ -20,8 +20,8 @@
|
||||||
<rect id="llink" stroke="#d5d5d5" fill="url(#a)" x=".5" y=".5" width="61" height="19" rx="2"/>
|
<rect id="llink" stroke="#d5d5d5" fill="url(#a)" x=".5" y=".5" width="61" height="19" rx="2"/>
|
||||||
<text aria-hidden="true" x="305" y="150" fill="#fff" transform="scale(.1)" textLength="510">Coverage</text>
|
<text aria-hidden="true" x="305" y="150" fill="#fff" transform="scale(.1)" textLength="510">Coverage</text>
|
||||||
<text x="305" y="140" transform="scale(.1)" textLength="510">Coverage</text>
|
<text x="305" y="140" transform="scale(.1)" textLength="510">Coverage</text>
|
||||||
<text aria-hidden="true" x="825" y="150" fill="#fff" transform="scale(.1)" textLength="230">22%</text>
|
<text aria-hidden="true" x="825" y="150" fill="#fff" transform="scale(.1)" textLength="230">99%</text>
|
||||||
<text id="rlink" x="825" y="140" transform="scale(.1)" textLength="230">22%</text>
|
<text id="rlink" x="825" y="140" transform="scale(.1)" textLength="230">99%</text>
|
||||||
</g>
|
</g>
|
||||||
<script xmlns=""/>
|
<script xmlns=""/>
|
||||||
</svg>
|
</svg>
|
||||||
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 1.7 KiB |
|
|
@ -5,9 +5,12 @@ build-backend = "maturin"
|
||||||
[project] # The rust bindings
|
[project] # The rust bindings
|
||||||
name = "xiv_csolver_lib"
|
name = "xiv_csolver_lib"
|
||||||
requires-python = ">=3.7"
|
requires-python = ">=3.7"
|
||||||
version = "0.1.7"
|
version = "0.1.8"
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Programming Language :: Rust",
|
"Programming Language :: Rust",
|
||||||
"Programming Language :: Python :: Implementation :: CPython",
|
"Programming Language :: Python :: Implementation :: CPython",
|
||||||
"Programming Language :: Python :: Implementation :: PyPy",
|
"Programming Language :: Python :: Implementation :: PyPy",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[tool.maturin]
|
||||||
|
features = ["pyo3/extension-module"]
|
||||||
|
|
@ -9,7 +9,7 @@ authors = [
|
||||||
{name="Dandaedre"},
|
{name="Dandaedre"},
|
||||||
]
|
]
|
||||||
requires-python = ">=3.7"
|
requires-python = ">=3.7"
|
||||||
version = "0.1.7"
|
version = "0.1.8"
|
||||||
license = {text="Mozilla Public License Version 2.0"}
|
license = {text="Mozilla Public License Version 2.0"}
|
||||||
classifiers = [
|
classifiers = [
|
||||||
"Programming Language :: Rust",
|
"Programming Language :: Rust",
|
||||||
|
|
|
||||||
|
|
@ -4,5 +4,9 @@
|
||||||
# If this seems super convoluted, and you'd rather it was just the three in-game values, know that me too.
|
# If this seems super convoluted, and you'd rather it was just the three in-game values, know that me too.
|
||||||
# Unfortunately that is how the craft system works in FFXIV.
|
# Unfortunately that is how the craft system works in FFXIV.
|
||||||
|
|
||||||
Grade 7 Tincture of Strength: [5060, 12628, 70, 130, 115, 80, 70]
|
Lvl88: [1650, 7000, 40, 128, 112, 100, 100]
|
||||||
Grade 5 Strength Alkahest: [1300, 6200, 40, 123, 107, 100, 100]
|
Patch6.3_precrafts: [3696, 8200, 35, 130, 115, 80, 70]
|
||||||
|
Patch6.3_gear: [5060, 12628, 70, 130, 115, 80, 70]
|
||||||
|
Patch6.3_gatherer: [5720, 12900, 70, 130, 115, 80, 70]
|
||||||
|
Patch6.4_precrafts: [4488, 9090, 35, 130, 115, 80, 70]
|
||||||
|
Patch6.4_gear: [6600, 14040, 70, 130, 115, 80, 70]
|
||||||
|
|
@ -4,6 +4,5 @@
|
||||||
# The top line will always be selected by default
|
# The top line will always be selected by default
|
||||||
|
|
||||||
|
|
||||||
Vicky Crosia: [4021, 3933, 587]
|
Vicky Crosia: [4021, 3987, 601]
|
||||||
Dandaedre Zadiel: [0, 0, 0]
|
Ladisla Kociann: [4021, 3951, 580]
|
||||||
Sekundes Dullahan: [2566, 2443, 522]
|
|
||||||
|
|
@ -2,9 +2,9 @@ import xiv_csolver_lib
|
||||||
import rich
|
import rich
|
||||||
|
|
||||||
rich.inspect(xiv_csolver_lib)
|
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_result())
|
||||||
|
rich.inspect(xiv_csolver_lib.test_info())
|
||||||
|
rich.inspect(xiv_csolver_lib.test_final_results())
|
||||||
|
|
||||||
|
|
||||||
class FeedMeDaddy:
|
class FeedMeDaddy:
|
||||||
|
|
|
||||||
|
|
@ -33,18 +33,18 @@ class Printer:
|
||||||
}
|
}
|
||||||
|
|
||||||
def save_users(self, user_name: str = None, user_stats: list = None) -> dict:
|
def save_users(self, user_name: str = None, user_stats: list = None) -> dict:
|
||||||
output = self.help_text_dict['users'] + '\n\n'
|
output = self.help_text_dict['users'] + '\r\n\r\n'
|
||||||
|
|
||||||
if user_name.title() == '':
|
if user_name.title() == '':
|
||||||
for user, stats in self.full_config.get_users_dict().items():
|
for user, stats in self.full_config.get_users_dict().items():
|
||||||
if user != ' ':
|
if user != ' ':
|
||||||
output += f'{user}: [{stats[0]}, {stats[1]}, {stats[2]}]\n'
|
output += f'{user}: [{stats[0]}, {stats[1]}, {stats[2]}]\r\n'
|
||||||
|
|
||||||
else:
|
else:
|
||||||
self.full_config.get_users_dict()[user_name] = user_stats
|
self.full_config.get_users_dict()[user_name] = user_stats
|
||||||
for user, stats in self.full_config.get_users_dict().items():
|
for user, stats in self.full_config.get_users_dict().items():
|
||||||
if user != ' ':
|
if user != ' ':
|
||||||
output += f'{user}: [{stats[0]}, {stats[1]}, {stats[2]}]\n'
|
output += f'{user}: [{stats[0]}, {stats[1]}, {stats[2]}]\r\n'
|
||||||
|
|
||||||
self.print_users(output)
|
self.print_users(output)
|
||||||
return self.full_config.get_users_dict()
|
return self.full_config.get_users_dict()
|
||||||
|
|
@ -55,18 +55,18 @@ class Printer:
|
||||||
return True
|
return True
|
||||||
|
|
||||||
def save_recipe(self, recipe_name: str = None, recipe_basic_stats: list = None, recipe_advanced_stats: list = None) -> dict:
|
def save_recipe(self, recipe_name: str = None, recipe_basic_stats: list = None, recipe_advanced_stats: list = None) -> dict:
|
||||||
output = self.help_text_dict['recipe'] + '\n\n'
|
output = self.help_text_dict['recipe'] + '\r\n\r\n'
|
||||||
|
|
||||||
if recipe_name.title() == '':
|
if recipe_name.title() == '':
|
||||||
for recipe, stats in self.full_config.get_recipes_dict().items():
|
for recipe, stats in self.full_config.get_recipes_dict().items():
|
||||||
if recipe != ' ':
|
if recipe != ' ':
|
||||||
output += f'{recipe}: [{stats[0]}, {stats[1]}, {stats[2]}, {stats[3]}, {stats[4]}, {stats[5]}, {stats[6]}]\n'
|
output += f'{recipe}: [{stats[0]}, {stats[1]}, {stats[2]}, {stats[3]}, {stats[4]}, {stats[5]}, {stats[6]}]\r\n'
|
||||||
|
|
||||||
else:
|
else:
|
||||||
self.full_config.get_recipes_dict()[recipe_name] = recipe_basic_stats[:-1] + recipe_advanced_stats
|
self.full_config.get_recipes_dict()[recipe_name] = recipe_basic_stats[:-1] + recipe_advanced_stats
|
||||||
for recipe, stats in self.full_config.get_recipes_dict().items():
|
for recipe, stats in self.full_config.get_recipes_dict().items():
|
||||||
if recipe != ' ':
|
if recipe != ' ':
|
||||||
output += f'{recipe}: [{stats[0]}, {stats[1]}, {stats[2]}, {stats[3]}, {stats[4]}, {stats[5]}, {stats[6]}]\n'
|
output += f'{recipe}: [{stats[0]}, {stats[1]}, {stats[2]}, {stats[3]}, {stats[4]}, {stats[5]}, {stats[6]}]\r\n'
|
||||||
|
|
||||||
self.print_recipe(output)
|
self.print_recipe(output)
|
||||||
return self.full_config.get_recipes_dict()
|
return self.full_config.get_recipes_dict()
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,7 @@ Remaining CP: {self.remaining_cp}"""
|
||||||
saved_lines.append(line)
|
saved_lines.append(line)
|
||||||
|
|
||||||
for line in saved_lines:
|
for line in saved_lines:
|
||||||
justified_text += line + '\n'
|
justified_text += line + '\r\n'
|
||||||
|
|
||||||
return justified_text[:-1]
|
return justified_text[:-1]
|
||||||
|
|
||||||
|
|
@ -67,8 +67,9 @@ Remaining CP: {self.remaining_cp}"""
|
||||||
|
|
||||||
if self.steps != 15 and self.steps != 29 and self.steps != 44:
|
if self.steps != 15 and self.steps != 29 and self.steps != 44:
|
||||||
saved_lines.append('/echo Craft complete ! <se.3>')
|
saved_lines.append('/echo Craft complete ! <se.3>')
|
||||||
else:
|
# else:
|
||||||
self.loggers.log(f'No completion message in macro because rotation is exactly {self.steps} steps.')
|
# TODO: Add a callback to the parent object for logging
|
||||||
|
# self.loggers.add_log(f'No completion message in macro because rotation is exactly {self.steps} steps.')
|
||||||
|
|
||||||
if self.steps > 15:
|
if self.steps > 15:
|
||||||
saved_lines.insert(14, '/echo Macro 1 complete <se.2>')
|
saved_lines.insert(14, '/echo Macro 1 complete <se.2>')
|
||||||
|
|
@ -81,11 +82,11 @@ Remaining CP: {self.remaining_cp}"""
|
||||||
for line in saved_lines:
|
for line in saved_lines:
|
||||||
count += 1
|
count += 1
|
||||||
if count < 16:
|
if count < 16:
|
||||||
self.macro1 += line + '\n'
|
self.macro1 += line + '\r\n'
|
||||||
elif 15 < count < 31:
|
elif 15 < count < 31:
|
||||||
self.macro2 += line + '\n'
|
self.macro2 += line + '\r\n'
|
||||||
elif 30 < count < 46:
|
elif 30 < count < 46:
|
||||||
self.macro3 += line + '\n'
|
self.macro3 += line + '\r\n'
|
||||||
|
|
||||||
self.macro1 = self.macro1[:-1]
|
self.macro1 = self.macro1[:-1]
|
||||||
self.macro2 = self.macro2[:-1]
|
self.macro2 = self.macro2[:-1]
|
||||||
|
|
@ -116,6 +117,7 @@ class Solver:
|
||||||
self.loggers = loggers
|
self.loggers = loggers
|
||||||
|
|
||||||
self.solutions = []
|
self.solutions = []
|
||||||
|
self.info = None
|
||||||
self.best_quality = None
|
self.best_quality = None
|
||||||
self.least_steps = None
|
self.least_steps = None
|
||||||
self.safe_50 = None
|
self.safe_50 = None
|
||||||
|
|
@ -124,7 +126,7 @@ class Solver:
|
||||||
self.compute_all()
|
self.compute_all()
|
||||||
|
|
||||||
def solve(self) -> str:
|
def solve(self) -> str:
|
||||||
self.solutions = xcs.solve_from_python(self)
|
self.solutions,self.info = xcs.solve_from_python(self)
|
||||||
return self.solutions
|
return self.solutions
|
||||||
|
|
||||||
def compute_all(self) -> True:
|
def compute_all(self) -> True:
|
||||||
|
|
@ -153,7 +155,7 @@ class Solver:
|
||||||
break
|
break
|
||||||
|
|
||||||
if not done:
|
if not done:
|
||||||
self.loggers.add_log('Could not find a rotation for a 50% Safe Margin.\n'
|
self.loggers.add_log('Could not find a rotation for a 50% Safe Margin.\r\n'
|
||||||
' Defaulting to Best Quality.')
|
' Defaulting to Best Quality.')
|
||||||
self.safe_50 = self.best_quality
|
self.safe_50 = self.best_quality
|
||||||
|
|
||||||
|
|
@ -169,5 +171,3 @@ class Solver:
|
||||||
self.least_steps = Result(output, 'Least steps')
|
self.least_steps = Result(output, 'Least steps')
|
||||||
|
|
||||||
return self.least_steps
|
return self.least_steps
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ def translate_list(actions: list, lang: str):
|
||||||
output.append(dictionary[action])
|
output.append(dictionary[action])
|
||||||
except KeyError:
|
except KeyError:
|
||||||
output.append(supported_languages["en"][action])
|
output.append(supported_languages["en"][action])
|
||||||
loggers.log('Translation not found. Defaulting to English.\n'
|
loggers.log('Translation not found. Defaulting to English.\r\n'
|
||||||
' Macros will probably be broken because of this.')
|
' Macros will probably be broken because of this.')
|
||||||
|
|
||||||
else:
|
else:
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
reorder_imports = true
|
||||||
102
src/action.rs
|
|
@ -2,7 +2,6 @@
|
||||||
//!
|
//!
|
||||||
//! All actions are defined as Action, containing all methods to actively use it in a craft
|
//! All actions are defined as Action, containing all methods to actively use it in a craft
|
||||||
//! while ActionBuilder is used only initally as a lazy_static setup
|
//! while ActionBuilder is used only initally as a lazy_static setup
|
||||||
//!
|
|
||||||
|
|
||||||
use crate::craft::Craft;
|
use crate::craft::Craft;
|
||||||
use crate::specs::{Buff, Success};
|
use crate::specs::{Buff, Success};
|
||||||
|
|
@ -145,9 +144,10 @@ impl Action {
|
||||||
}
|
}
|
||||||
/// Get the durability cost this action would have if used at this stage of the craft
|
/// Get the durability cost this action would have if used at this stage of the craft
|
||||||
/// This method accounts for the effects of **master mend** and **waste not**.
|
/// This method accounts for the effects of **master mend** and **waste not**.
|
||||||
pub fn get_durability_cost(&self, _craft: &Craft) -> u32 {
|
/// Note that not using i32 for durability from scratch is a desing choice
|
||||||
|
pub fn get_durability_cost(&self, _craft: &Craft) -> i32 {
|
||||||
if self == &ACTIONS.masters_mend {
|
if self == &ACTIONS.masters_mend {
|
||||||
return 30;
|
return -30;
|
||||||
}
|
}
|
||||||
if self.dur == 0 || self.progress == 0 && self.quality == 0 {
|
if self.dur == 0 || self.progress == 0 && self.quality == 0 {
|
||||||
return 0;
|
return 0;
|
||||||
|
|
@ -159,7 +159,7 @@ impl Action {
|
||||||
if dur < 5 {
|
if dur < 5 {
|
||||||
dur = 5;
|
dur = 5;
|
||||||
}
|
}
|
||||||
dur
|
dur as i32
|
||||||
}
|
}
|
||||||
/// Get the progress effect this action would have if used at this stage of the craft
|
/// Get the progress effect this action would have if used at this stage of the craft
|
||||||
/// This method accounts for the effects of **groundwork** under 20 durability,
|
/// This method accounts for the effects of **groundwork** under 20 durability,
|
||||||
|
|
@ -419,6 +419,7 @@ impl Default for ActionList {
|
||||||
.build(),
|
.build(),
|
||||||
|
|
||||||
masters_mend: ActionBuilder::new("Master's Mend").cp(88).build(),
|
masters_mend: ActionBuilder::new("Master's Mend").cp(88).build(),
|
||||||
|
//masters_mend: ActionBuilder::new("Master's Mend").dur(-30).cp(88).build(),
|
||||||
waste_not: ActionBuilder::new("Waste Not")
|
waste_not: ActionBuilder::new("Waste Not")
|
||||||
.cp(56)
|
.cp(56)
|
||||||
.buff(Some((Buff::WasteNot, 4)))
|
.buff(Some((Buff::WasteNot, 4)))
|
||||||
|
|
@ -454,3 +455,96 @@ lazy_static! {
|
||||||
/// Initialize a static pseudo &Craft: ACTIONS
|
/// Initialize a static pseudo &Craft: ACTIONS
|
||||||
pub static ref ACTIONS: ActionList = ActionList::default();
|
pub static ref ACTIONS: ActionList = ActionList::default();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use crate::action::ACTIONS;
|
||||||
|
use pretty_assertions::assert_eq;
|
||||||
|
use strum::IntoEnumIterator;
|
||||||
|
#[test]
|
||||||
|
pub fn test_structs() {
|
||||||
|
let ac = crate::action::Action {
|
||||||
|
name: "Michel".to_string(),
|
||||||
|
dur: 0,
|
||||||
|
cp: 0,
|
||||||
|
progress: 0,
|
||||||
|
quality: 0,
|
||||||
|
buff: None,
|
||||||
|
short_name: "miguel".to_string(),
|
||||||
|
};
|
||||||
|
let ab = crate::action::ActionBuilder { action: ac };
|
||||||
|
let ba = crate::action::ActionBuilder::new(&"Basic Synthesis");
|
||||||
|
let _ = crate::action::ActionBuilder::new(&"Groundwork");
|
||||||
|
let cs = crate::action::ActionBuilder::new(&"Careful Synthesis");
|
||||||
|
ab.dur(10)
|
||||||
|
.cp(10)
|
||||||
|
.progress(10)
|
||||||
|
.quality(10)
|
||||||
|
.buff(None)
|
||||||
|
.build();
|
||||||
|
let act1 = ba.cp(10).dur(22).progress(33).quality(44).build();
|
||||||
|
let act2 = cs.cp(10).dur(22).progress(33).quality(44).build();
|
||||||
|
assert_eq!(act1, act2);
|
||||||
|
format!("{:?}", act1);
|
||||||
|
let _ = crate::action::ActionList::default();
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_with_craft() {
|
||||||
|
let mut bbs = crate::specs::BuffState::default();
|
||||||
|
for buff in crate::specs::Buff::iter() {
|
||||||
|
bbs.apply(buff, 2);
|
||||||
|
}
|
||||||
|
let mut act1 = crate::action::ActionBuilder::new(&"Basic Synthesis")
|
||||||
|
.dur(22)
|
||||||
|
.cp(10)
|
||||||
|
.progress(100)
|
||||||
|
.quality(100)
|
||||||
|
.build();
|
||||||
|
let mut craft = crate::craft::Craft::default();
|
||||||
|
craft.buffs = bbs;
|
||||||
|
|
||||||
|
assert_eq!(act1.get_name(), "Basic Synthesis");
|
||||||
|
assert_eq!(act1.get_cp_cost(&craft), 10);
|
||||||
|
assert_eq!(act1.get_durability_cost(&craft), 11);
|
||||||
|
assert_eq!(act1.get_progress(&craft), 250);
|
||||||
|
assert_eq!(act1.get_quality(&craft), 300);
|
||||||
|
assert_eq!(act1.get_buff(), None);
|
||||||
|
|
||||||
|
assert!(act1.can_use(&craft));
|
||||||
|
|
||||||
|
assert_eq!(&ACTIONS.standard_touch.get_cp_cost(&craft), &18);
|
||||||
|
assert_eq!(&ACTIONS.advanced_touch.get_cp_cost(&craft), &18);
|
||||||
|
assert_eq!(&ACTIONS.masters_mend.get_durability_cost(&craft), &-30);
|
||||||
|
|
||||||
|
assert_eq!(&ACTIONS.byregot_blessing.get_quality(&craft), &420);
|
||||||
|
assert_eq!(&ACTIONS.byregot_blessing.can_use(&craft), &true);
|
||||||
|
assert_eq!(&ACTIONS.muscle_memory.can_use(&craft), &true);
|
||||||
|
assert_eq!(&ACTIONS.trained_finesse.can_use(&craft), &false);
|
||||||
|
assert_eq!(&ACTIONS.reflect.can_use(&craft), &true);
|
||||||
|
|
||||||
|
act1.progress = 0;
|
||||||
|
act1.quality = 0;
|
||||||
|
assert_eq!(act1.get_durability_cost(&craft), 0);
|
||||||
|
act1.dur = 0;
|
||||||
|
act1.progress = 100;
|
||||||
|
act1.quality = 100;
|
||||||
|
assert_eq!(act1.get_durability_cost(&craft), 0);
|
||||||
|
|
||||||
|
act1.dur = 20;
|
||||||
|
craft.durability = 10;
|
||||||
|
craft.buffs = crate::specs::BuffState::default();
|
||||||
|
assert_eq!(act1.get_progress(&craft), 50);
|
||||||
|
assert_eq!(act1.get_quality(&craft), 50);
|
||||||
|
|
||||||
|
act1.dur = 2;
|
||||||
|
assert_eq!(act1.get_durability_cost(&craft), 5);
|
||||||
|
|
||||||
|
craft.cp = 0;
|
||||||
|
assert_eq!(&ACTIONS.reflect.can_use(&craft), &false);
|
||||||
|
|
||||||
|
craft.cp = 100;
|
||||||
|
craft.success = crate::specs::Success::Failure;
|
||||||
|
assert_eq!(&ACTIONS.reflect.can_use(&craft), &false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@
|
||||||
//!
|
//!
|
||||||
//! It is really recommended to set up a venv to handle the python development
|
//! It is really recommended to set up a venv to handle the python development
|
||||||
//!
|
//!
|
||||||
//! All bindings and the explanation of how to use them can be found in the [`io`](crate::io) module.
|
//! All bindings and the explanation of how to use them can be found in the [`io`](xiv_csolver_lib::io) module.
|
||||||
//!
|
//!
|
||||||
//! ### Features
|
//! ### Features
|
||||||
//!
|
//!
|
||||||
|
|
@ -131,26 +131,26 @@ fn main() {
|
||||||
Some(ref res) => {
|
Some(ref res) => {
|
||||||
// Show best results
|
// Show best results
|
||||||
if args.verbose > 0 {
|
if args.verbose > 0 {
|
||||||
println!("[Final] {} results were found:", res.len());
|
println!("[Final] {} results were found:", res.0.len());
|
||||||
#[cfg(feature = "verbose")]
|
#[cfg(feature = "verbose")]
|
||||||
if args.verbose > 1 {
|
if args.verbose > 1 {
|
||||||
xiv_csolver_lib::print_routes(&results);
|
xiv_csolver_lib::print_routes(&results);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
println!("\n > SOLUTION [Least steps] <");
|
println!("\n > SOLUTION [Least steps] <");
|
||||||
xiv_csolver_lib::find_fast_route(&results)
|
xiv_csolver_lib::find_fast_route(&res)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.pretty_print();
|
.pretty_print();
|
||||||
println!("\n > SOLUTION [Most durability] <");
|
println!("\n > SOLUTION [Most durability] <");
|
||||||
xiv_csolver_lib::find_safe_route(&results)
|
xiv_csolver_lib::find_safe_route(&res)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.pretty_print();
|
.pretty_print();
|
||||||
println!("\n > SOLUTION [Most quality] < ");
|
println!("\n > SOLUTION [Most quality] < ");
|
||||||
xiv_csolver_lib::find_quality_route(&results)
|
xiv_csolver_lib::find_quality_route(&res)
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.pretty_print();
|
.pretty_print();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// #[cfg(feature = "verbose")]
|
// #[cfg(feature = "verbose")]
|
||||||
// if params.verbose>2{
|
// if params.verbose>2{
|
||||||
|
|
|
||||||
129
src/craft.rs
|
|
@ -3,7 +3,6 @@
|
||||||
//! A craft represent the state of the recipe with a vector of actions applied to it.
|
//! A craft represent the state of the recipe with a vector of actions applied to it.
|
||||||
//! Applying actions to it will make the craft progress, while branching and trying other actions
|
//! Applying actions to it will make the craft progress, while branching and trying other actions
|
||||||
//! will be done by cloning
|
//! will be done by cloning
|
||||||
//!
|
|
||||||
|
|
||||||
use crate::action::Action;
|
use crate::action::Action;
|
||||||
use crate::specs::{Buff, BuffState, Recipe, Stats, Success};
|
use crate::specs::{Buff, BuffState, Recipe, Stats, Success};
|
||||||
|
|
@ -42,7 +41,6 @@ pub struct Craft<'a> {
|
||||||
|
|
||||||
impl<'a> Craft<'a> {
|
impl<'a> Craft<'a> {
|
||||||
/// Create a new craft with a recipe, stats and parameters
|
/// Create a new craft with a recipe, stats and parameters
|
||||||
///
|
|
||||||
pub fn new(recipe: Recipe, stats: Stats, params: Parameters) -> Craft<'a> {
|
pub fn new(recipe: Recipe, stats: Stats, params: Parameters) -> Craft<'a> {
|
||||||
Self {
|
Self {
|
||||||
recipe,
|
recipe,
|
||||||
|
|
@ -184,9 +182,134 @@ impl<'a> Display for Craft<'a> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
impl<'a> Craft<'a> {
|
||||||
|
/// Create a "Default" craft, testing only
|
||||||
|
pub fn default() -> Craft<'a> {
|
||||||
|
Self::new(
|
||||||
|
crate::specs::Recipe {
|
||||||
|
durability: 200,
|
||||||
|
progress: 200,
|
||||||
|
progress_divider: 100,
|
||||||
|
progress_modifier: 100,
|
||||||
|
quality: 100,
|
||||||
|
quality_divider: 100,
|
||||||
|
quality_modifier: 100,
|
||||||
|
},
|
||||||
|
crate::specs::Stats {
|
||||||
|
craftsmanship: 200,
|
||||||
|
control: 200,
|
||||||
|
max_cp: 200,
|
||||||
|
},
|
||||||
|
crate::io::Parameters {
|
||||||
|
threads: 10,
|
||||||
|
verbose: 2,
|
||||||
|
depth: 10,
|
||||||
|
desperate: false,
|
||||||
|
byregot_step: 10,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a "Two start" craft, testing only
|
||||||
|
pub fn two_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,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Create a "Zero star" craft for debbuging & testing
|
||||||
|
pub fn zero_star() -> Craft<'a> {
|
||||||
|
Self::new(
|
||||||
|
crate::specs::Recipe {
|
||||||
|
durability: 70,
|
||||||
|
progress: 4000,
|
||||||
|
quality: 10920,
|
||||||
|
progress_divider: 100,
|
||||||
|
quality_divider: 100,
|
||||||
|
progress_modifier: 100,
|
||||||
|
quality_modifier: 100,
|
||||||
|
},
|
||||||
|
crate::specs::Stats {
|
||||||
|
craftsmanship: 4000,
|
||||||
|
control: 4000,
|
||||||
|
max_cp: 600,
|
||||||
|
},
|
||||||
|
crate::io::Parameters {
|
||||||
|
threads: 8,
|
||||||
|
verbose: 2,
|
||||||
|
depth: 8,
|
||||||
|
desperate: false,
|
||||||
|
byregot_step: 10,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
|
use pretty_assertions::assert_eq;
|
||||||
// Struct Test
|
// Struct Test
|
||||||
#[test]
|
#[test]
|
||||||
pub fn struct_tests() {}
|
pub fn struct_tests() {
|
||||||
|
let craft = crate::craft::Craft::zero_star().clone();
|
||||||
|
assert_eq!(craft.get_base_progression(), 402);
|
||||||
|
assert_eq!(craft.get_base_quality(), 435);
|
||||||
|
|
||||||
|
format!("{}", craft);
|
||||||
|
format!("{:?}", craft);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_craft() {
|
||||||
|
let mut craft = crate::craft::Craft::default();
|
||||||
|
craft.cp = 1000;
|
||||||
|
format!("{:?}", craft);
|
||||||
|
let mut craft2 = craft.run_action(&crate::action::ACTIONS.veneration).clone();
|
||||||
|
|
||||||
|
craft.run_action(&crate::action::ACTIONS.masters_mend);
|
||||||
|
craft.run_action(&crate::action::ACTIONS.masters_mend);
|
||||||
|
craft.run_action(&crate::action::ACTIONS.manipulation);
|
||||||
|
craft.run_action(&crate::action::ACTIONS.basic_touch);
|
||||||
|
craft.run_action(&crate::action::ACTIONS.basic_synthesis);
|
||||||
|
assert_eq!(craft.durability, 190);
|
||||||
|
craft.run_action(&crate::action::ACTIONS.masters_mend);
|
||||||
|
assert_eq!(craft.durability, 200);
|
||||||
|
craft.run_action(&crate::action::ACTIONS.masters_mend);
|
||||||
|
for _ in 0..10 {
|
||||||
|
craft.run_action(&crate::action::ACTIONS.basic_touch);
|
||||||
|
}
|
||||||
|
|
||||||
|
for _ in 0..3 {
|
||||||
|
craft.run_action(&crate::action::ACTIONS.masters_mend);
|
||||||
|
craft.run_action(&crate::action::ACTIONS.groundwork);
|
||||||
|
}
|
||||||
|
assert_eq!(craft.success, crate::craft::Success::Success);
|
||||||
|
|
||||||
|
for _ in 0..20 {
|
||||||
|
craft2.run_action(&crate::action::ACTIONS.preparatory_touch);
|
||||||
|
}
|
||||||
|
assert_eq!(craft2.durability, 0);
|
||||||
|
assert_eq!(craft2.success, crate::craft::Success::Failure);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
282
src/io.rs
|
|
@ -1,15 +1,8 @@
|
||||||
//! The main IO module
|
//! 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
|
//! 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 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
|
/// The parameters needed at runtime, used since Args cannot easily be passed to python
|
||||||
#[derive(Debug, Clone, Copy)]
|
#[derive(Debug, Clone, Copy)]
|
||||||
|
|
@ -68,149 +61,6 @@ pub struct Args {
|
||||||
pub long: bool,
|
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<String>,
|
|
||||||
/// 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::<Vec<String>>();
|
|
||||||
// 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 {
|
impl Parameters {
|
||||||
/// Create parameters from the arguments parsed by clap
|
/// Create parameters from the arguments parsed by clap
|
||||||
pub fn from_args(args: &Args) -> Self {
|
pub fn from_args(args: &Args) -> Self {
|
||||||
|
|
@ -224,96 +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(())
|
|
||||||
}
|
|
||||||
|
|
||||||
///
|
|
||||||
#[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<Option<Vec<SolverResult>>> {
|
|
||||||
// Create Recipe
|
|
||||||
let recipe = Recipe {
|
|
||||||
durability: values.getattr("durability")?.extract()?,
|
|
||||||
progress: values.getattr("progress")?.extract()?,
|
|
||||||
progress_divider: values.getattr("progress_divider")?.extract()?,
|
|
||||||
progress_modifier: values.getattr("progress_modifier")?.extract()?,
|
|
||||||
quality: values.getattr("quality")?.extract()?,
|
|
||||||
quality_divider: values.getattr("quality_divider")?.extract()?,
|
|
||||||
quality_modifier: values.getattr("quality_modifier")?.extract()?,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Create Stats
|
|
||||||
let stats = Stats {
|
|
||||||
craftsmanship: values.getattr("craftsmanship")?.extract()?,
|
|
||||||
control: values.getattr("control")?.extract()?,
|
|
||||||
max_cp: values.getattr("max_cp")?.extract()?,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Create parameters
|
|
||||||
let param = Parameters {
|
|
||||||
depth: values.getattr("depth")?.extract()?,
|
|
||||||
byregot_step: values.getattr("byregot_step")?.extract()?,
|
|
||||||
desperate: values.getattr("desperate")?.extract()?,
|
|
||||||
threads: values.getattr("threads")?.extract()?,
|
|
||||||
verbose: values.getattr("verbose")?.extract()?,
|
|
||||||
};
|
|
||||||
|
|
||||||
// println!("{:?} len: {:?} ",values,values.getattr("len()"));
|
|
||||||
py.allow_threads(move || {
|
|
||||||
let res = solve_craft(recipe, stats, param);
|
|
||||||
Ok(res)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use crate::io::Args;
|
use crate::io::{Args, Parameters};
|
||||||
use crate::{Parameters, SolverResult};
|
use crate::python_bindings::SolverResult;
|
||||||
use clap::Parser;
|
use clap::Parser;
|
||||||
use pretty_assertions::{assert_eq, assert_ne};
|
use pretty_assertions::{assert_eq, assert_ne};
|
||||||
|
|
||||||
|
|
@ -352,7 +116,8 @@ mod tests {
|
||||||
#[test]
|
#[test]
|
||||||
pub fn test_debug() {
|
pub fn test_debug() {
|
||||||
let def = SolverResult::default();
|
let def = SolverResult::default();
|
||||||
assert_eq!(format!("{:?}", def),"SolverResult { steps: 0, quality: 0, progression: 0, durability: 0, cp: 0, total_cp: 0, total_progression: 0, total_quality: 0, total_durability: 0, actions: [\"Act1\", \"Act2\"], step1_solutions: 0, step2_solutions: 0, found_100_percent: false }");
|
assert_eq!(format!("{:?}", def),"SolverResult { steps: 0, quality: 0, progression: 0, durability: 0, cp: 0, total_cp: 0, total_progression: 0, total_quality: 0, total_durability: 0, actions: [\"Act1\", \"Act2\"] }");
|
||||||
|
//, step1_solutions: 0, step2_solutions: 0, found_100_percent: false }
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
|
|
@ -371,7 +136,7 @@ mod tests {
|
||||||
let a2 = a.clone();
|
let a2 = a.clone();
|
||||||
println!("{:?}", a2);
|
println!("{:?}", a2);
|
||||||
// Test Custom recipe
|
// Test Custom recipe
|
||||||
let a3 = Args::parse_from([
|
let a3 = crate::io::Args::parse_from([
|
||||||
"ultraman",
|
"ultraman",
|
||||||
"-r",
|
"-r",
|
||||||
"recipe",
|
"recipe",
|
||||||
|
|
@ -411,5 +176,38 @@ mod tests {
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
pub fn test_parameters() {}
|
pub fn test_parameters() {
|
||||||
|
// Test a random config
|
||||||
|
let ar = Args::parse_from([
|
||||||
|
"ultraman",
|
||||||
|
"-r",
|
||||||
|
"recipe",
|
||||||
|
"-c",
|
||||||
|
"dan",
|
||||||
|
"-f",
|
||||||
|
"bigfile.toml",
|
||||||
|
"-d",
|
||||||
|
"45",
|
||||||
|
"-t",
|
||||||
|
"4",
|
||||||
|
"-D",
|
||||||
|
"-l",
|
||||||
|
"-vvv",
|
||||||
|
]);
|
||||||
|
let p = Parameters::from_args(&ar);
|
||||||
|
assert_eq!(p.depth, 11);
|
||||||
|
assert_eq!(p.verbose, 3);
|
||||||
|
assert_eq!(p.threads, 4);
|
||||||
|
assert_eq!(p.desperate, true);
|
||||||
|
assert_eq!(p.byregot_step, 6);
|
||||||
|
|
||||||
|
// Test defaults
|
||||||
|
let ar = Args::parse_from(&["a"]);
|
||||||
|
let p = Parameters::from_args(&ar);
|
||||||
|
assert_eq!(p.depth, 8);
|
||||||
|
assert_eq!(p.verbose, 0);
|
||||||
|
assert_eq!(p.threads, 4);
|
||||||
|
assert_eq!(p.desperate, false);
|
||||||
|
assert_eq!(p.byregot_step, 8);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
244
src/lib.rs
|
|
@ -96,18 +96,17 @@
|
||||||
|
|
||||||
#![warn(missing_docs)]
|
#![warn(missing_docs)]
|
||||||
|
|
||||||
use crate::io::SolverResult;
|
use crate::craft::Craft;
|
||||||
use crate::{
|
use crate::io::Parameters;
|
||||||
craft::Craft,
|
use crate::python_bindings::{Info, SolverResult};
|
||||||
io::Parameters,
|
use crate::specs::{Recipe, Stats};
|
||||||
specs::{Recipe, Stats},
|
|
||||||
};
|
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
use threadpool::ThreadPool;
|
use threadpool::ThreadPool;
|
||||||
|
|
||||||
pub mod action;
|
pub mod action;
|
||||||
pub mod craft;
|
pub mod craft;
|
||||||
pub mod io;
|
pub mod io;
|
||||||
|
pub mod python_bindings;
|
||||||
mod solver;
|
mod solver;
|
||||||
pub mod specs;
|
pub mod specs;
|
||||||
|
|
||||||
|
|
@ -116,7 +115,7 @@ pub fn solve_craft<'a>(
|
||||||
recipe: Recipe,
|
recipe: Recipe,
|
||||||
stats: Stats,
|
stats: Stats,
|
||||||
params: Parameters,
|
params: Parameters,
|
||||||
) -> Option<Vec<SolverResult>> {
|
) -> Option<(Vec<SolverResult>, Info)> {
|
||||||
// Load the craft with given arguments
|
// Load the craft with given arguments
|
||||||
let craft = Craft::new(recipe, stats, params);
|
let craft = Craft::new(recipe, stats, params);
|
||||||
|
|
||||||
|
|
@ -151,7 +150,7 @@ pub fn solve_craft<'a>(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Core algorithm, fill all found routes with the best route (doesn't branch, just replace)
|
// Core algorithm, fill all found routes with the best route
|
||||||
let arc_phase2_routes = Arc::new(Mutex::new(Vec::<Craft>::new()));
|
let arc_phase2_routes = Arc::new(Mutex::new(Vec::<Craft>::new()));
|
||||||
|
|
||||||
for route in phase1_routes {
|
for route in phase1_routes {
|
||||||
|
|
@ -169,9 +168,25 @@ pub fn solve_craft<'a>(
|
||||||
let phase2_routes = arc_phase2_routes.lock().unwrap();
|
let phase2_routes = arc_phase2_routes.lock().unwrap();
|
||||||
let nb_p2 = phase2_routes.len();
|
let nb_p2 = phase2_routes.len();
|
||||||
|
|
||||||
// Drop on empty results
|
// Drop on empty results. // TODO: Retry automatically with better parameters
|
||||||
if phase2_routes.len() == 0 {
|
if phase2_routes.len() == 0 {
|
||||||
return None;
|
// No solutions were found
|
||||||
|
if params.desperate {
|
||||||
|
// But everything was tested
|
||||||
|
return Some((Vec::<SolverResult>::new(), Info::new(0, 0, false)));
|
||||||
|
} else {
|
||||||
|
// And not everything was tested
|
||||||
|
return solve_craft(
|
||||||
|
recipe,
|
||||||
|
stats,
|
||||||
|
Parameters {
|
||||||
|
depth: 11,
|
||||||
|
byregot_step: 6,
|
||||||
|
desperate: true,
|
||||||
|
..params
|
||||||
|
},
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Print the results if verbose
|
// Print the results if verbose
|
||||||
|
|
@ -197,17 +212,17 @@ pub fn solve_craft<'a>(
|
||||||
for route in phase2_routes.iter() {
|
for route in phase2_routes.iter() {
|
||||||
if route.quality >= route.recipe.quality {
|
if route.quality >= route.recipe.quality {
|
||||||
// valid_routes.push(route.clone());
|
// valid_routes.push(route.clone());
|
||||||
valid_solutions.push(SolverResult::from_craft(route, nb_p1, nb_p2, true));
|
valid_solutions.push(SolverResult::from_craft(route)); //nb_p1, nb_p2, true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If no craft can make it to 100% HQ, fallback to base results
|
// If no craft can make it to 100% HQ, fallback to base results
|
||||||
if valid_solutions.len() == 0 {
|
if valid_solutions.len() == 0 {
|
||||||
for route in phase2_routes.iter() {
|
for route in phase2_routes.iter() {
|
||||||
valid_solutions.push(SolverResult::from_craft(route, nb_p1, nb_p2, false));
|
valid_solutions.push(SolverResult::from_craft(route));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Some(valid_solutions)
|
Some((valid_solutions, Info::new(nb_p1, nb_p2, true)))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Load the config from args and make a craft from it
|
/// Load the config from args and make a craft from it
|
||||||
|
|
@ -324,9 +339,9 @@ pub fn load_from_config<'a>(
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Print all routes in the vect, verbose
|
/// Print all routes in the vect, verbose
|
||||||
pub fn print_routes<'a>(routes: &Option<Vec<SolverResult>>) {
|
pub fn print_routes<'a>(routes: &Option<(Vec<SolverResult>, Info)>) {
|
||||||
match routes {
|
match routes {
|
||||||
Some(r) => {
|
Some((r, _)) => {
|
||||||
println!("Showing {} routes", r.len());
|
println!("Showing {} routes", r.len());
|
||||||
for c in r.iter() {
|
for c in r.iter() {
|
||||||
println!(
|
println!(
|
||||||
|
|
@ -340,37 +355,206 @@ pub fn print_routes<'a>(routes: &Option<Vec<SolverResult>>) {
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Find the route with the least amount of steps
|
/// Find the route with the least amount of steps
|
||||||
pub fn find_fast_route(routes: &Option<Vec<SolverResult>>) -> Option<&SolverResult> {
|
pub fn find_fast_route<'a>(routes: &'a (Vec<SolverResult>, Info)) -> Option<&'a SolverResult> {
|
||||||
match routes {
|
let (_routes, _info) = routes;
|
||||||
Some(_routes) => {
|
|
||||||
if _routes.len() > 0 {
|
if _routes.len() > 0 {
|
||||||
_routes.iter().min_by_key(|key| key.steps)
|
_routes.iter().min_by_key(|key| key.steps)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Find the route with the maximum amount of quality
|
/// Find the route with the maximum amount of quality
|
||||||
pub fn find_quality_route(routes: &Option<Vec<SolverResult>>) -> Option<&SolverResult> {
|
pub fn find_quality_route<'a>(routes: &'a (Vec<SolverResult>, Info)) -> Option<&'a SolverResult> {
|
||||||
match routes {
|
let (_routes, _info) = routes;
|
||||||
Some(_routes) => _routes.iter().max_by_key(|key| key.quality),
|
_routes.iter().max_by_key(|key| key.quality)
|
||||||
None => None,
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Find the route with the maximum of durability left
|
/// Find the route with the maximum of durability left
|
||||||
pub fn find_safe_route(routes: &Option<Vec<SolverResult>>) -> Option<&SolverResult> {
|
pub fn find_safe_route(routes: &(Vec<SolverResult>, Info)) -> Option<&SolverResult> {
|
||||||
match routes {
|
let (_routes, _info) = routes;
|
||||||
Some(_routes) => {
|
|
||||||
if _routes.len() > 0 {
|
if _routes.len() > 0 {
|
||||||
_routes.iter().max_by_key(|key| key.durability)
|
_routes.iter().max_by_key(|key| key.durability)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
None => None,
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_lib_find_route() {
|
||||||
|
// Supposed to find a route for the base craft
|
||||||
|
let mut craft = crate::craft::Craft::two_star();
|
||||||
|
let res = solve_craft(craft.recipe, craft.stats, craft.args);
|
||||||
|
assert!(res.unwrap().0.len() > 2000);
|
||||||
|
|
||||||
|
craft.recipe.progress = 0;
|
||||||
|
let res = solve_craft(craft.recipe, craft.stats, craft.args);
|
||||||
|
println!("{:?}", res);
|
||||||
|
assert!(res.unwrap().0.len() == 0);
|
||||||
|
|
||||||
|
craft.recipe.progress = 100;
|
||||||
|
craft.stats.max_cp = 0;
|
||||||
|
craft.cp = 0;
|
||||||
|
|
||||||
|
let mut res = solve_craft(craft.recipe, craft.stats, craft.args).unwrap();
|
||||||
|
println!("{:?}", res);
|
||||||
|
assert_eq!(res.0.len(), 1);
|
||||||
|
assert_eq!(res.0.pop().unwrap().actions, vec!("basicSynth2"));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_lib_print_route() {
|
||||||
|
let craft = crate::craft::Craft::two_star();
|
||||||
|
print_routes(&solve_craft(craft.recipe, craft.stats, craft.args));
|
||||||
|
print_routes(&None);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_lib_best_solutions() {
|
||||||
|
let craft = crate::craft::Craft::two_star();
|
||||||
|
let routes = solve_craft(craft.recipe, craft.stats, craft.args).unwrap();
|
||||||
|
// assert!(find_fast_route(&(None)).is_none());
|
||||||
|
// assert!(find_quality_route(&None).is_none());
|
||||||
|
// assert!(find_safe_route(&None).is_none());
|
||||||
|
|
||||||
|
assert!(find_fast_route(&((vec![], Info::default()))).is_none());
|
||||||
|
assert!(find_quality_route(&((vec![], Info::default()))).is_none());
|
||||||
|
assert!(find_safe_route(&((vec![], Info::default()))).is_none());
|
||||||
|
|
||||||
|
let sol = find_fast_route(&routes).unwrap();
|
||||||
|
assert_eq!(sol.steps, 17);
|
||||||
|
assert_eq!(sol.quality, 11129);
|
||||||
|
assert_eq!(sol.progression, 3750);
|
||||||
|
assert_eq!(sol.durability, 0);
|
||||||
|
assert_eq!(sol.cp, 7);
|
||||||
|
assert_eq!(routes.1.step1_solutions, 9);
|
||||||
|
assert_eq!(routes.1.step2_solutions, 21193);
|
||||||
|
assert_eq!(routes.1.found_100_percent, true);
|
||||||
|
assert_eq!(
|
||||||
|
sol.actions,
|
||||||
|
vec!(
|
||||||
|
"muscleMemory",
|
||||||
|
"manipulation",
|
||||||
|
"veneration",
|
||||||
|
"wasteNot2",
|
||||||
|
"groundwork",
|
||||||
|
"delicateSynthesis",
|
||||||
|
"delicateSynthesis",
|
||||||
|
"innovation",
|
||||||
|
"preparatoryTouch",
|
||||||
|
"preparatoryTouch",
|
||||||
|
"preparatoryTouch",
|
||||||
|
"preparatoryTouch",
|
||||||
|
"innovation",
|
||||||
|
"basicTouch",
|
||||||
|
"standardTouch",
|
||||||
|
"greatStrides",
|
||||||
|
"byregotsBlessing",
|
||||||
|
"basicSynth2"
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
let sol = find_quality_route(&routes).unwrap();
|
||||||
|
assert_eq!(sol.steps, 23);
|
||||||
|
assert_eq!(sol.quality, 12032);
|
||||||
|
assert_eq!(sol.progression, 3675);
|
||||||
|
assert_eq!(sol.durability, -5);
|
||||||
|
assert_eq!(sol.cp, 3);
|
||||||
|
assert_eq!(routes.1.step1_solutions, 9);
|
||||||
|
assert_eq!(routes.1.step2_solutions, 21193);
|
||||||
|
assert_eq!(routes.1.found_100_percent, true);
|
||||||
|
assert_eq!(
|
||||||
|
sol.actions,
|
||||||
|
vec!(
|
||||||
|
"muscleMemory",
|
||||||
|
"manipulation",
|
||||||
|
"veneration",
|
||||||
|
"groundwork",
|
||||||
|
"prudentSynthesis",
|
||||||
|
"innovation",
|
||||||
|
"prudentTouch",
|
||||||
|
"basicTouch",
|
||||||
|
"standardTouch",
|
||||||
|
"advancedTouch",
|
||||||
|
"manipulation",
|
||||||
|
"innovation",
|
||||||
|
"prudentTouch",
|
||||||
|
"basicTouch",
|
||||||
|
"standardTouch",
|
||||||
|
"advancedTouch",
|
||||||
|
"innovation",
|
||||||
|
"basicTouch",
|
||||||
|
"standardTouch",
|
||||||
|
"advancedTouch",
|
||||||
|
"greatStrides",
|
||||||
|
"innovation",
|
||||||
|
"byregotsBlessing",
|
||||||
|
"basicSynth2"
|
||||||
|
)
|
||||||
|
);
|
||||||
|
|
||||||
|
let sol = find_safe_route(&routes).unwrap();
|
||||||
|
assert_eq!(sol.steps, 22);
|
||||||
|
assert_eq!(sol.quality, 11161);
|
||||||
|
assert_eq!(sol.progression, 3675);
|
||||||
|
assert_eq!(sol.durability, 10);
|
||||||
|
assert_eq!(sol.cp, 4);
|
||||||
|
assert_eq!(routes.1.step1_solutions, 9);
|
||||||
|
assert_eq!(routes.1.step2_solutions, 21193);
|
||||||
|
assert_eq!(routes.1.found_100_percent, true);
|
||||||
|
assert_eq!(
|
||||||
|
sol.actions,
|
||||||
|
vec!(
|
||||||
|
"muscleMemory",
|
||||||
|
"manipulation",
|
||||||
|
"veneration",
|
||||||
|
"groundwork",
|
||||||
|
"carefulSynthesis",
|
||||||
|
"prudentTouch",
|
||||||
|
"innovation",
|
||||||
|
"prudentTouch",
|
||||||
|
"prudentTouch",
|
||||||
|
"prudentTouch",
|
||||||
|
"prudentTouch",
|
||||||
|
"manipulation",
|
||||||
|
"innovation",
|
||||||
|
"prudentTouch",
|
||||||
|
"basicTouch",
|
||||||
|
"standardTouch",
|
||||||
|
"advancedTouch",
|
||||||
|
"innovation",
|
||||||
|
"basicTouch",
|
||||||
|
"standardTouch",
|
||||||
|
"greatStrides",
|
||||||
|
"byregotsBlessing",
|
||||||
|
"basicSynth2"
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_load_from_config() {
|
||||||
|
load_from_config("default_recipe", "craft.toml", "default_character");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[should_panic]
|
||||||
|
#[test]
|
||||||
|
pub fn test_bad_config_filename() {
|
||||||
|
load_from_config("default_recipe", "nocrafto.toml", "default_character");
|
||||||
|
}
|
||||||
|
|
||||||
|
#[should_panic]
|
||||||
|
#[test]
|
||||||
|
pub fn test_bad_config_recipename() {
|
||||||
|
load_from_config("bad_recipe", "craft.toml", "default_character");
|
||||||
|
}
|
||||||
|
#[should_panic]
|
||||||
|
#[test]
|
||||||
|
pub fn test_bad_config_charname() {
|
||||||
|
load_from_config("default_recipe", "craft.toml", "bad_character");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,337 @@
|
||||||
|
//! The binding module
|
||||||
|
//! It contains the python bindings, and the structs
|
||||||
|
//! needed to hold all parameters needed at runtime
|
||||||
|
//!
|
||||||
|
//! Making the bindings a build feature is a WIP
|
||||||
|
|
||||||
|
use crate::Craft;
|
||||||
#[cfg(not(feature = "no_python"))]
|
#[cfg(not(feature = "no_python"))]
|
||||||
|
use crate::Parameters;
|
||||||
|
use core::fmt::Display;
|
||||||
use pyo3::prelude::*;
|
use pyo3::prelude::*;
|
||||||
|
|
||||||
|
/// A final stripped down version of a craft
|
||||||
|
/// used for final print and talking with python
|
||||||
|
#[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<String>,
|
||||||
|
// /// 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,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Global info on the execution
|
||||||
|
#[derive(Debug)]
|
||||||
|
#[pyclass]
|
||||||
|
pub struct Info {
|
||||||
|
/// 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,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Solution information, contains information about the execution
|
||||||
|
impl Info {
|
||||||
|
/// Make a new information struct
|
||||||
|
pub fn new(
|
||||||
|
step1_solutions: usize,
|
||||||
|
step2_solutions: usize,
|
||||||
|
found_100_percent: bool,
|
||||||
|
// params: &'Parameters
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
step1_solutions,
|
||||||
|
step2_solutions,
|
||||||
|
found_100_percent,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Default value of the info, only used for debug purposes
|
||||||
|
pub fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
step1_solutions: 0,
|
||||||
|
step2_solutions: 0,
|
||||||
|
found_100_percent: false,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
/// 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) -> SolverResult {
|
||||||
|
let mut actions = craft
|
||||||
|
.actions
|
||||||
|
.iter()
|
||||||
|
.map(|action| format!("{}", action.short_name))
|
||||||
|
.collect::<Vec<String>>();
|
||||||
|
// 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,
|
||||||
|
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()],
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
////// 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!(test_final_results, m)?)?;
|
||||||
|
m.add_function(wrap_pyfunction!(test_info, 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::python_bindings::SolverResult::default())
|
||||||
|
/// ```
|
||||||
|
/// # use xiv_csolver_lib::python_bindings::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()],
|
||||||
|
/// cp: 0,
|
||||||
|
/// total_cp: 0,
|
||||||
|
/// };
|
||||||
|
/// ```
|
||||||
|
#[cfg(not(feature = "no_python"))]
|
||||||
|
#[pyfunction]
|
||||||
|
pub fn test_result() -> SolverResult {
|
||||||
|
SolverResult::default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A test info, useful for debugging, all values are set to zero as per the
|
||||||
|
/// [`default`](crate::python_bindings::Info::default())
|
||||||
|
/// ```
|
||||||
|
/// # use xiv_csolver_lib::python_bindings::Info;
|
||||||
|
/// Info {
|
||||||
|
/// step1_solutions: 0,
|
||||||
|
/// step2_solutions: 0,
|
||||||
|
/// found_100_percent: false,
|
||||||
|
/// };
|
||||||
|
/// ```
|
||||||
|
#[cfg(not(feature = "no_python"))]
|
||||||
|
#[pyfunction]
|
||||||
|
pub fn test_info() -> Info {
|
||||||
|
Info::default()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// A test result array, useful for debugging, all values are set to zero as per the
|
||||||
|
/// [`default`](crate::python_bindings::Info::default())
|
||||||
|
/// ```
|
||||||
|
/// # use xiv_csolver_lib::python_bindings::{Info};
|
||||||
|
/// # use xiv_csolver_lib::python_bindings::SolverResult;
|
||||||
|
/// (
|
||||||
|
/// vec![SolverResult::default(), SolverResult::default()],
|
||||||
|
/// Info::default(),
|
||||||
|
/// );
|
||||||
|
/// ```
|
||||||
|
#[cfg(not(feature = "no_python"))]
|
||||||
|
#[pyfunction]
|
||||||
|
pub fn test_final_results() -> (Vec<SolverResult>, Info) {
|
||||||
|
(
|
||||||
|
vec![SolverResult::default(), SolverResult::default()],
|
||||||
|
Info::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<Option<(Vec<SolverResult>, Info)>> {
|
||||||
|
// Create Recipe
|
||||||
|
let recipe = Recipe {
|
||||||
|
durability: values.getattr("durability")?.extract()?,
|
||||||
|
progress: values.getattr("progress")?.extract()?,
|
||||||
|
progress_divider: values.getattr("progress_divider")?.extract()?,
|
||||||
|
progress_modifier: values.getattr("progress_modifier")?.extract()?,
|
||||||
|
quality: values.getattr("quality")?.extract()?,
|
||||||
|
quality_divider: values.getattr("quality_divider")?.extract()?,
|
||||||
|
quality_modifier: values.getattr("quality_modifier")?.extract()?,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create Stats
|
||||||
|
let stats = Stats {
|
||||||
|
craftsmanship: values.getattr("craftsmanship")?.extract()?,
|
||||||
|
control: values.getattr("control")?.extract()?,
|
||||||
|
max_cp: values.getattr("max_cp")?.extract()?,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Create parameters
|
||||||
|
let param = Parameters {
|
||||||
|
depth: values.getattr("depth")?.extract()?,
|
||||||
|
byregot_step: values.getattr("byregot_step")?.extract()?,
|
||||||
|
desperate: values.getattr("desperate")?.extract()?,
|
||||||
|
threads: values.getattr("threads")?.extract()?,
|
||||||
|
verbose: values.getattr("verbose")?.extract()?,
|
||||||
|
};
|
||||||
|
|
||||||
|
// println!("{:?} len: {:?} ",values,values.getattr("len()"));
|
||||||
|
py.allow_threads(move || {
|
||||||
|
let res = solve_craft(recipe, stats, param);
|
||||||
|
Ok(res)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod test {
|
||||||
|
use crate::python_bindings::{test_final_results, test_info, test_result};
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_function_call() {
|
||||||
|
test_final_results();
|
||||||
|
test_info();
|
||||||
|
test_result();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ pub fn next_action_picker_1<'a>(craft: &Craft<'a>) -> Vec<Option<&'a Action>> {
|
||||||
let mut available_actions = Vec::<Option<&'a Action>>::new();
|
let mut available_actions = Vec::<Option<&'a Action>>::new();
|
||||||
let mut forbidden_actions = Vec::<Option<&'a Action>>::new();
|
let mut forbidden_actions = Vec::<Option<&'a Action>>::new();
|
||||||
|
|
||||||
// Optimize the first three steps for massive time save
|
// Optimize the first four steps for massive time save
|
||||||
if craft.step_count == 0 {
|
if craft.step_count == 0 {
|
||||||
return action_vec![ACTIONS.muscle_memory];
|
return action_vec![ACTIONS.muscle_memory];
|
||||||
}
|
}
|
||||||
|
|
@ -61,10 +61,11 @@ pub fn next_action_picker_1<'a>(craft: &Craft<'a>) -> Vec<Option<&'a Action>> {
|
||||||
// ACTIONS.groundwork for the --pls
|
// ACTIONS.groundwork for the --pls
|
||||||
if craft.args.desperate {
|
if craft.args.desperate {
|
||||||
available_actions.append(&mut action_vec![ACTIONS.groundwork]);
|
available_actions.append(&mut action_vec![ACTIONS.groundwork]);
|
||||||
|
available_actions.append(&mut action_vec![ACTIONS.masters_mend]);
|
||||||
}
|
}
|
||||||
|
|
||||||
// For long first run
|
// 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])
|
available_actions.append(&mut action_vec![ACTIONS.waste_not_ii, ACTIONS.waste_not])
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -107,9 +108,10 @@ pub fn generate_routes_phase1<'a>(craft: Craft<'a>) -> Vec<Craft<'a>> {
|
||||||
continue;
|
continue;
|
||||||
} else if 0.0 < remaining_prog && remaining_prog <= 1.2 {
|
} else if 0.0 < remaining_prog && remaining_prog <= 1.2 {
|
||||||
// pass // Will finish with basicSynth2 (free)
|
// pass // Will finish with basicSynth2 (free)
|
||||||
} else if 1.2 < remaining_prog && remaining_prog <= 1.2 {
|
// TODO: Test replacing this value with 1.8 that should be the correct value but hasnt be tested
|
||||||
craft.cp -= 7; // Will finish with carefulSynthesis (7cp)
|
// } else if 1.2 < remaining_prog && remaining_prog <= 1.4 {
|
||||||
} else if 1.2 < remaining_prog && remaining_prog <= 2.0 {
|
// craft.cp -= 7; // Will finish with carefulSynthesis (7cp)
|
||||||
|
} else if 1.4 < remaining_prog && remaining_prog <= 2.0 {
|
||||||
craft.cp -= 12; // Will finish with observe+focusedSynthesis (12cp)
|
craft.cp -= 12; // Will finish with observe+focusedSynthesis (12cp)
|
||||||
}
|
}
|
||||||
craft.durability -= 10; // Save the final step, since we always aim to end with -5dur, it doesn't matter
|
craft.durability -= 10; // Save the final step, since we always aim to end with -5dur, it doesn't matter
|
||||||
|
|
@ -191,6 +193,9 @@ pub fn next_action_phase_2<'a>(craft: &Craft<'a>) -> Vec<Option<&'a Action>> {
|
||||||
available_actions.push(&ACTIONS.byregot_blessing);
|
available_actions.push(&ACTIONS.byregot_blessing);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// if craft.durability + 30 < craft.recipe.durability as i32{
|
||||||
|
// available_actions.push(&ACTIONS.masters_mend);
|
||||||
|
// }
|
||||||
let mut final_actions: Vec<Option<&Action>> = Vec::new();
|
let mut final_actions: Vec<Option<&Action>> = Vec::new();
|
||||||
|
|
||||||
for action in available_actions {
|
for action in available_actions {
|
||||||
|
|
@ -242,3 +247,5 @@ pub fn generate_routes_phase2<'a>(craft: Craft<'a>) -> Option<Vec<Craft<'a>>> {
|
||||||
top_routes.push(top_route);
|
top_routes.push(top_route);
|
||||||
Some(top_routes)
|
Some(top_routes)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mod test_solver;
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,391 @@
|
||||||
|
#[allow(unused_imports)]
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_first_step() {
|
||||||
|
let mut craft = crate::craft::Craft::two_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
|
||||||
|
]
|
||||||
|
);
|
||||||
|
assert_eq!(craft.progression, 250);
|
||||||
|
assert_eq!(craft.quality, 266);
|
||||||
|
assert_eq!(craft.cp, 317);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_routes_p1() {
|
||||||
|
let craft = crate::craft::Craft::two_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();
|
||||||
|
assert!(route.is_none());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test Custom routes (None and basic synthesis)
|
||||||
|
#[test]
|
||||||
|
pub fn test_custom_p1_routes() {
|
||||||
|
// None route, no more actions
|
||||||
|
let mut craft = crate::craft::Craft::zero_star();
|
||||||
|
craft.success = crate::specs::Success::Failure;
|
||||||
|
let routes1 = generate_routes_phase1(craft.clone());
|
||||||
|
assert!(routes1.is_empty());
|
||||||
|
}
|
||||||
|
|
||||||
|
// Test step 2 route-finding
|
||||||
|
#[test]
|
||||||
|
pub fn test_second_step() {
|
||||||
|
let mut craft = crate::craft::Craft::two_star();
|
||||||
|
craft.cp = 10000;
|
||||||
|
let mut routes1 = generate_routes_phase1(craft);
|
||||||
|
let mut craft2 = routes1.pop().unwrap();
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(vact, action_vec![ACTIONS.innovation]);
|
||||||
|
craft2.run_action(&ACTIONS.innovation);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.basic_touch, ACTIONS.preparatory_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.basic_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.preparatory_touch, ACTIONS.standard_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.standard_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.preparatory_touch, ACTIONS.advanced_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.advanced_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![
|
||||||
|
ACTIONS.basic_touch,
|
||||||
|
ACTIONS.preparatory_touch,
|
||||||
|
ACTIONS.manipulation
|
||||||
|
]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.manipulation);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(vact, action_vec![ACTIONS.innovation]);
|
||||||
|
craft2.run_action(&ACTIONS.innovation);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.basic_touch, ACTIONS.prudent_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.basic_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.prudent_touch, ACTIONS.standard_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.prudent_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.basic_touch, ACTIONS.prudent_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.prudent_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.basic_touch, ACTIONS.prudent_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.prudent_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(vact, action_vec![ACTIONS.innovation]);
|
||||||
|
craft2.run_action(&ACTIONS.innovation);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![ACTIONS.basic_touch, ACTIONS.prudent_touch]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.prudent_touch);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![
|
||||||
|
ACTIONS.basic_touch,
|
||||||
|
ACTIONS.prudent_touch,
|
||||||
|
ACTIONS.trained_finesse,
|
||||||
|
ACTIONS.great_strides
|
||||||
|
]
|
||||||
|
);
|
||||||
|
craft2.run_action(&ACTIONS.great_strides);
|
||||||
|
|
||||||
|
let vact = next_action_phase_2(&craft2);
|
||||||
|
assert_eq!(
|
||||||
|
vact,
|
||||||
|
action_vec![
|
||||||
|
ACTIONS.basic_touch,
|
||||||
|
ACTIONS.prudent_touch,
|
||||||
|
ACTIONS.byregot_blessing
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
craft2.run_action(&ACTIONS.byregot_blessing);
|
||||||
|
craft2.success = crate::specs::Success::Success;
|
||||||
|
assert_eq!(next_action_phase_2(&craft2), vec![None]);
|
||||||
|
assert_eq!(craft2.progression, 3750);
|
||||||
|
assert_eq!(craft2.quality, 9899);
|
||||||
|
assert_eq!(craft2.cp, 9322);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
pub fn test_generate_routes_p2() {
|
||||||
|
let craft = crate::craft::Craft::two_star();
|
||||||
|
let mut routes1 = generate_routes_phase1(craft);
|
||||||
|
let craft1 = routes1.pop().unwrap();
|
||||||
|
let routes2 = generate_routes_phase2(craft1);
|
||||||
|
assert_eq!(routes2.unwrap().len(), 241);
|
||||||
|
|
||||||
|
// Any modification on the solving will break this test, same as before,
|
||||||
|
// maybe having a range of expected solution instead is the way to go.
|
||||||
|
|
||||||
|
// Nonetheless the solver test will add qualitative testing so some
|
||||||
|
// results will be thoughrouly checked
|
||||||
|
|
||||||
|
// Maybe sampling a handful results and expect them to always exits could also work
|
||||||
|
}
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
|
|
||||||