Skip to content

Commit c4a19c2

Browse files
fixed import statements
1 parent 0ae2a01 commit c4a19c2

File tree

3 files changed

+76
-79
lines changed

3 files changed

+76
-79
lines changed

axelrod/tests/unit/test_interaction_utils.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
from collections import Counter
44

55
import axelrod as axl
6-
import axelrod.interaction_utils as iu
76

87
C, D = axl.Action.C, axl.Action.D
98

@@ -46,43 +45,43 @@ class TestMatch(unittest.TestCase):
4645

4746
def test_compute_scores(self):
4847
for inter, score in zip(self.interactions, self.scores):
49-
self.assertEqual(score, iu.compute_scores(inter))
48+
self.assertEqual(score, axl.interaction_utils.compute_scores(inter))
5049

5150
def test_compute_final_score(self):
5251
for inter, final_score in zip(self.interactions, self.final_scores):
53-
self.assertEqual(final_score, iu.compute_final_score(inter))
52+
self.assertEqual(final_score, axl.interaction_utils.compute_final_score(inter))
5453

5554
def test_compute_final_score_per_turn(self):
5655
for inter, final_score_per_round in zip(
5756
self.interactions, self.final_score_per_turn
5857
):
5958
self.assertEqual(
60-
final_score_per_round, iu.compute_final_score_per_turn(inter)
59+
final_score_per_round, axl.interaction_utils.compute_final_score_per_turn(inter)
6160
)
6261

6362
def test_compute_winner_index(self):
6463
for inter, winner in zip(self.interactions, self.winners):
65-
self.assertEqual(winner, iu.compute_winner_index(inter))
64+
self.assertEqual(winner, axl.interaction_utils.compute_winner_index(inter))
6665

6766
def test_compute_cooperations(self):
6867
for inter, coop in zip(self.interactions, self.cooperations):
69-
self.assertEqual(coop, iu.compute_cooperations(inter))
68+
self.assertEqual(coop, axl.interaction_utils.compute_cooperations(inter))
7069

7170
def test_compute_normalised_cooperations(self):
7271
for inter, coop in zip(self.interactions, self.normalised_cooperations):
73-
self.assertEqual(coop, iu.compute_normalised_cooperation(inter))
72+
self.assertEqual(coop, axl.interaction_utils.compute_normalised_cooperation(inter))
7473

7574
def test_compute_state_distribution(self):
7675
for inter, dist in zip(self.interactions, self.state_distribution):
77-
self.assertEqual(dist, iu.compute_state_distribution(inter))
76+
self.assertEqual(dist, axl.interaction_utils.compute_state_distribution(inter))
7877

7978
def test_compute_normalised_state_distribution(self):
8079
for inter, dist in zip(self.interactions, self.normalised_state_distribution):
81-
self.assertEqual(dist, iu.compute_normalised_state_distribution(inter))
80+
self.assertEqual(dist, axl.interaction_utils.compute_normalised_state_distribution(inter))
8281

8382
def test_compute_state_to_action_distribution(self):
8483
for inter, dist in zip(self.interactions, self.state_to_action_distribution):
85-
self.assertEqual(dist, iu.compute_state_to_action_distribution(inter))
84+
self.assertEqual(dist, axl.interaction_utils.compute_state_to_action_distribution(inter))
8685
inter = [(C, D), (D, C), (C, D), (D, C), (D, D), (C, C), (C, D)]
8786
expected_dist = [
8887
Counter(
@@ -97,14 +96,14 @@ def test_compute_state_to_action_distribution(self):
9796
Counter({((C, C), D): 1, ((C, D), C): 2, ((D, C), D): 2, ((D, D), C): 1}),
9897
]
9998

100-
self.assertEqual(expected_dist, iu.compute_state_to_action_distribution(inter))
99+
self.assertEqual(expected_dist, axl.interaction_utils.compute_state_to_action_distribution(inter))
101100

102101
def test_compute_normalised_state_to_action_distribution(self):
103102
for inter, dist in zip(
104103
self.interactions, self.normalised_state_to_action_distribution
105104
):
106105
self.assertEqual(
107-
dist, iu.compute_normalised_state_to_action_distribution(inter)
106+
dist, axl.interaction_utils.compute_normalised_state_to_action_distribution(inter)
108107
)
109108
inter = [(C, D), (D, C), (C, D), (D, C), (D, D), (C, C), (C, D)]
110109
expected_dist = [
@@ -120,12 +119,12 @@ def test_compute_normalised_state_to_action_distribution(self):
120119
Counter({((C, C), D): 1, ((C, D), C): 1, ((D, C), D): 1, ((D, D), C): 1}),
121120
]
122121
self.assertEqual(
123-
expected_dist, iu.compute_normalised_state_to_action_distribution(inter)
122+
expected_dist, axl.interaction_utils.compute_normalised_state_to_action_distribution(inter)
124123
)
125124

126125
def test_compute_sparklines(self):
127126
for inter, spark in zip(self.interactions, self.sparklines):
128-
self.assertEqual(spark, iu.compute_sparklines(inter))
127+
self.assertEqual(spark, axl.interaction_utils.compute_sparklines(inter))
129128

130129
def test_read_interactions_from_file(self):
131130
tmp_file = tempfile.NamedTemporaryFile(mode="w", delete=False)
@@ -138,10 +137,10 @@ def test_read_interactions_from_file(self):
138137
(0, 1): [[(C, D), (C, D)] for _ in range(3)],
139138
(1, 1): [[(D, D), (D, D)] for _ in range(3)],
140139
}
141-
interactions = iu.read_interactions_from_file(tmp_file.name, progress_bar=False)
140+
interactions = axl.interaction_utils.read_interactions_from_file(tmp_file.name, progress_bar=False)
142141
self.assertEqual(expected_interactions, interactions)
143142

144143
def test_string_to_interactions(self):
145144
string = "CDCDDD"
146145
interactions = [(C, D), (C, D), (D, D)]
147-
self.assertEqual(iu.string_to_interactions(string), interactions)
146+
self.assertEqual(axl.interaction_utils.string_to_interactions(string), interactions)

0 commit comments

Comments
 (0)