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

test: update test case values

Browse Source
This commit is contained in:
MaxOhn
2024-10-11 13:56:11 +02:00
parent b33e259afe
commit ec52aaa5a8
2 changed files with 174 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/difficulty.rs
+86 -86
View File
@@ -127,110 +127,110 @@ fn basic_osu() {
test_cases! {
Osu: OSU {
NM => {
aim: 2.8693628443424104,
speed: 2.533869745015772,
aim: 2.881184366758021,
speed: 2.468469273849314,
flashlight: 2.288770487900865,
slider_factor: 0.9803052946037858,
speed_note_count: 210.36373973116545,
aim_difficult_strain_count: 0.0, // TODO
speed_difficult_strain_count: 0.0, // TODO
slider_factor: 0.9803293523973865,
speed_note_count: 204.88794724609374,
aim_difficult_strain_count: 106.63833474488378,
speed_difficult_strain_count: 79.9883004295862,
ar: 9.300000190734863,
od: 8.800000190734863,
hp: 5.0,
n_circles: 307,
n_sliders: 293,
n_spinners: 1,
stars: 5.669858729379628,
stars: 5.643619989739299,
max_combo: 909,
};
HD => {
aim: 2.8693628443424104,
speed: 2.533869745015772,
flashlight: 2.606877929965889,
slider_factor: 0.9803052946037858,
speed_note_count: 210.36373973116545,
aim_difficult_strain_count: 0.0, // TODO
speed_difficult_strain_count: 0.0, // TODO
aim: 2.881184366758021,
speed: 2.468469273849314,
flashlight: 0.0,
slider_factor: 0.9803293523973865,
speed_note_count: 204.88794724609374,
aim_difficult_strain_count: 106.63833474488378,
speed_difficult_strain_count: 79.9883004295862,
ar: 9.300000190734863,
od: 8.800000190734863,
hp: 5.0,
n_circles: 307,
n_sliders: 293,
n_spinners: 1,
stars: 5.669858729379628,
stars: 5.643619989739299,
max_combo: 909,
};
HR => {
aim: 3.2385394176190507,
speed: 2.7009854505234308,
flashlight: 2.8549217213059936,
slider_factor: 0.9690667605258665,
speed_note_count: 184.01205359079387,
aim_difficult_strain_count: 0.0, // TODO
speed_difficult_strain_count: 0.0, // TODO
aim: 3.2515300463985666,
speed: 2.6323568908654615,
flashlight: 0.0,
slider_factor: 0.969089944826546,
speed_note_count: 178.52041495886283,
aim_difficult_strain_count: 108.03970474535397,
speed_difficult_strain_count: 73.27713411796513,
ar: 10.0,
od: 10.0,
hp: 7.0,
n_circles: 307,
n_sliders: 293,
n_spinners: 1,
stars: 6.263576582906263,
stars: 6.243301253337941,
max_combo: 909,
};
DT => {
aim: 4.041442573946681,
speed: 3.6784866216272474,
flashlight: 3.319522943625448,
slider_factor: 0.9776943279272041,
speed_note_count: 214.80421464205617,
aim_difficult_strain_count: 0.0, // TODO
speed_difficult_strain_count: 0.0, // TODO
aim: 4.058080039906945,
speed: 3.570932204630734,
flashlight: 0.0,
slider_factor: 0.9777224379583133,
speed_note_count: 211.29204189490912,
aim_difficult_strain_count: 126.9561362975524,
speed_difficult_strain_count: 95.63810649133869,
ar: 10.53333346048991,
od: 10.311111238267687,
hp: 5.0,
n_circles: 307,
n_sliders: 293,
n_spinners: 1,
stars: 8.085307648397622,
stars: 8.030649319285482,
max_combo: 909,
};
FL => {
aim: 2.8693628443424104,
speed: 2.533869745015772,
flashlight: 2.288770487900865,
slider_factor: 0.9803052946037858,
speed_note_count: 210.36373973116545,
aim_difficult_strain_count: 0.0, // TODO
speed_difficult_strain_count: 0.0, // TODO
aim: 2.881184366758021,
speed: 2.468469273849314,
flashlight: 2.287888783550428,
slider_factor: 0.9803293523973865,
speed_note_count: 204.88794724609374,
aim_difficult_strain_count: 106.63833474488378,
speed_difficult_strain_count: 79.9883004295862,
ar: 9.300000190734863,
od: 8.800000190734863,
hp: 5.0,
n_circles: 307,
n_sliders: 293,
n_spinners: 1,
stars: 6.8667780753884236,
stars: 6.858771801534423,
max_combo: 909,
};
HD FL => {
aim: 2.8693628443424104,
speed: 2.533869745015772,
flashlight: 2.606877929965889,
slider_factor: 0.9803052946037858,
speed_note_count: 210.36373973116545,
aim_difficult_strain_count: 0.0, // TODO
speed_difficult_strain_count: 0.0, // TODO
aim: 2.881184366758021,
speed: 2.468469273849314,
flashlight: 2.605859779358901,
slider_factor: 0.9803293523973865,
speed_note_count: 204.88794724609374,
aim_difficult_strain_count: 106.63833474488378,
speed_difficult_strain_count: 79.9883004295862,
ar: 9.300000190734863,
od: 8.800000190734863,
hp: 5.0,
n_circles: 307,
n_sliders: 293,
n_spinners: 1,
stars: 7.17258038247615,
stars: 7.167932950561898,
max_combo: 909,
};
}
};
#[cfg(target_os = "linux")]
#[cfg(target_os = "linux")] // TODO
test_cases! {
Osu: OSU {
NM => {
@@ -332,35 +332,35 @@ fn basic_taiko() {
test_cases! {
Taiko: TAIKO {
NM => {
stamina: 1.4528845068865617,
stamina: 1.3991746883284406,
rhythm: 0.20130047251681948,
color: 1.0487315549761433,
peak: 1.8881824429738323,
peak: 1.8422453377400778,
great_hit_window: 35.0,
ok_hit_window: 0.0, // TODO
stars: 2.9778030386845606,
ok_hit_window: 80.0,
stars: 2.914589700180437,
max_combo: 289,
is_convert: false,
};
HR => {
stamina: 1.4528845068865617,
stamina: 1.3991746883284406,
rhythm: 0.20130047251681948,
color: 1.0487315549761433,
peak: 1.8881824429738323,
peak: 1.8422453377400778,
great_hit_window: 29.0,
ok_hit_window: 0.0, // TODO
stars: 2.9778030386845606,
ok_hit_window: 68.0,
stars: 2.914589700180437,
max_combo: 289,
is_convert: false,
};
DT => {
stamina: 2.054617838297644,
stamina: 2.0358868555131586,
rhythm: 0.4448175371191029,
color: 1.3637624960988888,
peak: 2.6393434317991886,
color: 1.363762496098889,
peak: 2.625066421324458,
great_hit_window: 23.333333333333332,
ok_hit_window: 0.0, // TODO
stars: 3.9605501866340607,
ok_hit_window: 53.333333333333336,
stars: 3.942709244618132,
max_combo: 289,
is_convert: false,
};
@@ -373,35 +373,35 @@ fn convert_taiko() {
test_cases! {
Taiko: OSU {
NM => {
stamina: 2.947896529153566,
stamina: 2.9127139214411444,
rhythm: 1.4696991260446617,
color: 2.3032281729649067,
peak: 4.130240422926277,
color: 2.303228172964907,
peak: 4.117779264387738,
great_hit_window: 23.59999942779541,
ok_hit_window: 0.0, // TODO
stars: 5.247857660585606,
ok_hit_window: 57.19999885559082,
stars: 5.660149021515273,
max_combo: 908,
is_convert: true,
};
HR => {
stamina: 2.947896529153566,
stamina: 2.9127139214411444,
rhythm: 1.4696991260446617,
color: 2.3032281729649067,
peak: 4.130240422926277,
color: 2.303228172964907,
peak: 4.117779264387738,
great_hit_window: 20.0,
ok_hit_window: 0.0, // TODO
stars: 5.247857660585606,
ok_hit_window: 50.0,
stars: 5.660149021515273,
max_combo: 908,
is_convert: true,
};
DT => {
stamina: 4.412382708370478,
stamina: 4.379782453136822,
rhythm: 2.002843919169095,
color: 3.1864894777399986,
peak: 6.107962386775966,
peak: 6.103209631166694,
great_hit_window: 15.733332951863607,
ok_hit_window: 0.0, // TODO
stars: 7.0140481946324815,
ok_hit_window: 38.13333257039388,
stars: 7.578560915020682,
max_combo: 908,
is_convert: true,
};
@@ -414,7 +414,7 @@ fn basic_catch() {
test_cases! {
Catch: CATCH {
NM => {
stars: 3.2502663133739844,
stars: 3.250266313373984,
ar: 8.0,
n_fruits: 728,
n_droplets: 2,
@@ -422,7 +422,7 @@ fn basic_catch() {
is_convert: false,
};
HR => {
stars: 4.3148698646484265,
stars: 4.313360856186517,
ar: 10.0,
n_fruits: 728,
n_droplets: 2,
@@ -430,7 +430,7 @@ fn basic_catch() {
is_convert: false,
};
EZ => {
stars: 4.021637906259923,
stars: 4.06522224010957,
ar: 4.0,
n_fruits: 728,
n_droplets: 2,
@@ -438,7 +438,7 @@ fn basic_catch() {
is_convert: false,
};
DT => {
stars: 4.635262826575387,
stars: 4.635262826575386,
ar: 9.666666666666668,
n_fruits: 728,
n_droplets: 2,
@@ -454,15 +454,15 @@ fn convert_catch() {
test_cases! {
Catch: OSU {
NM => {
stars: 4.513884094512871,
ar: 9.300000190734863,
stars: 4.528720977989276,
ar: 9.300000190734863
n_fruits: 908,
n_droplets: 0,
n_tiny_droplets: 159,
is_convert: true,
};
HR => {
stars: 5.082061773944862,
stars: 5.076698043567007,
ar: 10.0,
n_fruits: 908,
n_droplets: 0,
@@ -470,7 +470,7 @@ fn convert_catch() {
is_convert: true,
};
EZ => {
stars: 3.598951063172104,
stars: 3.593264064535228,
ar: 4.650000095367432,
n_fruits: 908,
n_droplets: 0,
@@ -478,7 +478,7 @@ fn convert_catch() {
is_convert: true,
};
DT => {
stars: 6.136837738350475,
stars: 6.15540143757313,
ar: 10.53333346048991,
n_fruits: 908,
n_droplets: 0,
@@ -494,14 +494,14 @@ fn basic_mania() {
test_cases! {
Mania: MANIA {
NM => {
stars: 3.441830819988125,
stars: 3.358304846842773,
hit_window: 40.0,
n_objects: 594,
max_combo: 956,
is_convert: false,
};
DT => {
stars: 4.70051326060948,
stars: 4.6072892053157295,
hit_window: 40.0,
n_objects: 594,
max_combo: 956,
tests/performance.rs
+88 -78
View File
@@ -15,7 +15,7 @@ mod common;
macro_rules! test_cases {
( $mode:ident: $path:ident {
$( $( $mods:ident )+ => {
$( $key:ident: $value:literal $( , )? )*
$( $key:ident: $value:expr $( , )? )*
} ;)*
} ) => {
let map = Beatmap::from_path(common::$path)
@@ -31,12 +31,12 @@ macro_rules! test_cases {
};
( @Osu {
$map:ident,
pp: $pp:literal,
pp_acc: $pp_acc:literal,
pp_aim: $pp_aim:literal,
pp_flashlight: $pp_flashlight:literal,
pp_speed: $pp_speed:literal,
effective_miss_count: $effective_miss_count:literal,
pp: $pp:expr,
pp_acc: $pp_acc:expr,
pp_aim: $pp_aim:expr,
pp_flashlight: $pp_flashlight:expr,
pp_speed: $pp_speed:expr,
effective_miss_count: $effective_miss_count:expr,
}) => {
(
OsuPerformance::from($map.as_owned()),
@@ -53,10 +53,11 @@ macro_rules! test_cases {
};
( @Taiko {
$map: ident,
pp: $pp:literal,
pp_acc: $pp_acc:literal,
pp_difficulty: $pp_difficulty:literal,
effective_miss_count: $effective_miss_count:literal,
pp: $pp:expr,
pp_acc: $pp_acc:expr,
pp_difficulty: $pp_difficulty:expr,
effective_miss_count: $effective_miss_count:expr,
estimated_unstable_rate: $estimated_unstable_rate:expr,
}) => {
(
TaikoPerformance::from($map.as_owned()),
@@ -65,13 +66,14 @@ macro_rules! test_cases {
pp_acc: $pp_acc,
pp_difficulty: $pp_difficulty,
effective_miss_count: $effective_miss_count,
estimated_unstable_rate: $estimated_unstable_rate,
..Default::default()
},
)
};
( @Catch {
$map:ident,
pp: $pp:literal,
pp: $pp:expr,
}) => {
(
CatchPerformance::from($map.as_owned()),
@@ -83,8 +85,8 @@ macro_rules! test_cases {
};
( @Mania {
$map:ident,
pp: $pp:literal,
pp_difficulty: $pp_difficulty:literal,
pp: $pp:expr,
pp_difficulty: $pp_difficulty:expr,
}) => {
(
ManiaPerformance::from($map.as_owned()),
@@ -102,19 +104,19 @@ fn basic_osu() {
test_cases! {
Osu: OSU {
NM => {
pp: 255.9419635475736,
pp_acc: 79.84500076626814,
pp_aim: 98.13131344235279,
pp: 272.6047426867276,
pp_acc: 97.62287463107766,
pp_aim: 99.3726518686143,
pp_flashlight: 0.0,
pp_speed: 69.86876965478146,
pp_speed: 64.48542022217285,
effective_miss_count: 0.0,
};
HD => {
pp: 281.28736211196446,
pp_acc: 86.2326008275696,
pp_aim: 108.72949454544438,
pp: 299.17174736245374,
pp_acc: 105.43270460156388,
pp_aim: 110.10489751227146,
pp_flashlight: 0.0,
pp_speed: 77.41459624444144,
pp_speed: 71.4498451141828,
effective_miss_count: 0.0,
};
EZ HD => {
@@ -126,35 +128,35 @@ fn basic_osu() {
effective_miss_count: 0.0,
};
HR => {
pp: 375.0764291059058,
pp_acc: 132.13521300659738,
pp_aim: 143.28598037767793,
pp: 404.7030358947424,
pp_acc: 161.55575439788055,
pp_aim: 145.04665418031985,
pp_flashlight: 0.0,
pp_speed: 87.39375701955078,
pp_speed: 80.77088499277514,
effective_miss_count: 0.0,
};
DT => {
pp: 716.3683237855254,
pp_acc: 150.5694857734174,
pp_aim: 300.39084638572484,
pp: 738.7899608061098,
pp_acc: 184.09450675506795,
pp_aim: 304.16666833057235,
pp_flashlight: 0.0,
pp_speed: 240.8765306794618,
pp_speed: 220.06297202966698,
effective_miss_count: 0.0,
};
FL => {
pp: 384.8917879591265,
pp_acc: 81.4419007815935,
pp_aim: 98.13131344235279,
pp_flashlight: 132.3991950960219,
pp_speed: 69.86876965478146,
pp: 402.408877784248,
pp_acc: 99.57533212369923,
pp_aim: 99.3726518686143,
pp_flashlight: 132.29720631068272,
pp_speed: 64.48542022217285,
effective_miss_count: 0.0,
};
HD FL => {
pp: 450.3709760368082,
pp_acc: 87.95725284412099,
pp_aim: 108.72949454544438,
pp_flashlight: 171.7600847331662,
pp_speed: 77.41459624444144,
pp: 469.3245236137446,
pp_acc: 107.54135869359516,
pp_aim: 110.10489751227146,
pp_flashlight: 171.62594459401154,
pp_speed: 71.4498451141828,
effective_miss_count: 0.0,
};
}
@@ -166,28 +168,32 @@ fn basic_taiko() {
test_cases! {
Taiko: TAIKO {
NM => {
pp: 98.47602106219567,
pp_acc: 46.11642717726248,
pp_difficulty: 46.69844233558799,
pp: 117.93083232512124,
pp_acc: 67.10083752258917,
pp_difficulty: 43.804435430934774,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(148.44150180469418),
};
HD => {
pp: 107.19493857245885,
pp_acc: 46.11642717726248,
pp_difficulty: 47.86590339397769,
pp: 127.99624094636974,
pp_acc: 67.10083752258917,
pp_difficulty: 44.89954631670814,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(148.44150180469418),
};
HR => {
pp: 112.22705475791287,
pp_acc: 56.71431676265808,
pp_difficulty: 49.033364452367394,
pp: 139.75239372681187,
pp_acc: 82.52109686788792,
pp_difficulty: 48.75926757049594,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(122.99438720960376),
};
DT => {
pp: 181.5021832786881,
pp_acc: 80.74206626516394,
pp_difficulty: 90.29961105452931,
pp: 220.51543873147975,
pp_acc: 118.28107309573312,
pp_difficulty: 89.35584221033577,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(98.96100120312946),
};
}
};
@@ -198,28 +204,32 @@ fn convert_taiko() {
test_cases! {
Taiko: OSU {
NM => {
pp: 324.23564627433217,
pp_acc: 125.81086361861148,
pp_difficulty: 179.31471072573842,
pp: 396.36982258196866,
pp_acc: 160.00481201044695,
pp_difficulty: 213.19920144243838,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(85.75868894575865),
};
HD => {
pp: 353.7513933816713,
pp_acc: 125.81086361861148,
pp_difficulty: 183.79757849388187,
pp: 426.0975592756163,
pp_acc: 160.00481201044695,
pp_difficulty: 213.19920144243838,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(85.75868894575865),
};
HR => {
pp: 360.12274556551137,
pp_acc: 150.9344373000759,
pp_difficulty: 188.28044626202535,
pp: 452.71458235192836,
pp_acc: 191.95668459371925,
pp_difficulty: 234.5205569790155,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(72.67685680089848),
};
DT => {
pp: 604.8167434609272,
pp_acc: 220.7055264311451,
pp_difficulty: 347.90986552791844,
pp: 739.7393581199891,
pp_acc: 280.8904545747157,
pp_difficulty: 415.0249135067657,
effective_miss_count: 0.0,
estimated_unstable_rate: Some(57.17245929717244),
};
}
}
@@ -229,10 +239,10 @@ fn convert_taiko() {
fn basic_catch() {
test_cases! {
Catch: CATCH {
NM => { pp: 113.85903714373049 };
HD => { pp: 136.63084457247658 };
HD HR => { pp: 231.90266535529486 };
DT => { pp: 247.18402249125862 };
NM => { pp: 113.85903714373046 };
HD => { pp: 136.63084457247655 };
HD HR => { pp: 231.7403429678108 };
DT => { pp: 247.18402249125842 };
}
};
}
@@ -241,10 +251,10 @@ fn basic_catch() {
fn convert_catch() {
test_cases! {
Catch: OSU {
NM => { pp: 230.99937552589745 };
HD => { pp: 254.6768082128294 };
HD HR => { pp: 328.41201070443725 };
DT => { pp: 500.4365349891725 };
NM => { pp: 232.52175944328079 };
HD => { pp: 256.35523645996665 };
HD HR => { pp: 327.71861407740374 };
DT => { pp: 503.47065792054815 };
}
};
}
@@ -253,9 +263,9 @@ fn convert_catch() {
fn basic_mania() {
test_cases! {
Mania: MANIA {
NM => { pp: 114.37175184134917, pp_difficulty: 14.296468980168646 };
EZ => { pp: 57.18587592067458, pp_difficulty: 14.296468980168646 };
DT => { pp: 233.17882161546717, pp_difficulty: 29.147352701933396 };
NM => { pp: 108.08430593303873, pp_difficulty: 108.08430593303873 };
EZ => { pp: 54.04215296651937, pp_difficulty: 108.08430593303873 };
DT => { pp: 222.79838979800365, pp_difficulty: 222.79838979800365 };
}
};
}
@@ -264,9 +274,9 @@ fn basic_mania() {
fn convert_mania() {
test_cases! {
Mania: OSU {
NM => { pp: 99.73849552661329, pp_difficulty: 12.467311940826661 };
EZ => { pp: 49.869247763306646, pp_difficulty: 12.467311940826661 };
DT => { pp: 195.23247718805612, pp_difficulty: 24.404059648507015 };
NM => { pp: 99.73849552661329, pp_difficulty: 99.73849552661329 };
EZ => { pp: 49.869247763306646, pp_difficulty: 99.73849552661329 };
DT => { pp: 195.23247718805612, pp_difficulty: 195.23247718805612 };
}
};
}