Skip to content

Commit

Permalink
Merge pull request #1103 from galcohensius:games_into_folders_fixed_cla2
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 554758995
Change-Id: If3de0a5beb8dcc7eb10e05925e194f152e596491
  • Loading branch information
@lanctot
lanctot committed Aug 8, 2023
2 parents 015e57c + e57dcb3 commit e5d79c4
Show file tree
Hide file tree
Showing 292 changed files with 461 additions and 466 deletions.
14 changes: 7 additions & 7 deletions open_spiel/algorithms/best_response_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions open_spiel/algorithms/cfr_br_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
10 changes: 5 additions & 5 deletions open_spiel/algorithms/cfr_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion open_spiel/algorithms/corr_dev_builder_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions open_spiel/algorithms/corr_dist_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions open_spiel/algorithms/deterministic_policy_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions open_spiel/algorithms/external_sampling_mccfr_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <random>

#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"

Expand Down
2 changes: 1 addition & 1 deletion open_spiel/algorithms/get_all_histories_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/algorithms/get_all_states_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions open_spiel/algorithms/get_legal_actions_map_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@

#include <unordered_map>

#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;
Expand Down
10 changes: 5 additions & 5 deletions open_spiel/algorithms/history_tree_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions open_spiel/algorithms/infostate_tree_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
#include <memory>
#include <utility>

#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"

Expand Down
2 changes: 1 addition & 1 deletion open_spiel/algorithms/matrix_game_utils_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions open_spiel/algorithms/minimax_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@

#include <cmath>

#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"

Expand Down
4 changes: 2 additions & 2 deletions open_spiel/algorithms/outcome_sampling_mccfr_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
#include <random>

#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"

Expand Down
10 changes: 5 additions & 5 deletions open_spiel/algorithms/tabular_exploitability_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/algorithms/tabular_q_learning_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/algorithms/tabular_sarsa_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion open_spiel/bots/gin_rummy/simple_gin_rummy_bot.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <utility>
#include <vector>

#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"
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/bots/gin_rummy/simple_gin_rummy_bot_example.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/bots/gin_rummy/simple_gin_rummy_bot_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include <vector>

#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"

Expand Down
2 changes: 1 addition & 1 deletion open_spiel/bots/uci/random_uci_bot.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/bots/uci/uci_bot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/bots/xinxin/xinxin_bot.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/examples/fsicfr_liars_dice.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/examples/imperfect_recall_mccfr.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
4 changes: 2 additions & 2 deletions open_spiel/examples/minimax_example.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
#include <memory>

#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"

Expand Down
2 changes: 1 addition & 1 deletion open_spiel/examples/policy_iteration_example.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <string>

#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"

Expand Down
2 changes: 1 addition & 1 deletion open_spiel/examples/tabular_q_learning_example.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/examples/tabular_sarsa_example.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion open_spiel/game_transforms/zerosum_test.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading

0 comments on commit e5d79c4

Please sign in to comment.