Skip to content

Commit 52af3aa

Browse files
marcharpermarcharper
authored
Merge pull request #13 from Axelrod-Python/update-run-times
Update run times
2 parents 532452f + 08e97a7 commit 52af3aa

File tree

3 files changed

+166
-122
lines changed

3 files changed

+166
-122
lines changed

‎Matches.ipynb‎

Lines changed: 52 additions & 36 deletions
Large diffs are not rendered by default.

‎logo.png‎

-13.5 KB
Loading

‎untested/Axelrod-Strategy-Times.ipynb‎

Lines changed: 114 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
},
1010
{
1111
"cell_type": "code",
12-
"execution_count": 6,
12+
"execution_count": 1,
1313
"metadata": {
1414
"collapsed": true
1515
},
@@ -19,13 +19,34 @@
1919
"\n",
2020
"import numpy as np\n",
2121
"import pandas as pd\n",
22+
"import tqdm\n",
2223
"\n",
2324
"import axelrod as axl"
2425
]
2526
},
2627
{
2728
"cell_type": "code",
28-
"execution_count": 7,
29+
"execution_count": 2,
30+
"metadata": {},
31+
"outputs": [
32+
{
33+
"data": {
34+
"text/plain": [
35+
"'3.0.0'"
36+
]
37+
},
38+
"execution_count": 2,
39+
"metadata": {},
40+
"output_type": "execute_result"
41+
}
42+
],
43+
"source": [
44+
"axl.__version__"
45+
]
46+
},
47+
{
48+
"cell_type": "code",
49+
"execution_count": 3,
2950
"metadata": {
3051
"collapsed": true
3152
},
@@ -37,10 +58,8 @@
3758
},
3859
{
3960
"cell_type": "code",
40-
"execution_count": 8,
41-
"metadata": {
42-
"collapsed": false
43-
},
61+
"execution_count": 4,
62+
"metadata": {},
4463
"outputs": [],
4564
"source": [
4665
"def play_matches(s1, s2, reps=20):\n",
@@ -51,15 +70,21 @@
5170
},
5271
{
5372
"cell_type": "code",
54-
"execution_count": 9,
55-
"metadata": {
56-
"collapsed": false
57-
},
58-
"outputs": [],
73+
"execution_count": 5,
74+
"metadata": {},
75+
"outputs": [
76+
{
77+
"name": "stderr",
78+
"output_type": "stream",
79+
"text": [
80+
"100%|██████████| 195/195 [16:59:50<00:00, 1886.19s/it] \n"
81+
]
82+
}
83+
],
5984
"source": [
6085
"data = [] \n",
6186
" \n",
62-
"for s1 in strategies:\n",
87+
"for s1 in tqdm.tqdm(strategies):\n",
6388
" times = []\n",
6489
" for s2 in strategies:\n",
6590
" t = timeit.timeit(lambda: play_matches(s1, s2, reps=reps), number=1)\n",
@@ -72,79 +97,77 @@
7297
},
7398
{
7499
"cell_type": "code",
75-
"execution_count": 10,
76-
"metadata": {
77-
"collapsed": false
78-
},
100+
"execution_count": 6,
101+
"metadata": {},
79102
"outputs": [
80103
{
81104
"name": "stdout",
82105
"output_type": "stream",
83106
"text": [
84-
" Player Name Mean Time Std Time\n",
85-
"45 Geller 2.364258 12.156240\n",
86-
"79 Mind Reader 1.520905 8.703081\n",
87-
"92 Protected Mind Reader 1.512659 8.700015\n",
88-
"47 Geller Defector 0.362436 0.715352\n",
89-
"81 Mirror Mind Reader 0.362024 0.720167\n",
90-
"46 Geller Cooperator 0.357598 0.709635\n",
91-
"26 Darwin 0.354589 0.690721\n",
92-
"134 Meta Winner 0.162879 0.750178\n",
93-
"141 Meta Mixer 0.155564 0.712755\n",
94-
"133 Meta Minority 0.139740 0.614238\n",
95-
"132 Meta Majority 0.137985 0.624223\n",
96-
"140 Meta Winner Long Memory 0.130046 0.609614\n",
97-
"139 Meta Majority Long Memory 0.112917 0.511678\n",
98-
"138 Meta Winner Finite Memory 0.090466 0.409023\n",
99-
"137 Meta Majority Finite Memory 0.078583 0.351208\n",
100-
"136 Meta Winner Memory One 0.060976 0.265651\n",
101-
"135 Meta Majority Memory One 0.057070 0.248712\n",
102-
"43 PSO Gambler 0.049304 0.200303\n",
103-
"67 Hesitant QLearner 0.045791 0.188372\n",
104-
"10 Arrogant QLearner 0.045656 0.187398\n",
105-
"102 Risky QLearner 0.045148 0.185345\n",
106-
"15 Cautious QLearner 0.045024 0.184654\n",
107-
"68 Inverse 0.044104 0.183974\n",
108-
"125 ZD-Extort-2 v2 0.044060 0.183605\n",
109-
"61 Grofman 0.043912 0.184099\n",
110-
"110 Stochastic WSLS 0.043576 0.180912\n",
111-
"124 ZD-Extort-2 0.043488 0.180818\n",
112-
"33 Feld 0.043372 0.180069\n",
113-
"120 Tullock 0.043238 0.179121\n",
114-
"95 Random: 0.5 0.043228 0.179316\n",
115-
".. ... ... ...\n",
116-
"123 Win-Stay Lose-Shift 0.009183 0.068446\n",
117-
"98 Retaliate (0.1) 0.009164 0.067860\n",
118-
"24 Cycler DC 0.009158 0.069100\n",
119-
"99 Retaliate (0.08) 0.009156 0.068108\n",
120-
"66 Hard Tit For Tat 0.009143 0.068464\n",
121-
"83 Nydegger 0.009140 0.068430\n",
122-
"104 Slow Tit For Two Tats 0.009138 0.068211\n",
123-
"40 Forgiving Tit For Tat 0.009130 0.068529\n",
124-
"63 Grumpy 0.009129 0.068508\n",
125-
"84 Omega TFT 0.009123 0.067825\n",
126-
"85 Once Bitten 0.009109 0.067687\n",
127-
"22 Cycler CCCD 0.009108 0.068073\n",
128-
"8 Adapative Pavlov 2011 0.009108 0.068047\n",
129-
"62 Grudger 0.009099 0.068121\n",
130-
"106 Soft Grudger 0.009098 0.068047\n",
131-
"23 Cycler CCD 0.009095 0.068295\n",
132-
"21 Cycler CCCCCD 0.009080 0.067746\n",
133-
"29 Defector Hunter 0.009076 0.067956\n",
134-
"7 Adapative Pavlov 2006 0.009070 0.067653\n",
135-
"38 Forgetful Grudger 0.009069 0.068127\n",
136-
"39 Forgiver 0.009069 0.068085\n",
137-
"96 Random Hunter 0.009066 0.067700\n",
138-
"25 Cycler DDC 0.009034 0.068013\n",
139-
"27 Davis 0.009020 0.067919\n",
140-
"28 Defector 0.009003 0.068814\n",
141-
"18 Cooperator 0.008938 0.067789\n",
142-
"1 Aggravater 0.008833 0.067179\n",
143-
"80 Mind Warper 0.000666 0.004936\n",
144-
"78 Mind Controller 0.000661 0.004974\n",
145-
"77 Mind Bender 0.000076 0.000109\n",
107+
" Player Name Mean Time Std Time\n",
108+
"183 Meta Winner Ensemble: 173 players 0.725196 0.163327\n",
109+
"194 Nice Meta Winner Ensemble: 173 players 0.717734 0.163551\n",
110+
"181 Meta Winner: 173 players 0.715843 0.163815\n",
111+
"193 Nice Meta Winner: 173 players 0.710260 0.161433\n",
112+
"180 Meta Mixer: 173 players 0.704137 0.164330\n",
113+
"179 Meta Minority: 173 players 0.703511 0.161470\n",
114+
"175 Meta Majority: 173 players 0.694404 0.163263\n",
115+
"188 NMWE Deterministic: 126 players 0.674661 0.161399\n",
116+
"186 Meta Winner Long Memory: 95 players 0.669951 0.163705\n",
117+
"190 NMWE Long Memory: 95 players 0.669422 0.161453\n",
118+
"178 Meta Majority Long Memory: 95 players 0.654059 0.161824\n",
119+
"182 Meta Winner Deterministic: 126 players 0.274890 0.368792\n",
120+
"32 DBS: 0.75, 3, 4, 3, 5 0.237661 0.326356\n",
121+
"189 NMWE Finite Memory: 78 players 0.082399 0.161549\n",
122+
"185 Meta Winner Finite Memory: 78 players 0.078334 0.163674\n",
123+
"192 NMWE Stochastic: 47 players 0.077715 0.160826\n",
124+
"187 Meta Winner Stochastic: 47 players 0.074814 0.162308\n",
125+
"177 Meta Majority Finite Memory: 78 players 0.072536 0.161273\n",
126+
"191 NMWE Memory One: 30 players 0.055799 0.160154\n",
127+
"184 Meta Winner Memory One: 30 players 0.053825 0.161574\n",
128+
"176 Meta Majority Memory One: 30 players 0.050814 0.158918\n",
129+
"51 Evolved HMM 5 0.049297 0.159704\n",
130+
"18 Cautious QLearner 0.047443 0.165049\n",
131+
"12 Arrogant QLearner 0.047385 0.164823\n",
132+
"14 Better and Better 0.046649 0.167129\n",
133+
"17 Calculator 0.046625 0.166518\n",
134+
"13 Average Copier 0.046254 0.165869\n",
135+
"4 ALLCorALLD 0.045717 0.164213\n",
136+
"85 Hesitant QLearner 0.045697 0.158947\n",
137+
"126 Risky QLearner 0.045648 0.158738\n",
138+
".. ... ... ...\n",
139+
"48 Evolved FSM 16 Noise 05 0.037923 0.148604\n",
140+
"120 Resurrection 0.037918 0.148614\n",
141+
"95 Math Constant Hunter 0.037918 0.148293\n",
142+
"104 $\\pi$ 0.037917 0.148406\n",
143+
"73 Grudger 0.037915 0.148749\n",
144+
"150 Tit For Tat 0.037915 0.148737\n",
145+
"129 Shubik 0.037914 0.148716\n",
146+
"124 Revised Downing: True 0.037910 0.148451\n",
147+
"135 SolutionB1 0.037907 0.148419\n",
148+
"36 DoubleCrosser: ('D', 'D') 0.037902 0.148167\n",
149+
"68 Soft Go By Majority: 5 0.037898 0.148177\n",
150+
"161 Win-Stay Lose-Shift: C 0.037892 0.148436\n",
151+
"46 Evolved FSM 4 0.037886 0.148443\n",
152+
"156 VeryBad 0.037871 0.148505\n",
153+
"130 Slow Tit For Two Tats 0.037856 0.148452\n",
154+
"31 Davis: 10 0.037850 0.148450\n",
155+
"128 ShortMem 0.037848 0.148281\n",
156+
"91 Level Punisher 0.037847 0.148361\n",
157+
"58 Forgiver 0.037834 0.148303\n",
158+
"84 Hard Tit For Tat 0.037807 0.148200\n",
159+
"54 Fool Me Forever 0.037794 0.148077\n",
160+
"42 Eventual Cycle Hunter 0.037786 0.147847\n",
161+
"152 Tricky Cooperator 0.037772 0.147798\n",
162+
"74 GrudgerAlternator 0.037734 0.147876\n",
163+
"75 Grumpy: Nice, 10, -10 0.037720 0.147843\n",
164+
"103 Opposite Grudger 0.037701 0.147757\n",
165+
"118 Random Hunter 0.037666 0.147202\n",
166+
"23 Cooperator Hunter 0.037662 0.147499\n",
167+
"22 Cooperator 0.037562 0.147239\n",
168+
"34 Defector Hunter 0.037512 0.146974\n",
146169
"\n",
147-
"[142 rows x 3 columns]\n"
170+
"[195 rows x 3 columns]\n"
148171
]
149172
}
150173
],
@@ -154,7 +177,7 @@
154177
},
155178
{
156179
"cell_type": "code",
157-
"execution_count": 11,
180+
"execution_count": 7,
158181
"metadata": {
159182
"collapsed": true
160183
},
@@ -174,24 +197,29 @@
174197
}
175198
],
176199
"metadata": {
200+
"anaconda-cloud": {},
177201
"kernelspec": {
178-
"display_name": "Python 2",
202+
"display_name": "Python [default]",
179203
"language": "python",
180-
"name": "python2"
204+
"name": "python3"
181205
},
182206
"language_info": {
183207
"codemirror_mode": {
184208
"name": "ipython",
185-
"version": 2
209+
"version": 3
186210
},
187211
"file_extension": ".py",
188212
"mimetype": "text/x-python",
189213
"name": "python",
190214
"nbconvert_exporter": "python",
191-
"pygments_lexer": "ipython2",
192-
"version": "2.7.11"
215+
"pygments_lexer": "ipython3",
216+
"version": "3.5.2"
217+
},
218+
"widgets": {
219+
"state": {},
220+
"version": "1.0.0"
193221
}
194222
},
195223
"nbformat": 4,
196-
"nbformat_minor": 0
224+
"nbformat_minor": 1
197225
}

0 commit comments

Comments
 (0)