Minor cleanup involving Network::get_output.

Pull request #2228.
leela-zero · Apr 2, 2019 · d0aacb8 · d0aacb8
1 parent 358a0d2
commit d0aacb8
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/GTP.cpp b/src/GTP.cpp
@@ -858,8 +858,7 @@ void GTP::execute(GameState & game, const std::string& xinput) {
             }
         } else if (symmetry == "average" || symmetry == "avg") {
             vec = s_network->get_output(
-                &game, Network::Ensemble::AVERAGE,
-                Network::NUM_SYMMETRIES, false);
+                &game, Network::Ensemble::AVERAGE, -1, false);
         } else {
             vec = s_network->get_output(
                 &game, Network::Ensemble::DIRECT, std::stoi(symmetry), false);

diff --git a/src/Network.cpp b/src/Network.cpp
@@ -743,6 +743,7 @@ Network::Netresult Network::get_output(
         assert(symmetry >= 0 && symmetry < NUM_SYMMETRIES);
         result = get_output_internal(state, symmetry);
     } else if (ensemble == AVERAGE) {
+        assert(symmetry == -1);
         for (auto sym = 0; sym < NUM_SYMMETRIES; ++sym) {
             auto tmpresult = get_output_internal(state, sym);
             result.winrate +=

diff --git a/src/Training.cpp b/src/Training.cpp
@@ -169,8 +169,8 @@ void Training::record(Network & network, GameState& state, UCTNode& root) {
     step.to_move = state.board.get_to_move();
     step.planes = get_planes(&state);
 
-    auto result =
-        network.get_output(&state, Network::Ensemble::DIRECT, 0);
+    const auto result = network.get_output(
+        &state, Network::Ensemble::DIRECT, Network::IDENTITY_SYMMETRY);
     step.net_winrate = result.winrate;
 
     const auto& best_node = root.get_best_root_child(step.to_move);