Set TF3 to have inf memory length.

Closes #25
Axelrod-Python · May 17, 2017 · 57d30b7 · 57d30b7
1 parent 50ddd2f
commit 57d30b7
Show file tree

Hide file tree

Showing 71 changed files with 123 additions and 120 deletions.
diff --git a/img/ALLCorALLD_v_Cooperator.pdf b/img/ALLCorALLD_v_Cooperator.pdf
diff --git a/img/ALLCorALLD_v_Defector.pdf b/img/ALLCorALLD_v_Defector.pdf
diff --git a/img/ALLCorALLD_v_TfT.pdf b/img/ALLCorALLD_v_TfT.pdf
diff --git a/img/Alternator_v_ALLCorALLD.pdf b/img/Alternator_v_ALLCorALLD.pdf
diff --git a/img/Alternator_v_Cooperator.pdf b/img/Alternator_v_Cooperator.pdf
diff --git a/img/Alternator_v_Defector.pdf b/img/Alternator_v_Defector.pdf
diff --git a/img/Alternator_v_GTFT.pdf b/img/Alternator_v_GTFT.pdf
diff --git a/img/Alternator_v_PSO_Gambler_2_2_2.pdf b/img/Alternator_v_PSO_Gambler_2_2_2.pdf
diff --git a/img/Alternator_v_Random.pdf b/img/Alternator_v_Random.pdf
diff --git a/img/Alternator_v_TfT.pdf b/img/Alternator_v_TfT.pdf
diff --git a/img/Alternator_v_WSLS.pdf b/img/Alternator_v_WSLS.pdf
diff --git a/img/Alternator_v_ZD-Extort-2.pdf b/img/Alternator_v_ZD-Extort-2.pdf
diff --git a/img/Calculator_v_ALLCorALLD.pdf b/img/Calculator_v_ALLCorALLD.pdf
diff --git a/img/Calculator_v_Arrogant_QLearner.pdf b/img/Calculator_v_Arrogant_QLearner.pdf
diff --git a/img/Calculator_v_Random.pdf b/img/Calculator_v_Random.pdf
diff --git a/img/Cooperator_v_ALLCorALLD.pdf b/img/Cooperator_v_ALLCorALLD.pdf
diff --git a/img/Cooperator_v_GTFT.pdf b/img/Cooperator_v_GTFT.pdf
diff --git a/img/Cooperator_v_PSO_Gambler_2_2_2.pdf b/img/Cooperator_v_PSO_Gambler_2_2_2.pdf
diff --git a/img/Cooperator_v_Random.pdf b/img/Cooperator_v_Random.pdf
diff --git a/img/Cooperator_v_TfT.pdf b/img/Cooperator_v_TfT.pdf
diff --git a/img/Cooperator_v_ZD-Extort-2.pdf b/img/Cooperator_v_ZD-Extort-2.pdf
diff --git a/img/Defector_v_Alternator.pdf b/img/Defector_v_Alternator.pdf
diff --git a/img/Defector_v_Cooperator.pdf b/img/Defector_v_Cooperator.pdf
diff --git a/img/Defector_v_Defector.pdf b/img/Defector_v_Defector.pdf
diff --git a/img/Defector_v_TfT.pdf b/img/Defector_v_TfT.pdf
diff --git a/img/Defector_v_WSLS.pdf b/img/Defector_v_WSLS.pdf
diff --git a/img/Random_v_ALLCorALLD.pdf b/img/Random_v_ALLCorALLD.pdf
diff --git a/img/Random_v_Cooperator.pdf b/img/Random_v_Cooperator.pdf
diff --git a/img/Random_v_Defector.pdf b/img/Random_v_Defector.pdf
diff --git a/img/Random_v_GTFT.pdf b/img/Random_v_GTFT.pdf
diff --git a/img/Random_v_PSO_Gambler_2_2_2.pdf b/img/Random_v_PSO_Gambler_2_2_2.pdf
diff --git a/img/Random_v_Random.pdf b/img/Random_v_Random.pdf
diff --git a/img/Random_v_TfT.pdf b/img/Random_v_TfT.pdf
diff --git a/img/Random_v_ZD-Extort-2.pdf b/img/Random_v_ZD-Extort-2.pdf
diff --git a/img/WSLS_v_TfT.pdf b/img/WSLS_v_TfT.pdf
diff --git a/img/average_rank_vs_population_size_coexist.pdf b/img/average_rank_vs_population_size_coexist.pdf
diff --git a/img/average_rank_vs_population_size_invade.pdf b/img/average_rank_vs_population_size_invade.pdf
diff --git a/img/average_rank_vs_population_size_resist.pdf b/img/average_rank_vs_population_size_resist.pdf
diff --git a/img/boxplot_10_invade.pdf b/img/boxplot_10_invade.pdf
diff --git a/img/boxplot_10_resist.pdf b/img/boxplot_10_resist.pdf
diff --git a/img/boxplot_11_invade.pdf b/img/boxplot_11_invade.pdf
diff --git a/img/boxplot_11_resist.pdf b/img/boxplot_11_resist.pdf
diff --git a/img/boxplot_12_invade.pdf b/img/boxplot_12_invade.pdf
diff --git a/img/boxplot_12_resist.pdf b/img/boxplot_12_resist.pdf
diff --git a/img/boxplot_13_invade.pdf b/img/boxplot_13_invade.pdf
diff --git a/img/boxplot_13_resist.pdf b/img/boxplot_13_resist.pdf
diff --git a/img/boxplot_14_invade.pdf b/img/boxplot_14_invade.pdf
diff --git a/img/boxplot_14_resist.pdf b/img/boxplot_14_resist.pdf
diff --git a/img/boxplot_2_invade.pdf b/img/boxplot_2_invade.pdf
diff --git a/img/boxplot_3_invade.pdf b/img/boxplot_3_invade.pdf
diff --git a/img/boxplot_3_resist.pdf b/img/boxplot_3_resist.pdf
diff --git a/img/boxplot_4_invade.pdf b/img/boxplot_4_invade.pdf
diff --git a/img/boxplot_4_resist.pdf b/img/boxplot_4_resist.pdf
diff --git a/img/boxplot_5_invade.pdf b/img/boxplot_5_invade.pdf
diff --git a/img/boxplot_5_resist.pdf b/img/boxplot_5_resist.pdf
diff --git a/img/boxplot_6_invade.pdf b/img/boxplot_6_invade.pdf
diff --git a/img/boxplot_6_resist.pdf b/img/boxplot_6_resist.pdf
diff --git a/img/boxplot_7_invade.pdf b/img/boxplot_7_invade.pdf
diff --git a/img/boxplot_7_resist.pdf b/img/boxplot_7_resist.pdf
diff --git a/img/boxplot_8_invade.pdf b/img/boxplot_8_invade.pdf
diff --git a/img/boxplot_8_resist.pdf b/img/boxplot_8_resist.pdf
diff --git a/img/boxplot_9_invade.pdf b/img/boxplot_9_invade.pdf
diff --git a/img/boxplot_9_resist.pdf b/img/boxplot_9_resist.pdf
diff --git a/img/correlation_heatmap_coexist.pdf b/img/correlation_heatmap_coexist.pdf
diff --git a/img/correlation_heatmap_invade.pdf b/img/correlation_heatmap_invade.pdf
diff --git a/img/correlation_heatmap_resist.pdf b/img/correlation_heatmap_resist.pdf
diff --git a/main.pdf b/main.pdf
diff --git a/nbs/main.ipynb b/nbs/main.ipynb
diff --git a/src/players.py b/src/players.py
@@ -51,7 +51,7 @@
 
 fsm_players[3].classifier["memory_depth"] = float('inf')
 fsm_players[4].classifier["memory_depth"] = float('inf')
