change adoption calculation

- src/NameGame.cc (run): count last N uncommitted strategies and report
  that instead of the last N strategies.

Signed-off-by: Aiden Woodruff <woodra@rpi.edu>

1 files changed, 9 insertions, 0 deletions

diff --git a/src/NameGame.cc b/src/NameGame.cc
index bfd681c..7561946 100644
--- a/src/NameGame.cc
+++ b/src/NameGame.cc
@@ -148,10 +148,19 @@ int NameGame::run(int rounds) {
         avg /= strategy_record.size() - srlen;
         // std::cout << avg << std::endl;
         int plays = 0;
+#ifdef TP_ALLSTRAT
         for (int i = strategy_record.size() - gsize; i < strategy_record.size(); ++i) {
                 if (!strategy_record[i].committed && strategy_record[i].strategy == 1)
                         ++plays;
         }
+#else
+        for (int i = strategy_record.size() - 1, j = 0; i >= 0 && j < gsize; --i) {
+                if (!strategy_record[i].committed) {
+                        ++j;
+                        if (strategy_record[i].strategy == 1) ++plays;
+                }
+        }
+#endif
         return plays;
 }