Skip to content

Commit e742004

Browse files
edouardArgensonedouardArgenson
committed
merged from several branches and resolve conflict
2 parents e6c9662 + dc17f33 commit e742004

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+3389
-1389
lines changed

‎.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ script:
3030
- python doctests.py
3131
# Run the type checker
3232
- python run_mypy.py
33+
# Check that all strategies are in the index
34+
- python run_strategy_indexer.py
3335
after_success:
3436
- coveralls
3537
notifications:

‎CHANGES.md

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,48 @@
1+
# v2.10.0, 2017-04-17
2+
3+
Bug fix in strategy transformers, new strategy, internal refactor of strategies,
4+
fix bibtex in citation file.
5+
6+
- Fix a bug: ensure strategy transformers also transform classification
7+
https://github.com/Axelrod-Python/Axelrod/pull/972
8+
- Add DoubleResurrection strategy
9+
https://github.com/Axelrod-Python/Axelrod/pull/965
10+
- Refactor of LookerUp and Gambler
11+
https://github.com/Axelrod-Python/Axelrod/pull/966
12+
- Add regression test for FSM players
13+
https://github.com/Axelrod-Python/Axelrod/pull/967
14+
- Bibtex fix in CITATION.rst
15+
https://github.com/Axelrod-Python/Axelrod/pull/968
16+
17+
Here are all the commits for this PR:
18+
https://github.com/Axelrod-Python/Axelrod/compare/v2.10.0...v2.10.0
19+
20+
# v2.9.0, 2017-04-11
21+
22+
Approximate Moran process, test refactor, tweak to the Human play repr,
23+
documentation and an
24+
internal improvement to some cheating strategies.
25+
26+
- Small fix to the repr for the Human strategy:
27+
https://github.com/Axelrod-Python/Axelrod/pull/959
28+
- Speedup to Geller, Darwin and MindReader
29+
https://github.com/Axelrod-Python/Axelrod/pull/950
30+
- Add documentation details for running tests
31+
https://github.com/Axelrod-Python/Axelrod/pull/954
32+
- Add documentation for commit message guidelines:
33+
https://github.com/Axelrod-Python/Axelrod/pull/963
34+
- Fragment the Moran process documentation
35+
https://github.com/Axelrod-Python/Axelrod/pull/962
36+
- Add an approximate Moran process
37+
https://github.com/Axelrod-Python/Axelrod/pull/955
38+
- Test refactor:
39+
https://github.com/Axelrod-Python/Axelrod/pull/964
40+
- Refactor of the finite state machines:
41+
https://github.com/Axelrod-Python/Axelrod/pull/956
42+
43+
Here are all the commits for this PR:
44+
https://github.com/Axelrod-Python/Axelrod/compare/v2.8.0...v2.9.0
45+
146
# v2.8.0, 2017-04-02
247

348
Source code cleanup, test refactor, new strategies and improved `__repr__` of

‎CITATION.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Please use the following to cite the latest version of the Axelrod library::
22

33
@misc{axelrodproject,
4-
author = {{ {The Axelrod project developers} }}
4+
author = {{ {The Axelrod project developers} }},
55
title = {Axelrod: <RELEASE TITLE>},
66
month = apr,
77
year = 2016,

‎axelrod/data/pso_gambler.csv

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Name (string), plays (int), opp_plays(int), starting_plays(int), weights (floats)
22
PSO Gambler Mem1, 1, 1, 0, 1.0, 0.52173487, 0.0, 0.12050939
3-
PSO Gambler 1_1_1, 1, 1, 1, 1.0, 0.12304797, 0.0, 0.13581423, 1.0, 0.57740178, 0.0, 0.11886807
3+
PSO Gambler 1_1_1, 1, 1, 1, 1.0, 1.0, 0.12304797, 0.57740178, 0.0, 0.0, 0.13581423, 0.11886807
44
# , 2, 2, 2, 1.0, 0.0, 1.0, 1.0, 0.0, 1.0, 1.0, 1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.93, 0.0, 1.0, 0.67, 0.42, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.48, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 1.0, 0.0, 0.19, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.36, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0
5-
PSO Gambler 2_2_2, 2, 2, 2, 1.0, 1.0, 0.0, 0.02126434, 0.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.95280465, 0.80897541, 0.0, 0.0, 0.0, 0.0, 0.65147565, 0.15412392, 0.24922166, 0.0, 0.0, 0.0, 0.0, 0.0, 0.24523149, 1.0, 0.0, 0.0, 0.43278586, 1.0, 0.0, 0.23563137, 1.0, 1.0, 1.0, 0.00227615, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.15140743, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.77344942, 0.0
6-
PSO Gambler 2_2_2 Noise 05, 2, 2, 2, 1.0, 0.0, 1.0, 0.63548102, 1.0, 1.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 0.0, 0.13863175, 1.0, 0.7724137, 0.0, 1.0, 0.0, 0.07127653, 0.0, 1.0, 0.28124022, 0.0, 0.0, 0.98603825, 0.0, 0.0, 1.0, 0.06434619, 1.0, 1.0, 1.0, 0.50999729, 0.00524508, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0, 1.0, 0.16240799, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, 1.0, 0.87463905, 0.0, 0.0, 1.0, 0.0, 0.0
5+
PSO Gambler 2_2_2, 2, 2, 2, 1.0, 1.0, 1.0, 0.0, 1.0, 0.95280465, 0.0, 0.0, 0.0, 0.80897541, 0.0, 0.0, 0.02126434, 0.0, 0.43278586, 0.0, 0.0, 0.0, 1.0, 0.15140743, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.23563137, 0.0, 0.0, 0.65147565, 1.0, 0.0, 0.0, 0.15412392, 1.0, 0.0, 0.0, 0.24922166, 1.0, 0.0, 0.0, 0.0, 0.00227615, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 0.0, 0.77344942, 1.0, 0.24523149, 1.0, 0.0
6+
PSO Gambler 2_2_2 Noise 05, 2, 2, 2, 1.0, 1.0, 0.0, 0.0, 0.0, 1.0, 0.98603825, 1.0, 1.0, 0.0, 0.0, 0.16240799, 0.63548102, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 0.0, 1.0, 0.13863175, 0.06434619, 1.0, 1.0, 1.0, 1.0, 1.0, 0.0, 0.7724137, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0, 1.0, 1.0, 0.50999729, 1.0, 0.0, 0.0, 0.00524508, 0.87463905, 0.0, 0.07127653, 1.0, 0.0, 1.0, 0.0, 1.0, 0.0, 0.0, 1.0, 1.0, 1.0, 0.0, 0.28124022, 1.0, 0.0, 0.0, 0.0, 1.0, 0.0

0 commit comments

Comments
 (0)