change main to one run game

- src/main.cc: run only one game with prescribed settings and output the
  number of new strategy plays.
- src/NameGame.h: change NameGame::run to return an int which is the
  number of non-committed players that changed their mind.
- src/NameGame.cc (run): do not display average for brevity.
- output the uncommitted new strategy plays.

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

3 files changed, 19 insertions, 15 deletions

diff --git a/src/NameGame.cc b/src/NameGame.cc
index 20221f7..e427542 100644
--- a/src/NameGame.cc
+++ b/src/NameGame.cc
@@ -72,7 +72,7 @@ void NameGame::initMemory() {
         }
 }
 
-void NameGame::run(int rounds) {
+int NameGame::run(int rounds) {
         if (rounds < 0) throw std::invalid_argument("NameGame::run rounds < 0");
         size_t srlen = strategy_record.size();
         for (int i = 0; i < rounds; ++i) runRound(i);
@@ -83,7 +83,13 @@ void NameGame::run(int rounds) {
                 avg += strategy_record[i].strategy;
         }
         avg /= strategy_record.size() - srlen;
-        std::cout << avg << std::endl;
+        // std::cout << avg << std::endl;
+        int plays = 0;
+        for (int i = strategy_record.size() - gsize; i < strategy_record.size(); ++i) {
+                if (!strategy_record[i].committed && strategy_record[i].strategy == 1)
+                        ++plays;
+        }
+        return plays;
 }
 
 void NameGame::runRound(int r) {
diff --git a/src/NameGame.h b/src/NameGame.h
index 7a9638a..0b02a15 100644
--- a/src/NameGame.h
+++ b/src/NameGame.h
@@ -18,7 +18,11 @@ public:
         void initGraph();
         void initMemory();
         void clearRecord();
-        void run(int rounds);
+        /**
+         * \brief Run the game.
+         * \return number of non-committed players who would choose the new strategy
+         */
+        int run(int rounds);
         void writeRecord(const char* fname, bool append = false);
 
 protected:
diff --git a/src/main.cc b/src/main.cc
index f828b27..f8776eb 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -3,18 +3,12 @@
 #include "NameGame.h"
 
 int main(int argc, char* argv[]) {
-        int group_size = 1000;
-        tp::NameGame namegame(group_size, 0, 12);
-        int cmperc_start = 18;
-        for (int cmperc = cmperc_start; cmperc < 28; cmperc += 2) {
-                int cmsize = group_size * cmperc / 100;
-                namegame.clearRecord();
-                namegame.setCMsize(cmsize);
-                namegame.initMemory();
-                std::cout << "CM " << cmsize << " / " << group_size << std::endl;
-                namegame.run(group_size * 1000);
-                namegame.writeRecord("strategy_record.csv", cmperc != cmperc_start);
-        }
+        int group_size = 1000, cmsize = 292;
+        tp::NameGame namegame(group_size, cmsize, 12);
+        std::cout << "CM " << cmsize << " / " << group_size << std::endl;
+        int a = namegame.run(group_size * 1000);
+        std::cout << "Non-committed new strategy plays in the last N runs: " << a << std::endl;
+        namegame.writeRecord("strategy_record.csv");
         return 0;
 }