Add a "solutions don't change" test for the ice-cream cone too.

[dunshire.git] / test / symmetric_linear_game_test.py

diff --git a/test/symmetric_linear_game_test.py b/test/symmetric_linear_game_test.py
index f5b48f4ac1f3e19bcec92d9357a511ebfd794df5..1e7194b6bf08e50c1739539469a36279d866f8c1 100644 (file)
--- a/test/symmetric_linear_game_test.py
+++ b/test/symmetric_linear_game_test.py
@@ -4,14 +4,13 @@ Unit tests for the :class:`SymmetricLinearGame` class.
 
 from unittest import TestCase
 
-from dunshire.cones import NonnegativeOrthant
 from dunshire.games import SymmetricLinearGame
 from dunshire.matrices import eigenvalues_re, inner_product, norm
 from dunshire import options
-from .randomgen import (RANDOM_MAX, random_icecream_game,
-                        random_ll_icecream_game, random_ll_orthant_game,
-                        random_nn_scaling, random_orthant_game,
-                        random_positive_orthant_game, random_translation)
+from .randomgen import (random_icecream_game, random_ll_icecream_game,
+                        random_ll_orthant_game, random_nn_scaling,
+                        random_orthant_game, random_positive_orthant_game,
+                        random_translation)
 
 
 # Tell pylint to shut up about the large number of methods.
@@ -43,6 +42,31 @@ class SymmetricLinearGameTest(TestCase): # pylint: disable=R0904
         self.assertTrue(abs(first - second) < options.ABS_TOL*modifier)
 
 
+    def test_solutions_dont_change_orthant(self):
+        G = random_orthant_game()
+        self.assert_solutions_dont_change(G)
+
+    def test_solutions_dont_change_icecream(self):
+        G = random_icecream_game()
+        self.assert_solutions_dont_change(G)
+
+    def assert_solutions_dont_change(self, G):
+        """
+        If we solve the same problem twice, we should get
+        the same answer both times.
+        """
+        soln1 = G.solution()
+        soln2 = G.solution()
+        p1_diff = norm(soln1.player1_optimal() - soln2.player1_optimal())
+        p2_diff = norm(soln1.player2_optimal() - soln2.player2_optimal())
+        gv_diff = abs(soln1.game_value() - soln2.game_value())
+
+        p1_close = p1_diff < options.ABS_TOL
+        p2_close = p2_diff < options.ABS_TOL
+        gv_close = gv_diff < options.ABS_TOL
+
+        self.assertTrue(p1_close and p2_close and gv_close)
+
 
     def test_condition_lower_bound(self):
         """
@@ -189,10 +213,15 @@ class SymmetricLinearGameTest(TestCase): # pylint: disable=R0904
         value = soln.game_value()
 
         ip1 = inner_product(y_bar, G.L()*x_bar - value*G.e1())
-        self.assert_within_tol(ip1, 0)
-
         ip2 = inner_product(value*G.e2() - G.L().trans()*y_bar, x_bar)
-        self.assert_within_tol(ip2, 0)
+
+        # Huh.. well, y_bar and x_bar can each be epsilon away, but
+        # x_bar is scaled by L, so that's (norm(L) + 1), and then
+        # value could be off by epsilon, so that's another norm(e1) or
+        # norm(e2). On the other hand, this test seems to pass most of
+        # the time even with a modifier of one. How about.. four?
+        self.assert_within_tol(ip1, 0, 4)
+        self.assert_within_tol(ip2, 0, 4)
 
 
     def test_orthogonality_orthant(self):