From 6da70e6bfc33bf6683f1cb65fd149b35a2a493f8 Mon Sep 17 00:00:00 2001
From: Mike Aizatsky <mike.aizatsky@gmail.com>
Date: Mon, 4 Nov 2024 14:13:47 -0800
Subject: [PATCH] nits

---
 src/cards.rs  |  2 +-
 src/lib.rs    | 17 +++++++++++------
 src/search.rs |  5 ++++-
 src/stats.rs  | 15 +++++++++------
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/cards.rs b/src/cards.rs
index 6d678a5..08a2e66 100644
--- a/src/cards.rs
+++ b/src/cards.rs
@@ -35,7 +35,7 @@ impl Suit {
     pub const ALL: [Suit; 4] = [Suit::C, Suit::D, Suit::H, Suit::S];
 
     #[must_use]
-    pub fn symbol(&self) -> &str {
+    pub fn symbol(self) -> &'static str {
         match self {
             Suit::C => "\u{2663}",
             Suit::D => "\u{2666}",
diff --git a/src/lib.rs b/src/lib.rs
index 69c5379..52bbacf 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -36,16 +36,21 @@ impl Player {
     fn index(self) -> usize {
         (self as u8) as usize
     }
+
+    fn symbol(self) -> &'static str {
+        match self {
+            Self::W => "W",
+            Self::N => "N",
+            Self::E => "E",
+            Self::S => "S",
+        }
+
+    }
 }
 
 impl std::fmt::Debug for Player {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        match self {
-            Self::W => write!(f, "W"),
-            Self::N => write!(f, "N"),
-            Self::E => write!(f, "E"),
-            Self::S => write!(f, "S"),
-        }
+        f.write_str(self.symbol())
     }
 }
 
diff --git a/src/search.rs b/src/search.rs
index 975da82..ce0b307 100644
--- a/src/search.rs
+++ b/src/search.rs
@@ -45,6 +45,7 @@ impl Lattice<u8> for Min {
     }
 }
 
+#[derive(Debug, Clone)]
 pub struct InitialPosition {
     pub deal: Deal,
     pub trumps: Option<Suit>,
@@ -58,6 +59,7 @@ where
     TT: TransTable<PoC>,
     ST: Stats,
 {
+    init: InitialPosition,
     state: PlayState<PoC>,
     table: TT,
     stats: ST,
@@ -82,6 +84,7 @@ impl<PoC: PlayOfCards, TT: TransTable<PoC>, ST: Stats> SearchImpl<PoC, TT, ST> {
         let deal = deal.promote_all(&mut cards);
 
         Self {
+            init: init.clone(),
             state: PlayState::<PoC>::new(&deal, next),
             table,
             stats,
@@ -281,7 +284,7 @@ impl<PoC: PlayOfCards, TT: TransTable<PoC>, ST: Stats> Search for SearchImpl<PoC
                 guess = upper;
             }
         }
-        self.stats.search_finished();
+        self.stats.search_finished(&self.init);
 
         guess
     }
diff --git a/src/stats.rs b/src/stats.rs
index 7e7380b..7cfb5d7 100644
--- a/src/stats.rs
+++ b/src/stats.rs
@@ -1,12 +1,14 @@
 use std::time::{Duration, Instant};
 
+use crate::search::InitialPosition;
+
 pub trait Stats {
     fn guess_iter(&mut self);
     fn max_tricks_cutoff(&mut self);
     fn node_visit(&mut self);
     fn quick_tricks_cutoff(&mut self);
     fn search_cutoff(&mut self);
-    fn search_finished(&mut self);
+    fn search_finished(&mut self, init: &InitialPosition);
     fn search_started(&mut self);
     fn tt_hit(&mut self);
     fn tt_lower_cutoff(&mut self);
@@ -31,7 +33,7 @@ impl Stats for EmptyStats {
 
     fn search_cutoff(&mut self) {}
 
-    fn search_finished(&mut self) {}
+    fn search_finished(&mut self, _init: &InitialPosition) {}
 
     fn search_started(&mut self) {}
 
@@ -53,10 +55,11 @@ pub struct UnsyncStats {
     tt_upper_cutoff: usize,
 }
 impl UnsyncStats {
-    fn print(&self)  {
+    fn print(&self, init: &InitialPosition)  {
         let duration = self.elapsed.unwrap().as_millis() as usize;
         println!("Search Statistics:");
-        println!("    duration: {duration:12} ms",);
+        println!("    contract:           {}{}", init.declarer.symbol(), init.trumps.map_or("N", |s| s.symbol()));
+        println!("    duration: {duration:12} ms");
         println!("    searches: {:12}", self.search);
         println!("    guesses:  {:12}", self.guess_iter);
         println!("    nodes:    {:12} {}/ms", self.nodes, self.nodes / duration);
@@ -98,9 +101,9 @@ impl Stats for UnsyncStats {
         self.search_cutoff += 1;
     }
 
-    fn search_finished(&mut self) {
+    fn search_finished(&mut self, init: &InitialPosition) {
         self.elapsed = Some(self.start.unwrap().elapsed());
-        self.print();
+        self.print(init);
     }
 
     fn search_started(&mut self) {