Skip to content

Commit

Permalink
Merge 66cbbfa into 6449253
Browse files Browse the repository at this point in the history
  • Loading branch information
marcharper committed Mar 11, 2020
2 parents 6449253 + 66cbbfa commit 825da38
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions axelrod/result_set.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import csv
import itertools
from multiprocessing import cpu_count
import warnings

import numpy as np
import tqdm
Expand Down Expand Up @@ -405,12 +406,14 @@ def _build_initial_cooperation_count(self, initial_cooperation_count_series):

@update_progress_bar
def _build_normalised_cooperation(self):
normalised_cooperation = [
list(np.nan_to_num(row))
for row in np.array(self.cooperation)
/ sum(map(np.array, self.match_lengths))
]
return normalised_cooperation
with warnings.catch_warnings():
warnings.simplefilter("ignore")
normalised_cooperation = [
list(np.nan_to_num(row))
for row in np.array(self.cooperation)
/ sum(map(np.array, self.match_lengths))
]
return normalised_cooperation

@update_progress_bar
def _build_initial_cooperation_rate(self, interactions_series):
Expand All @@ -420,10 +423,12 @@ def _build_initial_cooperation_rate(self, interactions_series):
for player_index in range(self.num_players)
]
)
initial_cooperation_rate = list(
np.nan_to_num(np.array(self.initial_cooperation_count) / interactions_array)
)
return initial_cooperation_rate
with warnings.catch_warnings():
warnings.simplefilter("ignore")
initial_cooperation_rate = list(
np.nan_to_num(np.array(self.initial_cooperation_count) / interactions_array)
)
return initial_cooperation_rate

@update_progress_bar
def _build_ranking(self):
Expand Down

0 comments on commit 825da38

Please sign in to comment.