Merge branch 'master' of github.com:w07wong/open_spiel

KezhiAdore · Jan 18, 2023 · 009399f · 009399f
2 parents 1c24c5c + fbfff28
commit 009399f
Show file tree

Hide file tree

Showing 32 changed files with 7,333 additions and 39 deletions.
diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
@@ -76,7 +76,7 @@ jobs:
           source ./open_spiel/scripts/python_extra_deps.sh
           ${CI_PYBIN} -m pip install --upgrade $OPEN_SPIEL_PYTHON_JAX_DEPS $OPEN_SPIEL_PYTHON_PYTORCH_DEPS $OPEN_SPIEL_PYTHON_TENSORFLOW_DEPS $OPEN_SPIEL_PYTHON_MISC_DEPS
           ${CI_PYBIN} -m pip install twine
-          ${CI_PYBIN} -m pip install cibuildwheel==2.5.0
+          ${CI_PYBIN} -m pip install cibuildwheel==2.11.1
       - name: Build sdist
         run: |
           pipx run build --sdist

diff --git a/Dockerfile.base b/Dockerfile.base
@@ -1,6 +1,5 @@
 FROM ubuntu:20.04 as base
 RUN apt update
-RUN dpkg --add-architecture i386 && apt update
 RUN apt-get -y install \
     clang \
     curl \

diff --git a/Dockerfile.jupyter b/Dockerfile.jupyter
@@ -1,6 +1,5 @@
 FROM ubuntu:20.04 as base
 RUN apt update
-RUN dpkg --add-architecture i386 && apt update
 RUN apt-get -y install \
     clang \
     curl \
@@ -21,14 +20,14 @@ RUN sudo pip3 install matplotlib
 COPY . .
 RUN DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata
 RUN ./install.sh
-RUN pip3 install --upgrade setuptools testresources 
+RUN pip3 install --upgrade setuptools testresources
 RUN pip3 install --upgrade -r requirements.txt
 RUN pip3 install --upgrade cmake
 
 # build and test
 RUN mkdir -p build
 WORKDIR /repo/build
-RUN cmake -DPython_TARGET_VERSION=${PYVERSION} -DCMAKE_CXX_COMPILER=`which clang++` ../open_spiel 
+RUN cmake -DPython_TARGET_VERSION=${PYVERSION} -DCMAKE_CXX_COMPILER=`which clang++` ../open_spiel
 RUN make -j12
 ENV PYTHONPATH=${PYTHONPATH}:/repo
 ENV PYTHONPATH=${PYTHONPATH}:/repo/build/python

