Skip to content

Commit

Permalink
Merge pull request #800 from Axelrod-Python/py3.6
Browse files Browse the repository at this point in the history
Change python support from 3.4/3.5 to 3.5/3.6
  • Loading branch information
marcharper committed Jan 1, 2017
2 parents e15b86e + f2c9697 commit ce0f161
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

language: python
python:
- 3.4
- 3.5
- 3.6

cache:
directories:
Expand All @@ -15,7 +15,7 @@ install:
- pip install -r requirements.txt
- pip install sphinx
- pip install sphinx_rtd_theme
- pip install docutils==0.12
- pip install docutils==0.12
- pip install coverage
- pip install coveralls
script:
Expand Down
6 changes: 3 additions & 3 deletions docs/tutorials/further_topics/spatial_tournaments.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ and obtain the interactions::

>>> spatial_tournament = axl.SpatialTournament(players ,turns=2, repetitions=2, edges=edges)
>>> results = spatial_tournament.play(keep_interactions=True)
>>> for index_pair, interaction in results.interactions.items():
>>> for index_pair, interaction in sorted(results.interactions.items()):
... player1 = spatial_tournament.players[index_pair[0]]
... player2 = spatial_tournament.players[index_pair[1]]
... print('%s vs %s: %s' % (player1, player2, interaction))
Defector vs Tit For Tat: [[('D', 'C'), ('D', 'D')], [('D', 'C'), ('D', 'D')]]
Cooperator vs Tit For Tat: [[('C', 'C'), ('C', 'C')], [('C', 'C'), ('C', 'C')]]
Cooperator vs Grudger: [[('C', 'C'), ('C', 'C')], [('C', 'C'), ('C', 'C')]]
Defector vs Tit For Tat: [[('D', 'C'), ('D', 'D')], [('D', 'C'), ('D', 'D')]]
Defector vs Grudger: [[('D', 'C'), ('D', 'D')], [('D', 'C'), ('D', 'D')]]
Cooperator vs Tit For Tat: [[('C', 'C'), ('C', 'C')], [('C', 'C'), ('C', 'C')]]

As anticipated :code:`Cooperator` does not interact with :code:`Defector` neither
:code:`TitForTat` with :code:`Grudger`.
Expand Down

0 comments on commit ce0f161

Please sign in to comment.