logaritmisk/trueskill-tt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it more rusty

Browse Source
This commit is contained in:
Anders Olsson
2022-12-27 22:24:01 +01:00
parent fdddf56156
commit 9b6cb9e7eb
1 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/batch.rs
View File

@@ -110,7 +110,7 @@ pub struct Batch {
impl Batch {
pub fn new(
composition: Vec<Vec<Vec<Index>>>,
compositions: Vec<Vec<Vec<Index>>>,
results: Vec<Vec<f64>>,
weights: Vec<Vec<Vec<f64>>>,
time: i64,
@@ -118,47 +118,48 @@ impl Batch {
agents: &HashMap<Index, Agent>,
) -> Self {
assert!(
results.is_empty() || results.len() == composition.len(),
results.is_empty() || results.len() == compositions.len(),
"TODO: Add a comment here"
);
assert!(
weights.is_empty() || weights.len() == composition.len(),
weights.is_empty() || weights.len() == compositions.len(),
"TODO: Add a comment here"
);
let this_agent = composition
let this_agent = compositions
.iter()
.flatten()
.flatten()
.cloned()
.collect::<HashSet<_>>();
let elapsed = this_agent
.iter()
.map(|&idx| (idx, compute_elapsed(agents[&idx].last_time, time)))
.collect::<HashMap<_, _>>();
let skills = this_agent
.iter()
.map(|&idx| {
let elapsed = compute_elapsed(agents[idx].last_time, time);
(
idx,
*idx,
Skill {
forward: agents[&idx].receive(elapsed[&idx]),
elapsed: elapsed[&idx],
forward: agents[idx].receive(elapsed),
elapsed,
..Default::default()
},
)
})
.collect::<HashMap<_, _>>();
let events = (0..composition.len())
.map(|e| {
let teams = (0..composition[e].len())
.map(|t| {
let items = (0..composition[e][t].len())
.map(|a| Item {
agent: composition[e][t][a],
let events = compositions
.iter()
.enumerate() // (0..composition.len())
.map(|(e, composition)| {
let teams = composition
.iter()
.enumerate() // (0..composition.len())
.map(|(t, team)| {
let items = team
.iter()
.map(|&agent| Item {
agent,
likelihood: N_INF,
})
.collect::<Vec<_>>();
@@ -166,7 +167,7 @@ impl Batch {
Team {
items,
output: if results.is_empty() {
(composition[e].len() - (t + 1)) as f64
(composition.len() - (t + 1)) as f64
} else {
results[e][t]
},