diff --git a/open_spiel/algorithms/best_response_test.cc b/open_spiel/algorithms/best_response_test.cc index 83ebbf260a..7ac0c1c471 100644 --- a/open_spiel/algorithms/best_response_test.cc +++ b/open_spiel/algorithms/best_response_test.cc @@ -22,13 +22,13 @@ #include "open_spiel/algorithms/minimax.h" #include "open_spiel/game_parameters.h" -#include "open_spiel/games/efg_game.h" -#include "open_spiel/games/efg_game_data.h" -#include "open_spiel/games/goofspiel.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" -#include "open_spiel/games/liars_dice.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/efg_game/efg_game.h" +#include "open_spiel/games/efg_game/efg_game_data.h" +#include "open_spiel/games/goofspiel/goofspiel.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" +#include "open_spiel/games/liars_dice/liars_dice.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/policy.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/cfr_br_test.cc b/open_spiel/algorithms/cfr_br_test.cc index a57d15aa3a..e663621b5c 100644 --- a/open_spiel/algorithms/cfr_br_test.cc +++ b/open_spiel/algorithms/cfr_br_test.cc @@ -16,8 +16,8 @@ #include "open_spiel/algorithms/expected_returns.h" #include "open_spiel/algorithms/tabular_exploitability.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" namespace open_spiel { namespace algorithms { diff --git a/open_spiel/algorithms/cfr_test.cc b/open_spiel/algorithms/cfr_test.cc index 24f5f228c2..0f8b542010 100644 --- a/open_spiel/algorithms/cfr_test.cc +++ b/open_spiel/algorithms/cfr_test.cc @@ -21,11 +21,11 @@ #include "open_spiel/algorithms/history_tree.h" #include "open_spiel/algorithms/tabular_exploitability.h" #include "open_spiel/game_transforms/turn_based_simultaneous_game.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" -#include "open_spiel/games/liars_dice.h" -#include "open_spiel/games/matching_pennies_3p.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" +#include "open_spiel/games/liars_dice/liars_dice.h" +#include "open_spiel/games/matching_pennies_3p/matching_pennies_3p.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/corr_dev_builder_test.cc b/open_spiel/algorithms/corr_dev_builder_test.cc index 4b661c2527..8dd407721e 100644 --- a/open_spiel/algorithms/corr_dev_builder_test.cc +++ b/open_spiel/algorithms/corr_dev_builder_test.cc @@ -25,7 +25,7 @@ #include "open_spiel/algorithms/deterministic_policy.h" #include "open_spiel/algorithms/expected_returns.h" #include "open_spiel/game_transforms/turn_based_simultaneous_game.h" -#include "open_spiel/games/efg_game.h" +#include "open_spiel/games/efg_game/efg_game.h" #include "open_spiel/policy.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/corr_dist_test.cc b/open_spiel/algorithms/corr_dist_test.cc index 1e4850ed00..a8d6335b2c 100644 --- a/open_spiel/algorithms/corr_dist_test.cc +++ b/open_spiel/algorithms/corr_dist_test.cc @@ -20,8 +20,8 @@ #include "open_spiel/algorithms/cfr.h" #include "open_spiel/algorithms/corr_dev_builder.h" #include "open_spiel/game_transforms/turn_based_simultaneous_game.h" -#include "open_spiel/games/efg_game.h" -#include "open_spiel/games/efg_game_data.h" +#include "open_spiel/games/efg_game/efg_game.h" +#include "open_spiel/games/efg_game/efg_game_data.h" #include "open_spiel/matrix_game.h" #include "open_spiel/policy.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/algorithms/deterministic_policy_test.cc b/open_spiel/algorithms/deterministic_policy_test.cc index 7f06d986cb..ab41cee4a3 100644 --- a/open_spiel/algorithms/deterministic_policy_test.cc +++ b/open_spiel/algorithms/deterministic_policy_test.cc @@ -14,8 +14,8 @@ #include "open_spiel/algorithms/deterministic_policy.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" namespace open_spiel { namespace algorithms { diff --git a/open_spiel/algorithms/external_sampling_mccfr_test.cc b/open_spiel/algorithms/external_sampling_mccfr_test.cc index 5461e85dbe..f60f66cbcf 100644 --- a/open_spiel/algorithms/external_sampling_mccfr_test.cc +++ b/open_spiel/algorithms/external_sampling_mccfr_test.cc @@ -19,8 +19,8 @@ #include #include "open_spiel/algorithms/tabular_exploitability.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/get_all_histories_test.cc b/open_spiel/algorithms/get_all_histories_test.cc index c23b0bb425..410ec2b9a1 100644 --- a/open_spiel/algorithms/get_all_histories_test.cc +++ b/open_spiel/algorithms/get_all_histories_test.cc @@ -14,7 +14,7 @@ #include "open_spiel/algorithms/get_all_histories.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel_utils.h" namespace algorithms = open_spiel::algorithms; diff --git a/open_spiel/algorithms/get_all_states_test.cc b/open_spiel/algorithms/get_all_states_test.cc index e8b3610052..116aa41595 100644 --- a/open_spiel/algorithms/get_all_states_test.cc +++ b/open_spiel/algorithms/get_all_states_test.cc @@ -14,7 +14,7 @@ #include "open_spiel/algorithms/get_all_states.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel_utils.h" namespace algorithms = open_spiel::algorithms; diff --git a/open_spiel/algorithms/get_legal_actions_map_test.cc b/open_spiel/algorithms/get_legal_actions_map_test.cc index 4e6d2f2d8b..9be876ff0f 100644 --- a/open_spiel/algorithms/get_legal_actions_map_test.cc +++ b/open_spiel/algorithms/get_legal_actions_map_test.cc @@ -16,9 +16,9 @@ #include -#include "open_spiel/games/goofspiel.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/goofspiel/goofspiel.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" #include "open_spiel/spiel_utils.h" namespace algorithms = open_spiel::algorithms; diff --git a/open_spiel/algorithms/history_tree_test.cc b/open_spiel/algorithms/history_tree_test.cc index 31ee8e101c..2183ec7238 100644 --- a/open_spiel/algorithms/history_tree_test.cc +++ b/open_spiel/algorithms/history_tree_test.cc @@ -22,11 +22,11 @@ #include "open_spiel/abseil-cpp/absl/container/node_hash_set.h" #include "open_spiel/algorithms/minimax.h" #include "open_spiel/game_parameters.h" -#include "open_spiel/games/goofspiel.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" -#include "open_spiel/games/liars_dice.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/goofspiel/goofspiel.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" +#include "open_spiel/games/liars_dice/liars_dice.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/infostate_tree_test.cc b/open_spiel/algorithms/infostate_tree_test.cc index d284340c6f..5b2a51e572 100644 --- a/open_spiel/algorithms/infostate_tree_test.cc +++ b/open_spiel/algorithms/infostate_tree_test.cc @@ -18,8 +18,8 @@ #include #include -#include "open_spiel/games/goofspiel.h" -#include "open_spiel/games/kuhn_poker.h" +#include "open_spiel/games/goofspiel/goofspiel.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/matrix_game_utils_test.cc b/open_spiel/algorithms/matrix_game_utils_test.cc index 5e17139033..cfed72305b 100644 --- a/open_spiel/algorithms/matrix_game_utils_test.cc +++ b/open_spiel/algorithms/matrix_game_utils_test.cc @@ -14,7 +14,7 @@ #include "open_spiel/algorithms/matrix_game_utils.h" -#include "open_spiel/games/kuhn_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" namespace open_spiel { namespace algorithms { diff --git a/open_spiel/algorithms/minimax_test.cc b/open_spiel/algorithms/minimax_test.cc index b12ab4d94a..0110d6a8f3 100644 --- a/open_spiel/algorithms/minimax_test.cc +++ b/open_spiel/algorithms/minimax_test.cc @@ -16,8 +16,8 @@ #include -#include "open_spiel/games/pig.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/pig/pig.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/outcome_sampling_mccfr_test.cc b/open_spiel/algorithms/outcome_sampling_mccfr_test.cc index 74c23d355f..cdbd7feef3 100644 --- a/open_spiel/algorithms/outcome_sampling_mccfr_test.cc +++ b/open_spiel/algorithms/outcome_sampling_mccfr_test.cc @@ -19,8 +19,8 @@ #include #include "open_spiel/algorithms/tabular_exploitability.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/tabular_exploitability_test.cc b/open_spiel/algorithms/tabular_exploitability_test.cc index f477ff369b..2e5891df02 100644 --- a/open_spiel/algorithms/tabular_exploitability_test.cc +++ b/open_spiel/algorithms/tabular_exploitability_test.cc @@ -23,11 +23,11 @@ #include "open_spiel/algorithms/best_response.h" #include "open_spiel/algorithms/minimax.h" #include "open_spiel/game_parameters.h" -#include "open_spiel/games/goofspiel.h" -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" -#include "open_spiel/games/liars_dice.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/goofspiel/goofspiel.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" +#include "open_spiel/games/liars_dice/liars_dice.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/policy.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/algorithms/tabular_q_learning_test.cc b/open_spiel/algorithms/tabular_q_learning_test.cc index 47ae85f75f..d1ecc2a7a8 100644 --- a/open_spiel/algorithms/tabular_q_learning_test.cc +++ b/open_spiel/algorithms/tabular_q_learning_test.cc @@ -21,7 +21,7 @@ #include "open_spiel/abseil-cpp/absl/random/distributions.h" #include "open_spiel/abseil-cpp/absl/random/random.h" -#include "open_spiel/games/catch.h" +#include "open_spiel/games/catch/catch.h" #include "open_spiel/spiel.h" namespace open_spiel { diff --git a/open_spiel/algorithms/tabular_sarsa_test.cc b/open_spiel/algorithms/tabular_sarsa_test.cc index bd2d84fde2..a40ff5f046 100644 --- a/open_spiel/algorithms/tabular_sarsa_test.cc +++ b/open_spiel/algorithms/tabular_sarsa_test.cc @@ -21,7 +21,7 @@ #include "open_spiel/abseil-cpp/absl/random/distributions.h" #include "open_spiel/abseil-cpp/absl/random/random.h" -#include "open_spiel/games/catch.h" +#include "open_spiel/games/catch/catch.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/bots/gin_rummy/simple_gin_rummy_bot.cc b/open_spiel/bots/gin_rummy/simple_gin_rummy_bot.cc index 82cce43c54..a6421e9977 100644 --- a/open_spiel/bots/gin_rummy/simple_gin_rummy_bot.cc +++ b/open_spiel/bots/gin_rummy/simple_gin_rummy_bot.cc @@ -18,7 +18,7 @@ #include #include -#include "open_spiel/games/gin_rummy.h" +#include "open_spiel/games/gin_rummy/gin_rummy.h" #include "open_spiel/games/gin_rummy/gin_rummy_utils.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_example.cc b/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_example.cc index e476ef9fb9..6153345238 100644 --- a/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_example.cc +++ b/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_example.cc @@ -23,7 +23,7 @@ #include "open_spiel/abseil-cpp/absl/time/clock.h" #include "open_spiel/abseil-cpp/absl/time/time.h" #include "open_spiel/bots/gin_rummy/simple_gin_rummy_bot.h" -#include "open_spiel/games/gin_rummy.h" +#include "open_spiel/games/gin_rummy/gin_rummy.h" #include "open_spiel/games/gin_rummy/gin_rummy_utils.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_test.cc b/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_test.cc index 67141705d4..2e9fc07bf8 100644 --- a/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_test.cc +++ b/open_spiel/bots/gin_rummy/simple_gin_rummy_bot_test.cc @@ -17,7 +17,7 @@ #include #include "open_spiel/bots/gin_rummy/simple_gin_rummy_bot.h" -#include "open_spiel/games/gin_rummy.h" +#include "open_spiel/games/gin_rummy/gin_rummy.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_bots.h" diff --git a/open_spiel/bots/uci/random_uci_bot.cc b/open_spiel/bots/uci/random_uci_bot.cc index 7acc25a568..77b6307bb0 100644 --- a/open_spiel/bots/uci/random_uci_bot.cc +++ b/open_spiel/bots/uci/random_uci_bot.cc @@ -20,7 +20,7 @@ #include "open_spiel/abseil-cpp/absl/flags/parse.h" #include "open_spiel/abseil-cpp/absl/random/distributions.h" #include "open_spiel/abseil-cpp/absl/strings/match.h" -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" #include "open_spiel/utils/init.h" diff --git a/open_spiel/bots/uci/uci_bot.h b/open_spiel/bots/uci/uci_bot.h index 18486140be..e0a165dcc3 100644 --- a/open_spiel/bots/uci/uci_bot.h +++ b/open_spiel/bots/uci/uci_bot.h @@ -17,7 +17,7 @@ #define OPEN_SPIEL_BOTS_UCI_BOT_H_ #include "open_spiel/abseil-cpp/absl/types/optional.h" -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/spiel_bots.h" // **IMPORTANT NOTE** The basic test currently hangs, so consider this bot diff --git a/open_spiel/bots/xinxin/xinxin_bot.h b/open_spiel/bots/xinxin/xinxin_bot.h index 9f2f12d7a4..1e1bb6de0e 100644 --- a/open_spiel/bots/xinxin/xinxin_bot.h +++ b/open_spiel/bots/xinxin/xinxin_bot.h @@ -22,7 +22,7 @@ #include "open_spiel/bots/xinxin/hearts/Hearts.h" #include "open_spiel/bots/xinxin/hearts/iiMonteCarlo.h" -#include "open_spiel/games/hearts.h" +#include "open_spiel/games/hearts/hearts.h" #include "open_spiel/spiel_bots.h" namespace open_spiel { diff --git a/open_spiel/examples/fsicfr_liars_dice.cc b/open_spiel/examples/fsicfr_liars_dice.cc index 7b11afe366..c89c715ee1 100644 --- a/open_spiel/examples/fsicfr_liars_dice.cc +++ b/open_spiel/examples/fsicfr_liars_dice.cc @@ -17,7 +17,7 @@ #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" #include "open_spiel/algorithms/fsicfr.h" #include "open_spiel/algorithms/tabular_best_response_mdp.h" -#include "open_spiel/games/liars_dice.h" +#include "open_spiel/games/liars_dice/liars_dice.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_globals.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/examples/imperfect_recall_mccfr.cc b/open_spiel/examples/imperfect_recall_mccfr.cc index 47a86332d7..8ea5b4850b 100644 --- a/open_spiel/examples/imperfect_recall_mccfr.cc +++ b/open_spiel/examples/imperfect_recall_mccfr.cc @@ -20,7 +20,7 @@ #include "open_spiel/algorithms/tabular_best_response_mdp.h" #include "open_spiel/algorithms/external_sampling_mccfr.h" #include "open_spiel/algorithms/outcome_sampling_mccfr.h" -#include "open_spiel/games/phantom_ttt.h" +#include "open_spiel/games/phantom_ttt/phantom_ttt.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/examples/minimax_example.cc b/open_spiel/examples/minimax_example.cc index 5d8bf0df6e..d83340cd09 100644 --- a/open_spiel/examples/minimax_example.cc +++ b/open_spiel/examples/minimax_example.cc @@ -15,8 +15,8 @@ #include #include "open_spiel/algorithms/minimax.h" -#include "open_spiel/games/breakthrough.h" -#include "open_spiel/games/pig.h" +#include "open_spiel/games/breakthrough/breakthrough.h" +#include "open_spiel/games/pig/pig.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/examples/policy_iteration_example.cc b/open_spiel/examples/policy_iteration_example.cc index 21cb039f2d..285d509cb9 100644 --- a/open_spiel/examples/policy_iteration_example.cc +++ b/open_spiel/examples/policy_iteration_example.cc @@ -16,7 +16,7 @@ #include #include "open_spiel/algorithms/policy_iteration.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/examples/tabular_q_learning_example.cc b/open_spiel/examples/tabular_q_learning_example.cc index 88b2620d4d..8378761bac 100644 --- a/open_spiel/examples/tabular_q_learning_example.cc +++ b/open_spiel/examples/tabular_q_learning_example.cc @@ -18,7 +18,7 @@ #include "open_spiel/abseil-cpp/absl/container/flat_hash_map.h" #include "open_spiel/algorithms/tabular_q_learning.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_globals.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/examples/tabular_sarsa_example.cc b/open_spiel/examples/tabular_sarsa_example.cc index d623af28b6..87af6fe8ed 100644 --- a/open_spiel/examples/tabular_sarsa_example.cc +++ b/open_spiel/examples/tabular_sarsa_example.cc @@ -18,7 +18,7 @@ #include "open_spiel/abseil-cpp/absl/container/flat_hash_map.h" #include "open_spiel/algorithms/tabular_sarsa.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_globals.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/game_transforms/zerosum_test.cc b/open_spiel/game_transforms/zerosum_test.cc index 69b65fa0f7..09a274ff94 100644 --- a/open_spiel/game_transforms/zerosum_test.cc +++ b/open_spiel/game_transforms/zerosum_test.cc @@ -14,7 +14,7 @@ #include "open_spiel/game_transforms/zerosum.h" -#include "open_spiel/games/oh_hell.h" +#include "open_spiel/games/oh_hell/oh_hell.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/CMakeLists.txt b/open_spiel/games/CMakeLists.txt index 89b778606b..ef485b6781 100644 --- a/open_spiel/games/CMakeLists.txt +++ b/open_spiel/games/CMakeLists.txt @@ -1,116 +1,114 @@ set(GAME_SOURCES - 2048.cc - 2048.h - amazons.cc - amazons.h - backgammon.cc - backgammon.h - bargaining.cc - bargaining.h - battleship.cc - battleship.h - battleship_types.h - battleship_types.cc - blackjack.cc - blackjack.h - blotto.cc - blotto.h - breakthrough.cc - breakthrough.h - bridge.cc - bridge.h + amazons/amazons.cc + amazons/amazons.h + backgammon/backgammon.cc + backgammon/backgammon.h + bargaining/bargaining.cc + bargaining/bargaining.h + battleship/battleship.cc + battleship/battleship.h + battleship/battleship_types.h + battleship/battleship_types.cc + blackjack/blackjack.cc + blackjack/blackjack.h + blotto/blotto.cc + blotto/blotto.h + breakthrough/breakthrough.cc + breakthrough/breakthrough.h + bridge/bridge.cc + bridge/bridge.h bridge/bridge_scoring.cc bridge/bridge_scoring.h - bridge_uncontested_bidding.cc - bridge_uncontested_bidding.h - catch.cc - catch.h - checkers.cc - checkers.h - chess.cc - chess.h + bridge/bridge_uncontested_bidding.cc + bridge/bridge_uncontested_bidding.h + catch/catch.cc + catch/catch.h + checkers/checkers.cc + checkers/checkers.h + chess/chess.cc + chess/chess.h chess/chess_board.cc chess/chess_board.h chess/chess_common.cc chess/chess_common.h - cliff_walking.cc - cliff_walking.h - clobber.cc - clobber.h - coin_game.cc - coin_game.h - colored_trails.cc - colored_trails.h + cliff_walking/cliff_walking.cc + cliff_walking/cliff_walking.h + clobber/clobber.cc + clobber/clobber.h + coin_game/coin_game.cc + coin_game/coin_game.h + colored_trails/colored_trails.cc + colored_trails/colored_trails.h colored_trails/colored_trails_utils.cc - connect_four.cc - connect_four.h - coop_box_pushing.cc - coop_box_pushing.h - coordinated_mp.cc - coordinated_mp.h - crazy_eights.cc - crazy_eights.h - cursor_go.cc - cursor_go.h - dark_chess.cc - dark_chess.h - dark_hex.cc - dark_hex.h - deep_sea.cc - deep_sea.h + connect_four/connect_four.cc + connect_four/connect_four.h + coop_box_pushing/coop_box_pushing.cc + coop_box_pushing/coop_box_pushing.h + coordinated_mp/coordinated_mp.cc + coordinated_mp/coordinated_mp.h + crazy_eights/crazy_eights.cc + crazy_eights/crazy_eights.h + cursor_go/cursor_go.cc + cursor_go/cursor_go.h + dark_chess/dark_chess.cc + dark_chess/dark_chess.h + dark_hex/dark_hex.cc + dark_hex/dark_hex.h + deep_sea/deep_sea.cc + deep_sea/deep_sea.h dynamic_routing/dynamic_routing_data.cc dynamic_routing/dynamic_routing_data.h dynamic_routing/dynamic_routing_utils.cc dynamic_routing/dynamic_routing_utils.h - dou_dizhu.cc - dou_dizhu.h + dou_dizhu/dou_dizhu.cc + dou_dizhu/dou_dizhu.h dou_dizhu/dou_dizhu_utils.cc dou_dizhu/dou_dizhu_utils.h - efg_game.cc - efg_game.h - efg_game_data.cc - efg_game_data.h - euchre.cc - euchre.h - first_sealed_auction.cc - first_sealed_auction.h - gin_rummy.cc - gin_rummy.h + efg_game/efg_game.cc + efg_game/efg_game.h + efg_game/efg_game_data.cc + efg_game/efg_game_data.h + euchre/euchre.cc + euchre/euchre.h + first_sealed_auction/first_sealed_auction.cc + first_sealed_auction/first_sealed_auction.h + gin_rummy/gin_rummy.cc + gin_rummy/gin_rummy.h gin_rummy/gin_rummy_utils.cc gin_rummy/gin_rummy_utils.h - go.cc - go.h + go/go.cc + go/go.h go/go_board.cc go/go_board.h - goofspiel.cc - goofspiel.h - havannah.cc - havannah.h - hearts.cc - hearts.h - hex.cc - hex.h - kriegspiel.cc - kriegspiel.h - kuhn_poker.cc - kuhn_poker.h - laser_tag.cc - laser_tag.h - leduc_poker.cc - leduc_poker.h - lewis_signaling.cc - lewis_signaling.h - liars_dice.cc - liars_dice.h - maedn.cc - maedn.h - mancala.cc - mancala.h - markov_soccer.cc - markov_soccer.h - matching_pennies_3p.cc - matching_pennies_3p.h - matrix_games.cc + goofspiel/goofspiel.cc + goofspiel/goofspiel.h + havannah/havannah.cc + havannah/havannah.h + hearts/hearts.cc + hearts/hearts.h + hex/hex.cc + hex/hex.h + kriegspiel/kriegspiel.cc + kriegspiel/kriegspiel.h + kuhn_poker/kuhn_poker.cc + kuhn_poker/kuhn_poker.h + laser_tag/laser_tag.cc + laser_tag/laser_tag.h + leduc_poker/leduc_poker.cc + leduc_poker/leduc_poker.h + lewis_signaling/lewis_signaling.cc + lewis_signaling/lewis_signaling.h + liars_dice/liars_dice.cc + liars_dice/liars_dice.h + maedn/maedn.cc + maedn/maedn.h + mancala/mancala.cc + mancala/mancala.h + markov_soccer/markov_soccer.cc + markov_soccer/markov_soccer.h + matching_pennies_3p/matching_pennies_3p.cc + matching_pennies_3p/matching_pennies_3p.h + matrix_games/matrix_games.cc mfg/crowd_modelling.cc mfg/crowd_modelling.h mfg/crowd_modelling_2d.cc @@ -119,75 +117,77 @@ set(GAME_SOURCES mfg/dynamic_routing.h mfg/garnet.cc mfg/garnet.h - morpion_solitaire.cc - morpion_solitaire.h - negotiation.cc - negotiation.h - nfg_game.cc - nfg_game.h - nine_mens_morris.cc - nine_mens_morris.h - nim.cc - nim.h - oh_hell.cc - oh_hell.h - oshi_zumo.cc - oshi_zumo.h - othello.cc - othello.h - oware.cc - oware.h + morpion_solitaire/morpion_solitaire.cc + morpion_solitaire/morpion_solitaire.h + negotiation/negotiation.cc + negotiation/negotiation.h + nfg_game/nfg_game.cc + nfg_game/nfg_game.h + nine_mens_morris/nine_mens_morris.cc + nine_mens_morris/nine_mens_morris.h + nim/nim.cc + nim/nim.h + oh_hell/oh_hell.cc + oh_hell/oh_hell.h + oshi_zumo/oshi_zumo.cc + oshi_zumo/oshi_zumo.h + othello/othello.cc + othello/othello.h + oware/oware.cc + oware/oware.h oware/oware_board.cc oware/oware_board.h - pathfinding.cc - pathfinding.h - pentago.cc - pentago.h - phantom_go.h - phantom_go.cc + pathfinding/pathfinding.cc + pathfinding/pathfinding.h + pentago/pentago.cc + pentago/pentago.h + phantom_go/phantom_go.h + phantom_go/phantom_go.cc phantom_go/phantom_go_board.h phantom_go/phantom_go_board.cc - phantom_ttt.cc - phantom_ttt.h - pig.cc - pig.h - quoridor.cc - quoridor.h - rbc.cc - rbc.h - sheriff.cc - sheriff.h - skat.cc - skat.h - solitaire.cc - solitaire.h - stones_and_gems.cc - stones_and_gems.h - tarok.cc - tarok.h + phantom_ttt/phantom_ttt.cc + phantom_ttt/phantom_ttt.h + pig/pig.cc + pig/pig.h + quoridor/quoridor.cc + quoridor/quoridor.h + rbc/rbc.cc + rbc/rbc.h + sheriff/sheriff.cc + sheriff/sheriff.h + skat/skat.cc + skat/skat.h + solitaire/solitaire.cc + solitaire/solitaire.h + stones_and_gems/stones_and_gems.cc + stones_and_gems/stones_and_gems.h + tarok/tarok.cc + tarok/tarok.h tarok/cards.cc tarok/cards.h tarok/contracts.cc tarok/contracts.h - tic_tac_toe.cc - tic_tac_toe.h - tiny_bridge.cc - tiny_bridge.h - tiny_hanabi.cc - tiny_hanabi.h - trade_comm.cc - trade_comm.h - ultimate_tic_tac_toe.h - ultimate_tic_tac_toe.cc - y.cc - y.h + tic_tac_toe/tic_tac_toe.cc + tic_tac_toe/tic_tac_toe.h + tiny_bridge/tiny_bridge.cc + tiny_bridge/tiny_bridge.h + tiny_hanabi/tiny_hanabi.cc + tiny_hanabi/tiny_hanabi.h + trade_comm/trade_comm.cc + trade_comm/trade_comm.h + twenty_forty_eight/2048.cc + twenty_forty_eight/2048.h + ultimate_tic_tac_toe/ultimate_tic_tac_toe.h + ultimate_tic_tac_toe/ultimate_tic_tac_toe.cc + y/y.cc + y/y.h ) if (${OPEN_SPIEL_BUILD_WITH_HANABI}) - set(GAME_SOURCES ${GAME_SOURCES} hanabi.cc hanabi.h) + set(GAME_SOURCES ${GAME_SOURCES} hanabi/hanabi.cc hanabi/hanabi.h) endif() if (${OPEN_SPIEL_BUILD_WITH_ACPC}) - set(GAME_SOURCES ${GAME_SOURCES} universal_poker.cc universal_poker.h) + set(GAME_SOURCES ${GAME_SOURCES} universal_poker/universal_poker.cc universal_poker/universal_poker.h) endif() add_library (games OBJECT ${GAME_SOURCES}) @@ -270,65 +270,65 @@ add_library(bridge_double_dummy_solver OBJECT target_include_directories (bridge_double_dummy_solver PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) target_compile_definitions(bridge_double_dummy_solver PUBLIC DDS_NO_STATIC_INIT) -add_executable(2048_test 2048_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(2048_test twenty_forty_eight/2048_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(2048_test 2048_test) -add_executable(amazons_test amazons_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(amazons_test amazons/amazons_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(amazons_test amazons_test) -add_executable(backgammon_test backgammon_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(backgammon_test backgammon/backgammon_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(backgammon_test backgammon_test) -add_executable(bargaining_instance_generator bargaining_instance_generator.cc +add_executable(bargaining_instance_generator bargaining/bargaining_instance_generator.cc ${OPEN_SPIEL_OBJECTS}) -add_executable(bargaining_test bargaining_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(bargaining_test bargaining/bargaining_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(bargaining_test bargaining_test) -add_executable(battleship_test battleship_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(battleship_test battleship/battleship_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(battleship_test battleship_test) -add_executable(blackjack_test blackjack_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(blackjack_test blackjack/blackjack_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(blackjack_test blackjack_test) -add_executable(blotto_test blotto_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(blotto_test blotto/blotto_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(blotto_test blotto_test) -add_executable(breakthrough_test breakthrough_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(breakthrough_test breakthrough/breakthrough_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(breakthrough_test breakthrough_test) -add_executable(bridge_test bridge_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(bridge_test bridge/bridge_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(bridge_test bridge_test) -add_executable(catch_test catch_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(catch_test catch/catch_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(catch_test catch_test) -add_executable(checkers_test checkers_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(checkers_test checkers/checkers_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(checkers_test checkers_test) -add_executable(chess_test chess_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(chess_test chess/chess_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(chess_test chess_test) -add_executable(cliff_walking_test cliff_walking_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(cliff_walking_test cliff_walking/cliff_walking_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(cliff_walking_test cliff_walking_test) -add_executable(clobber_test clobber_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(clobber_test clobber/clobber_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(clobber_test clobber_test) -add_executable(coin_game_test coin_game_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(coin_game_test coin_game/coin_game_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(coin_game_test coin_game_test) @@ -337,26 +337,26 @@ add_executable(colored_trails_board_generator colored_trails/colored_trails_board_generator.cc ${OPEN_SPIEL_OBJECTS} $) -add_executable(colored_trails_test colored_trails_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(colored_trails_test colored_trails/colored_trails_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(colored_trails_test colored_trails_test) -add_executable(connect_four_test connect_four_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(connect_four_test connect_four/connect_four_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(connect_four_test connect_four_test) -add_executable(coop_box_pushing_test coop_box_pushing_test.cc +add_executable(coop_box_pushing_test coop_box_pushing/coop_box_pushing_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(coop_box_pushing_test coop_box_pushing_test) -add_executable(coordinated_mp_test coordinated_mp_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(coordinated_mp_test coordinated_mp/coordinated_mp_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(coordinated_mp_test coordinated_mp_test) -add_executable(crazy_eights_test crazy_eights_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(crazy_eights_test crazy_eights/crazy_eights_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(crazy_eights_test crazy_eights_test) @@ -368,20 +368,20 @@ add_executable(crowd_modelling_2d_test mfg/crowd_modelling_2d_test.cc ${OPEN_SPI $) add_test(crowd_modelling_2d_test crowd_modelling_2d_test) -add_executable(cursor_go_test cursor_go_test.cc +add_executable(cursor_go_test cursor_go/cursor_go_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(cursor_go_test cursor_go_test) -add_executable(dark_chess_test dark_chess_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(dark_chess_test dark_chess/dark_chess_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(dark_chess_test dark_chess_test) -add_executable(dark_hex_test dark_hex_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(dark_hex_test dark_hex/dark_hex_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(dark_hex_test dark_hex_test) -add_executable(deep_sea_test deep_sea_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(deep_sea_test deep_sea/deep_sea_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(deep_sea_test deep_sea_test) @@ -397,7 +397,7 @@ add_executable(dynamic_routing_utils_test dynamic_routing/dynamic_routing_utils_ $) add_test(dynamic_routing_utils_test dynamic_routing_utils_test) -add_executable(dou_dizhu_test dou_dizhu_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(dou_dizhu_test dou_dizhu/dou_dizhu_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(dou_dizhu_test dou_dizhu_test) @@ -405,15 +405,15 @@ add_executable(dou_dizhu_utils_test dou_dizhu/dou_dizhu_utils_test.cc ${OPEN_SPI $) add_test(dou_dizhu_utils_test dou_dizhu_utils_test) -add_executable(efg_game_test efg_game_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(efg_game_test efg_game/efg_game_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(efg_game_test efg_game_test) -add_executable(euchre_test euchre_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(euchre_test euchre/euchre_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(euchre_test euchre_test) -add_executable(first_sealed_auction_test first_sealed_auction_test.cc +add_executable(first_sealed_auction_test first_sealed_auction/first_sealed_auction_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(first_sealed_auction_test first_sealed_auction_test) @@ -422,200 +422,199 @@ add_executable(garnet_test mfg/garnet_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(garnet_test garnet_test) -add_executable(gin_rummy_test gin_rummy_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(gin_rummy_test gin_rummy/gin_rummy_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(gin_rummy_test gin_rummy_test) -add_executable(go_test go_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(go_test go/go_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(go_test go_test) -add_executable(phantom_go_test phantom_go_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(phantom_go_test phantom_go/phantom_go_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(phantom_go_test phantom_go_test) -add_executable(goofspiel_test goofspiel_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(goofspiel_test goofspiel/goofspiel_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(goofspiel_test goofspiel_test) -add_executable(havannah_test havannah_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(havannah_test havannah/havannah_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(havannah_test havannah_test) -add_executable(hearts_test hearts_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(hearts_test hearts/hearts_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(hearts_test hearts_test) -add_executable(hex_test hex_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(hex_test hex/hex_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(hex_test hex_test) -add_executable(kriegspiel_test kriegspiel_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(kriegspiel_test kriegspiel/kriegspiel_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(kriegspiel_test kriegspiel_test) -add_executable(kuhn_poker_test kuhn_poker_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(kuhn_poker_test kuhn_poker/kuhn_poker_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(kuhn_poker_test kuhn_poker_test) -add_executable(leduc_poker_test leduc_poker_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(leduc_poker_test leduc_poker/leduc_poker_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(leduc_poker_test leduc_poker_test) -add_executable(lewis_signaling_test lewis_signaling_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(lewis_signaling_test lewis_signaling/lewis_signaling_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(lewis_signaling_test lewis_signaling_test) -add_executable(liars_dice_test liars_dice_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(liars_dice_test liars_dice/liars_dice_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(liars_dice_test liars_dice_test) -add_executable(maedn_test maedn_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(maedn_test maedn/maedn_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(maedn_test maedn_test) -add_executable(mancala_test mancala_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(mancala_test mancala/mancala_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(mancala_test mancala_test) -add_executable(markov_soccer_test markov_soccer_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(markov_soccer_test markov_soccer/markov_soccer_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(markov_soccer_test markov_soccer_test) -add_executable(matching_pennies_3p_test matching_pennies_3p_test.cc +add_executable(matching_pennies_3p_test matching_pennies_3p/matching_pennies_3p_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(matching_pennies_3p_test matching_pennies_3p_test) -add_executable(matrix_games_test matrix_games_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(matrix_games_test matrix_games/matrix_games_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(matrix_games_test matrix_games_test) -add_executable(morpion_solitaire_test morpion_solitaire_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(morpion_solitaire_test morpion_solitaire/morpion_solitaire_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(morpion_solitaire_test morpion_solitaire_test) -add_executable(negotiation_test negotiation_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(negotiation_test negotiation/negotiation_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(negotiation_test negotiation_test) -add_executable(nfg_game_test nfg_game_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(nfg_game_test nfg_game/nfg_game_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(nfg_game_test nfg_game_test) -add_executable(nim_test nim_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(nim_test nim/nim_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(nim_test nim_test) -add_executable(nine_mens_morris_test nine_mens_morris_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(nine_mens_morris_test nine_mens_morris/nine_mens_morris_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(nine_mens_morris_test nine_mens_morris_test) -add_executable(oh_hell_test oh_hell_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(oh_hell_test oh_hell/oh_hell_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(oh_hell_test oh_hell_test) -add_executable(oshi_zumo_test oshi_zumo_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(oshi_zumo_test oshi_zumo/oshi_zumo_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(oshi_zumo_test oshi_zumo_test) -add_executable(othello_test othello_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(othello_test othello/othello_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(othello_test othello_test) -add_executable(oware_test oware_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(oware_test oware/oware_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(oware_test oware_test) -add_executable(pathfinding_test pathfinding_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(pathfinding_test pathfinding/pathfinding_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(pathfinding_test pathfinding_test) -add_executable(pentago_test pentago_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(pentago_test pentago/pentago_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(pentago_test pentago_test) -add_executable(phantom_ttt_test phantom_ttt_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(phantom_ttt_test phantom_ttt/phantom_ttt_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(phantom_ttt_test phantom_ttt_test) -add_executable(pig_test pig_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(pig_test pig/pig_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(pig_test pig_test) -add_executable(quoridor_test quoridor_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(quoridor_test quoridor/quoridor_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(quoridor_test quoridor_test) -add_executable(rbc_test rbc_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(rbc_test rbc/rbc_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(rbc_test rbc_test) -add_executable(sheriff_test sheriff_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(sheriff_test sheriff/sheriff_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(sheriff_test sheriff_test) -add_executable(skat_test skat_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(skat_test skat/skat_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(skat_test skat_test) -add_executable(solitaire_test solitaire_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(solitaire_test solitaire/solitaire_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(solitaire_test solitaire_test) -add_executable(stones_and_gems_test stones_and_gems_test.cc +add_executable(stones_and_gems_test stones_and_gems/stones_and_gems_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(stones_and_gems_test stones_and_gems_test) -add_executable(tarok_test tarok_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(tarok_test tarok/tarok_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(tarok_test tarok_test) -add_executable(tic_tac_toe_test tic_tac_toe_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(tic_tac_toe_test tic_tac_toe/tic_tac_toe_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(tic_tac_toe_test tic_tac_toe_test) -add_executable(laser_tag_test laser_tag_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(laser_tag_test laser_tag/laser_tag_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(laser_tag_test laser_tag_test) -add_executable(tiny_bridge_test tiny_bridge_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(tiny_bridge_test tiny_bridge/tiny_bridge_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(tiny_bridge_test tiny_bridge_test) -add_executable(tiny_hanabi_test tiny_hanabi_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(tiny_hanabi_test tiny_hanabi/tiny_hanabi_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(tiny_hanabi_test tiny_hanabi_test) -add_executable(trade_comm_test trade_comm_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(trade_comm_test trade_comm/trade_comm_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(trade_comm_test trade_comm_test) -add_executable(ultimate_tic_tac_toe_test ultimate_tic_tac_toe_test.cc +add_executable(ultimate_tic_tac_toe_test ultimate_tic_tac_toe/ultimate_tic_tac_toe_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(ultimate_tic_tac_toe_test ultimate_tic_tac_toe_test) if (${OPEN_SPIEL_BUILD_WITH_ACPC}) - add_executable(universal_poker_test universal_poker_test.cc ${OPEN_SPIEL_OBJECTS} + add_executable(universal_poker_test universal_poker/universal_poker_test.cc ${OPEN_SPIEL_OBJECTS} $ $) add_test(universal_poker_test universal_poker_test --subgames_data_dir=${CMAKE_CURRENT_SOURCE_DIR}/universal_poker/endgames) endif() -add_executable(y_test y_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(y_test y/y_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(y_test y_test) - diff --git a/open_spiel/games/amazons.cc b/open_spiel/games/amazons/amazons.cc similarity index 99% rename from open_spiel/games/amazons.cc rename to open_spiel/games/amazons/amazons.cc index fc115010c5..6c98c03f8e 100644 --- a/open_spiel/games/amazons.cc +++ b/open_spiel/games/amazons/amazons.cc @@ -12,8 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -// testing -#include "open_spiel/games/amazons.h" +#include "open_spiel/games/amazons/amazons.h" #include #include diff --git a/open_spiel/games/amazons.h b/open_spiel/games/amazons/amazons.h similarity index 100% rename from open_spiel/games/amazons.h rename to open_spiel/games/amazons/amazons.h diff --git a/open_spiel/games/amazons_test.cc b/open_spiel/games/amazons/amazons_test.cc similarity index 99% rename from open_spiel/games/amazons_test.cc rename to open_spiel/games/amazons/amazons_test.cc index c522646c3b..9a5284155e 100644 --- a/open_spiel/games/amazons_test.cc +++ b/open_spiel/games/amazons/amazons_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/amazons.h" +#include "open_spiel/games/amazons/amazons.h" #include #include diff --git a/open_spiel/games/backgammon.cc b/open_spiel/games/backgammon/backgammon.cc similarity index 99% rename from open_spiel/games/backgammon.cc rename to open_spiel/games/backgammon/backgammon.cc index b2e11036d0..1b66d31f8f 100644 --- a/open_spiel/games/backgammon.cc +++ b/open_spiel/games/backgammon/backgammon.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/backgammon.h" +#include "open_spiel/games/backgammon/backgammon.h" #include #include diff --git a/open_spiel/games/backgammon.h b/open_spiel/games/backgammon/backgammon.h similarity index 100% rename from open_spiel/games/backgammon.h rename to open_spiel/games/backgammon/backgammon.h diff --git a/open_spiel/games/backgammon_test.cc b/open_spiel/games/backgammon/backgammon_test.cc similarity index 99% rename from open_spiel/games/backgammon_test.cc rename to open_spiel/games/backgammon/backgammon_test.cc index 4283d18151..8f737d9917 100644 --- a/open_spiel/games/backgammon_test.cc +++ b/open_spiel/games/backgammon/backgammon_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/backgammon.h" +#include "open_spiel/games/backgammon/backgammon.h" #include #include diff --git a/open_spiel/games/bargaining.cc b/open_spiel/games/bargaining/bargaining.cc similarity index 99% rename from open_spiel/games/bargaining.cc rename to open_spiel/games/bargaining/bargaining.cc index 5390ebd27d..a67ad0a6d7 100644 --- a/open_spiel/games/bargaining.cc +++ b/open_spiel/games/bargaining/bargaining.cc @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/bargaining.h" +#include "open_spiel/games/bargaining/bargaining.h" #include #include diff --git a/open_spiel/games/bargaining.h b/open_spiel/games/bargaining/bargaining.h similarity index 100% rename from open_spiel/games/bargaining.h rename to open_spiel/games/bargaining/bargaining.h diff --git a/open_spiel/games/bargaining_instance_generator.cc b/open_spiel/games/bargaining/bargaining_instance_generator.cc similarity index 98% rename from open_spiel/games/bargaining_instance_generator.cc rename to open_spiel/games/bargaining/bargaining_instance_generator.cc index 7205917d2e..de2bcc519d 100644 --- a/open_spiel/games/bargaining_instance_generator.cc +++ b/open_spiel/games/bargaining/bargaining_instance_generator.cc @@ -24,7 +24,7 @@ #include "open_spiel/abseil-cpp/absl/flags/flag.h" #include "open_spiel/abseil-cpp/absl/flags/parse.h" #include "open_spiel/abseil-cpp/absl/random/distributions.h" -#include "open_spiel/games/bargaining.h" +#include "open_spiel/games/bargaining/bargaining.h" #include "open_spiel/utils/file.h" #include "open_spiel/utils/init.h" diff --git a/open_spiel/games/bargaining_instances1000.txt b/open_spiel/games/bargaining/bargaining_instances1000.txt similarity index 100% rename from open_spiel/games/bargaining_instances1000.txt rename to open_spiel/games/bargaining/bargaining_instances1000.txt diff --git a/open_spiel/games/bargaining_test.cc b/open_spiel/games/bargaining/bargaining_test.cc similarity index 99% rename from open_spiel/games/bargaining_test.cc rename to open_spiel/games/bargaining/bargaining_test.cc index 0ca71aae0b..c9e53bdd88 100644 --- a/open_spiel/games/bargaining_test.cc +++ b/open_spiel/games/bargaining/bargaining_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/bargaining.h" +#include "open_spiel/games/bargaining/bargaining.h" #include #include diff --git a/open_spiel/games/battleship.cc b/open_spiel/games/battleship/battleship.cc similarity index 99% rename from open_spiel/games/battleship.cc rename to open_spiel/games/battleship/battleship.cc index 006113c788..0e7fc7c2d3 100644 --- a/open_spiel/games/battleship.cc +++ b/open_spiel/games/battleship/battleship.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/battleship.h" +#include "open_spiel/games/battleship/battleship.h" #include "open_spiel/abseil-cpp/absl/strings/ascii.h" #include "open_spiel/abseil-cpp/absl/strings/numbers.h" diff --git a/open_spiel/games/battleship.h b/open_spiel/games/battleship/battleship.h similarity index 99% rename from open_spiel/games/battleship.h rename to open_spiel/games/battleship/battleship.h index 9fca1e9c9d..6cf45df4b8 100644 --- a/open_spiel/games/battleship.h +++ b/open_spiel/games/battleship/battleship.h @@ -162,7 +162,7 @@ #include #include -#include "open_spiel/games/battleship_types.h" +#include "open_spiel/games/battleship/battleship_types.h" #include "open_spiel/spiel.h" namespace open_spiel { diff --git a/open_spiel/games/battleship_test.cc b/open_spiel/games/battleship/battleship_test.cc similarity index 99% rename from open_spiel/games/battleship_test.cc rename to open_spiel/games/battleship/battleship_test.cc index e2b0d07449..71e860571b 100644 --- a/open_spiel/games/battleship_test.cc +++ b/open_spiel/games/battleship/battleship_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/battleship.h" +#include "open_spiel/games/battleship/battleship.h" #include #include diff --git a/open_spiel/games/battleship_types.cc b/open_spiel/games/battleship/battleship_types.cc similarity index 99% rename from open_spiel/games/battleship_types.cc rename to open_spiel/games/battleship/battleship_types.cc index 5ac2932597..34ee7eacea 100644 --- a/open_spiel/games/battleship_types.cc +++ b/open_spiel/games/battleship/battleship_types.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/battleship_types.h" +#include "open_spiel/games/battleship/battleship_types.h" namespace open_spiel { namespace battleship { diff --git a/open_spiel/games/battleship_types.h b/open_spiel/games/battleship/battleship_types.h similarity index 100% rename from open_spiel/games/battleship_types.h rename to open_spiel/games/battleship/battleship_types.h diff --git a/open_spiel/games/blackjack.cc b/open_spiel/games/blackjack/blackjack.cc similarity index 99% rename from open_spiel/games/blackjack.cc rename to open_spiel/games/blackjack/blackjack.cc index 4c39c0c51b..b63b7696fb 100644 --- a/open_spiel/games/blackjack.cc +++ b/open_spiel/games/blackjack/blackjack.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/blackjack.h" +#include "open_spiel/games/blackjack/blackjack.h" #include diff --git a/open_spiel/games/blackjack.h b/open_spiel/games/blackjack/blackjack.h similarity index 100% rename from open_spiel/games/blackjack.h rename to open_spiel/games/blackjack/blackjack.h diff --git a/open_spiel/games/blackjack_test.cc b/open_spiel/games/blackjack/blackjack_test.cc similarity index 98% rename from open_spiel/games/blackjack_test.cc rename to open_spiel/games/blackjack/blackjack_test.cc index a28f7ba58b..d4daaa682e 100644 --- a/open_spiel/games/blackjack_test.cc +++ b/open_spiel/games/blackjack/blackjack_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/blackjack.h" +#include "open_spiel/games/blackjack/blackjack.h" #include "open_spiel/spiel_utils.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/blotto.cc b/open_spiel/games/blotto/blotto.cc similarity index 99% rename from open_spiel/games/blotto.cc rename to open_spiel/games/blotto/blotto.cc index 821c267f20..6741398fec 100644 --- a/open_spiel/games/blotto.cc +++ b/open_spiel/games/blotto/blotto.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/blotto.h" +#include "open_spiel/games/blotto/blotto.h" #include diff --git a/open_spiel/games/blotto.h b/open_spiel/games/blotto/blotto.h similarity index 100% rename from open_spiel/games/blotto.h rename to open_spiel/games/blotto/blotto.h diff --git a/open_spiel/games/blotto_test.cc b/open_spiel/games/blotto/blotto_test.cc similarity index 100% rename from open_spiel/games/blotto_test.cc rename to open_spiel/games/blotto/blotto_test.cc diff --git a/open_spiel/games/breakthrough.cc b/open_spiel/games/breakthrough/breakthrough.cc similarity index 99% rename from open_spiel/games/breakthrough.cc rename to open_spiel/games/breakthrough/breakthrough.cc index 1b35a5e862..c440c2abe8 100644 --- a/open_spiel/games/breakthrough.cc +++ b/open_spiel/games/breakthrough/breakthrough.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/breakthrough.h" +#include "open_spiel/games/breakthrough/breakthrough.h" #include #include diff --git a/open_spiel/games/breakthrough.h b/open_spiel/games/breakthrough/breakthrough.h similarity index 100% rename from open_spiel/games/breakthrough.h rename to open_spiel/games/breakthrough/breakthrough.h diff --git a/open_spiel/games/breakthrough_test.cc b/open_spiel/games/breakthrough/breakthrough_test.cc similarity index 96% rename from open_spiel/games/breakthrough_test.cc rename to open_spiel/games/breakthrough/breakthrough_test.cc index e013699218..30007c8eb6 100644 --- a/open_spiel/games/breakthrough_test.cc +++ b/open_spiel/games/breakthrough/breakthrough_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/breakthrough.h" +#include "open_spiel/games/breakthrough/breakthrough.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/bridge.cc b/open_spiel/games/bridge/bridge.cc similarity index 99% rename from open_spiel/games/bridge.cc rename to open_spiel/games/bridge/bridge.cc index 622f800a0b..bcedebab0c 100644 --- a/open_spiel/games/bridge.cc +++ b/open_spiel/games/bridge/bridge.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/bridge.h" +#include "open_spiel/games/bridge/bridge.h" #include #include diff --git a/open_spiel/games/bridge.h b/open_spiel/games/bridge/bridge.h similarity index 100% rename from open_spiel/games/bridge.h rename to open_spiel/games/bridge/bridge.h diff --git a/open_spiel/games/bridge_test.cc b/open_spiel/games/bridge/bridge_test.cc similarity index 97% rename from open_spiel/games/bridge_test.cc rename to open_spiel/games/bridge/bridge_test.cc index 07e1696788..7635573b5d 100644 --- a/open_spiel/games/bridge_test.cc +++ b/open_spiel/games/bridge/bridge_test.cc @@ -12,11 +12,11 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/bridge.h" +#include "open_spiel/games/bridge/bridge.h" #include "open_spiel/abseil-cpp/absl/strings/str_replace.h" #include "open_spiel/games/bridge/bridge_scoring.h" -#include "open_spiel/games/bridge_uncontested_bidding.h" +#include "open_spiel/games/bridge/bridge_uncontested_bidding.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/bridge_uncontested_bidding.cc b/open_spiel/games/bridge/bridge_uncontested_bidding.cc similarity index 99% rename from open_spiel/games/bridge_uncontested_bidding.cc rename to open_spiel/games/bridge/bridge_uncontested_bidding.cc index ade45e7fd5..42400034f9 100644 --- a/open_spiel/games/bridge_uncontested_bidding.cc +++ b/open_spiel/games/bridge/bridge_uncontested_bidding.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/bridge_uncontested_bidding.h" +#include "open_spiel/games/bridge/bridge_uncontested_bidding.h" #include #include diff --git a/open_spiel/games/bridge_uncontested_bidding.h b/open_spiel/games/bridge/bridge_uncontested_bidding.h similarity index 100% rename from open_spiel/games/bridge_uncontested_bidding.h rename to open_spiel/games/bridge/bridge_uncontested_bidding.h diff --git a/open_spiel/games/catch.cc b/open_spiel/games/catch/catch.cc similarity index 99% rename from open_spiel/games/catch.cc rename to open_spiel/games/catch/catch.cc index 39fb9a0b26..4af42f3149 100644 --- a/open_spiel/games/catch.cc +++ b/open_spiel/games/catch/catch.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/catch.h" +#include "open_spiel/games/catch/catch.h" #include #include diff --git a/open_spiel/games/catch.h b/open_spiel/games/catch/catch.h similarity index 100% rename from open_spiel/games/catch.h rename to open_spiel/games/catch/catch.h diff --git a/open_spiel/games/catch_test.cc b/open_spiel/games/catch/catch_test.cc similarity index 98% rename from open_spiel/games/catch_test.cc rename to open_spiel/games/catch/catch_test.cc index 78ee43e7fc..85368a4135 100644 --- a/open_spiel/games/catch_test.cc +++ b/open_spiel/games/catch/catch_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/catch.h" +#include "open_spiel/games/catch/catch.h" #include "open_spiel/algorithms/get_all_states.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/checkers.cc b/open_spiel/games/checkers/checkers.cc similarity index 99% rename from open_spiel/games/checkers.cc rename to open_spiel/games/checkers/checkers.cc index 8d9a14e3c7..ab9c635d37 100644 --- a/open_spiel/games/checkers.cc +++ b/open_spiel/games/checkers/checkers.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/checkers.h" +#include "open_spiel/games/checkers/checkers.h" #include #include diff --git a/open_spiel/games/checkers.h b/open_spiel/games/checkers/checkers.h similarity index 100% rename from open_spiel/games/checkers.h rename to open_spiel/games/checkers/checkers.h diff --git a/open_spiel/games/checkers_test.cc b/open_spiel/games/checkers/checkers_test.cc similarity index 99% rename from open_spiel/games/checkers_test.cc rename to open_spiel/games/checkers/checkers_test.cc index 240ede6ba4..4545c8425d 100644 --- a/open_spiel/games/checkers_test.cc +++ b/open_spiel/games/checkers/checkers_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/checkers.h" +#include "open_spiel/games/checkers/checkers.h" #include "open_spiel/abseil-cpp/absl/types/optional.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/chess.cc b/open_spiel/games/chess/chess.cc similarity index 99% rename from open_spiel/games/chess.cc rename to open_spiel/games/chess/chess.cc index b25a520d56..dda921107b 100644 --- a/open_spiel/games/chess.cc +++ b/open_spiel/games/chess/chess.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/abseil-cpp/absl/algorithm/container.h" #include "open_spiel/abseil-cpp/absl/types/optional.h" diff --git a/open_spiel/games/chess.h b/open_spiel/games/chess/chess.h similarity index 100% rename from open_spiel/games/chess.h rename to open_spiel/games/chess/chess.h diff --git a/open_spiel/games/chess_test.cc b/open_spiel/games/chess/chess_test.cc similarity index 99% rename from open_spiel/games/chess_test.cc rename to open_spiel/games/chess/chess_test.cc index 119d7f5405..1422196ced 100644 --- a/open_spiel/games/chess_test.cc +++ b/open_spiel/games/chess/chess_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include #include diff --git a/open_spiel/games/cliff_walking.cc b/open_spiel/games/cliff_walking/cliff_walking.cc similarity index 99% rename from open_spiel/games/cliff_walking.cc rename to open_spiel/games/cliff_walking/cliff_walking.cc index dffd582366..5f46f09c28 100644 --- a/open_spiel/games/cliff_walking.cc +++ b/open_spiel/games/cliff_walking/cliff_walking.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/cliff_walking.h" +#include "open_spiel/games/cliff_walking/cliff_walking.h" #include #include diff --git a/open_spiel/games/cliff_walking.h b/open_spiel/games/cliff_walking/cliff_walking.h similarity index 100% rename from open_spiel/games/cliff_walking.h rename to open_spiel/games/cliff_walking/cliff_walking.h diff --git a/open_spiel/games/cliff_walking_test.cc b/open_spiel/games/cliff_walking/cliff_walking_test.cc similarity index 95% rename from open_spiel/games/cliff_walking_test.cc rename to open_spiel/games/cliff_walking/cliff_walking_test.cc index acc111140c..f214e0fba1 100644 --- a/open_spiel/games/cliff_walking_test.cc +++ b/open_spiel/games/cliff_walking/cliff_walking_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/cliff_walking.h" +#include "open_spiel/games/cliff_walking/cliff_walking.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/clobber.cc b/open_spiel/games/clobber/clobber.cc similarity index 99% rename from open_spiel/games/clobber.cc rename to open_spiel/games/clobber/clobber.cc index 746e358b3d..520358273b 100644 --- a/open_spiel/games/clobber.cc +++ b/open_spiel/games/clobber/clobber.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/clobber.h" +#include "open_spiel/games/clobber/clobber.h" #include #include diff --git a/open_spiel/games/clobber.h b/open_spiel/games/clobber/clobber.h similarity index 100% rename from open_spiel/games/clobber.h rename to open_spiel/games/clobber/clobber.h diff --git a/open_spiel/games/clobber_test.cc b/open_spiel/games/clobber/clobber_test.cc similarity index 98% rename from open_spiel/games/clobber_test.cc rename to open_spiel/games/clobber/clobber_test.cc index 3fd6d6fa92..d5adaf35df 100644 --- a/open_spiel/games/clobber_test.cc +++ b/open_spiel/games/clobber/clobber_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/clobber.h" +#include "open_spiel/games/clobber/clobber.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/coin_game.cc b/open_spiel/games/coin_game/coin_game.cc similarity index 99% rename from open_spiel/games/coin_game.cc rename to open_spiel/games/coin_game/coin_game.cc index 2855d799d6..543f19a248 100644 --- a/open_spiel/games/coin_game.cc +++ b/open_spiel/games/coin_game/coin_game.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/coin_game.h" +#include "open_spiel/games/coin_game/coin_game.h" #include diff --git a/open_spiel/games/coin_game.h b/open_spiel/games/coin_game/coin_game.h similarity index 100% rename from open_spiel/games/coin_game.h rename to open_spiel/games/coin_game/coin_game.h diff --git a/open_spiel/games/coin_game_test.cc b/open_spiel/games/coin_game/coin_game_test.cc similarity index 100% rename from open_spiel/games/coin_game_test.cc rename to open_spiel/games/coin_game/coin_game_test.cc diff --git a/open_spiel/games/colored_trails.cc b/open_spiel/games/colored_trails/colored_trails.cc similarity index 99% rename from open_spiel/games/colored_trails.cc rename to open_spiel/games/colored_trails/colored_trails.cc index 487372e5b2..593440a35a 100644 --- a/open_spiel/games/colored_trails.cc +++ b/open_spiel/games/colored_trails/colored_trails.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/colored_trails.h" +#include "open_spiel/games/colored_trails/colored_trails.h" #include #include diff --git a/open_spiel/games/colored_trails.h b/open_spiel/games/colored_trails/colored_trails.h similarity index 100% rename from open_spiel/games/colored_trails.h rename to open_spiel/games/colored_trails/colored_trails.h diff --git a/open_spiel/games/colored_trails/colored_trails_board_generator.cc b/open_spiel/games/colored_trails/colored_trails_board_generator.cc index 9e3eafafcb..3d110fb92b 100644 --- a/open_spiel/games/colored_trails/colored_trails_board_generator.cc +++ b/open_spiel/games/colored_trails/colored_trails_board_generator.cc @@ -23,7 +23,7 @@ #include "open_spiel/abseil-cpp/absl/flags/flag.h" #include "open_spiel/abseil-cpp/absl/flags/parse.h" #include "open_spiel/abseil-cpp/absl/random/distributions.h" -#include "open_spiel/games/colored_trails.h" +#include "open_spiel/games/colored_trails/colored_trails.h" #include "open_spiel/utils/file.h" #include "open_spiel/utils/init.h" diff --git a/open_spiel/games/colored_trails_test.cc b/open_spiel/games/colored_trails/colored_trails_test.cc similarity index 95% rename from open_spiel/games/colored_trails_test.cc rename to open_spiel/games/colored_trails/colored_trails_test.cc index a6701da2f9..114775795b 100644 --- a/open_spiel/games/colored_trails_test.cc +++ b/open_spiel/games/colored_trails/colored_trails_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/colored_trails.h" +#include "open_spiel/games/colored_trails/colored_trails.h" #include #include diff --git a/open_spiel/games/colored_trails/colored_trails_utils.cc b/open_spiel/games/colored_trails/colored_trails_utils.cc index a5deee5279..8b3742c80b 100644 --- a/open_spiel/games/colored_trails/colored_trails_utils.cc +++ b/open_spiel/games/colored_trails/colored_trails_utils.cc @@ -17,7 +17,7 @@ #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" #include "open_spiel/abseil-cpp/absl/strings/str_split.h" -#include "open_spiel/games/colored_trails.h" +#include "open_spiel/games/colored_trails/colored_trails.h" #include "open_spiel/utils/file.h" namespace open_spiel { diff --git a/open_spiel/games/connect_four.cc b/open_spiel/games/connect_four/connect_four.cc similarity index 99% rename from open_spiel/games/connect_four.cc rename to open_spiel/games/connect_four/connect_four.cc index 88bf21cfbd..28a7036904 100644 --- a/open_spiel/games/connect_four.cc +++ b/open_spiel/games/connect_four/connect_four.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/connect_four.h" +#include "open_spiel/games/connect_four/connect_four.h" #include #include diff --git a/open_spiel/games/connect_four.h b/open_spiel/games/connect_four/connect_four.h similarity index 100% rename from open_spiel/games/connect_four.h rename to open_spiel/games/connect_four/connect_four.h diff --git a/open_spiel/games/connect_four_test.cc b/open_spiel/games/connect_four/connect_four_test.cc similarity index 98% rename from open_spiel/games/connect_four_test.cc rename to open_spiel/games/connect_four/connect_four_test.cc index c58aba82cb..2d644f95d8 100644 --- a/open_spiel/games/connect_four_test.cc +++ b/open_spiel/games/connect_four/connect_four_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/connect_four.h" +#include "open_spiel/games/connect_four/connect_four.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/coop_box_pushing.cc b/open_spiel/games/coop_box_pushing/coop_box_pushing.cc similarity index 99% rename from open_spiel/games/coop_box_pushing.cc rename to open_spiel/games/coop_box_pushing/coop_box_pushing.cc index ebdfed1986..3ebb069d8d 100644 --- a/open_spiel/games/coop_box_pushing.cc +++ b/open_spiel/games/coop_box_pushing/coop_box_pushing.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/coop_box_pushing.h" +#include "open_spiel/games/coop_box_pushing/coop_box_pushing.h" #include #include diff --git a/open_spiel/games/coop_box_pushing.h b/open_spiel/games/coop_box_pushing/coop_box_pushing.h similarity index 100% rename from open_spiel/games/coop_box_pushing.h rename to open_spiel/games/coop_box_pushing/coop_box_pushing.h diff --git a/open_spiel/games/coop_box_pushing_test.cc b/open_spiel/games/coop_box_pushing/coop_box_pushing_test.cc similarity index 94% rename from open_spiel/games/coop_box_pushing_test.cc rename to open_spiel/games/coop_box_pushing/coop_box_pushing_test.cc index a3e8889305..0e189cecae 100644 --- a/open_spiel/games/coop_box_pushing_test.cc +++ b/open_spiel/games/coop_box_pushing/coop_box_pushing_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/coop_box_pushing.h" +#include "open_spiel/games/coop_box_pushing/coop_box_pushing.h" #include "open_spiel/spiel_utils.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/coordinated_mp.cc b/open_spiel/games/coordinated_mp/coordinated_mp.cc similarity index 99% rename from open_spiel/games/coordinated_mp.cc rename to open_spiel/games/coordinated_mp/coordinated_mp.cc index be4f67933d..be9094a792 100644 --- a/open_spiel/games/coordinated_mp.cc +++ b/open_spiel/games/coordinated_mp/coordinated_mp.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/coordinated_mp.h" +#include "open_spiel/games/coordinated_mp/coordinated_mp.h" #include #include diff --git a/open_spiel/games/coordinated_mp.h b/open_spiel/games/coordinated_mp/coordinated_mp.h similarity index 100% rename from open_spiel/games/coordinated_mp.h rename to open_spiel/games/coordinated_mp/coordinated_mp.h diff --git a/open_spiel/games/coordinated_mp_test.cc b/open_spiel/games/coordinated_mp/coordinated_mp_test.cc similarity index 96% rename from open_spiel/games/coordinated_mp_test.cc rename to open_spiel/games/coordinated_mp/coordinated_mp_test.cc index 1825fdb30a..777ce55212 100644 --- a/open_spiel/games/coordinated_mp_test.cc +++ b/open_spiel/games/coordinated_mp/coordinated_mp_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/coordinated_mp.h" +#include "open_spiel/games/coordinated_mp/coordinated_mp.h" #include "open_spiel/algorithms/get_all_states.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/crazy_eights.cc b/open_spiel/games/crazy_eights/crazy_eights.cc similarity index 99% rename from open_spiel/games/crazy_eights.cc rename to open_spiel/games/crazy_eights/crazy_eights.cc index d4de4bc2d0..af869fd603 100644 --- a/open_spiel/games/crazy_eights.cc +++ b/open_spiel/games/crazy_eights/crazy_eights.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/crazy_eights.h" +#include "open_spiel/games/crazy_eights/crazy_eights.h" #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" #include "open_spiel/abseil-cpp/absl/strings/str_format.h" diff --git a/open_spiel/games/crazy_eights.h b/open_spiel/games/crazy_eights/crazy_eights.h similarity index 100% rename from open_spiel/games/crazy_eights.h rename to open_spiel/games/crazy_eights/crazy_eights.h diff --git a/open_spiel/games/crazy_eights_test.cc b/open_spiel/games/crazy_eights/crazy_eights_test.cc similarity index 98% rename from open_spiel/games/crazy_eights_test.cc rename to open_spiel/games/crazy_eights/crazy_eights_test.cc index 545acbc9eb..b8494dc67a 100644 --- a/open_spiel/games/crazy_eights_test.cc +++ b/open_spiel/games/crazy_eights/crazy_eights_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/crazy_eights.h" +#include "open_spiel/games/crazy_eights/crazy_eights.h" #include "open_spiel/abseil-cpp/absl/strings/str_format.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/cursor_go.cc b/open_spiel/games/cursor_go/cursor_go.cc similarity index 99% rename from open_spiel/games/cursor_go.cc rename to open_spiel/games/cursor_go/cursor_go.cc index b79d4a50f1..5d8adc32a0 100644 --- a/open_spiel/games/cursor_go.cc +++ b/open_spiel/games/cursor_go/cursor_go.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/cursor_go.h" +#include "open_spiel/games/cursor_go/cursor_go.h" #include diff --git a/open_spiel/games/cursor_go.h b/open_spiel/games/cursor_go/cursor_go.h similarity index 100% rename from open_spiel/games/cursor_go.h rename to open_spiel/games/cursor_go/cursor_go.h diff --git a/open_spiel/games/cursor_go_test.cc b/open_spiel/games/cursor_go/cursor_go_test.cc similarity index 96% rename from open_spiel/games/cursor_go_test.cc rename to open_spiel/games/cursor_go/cursor_go_test.cc index 8bdb2d5a68..0818b43659 100644 --- a/open_spiel/games/cursor_go_test.cc +++ b/open_spiel/games/cursor_go/cursor_go_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/cursor_go.h" +#include "open_spiel/games/cursor_go/cursor_go.h" #include "open_spiel/games/go/go_board.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/dark_chess.cc b/open_spiel/games/dark_chess/dark_chess.cc similarity index 99% rename from open_spiel/games/dark_chess.cc rename to open_spiel/games/dark_chess/dark_chess.cc index d8febb6839..a0af763b38 100644 --- a/open_spiel/games/dark_chess.cc +++ b/open_spiel/games/dark_chess/dark_chess.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/dark_chess.h" +#include "open_spiel/games/dark_chess/dark_chess.h" #include #include diff --git a/open_spiel/games/dark_chess.h b/open_spiel/games/dark_chess/dark_chess.h similarity index 99% rename from open_spiel/games/dark_chess.h rename to open_spiel/games/dark_chess/dark_chess.h index 12d4a1cace..7e485abe01 100644 --- a/open_spiel/games/dark_chess.h +++ b/open_spiel/games/dark_chess/dark_chess.h @@ -24,7 +24,7 @@ #include "open_spiel/abseil-cpp/absl/algorithm/container.h" #include "open_spiel/abseil-cpp/absl/container/flat_hash_map.h" -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/games/chess/chess_board.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/dark_chess_test.cc b/open_spiel/games/dark_chess/dark_chess_test.cc similarity index 100% rename from open_spiel/games/dark_chess_test.cc rename to open_spiel/games/dark_chess/dark_chess_test.cc diff --git a/open_spiel/games/dark_hex.cc b/open_spiel/games/dark_hex/dark_hex.cc similarity index 99% rename from open_spiel/games/dark_hex.cc rename to open_spiel/games/dark_hex/dark_hex.cc index 8acc7e016b..018199bb96 100644 --- a/open_spiel/games/dark_hex.cc +++ b/open_spiel/games/dark_hex/dark_hex.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/dark_hex.h" +#include "open_spiel/games/dark_hex/dark_hex.h" #include #include #include #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" -#include "open_spiel/games/hex.h" +#include "open_spiel/games/hex/hex.h" #include "open_spiel/spiel_utils.h" namespace open_spiel { diff --git a/open_spiel/games/dark_hex.h b/open_spiel/games/dark_hex/dark_hex.h similarity index 99% rename from open_spiel/games/dark_hex.h rename to open_spiel/games/dark_hex/dark_hex.h index 7e6e10dc7c..5c7891aad7 100644 --- a/open_spiel/games/dark_hex.h +++ b/open_spiel/games/dark_hex/dark_hex.h @@ -22,7 +22,7 @@ #include #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" -#include "open_spiel/games/hex.h" +#include "open_spiel/games/hex/hex.h" #include "open_spiel/spiel.h" // Dark Hex (Some versions also called Phantom Hex or Kriegspiel Hex) is an diff --git a/open_spiel/games/dark_hex_test.cc b/open_spiel/games/dark_hex/dark_hex_test.cc similarity index 100% rename from open_spiel/games/dark_hex_test.cc rename to open_spiel/games/dark_hex/dark_hex_test.cc diff --git a/open_spiel/games/deep_sea.cc b/open_spiel/games/deep_sea/deep_sea.cc similarity index 99% rename from open_spiel/games/deep_sea.cc rename to open_spiel/games/deep_sea/deep_sea.cc index 101b536758..6aac4805af 100644 --- a/open_spiel/games/deep_sea.cc +++ b/open_spiel/games/deep_sea/deep_sea.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/deep_sea.h" +#include "open_spiel/games/deep_sea/deep_sea.h" #include #include diff --git a/open_spiel/games/deep_sea.h b/open_spiel/games/deep_sea/deep_sea.h similarity index 100% rename from open_spiel/games/deep_sea.h rename to open_spiel/games/deep_sea/deep_sea.h diff --git a/open_spiel/games/deep_sea_test.cc b/open_spiel/games/deep_sea/deep_sea_test.cc similarity index 96% rename from open_spiel/games/deep_sea_test.cc rename to open_spiel/games/deep_sea/deep_sea_test.cc index d0e84437a1..bf5748c9eb 100644 --- a/open_spiel/games/deep_sea_test.cc +++ b/open_spiel/games/deep_sea/deep_sea_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/deep_sea.h" +#include "open_spiel/games/deep_sea/deep_sea.h" #include "open_spiel/algorithms/get_all_states.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/dou_dizhu.cc b/open_spiel/games/dou_dizhu/dou_dizhu.cc similarity index 99% rename from open_spiel/games/dou_dizhu.cc rename to open_spiel/games/dou_dizhu/dou_dizhu.cc index cf5ab287b7..61ac7487d2 100644 --- a/open_spiel/games/dou_dizhu.cc +++ b/open_spiel/games/dou_dizhu/dou_dizhu.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/dou_dizhu.h" +#include "open_spiel/games/dou_dizhu/dou_dizhu.h" #include diff --git a/open_spiel/games/dou_dizhu.h b/open_spiel/games/dou_dizhu/dou_dizhu.h similarity index 100% rename from open_spiel/games/dou_dizhu.h rename to open_spiel/games/dou_dizhu/dou_dizhu.h diff --git a/open_spiel/games/dou_dizhu_test.cc b/open_spiel/games/dou_dizhu/dou_dizhu_test.cc similarity index 95% rename from open_spiel/games/dou_dizhu_test.cc rename to open_spiel/games/dou_dizhu/dou_dizhu_test.cc index e0e69eefbf..a8b9332dcd 100644 --- a/open_spiel/games/dou_dizhu_test.cc +++ b/open_spiel/games/dou_dizhu/dou_dizhu_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/dou_dizhu.h" +#include "open_spiel/games/dou_dizhu/dou_dizhu.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/efg_game.cc b/open_spiel/games/efg_game/efg_game.cc similarity index 99% rename from open_spiel/games/efg_game.cc rename to open_spiel/games/efg_game/efg_game.cc index 0be06a7393..254e77c93c 100644 --- a/open_spiel/games/efg_game.cc +++ b/open_spiel/games/efg_game/efg_game.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/efg_game.h" +#include "open_spiel/games/efg_game/efg_game.h" #include #include diff --git a/open_spiel/games/efg_game.h b/open_spiel/games/efg_game/efg_game.h similarity index 100% rename from open_spiel/games/efg_game.h rename to open_spiel/games/efg_game/efg_game.h diff --git a/open_spiel/games/efg_game_data.cc b/open_spiel/games/efg_game/efg_game_data.cc similarity index 99% rename from open_spiel/games/efg_game_data.cc rename to open_spiel/games/efg_game/efg_game_data.cc index 07a99aba80..44c78ed9eb 100644 --- a/open_spiel/games/efg_game_data.cc +++ b/open_spiel/games/efg_game/efg_game_data.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/efg_game_data.h" +#include "open_spiel/games/efg_game/efg_game_data.h" namespace open_spiel { namespace efg_game { diff --git a/open_spiel/games/efg_game_data.h b/open_spiel/games/efg_game/efg_game_data.h similarity index 96% rename from open_spiel/games/efg_game_data.h rename to open_spiel/games/efg_game/efg_game_data.h index cd6bbb4503..81b36239ef 100644 --- a/open_spiel/games/efg_game_data.h +++ b/open_spiel/games/efg_game/efg_game_data.h @@ -17,7 +17,7 @@ #include -#include "open_spiel/games/efg_game.h" +#include "open_spiel/games/efg_game/efg_game.h" #include "open_spiel/spiel.h" namespace open_spiel { diff --git a/open_spiel/games/efg_game_test.cc b/open_spiel/games/efg_game/efg_game_test.cc similarity index 91% rename from open_spiel/games/efg_game_test.cc rename to open_spiel/games/efg_game/efg_game_test.cc index 16570d2e77..6951e26a75 100644 --- a/open_spiel/games/efg_game_test.cc +++ b/open_spiel/games/efg_game/efg_game_test.cc @@ -12,13 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/efg_game.h" +#include "open_spiel/games/efg_game/efg_game.h" #include #include #include "open_spiel/abseil-cpp/absl/types/optional.h" -#include "open_spiel/games/efg_game_data.h" +#include "open_spiel/games/efg_game/efg_game_data.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" #include "open_spiel/tests/basic_tests.h" @@ -30,23 +30,20 @@ namespace { namespace testing = open_spiel::testing; +#define EFG_PATH_PREFIX "open_spiel/games/efg_game/games/" // Sample game from Gambit -const char* kCommasFilename = "third_party/open_spiel/games/efg/commas.efg"; - -const char* kSampleFilename = "third_party/open_spiel/games/efg/sample.efg"; -const char* kKuhnFilename = "third_party/open_spiel/games/efg/kuhn_poker.efg"; -const char* kLeducFilename = "third_party/open_spiel/games/efg/leduc_poker.efg"; -const char* kSignalingFilename = - "third_party/open_spiel/games/efg/signaling_vonstengel_forges_2008.efg"; +const char* kCommasFilename = EFG_PATH_PREFIX "commas.efg"; +const char* kSampleFilename = EFG_PATH_PREFIX "sample.efg"; +const char* kKuhnFilename = EFG_PATH_PREFIX "kuhn_poker.efg"; +const char* kLeducFilename = EFG_PATH_PREFIX "leduc_poker.efg"; +const char* kSignalingFilename = EFG_PATH_PREFIX + "signaling_vonstengel_forges_2008.efg"; // Example games from Morrill et al. // "Hindsight and Sequential Rationality of Correlated Play" -const char* kExtendedBosFilename = - "third_party/open_spiel/games/efg/extended_bos.efg"; -const char* kExtendedMPFilename = - "third_party/open_spiel/games/efg/extended_mp.efg"; -const char* kExtendedShapleysFilename = - "third_party/open_spiel/games/efg/extended_shapleys.efg"; +const char* kExtendedBosFilename = EFG_PATH_PREFIX "extended_bos.efg"; +const char* kExtendedMPFilename = EFG_PATH_PREFIX "extended_mp.efg"; +const char* kExtendedShapleysFilename = EFG_PATH_PREFIX "extended_shapleys.efg"; void EFGGameSimTestsSampleFromData() { std::shared_ptr game = LoadEFGGame(GetSampleEFGData()); diff --git a/open_spiel/games/efg/README.md b/open_spiel/games/efg_game/games/README.md similarity index 100% rename from open_spiel/games/efg/README.md rename to open_spiel/games/efg_game/games/README.md diff --git a/open_spiel/games/efg/commas.efg b/open_spiel/games/efg_game/games/commas.efg similarity index 100% rename from open_spiel/games/efg/commas.efg rename to open_spiel/games/efg_game/games/commas.efg diff --git a/open_spiel/games/efg/extended_bos.efg b/open_spiel/games/efg_game/games/extended_bos.efg similarity index 100% rename from open_spiel/games/efg/extended_bos.efg rename to open_spiel/games/efg_game/games/extended_bos.efg diff --git a/open_spiel/games/efg/extended_mp.efg b/open_spiel/games/efg_game/games/extended_mp.efg similarity index 100% rename from open_spiel/games/efg/extended_mp.efg rename to open_spiel/games/efg_game/games/extended_mp.efg diff --git a/open_spiel/games/efg/extended_shapleys.efg b/open_spiel/games/efg_game/games/extended_shapleys.efg similarity index 100% rename from open_spiel/games/efg/extended_shapleys.efg rename to open_spiel/games/efg_game/games/extended_shapleys.efg diff --git a/open_spiel/games/efg/greenwald_sarfati_example1.efg b/open_spiel/games/efg_game/games/greenwald_sarfati_example1.efg similarity index 100% rename from open_spiel/games/efg/greenwald_sarfati_example1.efg rename to open_spiel/games/efg_game/games/greenwald_sarfati_example1.efg diff --git a/open_spiel/games/efg/greenwald_sarfati_example2.efg b/open_spiel/games/efg_game/games/greenwald_sarfati_example2.efg similarity index 100% rename from open_spiel/games/efg/greenwald_sarfati_example2.efg rename to open_spiel/games/efg_game/games/greenwald_sarfati_example2.efg diff --git a/open_spiel/games/efg/kuhn_poker.efg b/open_spiel/games/efg_game/games/kuhn_poker.efg similarity index 100% rename from open_spiel/games/efg/kuhn_poker.efg rename to open_spiel/games/efg_game/games/kuhn_poker.efg diff --git a/open_spiel/games/efg/leduc_poker.efg b/open_spiel/games/efg_game/games/leduc_poker.efg similarity index 100% rename from open_spiel/games/efg/leduc_poker.efg rename to open_spiel/games/efg_game/games/leduc_poker.efg diff --git a/open_spiel/games/efg/sample.efg b/open_spiel/games/efg_game/games/sample.efg similarity index 100% rename from open_spiel/games/efg/sample.efg rename to open_spiel/games/efg_game/games/sample.efg diff --git a/open_spiel/games/efg/signaling_vonstengel_forges_2008.efg b/open_spiel/games/efg_game/games/signaling_vonstengel_forges_2008.efg similarity index 100% rename from open_spiel/games/efg/signaling_vonstengel_forges_2008.efg rename to open_spiel/games/efg_game/games/signaling_vonstengel_forges_2008.efg diff --git a/open_spiel/games/euchre.cc b/open_spiel/games/euchre/euchre.cc similarity index 99% rename from open_spiel/games/euchre.cc rename to open_spiel/games/euchre/euchre.cc index 8d537d1fdc..c7562b8d53 100644 --- a/open_spiel/games/euchre.cc +++ b/open_spiel/games/euchre/euchre.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/euchre.h" +#include "open_spiel/games/euchre/euchre.h" #include #include diff --git a/open_spiel/games/euchre.h b/open_spiel/games/euchre/euchre.h similarity index 100% rename from open_spiel/games/euchre.h rename to open_spiel/games/euchre/euchre.h diff --git a/open_spiel/games/euchre_test.cc b/open_spiel/games/euchre/euchre_test.cc similarity index 100% rename from open_spiel/games/euchre_test.cc rename to open_spiel/games/euchre/euchre_test.cc diff --git a/open_spiel/games/first_sealed_auction.cc b/open_spiel/games/first_sealed_auction/first_sealed_auction.cc similarity index 99% rename from open_spiel/games/first_sealed_auction.cc rename to open_spiel/games/first_sealed_auction/first_sealed_auction.cc index f29e1a76fd..432212448d 100644 --- a/open_spiel/games/first_sealed_auction.cc +++ b/open_spiel/games/first_sealed_auction/first_sealed_auction.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/first_sealed_auction.h" +#include "open_spiel/games/first_sealed_auction/first_sealed_auction.h" #include #include diff --git a/open_spiel/games/first_sealed_auction.h b/open_spiel/games/first_sealed_auction/first_sealed_auction.h similarity index 100% rename from open_spiel/games/first_sealed_auction.h rename to open_spiel/games/first_sealed_auction/first_sealed_auction.h diff --git a/open_spiel/games/first_sealed_auction_test.cc b/open_spiel/games/first_sealed_auction/first_sealed_auction_test.cc similarity index 97% rename from open_spiel/games/first_sealed_auction_test.cc rename to open_spiel/games/first_sealed_auction/first_sealed_auction_test.cc index 491a78932a..dd8198111a 100644 --- a/open_spiel/games/first_sealed_auction_test.cc +++ b/open_spiel/games/first_sealed_auction/first_sealed_auction_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/first_sealed_auction.h" +#include "open_spiel/games/first_sealed_auction/first_sealed_auction.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/gin_rummy.cc b/open_spiel/games/gin_rummy/gin_rummy.cc similarity index 99% rename from open_spiel/games/gin_rummy.cc rename to open_spiel/games/gin_rummy/gin_rummy.cc index c8ea5c81f0..c5a5dcba34 100644 --- a/open_spiel/games/gin_rummy.cc +++ b/open_spiel/games/gin_rummy/gin_rummy.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/gin_rummy.h" +#include "open_spiel/games/gin_rummy/gin_rummy.h" #include #include diff --git a/open_spiel/games/gin_rummy.h b/open_spiel/games/gin_rummy/gin_rummy.h similarity index 100% rename from open_spiel/games/gin_rummy.h rename to open_spiel/games/gin_rummy/gin_rummy.h diff --git a/open_spiel/games/gin_rummy_test.cc b/open_spiel/games/gin_rummy/gin_rummy_test.cc similarity index 99% rename from open_spiel/games/gin_rummy_test.cc rename to open_spiel/games/gin_rummy/gin_rummy_test.cc index c23463f056..ee70230da1 100644 --- a/open_spiel/games/gin_rummy_test.cc +++ b/open_spiel/games/gin_rummy/gin_rummy_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/gin_rummy.h" +#include "open_spiel/games/gin_rummy/gin_rummy.h" #include "open_spiel/abseil-cpp/absl/algorithm/container.h" #include "open_spiel/games/gin_rummy/gin_rummy_utils.h" diff --git a/open_spiel/games/go.cc b/open_spiel/games/go/go.cc similarity index 99% rename from open_spiel/games/go.cc rename to open_spiel/games/go/go.cc index 9fc74ffe2b..becbbe4e12 100644 --- a/open_spiel/games/go.cc +++ b/open_spiel/games/go/go.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/go.h" +#include "open_spiel/games/go/go.h" #include diff --git a/open_spiel/games/go.h b/open_spiel/games/go/go.h similarity index 100% rename from open_spiel/games/go.h rename to open_spiel/games/go/go.h diff --git a/open_spiel/games/go_test.cc b/open_spiel/games/go/go_test.cc similarity index 98% rename from open_spiel/games/go_test.cc rename to open_spiel/games/go/go_test.cc index 6d76e1b86d..fc4529a4f1 100644 --- a/open_spiel/games/go_test.cc +++ b/open_spiel/games/go/go_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/go.h" +#include "open_spiel/games/go/go.h" #include "open_spiel/games/go/go_board.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/goofspiel.cc b/open_spiel/games/goofspiel/goofspiel.cc similarity index 99% rename from open_spiel/games/goofspiel.cc rename to open_spiel/games/goofspiel/goofspiel.cc index f103589771..87e6e811e8 100644 --- a/open_spiel/games/goofspiel.cc +++ b/open_spiel/games/goofspiel/goofspiel.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/goofspiel.h" +#include "open_spiel/games/goofspiel/goofspiel.h" #include #include diff --git a/open_spiel/games/goofspiel.h b/open_spiel/games/goofspiel/goofspiel.h similarity index 100% rename from open_spiel/games/goofspiel.h rename to open_spiel/games/goofspiel/goofspiel.h diff --git a/open_spiel/games/goofspiel_test.cc b/open_spiel/games/goofspiel/goofspiel_test.cc similarity index 98% rename from open_spiel/games/goofspiel_test.cc rename to open_spiel/games/goofspiel/goofspiel_test.cc index abbecab363..bf37269d0d 100644 --- a/open_spiel/games/goofspiel_test.cc +++ b/open_spiel/games/goofspiel/goofspiel_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/goofspiel.h" +#include "open_spiel/games/goofspiel/goofspiel.h" #include "open_spiel/game_parameters.h" #include "open_spiel/game_transforms/turn_based_simultaneous_game.h" diff --git a/open_spiel/games/hanabi/CMakeLists.txt b/open_spiel/games/hanabi/CMakeLists.txt index f1a0a3c644..ef6562a18a 100644 --- a/open_spiel/games/hanabi/CMakeLists.txt +++ b/open_spiel/games/hanabi/CMakeLists.txt @@ -23,7 +23,7 @@ add_library(hanabi_learning_environment OBJECT target_include_directories (hanabi_learning_environment PUBLIC hanabi-learning-environment/hanabi_learning_environment) target_include_directories (games PUBLIC hanabi-learning-environment/hanabi_learning_environment) -add_executable(hanabi_test ../hanabi_test.cc ${OPEN_SPIEL_OBJECTS} +add_executable(hanabi_test hanabi_test.cc ${OPEN_SPIEL_OBJECTS} $) add_test(hanabi_test hanabi_test) target_include_directories (hanabi_test PUBLIC hanabi-learning-environment/hanabi_learning_environment) diff --git a/open_spiel/games/hanabi.cc b/open_spiel/games/hanabi/hanabi.cc similarity index 99% rename from open_spiel/games/hanabi.cc rename to open_spiel/games/hanabi/hanabi.cc index 0bf806e301..af4687add3 100644 --- a/open_spiel/games/hanabi.cc +++ b/open_spiel/games/hanabi/hanabi.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/hanabi.h" +#include "open_spiel/games/hanabi/hanabi.h" #include "open_spiel/game_parameters.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/hanabi.h b/open_spiel/games/hanabi/hanabi.h similarity index 100% rename from open_spiel/games/hanabi.h rename to open_spiel/games/hanabi/hanabi.h diff --git a/open_spiel/games/hanabi_test.cc b/open_spiel/games/hanabi/hanabi_test.cc similarity index 97% rename from open_spiel/games/hanabi_test.cc rename to open_spiel/games/hanabi/hanabi_test.cc index 31f63616bf..043a0ba50d 100644 --- a/open_spiel/games/hanabi_test.cc +++ b/open_spiel/games/hanabi/hanabi_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/hanabi.h" +#include "open_spiel/games/hanabi/hanabi.h" #include "open_spiel/game_parameters.h" #include "open_spiel/observer.h" diff --git a/open_spiel/games/havannah.cc b/open_spiel/games/havannah/havannah.cc similarity index 99% rename from open_spiel/games/havannah.cc rename to open_spiel/games/havannah/havannah.cc index 7c3f043e78..d43736ffe3 100644 --- a/open_spiel/games/havannah.cc +++ b/open_spiel/games/havannah/havannah.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/havannah.h" +#include "open_spiel/games/havannah/havannah.h" #include #include diff --git a/open_spiel/games/havannah.h b/open_spiel/games/havannah/havannah.h similarity index 100% rename from open_spiel/games/havannah.h rename to open_spiel/games/havannah/havannah.h diff --git a/open_spiel/games/havannah_test.cc b/open_spiel/games/havannah/havannah_test.cc similarity index 100% rename from open_spiel/games/havannah_test.cc rename to open_spiel/games/havannah/havannah_test.cc diff --git a/open_spiel/games/hearts.cc b/open_spiel/games/hearts/hearts.cc similarity index 99% rename from open_spiel/games/hearts.cc rename to open_spiel/games/hearts/hearts.cc index 44b9d9b349..c4b2a96cf9 100644 --- a/open_spiel/games/hearts.cc +++ b/open_spiel/games/hearts/hearts.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/hearts.h" +#include "open_spiel/games/hearts/hearts.h" #include #include diff --git a/open_spiel/games/hearts.h b/open_spiel/games/hearts/hearts.h similarity index 100% rename from open_spiel/games/hearts.h rename to open_spiel/games/hearts/hearts.h diff --git a/open_spiel/games/hearts_test.cc b/open_spiel/games/hearts/hearts_test.cc similarity index 99% rename from open_spiel/games/hearts_test.cc rename to open_spiel/games/hearts/hearts_test.cc index d7444feb79..759bae2ac0 100644 --- a/open_spiel/games/hearts_test.cc +++ b/open_spiel/games/hearts/hearts_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/hearts.h" +#include "open_spiel/games/hearts/hearts.h" #include #include diff --git a/open_spiel/games/hex.cc b/open_spiel/games/hex/hex.cc similarity index 99% rename from open_spiel/games/hex.cc rename to open_spiel/games/hex/hex.cc index 833c43b4db..1bdabcfbbd 100644 --- a/open_spiel/games/hex.cc +++ b/open_spiel/games/hex/hex.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/hex.h" +#include "open_spiel/games/hex/hex.h" #include #include diff --git a/open_spiel/games/hex.h b/open_spiel/games/hex/hex.h similarity index 100% rename from open_spiel/games/hex.h rename to open_spiel/games/hex/hex.h diff --git a/open_spiel/games/hex_test.cc b/open_spiel/games/hex/hex_test.cc similarity index 100% rename from open_spiel/games/hex_test.cc rename to open_spiel/games/hex/hex_test.cc diff --git a/open_spiel/games/kriegspiel.cc b/open_spiel/games/kriegspiel/kriegspiel.cc similarity index 99% rename from open_spiel/games/kriegspiel.cc rename to open_spiel/games/kriegspiel/kriegspiel.cc index 79c5378491..a53c5b1c44 100644 --- a/open_spiel/games/kriegspiel.cc +++ b/open_spiel/games/kriegspiel/kriegspiel.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/kriegspiel.h" +#include "open_spiel/games/kriegspiel/kriegspiel.h" #include #include diff --git a/open_spiel/games/kriegspiel.h b/open_spiel/games/kriegspiel/kriegspiel.h similarity index 99% rename from open_spiel/games/kriegspiel.h rename to open_spiel/games/kriegspiel/kriegspiel.h index 512cc08634..c9a05716b9 100644 --- a/open_spiel/games/kriegspiel.h +++ b/open_spiel/games/kriegspiel/kriegspiel.h @@ -24,7 +24,7 @@ #include "open_spiel/abseil-cpp/absl/algorithm/container.h" #include "open_spiel/abseil-cpp/absl/container/flat_hash_map.h" -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/games/chess/chess_board.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/kriegspiel_test.cc b/open_spiel/games/kriegspiel/kriegspiel_test.cc similarity index 100% rename from open_spiel/games/kriegspiel_test.cc rename to open_spiel/games/kriegspiel/kriegspiel_test.cc diff --git a/open_spiel/games/kuhn_poker.cc b/open_spiel/games/kuhn_poker/kuhn_poker.cc similarity index 99% rename from open_spiel/games/kuhn_poker.cc rename to open_spiel/games/kuhn_poker/kuhn_poker.cc index 5623b3176a..566268d08a 100644 --- a/open_spiel/games/kuhn_poker.cc +++ b/open_spiel/games/kuhn_poker/kuhn_poker.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/kuhn_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" #include #include diff --git a/open_spiel/games/kuhn_poker.h b/open_spiel/games/kuhn_poker/kuhn_poker.h similarity index 100% rename from open_spiel/games/kuhn_poker.h rename to open_spiel/games/kuhn_poker/kuhn_poker.h diff --git a/open_spiel/games/kuhn_poker_test.cc b/open_spiel/games/kuhn_poker/kuhn_poker_test.cc similarity index 98% rename from open_spiel/games/kuhn_poker_test.cc rename to open_spiel/games/kuhn_poker/kuhn_poker_test.cc index dd41284337..7a36659b82 100644 --- a/open_spiel/games/kuhn_poker_test.cc +++ b/open_spiel/games/kuhn_poker/kuhn_poker_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/kuhn_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" #include "open_spiel/algorithms/get_all_states.h" #include "open_spiel/policy.h" diff --git a/open_spiel/games/laser_tag.cc b/open_spiel/games/laser_tag/laser_tag.cc similarity index 99% rename from open_spiel/games/laser_tag.cc rename to open_spiel/games/laser_tag/laser_tag.cc index cf1fc852d7..357854fd6e 100644 --- a/open_spiel/games/laser_tag.cc +++ b/open_spiel/games/laser_tag/laser_tag.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/laser_tag.h" +#include "open_spiel/games/laser_tag/laser_tag.h" #include #include diff --git a/open_spiel/games/laser_tag.h b/open_spiel/games/laser_tag/laser_tag.h similarity index 100% rename from open_spiel/games/laser_tag.h rename to open_spiel/games/laser_tag/laser_tag.h diff --git a/open_spiel/games/laser_tag_test.cc b/open_spiel/games/laser_tag/laser_tag_test.cc similarity index 99% rename from open_spiel/games/laser_tag_test.cc rename to open_spiel/games/laser_tag/laser_tag_test.cc index 371bbcdd01..58498c997c 100644 --- a/open_spiel/games/laser_tag_test.cc +++ b/open_spiel/games/laser_tag/laser_tag_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/laser_tag.h" +#include "open_spiel/games/laser_tag/laser_tag.h" #include #include diff --git a/open_spiel/games/leduc_poker.cc b/open_spiel/games/leduc_poker/leduc_poker.cc similarity index 99% rename from open_spiel/games/leduc_poker.cc rename to open_spiel/games/leduc_poker/leduc_poker.cc index a71d618447..01e04e2773 100644 --- a/open_spiel/games/leduc_poker.cc +++ b/open_spiel/games/leduc_poker/leduc_poker.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" #include #include diff --git a/open_spiel/games/leduc_poker.h b/open_spiel/games/leduc_poker/leduc_poker.h similarity index 100% rename from open_spiel/games/leduc_poker.h rename to open_spiel/games/leduc_poker/leduc_poker.h diff --git a/open_spiel/games/leduc_poker_test.cc b/open_spiel/games/leduc_poker/leduc_poker_test.cc similarity index 97% rename from open_spiel/games/leduc_poker_test.cc rename to open_spiel/games/leduc_poker/leduc_poker_test.cc index d2501a7ec4..7801a181b4 100644 --- a/open_spiel/games/leduc_poker_test.cc +++ b/open_spiel/games/leduc_poker/leduc_poker_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" #include "open_spiel/policy.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/lewis_signaling.cc b/open_spiel/games/lewis_signaling/lewis_signaling.cc similarity index 99% rename from open_spiel/games/lewis_signaling.cc rename to open_spiel/games/lewis_signaling/lewis_signaling.cc index d7b0987b1a..72a76c080f 100644 --- a/open_spiel/games/lewis_signaling.cc +++ b/open_spiel/games/lewis_signaling/lewis_signaling.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/lewis_signaling.h" +#include "open_spiel/games/lewis_signaling/lewis_signaling.h" #include #include diff --git a/open_spiel/games/lewis_signaling.h b/open_spiel/games/lewis_signaling/lewis_signaling.h similarity index 100% rename from open_spiel/games/lewis_signaling.h rename to open_spiel/games/lewis_signaling/lewis_signaling.h diff --git a/open_spiel/games/lewis_signaling_test.cc b/open_spiel/games/lewis_signaling/lewis_signaling_test.cc similarity index 98% rename from open_spiel/games/lewis_signaling_test.cc rename to open_spiel/games/lewis_signaling/lewis_signaling_test.cc index 1581c8ced8..228f71eaff 100644 --- a/open_spiel/games/lewis_signaling_test.cc +++ b/open_spiel/games/lewis_signaling/lewis_signaling_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/lewis_signaling.h" +#include "open_spiel/games/lewis_signaling/lewis_signaling.h" #include #include diff --git a/open_spiel/games/liars_dice.cc b/open_spiel/games/liars_dice/liars_dice.cc similarity index 99% rename from open_spiel/games/liars_dice.cc rename to open_spiel/games/liars_dice/liars_dice.cc index bb42e7dcfc..0818f183b5 100644 --- a/open_spiel/games/liars_dice.cc +++ b/open_spiel/games/liars_dice/liars_dice.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/liars_dice.h" +#include "open_spiel/games/liars_dice/liars_dice.h" #include #include diff --git a/open_spiel/games/liars_dice.h b/open_spiel/games/liars_dice/liars_dice.h similarity index 100% rename from open_spiel/games/liars_dice.h rename to open_spiel/games/liars_dice/liars_dice.h diff --git a/open_spiel/games/liars_dice_test.cc b/open_spiel/games/liars_dice/liars_dice_test.cc similarity index 100% rename from open_spiel/games/liars_dice_test.cc rename to open_spiel/games/liars_dice/liars_dice_test.cc diff --git a/open_spiel/games/maedn.cc b/open_spiel/games/maedn/maedn.cc similarity index 99% rename from open_spiel/games/maedn.cc rename to open_spiel/games/maedn/maedn.cc index cc0ec464ab..65a71f6c1e 100644 --- a/open_spiel/games/maedn.cc +++ b/open_spiel/games/maedn/maedn.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/maedn.h" +#include "open_spiel/games/maedn/maedn.h" #include #include diff --git a/open_spiel/games/maedn.h b/open_spiel/games/maedn/maedn.h similarity index 100% rename from open_spiel/games/maedn.h rename to open_spiel/games/maedn/maedn.h diff --git a/open_spiel/games/maedn_test.cc b/open_spiel/games/maedn/maedn_test.cc similarity index 99% rename from open_spiel/games/maedn_test.cc rename to open_spiel/games/maedn/maedn_test.cc index 7fb87554eb..f73466ffbb 100644 --- a/open_spiel/games/maedn_test.cc +++ b/open_spiel/games/maedn/maedn_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/maedn.h" +#include "open_spiel/games/maedn/maedn.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/mancala.cc b/open_spiel/games/mancala/mancala.cc similarity index 99% rename from open_spiel/games/mancala.cc rename to open_spiel/games/mancala/mancala.cc index af3f532815..55399bbcda 100644 --- a/open_spiel/games/mancala.cc +++ b/open_spiel/games/mancala/mancala.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/mancala.h" +#include "open_spiel/games/mancala/mancala.h" #include #include diff --git a/open_spiel/games/mancala.h b/open_spiel/games/mancala/mancala.h similarity index 100% rename from open_spiel/games/mancala.h rename to open_spiel/games/mancala/mancala.h diff --git a/open_spiel/games/mancala_test.cc b/open_spiel/games/mancala/mancala_test.cc similarity index 98% rename from open_spiel/games/mancala_test.cc rename to open_spiel/games/mancala/mancala_test.cc index 9f8bcff2c6..2587a2c1fd 100644 --- a/open_spiel/games/mancala_test.cc +++ b/open_spiel/games/mancala/mancala_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/mancala.h" +#include "open_spiel/games/mancala/mancala.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/markov_soccer.cc b/open_spiel/games/markov_soccer/markov_soccer.cc similarity index 99% rename from open_spiel/games/markov_soccer.cc rename to open_spiel/games/markov_soccer/markov_soccer.cc index 5992966347..9711efc9e1 100644 --- a/open_spiel/games/markov_soccer.cc +++ b/open_spiel/games/markov_soccer/markov_soccer.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/markov_soccer.h" +#include "open_spiel/games/markov_soccer/markov_soccer.h" #include #include diff --git a/open_spiel/games/markov_soccer.h b/open_spiel/games/markov_soccer/markov_soccer.h similarity index 100% rename from open_spiel/games/markov_soccer.h rename to open_spiel/games/markov_soccer/markov_soccer.h diff --git a/open_spiel/games/markov_soccer_test.cc b/open_spiel/games/markov_soccer/markov_soccer_test.cc similarity index 96% rename from open_spiel/games/markov_soccer_test.cc rename to open_spiel/games/markov_soccer/markov_soccer_test.cc index adb035ed43..1f4fdba82f 100644 --- a/open_spiel/games/markov_soccer_test.cc +++ b/open_spiel/games/markov_soccer/markov_soccer_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/markov_soccer.h" +#include "open_spiel/games/markov_soccer/markov_soccer.h" #include "open_spiel/spiel_utils.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/matching_pennies_3p.cc b/open_spiel/games/matching_pennies_3p/matching_pennies_3p.cc similarity index 98% rename from open_spiel/games/matching_pennies_3p.cc rename to open_spiel/games/matching_pennies_3p/matching_pennies_3p.cc index 9075f36127..e2ca6f2296 100644 --- a/open_spiel/games/matching_pennies_3p.cc +++ b/open_spiel/games/matching_pennies_3p/matching_pennies_3p.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/matching_pennies_3p.h" +#include "open_spiel/games/matching_pennies_3p/matching_pennies_3p.h" #include diff --git a/open_spiel/games/matching_pennies_3p.h b/open_spiel/games/matching_pennies_3p/matching_pennies_3p.h similarity index 100% rename from open_spiel/games/matching_pennies_3p.h rename to open_spiel/games/matching_pennies_3p/matching_pennies_3p.h diff --git a/open_spiel/games/matching_pennies_3p_test.cc b/open_spiel/games/matching_pennies_3p/matching_pennies_3p_test.cc similarity index 100% rename from open_spiel/games/matching_pennies_3p_test.cc rename to open_spiel/games/matching_pennies_3p/matching_pennies_3p_test.cc diff --git a/open_spiel/games/matrix_games.cc b/open_spiel/games/matrix_games/matrix_games.cc similarity index 100% rename from open_spiel/games/matrix_games.cc rename to open_spiel/games/matrix_games/matrix_games.cc diff --git a/open_spiel/games/matrix_games_test.cc b/open_spiel/games/matrix_games/matrix_games_test.cc similarity index 96% rename from open_spiel/games/matrix_games_test.cc rename to open_spiel/games/matrix_games/matrix_games_test.cc index c31f3ed487..1609b3d4c3 100644 --- a/open_spiel/games/matrix_games_test.cc +++ b/open_spiel/games/matrix_games/matrix_games_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/blotto.h" +#include "open_spiel/games/blotto/blotto.h" #include "open_spiel/matrix_game.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/morpion_solitaire.cc b/open_spiel/games/morpion_solitaire/morpion_solitaire.cc similarity index 99% rename from open_spiel/games/morpion_solitaire.cc rename to open_spiel/games/morpion_solitaire/morpion_solitaire.cc index 9b9f9aa1ba..e36b2f5505 100644 --- a/open_spiel/games/morpion_solitaire.cc +++ b/open_spiel/games/morpion_solitaire/morpion_solitaire.cc @@ -11,7 +11,7 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/morpion_solitaire.h" +#include "open_spiel/games/morpion_solitaire/morpion_solitaire.h" #include #include diff --git a/open_spiel/games/morpion_solitaire.h b/open_spiel/games/morpion_solitaire/morpion_solitaire.h similarity index 100% rename from open_spiel/games/morpion_solitaire.h rename to open_spiel/games/morpion_solitaire/morpion_solitaire.h diff --git a/open_spiel/games/morpion_solitaire_test.cc b/open_spiel/games/morpion_solitaire/morpion_solitaire_test.cc similarity index 96% rename from open_spiel/games/morpion_solitaire_test.cc rename to open_spiel/games/morpion_solitaire/morpion_solitaire_test.cc index 120a5f711e..1db8383082 100644 --- a/open_spiel/games/morpion_solitaire_test.cc +++ b/open_spiel/games/morpion_solitaire/morpion_solitaire_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/morpion_solitaire.h" +#include "open_spiel/games/morpion_solitaire/morpion_solitaire.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/negotiation.cc b/open_spiel/games/negotiation/negotiation.cc similarity index 99% rename from open_spiel/games/negotiation.cc rename to open_spiel/games/negotiation/negotiation.cc index 6961ee17d2..c5086bf840 100644 --- a/open_spiel/games/negotiation.cc +++ b/open_spiel/games/negotiation/negotiation.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/negotiation.h" +#include "open_spiel/games/negotiation/negotiation.h" #include #include diff --git a/open_spiel/games/negotiation.h b/open_spiel/games/negotiation/negotiation.h similarity index 100% rename from open_spiel/games/negotiation.h rename to open_spiel/games/negotiation/negotiation.h diff --git a/open_spiel/games/negotiation_test.cc b/open_spiel/games/negotiation/negotiation_test.cc similarity index 100% rename from open_spiel/games/negotiation_test.cc rename to open_spiel/games/negotiation/negotiation_test.cc diff --git a/open_spiel/games/nfg/matching_pennies_3p.nfg b/open_spiel/games/nfg_game/games/matching_pennies_3p.nfg similarity index 100% rename from open_spiel/games/nfg/matching_pennies_3p.nfg rename to open_spiel/games/nfg_game/games/matching_pennies_3p.nfg diff --git a/open_spiel/games/nfg/sample.nfg b/open_spiel/games/nfg_game/games/sample.nfg similarity index 100% rename from open_spiel/games/nfg/sample.nfg rename to open_spiel/games/nfg_game/games/sample.nfg diff --git a/open_spiel/games/nfg_game.cc b/open_spiel/games/nfg_game/nfg_game.cc similarity index 99% rename from open_spiel/games/nfg_game.cc rename to open_spiel/games/nfg_game/nfg_game.cc index 9e743bde41..0ade2a72d6 100644 --- a/open_spiel/games/nfg_game.cc +++ b/open_spiel/games/nfg_game/nfg_game.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/nfg_game.h" +#include "open_spiel/games/nfg_game/nfg_game.h" #include #include diff --git a/open_spiel/games/nfg_game.h b/open_spiel/games/nfg_game/nfg_game.h similarity index 100% rename from open_spiel/games/nfg_game.h rename to open_spiel/games/nfg_game/nfg_game.h diff --git a/open_spiel/games/nfg_game_test.cc b/open_spiel/games/nfg_game/nfg_game_test.cc similarity index 99% rename from open_spiel/games/nfg_game_test.cc rename to open_spiel/games/nfg_game/nfg_game_test.cc index c61d50d2b3..aece8bb3bd 100644 --- a/open_spiel/games/nfg_game_test.cc +++ b/open_spiel/games/nfg_game/nfg_game_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/nfg_game.h" +#include "open_spiel/games/nfg_game/nfg_game.h" #include #include diff --git a/open_spiel/games/nim.cc b/open_spiel/games/nim/nim.cc similarity index 99% rename from open_spiel/games/nim.cc rename to open_spiel/games/nim/nim.cc index c8037090fd..311780aa2f 100644 --- a/open_spiel/games/nim.cc +++ b/open_spiel/games/nim/nim.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/nim.h" +#include "open_spiel/games/nim/nim.h" #include #include diff --git a/open_spiel/games/nim.h b/open_spiel/games/nim/nim.h similarity index 100% rename from open_spiel/games/nim.h rename to open_spiel/games/nim/nim.h diff --git a/open_spiel/games/nim_test.cc b/open_spiel/games/nim/nim_test.cc similarity index 100% rename from open_spiel/games/nim_test.cc rename to open_spiel/games/nim/nim_test.cc diff --git a/open_spiel/games/nine_mens_morris.cc b/open_spiel/games/nine_mens_morris/nine_mens_morris.cc similarity index 99% rename from open_spiel/games/nine_mens_morris.cc rename to open_spiel/games/nine_mens_morris/nine_mens_morris.cc index 2987034d53..5d7519199c 100644 --- a/open_spiel/games/nine_mens_morris.cc +++ b/open_spiel/games/nine_mens_morris/nine_mens_morris.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/nine_mens_morris.h" +#include "open_spiel/games/nine_mens_morris/nine_mens_morris.h" #include #include diff --git a/open_spiel/games/nine_mens_morris.h b/open_spiel/games/nine_mens_morris/nine_mens_morris.h similarity index 100% rename from open_spiel/games/nine_mens_morris.h rename to open_spiel/games/nine_mens_morris/nine_mens_morris.h diff --git a/open_spiel/games/nine_mens_morris_test.cc b/open_spiel/games/nine_mens_morris/nine_mens_morris_test.cc similarity index 100% rename from open_spiel/games/nine_mens_morris_test.cc rename to open_spiel/games/nine_mens_morris/nine_mens_morris_test.cc diff --git a/open_spiel/games/oh_hell.cc b/open_spiel/games/oh_hell/oh_hell.cc similarity index 99% rename from open_spiel/games/oh_hell.cc rename to open_spiel/games/oh_hell/oh_hell.cc index 20c2a792d7..9fd68c15be 100644 --- a/open_spiel/games/oh_hell.cc +++ b/open_spiel/games/oh_hell/oh_hell.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/oh_hell.h" +#include "open_spiel/games/oh_hell/oh_hell.h" #include #include diff --git a/open_spiel/games/oh_hell.h b/open_spiel/games/oh_hell/oh_hell.h similarity index 100% rename from open_spiel/games/oh_hell.h rename to open_spiel/games/oh_hell/oh_hell.h diff --git a/open_spiel/games/oh_hell_test.cc b/open_spiel/games/oh_hell/oh_hell_test.cc similarity index 99% rename from open_spiel/games/oh_hell_test.cc rename to open_spiel/games/oh_hell/oh_hell_test.cc index 37514ba752..1536235fe1 100644 --- a/open_spiel/games/oh_hell_test.cc +++ b/open_spiel/games/oh_hell/oh_hell_test.cc @@ -14,7 +14,7 @@ #include -#include "open_spiel/games/oh_hell.h" +#include "open_spiel/games/oh_hell/oh_hell.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/oshi_zumo.cc b/open_spiel/games/oshi_zumo/oshi_zumo.cc similarity index 99% rename from open_spiel/games/oshi_zumo.cc rename to open_spiel/games/oshi_zumo/oshi_zumo.cc index 7a7707f30a..778f1a0b10 100644 --- a/open_spiel/games/oshi_zumo.cc +++ b/open_spiel/games/oshi_zumo/oshi_zumo.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/oshi_zumo.h" +#include "open_spiel/games/oshi_zumo/oshi_zumo.h" #include #include diff --git a/open_spiel/games/oshi_zumo.h b/open_spiel/games/oshi_zumo/oshi_zumo.h similarity index 100% rename from open_spiel/games/oshi_zumo.h rename to open_spiel/games/oshi_zumo/oshi_zumo.h diff --git a/open_spiel/games/oshi_zumo_test.cc b/open_spiel/games/oshi_zumo/oshi_zumo_test.cc similarity index 97% rename from open_spiel/games/oshi_zumo_test.cc rename to open_spiel/games/oshi_zumo/oshi_zumo_test.cc index ab660890ac..a39a927ce8 100644 --- a/open_spiel/games/oshi_zumo_test.cc +++ b/open_spiel/games/oshi_zumo/oshi_zumo_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/oshi_zumo.h" +#include "open_spiel/games/oshi_zumo/oshi_zumo.h" #include "open_spiel/algorithms/get_all_states.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/othello.cc b/open_spiel/games/othello/othello.cc similarity index 99% rename from open_spiel/games/othello.cc rename to open_spiel/games/othello/othello.cc index 13bf4f3bf0..b3abe195af 100644 --- a/open_spiel/games/othello.cc +++ b/open_spiel/games/othello/othello.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/othello.h" +#include "open_spiel/games/othello/othello.h" #include #include diff --git a/open_spiel/games/othello.h b/open_spiel/games/othello/othello.h similarity index 100% rename from open_spiel/games/othello.h rename to open_spiel/games/othello/othello.h diff --git a/open_spiel/games/othello_test.cc b/open_spiel/games/othello/othello_test.cc similarity index 100% rename from open_spiel/games/othello_test.cc rename to open_spiel/games/othello/othello_test.cc diff --git a/open_spiel/games/oware.cc b/open_spiel/games/oware/oware.cc similarity index 99% rename from open_spiel/games/oware.cc rename to open_spiel/games/oware/oware.cc index f060e79c2c..0edf19f59d 100644 --- a/open_spiel/games/oware.cc +++ b/open_spiel/games/oware/oware.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/oware.h" +#include "open_spiel/games/oware/oware.h" #include diff --git a/open_spiel/games/oware.h b/open_spiel/games/oware/oware.h similarity index 100% rename from open_spiel/games/oware.h rename to open_spiel/games/oware/oware.h diff --git a/open_spiel/games/oware_test.cc b/open_spiel/games/oware/oware_test.cc similarity index 99% rename from open_spiel/games/oware_test.cc rename to open_spiel/games/oware/oware_test.cc index 9cb3f025b7..9bf74c4378 100644 --- a/open_spiel/games/oware_test.cc +++ b/open_spiel/games/oware/oware_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/oware.h" +#include "open_spiel/games/oware/oware.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/pathfinding.cc b/open_spiel/games/pathfinding/pathfinding.cc similarity index 99% rename from open_spiel/games/pathfinding.cc rename to open_spiel/games/pathfinding/pathfinding.cc index f98928c032..df14e56c7f 100644 --- a/open_spiel/games/pathfinding.cc +++ b/open_spiel/games/pathfinding/pathfinding.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/pathfinding.h" +#include "open_spiel/games/pathfinding/pathfinding.h" #include #include diff --git a/open_spiel/games/pathfinding.h b/open_spiel/games/pathfinding/pathfinding.h similarity index 100% rename from open_spiel/games/pathfinding.h rename to open_spiel/games/pathfinding/pathfinding.h diff --git a/open_spiel/games/pathfinding_test.cc b/open_spiel/games/pathfinding/pathfinding_test.cc similarity index 99% rename from open_spiel/games/pathfinding_test.cc rename to open_spiel/games/pathfinding/pathfinding_test.cc index cbbd65f54a..4ee3ad8559 100644 --- a/open_spiel/games/pathfinding_test.cc +++ b/open_spiel/games/pathfinding/pathfinding_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/pathfinding.h" +#include "open_spiel/games/pathfinding/pathfinding.h" #include diff --git a/open_spiel/games/pentago.cc b/open_spiel/games/pentago/pentago.cc similarity index 99% rename from open_spiel/games/pentago.cc rename to open_spiel/games/pentago/pentago.cc index 606362e924..5b9be5e7ac 100644 --- a/open_spiel/games/pentago.cc +++ b/open_spiel/games/pentago/pentago.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/pentago.h" +#include "open_spiel/games/pentago/pentago.h" #include #include diff --git a/open_spiel/games/pentago.h b/open_spiel/games/pentago/pentago.h similarity index 100% rename from open_spiel/games/pentago.h rename to open_spiel/games/pentago/pentago.h diff --git a/open_spiel/games/pentago_test.cc b/open_spiel/games/pentago/pentago_test.cc similarity index 100% rename from open_spiel/games/pentago_test.cc rename to open_spiel/games/pentago/pentago_test.cc diff --git a/open_spiel/games/phantom_go.cc b/open_spiel/games/phantom_go/phantom_go.cc similarity index 99% rename from open_spiel/games/phantom_go.cc rename to open_spiel/games/phantom_go/phantom_go.cc index a3cea6f516..1a5ead01d0 100644 --- a/open_spiel/games/phantom_go.cc +++ b/open_spiel/games/phantom_go/phantom_go.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/phantom_go.h" +#include "open_spiel/games/phantom_go/phantom_go.h" #include #include diff --git a/open_spiel/games/phantom_go.h b/open_spiel/games/phantom_go/phantom_go.h similarity index 100% rename from open_spiel/games/phantom_go.h rename to open_spiel/games/phantom_go/phantom_go.h diff --git a/open_spiel/games/phantom_go_test.cc b/open_spiel/games/phantom_go/phantom_go_test.cc similarity index 98% rename from open_spiel/games/phantom_go_test.cc rename to open_spiel/games/phantom_go/phantom_go_test.cc index 5017b99b05..a9fc7cea33 100644 --- a/open_spiel/games/phantom_go_test.cc +++ b/open_spiel/games/phantom_go/phantom_go_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/phantom_go.h" +#include "open_spiel/games/phantom_go/phantom_go.h" #include "open_spiel/games/phantom_go/phantom_go_board.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/phantom_ttt.cc b/open_spiel/games/phantom_ttt/phantom_ttt.cc similarity index 99% rename from open_spiel/games/phantom_ttt.cc rename to open_spiel/games/phantom_ttt/phantom_ttt.cc index 8d40a3fdc2..7bdc585d2c 100644 --- a/open_spiel/games/phantom_ttt.cc +++ b/open_spiel/games/phantom_ttt/phantom_ttt.cc @@ -12,14 +12,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/phantom_ttt.h" +#include "open_spiel/games/phantom_ttt/phantom_ttt.h" #include #include #include -#include "./tic_tac_toe.h" #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel_utils.h" namespace open_spiel { diff --git a/open_spiel/games/phantom_ttt.h b/open_spiel/games/phantom_ttt/phantom_ttt.h similarity index 99% rename from open_spiel/games/phantom_ttt.h rename to open_spiel/games/phantom_ttt/phantom_ttt.h index 177728637a..df1ac0a0e3 100644 --- a/open_spiel/games/phantom_ttt.h +++ b/open_spiel/games/phantom_ttt/phantom_ttt.h @@ -22,7 +22,7 @@ #include #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" // Phantom Tic-Tac-Toe is a phantom version of the classic game of Tic-Tac-Toe diff --git a/open_spiel/games/phantom_ttt_test.cc b/open_spiel/games/phantom_ttt/phantom_ttt_test.cc similarity index 100% rename from open_spiel/games/phantom_ttt_test.cc rename to open_spiel/games/phantom_ttt/phantom_ttt_test.cc diff --git a/open_spiel/games/pig.cc b/open_spiel/games/pig/pig.cc similarity index 99% rename from open_spiel/games/pig.cc rename to open_spiel/games/pig/pig.cc index 85c1ee530c..80da42683c 100644 --- a/open_spiel/games/pig.cc +++ b/open_spiel/games/pig/pig.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/pig.h" +#include "open_spiel/games/pig/pig.h" #include diff --git a/open_spiel/games/pig.h b/open_spiel/games/pig/pig.h similarity index 100% rename from open_spiel/games/pig.h rename to open_spiel/games/pig/pig.h diff --git a/open_spiel/games/pig_test.cc b/open_spiel/games/pig/pig_test.cc similarity index 100% rename from open_spiel/games/pig_test.cc rename to open_spiel/games/pig/pig_test.cc diff --git a/open_spiel/games/quoridor.cc b/open_spiel/games/quoridor/quoridor.cc similarity index 99% rename from open_spiel/games/quoridor.cc rename to open_spiel/games/quoridor/quoridor.cc index 1ddafbd4bb..352e48d5af 100644 --- a/open_spiel/games/quoridor.cc +++ b/open_spiel/games/quoridor/quoridor.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/quoridor.h" +#include "open_spiel/games/quoridor/quoridor.h" #include #include diff --git a/open_spiel/games/quoridor.h b/open_spiel/games/quoridor/quoridor.h similarity index 100% rename from open_spiel/games/quoridor.h rename to open_spiel/games/quoridor/quoridor.h diff --git a/open_spiel/games/quoridor_test.cc b/open_spiel/games/quoridor/quoridor_test.cc similarity index 100% rename from open_spiel/games/quoridor_test.cc rename to open_spiel/games/quoridor/quoridor_test.cc diff --git a/open_spiel/games/rbc.cc b/open_spiel/games/rbc/rbc.cc similarity index 99% rename from open_spiel/games/rbc.cc rename to open_spiel/games/rbc/rbc.cc index 6445cbe7f2..9cffaf1e4a 100644 --- a/open_spiel/games/rbc.cc +++ b/open_spiel/games/rbc/rbc.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/rbc.h" +#include "open_spiel/games/rbc/rbc.h" #include #include diff --git a/open_spiel/games/rbc.h b/open_spiel/games/rbc/rbc.h similarity index 99% rename from open_spiel/games/rbc.h rename to open_spiel/games/rbc/rbc.h index 3f862331e7..28f6f73566 100644 --- a/open_spiel/games/rbc.h +++ b/open_spiel/games/rbc/rbc.h @@ -24,7 +24,7 @@ #include "open_spiel/abseil-cpp/absl/algorithm/container.h" #include "open_spiel/abseil-cpp/absl/container/flat_hash_map.h" -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/games/chess/chess_board.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_utils.h" diff --git a/open_spiel/games/rbc_test.cc b/open_spiel/games/rbc/rbc_test.cc similarity index 99% rename from open_spiel/games/rbc_test.cc rename to open_spiel/games/rbc/rbc_test.cc index a1aa9035e1..1289770d7e 100644 --- a/open_spiel/games/rbc_test.cc +++ b/open_spiel/games/rbc/rbc_test.cc @@ -12,9 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/rbc.h" +#include "open_spiel/games/rbc/rbc.h" -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/games/chess/chess_board.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/sheriff.cc b/open_spiel/games/sheriff/sheriff.cc similarity index 99% rename from open_spiel/games/sheriff.cc rename to open_spiel/games/sheriff/sheriff.cc index d0c647a4c5..b5f38a144d 100644 --- a/open_spiel/games/sheriff.cc +++ b/open_spiel/games/sheriff/sheriff.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/sheriff.h" +#include "open_spiel/games/sheriff/sheriff.h" #include diff --git a/open_spiel/games/sheriff.h b/open_spiel/games/sheriff/sheriff.h similarity index 100% rename from open_spiel/games/sheriff.h rename to open_spiel/games/sheriff/sheriff.h diff --git a/open_spiel/games/sheriff_test.cc b/open_spiel/games/sheriff/sheriff_test.cc similarity index 99% rename from open_spiel/games/sheriff_test.cc rename to open_spiel/games/sheriff/sheriff_test.cc index 3b898e0cb3..063cdf4af7 100644 --- a/open_spiel/games/sheriff_test.cc +++ b/open_spiel/games/sheriff/sheriff_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/sheriff.h" +#include "open_spiel/games/sheriff/sheriff.h" #include #include diff --git a/open_spiel/games/skat.cc b/open_spiel/games/skat/skat.cc similarity index 99% rename from open_spiel/games/skat.cc rename to open_spiel/games/skat/skat.cc index 024de90e37..9f2bd5c690 100644 --- a/open_spiel/games/skat.cc +++ b/open_spiel/games/skat/skat.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/skat.h" +#include "open_spiel/games/skat/skat.h" #include "open_spiel/abseil-cpp/absl/strings/str_format.h" #include "open_spiel/abseil-cpp/absl/strings/string_view.h" diff --git a/open_spiel/games/skat.h b/open_spiel/games/skat/skat.h similarity index 100% rename from open_spiel/games/skat.h rename to open_spiel/games/skat/skat.h diff --git a/open_spiel/games/skat_test.cc b/open_spiel/games/skat/skat_test.cc similarity index 96% rename from open_spiel/games/skat_test.cc rename to open_spiel/games/skat/skat_test.cc index 3ec3fd687c..41416c08cb 100644 --- a/open_spiel/games/skat_test.cc +++ b/open_spiel/games/skat/skat_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/skat.h" +#include "open_spiel/games/skat/skat.h" #include "open_spiel/spiel_utils.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/solitaire.cc b/open_spiel/games/solitaire/solitaire.cc similarity index 99% rename from open_spiel/games/solitaire.cc rename to open_spiel/games/solitaire/solitaire.cc index 6f333fdf07..8fa99b378f 100644 --- a/open_spiel/games/solitaire.cc +++ b/open_spiel/games/solitaire/solitaire.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/solitaire.h" +#include "open_spiel/games/solitaire/solitaire.h" #include "open_spiel/abseil-cpp/absl/types/optional.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/solitaire.h b/open_spiel/games/solitaire/solitaire.h similarity index 100% rename from open_spiel/games/solitaire.h rename to open_spiel/games/solitaire/solitaire.h diff --git a/open_spiel/games/solitaire_test.cc b/open_spiel/games/solitaire/solitaire_test.cc similarity index 98% rename from open_spiel/games/solitaire_test.cc rename to open_spiel/games/solitaire/solitaire_test.cc index 213028ecab..8b342597a4 100644 --- a/open_spiel/games/solitaire_test.cc +++ b/open_spiel/games/solitaire/solitaire_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/solitaire.h" +#include "open_spiel/games/solitaire/solitaire.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/stones_and_gems.cc b/open_spiel/games/stones_and_gems/stones_and_gems.cc similarity index 99% rename from open_spiel/games/stones_and_gems.cc rename to open_spiel/games/stones_and_gems/stones_and_gems.cc index 04edb75a67..62913eb2d7 100644 --- a/open_spiel/games/stones_and_gems.cc +++ b/open_spiel/games/stones_and_gems/stones_and_gems.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/stones_and_gems.h" +#include "open_spiel/games/stones_and_gems/stones_and_gems.h" #include diff --git a/open_spiel/games/stones_and_gems.h b/open_spiel/games/stones_and_gems/stones_and_gems.h similarity index 100% rename from open_spiel/games/stones_and_gems.h rename to open_spiel/games/stones_and_gems/stones_and_gems.h diff --git a/open_spiel/games/stones_and_gems_test.cc b/open_spiel/games/stones_and_gems/stones_and_gems_test.cc similarity index 99% rename from open_spiel/games/stones_and_gems_test.cc rename to open_spiel/games/stones_and_gems/stones_and_gems_test.cc index d55fb88d02..c1db5c8862 100644 --- a/open_spiel/games/stones_and_gems_test.cc +++ b/open_spiel/games/stones_and_gems/stones_and_gems_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/stones_and_gems.h" +#include "open_spiel/games/stones_and_gems/stones_and_gems.h" #include "open_spiel/abseil-cpp/absl/container/node_hash_map.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/tarok.cc b/open_spiel/games/tarok/tarok.cc similarity index 99% rename from open_spiel/games/tarok.cc rename to open_spiel/games/tarok/tarok.cc index 8fb72bb122..5ae4c4380f 100644 --- a/open_spiel/games/tarok.cc +++ b/open_spiel/games/tarok/tarok.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tarok.h" +#include "open_spiel/games/tarok/tarok.h" #include #include diff --git a/open_spiel/games/tarok.h b/open_spiel/games/tarok/tarok.h similarity index 100% rename from open_spiel/games/tarok.h rename to open_spiel/games/tarok/tarok.h diff --git a/open_spiel/games/tarok_test.cc b/open_spiel/games/tarok/tarok_test.cc similarity index 99% rename from open_spiel/games/tarok_test.cc rename to open_spiel/games/tarok/tarok_test.cc index 8a39336aa5..75bada08ab 100644 --- a/open_spiel/games/tarok_test.cc +++ b/open_spiel/games/tarok/tarok_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tarok.h" +#include "open_spiel/games/tarok/tarok.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/tic_tac_toe.cc b/open_spiel/games/tic_tac_toe/tic_tac_toe.cc similarity index 99% rename from open_spiel/games/tic_tac_toe.cc rename to open_spiel/games/tic_tac_toe/tic_tac_toe.cc index 21f7f6e2ed..1465dc0243 100644 --- a/open_spiel/games/tic_tac_toe.cc +++ b/open_spiel/games/tic_tac_toe/tic_tac_toe.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include #include diff --git a/open_spiel/games/tic_tac_toe.h b/open_spiel/games/tic_tac_toe/tic_tac_toe.h similarity index 100% rename from open_spiel/games/tic_tac_toe.h rename to open_spiel/games/tic_tac_toe/tic_tac_toe.h diff --git a/open_spiel/games/tic_tac_toe_test.cc b/open_spiel/games/tic_tac_toe/tic_tac_toe_test.cc similarity index 100% rename from open_spiel/games/tic_tac_toe_test.cc rename to open_spiel/games/tic_tac_toe/tic_tac_toe_test.cc diff --git a/open_spiel/games/tiny_bridge.cc b/open_spiel/games/tiny_bridge/tiny_bridge.cc similarity index 99% rename from open_spiel/games/tiny_bridge.cc rename to open_spiel/games/tiny_bridge/tiny_bridge.cc index 5a7cdfed40..7d3117c241 100644 --- a/open_spiel/games/tiny_bridge.cc +++ b/open_spiel/games/tiny_bridge/tiny_bridge.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tiny_bridge.h" +#include "open_spiel/games/tiny_bridge/tiny_bridge.h" #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" #include "open_spiel/algorithms/minimax.h" diff --git a/open_spiel/games/tiny_bridge.h b/open_spiel/games/tiny_bridge/tiny_bridge.h similarity index 100% rename from open_spiel/games/tiny_bridge.h rename to open_spiel/games/tiny_bridge/tiny_bridge.h diff --git a/open_spiel/games/tiny_bridge_test.cc b/open_spiel/games/tiny_bridge/tiny_bridge_test.cc similarity index 97% rename from open_spiel/games/tiny_bridge_test.cc rename to open_spiel/games/tiny_bridge/tiny_bridge_test.cc index f0755327c6..b478e14fef 100644 --- a/open_spiel/games/tiny_bridge_test.cc +++ b/open_spiel/games/tiny_bridge/tiny_bridge_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tiny_bridge.h" +#include "open_spiel/games/tiny_bridge/tiny_bridge.h" #include "open_spiel/algorithms/get_all_states.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/tiny_hanabi.cc b/open_spiel/games/tiny_hanabi/tiny_hanabi.cc similarity index 99% rename from open_spiel/games/tiny_hanabi.cc rename to open_spiel/games/tiny_hanabi/tiny_hanabi.cc index 50b62155f8..904d46926d 100644 --- a/open_spiel/games/tiny_hanabi.cc +++ b/open_spiel/games/tiny_hanabi/tiny_hanabi.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tiny_hanabi.h" +#include "open_spiel/games/tiny_hanabi/tiny_hanabi.h" #include diff --git a/open_spiel/games/tiny_hanabi.h b/open_spiel/games/tiny_hanabi/tiny_hanabi.h similarity index 100% rename from open_spiel/games/tiny_hanabi.h rename to open_spiel/games/tiny_hanabi/tiny_hanabi.h diff --git a/open_spiel/games/tiny_hanabi_test.cc b/open_spiel/games/tiny_hanabi/tiny_hanabi_test.cc similarity index 97% rename from open_spiel/games/tiny_hanabi_test.cc rename to open_spiel/games/tiny_hanabi/tiny_hanabi_test.cc index aa75c88161..f9eb5ee714 100644 --- a/open_spiel/games/tiny_hanabi_test.cc +++ b/open_spiel/games/tiny_hanabi/tiny_hanabi_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tiny_hanabi.h" +#include "open_spiel/games/tiny_hanabi/tiny_hanabi.h" #include "open_spiel/algorithms/get_all_states.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/games/trade_comm.cc b/open_spiel/games/trade_comm/trade_comm.cc similarity index 99% rename from open_spiel/games/trade_comm.cc rename to open_spiel/games/trade_comm/trade_comm.cc index 4e2000d1d0..11ba974f5a 100644 --- a/open_spiel/games/trade_comm.cc +++ b/open_spiel/games/trade_comm/trade_comm.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/trade_comm.h" +#include "open_spiel/games/trade_comm/trade_comm.h" #include #include diff --git a/open_spiel/games/trade_comm.h b/open_spiel/games/trade_comm/trade_comm.h similarity index 100% rename from open_spiel/games/trade_comm.h rename to open_spiel/games/trade_comm/trade_comm.h diff --git a/open_spiel/games/trade_comm_test.cc b/open_spiel/games/trade_comm/trade_comm_test.cc similarity index 98% rename from open_spiel/games/trade_comm_test.cc rename to open_spiel/games/trade_comm/trade_comm_test.cc index 807444edef..a252f538b8 100644 --- a/open_spiel/games/trade_comm_test.cc +++ b/open_spiel/games/trade_comm/trade_comm_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/trade_comm.h" +#include "open_spiel/games/trade_comm/trade_comm.h" #include #include diff --git a/open_spiel/games/2048.cc b/open_spiel/games/twenty_forty_eight/2048.cc similarity index 99% rename from open_spiel/games/2048.cc rename to open_spiel/games/twenty_forty_eight/2048.cc index c707dbef43..e9b6833ca9 100644 --- a/open_spiel/games/2048.cc +++ b/open_spiel/games/twenty_forty_eight/2048.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/2048.h" +#include "open_spiel/games/twenty_forty_eight/2048.h" #include #include diff --git a/open_spiel/games/2048.h b/open_spiel/games/twenty_forty_eight/2048.h similarity index 100% rename from open_spiel/games/2048.h rename to open_spiel/games/twenty_forty_eight/2048.h diff --git a/open_spiel/games/2048_test.cc b/open_spiel/games/twenty_forty_eight/2048_test.cc similarity index 99% rename from open_spiel/games/2048_test.cc rename to open_spiel/games/twenty_forty_eight/2048_test.cc index 4f3bc6ba22..1cb0603be5 100644 --- a/open_spiel/games/2048_test.cc +++ b/open_spiel/games/twenty_forty_eight/2048_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/2048.h" +#include "open_spiel/games/twenty_forty_eight/2048.h" #include "open_spiel/spiel.h" #include "open_spiel/tests/basic_tests.h" diff --git a/open_spiel/games/ultimate_tic_tac_toe.cc b/open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe.cc similarity index 98% rename from open_spiel/games/ultimate_tic_tac_toe.cc rename to open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe.cc index 26737c4c45..04459986d5 100644 --- a/open_spiel/games/ultimate_tic_tac_toe.cc +++ b/open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/ultimate_tic_tac_toe.h" +#include "open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe.h" #include #include @@ -20,7 +20,7 @@ #include #include "open_spiel/abseil-cpp/absl/strings/str_cat.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel_globals.h" #include "open_spiel/spiel_utils.h" #include "open_spiel/utils/tensor_view.h" diff --git a/open_spiel/games/ultimate_tic_tac_toe.h b/open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe.h similarity index 98% rename from open_spiel/games/ultimate_tic_tac_toe.h rename to open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe.h index 875d105d90..df1f089a91 100644 --- a/open_spiel/games/ultimate_tic_tac_toe.h +++ b/open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe.h @@ -21,7 +21,7 @@ #include #include -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/spiel.h" #include "open_spiel/spiel_globals.h" diff --git a/open_spiel/games/ultimate_tic_tac_toe_test.cc b/open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe_test.cc similarity index 100% rename from open_spiel/games/ultimate_tic_tac_toe_test.cc rename to open_spiel/games/ultimate_tic_tac_toe/ultimate_tic_tac_toe_test.cc diff --git a/open_spiel/games/universal_poker.cc b/open_spiel/games/universal_poker/universal_poker.cc similarity index 99% rename from open_spiel/games/universal_poker.cc rename to open_spiel/games/universal_poker/universal_poker.cc index 7704d42c98..271ed355c1 100644 --- a/open_spiel/games/universal_poker.cc +++ b/open_spiel/games/universal_poker/universal_poker.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/universal_poker.h" +#include "open_spiel/games/universal_poker/universal_poker.h" #include #include diff --git a/open_spiel/games/universal_poker.h b/open_spiel/games/universal_poker/universal_poker.h similarity index 100% rename from open_spiel/games/universal_poker.h rename to open_spiel/games/universal_poker/universal_poker.h diff --git a/open_spiel/games/universal_poker_test.cc b/open_spiel/games/universal_poker/universal_poker_test.cc similarity index 99% rename from open_spiel/games/universal_poker_test.cc rename to open_spiel/games/universal_poker/universal_poker_test.cc index bcf77c1ff5..ce7c124fdf 100644 --- a/open_spiel/games/universal_poker_test.cc +++ b/open_spiel/games/universal_poker/universal_poker_test.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/universal_poker.h" +#include "open_spiel/games/universal_poker/universal_poker.h" #include #include diff --git a/open_spiel/games/y.cc b/open_spiel/games/y/y.cc similarity index 99% rename from open_spiel/games/y.cc rename to open_spiel/games/y/y.cc index 3b49b66ff0..cdc498784f 100644 --- a/open_spiel/games/y.cc +++ b/open_spiel/games/y/y.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/y.h" +#include "open_spiel/games/y/y.h" #include #include diff --git a/open_spiel/games/y.h b/open_spiel/games/y/y.h similarity index 100% rename from open_spiel/games/y.h rename to open_spiel/games/y/y.h diff --git a/open_spiel/games/y_test.cc b/open_spiel/games/y/y_test.cc similarity index 100% rename from open_spiel/games/y_test.cc rename to open_spiel/games/y/y_test.cc diff --git a/open_spiel/python/pybind11/games_backgammon.cc b/open_spiel/python/pybind11/games_backgammon.cc index 1782d2e291..0917e12a4a 100644 --- a/open_spiel/python/pybind11/games_backgammon.cc +++ b/open_spiel/python/pybind11/games_backgammon.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_backgammon.h" -#include "open_spiel/games/backgammon.h" +#include "open_spiel/games/backgammon/backgammon.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_bargaining.cc b/open_spiel/python/pybind11/games_bargaining.cc index a7373b1ad5..0e1a1eaed1 100644 --- a/open_spiel/python/pybind11/games_bargaining.cc +++ b/open_spiel/python/pybind11/games_bargaining.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_bargaining.h" -#include "open_spiel/games/bargaining.h" +#include "open_spiel/games/bargaining/bargaining.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_bridge.cc b/open_spiel/python/pybind11/games_bridge.cc index ff38f1d4f7..d0cbaecc56 100644 --- a/open_spiel/python/pybind11/games_bridge.cc +++ b/open_spiel/python/pybind11/games_bridge.cc @@ -16,7 +16,7 @@ #include -#include "open_spiel/games/bridge.h" +#include "open_spiel/games/bridge/bridge.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_chess.cc b/open_spiel/python/pybind11/games_chess.cc index 89bc4bcdb6..4ef496ec16 100644 --- a/open_spiel/python/pybind11/games_chess.cc +++ b/open_spiel/python/pybind11/games_chess.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_chess.h" -#include "open_spiel/games/chess.h" +#include "open_spiel/games/chess/chess.h" #include "open_spiel/games/chess/chess_board.h" #include "open_spiel/games/chess/chess_common.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_colored_trails.cc b/open_spiel/python/pybind11/games_colored_trails.cc index 292ac9766f..7dcf2e491e 100644 --- a/open_spiel/python/pybind11/games_colored_trails.cc +++ b/open_spiel/python/pybind11/games_colored_trails.cc @@ -16,7 +16,7 @@ #include -#include "open_spiel/games/colored_trails.h" +#include "open_spiel/games/colored_trails/colored_trails.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_euchre.cc b/open_spiel/python/pybind11/games_euchre.cc index fb4f48a982..b98c071fa8 100644 --- a/open_spiel/python/pybind11/games_euchre.cc +++ b/open_spiel/python/pybind11/games_euchre.cc @@ -16,7 +16,7 @@ #include -#include "open_spiel/games/euchre.h" +#include "open_spiel/games/euchre/euchre.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_gin_rummy.cc b/open_spiel/python/pybind11/games_gin_rummy.cc index 5176a700d8..b631b3a983 100644 --- a/open_spiel/python/pybind11/games_gin_rummy.cc +++ b/open_spiel/python/pybind11/games_gin_rummy.cc @@ -17,7 +17,7 @@ #include #include -#include "open_spiel/games/gin_rummy.h" +#include "open_spiel/games/gin_rummy/gin_rummy.h" #include "open_spiel/games/gin_rummy/gin_rummy_utils.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_kuhn_poker.cc b/open_spiel/python/pybind11/games_kuhn_poker.cc index ffb751d0af..0dc442513f 100644 --- a/open_spiel/python/pybind11/games_kuhn_poker.cc +++ b/open_spiel/python/pybind11/games_kuhn_poker.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_kuhn_poker.h" -#include "open_spiel/games/kuhn_poker.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" #include "open_spiel/python/pybind11/pybind11.h" namespace py = ::pybind11; diff --git a/open_spiel/python/pybind11/games_leduc_poker.cc b/open_spiel/python/pybind11/games_leduc_poker.cc index 1def2531da..647f2506e3 100644 --- a/open_spiel/python/pybind11/games_leduc_poker.cc +++ b/open_spiel/python/pybind11/games_leduc_poker.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_leduc_poker.h" -#include "open_spiel/games/leduc_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_negotiation.cc b/open_spiel/python/pybind11/games_negotiation.cc index e82da4eb7a..7acd7e3e78 100644 --- a/open_spiel/python/pybind11/games_negotiation.cc +++ b/open_spiel/python/pybind11/games_negotiation.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_negotiation.h" -#include "open_spiel/games/negotiation.h" +#include "open_spiel/games/negotiation/negotiation.h" #include "open_spiel/python/pybind11/pybind11.h" #include "open_spiel/spiel.h" diff --git a/open_spiel/python/pybind11/games_tarok.cc b/open_spiel/python/pybind11/games_tarok.cc index 4fc9771e88..3a469c3688 100644 --- a/open_spiel/python/pybind11/games_tarok.cc +++ b/open_spiel/python/pybind11/games_tarok.cc @@ -12,7 +12,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -#include "open_spiel/games/tarok.h" +#include "open_spiel/games/tarok/tarok.h" #include "open_spiel/python/pybind11/pybind11.h" PYBIND11_SMART_HOLDER_TYPE_CASTERS(open_spiel::tarok::TarokState); diff --git a/open_spiel/python/pybind11/games_tiny_bridge.cc b/open_spiel/python/pybind11/games_tiny_bridge.cc index 22b22ba507..eff5d6eaec 100644 --- a/open_spiel/python/pybind11/games_tiny_bridge.cc +++ b/open_spiel/python/pybind11/games_tiny_bridge.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_tiny_bridge.h" -#include "open_spiel/games/tiny_bridge.h" +#include "open_spiel/games/tiny_bridge/tiny_bridge.h" #include "open_spiel/spiel.h" #include "open_spiel/python/pybind11/pybind11.h" diff --git a/open_spiel/python/pybind11/games_trade_comm.cc b/open_spiel/python/pybind11/games_trade_comm.cc index 22b4c009eb..7f0d7a7924 100644 --- a/open_spiel/python/pybind11/games_trade_comm.cc +++ b/open_spiel/python/pybind11/games_trade_comm.cc @@ -14,7 +14,7 @@ #include "open_spiel/python/pybind11/games_trade_comm.h" -#include "open_spiel/games/trade_comm.h" +#include "open_spiel/games/trade_comm/trade_comm.h" #include "open_spiel/spiel.h" #include "open_spiel/python/pybind11/pybind11.h" diff --git a/open_spiel/python/pybind11/pyspiel.cc b/open_spiel/python/pybind11/pyspiel.cc index b19643b26f..d08f5b08be 100644 --- a/open_spiel/python/pybind11/pyspiel.cc +++ b/open_spiel/python/pybind11/pyspiel.cc @@ -21,9 +21,9 @@ #include "open_spiel/algorithms/tensor_game_utils.h" #include "open_spiel/canonical_game_strings.h" #include "open_spiel/game_parameters.h" -#include "open_spiel/games/efg_game.h" -#include "open_spiel/games/efg_game_data.h" -#include "open_spiel/games/nfg_game.h" +#include "open_spiel/games/efg_game/efg_game.h" +#include "open_spiel/games/efg_game/efg_game_data.h" +#include "open_spiel/games/nfg_game/nfg_game.h" #include "open_spiel/matrix_game.h" #include "open_spiel/normal_form_game.h" #include "open_spiel/observer.h" diff --git a/open_spiel/tests/spiel_test.cc b/open_spiel/tests/spiel_test.cc index 6e7789e3fb..45516fc0e5 100644 --- a/open_spiel/tests/spiel_test.cc +++ b/open_spiel/tests/spiel_test.cc @@ -20,10 +20,10 @@ #include #include -#include "open_spiel/games/kuhn_poker.h" -#include "open_spiel/games/leduc_poker.h" -#include "open_spiel/games/liars_dice.h" -#include "open_spiel/games/tic_tac_toe.h" +#include "open_spiel/games/kuhn_poker/kuhn_poker.h" +#include "open_spiel/games/leduc_poker/leduc_poker.h" +#include "open_spiel/games/liars_dice/liars_dice.h" +#include "open_spiel/games/tic_tac_toe/tic_tac_toe.h" #include "open_spiel/policy.h" #include "open_spiel/simultaneous_move_game.h" #include "open_spiel/spiel_utils.h"