Skip to content

RFC: game_theory: Minor refactoring #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 9, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions quantecon/game_theory/game_converters.py
Original file line number Diff line number Diff line change
@@ -139,7 +139,7 @@ def _parse(string):
players = [
Player(
payoffs2d[i, :].reshape(nums_actions, order='F').transpose(
list(range(i, N)) + list(range(i))
(*range(i, N), *range(i))
)
) for i in range(N)
]
@@ -196,7 +196,7 @@ def _dump(g):
for i, player in enumerate(g.players):
payoffs = np.array2string(
player.payoff_array.transpose(
list(range(g.N-i, g.N)) + list(range(g.N-i))
(*range(g.N-i, g.N), *range(g.N-i))
).ravel(order='F'))[1:-1]
s += ' '.join(payoffs.split()) + ' '

2 changes: 1 addition & 1 deletion quantecon/game_theory/logitdyn.py
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ def __init__(self, data, beta=1.0):

for player in self.players:
payoff_array_rotated = \
player.payoff_array.transpose(list(range(1, self.N)) + [0])
player.payoff_array.transpose((*range(1, self.N), 0))
payoff_array_rotated -= \
payoff_array_rotated.max(axis=-1)[..., np.newaxis]
player.logit_choice_cdfs = \
8 changes: 4 additions & 4 deletions quantecon/game_theory/normal_form_game.py
Original file line number Diff line number Diff line change
@@ -640,8 +640,9 @@ def __init__(self, data, dtype=None):
)
for i, payoff_array in enumerate(payoff_arrays):
payoff_array[:] = \
data.take(i, axis=-1).transpose(list(range(i, N)) +
list(range(i)))
data.take(i, axis=-1).transpose(
(*range(i, N), *range(i))
)
self.players = tuple(
Player(payoff_array) for payoff_array in payoff_arrays
)
@@ -663,8 +664,7 @@ def payoff_profile_array(self):
np.empty(self.players[0].payoff_array.shape + (N,), dtype=dtype)
for i, player in enumerate(self.players):
payoff_profile_array[..., i] = \
player.payoff_array.transpose(list(range(N-i, N)) +
list(range(N-i)))
player.payoff_array.transpose((*range(N-i, N), *range(N-i)))
return payoff_profile_array

def __repr__(self):