WIP: Fix compute features and retrain ann (#1182)

* Fix weight parametrization for `my_previous_d`

Corresponds to #1172

* Add new weights.

Note that I trained ANNNoise with a hidden layer of size 10 due to the
docstring. This was in fact an incorrect (the layer had size 5)
docstring but retraining took
quite a while...

* Update tests.

* Remove depreciated dask call.

* Add link to archived training data.

* Sep. archived training data and fix name.

This fails tests, waiting on new data.

* Update training weight for noisy ANN.

* Remove unneeded autodoc calls

This is causing a failure with latest version of sphinx. The docs still
build fine.

Author: drvinceknight

axelrod/data/ann_weights.csv

@@ -1,4 +1,4 @@
 # name, features, hidden_layer_size, weights...
-Evolved ANN, 17, 10, 14.920994181509778, -8.539421246554134, 1.6150777681580917, 2.1133839745099454, 3.139277603197329, 5.6073089903855875, 1.2893101871455475, 2.4515162433471858, 2.1799060574006854, -849.7818194473224, -0.5462821695841157, 14.075346888367086, -0.1077206029112968, 7.624028351513943, -14.723642904872566, -0.47056467181920375, -0.15272858722884597, -0.1667870345057203, -9.330207656247605, -7.201903893065708, 0.7222008172556904, 3.369875284705219, -0.25178793728167986, 2.1824742184012806, -284.292337958774, -2.0371764515038127, -0.4060750963524431, 0.2157312539968217, -0.4873289084475911, 0.7099388173802433, -3.1376006307014195, 0.31628563243348884, -26.069882396181146, 0.57658725316419, 0.6255304773897739, 0.11574707769043852, -6.724658017753541, -0.06168718094941729, -1.704573813012053, -21.053084484673565, -0.27906811892030864, -0.6592946544049232, -1.6522880946637706, -10.070715103357005, 1.9120237918736203, -8.381248251868456, -0.42375002332046985, -4.075091157956381, 5.852205040950515, -0.16887278728842112, -503.9800319502985, -0.8101004804354428, 32.96795077739276, -0.3505022538093938, -23.635260283225836, -0.6788655791960011, -3.7324573271823405, 5.210501178280269, 7.899371341588726, -0.37219584002539274, -8.590100977369616, 1.1951877751525553, -0.9725999589188156, -0.33034089637893205, -1.6874230655478766, 11.445205808265705, 25.508800948197486, -0.3232633677420764, -3.2801359754639527, 0.7995376207063848, 60.40795197689716, -0.6973191118154607, -0.0606902634645794, 18.761627341404377, 1.6106147916036295, 0.8952559555504325, 7.737989750542529, -0.08155796137522858, -0.2707603418821436, 0.8377391071724807, 0.7599744569869842, -6.5471193331012385, 0.04984626844358209, -0.9546393825548196, 0.3320730603700408, 8.12061599840428, -0.5586487381935316, 4.040878306422091, 2.24447343472202, -11.692072099260537, 0.3554078938672782, 0.9426944571138662, 3.0217729542605944, -0.2898778350971405, -9.528042013696693, -0.7908737822509964, 33.096610930739146, -0.11350519233454959, 0.4578615307378835, -301.61586589419073, -0.9433905899289174, -7.9850815282881085, 16.82495134955476, -7.426550428361391, 0.7823387911370989, -0.5930616323373504, -8.780861210306748, -27.96554907649343, -2.5356464175646574, 6.350179221288333, -3.058694370342431, 6.0971728186462535, -34.381871731785004, -0.8520828425260147, 7.745937635677921, -18.427922226016875, 0.18742462407203792, 0.7624744141906804, -11.376965305377842, 0.5137943475400424, -3.002550433196402, 0.7902109588465649, -4218.048877034596, -0.7585298993589994, 3.0855504457055196, 7.884180809124661, 1.8811641150347547, -0.965138462833793, 2.202796310895349, -1.5145312506057167, 1.9850892266233329, -5.446953946631405, -0.2624599713295459, -4.528521948056366, -87.84063254115298, 1.5864033886918087, 0.18654828525466285, 0.5189590159529605, -4.591979598068858, 0.04895538998569959, 0.005060619101347402, 1.0578108979883498, 3.291121378596104, -1.8986213534870875, 5.158289861855974, -0.10919419963736998, -0.5779851376477234, -2.92310972518996, 0.004062011737791114, -0.4811680813446637, -0.0809173068233835, 0.7176388332501142, -0.28740833712052716, -8.596418198927504, -12.392010102035053, -0.19025220226005865, -6.408742332162129, 0.21671177114693058, -2.010055169209548, 3.5211106460017993, -6.623636682631282, -6.298207738699384, 0.09629628969288118, -1.5906496462082083, 40.69630333710249, 5.578076407652192, 0.9873037395054352, 4.1246368805708755, 5.586014682561839, -5.169634595361068, 5.0267710234418175, 8.189532925869203, 2.52090646851362, -0.8760008415096329, 4.254991686226757, 0.00476046038928349, 0.40241499110653334, -0.04145512316612909, -0.22365267837870784, -0.40577464527176105, 5.808860159876369, -0.5090740661209461, 11.083481877045486, -0.994319001629201, 1.0065042165704814, 513.6857303903015, 1.576458223820881, 1.3857709244359848, -0.7827681760160742, 0.4011009259304046
-Evolved ANN 5, 17, 5, 1042.4997550294277, -7937.858369783021, 25.818606328924748, -4.26070377439986, -168.96277998356356, -2.341257600473047, -0.07771589191183033, -0.5423944875015767, -1.5810736326692496, -5.16213101721316, 7.17816349844851, 0.8074964122636121, 0.21416319743457732, 5.538961473252522, -9.512898809828501, -0.12006356662369953, -280.082516613952, 1.8529621354893893, 26.817611147417185, 0.9820010728041374, -2.27725077434398, -0.8906807363846334, 55.03539131541135, -211.54099059075676, 20.792899954576107, -5.503012443532969, -280.9683636797514, 74.43564536095175, 124.14334411081369, -12.706254307082409, -6.933920984890429, -0.38476268064463015, 8.975175048181198, -1.6449542486545161, 8.26071827262421, -2.3810851684394456, -18.27825778507713, -67.57530677803513, -11.059397770595735, -0.4455897450240485, 3.2266501549486204, -7.6443085976596965, 63.44603031947662, -3.528482065643596, -5.076406291100973, 19.374734266507975, 1.5226203343728766, -0.44268278128779104, -0.8161698911312674, 9.61235271443554, 17.676650252285967, -0.7420227915598891, 0.07413481608374295, -0.8342895316168797, -0.6694872934600434, 10.430156762300522, 3.635766426950689, 0.1755334463387752, -0.9890251977872899, 0.42011087742859177, -2.820643154845354, 0.7207632754474798, 2.4153542760406044, -0.20532907625980434, -0.09578540868421094, -0.3248853993761196, -15.114073526949754, 0.7138749178582036, 0.012748683574398522, -5.151929171038222, -0.18168096204611683, 0.12321196817972058, -2.4823793808208254, -0.23381326045153722, -0.9949249013656158, -1.2493559896831516, -3.5801094837630747, 0.5272817536659411, -0.39953838013411125, 0.7048674167074584, -0.21423948660211947, 1.8969371420522172, 0.8784167200209325, 4.883426513866366, 0.07334277572312708, 0.9412829148198492, 2.2735749414879223, 0.3010358881711277, 0.7235472200870527, -5.497399729937924, 4.5921610714388805, 20.894513790044904, -1.1248646521466905, 0.5159194676598134, -0.5495447042819452
-Evolved ANN 5 Noise 05, 17, 5, 36.09658586297668, 0.6952539724936835, 0.25408153362565666, -2.716917527921508, 1.4814972333284617, 0.6028513839595413, 0.6844245625855201, 3.1692219435987266, 0.38252236362186864, 1.9391294083527966, -3.862861782732417, -1.1698165279159176, 6.030593622578442, -0.01572148430725266, -2.8555260071081223, 1.0963444420994224, 0.6521617821418728, 0.6822580643203193, -0.8037548090720363, -1.2857522891844446, 1.812749840703618, 10.38366533568883, -0.92753084797665, 0.7956284912623364, 1.2824107161589482, 0.007162461983402757, -4.804756035200856, -0.10614690858208416, 0.9642612520922451, -0.7461782948308407, -0.08752907284016989, 1.6516347772173845, 0.12574121805820204, 0.25169759021622107, 1.9418514469044912, -0.7936284062348744, -2.7970725779402184, 2.8989776390747766, 1.7621738442237704, 1.1830828950636911, -4.090498199690915, -0.12874132803561067, 0.4235478626298035, -0.048641270392635313, -0.5501716762530418, -4.704898276070267, 0.6503799361905369, 2.577952198406099, -0.6795188895754238, 1.296597838175882, -0.3737944847620966, -85.15976687237185, 6.102036276642611, -2.8088932676390646, -0.48828493262736883, -26.963608575080933, -0.2598350087342174, 6.295368949518579, 0.5553586643839697, -0.4886330547154492, -0.950193360384372, 1.02123593321849, 0.2337953815949918, -0.2543229365214641, -0.7453530276997804, -11.789731922222716, 1.7996751330617449, 0.33041910493690574, 0.34899319879004986, -5.278900059749108, -0.8625743757531087, 25.60501573957309, -1.0089393778784306, -0.05911002350335779, -0.9705348135122142, 0.10162679358236236, 0.12989359918585044, -3.984478547851949, 2.5609134716737953, -5.389221793406115, 0.39689573124049193, 26.683723990557972, -8.840110627163781, -12.030562053354247, -0.7408392496259206, 0.8081369706063168, -0.5332328628031116, -14.746921413893938, 2.7450770166928335, 0.10401164939107144, 0.7569160301876849, 0.6760525036631198, -7.663612737767711, 0.8904272712588372, 0.25074448552630524
+Evolved ANN, 17, 10, 3.459899447605539, 2.1318404265386586, 13.17966613895038, -6.192108007790158, -0.37086706789610013, -0.3896626810316768, -0.3866099292858918, -0.5945768318137592, 8.657276286604098, -0.31582965913711214, -12.77263491874852, -3.7221902888177283, 0.7700315120556411, -33.026063114130366, -0.6766419579791423, -0.9319070818093544, -12.214457623430176, -0.7005949704263965, -0.9248704722582742, -0.30575483808901427, -0.6882322381266356, 0.492463682676912, 0.4162176461180324, 2.2349377906341243, -4.828561111548519, -1.9512825291316083, 15.234656539966528, 13.201167624183022, 2.128673097211623, 2.92411276919898, -0.7547167660636005, 1.199314577481091, 0.06760026684238629, 0.7832939406545589, -177.49932309404323, 6.89500655807993, -0.08284645051120698, -0.799724698184292, -8.207688126907367, 17.450767180301746, -19.54570476880868, 23.570589723652876, 7.443462688149636, -4.262126715956444, 51.789933932119446, -0.9595303137934914, -0.015387143246637383, -1.6996871126483133, 0.5326556419474413, -0.8690658866365495, -0.747871482057276, -0.1990663384836313, 0.7376303253285281, 19.692218213944003, -2.920745672290689, -0.2877252920885854, -5.351299019427598, 1.1722532499353777, 1.3902788805171062, 0.38849134405949914, -5.729822642840242, -4.641822939824729, 0.5691745664669388, 0.30905426295392857, -8.85980449965398, -4.732837361082687, 0.8831193558694339, -0.9520915826182503, -0.5355473390079997, -22.037852229409136, -0.9596756645256569, 0.15632020854402362, -24.710657392303975, 21.00195680553553, -6.099731246259528, -0.9426766932743909, -0.7194608598270196, 3.4908551710867917, 0.1371367081336668, -0.9960642361403127, -0.23395001734734366, 0.7974681865981025, 1.1178545864789984, 0.0309085368898055, 0.3709257972027509, -0.7705906687715782, 0.3106563294379545, -0.006111882508708552, 0.01778595332796895, 0.5677955352244695, -0.04300357455768222, -0.8378512149555155, 0.4517674874175419, 0.026356153000395066, 8.559746666840512, 60.1036518587203, -11.066045796708, 1.9547952088765457, -1.2572770384601373, -3.1565358568060065, -0.39428165742075283, -7.976304408878465, -12.979182222761667, -0.8903476091382874, -0.044046900475693686, -2290.612969360032, 3.1361101611630904, -4.744165899359072, 1.5590913900932555, 23.589552731167824, 3.696503591016147, -49.0193733334204, -0.31155127179562386, -12.893291340674148, 3.355621906094085, -1124.6168527572167, -8.611905802129927, -5.495486462660128, 9.317002862904996, -0.928102034629926, 0.9862671193437127, 71.6360157474848, -41.78727928552422, -0.08938630210606524, -25.475912160872333, -1.6296570038831701, 3.721506342123227, 1.2616295894267517, -2.16674011456336, 1.0608792593103447, -1.5348732560098246, 0.6488189032682272, -9.554624561640432, 0.9982451738644897, -3.585518099583287, 2.3410371683096507, -1.059363823436213, -36.03382554076086, 49.400216254399005, -0.09560108506061127, 22.265326907988467, -1167.4125713033582, -827.3412289305065, -0.2817962724984171, -12.585799415544116, -0.4968822378372789, 81.10836010264876, 0.7230863554676401, -3.7241902674476655, -0.9757756717170544, -68.02893974316859, -2.2396567795647564, 0.07066110212550569, -1.250920612229347, -0.046887193108303915, -0.7680639795702753, 17.937616126439604, -1.1019678164169133, 0.07411014749198457, 2.056144561078099, -0.9166833148022522, -27.361514430051557, -2.3877636883795264, 2.2300576943504535, 447.438860571402, 0.45131006835733695, 10.58847351640523, 1.9849158213808964, -1574.2103557260862, -0.7371599837780478, 0.9086264191508042, -0.7828307535556679, 0.3300464039361075, 1.81242958242284, -3.610267708304238, -0.973651955724061, 0.1209299242691169, 2.9843573498979894, -0.11277293056015156, -0.7439895632451479, -3.8649914641316685, 0.9782080851048618, -5.053463725816831, 3.5891164827308604, -3.7958700956913, -2.8572114118106247, -0.41818946926149336, 1.4695517340149908, -0.026854015704181288, -0.02788909596479816
+Evolved ANN 5, 17, 5, -28.102635339566508, -5.270221138740612, -1.7991915039829207, -19.860573976774578, -24.60513164187047, 3.8162913045444635, 0.023473769583907095, -54.50321528122049, 10.003539037251969, -2.3346147693972115, 16.73844151591633, 0.3100810247981438, -169.33492203029917, -5.724230282870263, 0.8526201446384842, -0.22605058147685014, -17.835641849307482, -0.7043679829900225, -10.486007034199204, -3.0550187074781925, -0.6810531857496793, -4453.796912952781, 33810.53059746947, -10848.78737197365, -118.11626381871724, 93.18879667509046, -16083.650736874622, -13.725703495018438, 50.10494647994167, -7.604207807021347, 90.77373268627657, 1.595074916653774, 2.7557812139573015, -39715.109221929466, 28.904911685140643, -0.43899423549864697, 5.768080489913274, 5.295125125995148, -2.546634014137431, -238767.20745174124, -3.5528156876545527, -4.9527347193332965, 1115.2695575158439, 4.174668501799942, -14.649495628121237, -23.25321447104678, 0.5500236215768699, -20.73180030629891, 0.5694594098639599, 9.126335853167467, 3.566801760870098, 1337.557828195395, 7235.478182255781, 73866.16381328272, -857.4430471718431, -924.9591765734541, -3518.967885192465, -1.9067958478325906, -6.633454070601698, -14.521354381912227, -2885.6120623623256, 22500.261088902847, -2.151057666676581, -1132.4844452804136, -320738.9350600944, 95.16925312662866, -5656.2165411116075, -45086.65321702537, -27.563351028422737, -2.61387586136827, 371.56363217654854, -303.4084110871267, 6.983609633015089, -47.030329656598646, -32.801150369212415, 106.5993554145673, -1488.6548395800542, -76.76127924999216, 228.98568852459917, 3.1681704936401016, 7.847547722960641, -17.600408577355783, -10.176187185243615, -2.8861364567007923, -6.112911717298348, -335.90148548509376, 52.34158411280463, 1272.9680157062762, 22.881750122081684, 533.1837365484016, -0.6762316764182235, 4.4063523628928465, 4.139696013585834, 124.12127527435491, -128.06733876616389
+Evolved ANN 5 Noise 05, 17, 5, 23.884262150181755, -1818.8117704211384, -99.98875916610936, -0.03961610388820535, -6.210054298897063, 3.7052379169262717, -0.2341738759745093, -181.13859219885555, 12.13317672298101, -0.49669501894086343, -1.0749425884840627, 10.74864948953037, -0.2896667901231506, -16.22712292450597, -1.7178383009508598, 0.03221417142047274, -158.1666203488453, -14.63669956068759, 15.408582826806054, 5.844929636776999, 4.566735602054217, 3.2997530921332476, -1.9670038978333584, 11.7498294264678, 13.681065767064851, 6.221555978655614, -6.577090380820985, -5.280239152793359, -3.708452340749404, 0.9946864682020832, -4.969083580503034, 0.37099841885684537, -4.663632521892934, 0.5739444442201613, -97.24526798384726, -18.898938443720873, 2.836962511054863, 1426.696564885826, -61.660716521684535, -96.9853369128562, -35.811382478532956, 21.74704795347286, -43208.50415025884, -30.91261823654964, 556.8238912039677, -1.2029710853005269, 86.95493903070172, -10502.293376143582, -2.0466530653599544, 22.16892386331129, -155.02893455429202, -28.409090647029252, -3.391747333401208, -13.869670523479188, 13.919971713037201, 10.27621997230116, 0.8687219298082444, 5.274915939989237, -103.56226257273838, -11.47523804695477, 8.100576862445774, -0.5353167277104594, -9.108755782674894, 0.8155938130504109, -7.262915116612636, -0.7403289719769353, -1.7023773645551308, 1.0574026713510245, -2732.0241659942394, -5.435067280962746, -188.24943501427512, 0.37886585953090285, -67.01235198117197, -121.1206837158425, -83.84782446726592, 45.31005125030543, 11.069886195948996, -169.35773604933806, 31.675914286375498, -311.2006747809748, 49.093586385973545, -5.819783407611689, -88.52645028711315, -284.2358463873679, 0.6989482567897998, 156.74810964228283, 1.8064093223587379, 3.4228475977181265, -125.93039228074147, -25.169489233728665, 115.98479433268457, 21.27858612035085, 0.2744006209426808, 2.899956014713407, -53.98506935427509

axelrod/result_set.py

@@ -479,7 +479,7 @@ def _compute_tasks(self, tasks, processes):
         Compute all dask tasks
         """
         if processes is None:
-            out = da.compute(*tasks, get=da.get)
+            out = da.compute(*tasks, scheduler='single-threaded')
         else:
             out = da.compute(*tasks, num_workers=processes)
         return out

axelrod/strategies/ann.py

@@ -55,7 +55,7 @@ def compute_features(player: Player, opponent: Player) -> List[int]:
         opponent_second_c = 0
         opponent_second_d = 0
         my_previous_c = 1 if player.history[-1] == C else 0
-        my_previous_d = 0 if player.history[-1] == D else 0
+        my_previous_d = 1 if player.history[-1] == D else 0
         my_previous2_c = 0
         my_previous2_d = 0
         opponent_previous_c = 1 if opponent.history[-1] == C else 0
@@ -69,7 +69,7 @@ def compute_features(player: Player, opponent: Player) -> List[int]:
         opponent_second_c = 1 if opponent.history[1] == C else 0
         opponent_second_d = 1 if opponent.history[1] == D else 0
         my_previous_c = 1 if player.history[-1] == C else 0
-        my_previous_d = 0 if player.history[-1] == D else 0
+        my_previous_d = 1 if player.history[-1] == D else 0
         my_previous2_c = 1 if player.history[-2] == C else 0
         my_previous2_d = 1 if player.history[-2] == D else 0
         opponent_previous_c = 1 if opponent.history[-1] == C else 0
@@ -205,6 +205,9 @@ class EvolvedANN(ANN):
     A strategy based on a pre-trained neural network with 17 features and a
     hidden layer of size 10.
 
+    Trained using the `axelrod_dojo` version: 0.0.8
+    Training data is archived at doi.org/10.5281/zenodo.1306926
+
     Names:
 
      - Evolved ANN: Original name by Martin Jones.
@@ -222,6 +225,9 @@ class EvolvedANN5(ANN):
     A strategy based on a pre-trained neural network with 17 features and a
     hidden layer of size 5.
 
+    Trained using the `axelrod_dojo` version: 0.0.8
+    Training data is archived at doi.org/10.5281/zenodo.1306931
+
     Names:
 
      - Evolved ANN 5: Original name by Marc Harper.
@@ -237,11 +243,14 @@ def __init__(self) -> None:
 class EvolvedANNNoise05(ANN):
     """
     A strategy based on a pre-trained neural network with a hidden layer of
-    size 10, trained with noise=0.05.
+    size 5, trained with noise=0.05.
+
+    Trained using the `axelrod_dojo` version: 0.0.8
+    Training data i archived at doi.org/10.5281/zenodo.1314247.
 
     Names:
 
-     - Evolved ANN Noise 05: Original name by Marc Harper.
+     - Evolved ANN Noise 5: Original name by Marc Harper.
     """
 
     name = "Evolved ANN 5 Noise 05"

axelrod/tests/strategies/test_ann.py

@@ -61,7 +61,7 @@ def test_strategy(self):
         actions = [(C, C)] * 5
         self.versus_test(axelrod.Cooperator(), expected_actions=actions)
 
-        actions = [(C, D)] * 4 + [(D, D)]
+        actions = [(C, D)] + [(D, D)] * 4
         self.versus_test(axelrod.Defector(), expected_actions=actions)
 
 
@@ -83,5 +83,5 @@ def test_strategy(self):
         actions = [(C, C)] * 5
         self.versus_test(axelrod.Cooperator(), expected_actions=actions)
 
-        actions = [(C, D), (D, D), (C, D)]
+        actions = [(C, D), (D, D), (D, D)]
         self.versus_test(axelrod.Defector(), expected_actions=actions)