nki/youmubot
1
0
Fork 0
mirror of https://github.com/natsukagami/youmubot.git synced 2025-04-19 16:58:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly scale map age to 0.975

Browse source
This commit is contained in:
Natsu Kagami 2024-08-05 16:04:54 +02:00
parent e77930c8db
commit 7565a6e5c5
Signed by: nki
GPG key ID: 55A032EB38B49ADB
2 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
youmubot-db-sql/src/lib.rs
View file

@ -18,7 +18,8 @@ pub async fn connect(path: impl AsRef<Path>) -> Result<Pool> {
.filename(path) .filename(path)
.foreign_keys(true) .foreign_keys(true)
.create_if_missing(true) .create_if_missing(true)
.journal_mode(sqlite::SqliteJournalMode::Wal), .journal_mode(sqlite::SqliteJournalMode::Wal)
.synchronous(sqlite::SqliteSynchronous::Normal),
) )
.await?; .await?;

42
youmubot-osu/src/discord/mod.rs
View file

@ -22,7 +22,7 @@ pub use hook::{dot_osu_hook, hook, score_hook};
use server_rank::{SERVER_RANK_COMMAND, SHOW_LEADERBOARD_COMMAND}; use server_rank::{SERVER_RANK_COMMAND, SHOW_LEADERBOARD_COMMAND};
use stream::FuturesOrdered; use stream::FuturesOrdered;
use youmubot_prelude::announcer::AnnouncerHandler; use youmubot_prelude::announcer::AnnouncerHandler;
use youmubot_prelude::{stream::FuturesUnordered, *}; use youmubot_prelude::*;
use crate::{ use crate::{
discord::beatmap_cache::BeatmapMetaCache, discord::beatmap_cache::BeatmapMetaCache,
@ -880,27 +880,41 @@ async fn get_user(
Ok(()) Ok(())
} }
const SCALING_FACTOR: f64 = 0.975;
static SCALES: std::sync::OnceLock<Box<[f64]>> = std::sync::OnceLock::new();
fn scales() -> &'static [f64] {
SCALES.get_or_init(|| {
(0..256)
.map(|r| SCALING_FACTOR.powi(r))
// .scan(1.0, |a, _| {
// let old = *a;
// *a *= SCALING_FACTOR;
// Some(old)
// })
.collect::<Vec<_>>()
.into_boxed_slice()
})
}
pub(in crate::discord) async fn calculate_weighted_map_length( pub(in crate::discord) async fn calculate_weighted_map_length(
from_scores: impl IntoIterator<Item = &Score>, from_scores: impl IntoIterator<Item = &Score>,
cache: &BeatmapMetaCache, cache: &BeatmapMetaCache,
mode: Mode, mode: Mode,
) -> Result<f64> { ) -> Result<f64> {
from_scores let scores = from_scores
.into_iter() .into_iter()
.enumerate() .map(|s| async move {
.map(|(i, s)| async move {
let beatmap = cache.get_beatmap(s.beatmap_id, mode).await?; let beatmap = cache.get_beatmap(s.beatmap_id, mode).await?;
const SCALING_FACTOR: f64 = 0.975;
Ok(beatmap Ok(beatmap
.difficulty .difficulty
.apply_mods(s.mods, 0.0 /* dont care */) .apply_mods(s.mods, 0.0 /* dont care */)
.drain_length .drain_length
.as_secs_f64() .as_secs_f64()) as Result<_>
* (SCALING_FACTOR.powi(i as i32)))
}) })
.collect::<FuturesUnordered<_>>() .collect::<FuturesOrdered<_>>()
.try_fold(0.0, |a, b| future::ready(Ok(a + b))) .try_collect::<Vec<_>>()
.await .await?;
Ok(scores.into_iter().zip(scales()).map(|(a, b)| a * b).sum())
} }
pub(in crate::discord) async fn calculate_weighted_map_age( pub(in crate::discord) async fn calculate_weighted_map_age(
@ -908,10 +922,6 @@ pub(in crate::discord) async fn calculate_weighted_map_age(
cache: &BeatmapMetaCache, cache: &BeatmapMetaCache,
mode: Mode, mode: Mode,
) -> Result<i64> { ) -> Result<i64> {
const SCALING_FACTOR: f64 = 0.95;
let scales = (0..100)
.scan(1.0, |a, _| Some(*a * SCALING_FACTOR))
.collect::<Vec<_>>();
let scores = from_scores let scores = from_scores
.into_iter() .into_iter()
.map(|s| async move { .map(|s| async move {
@ -929,9 +939,9 @@ pub(in crate::discord) async fn calculate_weighted_map_age(
.await?; .await?;
Ok((scores Ok((scores
.iter() .iter()
.zip(scales.iter()) .zip(scales().iter())
.map(|(a, b)| a * b) .map(|(a, b)| a * b)
.sum::<f64>() .sum::<f64>()
/ scales.iter().take(scores.len()).sum::<f64>()) / scales().iter().take(scores.len()).sum::<f64>())
.floor() as i64) .floor() as i64)
} }