Hanabi/Endgame-Analyzer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add options to alter clue counts

Browse Source
This commit is contained in:
Maximilian Keßler 2023-11-10 23:53:28 +01:00
parent acece2a952
commit 280833ff1f
Signed by: max
GPG Key ID: BCC5A619923C0BA5
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/game_state.h
View File

@ -21,7 +21,7 @@ namespace Hanabi {
using rank_t = std::uint8_t;
using suit_t = std::uint8_t;
using clue_t = std::uint8_t;
using clue_t = std::int8_t;
using player_t = std::uint8_t;
using hand_index_t = std::uint8_t;
@ -220,6 +220,8 @@ public:
virtual void rotate_next_draw(const Card& card) = 0;
virtual void revert() = 0;
virtual void modify_clues(clue_t change) = 0;
[[nodiscard]] virtual player_t turn() const = 0;
[[nodiscard]] virtual clue_t num_clues() const = 0;
[[nodiscard]] virtual std::vector<std::vector<Card>> hands() const = 0;
@ -258,6 +260,7 @@ struct Game {
void make_turn();
void revert_turn();
void forward_until(size_t turn = 100, size_t draw_pile_break = 0);
void revert_until(size_t draw_pile_break);
std::unique_ptr<HanabiStateIF> state;
@ -282,6 +285,8 @@ public:
void revert() final;
void modify_clues(clue_t change) final;
[[nodiscard]] player_t turn() const final;
[[nodiscard]] clue_t num_clues() const final;
[[nodiscard]] std::vector<std::vector<Card>> hands() const final;

13
include/game_state.hpp
View File

@ -511,6 +511,19 @@ namespace Hanabi {
}
}
template<suit_t num_suits, player_t num_players, hand_index_t hand_size>
void HanabiState<num_suits, num_players, hand_size>::modify_clues(Hanabi::clue_t change)
{
_num_clues += change;
if (_num_clues > 8) {
_num_clues = 8;
}
if (_num_clues < 0) {
_num_clues = 0;
}
}
template<suit_t num_suits, player_t num_players, hand_index_t hand_size>
player_t HanabiState<num_suits, num_players, hand_size>::turn() const {
return _turn;

11
src/main.cpp
View File

@ -12,7 +12,7 @@
namespace Hanabi {
void analyze_game_and_start_cli(std::variant<int, const char*> game_id, int turn, int draw_pile_size, std::optional<uint8_t> score_goal,
bool start_cli, bool print_remaining_states, bool quiet) {
bool start_cli, bool print_remaining_states, bool quiet, clue_t clue_modifier) {
auto game = Download::get_game(game_id, score_goal);
if (game.state == nullptr) {
if(game_id.index() == 0) {
@ -24,6 +24,7 @@ namespace Hanabi {
}
game.forward_until(turn, draw_pile_size);
game.state->modify_clues(clue_modifier);
if (not quiet) {
std::cout << "Analysing state: " << std::endl << std::endl << *game.state << std::endl;
@ -37,8 +38,8 @@ namespace Hanabi {
std::cout.precision(10);
if (not (quiet and print_remaining_states)) {
std::cout << "Probability with optimal play: ";
print_probability(std::cout, res) << std::endl;
}
print_probability(std::cout, res) << std::endl;
if (not quiet) {
std::cout << "Took " << std::chrono::duration_cast<std::chrono::milliseconds>(end - start) << "." << std::endl;
std::cout << "Visited " << game.state->enumerated_states() << " states." << std::endl;
@ -72,6 +73,7 @@ int main(int argc, char *argv[]) {
int draw_pile_size = 0;
std::optional<int> score;
bool interactive_shell;
int clue_modifier = 0;
boost::program_options::options_description desc("Allowed options");
desc.add_options()
@ -83,6 +85,7 @@ int main(int argc, char *argv[]) {
("score,s", boost::program_options::value<int>(), "Score that counts as a win, i.e. is optimized for achieving.")
("interactive,i", boost::program_options::value<bool>(&interactive_shell)->default_value(true), "Drop into interactive shell to explore game")
("remaining-states,r", "Print probabilities for all further sizes of draw pile.")
("clue-modifier,c", boost::program_options::value<int>(&clue_modifier)->default_value(0), "Modification to the number of clues applied to selected game state.")
("quiet,q", "Deactivate all non-essential prints")
;
boost::program_options::variables_map vm;
@ -111,9 +114,9 @@ int main(int argc, char *argv[]) {
}
if (vm.count("file")) {
Hanabi::analyze_game_and_start_cli(vm["file"].as<std::string>().c_str(), turn, draw_pile_size, score, interactive_shell, vm.count("remaining-states"), vm.count("quiet"));
Hanabi::analyze_game_and_start_cli(vm["file"].as<std::string>().c_str(), turn, draw_pile_size, score, interactive_shell, vm.count("remaining-states"), vm.count("quiet"), clue_modifier);
} else {
Hanabi::analyze_game_and_start_cli(vm["id"].as<int>(), turn, draw_pile_size, score, interactive_shell, vm.count("remaining-states"), vm.count("quiet"));
Hanabi::analyze_game_and_start_cli(vm["id"].as<int>(), turn, draw_pile_size, score, interactive_shell, vm.count("remaining-states"), vm.count("quiet"), clue_modifier);
}
return EXIT_SUCCESS;
}