test_liapunov_value_reference -> test_liap_value_max_regret_reference

Author: rahulsavani

tests/test_mixed.py

@@ -501,49 +501,55 @@ def test_strategy_value_reference(game: gbt.Game, profile_data: list, rational_f
 
 
 @pytest.mark.parametrize(
-    "game,profile_data,liap_expected,tol,rational_flag",
+    "game,profile_data,liap_exp,max_regret_exp,tol,rational_flag",
     [
      ##############################################################################
      # Zero matrix nfg, all liap_values are zero
-     (games.create_2x2_zero_nfg(), [["3/4", "1/4"], ["2/5", "3/5"]], 0, ZERO, True),
-     (games.create_2x2_zero_nfg(), [["1/2", "1/2"], ["1/2", "1/2"]], 0, ZERO, True),
-     (games.create_2x2_zero_nfg(), [[1, 0], [1, 0]], 0, ZERO, True),
-     (games.create_2x2_zero_nfg(), [[1/4, 3/4], [2/5, 3/5]], 0, TOL, False),
+     (games.create_2x2_zero_nfg(), [["3/4", "1/4"], ["2/5", "3/5"]], 0, 0, ZERO, True),
+     (games.create_2x2_zero_nfg(), [["1/2", "1/2"], ["1/2", "1/2"]], 0, 0, ZERO, True),
+     (games.create_2x2_zero_nfg(), [[1, 0], [1, 0]], 0, 0, ZERO, True),
+     (games.create_2x2_zero_nfg(), [[1/4, 3/4], [2/5, 3/5]], 0, 0, TOL, False),
      ##############################################################################
      # 4x4 coordination nfg
-     (games.create_coord_4x4_nfg(), None, 0, ZERO, True),
-     (games.create_coord_4x4_nfg(), None, 0, TOL, False),
+     (games.create_coord_4x4_nfg(), None, 0, 0, ZERO, True),
+     (games.create_coord_4x4_nfg(), None, 0, 0, TOL, False),
+     (games.create_coord_4x4_nfg(), [[1, 0, 0, 0], [1, 0, 0, 0]], 0, 0, ZERO, True),
+     (games.create_coord_4x4_nfg(), [[1, 0, 0, 0], [1, 0, 0, 0]], 0, 0, TOL, False),
      (games.create_coord_4x4_nfg(),
-      [["1/3", "1/2", "1/12", "1/12"], ["3/8", "1/8", "1/4", "1/4"]], "245/2304", ZERO, True),
-     (games.create_coord_4x4_nfg(),
-      [["1/4", "1/4", "1/4", "1/4"], ["1/4", "1/4", "1/4", "1/4"]], 0, ZERO, True),
-     (games.create_coord_4x4_nfg(), [[1, 0, 0, 0], [1, 0, 0, 0]], 0, ZERO, True),
+      [["1/3", "1/2", "1/12", "1/12"], ["3/8", "1/8", "1/4", "1/4"]],
+      "245/2304", "13/48", ZERO, True),
      (games.create_coord_4x4_nfg(), [[1/3, 1/2, 1/12, 1/12], [3/8, 1/8, 1/4, 1/4]],
-      245/2304, TOL, False),
+      245/2304, 13/48, TOL, False),
+     (games.create_coord_4x4_nfg(),
+      [["1/3", 0, 0, "2/3"], [1, 0, 0, 0]], "5/9", "2/3", ZERO, True),
+     (games.create_coord_4x4_nfg(),
+      [[1/3, 0, 0, 2/3], [1, 0, 0, 0]], 5/9, 2/3, TOL, False),
      ##############################################################################
      # El Farol bar game efg
      (games.create_el_farol_bar_game_efg(),
-      [["1/2", "1/2"], ["1/2", "1/2"], ["1/2", "1/2"], ["1/2", "1/2"], ["1/2", "1/2"]], "0",
-      ZERO, True),
-     (games.create_el_farol_bar_game_efg(),
-      [["1/1", "0/1"], ["1/1", "0/1"], ["0/1", "1/1"], ["0/1", "1/1"], ["0/1", "1/1"]], "0",
-      ZERO, True),
+      [["1/2", "1/2"], ["1/2", "1/2"], ["1/2", "1/2"], ["1/2", "1/2"], ["1/2", "1/2"]],
+      0, 0, ZERO, True),
+     (games.create_el_farol_bar_game_efg(), [[1, 0], [1, 0], [0, 1], [0, 1], [0, 1]],
+      0, 0, ZERO, True),
      ##############################################################################
-     # 2x2x2 nfg with 2 pure and 1 mixed eq
-     (games.create_2x2x2_nfg(), [[1, 0], [1, 0], [1, 0]], 18, ZERO, True),  # 4^2+1+1
-     (games.create_2x2x2_nfg(), [[0, 1], [0, 1], [0, 1]], 18, ZERO, True),  # 4^2+1+1
-     (games.create_2x2x2_nfg(), [[1, 0], [0, 1], [1, 0]], 0, ZERO, True),
-     (games.create_2x2x2_nfg(), [[0, 1], [1, 0], [0, 1]], 0, ZERO, True),
-     (games.create_2x2x2_nfg(), None, 0, ZERO, True),  # uniform is Nash
+     # # 2x2x2 nfg with 2 pure and 1 mixed eq
+     (games.create_2x2x2_nfg(), [[1, 0], [1, 0], [1, 0]], 18, 4, ZERO, True),  # 4^2+1+1
+     (games.create_2x2x2_nfg(), [[0, 1], [0, 1], [0, 1]], 18, 4, ZERO, True),  # 4^2+1+1
+     (games.create_2x2x2_nfg(), [[1, 0], [0, 1], [1, 0]], 0, 0, ZERO, True),
+     (games.create_2x2x2_nfg(), [[0, 1], [1, 0], [0, 1]], 0, 0, ZERO, True),
+     (games.create_2x2x2_nfg(), None, 0, 0, ZERO, True),  # uniform is Nash
     ]
 )
-def test_liapunov_value_reference(game: gbt.Game, profile_data: list,
-                                  liap_expected: float | str,
-                                  tol: float | gbt.Rational | int,
-                                  rational_flag: bool):
-    liap_expected = gbt.Rational(liap_expected) if rational_flag else liap_expected
+def test_liap_value_max_regret_reference(game: gbt.Game, profile_data: list,
+                                         liap_exp: float | str,
+                                         max_regret_exp: float | str,
+                                         tol: float | gbt.Rational | int,
+                                         rational_flag: bool):
     profile = game.mixed_strategy_profile(rational=rational_flag, data=profile_data)
-    assert abs(profile.liap_value() - liap_expected) <= tol
+    liap_exp = gbt.Rational(liap_exp) if rational_flag else liap_exp
+    max_regret_exp = gbt.Rational(max_regret_exp) if rational_flag else max_regret_exp
+    assert abs(profile.liap_value() - liap_exp) <= tol
+    assert abs(profile.max_regret() - max_regret_exp) <= tol
 
 
 @pytest.mark.parametrize(