Skip to content

Commit 5470a4c

Browse files
drvinceknightmarcharper
authored andcommitted
Use np namespace.
1 parent 30dfed1 commit 5470a4c

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

axelrod/result_set.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import csv
44
import itertools
55

6-
from numpy import mean, nanmedian, std, array, nan_to_num
6+
import numpy as np
77
import tqdm
88

99
import dask as da
@@ -284,7 +284,7 @@ def _build_payoff_matrix(self):
284284
for player_index, opponent_index in pairs:
285285
utilities = self.payoffs[player_index][opponent_index]
286286
if utilities:
287-
payoff_matrix[player_index][opponent_index] = mean(utilities)
287+
payoff_matrix[player_index][opponent_index] = np.mean(utilities)
288288

289289
return payoff_matrix
290290

@@ -298,14 +298,14 @@ def _build_payoff_stddevs(self):
298298
for player_index, opponent_index in pairs:
299299
utilities = self.payoffs[player_index][opponent_index]
300300
if utilities:
301-
payoff_stddevs[player_index][opponent_index] = std(utilities)
301+
payoff_stddevs[player_index][opponent_index] = np.std(utilities)
302302

303303
return payoff_stddevs
304304

305305

306306
@update_progress_bar
307307
def _build_payoff_diffs_means(self):
308-
payoff_diffs_means = [[mean(diff) for diff in player]
308+
payoff_diffs_means = [[np.mean(diff) for diff in player]
309309
for player in self.score_diffs]
310310

311311
return payoff_diffs_means
@@ -404,26 +404,26 @@ def _build_initial_cooperation_count(self, initial_cooperation_count_series):
404404

405405
@update_progress_bar
406406
def _build_normalised_cooperation(self):
407-
normalised_cooperation = [list(nan_to_num(row))
408-
for row in array(self.cooperation) /
409-
sum(map(array, self.match_lengths))]
407+
normalised_cooperation = [list(np.nan_to_num(row))
408+
for row in np.array(self.cooperation) /
409+
sum(map(np.array, self.match_lengths))]
410410
return normalised_cooperation
411411

412412
@update_progress_bar
413413
def _build_initial_cooperation_rate(self, interactions_series):
414414
interactions_dict = interactions_series.to_dict()
415-
interactions_array = array([interactions_series.get(player_index, 0)
416-
for player_index in range(self.num_players)])
415+
interactions_array = np.array([interactions_series.get(player_index, 0)
416+
for player_index in range(self.num_players)])
417417
initial_cooperation_rate = list(
418-
nan_to_num(array(self.initial_cooperation_count) /
419-
interactions_array))
418+
np.nan_to_num(np.array(self.initial_cooperation_count) /
419+
interactions_array))
420420
return initial_cooperation_rate
421421

422422
@update_progress_bar
423423
def _build_ranking(self):
424424
ranking = sorted(
425425
range(self.num_players),
426-
key=lambda i: -nanmedian(self.normalised_scores[i]))
426+
key=lambda i: -np.nanmedian(self.normalised_scores[i]))
427427
return ranking
428428

429429
@update_progress_bar
@@ -637,8 +637,8 @@ def summarise(self):
637637
638638
"""
639639

640-
median_scores = map(nanmedian, self.normalised_scores)
641-
median_wins = map(nanmedian, self.wins)
640+
median_scores = map(np.nanmedian, self.normalised_scores)
641+
median_wins = map(np.nanmedian, self.wins)
642642

643643
self.player = namedtuple("Player", ["Rank", "Name", "Median_score",
644644
"Cooperation_rating", "Wins",
@@ -668,7 +668,7 @@ def summarise(self):
668668
if counter[(state, C)] > 0]
669669

670670
if len(counts) > 0:
671-
rate = mean(counts)
671+
rate = np.mean(counts)
672672
else:
673673
rate = 0
674674

0 commit comments

Comments
 (0)