EZPPFarm/akatsuki-pp-rs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osu: fixed & tested pp

Browse Source
This commit is contained in:
MaxOhn
2021-01-17 16:48:48 +01:00
parent 6cce937be8
commit 12bf2f01b6
14 changed files with 346 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/fruits.rs
+24 -16
View File
@@ -12,8 +12,8 @@ struct MapResult {
#[test]
fn fruits() {
let star_margin = 0.005;
let pp_margin = 0.015;
let star_margin = 0.0001;
let pp_margin = 0.0001;
for result in RESULTS {
let MapResult {
@@ -38,23 +38,31 @@ fn fruits() {
.calculate();
assert!(
(result.stars - stars).abs() < star_margin,
"Stars: {} | Expected: {} => {} margin [map {} | mods {}]",
result.stars,
stars,
(result.stars - stars).abs(),
map_id,
mods
(result.stars - stars).abs() < star_margin * stars,
"\nStars:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.stars,
expected = stars,
margin = (result.stars - stars).abs(),
allowed = star_margin * stars,
map = map_id,
mods = mods
);
assert!(
(result.pp - pp).abs() < pp_margin,
"PP: {} | Expected: {} => {} margin [map {} | mods {}]",
result.pp,
pp,
(result.pp - pp).abs(),
map_id,
mods
(result.pp - pp).abs() < pp_margin * pp,
"\nPP:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.pp,
expected = pp,
margin = (result.pp - pp).abs(),
allowed = pp_margin * pp,
map = map_id,
mods = mods
);
}
}
tests/mania.rs
+24 -16
View File
@@ -12,8 +12,8 @@ struct MapResult {
#[test]
fn mania() {
let star_margin = 0.001;
let pp_margin = 0.001;
let star_margin = 0.00001;
let pp_margin = 0.00001;
for result in RESULTS {
let MapResult {
@@ -38,23 +38,31 @@ fn mania() {
.calculate();
assert!(
(result.stars - stars).abs() < star_margin,
"Stars: {} | Expected: {} => {} margin [map {} | mods {}]",
result.stars,
stars,
(result.stars - stars).abs(),
map_id,
mods
(result.stars - stars).abs() < star_margin * stars,
"\nStars:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.stars,
expected = stars,
margin = (result.stars - stars).abs(),
allowed = star_margin * stars,
map = map_id,
mods = mods
);
assert!(
(result.pp - pp).abs() < pp_margin,
"PP: {} | Expected: {} => {} margin [map {} | mods {}]",
result.pp,
pp,
(result.pp - pp).abs(),
map_id,
mods
(result.pp - pp).abs() < pp_margin * pp,
"\nPP:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.pp,
expected = pp,
margin = (result.pp - pp).abs(),
allowed = pp_margin * pp,
map = map_id,
mods = mods
);
}
}
tests/osu.rs
+238 -1
View File
@@ -1 +1,238 @@
// TODO
extern crate rosu_pp;
use rosu_pp::{osu, Beatmap};
use std::fs::File;
struct MapResult {
map_id: u32,
mods: u32,
stars: f32,
pp: f32,
}
#[test]
fn osu_no_sliders() {
let star_margin = 0.0075;
let pp_margin = 0.0075;
for result in RESULTS {
let MapResult {
map_id,
mods,
stars,
pp,
} = result;
let file = match File::open(format!("./maps/{}.osu", map_id)) {
Ok(file) => file,
Err(why) => panic!("Could not open file {}.osu: {}", map_id, why),
};
let map = match Beatmap::parse(file) {
Ok(map) => map,
Err(why) => panic!("Error while parsing map {}: {}", map_id, why),
};
let result = rosu_pp::osu::PpCalculator::new(&map)
.mods(*mods)
.calculate(osu::no_sliders_no_leniency::stars);
assert!(
(result.attributes.stars - stars).abs() < star_margin * stars,
"\nStars:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.attributes.stars,
expected = stars,
margin = (result.attributes.stars - stars).abs(),
allowed = star_margin * stars,
map = map_id,
mods = mods
);
assert!(
(result.pp - pp).abs() < pp_margin * pp,
"\nPP:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.pp,
expected = pp,
margin = (result.pp - pp).abs(),
allowed = pp_margin * pp,
map = map_id,
mods = mods
);
}
}
#[test]
fn osu_no_leniency() {
let star_margin = 0.0025;
let pp_margin = 0.0025;
for result in RESULTS {
let MapResult {
map_id,
mods,
stars,
pp,
} = result;
let file = match File::open(format!("./maps/{}.osu", map_id)) {
Ok(file) => file,
Err(why) => panic!("Could not open file {}.osu: {}", map_id, why),
};
let map = match Beatmap::parse(file) {
Ok(map) => map,
Err(why) => panic!("Error while parsing map {}: {}", map_id, why),
};
let result = rosu_pp::osu::PpCalculator::new(&map)
.mods(*mods)
.calculate(osu::no_leniency::stars);
assert!(
(result.attributes.stars - stars).abs() < star_margin * stars,
"\nStars:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.attributes.stars,
expected = stars,
margin = (result.attributes.stars - stars).abs(),
allowed = star_margin * stars,
map = map_id,
mods = mods
);
assert!(
(result.pp - pp).abs() < pp_margin * pp,
"\nPP:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.pp,
expected = pp,
margin = (result.pp - pp).abs(),
allowed = pp_margin * pp,
map = map_id,
mods = mods
);
}
}
const RESULTS: &[MapResult] = &[
MapResult {
map_id: 1851299,
mods: 256,
stars: 4.23514130038547,
pp: 96.59532540603362,
},
MapResult {
map_id: 1851299,
mods: 0,
stars: 5.356786475158158,
pp: 191.72186087468594,
},
MapResult {
map_id: 1851299,
mods: 8,
stars: 5.356786475158158,
pp: 211.17333597663404,
},
MapResult {
map_id: 1851299,
mods: 64,
stars: 7.450616908751305,
pp: 476.39199443787675,
},
MapResult {
map_id: 1851299,
mods: 16,
stars: 5.6834681957637665,
pp: 243.32730989490153,
},
MapResult {
map_id: 1851299,
mods: 2,
stars: 4.937817303399699,
pp: 110.44350158714633,
},
// -----
MapResult {
map_id: 70090,
mods: 256,
stars: 2.2929922580201803,
pp: 17.530571082228978,
},
MapResult {
map_id: 70090,
mods: 0,
stars: 2.8322940761833983,
pp: 40.611760049886534,
},
MapResult {
map_id: 70090,
mods: 8,
stars: 2.8322940761833983,
pp: 46.252172598153074,
},
MapResult {
map_id: 70090,
mods: 64,
stars: 3.8338563325375485,
pp: 110.32389105793393,
},
MapResult {
map_id: 70090,
mods: 16,
stars: 3.0617492228478174,
pp: 84.67846960014381,
},
MapResult {
map_id: 70090,
mods: 2,
stars: 2.698823231324141,
pp: 21.861918597227252,
},
// -----
MapResult {
map_id: 1241370,
mods: 256,
stars: 5.662809600985943,
pp: 346.1069865511771,
},
MapResult {
map_id: 1241370,
mods: 0,
stars: 7.0367002127481975,
pp: 658.4944314112954,
},
MapResult {
map_id: 1241370,
mods: 8,
stars: 7.0367002127481975,
pp: 720.8614284211293,
},
MapResult {
map_id: 1241370,
mods: 64,
stars: 11.144720506574934,
pp: 2414.665180655108,
},
MapResult {
map_id: 1241370,
mods: 16,
stars: 7.641688110458715,
pp: 853.7411405318841,
},
MapResult {
map_id: 1241370,
mods: 2,
stars: 6.316288616688052,
pp: 357.3089261481221,
},
];
tests/taiko.rs
+24 -16
View File
@@ -12,8 +12,8 @@ struct MapResult {
#[test]
fn taiko() {
let star_margin = 0.001;
let pp_margin = 0.0075;
let star_margin = 0.0001;
let pp_margin = 0.0001;
for result in RESULTS {
let MapResult {
@@ -38,23 +38,31 @@ fn taiko() {
.calculate();
assert!(
(result.stars - stars).abs() < star_margin,
"Stars: {} | Expected: {} => {} margin [map {} | mods {}]",
result.stars,
stars,
(result.stars - stars).abs(),
map_id,
mods
(result.stars - stars).abs() < star_margin * stars,
"\nStars:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.stars,
expected = stars,
margin = (result.stars - stars).abs(),
allowed = star_margin * stars,
map = map_id,
mods = mods
);
assert!(
(result.pp - pp).abs() < pp_margin,
"PP: {} | Expected: {} => {} margin [map {} | mods {}]",
result.pp,
pp,
(result.pp - pp).abs(),
map_id,
mods
(result.pp - pp).abs() < pp_margin * pp,
"\nPP:\n\
Calculated: {calculated} | Expected: {expected}\n \
=> {margin} margin ({allowed} allowed)\n\
[map {map} | mods {mods}]\n",
calculated = result.pp,
expected = pp,
margin = (result.pp - pp).abs(),
allowed = pp_margin * pp,
map = map_id,
mods = mods
);
}
}