Add BetterAndBetter, WorseAndWorse2 and WorseAndWorse3 Strategies #786
Conversation
|
This pull request is currently incomplete as I haven't yet implemented all the strategies. |
Sorry for taking a while to get back to you @varung97, this looks right in terms of guidelines. Please carry on implementing the other strategies and we'll review it properly :)
The way we've done things so far is to include tests with seeds. |
|
Alright, thanks! I'm closing this pull request while I work on the other strategies, will reopen it when I'm done. |
|
@varung97 You can leave it open if you want, just tag it with "ready for review" when you are ready. We're usually happy to help write tests as time allows. |
| return opponent.history[-1] | ||
| else: | ||
| probability = 20 / float(current_round) | ||
| return random_choice(probability) |
There was a problem hiding this comment.
Do you think I should make a random_choice_defects function or something of the sort, as it might be a little confusing that the stated probability is 1 - 20 / current turn, but the probability in the code is just 20 / current turn?
Or should I add a comment to that effect?
There was a problem hiding this comment.
Don't make a new function, I think it's fine as it is :)
|
I'm not able to add labels to the PR I think 😅 (unless I'm doing something wrong) |
|
Yeah only admins can add labels but just ping us here when this is ready :) 👍 |
|
Oh I see. Could you add the ready for review label then? |
|
Sure thing (on my phone right now but I'll do it as soon as I get on front of my machine) 👍 |
|
Alright, thanks! |
|
|
||
| def strategy(self, opponent): | ||
| current_round = len(self.history) + 1 | ||
| probability = float(current_round) / 1000 |
There was a problem hiding this comment.
Axelrod doesn't support python 2 anymore so you don't need to force float division, you can have this simply as current_round / 1000.
There was a problem hiding this comment.
Oops right will fix that
| elif current_round <= 20: | ||
| return opponent.history[-1] | ||
| else: | ||
| probability = 20 / float(current_round) |
There was a problem hiding this comment.
No need for force float division.
| if current_round == 1: | ||
| return C | ||
| else: | ||
| probability = 1 - opponent.defections / float(current_round - 1) |
| 'manipulates_state': False | ||
| } | ||
|
|
||
| class TestWAW3vsCooperator(TestHeadsUp): |
There was a problem hiding this comment.
You don't need to create another class here, you can simply use different methods for each other these.
There was a problem hiding this comment.
So should I do something like this?
opponent = axelrod.Cooperator()
player = self.player()
match = axelrod.Match((opponent, player), turns=10)
self.assertEqual(match.play(), [('C', 'C')] * 10)
There was a problem hiding this comment.
Yup you could do that, you could also use the inbuilt testing help function: http://axelrod.readthedocs.io/en/latest/tutorials/contributing/strategy/writing_test_for_the_new_strategy.html
|
Is this what you were looking for? |
Yup, this looks good to me. Giving it a 👍, fyi we have a two core reviewer policy: @marcharper and/or @meatballs might have some other requests :) |
|
Looks good to me. Thanks for the contribution! |
|
Yay, thanks guys! |
No description provided.