Skip to content

Commit 02fe6a5

Browse files
committed
minor reorder
1 parent 7d741e5 commit 02fe6a5

1 file changed

Lines changed: 26 additions & 28 deletions

File tree

tests/test_nash.py

Lines changed: 26 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -216,31 +216,6 @@ class EquilibriumTestCase:
216216
]
217217

218218

219-
def test_enummixed_double():
220-
"""Test calls of enumeration of mixed strategy equilibria for 2-player games,
221-
floating-point."""
222-
game = games.read_from_file("stripped_down_poker.efg")
223-
result = gbt.nash.enummixed_solve(game, rational=False)
224-
assert len(result.equilibria) == 1
225-
# For floating-point results are not exact, so we skip testing exact values for now
226-
227-
228-
def test_lp_strategy_double():
229-
"""Test calls of LP for mixed strategy equilibria, floating-point."""
230-
game = games.read_from_file("stripped_down_poker.efg")
231-
result = gbt.nash.lp_solve(game, use_strategic=True, rational=False)
232-
assert len(result.equilibria) == 1
233-
# For floating-point results are not exact, so we skip testing exact values for now
234-
235-
236-
def test_lcp_strategy_double():
237-
"""Test calls of LCP for mixed strategy equilibria, floating-point."""
238-
game = games.read_from_file("stripped_down_poker.efg")
239-
result = gbt.nash.lcp_solve(game, use_strategic=True, rational=False)
240-
assert len(result.equilibria) == 1
241-
# For floating-point results are not exact, so we skip testing exact values for now
242-
243-
244219
LP_STRATEGY_RATIONAL_CASES = [
245220
pytest.param(
246221
EquilibriumTestCase(
@@ -466,6 +441,31 @@ def test_nash_strategy_solver(test_case: EquilibriumTestCase, subtests) -> None:
466441
assert abs(eq[strategy] - expected[strategy]) <= test_case.prob_tol
467442

468443

444+
def test_enummixed_double():
445+
"""Test calls of enumeration of mixed strategy equilibria for 2-player games,
446+
floating-point."""
447+
game = games.read_from_file("stripped_down_poker.efg")
448+
result = gbt.nash.enummixed_solve(game, rational=False)
449+
assert len(result.equilibria) == 1
450+
# For floating-point results are not exact, so we skip testing exact values for now
451+
452+
453+
def test_lp_strategy_double():
454+
"""Test calls of LP for mixed strategy equilibria, floating-point."""
455+
game = games.read_from_file("stripped_down_poker.efg")
456+
result = gbt.nash.lp_solve(game, use_strategic=True, rational=False)
457+
assert len(result.equilibria) == 1
458+
# For floating-point results are not exact, so we skip testing exact values for now
459+
460+
461+
def test_lcp_strategy_double():
462+
"""Test calls of LCP for mixed strategy equilibria, floating-point."""
463+
game = games.read_from_file("stripped_down_poker.efg")
464+
result = gbt.nash.lcp_solve(game, use_strategic=True, rational=False)
465+
assert len(result.equilibria) == 1
466+
# For floating-point results are not exact, so we skip testing exact values for now
467+
468+
469469
##################################################################################################
470470
# NASH SOLVER IN MIXED BEHAVIORS
471471
##################################################################################################
@@ -693,8 +693,6 @@ def test_nash_strategy_solver(test_case: EquilibriumTestCase, subtests) -> None:
693693
),
694694
]
695695

696-
#################################################################################################
697-
#################################################################################################
698696

699697
LCP_BEHAVIOR_RATIONAL_CASES = [
700698
# Zero-sum games (also tested with lp solve)
@@ -1441,7 +1439,7 @@ def test_nash_agent_solver_no_subtests_only_profile(test_case: EquilibriumTestCa
14411439
@pytest.mark.nash
14421440
@pytest.mark.parametrize("test_case", ENUMPOLY_AGENT_UNORDERED_CASES, ids=lambda c: c.label)
14431441
def test_nash_agent_solver_unordered(test_case: EquilibriumTestCase, subtests) -> None:
1444-
"""Test calls of Nash solvers in EFGs using "agent" versions.
1442+
"""Test calls of Nash solvers in EFGs using "agent" versions -- UNORDERED
14451443
14461444
Subtests:
14471445
- Agent max regret no more than `test_case.regret_tol`

0 commit comments

Comments
 (0)