only one strategy per round

- src/NameGame.cc (runRound): fixed code so that only speaker chooses a
  strategy each round. this matches BestResponseNameGame.R
- renamed variables to just strategy.
- updated record call.
- (run): updated average calculation per round.
- (writeRecord): updated header and row code.
- src/NameGame.h: updated Record struct to remove hearer info.

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

2 files changed, 10 insertions, 24 deletions

diff --git a/src/NameGame.cc b/src/NameGame.cc
index 2dd64c0..3fc314e 100644
--- a/src/NameGame.cc
+++ b/src/NameGame.cc
@@ -79,7 +79,7 @@ void NameGame::run(int rounds) {
         // Report average plays.
         float avg = 0;
         for (size_t i = srlen; i < strategy_record.size(); ++i) {
-                avg += strategy_record[i].s_strategy + strategy_record[i].h_strategy;
+                avg += strategy_record[i].strategy;
         }
         avg /= strategy_record.size() - srlen;
         std::cout << avg << std::endl;
@@ -94,30 +94,18 @@ void NameGame::runRound(int r) {
         );
 
         // Speaker chooses best strategy.
-        int s_strategy = best_move(speaker.GetId());
+        int strategy = best_move(speaker.GetId());
         if (verbose_flag) {
                 std::cout << "speaker (" << speaker.GetId() << " "
                         << std::boolalpha << speaker().Val1
-                        << ") chose: " << s_strategy << std::endl;
+                        << ") chose: " << strategy << std::endl;
         }
 
-        // Listener updates memory.
-        update_memory(hearer.GetId(), s_strategy);
+        // Hearer updates memory.
+        update_memory(hearer.GetId(), strategy);
 
-        // Listener chooses best strategy.
-        int h_strategy = best_move(hearer.GetId());
-        if (verbose_flag) {
-                std::cout << "hearer (" << hearer.GetId() << " "
-                        << std::boolalpha << hearer().Val1
-                        << ") chose: " << h_strategy << std::endl;
-        }
-
-        // Speaker updates memory.
-        update_memory(speaker.GetId(), h_strategy);
-        strategy_record.push_back({
-                r, speaker.GetId(), speaker().Val1,
-                hearer.GetId(), hearer().Val1, s_strategy, h_strategy
-        });
+        // Strategy is recorded.
+        strategy_record.push_back({r, speaker.GetId(), speaker().Val1, strategy});
 }
 
 int NameGame::best_move(int nId) const {
@@ -154,13 +142,11 @@ void NameGame::writeRecord(const char* fname, bool append) {
         else mode |= std::ios::trunc;
         std::fstream f(fname, mode);
         if (!append || f.tellp() == 0) {
-                f << "group_size,cm_size,memlen,round,speaker,speaker_type,"
-                        "hearer,hearer_type,speaker_strategy,hearer_strategy\n";
+                f << "group_size,cm_size,memlen,round,speaker,committed,strategy\n";
         }
         for (const auto& r : strategy_record) {
                 f << gsize << ',' << cmsize << ',' << memlen << ',' << r.round << ','
-                        << r.speaker << ',' << r.s_cm << ',' << r.hearer << ',' << r.h_cm << ','
-                        << r.s_strategy << ',' << r.h_strategy << '\n';
+                        << r.speaker << ',' << r.committed << ',' << r.strategy << '\n';
         }
 }
 
diff --git a/src/NameGame.h b/src/NameGame.h
index eae45f3..7a9638a 100644
--- a/src/NameGame.h
+++ b/src/NameGame.h
@@ -32,7 +32,7 @@ private:
         std::uniform_int_distribution<> dist;
         TNodeNet<TPair<TBool, TIntV>> graph;
         struct Record {
-                int round, speaker, s_cm, hearer, h_cm, s_strategy, h_strategy;
+                int round, speaker, committed, strategy;
         };
         std::vector<Record> strategy_record;
 }; // class NameGame