-fsm_players[5].classifier["memory_depth"] = 16
+fsm_players[5].classifier["memory_depth"] = float('inf')
 
 def selected_players(extra_players=fsm_players):
     """

diff --git a/tex/list_of_players.tex b/tex/list_of_players.tex
@@ -47,7 +47,7 @@
  - \textit{Stochastic} - \textit{Memory depth}: 5\item EvolvedLookerUp1\_1\_1
  - \textit{Deterministic} - \textit{Memory depth}: \(\infty\)\item EvolvedLookerUp2\_2\_2
  - \textit{Deterministic} - \textit{Memory depth}: \(\infty\)\item FSM Player: [(0, 'C', 0, 'C'), (0, 'D', 3, 'C'), (1, 'C', 5, 'D'), (1, 'D', 0, 'C'), (2, 'C', 3, 'C'), (2, 'D', 2, 'D'), (3, 'C', 4, 'D'), (3, 'D', 6, 'D'), (4, 'C', 3, 'C'), (4, 'D', 1, 'D'), (5, 'C', 6, 'C'), (5, 'D', 3, 'D'), (6, 'C', 6, 'D'), (6, 'D', 6, 'D'), (7, 'C', 7, 'D'), (7, 'D', 5, 'C')], 0, C
-(\textbf{TF3}) - \textit{Deterministic} - \textit{Memory depth}: 16\item FSM Player: [(0, 'C', 13, 'D'), (0, 'D', 12, 'D'), (1, 'C', 3, 'D'), (1, 'D', 4, 'D'), (2, 'C', 14, 'D'), (2, 'D', 9, 'D'), (3, 'C', 0, 'C'), (3, 'D', 1, 'D'), (4, 'C', 1, 'D'), (4, 'D', 2, 'D'), (5, 'C', 12, 'C'), (5, 'D', 6, 'C'), (6, 'C', 1, 'C'), (6, 'D', 14, 'D'), (7, 'C', 12, 'D'), (7, 'D', 2, 'D'), (8, 'C', 7, 'D'), (8, 'D', 9, 'D'), (9, 'C', 8, 'D'), (9, 'D', 0, 'D'), (10, 'C', 2, 'C'), (10, 'D', 15, 'C'), (11, 'C', 7, 'D'), (11, 'D', 13, 'D'), (12, 'C', 3, 'C'), (12, 'D', 8, 'D'), (13, 'C', 7, 'C'), (13, 'D', 10, 'D'), (14, 'C', 10, 'D'), (14, 'D', 7, 'D'), (15, 'C', 15, 'C'), (15, 'D', 11, 'D')], 0, C
+(\textbf{TF3}) - \textit{Deterministic} - \textit{Memory depth}: \(\infty\)\item FSM Player: [(0, 'C', 13, 'D'), (0, 'D', 12, 'D'), (1, 'C', 3, 'D'), (1, 'D', 4, 'D'), (2, 'C', 14, 'D'), (2, 'D', 9, 'D'), (3, 'C', 0, 'C'), (3, 'D', 1, 'D'), (4, 'C', 1, 'D'), (4, 'D', 2, 'D'), (5, 'C', 12, 'C'), (5, 'D', 6, 'C'), (6, 'C', 1, 'C'), (6, 'D', 14, 'D'), (7, 'C', 12, 'D'), (7, 'D', 2, 'D'), (8, 'C', 7, 'D'), (8, 'D', 9, 'D'), (9, 'C', 8, 'D'), (9, 'D', 0, 'D'), (10, 'C', 2, 'C'), (10, 'D', 15, 'C'), (11, 'C', 7, 'D'), (11, 'D', 13, 'D'), (12, 'C', 3, 'C'), (12, 'D', 8, 'D'), (13, 'C', 7, 'C'), (13, 'D', 10, 'D'), (14, 'C', 10, 'D'), (14, 'D', 7, 'D'), (15, 'C', 15, 'C'), (15, 'D', 11, 'D')], 0, C
 (\textbf{TF2}) - \textit{Deterministic} - \textit{Memory depth}: \(\infty\)\item FSM Player: [(0, 'C', 7, 'C'), (0, 'D', 1, 'C'), (1, 'C', 11, 'D'), (1, 'D', 11, 'D'), (2, 'C', 8, 'D'), (2, 'D', 8, 'C'), (3, 'C', 3, 'C'), (3, 'D', 12, 'D'), (4, 'C', 6, 'C'), (4, 'D', 3, 'C'), (5, 'C', 11, 'C'), (5, 'D', 8, 'D'), (6, 'C', 13, 'D'), (6, 'D', 14, 'C'), (7, 'C', 4, 'D'), (7, 'D', 2, 'D'), (8, 'C', 14, 'D'), (8, 'D', 8, 'D'), (9, 'C', 0, 'C'), (9, 'D', 10, 'D'), (10, 'C', 8, 'C'), (10, 'D', 15, 'C'), (11, 'C', 6, 'D'), (11, 'D', 5, 'D'), (12, 'C', 6, 'D'), (12, 'D', 9, 'D'), (13, 'C', 9, 'D'), (13, 'D', 8, 'D'), (14, 'C', 8, 'D'), (14, 'D', 13, 'D'), (15, 'C', 4, 'C'), (15, 'D', 5, 'C')], 0, C
 (\textbf{TF1}) - \textit{Deterministic} - \textit{Memory depth}: \(\infty\)\item Feld: 1.0, 0.5, 200
  - \textit{Stochastic} - \textit{Memory depth}: 200\item Firm But Fair

diff --git a/tex/memory_depth_count.tex b/tex/memory_depth_count.tex
@@ -2,6 +2,6 @@
 \toprule
 Memory Depth &   0   &   1   &   2   &   3   &   4   &   5   &   6   &   9   &   10  &   11  &   12  &   16  &   20  &   40  &   200 &  \(\infty\)   \\
 \midrule
-Count &     3 &    28 &    12 &     8 &     2 &     6 &     1 &     1 &     5 &     1 &     1 &     3 &     2 &     2 &     1 &    88 \\
+Count &     3 &    28 &    12 &     8 &     2 &     6 &     1 &     1 &     5 &     1 &     1 &     2 &     2 &     2 &     1 &    89 \\
 \bottomrule
 \end{tabular}