Hanabi/hanabi.rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

more improve

Browse source
This commit is contained in:
Jeff Wu 2016-03-30 23:18:55 -07:00
parent 0aad4dfa1c
commit 38bb323d91
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -53,5 +53,5 @@ Currently, on seeds 0-9999, we have:
| 2p | 3p | 4p | 5p | | 2p | 3p | 4p | 5p |
----------|---------|---------|---------|---------| ----------|---------|---------|---------|---------|
cheating | 24.8600 | 24.9781 | 24.9715 | 24.9583 | cheating | 24.8600 | 24.9781 | 24.9715 | 24.9583 |
info | 17.249 | 23.394 | 24.762 | 24.835 | info | 17.136 | 23.445 | 24.779 | 24.863 |

17
src/strategies/information.rs
View file

@ -173,12 +173,12 @@ impl CardPossibilityPartition {
let has_dead = card_table.probability_is_dead(view.get_board()) != 0.0; let has_dead = card_table.probability_is_dead(view.get_board()) != 0.0;
// TODO: group things of different colors and values?
let effective_max = if has_dead { let effective_max = if has_dead {
max_n_partitions - 1 max_n_partitions - 1
} else { } else {
max_n_partitions max_n_partitions
}; };
for card in card_table.get_possibilities() { for card in card_table.get_possibilities() {
if !view.get_board().is_dead(&card) { if !view.get_board().is_dead(&card) {
partition.insert(card.clone(), cur_block); partition.insert(card.clone(), cur_block);
@ -311,12 +311,16 @@ impl InformationPlayerStrategy {
// // if there is a card that is definitely playable, don't ask about playability // // if there is a card that is definitely playable, don't ask about playability
// if !known_playable { // if !known_playable {
for &(p, _, i) in &augmented_hand_info { for &(p, _, i) in &augmented_hand_info {
if (p != 0.0) && (p != 1.0) { // if the play probability is very low, ignore.
// probably there's only 1-2 possible cards for it, out of many
if (p > 0.1) && (p < 1.0) {
if add_question(&mut questions, &mut info_remaining, IsPlayable {index: i}) { if add_question(&mut questions, &mut info_remaining, IsPlayable {index: i}) {
return questions; return questions;
} }
} }
} }
// } else {
// debug!("Something known playable");
// } // }
for &(_, card_table, i) in &augmented_hand_info { for &(_, card_table, i) in &augmented_hand_info {
@ -587,12 +591,13 @@ impl InformationPlayerStrategy {
if card_table.probability_is_dead(view.get_board()) == 1.0 { if card_table.probability_is_dead(view.get_board()) == 1.0 {
return 0; return 0;
} }
let mut score = -1; // Do something more intelligent?
let mut score = 1;
if !card_table.color_determined() { if !card_table.color_determined() {
score -= 1; score += 1;
} }
if !card_table.value_determined() { if !card_table.value_determined() {
score -= 1; score += 1;
} }
return score; return score;
} }
@ -602,7 +607,7 @@ impl InformationPlayerStrategy {
{ {
let mut scores = info.iter().enumerate().map(|(i, card_table)| { let mut scores = info.iter().enumerate().map(|(i, card_table)| {
let score = self.get_hint_index_score(card_table, view); let score = self.get_hint_index_score(card_table, view);
(score, i) (-score, i)
}).collect::<Vec<_>>(); }).collect::<Vec<_>>();
scores.sort(); scores.sort();
scores[0].1 scores[0].1