[WIP] Integrate drawtree

.gitignore

@@ -20,6 +20,7 @@ _build
 build
 *.egg-info
 *.pyc
+*.so
 
 config.guess
 config.sub
@@ -39,6 +40,5 @@ dist
 .venv
 *.dmg
 Gambit.app/*
-*.so
-doc/tutorials/games/*.nfg
-doc/tutorials/games/*.efg
+*.ef
+doc/tutorials/*.ipynb_checkpoints

.readthedocs.yml

@@ -12,6 +12,7 @@ build:
   apt_packages:
     - libgmp-dev
     - pandoc
+    - texlive-full
 
 python:
   install:

Makefile.am

@@ -313,6 +313,8 @@ game_SOURCES = \
 	src/games/file.cc \
 	src/games/writer.cc \
 	src/games/writer.h \
+	src/games/layout.cc \
+    src/games/layout.h \
 	${agg_SOURCES} \
 	src/games/nash.h
 

doc/pygambit.rst

@@ -23,7 +23,7 @@ They are numbered in the order they should be read.
    tutorials/running_locally
    tutorials/01_quickstart
    tutorials/02_extensive_form
-   tutorials/03_poker
+   tutorials/03_stripped_down_poker
 
 Advanced user tutorials
 -----------------------
@@ -44,6 +44,17 @@ Advanced tutorials:
    tutorials/advanced_tutorials/quantal_response
    .. pygambit.external_programs
 
+Interoperability tutorials
+--------------------------
+
+These tutorials demonstrate how to use PyGambit alongside other game-theoretic software packages.
+These tutorials assume you have read the new user tutorials and are familiar with the PyGambit API, however they do not assume prior knowledge of the other software packages or an advanced understanding of Game Theory:
+
+.. toctree::
+   :maxdepth: 2
+
+   tutorials/interoperability_tutorials/openspiel
+
 Algorithms for computing Nash equilibria
 ----------------------------------------
 

doc/requirements.txt

@@ -9,3 +9,5 @@ ipython==9.4.0
 matplotlib==3.10.5
 pickleshare==0.7.5
 jupyter==1.1.1
+open_spiel==1.6.9
+draw-tree @ git+https://github.com/gambitproject/draw_tree.git@main

doc/tutorials/02_extensive_form.ipynb

@@ -29,17 +29,18 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 12,
    "id": "5946289b",
    "metadata": {},
    "outputs": [],
    "source": [
-    "import pygambit as gbt"
+    "import pygambit as gbt\n",
+    "from draw_tree import draw_tree"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 13,
    "id": "91ed4dfb",
    "metadata": {},
    "outputs": [],
@@ -60,7 +61,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 14,
    "id": "3cd94917",
    "metadata": {},
    "outputs": [
@@ -70,7 +71,7 @@
        "0"
       ]
      },
-     "execution_count": 3,
+     "execution_count": 14,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -91,7 +92,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 15,
    "id": "5d27a07a",
    "metadata": {},
    "outputs": [
@@ -101,7 +102,7 @@
        "2"
       ]
      },
-     "execution_count": 4,
+     "execution_count": 15,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -125,7 +126,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 16,
    "id": "47c4a31b",
    "metadata": {},
    "outputs": [],
@@ -151,7 +152,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 17,
    "id": "716e9b9a",
    "metadata": {},
    "outputs": [],
@@ -175,7 +176,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 18,
    "id": "695b1aad",
    "metadata": {},
    "outputs": [],
@@ -199,7 +200,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 19,
    "id": "0704ef86",
    "metadata": {},
    "outputs": [],
@@ -220,7 +221,30 @@
    "source": [
     "Nodes without an outcome attached are assumed to have payoffs of zero for all players.\n",
     "\n",
-    "Therefore, adding the outcome to this latter terminal node is not strictly necessary in Gambit, but it is useful to be explicit for readability."
+    "Therefore, adding the outcome to this latter terminal node is not strictly necessary in Gambit, but it is useful to be explicit for readability.\n",
+    "\n",
+    "Visualizing an extensive form game\n",
+    "----------------------------------\n",
+    "\n",
+    "We can visualize the game tree using the `draw_tree` package, which accepts a Gambit game object."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "9e1efa88",
+   "metadata": {},
+   "outputs": [
+    {
+     "name": "stderr",
+     "output_type": "stream",
+     "text": [
+      "/bin/sh: pdflatex: command not found\n"
+     ]
+    }
+   ],
+   "source": [
+    "# draw_tree(g)"
    ]
   },
   {
@@ -239,12 +263,13 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": null,
    "id": "37c51152",
    "metadata": {},
    "outputs": [],
    "source": [
-    "# g.to_efg(\"trust_game.efg\")"
+    "g.to_efg(\"trust_game.efg\")\n",
+    "draw_tree(\"trust_game.efg\")"
    ]
   },
   {
@@ -257,12 +282,26 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 21,
    "id": "0d86a750",
    "metadata": {},
-   "outputs": [],
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "Game(title='One-shot trust game, after Kreps (1990)')"
+      ],
+      "text/plain": [
+       "Game(title='One-shot trust game, after Kreps (1990)')"
+      ]
+     },
+     "execution_count": 21,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
    "source": [
-    "# gbt.read_efg(\"trust_game.efg\")"
+    "gbt.read_efg(\"trust_game.efg\")"
    ]
   },
   {

doc/tutorials/games/one_card_poker.efg

@@ -0,0 +1,14 @@
+EFG 2 R "One card poker" { "Alice" "Bob" }
+""
+
+c "" 1 "" { "King" 1/2 "Queen" 1/2 } 0
+p "King" 1 1 "" { "Raise" "Fold" } 0
+p "Raise" 2 1 "" { "Meet" "Pass" } 0
+t "Meet" 1 "Alice wins big" { 2, -2 }
+t "Pass" 2 "Alice wins" { 1, -1 }
+t "Fold" 4 "Bob wins" { -1, 1 }
+p "Queen" 1 2 "" { "Raise" "Fold" } 0
+p "Raise" 2 1 "" { "Meet" "Pass" } 0
+t "Meet" 3 "Bob wins big" { -2, 2 }
+t "Pass" 2 "Alice wins" { 1, -1 }
+t "Fold" 4 "Bob wins" { -1, 1 }

doc/tutorials/games/tiny_hanabi.efg

@@ -0,0 +1,58 @@
+EFG 2 R "tiny_hanabi()" { "Pl0" "Pl1" }
+""
+
+c "" 1 "" { "d0" 0.5000000000000000 "d1" 0.5000000000000000 } 0
+c "p0:d0" 2 "" { "d0" 0.5000000000000000 "d1" 0.5000000000000000 } 0
+p "" 1 1 "" { "p0a0" "p0a1" "p0a2" } 0
+p "" 2 1 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 1 "" { 10.0, 10.0 }
+t "" 2 "" { 0.0, 0.0 }
+t "" 3 "" { 0.0, 0.0 }
+p "" 2 2 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 4 "" { 4.0, 4.0 }
+t "" 5 "" { 8.0, 8.0 }
+t "" 6 "" { 4.0, 4.0 }
+p "" 2 3 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 7 "" { 10.0, 10.0 }
+t "" 8 "" { 0.0, 0.0 }
+t "" 9 "" { 0.0, 0.0 }
+p "" 1 1 "" { "p0a0" "p0a1" "p0a2" } 0
+p "" 2 4 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 10 "" { 0.0, 0.0 }
+t "" 11 "" { 0.0, 0.0 }
+t "" 12 "" { 10.0, 10.0 }
+p "" 2 5 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 13 "" { 4.0, 4.0 }
+t "" 14 "" { 8.0, 8.0 }
+t "" 15 "" { 4.0, 4.0 }
+p "" 2 6 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 16 "" { 0.0, 0.0 }
+t "" 17 "" { 0.0, 0.0 }
+t "" 18 "" { 10.0, 10.0 }
+c "p0:d1" 3 "" { "d0" 0.5000000000000000 "d1" 0.5000000000000000 } 0
+p "" 1 2 "" { "p0a0" "p0a1" "p0a2" } 0
+p "" 2 1 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 19 "" { 0.0, 0.0 }
+t "" 20 "" { 0.0, 0.0 }
+t "" 21 "" { 10.0, 10.0 }
+p "" 2 2 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 22 "" { 4.0, 4.0 }
+t "" 23 "" { 8.0, 8.0 }
+t "" 24 "" { 4.0, 4.0 }
+p "" 2 3 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 25 "" { 0.0, 0.0 }
+t "" 26 "" { 0.0, 0.0 }
+t "" 27 "" { 0.0, 0.0 }
+p "" 1 2 "" { "p0a0" "p0a1" "p0a2" } 0
+p "" 2 4 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 28 "" { 10.0, 10.0 }
+t "" 29 "" { 0.0, 0.0 }
+t "" 30 "" { 0.0, 0.0 }
+p "" 2 5 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 31 "" { 4.0, 4.0 }
+t "" 32 "" { 8.0, 8.0 }
+t "" 33 "" { 4.0, 4.0 }
+p "" 2 6 "" { "p1a0" "p1a1" "p1a2" } 0
+t "" 34 "" { 10.0, 10.0 }
+t "" 35 "" { 0.0, 0.0 }
+t "" 36 "" { 0.0, 0.0 }