From 1d8a088b982c0d5f26878e4b2794e9fc670b5bcb Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Tue, 15 Nov 2016 19:08:17 -0500 Subject: [PATCH] More minor doc cleanup. --- dunshire/games.py | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dunshire/games.py b/dunshire/games.py index e9ae21d..7dd2806 100644 --- a/dunshire/games.py +++ b/dunshire/games.py @@ -493,7 +493,6 @@ class SymmetricLinearGame: strategies:: >>> from dunshire import * - >>> from dunshire.options import ABS_TOL >>> K = NonnegativeOrthant(3) >>> L = [[1,-5,-15],[-1,2,-3],[-12,-15,1]] >>> e1 = [1,1,1] @@ -502,7 +501,7 @@ class SymmetricLinearGame: >>> soln = SLG.solution() >>> x_bar = soln.player1_optimal() >>> y_bar = soln.player2_optimal() - >>> abs(SLG.payoff(x_bar, y_bar) - soln.game_value()) < ABS_TOL + >>> SLG.payoff(x_bar, y_bar) == soln.game_value() True """ @@ -584,8 +583,9 @@ class SymmetricLinearGame: r""" Return the matrix ``A`` used in our CVXOPT construction. - This matrix :math:`A` appears on the right-hand side of :math:`Ax - = b` in the statement of the CVXOPT conelp program. + This matrix :math:`A` appears on the right-hand side of + :math:`Ax = b` in the `statement of the CVXOPT conelp program + `_. .. warning:: @@ -622,7 +622,8 @@ class SymmetricLinearGame: Return the matrix ``G`` used in our CVXOPT construction. Thus matrix :math:`G` appears on the left-hand side of :math:`Gx - + s = h` in the statement of the CVXOPT conelp program. + + s = h` in the `statement of the CVXOPT conelp program + `_. .. warning:: @@ -664,8 +665,9 @@ class SymmetricLinearGame: Return the vector ``c`` used in our CVXOPT construction. The column vector :math:`c` appears in the objective function - value :math:`\left\langle c,x \right\rangle` in the statement of - the CVXOPT conelp program. + value :math:`\left\langle c,x \right\rangle` in the `statement + of the CVXOPT conelp program + `_. .. warning:: @@ -702,7 +704,9 @@ class SymmetricLinearGame: """ Return the cone ``C`` used in our CVXOPT construction. - This is the cone over which the conelp program takes place. + This is the cone over which the `CVXOPT conelp program + `_ + takes place. Returns ------- @@ -731,8 +735,9 @@ class SymmetricLinearGame: r""" Return the ``h`` vector used in our CVXOPT construction. - The :math:`h` vector appears on the right-hand side of :math:`Gx + s - = h` in the statement of the CVXOPT conelp program. + The :math:`h` vector appears on the right-hand side of :math:`Gx + + s = h` in the `statement of the CVXOPT conelp program + `_. .. warning:: @@ -773,8 +778,9 @@ class SymmetricLinearGame: r""" Return the ``b`` vector used in our CVXOPT construction. - The vector ``b`` appears on the right-hand side of :math:`Ax = - b` in the statement of the CVXOPT conelp program. + The vector :math:`b` appears on the right-hand side of :math:`Ax + = b` in the `statement of the CVXOPT conelp program + `_. This method is static because the dimensions and entries of ``b`` are known beforehand, and don't depend on any other @@ -1237,8 +1243,12 @@ class SymmetricLinearGame: can show up. We define the condition number of this game to be the average of the condition numbers of ``G`` and ``A`` in the CVXOPT construction. If the condition number of this game is - high, then you can expect numerical difficulty (such as - :class:`PoorScalingException`). + high, you can problems like :class:`PoorScalingException`. + + Random testing shows that a condition number of around ``125`` + is about the best that we can solve reliably. However, the + failures are intermittent, and you may get lucky with an + ill-conditioned game. Returns ------- -- 2.44.2