Skip to content

Commit 15589f4

Browse files
authored
Merge pull request #5 from drvinceknight/marcharper-docs
Fix sphinx
2 parents c4aded7 + 45a35ce commit 15589f4

File tree

3 files changed

+18
-7
lines changed

3 files changed

+18
-7
lines changed

axelrod/interaction_utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# -*- coding: utf-8 -*-
12
"""
23
Functions to calculate results from interactions. Interactions are lists of the
34
form:

axelrod/moran.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
# -*- coding: utf-8 -*-
12
from collections import Counter
23
import random
34

docs/index.rst

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,31 +7,40 @@ Welcome to the documentation for the Axelrod Python library
77
===========================================================
88

99
Here is quick overview of the current capabilities of the library:
10+
1011
* Over 100 strategies from the literature and some exciting original
11-
contributions
12+
contributions
13+
1214
* Classic strategies like TiT-For-Tat, WSLS, and variants
1315
* Zero-Determinant and other Memory-One strategies
1416
* Many generic strategies that can be used to define an array of popular
15-
strategies, including finite state machines, strategies that hunt for
16-
patterns in other strategies, and strategies that combine the effects of
17-
many others
17+
strategies, including finite state machines, strategies that hunt for
18+
patterns in other strategies, and strategies that combine the effects of
19+
many others
1820
* Strategy transformers that augment that abilities of any strategy
21+
1922
* Head-to-Head matches
23+
2024
* Round Robin tournaments with a variety of options, including:
25+
2126
* noisy environments
2227
* spatial games
2328
* probabilistically chosen match lengths
29+
2430
* Population dynamics
31+
2532
* The Moran process
2633
* An ecological model
27-
*Multi-processor support, caching for deterministic interactions, automatically
28-
generate figures and statistics
34+
35+
* Multi-processor support, caching for deterministic interactions, automatically
36+
generate figures and statistics
2937

3038
Every strategy is categorized on a number of dimensions, including:
39+
3140
* Deterministic or Stochastic
3241
* How many rounds of history used
3342
* Whether the strategy has access to the game matrix, the length of the
34-
match, etc.
43+
match, etc.
3544

3645
Furthermore the library is extensively tested with 99%+ coverage, ensuring
3746
validity and reproducibility of results!

0 commit comments

Comments
 (0)