diff --git a/docs/games.md b/docs/games.md
@@ -30,6 +30,7 @@ Status                                       | Game
 ![](_static/green_circ10.png "green circle") | [Chess](#chess)
 <font color="orange"><b>~</b></font>         | [Dark Hex](#dark-hex)
 <font color="orange"><b>~</b></font>         | [Deep Sea](#deep-sea)
+<font color="orange"><b>~</b></font>         | [Dou Dizhu](#dou-dizhu)
 <font color="orange"><b>~</b></font>         | [Euchre](#euchre)
 ![](_static/green_circ10.png "green circle") | [First-price Sealed-Bid Auction](#first-price-sealed-bid-auction)
 ![](_static/green_circ10.png "green circle") | [Gin Rummy](#gin-rummy)
@@ -46,6 +47,7 @@ Status                                       | Game
 <font color="orange"><b>~</b></font>         | [Lewis Signaling](#lewis-signaling)
 ![](_static/green_circ10.png "green circle") | [Liar's Dice](#liars-dice)
 <font color="orange"><b>~</b></font>         | [Liar's Poker](#liars-poker)
+<font color="orange"><b>~</b></font>         | [Mensch ärgere Dich nicht](#mensch-aergere-dich-nicht)
 <font color="orange"><b>~</b></font>         | [Mancala](#mancala)
 <font color="orange"><b>~</b></font>         | [Markov Soccer](#markov-soccer)
 ![](_static/green_circ10.png "green circle") | [Matching Pennies (Three-player)](#matching-pennies-three-player)
@@ -311,6 +313,16 @@ Status                                       | Game
 *   1 players.
 *   [Osband et al. '17, Deep Exploration via Randomized Value Functions](https://arxiv.org/abs/1703.07608)
 
+### Dou Dizhu
+
+*   A three-player games where one player (dizhu) plays against a team of two
+    (peasants).
+*   Uses a 54-card deck.
+*   Non-deterministic.
+*   Imperfect information.
+*   Three players.
+*   [Wikipeda](https://en.wikipedia.org/wiki/Dou_dizhu)
+
 ### Euchre
 
 *   Trick-taking card game where players compete in pairs.
@@ -475,6 +487,7 @@ Status                                       | Game
 *   2 players.
 *   [Wikipedia](https://en.wikipedia.org/wiki/Liar%27s_dice)
 
+
 ### Liar's Poker
 
 *   Players bid and bluff on the state of all hands, given only the state of
@@ -486,6 +499,18 @@ Status                                       | Game
 *   2 or more players.
 *   [Wikipedia](https://en.wikipedia.org/wiki/Liar%27s_poker)
 
+
+### Mensch Aergere Dich Nicht 
+
+*   Players roll dice to move their pegs toward their home row while throwing
+    other players' pegs to the out area.
+*   Traditional game.
+*   Non-deterministic.
+*   Perfect information.
+*   2-4 players.
+*   [Wikipedia](https://en.wikipedia.org/wiki/Mensch_%C3%A4rgere_Dich_nicht)
+
+
 ### Mancala
 
 *   Players take turns sowing beans on the board and try to capture more beans

diff --git a/open_spiel/games/CMakeLists.txt b/open_spiel/games/CMakeLists.txt
@@ -60,6 +60,10 @@ set(GAME_SOURCES
   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_utils.cc
+  dou_dizhu/dou_dizhu_utils.h
   efg_game.cc
   efg_game.h
   efg_game_data.cc
@@ -96,6 +100,8 @@ set(GAME_SOURCES
   lewis_signaling.h
   liars_dice.cc
   liars_dice.h
+  maedn.cc
+  maedn.h
   mancala.cc
   mancala.h
   markov_soccer.cc
@@ -383,6 +389,14 @@ add_executable(dynamic_routing_utils_test dynamic_routing/dynamic_routing_utils_
                $<TARGET_OBJECTS:tests>)
 add_test(dynamic_routing_utils_test dynamic_routing_utils_test)
 
+add_executable(dou_dizhu_test dou_dizhu_test.cc ${OPEN_SPIEL_OBJECTS}
+               $<TARGET_OBJECTS:tests>)
+add_test(dou_dizhu_test dou_dizhu_test)
+
+add_executable(dou_dizhu_utils_test dou_dizhu/dou_dizhu_utils_test.cc ${OPEN_SPIEL_OBJECTS}
+               $<TARGET_OBJECTS:tests>)
+add_test(dou_dizhu_utils_test dou_dizhu_utils_test)
+
 add_executable(efg_game_test efg_game_test.cc ${OPEN_SPIEL_OBJECTS}
                $<TARGET_OBJECTS:tests>)
 add_test(efg_game_test efg_game_test)
@@ -451,6 +465,10 @@ add_executable(liars_dice_test liars_dice_test.cc ${OPEN_SPIEL_OBJECTS}
                $<TARGET_OBJECTS:algorithms>)
 add_test(liars_dice_test liars_dice_test)
 
+add_executable(maedn_test maedn_test.cc ${OPEN_SPIEL_OBJECTS}
+               $<TARGET_OBJECTS:tests>)
+add_test(maedn_test maedn_test)
+
 add_executable(mancala_test mancala_test.cc ${OPEN_SPIEL_OBJECTS}
                $<TARGET_OBJECTS:tests>)
 add_test(mancala_test mancala_test)