From 58c881130a04ca77a2f86c2a3a3bafac46149f16 Mon Sep 17 00:00:00 2001 From: Jeff Wu Date: Thu, 31 Mar 2016 00:02:09 -0700 Subject: [PATCH] fix sorting wrong order bug... some cleanup, update results --- README.md | 5 ++-- src/cards.rs | 4 --- src/game.rs | 9 ------ src/info.rs | 6 ++-- src/main.rs | 8 ++--- src/strategies/information.rs | 55 +++++++---------------------------- 6 files changed, 20 insertions(+), 67 deletions(-) diff --git a/README.md b/README.md index 930db88..2918a0d 100644 --- a/README.md +++ b/README.md @@ -45,13 +45,12 @@ For example, `cargo run -- -n 10000 -s 0 -t 2 -p 3` -## Results (sparsely updated) +## Results Currently, on seeds 0-9999, we have: -(info strategy is only ran on 1000 seeds) | 2p | 3p | 4p | 5p | ----------|---------|---------|---------|---------| cheating | 24.8600 | 24.9781 | 24.9715 | 24.9583 | -info | 17.136 | 23.445 | 24.779 | 24.863 | +info | 18.5959 | 23.8846 | 24.7753 | 24.8719 | diff --git a/src/cards.rs b/src/cards.rs index ca64c9b..3eba9b5 100644 --- a/src/cards.rs +++ b/src/cards.rs @@ -105,10 +105,6 @@ impl Discard { } } - pub fn get_count(&self, card: &Card) -> u32 { - self.counts.get_count(card) - } - pub fn has_all(&self, card: &Card) -> bool { self.counts.remaining(card) == 0 } diff --git a/src/game.rs b/src/game.rs index 50bd7a2..d6ec3aa 100644 --- a/src/game.rs +++ b/src/game.rs @@ -226,15 +226,6 @@ impl BoardState { Some(card.value) == self.get_firework(&card.color).desired_value() } - pub fn was_played(&self, card: &Card) -> bool { - let firework = self.fireworks.get(card.color).unwrap(); - if firework.complete() { - true - } else { - card.value < firework.desired_value().unwrap() - } - } - // best possible value we can get for firework of that color, // based on looking at discard + fireworks fn highest_attainable(&self, color: &Color) -> Value { diff --git a/src/info.rs b/src/info.rs index 36f2030..e415931 100644 --- a/src/info.rs +++ b/src/info.rs @@ -270,9 +270,9 @@ impl CardPossibilityTable { } // a bit more efficient - pub fn borrow_possibilities<'a>(&'a self) -> Vec<&'a Card> { - self.possible.keys().collect::>() - } + // pub fn borrow_possibilities<'a>(&'a self) -> Vec<&'a Card> { + // self.possible.keys().collect::>() + // } pub fn decrement_weight_if_possible(&mut self, card: &Card) { if self.is_possible(card) { diff --git a/src/main.rs b/src/main.rs index db6f1cf..598766c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -46,19 +46,19 @@ fn main() { "Log level, one of 'trace', 'debug', 'info', 'warn', and 'error'", "LOGLEVEL"); opts.optopt("n", "ntrials", - "Number of games to simulate", + "Number of games to simulate (default 1)", "NTRIALS"); opts.optopt("t", "nthreads", - "Number of threads to use for simulation", + "Number of threads to use for simulation (default 1)", "NTHREADS"); opts.optopt("s", "seed", - "Seed for PRNG", + "Seed for PRNG (default random)", "SEED"); opts.optopt("p", "nplayers", "Number of players", "NPLAYERS"); opts.optopt("g", "strategy", - "Which strategy to use. One of 'random' and 'cheat'", + "Which strategy to use. One of 'random', 'cheat', and 'info'", "STRATEGY"); opts.optflag("h", "help", "Print this help menu"); diff --git a/src/strategies/information.rs b/src/strategies/information.rs index c16fc37..2348896 100644 --- a/src/strategies/information.rs +++ b/src/strategies/information.rs @@ -4,21 +4,6 @@ use std::cmp::Ordering; use simulator::*; use game::*; -// strategy that recommends other players an action. -// -// 50 cards, 25 plays, 25 left -// with 5 players: -// - only 5 + 8 hints total. each player goes through 10 cards -// with 4 players: -// - only 9 + 8 hints total. each player goes through 12.5 cards -// -// For any given player with at least 4 cards, and index i, there are at least 3 hints that can be given. -// 0. a value hint on card i -// 1. a color hint on card i -// 2. any hint not involving card i -// -// for 4 players, can give 6 distinct hints - #[derive(Debug,Clone)] struct ModulusInformation { modulus: u32, @@ -131,33 +116,6 @@ impl Question for IsPlayable { } } -struct IsDead { - index: usize, -} -impl Question for IsDead { - fn info_amount(&self) -> u32 { 2 } - fn answer(&self, hand: &Cards, view: &OwnedGameView) -> u32 { - let ref card = hand[self.index]; - if view.get_board().is_dead(card) { 1 } else { 0 } - } - fn acknowledge_answer( - &self, - answer: u32, - hand_info: &mut Vec, - view: &OwnedGameView, - ) { - let ref mut card_table = hand_info[self.index]; - let possible = card_table.get_possibilities(); - for card in &possible { - if view.get_board().is_dead(card) { - if answer == 0 { card_table.mark_false(card); } - } else { - if answer == 1 { card_table.mark_false(card); } - } - } - } -} - struct CardPossibilityPartition { index: usize, n_partitions: u32, @@ -299,7 +257,8 @@ impl InformationPlayerStrategy { // sort by probability of play, then by index augmented_hand_info.sort_by(|&(p1, _, i1), &(p2, _, i2)| { - let result = p1.partial_cmp(&p2); + // *higher* probabilities are better + let result = p2.partial_cmp(&p1); if result == None || result == Some(Ordering::Equal) { i1.cmp(&i2) } else { @@ -628,6 +587,14 @@ impl InformationPlayerStrategy { let card_index = self.get_index_for_hint(self.get_player_public_info(&hint_player), view); let hint_card = &hand[card_index]; + // For any given player with at least 4 cards, and index i, there are at least 3 hints that can be given. + // 0. a value hint on card i + // 1. a color hint on card i + // 2. any hint not involving card i + // + // for 4 players, can give 6 distinct hints + + let hinted = match hint_type { 0 => { Hinted::Value(hint_card.value) @@ -650,7 +617,7 @@ impl InformationPlayerStrategy { if let Some(hinted) = hinted_opt { hinted } else { - // Technically possible, but never happens + // TODO: Technically possible, but never happens panic!("Found nothing to hint!") } }