From 9ea1e4aa233035b6d1c3924980af68ffaddcdae7 Mon Sep 17 00:00:00 2001 From: Andy Watkins Date: Thu, 6 Jun 2024 18:47:38 +0100 Subject: [PATCH] 0.9.0 fixes --- crates/odonata-base/src/eg/endgame.rs | 17 ++++++++--------- crates/odonata-base/src/infra/metric.rs | 6 +++--- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/crates/odonata-base/src/eg/endgame.rs b/crates/odonata-base/src/eg/endgame.rs index 0163f15d..57ebb1a5 100644 --- a/crates/odonata-base/src/eg/endgame.rs +++ b/crates/odonata-base/src/eg/endgame.rs @@ -1,6 +1,5 @@ use serde::{Deserialize, Serialize}; -use strum::IntoEnumIterator; -use strum_macros::{Display, EnumCount, EnumIter, IntoStaticStr}; +use strum_macros::{Display, EnumCount, IntoStaticStr}; use crate::prelude::*; use crate::trace::stat::{SliceStat, Stat}; @@ -55,7 +54,7 @@ impl Configurable for EndGameScoring { } } -#[derive(Copy, Default, Clone, PartialEq, Debug, IntoStaticStr, EnumCount, EnumIter, Display)] +#[derive(Copy, Default, Clone, PartialEq, Debug, IntoStaticStr, EnumCount, Display)] pub enum EndGame { #[default] Unknown, // for when its too costly to work out who wins @@ -139,11 +138,11 @@ pub enum EndGame { use static_init::dynamic; #[dynamic] static ENDGAME_COUNTS: Vec = { - let mut vec = vec![]; - for eg in EndGame::iter() { - let s: &'static str = eg.into(); - vec.push(Stat::new(s)); - } + let vec = vec![]; + // for eg in EndGame::iter() { + // let s: &'static str = eg.into(); + // vec.push(Stat::new(s)); + // } vec }; @@ -417,7 +416,7 @@ impl EndGame { pub fn from_board(b: &Board) -> Self { let eg = Self::private_ctor(b); - ENDGAME_COUNTS[eg as usize].increment(); + // ENDGAME_COUNTS[eg as usize].increment(); eg } diff --git a/crates/odonata-base/src/infra/metric.rs b/crates/odonata-base/src/infra/metric.rs index 96731795..d362cecc 100644 --- a/crates/odonata-base/src/infra/metric.rs +++ b/crates/odonata-base/src/infra/metric.rs @@ -1015,9 +1015,9 @@ impl fmt::Display for Metrics { // let mut b = Builder::default(); b.set_header(["Counter", "Value"]); - for eg in EndGame::iter() { - b.push_record([&eg.to_string(), &i(self.endgame[eg as usize])]); - } + // for eg in EndGame::iter() { + // b.push_record([&eg.to_string(), &i(self.endgame[eg as usize])]); + // } let mut t = b.build(); t.with(style.clone()) .with(Modify::new(Rows::single(0)).with(Border::default().top('-')))