X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=dunshire%2Fgames.py;h=71da5edbc561de3608e324c309c8ea3914213ce1;hb=019b62bedacc909118317f255725ff2891f161aa;hp=ff3ec0001b4c3508ceef2c43afb6d13ffb7d403f;hpb=428ef4a28dc25409df02f6af024043c21307a646;p=dunshire.git

diff --git a/dunshire/games.py b/dunshire/games.py
index ff3ec00..71da5ed 100644
--- a/dunshire/games.py
+++ b/dunshire/games.py
@@ -335,12 +335,12 @@ class SymmetricLinearGame:
               '  e1 = {:s},\n' \
               '  e2 = {:s},\n' \
               '  Condition((L, K, e1, e2)) = {:f}.'
-        indented_L = '\n      '.join(str(self._L).splitlines())
-        indented_e1 = '\n       '.join(str(self._e1).splitlines())
-        indented_e2 = '\n       '.join(str(self._e2).splitlines())
+        indented_L = '\n      '.join(str(self.L()).splitlines())
+        indented_e1 = '\n       '.join(str(self.e1()).splitlines())
+        indented_e2 = '\n       '.join(str(self.e2()).splitlines())
 
         return tpl.format(indented_L,
-                          str(self._K),
+                          str(self.K()),
                           indented_e1,
                           indented_e2,
                           self.condition())
@@ -614,7 +614,7 @@ class SymmetricLinearGame:
             <BLANKLINE>
 
         """
-        return matrix([0, self._e2], (1, self.dimension() + 1), 'd')
+        return matrix([0, self.e2()], (1, self.dimension() + 1), 'd')
 
 
 
@@ -657,7 +657,7 @@ class SymmetricLinearGame:
         """
         identity_matrix = identity(self.dimension())
         return append_row(append_col(self._zero(), -identity_matrix),
-                          append_col(self._e1, -self._L))
+                          append_col(self.e1(), -self.L()))
 
 
     def _c(self):
@@ -926,7 +926,7 @@ class SymmetricLinearGame:
 
         """
         try:
-            opts = {'show_progress': options.VERBOSE}
+            opts = {'show_progress': False}
             soln_dict = solvers.conelp(self._c(),
                                        self._G(),
                                        self._h(),
@@ -1072,10 +1072,10 @@ class SymmetricLinearGame:
               Condition((L, K, e1, e2)) = 44.476...
 
         """
-        # We pass ``self._L`` right back into the constructor, because
+        # We pass ``self.L()`` right back into the constructor, because
         # it will be transposed there. And keep in mind that ``self._K``
         # is its own dual.
-        return SymmetricLinearGame(self._L,
-                                   self._K,
-                                   self._e2,
-                                   self._e1)
+        return SymmetricLinearGame(self.L(),
+                                   self.K(),
+                                   self.e2(),
+                                   self.e1())