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

Add Tranquilizer (K67R) #1126

Merged
merged 32 commits into from
Sep 3, 2017
Merged

Add Tranquilizer (K67R) #1126

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
0c1a2c9
tranquiliser test
MHakem Aug 18, 2017
94556fe
Tranquiliser Stratey + Test
MHakem Aug 18, 2017
a2d9828
Make tests run.
MHakem Aug 18, 2017
b176f3b
Merge branch 'master' of https://github.com/Axelrod-Python/Axelrod
MHakem Aug 21, 2017
6098804
Add to axelrod second, fix test_tranquiliser.
MHakem Aug 19, 2017
51354b4
Initial draft of tests, still needs fixes
MHakem Aug 21, 2017
1db4603
Remove reset method.
MHakem Aug 21, 2017
b5e8c9f
Fixed seeds in test_tranquiliser program
MHakem Aug 21, 2017
50d3d7d
Actually fixed now
MHakem Aug 21, 2017
74103d1
Added test for double defection, changed var names
MHakem Aug 21, 2017
90bf0ea
Modified tranquiliser tests and tranquiliser program (changed variabl…
MHakem Aug 23, 2017
6fb1c6f
Removed unnecessary dict declarations
MHakem Aug 23, 2017
d703e7c
Add another test case + Pep8
MHakem Aug 23, 2017
1def399
Fix doctests
MHakem Aug 23, 2017
c5838bb
Modify code to conform PEP8 standard's.
MHakem Aug 24, 2017
a2cfe71
Modify code to conform PEP8 standard's. Remove unnecessary code.
MHakem Aug 24, 2017
f7018cc
Fix syntax error.
MHakem Aug 24, 2017
82052fc
Fix syntax error.
MHakem Aug 24, 2017
ab5d901
Fix equation in strategy
MHakem Aug 24, 2017
18a5fb4
Fix equation in strategy
MHakem Aug 24, 2017
be6a9e1
Fix styling
MHakem Aug 25, 2017
d07e85f
Change varaible names. Fix move number bug and hence modify tests. PE…
MHakem Aug 25, 2017
7c2b155
Fix move number bug and hence modify tests. PEP8 Styling.
MHakem Aug 25, 2017
45fe0a8
Remove randomValue, replace with random.random() only and hence modif…
MHakem Aug 26, 2017
83d61c1
Change initial probability value to 'None'.
MHakem Aug 26, 2017
8d0ef1b
Changed variable name 'consecutive_defections' to 'opponent_consecuti…
MHakem Aug 29, 2017
059f1e8
Move FD1 state code to new method called update_stochastic_state, mod…
MHakem Aug 29, 2017
b562e51
Restructure program, remove update_stochastic_state, modify tests
MHakem Aug 31, 2017
5a2dafc
Change docstrings, fix bug
MHakem Aug 31, 2017
6d3683f
Fix PEP8 Styling
MHakem Aug 31, 2017
d590ca1
Note that strategy has been implemented.
MHakem Sep 2, 2017
1a0ab10
Fix grammatical errors
MHakem Sep 3, 2017
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
3 changes: 2 additions & 1 deletion axelrod/strategies/_strategies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
from .axelrod_first import (
Davis, RevisedDowning, Feld, Grofman, Nydegger, Joss, Shubik, Tullock,
UnnamedStrategy, SteinAndRapoport, TidemanAndChieruzzi)
from .axelrod_second import Champion, Eatherley, Tester, Gladstein
from .axelrod_second import Champion, Eatherley, Tester, Gladstein, Tranquilizer
from .backstabber import BackStabber, DoubleCrosser
from .better_and_better import BetterAndBetter
from .calculator import Calculator
Expand Down Expand Up @@ -253,6 +253,7 @@
TidemanAndChieruzzi,
TitForTat,
TitFor2Tats,
Tranquilizer,
TrickyCooperator,
TrickyDefector,
Tullock,
Expand Down
Loading