v__0.0.6.4

math-econ-code · Nov 11, 2023 · e04e895 · e04e895
1 parent 34265a6
commit e04e895
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 2 deletions.
diff --git a/mec/gt.py b/mec/gt.py
@@ -81,6 +81,7 @@ def mangasarian_stone_solve(self):
         return(sol_dict)
 
     def lemke_howson_solve(self,verbose = 0):
+        from sympy import Symbol
 
         ris = ['r_' + str(i+1) for i in range(self.nbi)]
         yjs = ['y_' + str(self.nbi+j+1) for j in range(self.nbj)]

diff --git a/mec/test.py b/mec/test.py
@@ -93,9 +93,35 @@ def build_surplus(nbx,nby):
     print(choo_siow_mkt.assess(np.append(uv_GS_diy, λ_GS_diy_k)))
     choo_siow_mkt.isCoercive()
     return
-
+########################################################
+########################################################
+def test_mec_gt_Matrix_game():
+    from mec.gt import Matrix_game
+    Phi_i_j = np.array([[50, 100, 93.8], 
+                    [93.9, 60.0, 82.8], 
+                    [97.6, 100, 73.2]])
+    thegame = Matrix_game(Phi_i_j)
+    print(thegame.BRI(1) ,thegame.BRJ(0) )
+    thegame.compute_eq()
+    thegame.minimax_LP()
+    thegame.minimax_CP()
+
 
 
+def test_mec_gt_Bimatrix_game():
+    from mec.gt import Bimatrix_game
+    penalty_data = np.array([[50, 100, 93.8], [93.9, 60.0, 82.8], [97.6, 100, 73.2]])
+
+    penalty_zero_sum = Bimatrix_game(A_i_j = penalty_data, B_i_j = 100 - penalty_data)
+    penalty_nonzero_sum = Bimatrix_game(A_i_j = penalty_data,
+                                    B_i_j = np.array([[150, 100, 100], [100, 150, 100], [100, 100, 150]]) - penalty_data)
+    penalty_zero_sum.mangasarian_stone_solve()
+    penalty_nonzero_sum.lemke_howson_solve()
+
+########################################################
+########################################################
+########################################################
+
 def test_mec_lp():
     test_mec_lp_LP()
     test_mec_lp_Dictionary()
@@ -108,6 +134,11 @@ def test_mec_ot():
     test_mec_ot_TULogit()
 
     return
+
+def test_mec_gt():
+    test_mec_gt_Matrix_game
+
+    return
 
 def test_mec():
     test_mec_lp()

diff --git a/setup.py b/setup.py
@@ -2,7 +2,7 @@
 
 setup(
 	name="mec",
-	version="0.0.6.3",
+	version="0.0.6.4",
 	url="",
 	authors=["Alfred Galichon"],
 	author_email="ag133@nyu.edu",