titaniumtown/othello
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

elo: improve code quality and add confidence intervals

Browse Source
This commit is contained in:
Simon Gardling 2025-04-30 13:52:19 -04:00
parent aeca76fda6
commit b5e73cbbcf
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/elo.rs
View File

@ -9,7 +9,7 @@ use indicatif::{ProgressBar, ProgressStyle};
use rand::seq::SliceRandom; use rand::seq::SliceRandom;
use rayon::iter::{IntoParallelIterator, ParallelIterator}; use rayon::iter::{IntoParallelIterator, ParallelIterator};
use skillratings::{ use skillratings::{
glicko2::{glicko2, Glicko2Rating}, glicko2::{confidence_interval, glicko2, Glicko2Rating},
Outcomes, Rating, Outcomes, Rating,
}; };
use std::num::NonZero; use std::num::NonZero;
@ -30,7 +30,7 @@ pub fn run() {
..Default::default() ..Default::default()
}; };
let configs = [2, 4, 6] let configs = [6]
.into_iter() .into_iter()
.map(move |d| FutureMoveConfig { .map(move |d| FutureMoveConfig {
max_depth: d, max_depth: d,
@ -143,13 +143,22 @@ pub struct PlayerArena {
impl std::fmt::Display for PlayerArena { impl std::fmt::Display for PlayerArena {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let mut players_i: Vec<usize> = (0..self.players.len()).collect(); let mut players_i: Vec<usize> = (0..self.players.len()).collect();
players_i.sort_by_key(|&i| -(self.players[i].2.rating() * 100.0) as i64);
players_i.sort_by(|&a, &b| {
self.players[b]
.2
.rating()
.total_cmp(&self.players[a].2.rating())
});
for i in players_i { for i in players_i {
let conf_interval = confidence_interval(&self.players[i].2);
writeln!( writeln!(
f, f,
"({:.2}): {}", "({:.2}[+/-{:.2}]): {}",
self.players[i].2.rating(), self.players[i].2.rating(),
conf_interval.1 - self.players[i].2.rating(),
self.players[i].0 self.players[i].0
)?; )?;
} }
@ -163,9 +172,8 @@ impl PlayerArena {
Self { Self {
players: players players: players
.into_iter() .into_iter()
.zip([Default::default()].into_iter().cycle()) // All starting ratings should be the default
// flatten tuple .map(|(a, b)| (a, b, Default::default()))
.map(|((a, b), c)| (a, b, c))
.collect(), .collect(),
} }
} }
@ -238,9 +246,12 @@ impl PlayerArena {
received_num += 1; received_num += 1;
p.inc(1); p.inc(1);
// add extra newline after progressbar
println!(); println!();
// break if all pairs were recieved // break if all pairs were recieved
if received_num == num { if received_num == num {
drop(receiver);
break; break;
} }
} }
@ -265,14 +276,12 @@ impl PlayerArena {
} }
fn process_outcome(&mut self, player1: usize, player2: usize, outcome: &Outcomes) { fn process_outcome(&mut self, player1: usize, player2: usize, outcome: &Outcomes) {
let (np1, np2) = glicko2( (self.players[player1].2, self.players[player2].2) = glicko2(
&self.players[player1].2, &self.players[player1].2,
&self.players[player2].2, &self.players[player2].2,
outcome, outcome,
&Default::default(), &Default::default(),
); );
self.players[player1].2 = np1;
self.players[player2].2 = np2;
} }
fn play_two_inner(player_1: Box<dyn Agent>, player_2: Box<dyn Agent>) -> Outcomes { fn play_two_inner(player_1: Box<dyn Agent>, player_2: Box<dyn Agent>) -> Outcomes {