Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Refactor averagecopier for 884 and a bug. #912

Merged
merged 1 commit into from
Mar 16, 2017
Merged

Refactor averagecopier for 884 and a bug. #912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 axelrod/strategies/averagecopier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def strategy(self, opponent: Player) -> Action:
if len(opponent.history) == 0:
# Randomly picks a strategy (not affected by history).
return random_choice(0.5)
p = opponent.cooperations // len(opponent.history)
p = opponent.cooperations / len(opponent.history)
return random_choice(p)


Expand All @@ -47,5 +47,5 @@ class NiceAverageCopier(Player):
def strategy(self, opponent: Player) -> Action:
if len(opponent.history) == 0:
return C
p = opponent.cooperations // len(opponent.history)
p = opponent.cooperations / len(opponent.history)
return random_choice(p)
86 changes: 76 additions & 10 deletions axelrod/tests/strategies/test_averagecopier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,48 @@ class TestAverageCopier(TestPlayer):

def test_strategy(self):
# Test that the first strategy is picked randomly.
self.responses_test([C], seed=1)
self.responses_test([D], seed=2)
self.first_play_test(C, seed=1)
self.first_play_test(D, seed=2)

# Tests that if opponent has played all C then player chooses C.
self.responses_test([C, C, C], [C, C, C, C], [C, C, C, C], seed=5)
actions = [(C, C)] * 10
self.versus_test(axelrod.Cooperator(), expected_actions=actions,
seed=1)
actions = [(D, C)] + [(C, C)] * 9
self.versus_test(axelrod.Cooperator(), expected_actions=actions,
seed=2)

# Tests that if opponent has played all D then player chooses D.
self.responses_test([D, D, D], [C, C, C, C], [D, D, D, D], seed=5)
actions = [(C, D)] + [(D, D)] * 9
self.versus_test(axelrod.Defector(), expected_actions=actions,
seed=1)
actions = [(D, D)] + [(D, D)] * 9
self.versus_test(axelrod.Defector(), expected_actions=actions,
seed=2)

# Variable behaviour based on the history and stochastic

actions = [(C, C), (C, D), (D, C), (D, D), (C, C),
(C, D), (C, C), (D, D), (D, C), (C, D)]
self.versus_test(axelrod.Alternator(), expected_actions=actions,
seed=1)

actions = [(D, C), (C, D), (D, C), (C, D), (C, C),
(D, D), (D, C), (D, D), (C, C), (D, D)]
self.versus_test(axelrod.Alternator(), expected_actions=actions,
seed=2)

opponent = axelrod.MockPlayer([C, C, D, D, D, D])
actions = [(C, C), (C, C), (C, D), (D, D), (D, D),
(C, D), (D, C), (D, C), (D, D), (D, D)]
self.versus_test(opponent, expected_actions=actions,
seed=1)

opponent = axelrod.MockPlayer([C, C, C, D, D, D])
actions = [(D, C), (C, C), (C, C), (C, D), (D, D),
(C, D), (C, C), (D, C), (D, C), (D, D)]
self.versus_test(opponent, expected_actions=actions,
seed=2)


class TestNiceAverageCopier(TestPlayer):
Expand All @@ -45,9 +81,39 @@ class TestNiceAverageCopier(TestPlayer):
}

def test_strategy(self):
# Cooperates initially.
self.first_play_test(C)
# If opponent has played all C then player chooses C.
self.responses_test([C, C, C], [C, C, C, C], [C, C, C, C], seed=5)
# If opponent has played all D then player chooses D.
self.responses_test([D, D, D], [D, D, D, D], [D, D, D, D], seed=5)
# Cooperates initially (not stochastic)
self.first_play_test(C, seed=1)
self.first_play_test(C, seed=2)

# Tests that if opponent has played all C then player chooses C.
actions = [(C, C)] * 10
self.versus_test(axelrod.Cooperator(), expected_actions=actions,
seed=1)

# Tests that if opponent has played all D then player chooses D.
actions = [(C, D)] + [(D, D)] * 9
self.versus_test(axelrod.Defector(), expected_actions=actions,
seed=1)

# Variable behaviour based on the history and stochastic behaviour
actions = [(C, C), (C, D), (C, C), (D, D), (D, C),
(C, D), (C, C), (C, D), (D, C), (D, D)]
self.versus_test(axelrod.Alternator(), expected_actions=actions,
seed=1)

actions = [(C, C), (C, D), (D, C), (D, D), (C, C),
(C, D), (D, C), (D, D), (D, C), (C, D)]
self.versus_test(axelrod.Alternator(), expected_actions=actions,
seed=2)

opponent = axelrod.MockPlayer([C, C, D, D, D, D])
actions = [(C, C), (C, C), (C, D), (C, D), (D, D),
(D, D), (C, C), (D, C), (C, D), (D, D)]
self.versus_test(opponent, expected_actions=actions,
seed=1)

opponent = axelrod.MockPlayer([C, C, C, D, D, D])
actions = [(C, C), (C, C), (C, C), (C, D), (D, D),
(D, D), (C, C), (C, C), (D, C), (D, D)]
self.versus_test(opponent, expected_actions=actions,
seed=2)