Skip to content

37 - Prob end and rewrite of the results #507

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.

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

Merged
merged 49 commits into from
Mar 29, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
312c84e
Adding a length method to matches.
drvinceknight Mar 20, 2016
37e2f58
Adding a tournament type for prob end tournaments.
drvinceknight Mar 20, 2016
f7e7773
WIP Adding a tournament class for ProbEnd.
drvinceknight Mar 20, 2016
e4a4589
Build single matche method in tournament type.
drvinceknight Mar 21, 2016
18ea60e
Reproducing tests - commenting out errors
drvinceknight Mar 22, 2016
5e1b51f
Adding better explanation of cdf and pdf.
drvinceknight Mar 22, 2016
d6ab7d6
Fixing tournament_type init.
drvinceknight Mar 24, 2016
dd39450
Adding a build result set method to Tournament
drvinceknight Mar 24, 2016
719598c
Adding a players attribute to the Match class
drvinceknight Mar 24, 2016
f78dcc7
tournament type not explicit in init parameters.
drvinceknight Mar 24, 2016
1028374
Basic setups in place for ProbEndResultSet.
drvinceknight Mar 24, 2016
b7df88a
Adding cleanup to test sh script.
drvinceknight Mar 24, 2016
1f20dfc
Including payoff functions for diff len matches
drvinceknight Mar 26, 2016
e8daab9
Relevant methods for ProbEndResult class.
drvinceknight Mar 26, 2016
59be6f4
Py2 fix
drvinceknight Mar 26, 2016
94fc706
Ensure no cache used.
drvinceknight Mar 26, 2016
f3fd028
Tests for the titles in plots.
drvinceknight Mar 26, 2016
cc63f97
Fixing normalised score.
drvinceknight Mar 26, 2016
e275411
Final tests.
drvinceknight Mar 26, 2016
a4d8f7e
Adding documentation.
drvinceknight Mar 26, 2016
9716b05
Removing player1 player2 from Match class.
drvinceknight Mar 26, 2016
9b4678b
Fixing spacing for init of ProbEndResultSet.
drvinceknight Mar 26, 2016
3d60e31
Adding winner and final score method to Matches.
drvinceknight Mar 27, 2016
8c1c513
Making keep matches default.
drvinceknight Mar 27, 2016
8903552
Removing output dictionary, replacing with matches
drvinceknight Mar 27, 2016
b9e150b
Result class re write and adding methods to Match
drvinceknight Mar 27, 2016
e8d1cc5
Adjusting integration test.
drvinceknight Mar 28, 2016
0514f62
Modifying definition of good partner.
drvinceknight Mar 28, 2016
8d4aebe
Fixing result set. Change value of Morality metric
drvinceknight Mar 28, 2016
859de17
Fixing tests for plotter.
drvinceknight Mar 28, 2016
790f131
Fixing py2 division in Match.
drvinceknight Mar 28, 2016
4cd8fef
Results set all correct.
drvinceknight Mar 28, 2016
781ecde
Removing method that is not needed.
drvinceknight Mar 28, 2016
8338ebf
Speed up: precalc on init.
drvinceknight Mar 28, 2016
5a562cd
Removing default title (need to move to manager).
drvinceknight Mar 28, 2016
2f81f74
Adding catch for Matches that have 0 turns
drvinceknight Mar 28, 2016
19eaac9
ProbEndTournament makes use of base Results class
drvinceknight Mar 28, 2016
45724ff
Adding a plot for length of Matches.
drvinceknight Mar 28, 2016
5092163
Adding plot of match lengths to docs.
drvinceknight Mar 28, 2016
1ab0750
Adding docstrings to results.
drvinceknight Mar 28, 2016
402407f
Adding sphinx rtd theme to .travis.
drvinceknight Mar 28, 2016
828b589
non negative -> nonnegative
drvinceknight Mar 29, 2016
cad9a98
Removing commented out code.
drvinceknight Mar 29, 2016
627fe84
Adding a property based test for ProbEnd.
drvinceknight Mar 29, 2016
bea72af
Removing unnecessary modules.
drvinceknight Mar 29, 2016
94a9d53
Fix PEP8 errors
meatballs Mar 29, 2016
d213c82
Deleted commented out line (sorry I missed so many of these!)
drvinceknight Mar 29, 2016
796a4ae
Numpy formatting of docstring.
drvinceknight Mar 29, 2016
402ae74
Numpy format docstrings
drvinceknight Mar 29, 2016
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
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ before_install:
install:
- pip install -r requirements.txt
- pip install sphinx
- pip install sphinx_rtd_theme
- pip install coverage
- pip install coveralls
script:
Expand Down
2 changes: 1 addition & 1 deletion axelrod/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
from .match import Match
from .strategies import *
from .tournament_type import *
from .tournament import Tournament
from .tournament import Tournament, ProbEndTournament
from .tournament_manager import TournamentManager
from .tournament_manager_factory import TournamentManagerFactory
from .result_set import ResultSet
Expand Down
294 changes: 0 additions & 294 deletions axelrod/cooperation.py

This file was deleted.

2 changes: 1 addition & 1 deletion axelrod/eigen.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def power_iteration(mat, initial):
yield vec


def principal_eigenvector(mat, maximum_iterations=None, max_error=1e-8):
def principal_eigenvector(mat, maximum_iterations=1000, max_error=1e-3):
"""
Computes the (normalised) principal eigenvector of the given matrix.

Expand Down
Loading