of the game by the same number.
"""
(alpha, H) = random_nn_scaling(G)
- value1 = G.solution().game_value()
- value2 = H.solution().game_value()
- modifier = 4*max(abs(alpha), 1)
+ soln1 = G.solution()
+ soln2 = H.solution()
+ value1 = soln1.game_value()
+ value2 = soln2.game_value()
+ modifier1 = G.tolerance_scale(soln1)
+ modifier2 = H.tolerance_scale(soln2)
+ modifier = max(modifier1, modifier2)
self.assert_within_tol(alpha*value1, value2, modifier)
(alpha, H) = random_translation(G)
value2 = H.solution().game_value()
- modifier = 4*max(abs(alpha), 1)
+ modifier = G.tolerance_scale(soln1)
self.assert_within_tol(value1 + alpha, value2, modifier)
# Make sure the same optimal pair works.
y_bar = soln1.player2_optimal()
soln2 = H.solution()
- # The modifier of 4 is because each could be off by 2*ABS_TOL,
- # which is how far apart the primal/dual objectives have been
- # observed being.
- self.assert_within_tol(-soln1.game_value(), soln2.game_value(), 4)
+ mod = G.tolerance_scale(soln1)
+ self.assert_within_tol(-soln1.game_value(), soln2.game_value(), mod)
# Make sure the switched optimal pair works. Since x_bar and
# y_bar come from G, we use the same modifier.
- self.assert_within_tol(soln2.game_value(), H.payoff(y_bar, x_bar), 4)
+ self.assert_within_tol(soln2.game_value(), H.payoff(y_bar, x_bar), mod)
ip1 = inner_product(y_bar, G.L()*x_bar - value*G.e1())
ip2 = inner_product(value*G.e2() - G.L().trans()*y_bar, x_bar)
- # 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)
+ modifier = G.tolerance_scale(soln)
+ self.assert_within_tol(ip1, 0, modifier)
+ self.assert_within_tol(ip2, 0, modifier)
def test_orthogonality_orthant(self):
negative_stable = all([eig < options.ABS_TOL for eig in eigs])
self.assertTrue(negative_stable)
- # The dual game's value should always equal the primal's.
- # The modifier of 4 is because even though the games are dual,
- # CVXOPT doesn't know that, and each could be off by 2*ABS_TOL.
dualsoln = G.dual().solution()
- self.assert_within_tol(dualsoln.game_value(), soln.game_value(), 4)
+ mod = G.tolerance_scale(soln)
+ self.assert_within_tol(dualsoln.game_value(), soln.game_value(), mod)
def test_lyapunov_orthant(self):