add namegame parameters to record file

- src/NameGame.h: replace tuple in strategy_record with private struct.
- src/NameGame.cc (runRound): add round number so it can be written to the
	strategy record.
- change record update for struct and add round number.
    - use push_back and initializer list.
- (run): does not assume record is empty when calculating average.
- call runRound with round number.
- use struct instead of tuple.
- (writeRecord): write NameGame parameters and round number as well.
- src/main.cc: don't clear record and write entire record to file.

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

3 files changed, 20 insertions, 14 deletions

diff --git a/src/NameGame.cc b/src/NameGame.cc
index 022b951..5dfcbc7 100644
--- a/src/NameGame.cc
+++ b/src/NameGame.cc
@@ -73,18 +73,19 @@ void NameGame::initMemory() {
 
 void NameGame::run(int rounds) {
         if (rounds < 0) throw std::invalid_argument("NameGame::run rounds < 0");
-        for (int i = 0; i < rounds; ++i) runRound();
+        size_t srlen = strategy_record.size();
+        for (int i = 0; i < rounds; ++i) runRound(i);
         // Track all plays and plays by non-CM.
         // Report average plays.
         float avg = 0;
-        for (const auto r : strategy_record) {
-                avg += std::get<2>(r) + std::get<3>(r);
+        for (size_t i = srlen; i < strategy_record.size(); ++i) {
+                avg += strategy_record[i].s_strategy + strategy_record[i].h_strategy;
         }
-        avg /= strategy_record.size();
+        avg /= strategy_record.size() - srlen;
         std::cout << avg << std::endl;
 }
 
-void NameGame::runRound() {
+void NameGame::runRound(int r) {
         bool verbose_flag = false;
         // Select random speaker and hearer.
         auto speaker = graph.GetNI(dist(rng));
@@ -113,7 +114,9 @@ void NameGame::runRound() {
 
         // Speaker updates memory.
         update_memory(speaker.GetId(), h_strategy);
-        strategy_record.emplace_back(speaker.GetId(), hearer.GetId(), s_strategy, h_strategy);
+        strategy_record.push_back({
+                r, speaker.GetId(), hearer.GetId(), s_strategy, h_strategy
+        });
 }
 
 int NameGame::best_move(int nId) const {
@@ -146,12 +149,12 @@ void NameGame::clearRecord() {
 
 void NameGame::writeRecord(const char* fname) {
         std::ofstream f(fname);
-        f << "speaker,hearer,speaker_strategy,hearer_strategy\n";
-        int speaker, hearer, s_strategy, h_strategy;
+        f << "group_size,cm_size,memlen,round,"
+                "speaker,hearer,speaker_strategy,hearer_strategy\n";
         for (const auto& r : strategy_record) {
-                std::tie(speaker, hearer, s_strategy, h_strategy) = r;
-                f << speaker << ',' << hearer << ',' << s_strategy << ','
-                        << h_strategy << '\n';
+                f << gsize << ',' << cmsize << ',' << memlen << ',' << r.round << ','
+                        << r.speaker << ',' << r.hearer << ',' << r.s_strategy << ','
+                        << r.h_strategy << '\n';
         }
 }
 
diff --git a/src/NameGame.h b/src/NameGame.h
index 73f5630..abd9d6d 100644
--- a/src/NameGame.h
+++ b/src/NameGame.h
@@ -26,12 +26,15 @@ protected:
         void update_memory(int nId, int strategy);
 
 private:
-        void runRound();
+        void runRound(int r);
         int gsize, cmsize, memlen;
         std::mt19937 rng;
         std::uniform_int_distribution<> dist;
         TNodeNet<TPair<TBool, TIntV>> graph;
-        std::vector<std::tuple<int, int, int, int> > strategy_record;
+        struct Record {
+                int round, speaker, hearer, s_strategy, h_strategy;
+        };
+        std::vector<Record> strategy_record;
 }; // class NameGame
 
 } // namespace tp
diff --git a/src/main.cc b/src/main.cc
index 9f47446..2c56584 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -7,12 +7,12 @@ int main(int argc, char* argv[]) {
         tp::NameGame namegame(group_size, 0);
         for (int cmperc = 18; 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(1000);
         }
+        namegame.writeRecord("strategy_record.csv");
         return 0;
 }