Introduce getCompleteWhiteBonus

Author: KvanTTT

cpp/game/boardhistory.cpp

@@ -604,6 +604,10 @@ int BoardHistory::numberOfKoHashOccurrencesInHistory(Hash128 koHash, const KoHas
   return count;
 }
 
+float BoardHistory::getCompleteWhiteBonus() const {
+  return whiteBonusScore + whiteHandicapBonusScore + rules.komi;
+}
+
 float BoardHistory::whiteKomiAdjustmentForDraws(double drawEquivalentWinsForWhite) const {
   //We fold the draw utility into the komi, for input into things like the neural net.
   //Basically we model it as if the final score were jittered by a uniform draw from [-0.5,0.5].
@@ -614,7 +618,7 @@ float BoardHistory::whiteKomiAdjustmentForDraws(double drawEquivalentWinsForWhit
 }
 
 float BoardHistory::currentSelfKomi(Player pla, double drawEquivalentWinsForWhite) const {
-  float whiteKomiAdjusted = whiteBonusScore + whiteHandicapBonusScore + rules.komi + whiteKomiAdjustmentForDraws(drawEquivalentWinsForWhite);
+  float whiteKomiAdjusted = getCompleteWhiteBonus() + whiteKomiAdjustmentForDraws(drawEquivalentWinsForWhite);
 
   if(pla == P_WHITE)
     return whiteKomiAdjusted;
@@ -750,7 +754,7 @@ void BoardHistory::endAndScoreGameNow(const Board& board, Color area[Board::MAX_
     whiteBonusScore += (presumedNextMovePla == P_WHITE ? 0.5f : -0.5f);
   }
 
-  setFinalScoreAndWinner(static_cast<float>(boardScore) + whiteBonusScore + whiteHandicapBonusScore + rules.komi);
+  setFinalScoreAndWinner(static_cast<float>(boardScore) + getCompleteWhiteBonus());
   isScored = true;
   isNoResult = false;
   isResignation = false;
@@ -786,7 +790,7 @@ bool BoardHistory::endGameIfReasonable(const Board& board, const bool checkAllPa
       }
 
       if (!reasonableMoveExist) {
-        finalWhiteScore = board.numBlackCaptures - board.numWhiteCaptures + whiteBonusScore + whiteHandicapBonusScore + rules.komi;
+        finalWhiteScore = board.numBlackCaptures - board.numWhiteCaptures + getCompleteWhiteBonus();
       }
     }
 
@@ -834,7 +838,7 @@ bool BoardHistory::endGameIfReasonable(const Board& board, const bool checkAllPa
       hasButton = false;
       whiteBonusScore += (presumedNextMovePla == P_WHITE ? 0.5f : -0.5f);
     }
-    setFinalScoreAndWinner(boardScore + whiteBonusScore + whiteHandicapBonusScore + rules.komi);
+    setFinalScoreAndWinner(boardScore + getCompleteWhiteBonus());
     isScored = true;
     isNoResult = false;
     isResignation = false;
@@ -1100,7 +1104,7 @@ void BoardHistory::makeBoardMoveAssumeLegal(Board& board, Loc moveLoc, Player mo
       isGameFinished = true;
       isPastNormalPhaseEnd = false;
       const auto whiteMinusBlackScore = static_cast<float>(board.numBlackCaptures - board.numWhiteCaptures);
-      setFinalScoreAndWinner(whiteMinusBlackScore + whiteBonusScore + whiteHandicapBonusScore + rules.komi);
+      setFinalScoreAndWinner(whiteMinusBlackScore + getCompleteWhiteBonus());
     }
   } else {
     if(moveLoc != Board::PASS_LOC)

cpp/game/boardhistory.h

@@ -131,7 +131,10 @@ struct BoardHistory {
   //(such as setInitialTurnNumber, setAssumeMultipleStartingBlackMovesAreHandicap) set identically.
   BoardHistory copyToInitial() const;
 
+  float getCompleteWhiteBonus() const;
+
   float whiteKomiAdjustmentForDraws(double drawEquivalentWinsForWhite) const;
+
   float currentSelfKomi(Player pla, double drawEquivalentWinsForWhite) const;
 
   //Returns a reference a recent board state, where 0 is the current board, 1 is 1 move ago, etc.

cpp/game/dotsboardhistory.cpp

@@ -34,24 +34,24 @@ float BoardHistory::whiteScoreIfNotCapturingGroundingAlive(const Board& board, c
 float BoardHistory::whiteScoreIfGroundingAlive(const Board& board, const Color groundColor) const {
   assert(rules.isDots);
 
-  const auto extraWhiteScore = whiteBonusScore + whiteHandicapBonusScore + rules.komi;
+  const auto completeWhiteBonus = getCompleteWhiteBonus();
 
   const int blackWhiteCapturesDiff = board.numBlackCaptures - board.numWhiteCaptures;
 
   if (board.blackScoreIfWhiteGrounds == -board.whiteScoreIfBlackGrounds) {
     // All dots are grounded -> draw or win by extra bonus
     assert(board.whiteScoreIfBlackGrounds == blackWhiteCapturesDiff);
-    return static_cast<float>(blackWhiteCapturesDiff) + extraWhiteScore;
+    return static_cast<float>(blackWhiteCapturesDiff) + completeWhiteBonus;
   }
 
   // In case of non-capturing grounding, the winner still can ground if only all its dots are grounded (ungrounded opp dots don't matter)
-  if (const float fullWhiteScoreIfBlackGrounds = static_cast<float>(board.whiteScoreIfBlackGrounds) + extraWhiteScore;
+  if (const float fullWhiteScoreIfBlackGrounds = static_cast<float>(board.whiteScoreIfBlackGrounds) + completeWhiteBonus;
      fullWhiteScoreIfBlackGrounds < 0.0F) {
     // Black already won the game by grounding considering white extra bonus
     if (groundColor == C_EMPTY || (blackWhiteCapturesDiff == board.whiteScoreIfBlackGrounds && groundColor == P_BLACK)) {
       return fullWhiteScoreIfBlackGrounds;
     }
-  } else if (const float fullBlackScoreIfWhiteGrounds = static_cast<float>(board.blackScoreIfWhiteGrounds) - extraWhiteScore;
+  } else if (const float fullBlackScoreIfWhiteGrounds = static_cast<float>(board.blackScoreIfWhiteGrounds) - completeWhiteBonus;
      fullBlackScoreIfWhiteGrounds < 0.0F) {
     // White already won the game by grounding considering white extra bonus
     if (groundColor == C_EMPTY || (-blackWhiteCapturesDiff == board.blackScoreIfWhiteGrounds && groundColor == P_WHITE)) {