Merge branch 'king_moves_half_reset'

Luecx · Luecx · commit 876953bf27f0 · 2023-01-28T10:33:37.000+01:00
```
ELO   | 8.86 +- 8.83 (95%)
CONF  | 8.0+0.08s Threads=1 Hash=8MB
GAMES | N: 2864 W: 727 L: 654 D: 1483
```
diff --git a/src_files/board.cpp b/src_files/board.cpp
@@ -554,32 +554,64 @@ template<bool prefetch> void Board::move(Move m, TranspositionTable* table) {
         m_boardStatusHistory.emplace_back(std::move(newBoardStatus));
         this->changeActivePlayer();
         
-        if (isCastle(m)) {
-            // move the rook as well. castling rights are handled below
-            Square rookSquare = sqFrom + (mType == QUEEN_CASTLE ? -4 : 3);
-            Square rookTarget = sqTo + (mType == QUEEN_CASTLE ? 1 : -1);
-            this->unsetPiece(rookSquare);
-            this->setPiece(rookTarget, ROOK + 8 * color);
+        
+        bool requires_accumulator_reset = false;
+        if(     nn::kingSquareIndex(sqTo, color) !=
+                nn::kingSquareIndex(sqFrom, color)
+            ||  fileIndex(sqFrom) + fileIndex(sqTo) == 7){
+            requires_accumulator_reset = true;
         }
         
-        this->unsetPiece(sqFrom);
-        if (isCapture(m)) {
-            this->replacePiece(sqTo, pFrom);
-        } else {
-            this->setPiece(sqTo, pFrom);
+        // normal handling if no reset is required
+        if(!requires_accumulator_reset){
+            if (isCastle(m)) {
+                // move the rook as well. castling rights are handled below
+                Square rookSquare = sqFrom + (mType == QUEEN_CASTLE ? -4 : 3);
+                Square rookTarget = sqTo + (mType == QUEEN_CASTLE ? 1 : -1);
+                this->unsetPiece(rookSquare);
+                this->setPiece(rookTarget, ROOK + 8 * color);
+            }
+        
+            this->unsetPiece(sqFrom);
+            if (isCapture(m)) {
+                this->replacePiece(sqTo, pFrom);
+            } else {
+                this->setPiece(sqTo, pFrom);
+            }
+        }else{
+            Square ourKingSq = bitscanForward(getPieceBB(color ,KING));
+            Square oppKingSq = bitscanForward(getPieceBB(!color,KING));
+
+            // handling for when only updates for the opponents accumulator are needed
+            if (isCastle(m)) {
+                // move the rook as well. castling rights are handled below
+                Square rookSquare = sqFrom + (mType == QUEEN_CASTLE ? -4 : 3);
+                Square rookTarget = sqTo + (mType == QUEEN_CASTLE ? 1 : -1);
+                this->unsetPiece<false>(rookSquare);
+                this->setPiece<false>(rookTarget, ROOK + 8 * color);
+
+                this->evaluator.setPieceOnSquareAccumulator<false>(!color, ROOK, color, rookSquare, oppKingSq);
+                this->evaluator.setPieceOnSquareAccumulator<true>(!color , ROOK, color, rookTarget, oppKingSq);
+            }
+            this->unsetPiece<false>(sqFrom);
+            this->evaluator.setPieceOnSquareAccumulator<false>(!color, KING, color, sqFrom, oppKingSq);
+            if (isCapture(m)) {
+                this->replacePiece<false>(sqTo, pFrom);
+                this->evaluator.setPieceOnSquareAccumulator<true>(!color, KING, color, sqTo, oppKingSq);
+                this->evaluator.setPieceOnSquareAccumulator<false>(!color, getCapturedPieceType(m), !color, sqTo, oppKingSq);
+            } else {
+                this->setPiece<false>(sqTo, pFrom);
+                this->evaluator.setPieceOnSquareAccumulator<true>(!color, KING, color, sqTo, oppKingSq);
+            }
         }
         
-        // check if it crossed squares
-        if(     nn::kingSquareIndex(sqTo, color) !=
-                nn::kingSquareIndex(sqFrom, color)
-                ||  fileIndex(sqFrom) + fileIndex(sqTo) == 7){
+        // reset accumulator of moving side if required
+        if(requires_accumulator_reset){
             this->evaluator.resetAccumulator(this, color);
         }
         
         // we need to compute the repetition count
         this->computeNewRepetition();
-        
-        
         return;
     }
         
diff --git a/src_files/eval.cpp b/src_files/eval.cpp
@@ -276,3 +276,6 @@ template void nn::Evaluator::setPieceOnSquare<true>(bb::PieceType pieceType, bb:
 template void nn::Evaluator::setPieceOnSquare<false>(bb::PieceType pieceType, bb::Color pieceColor,
                                                      bb::Square square, bb::Square wKingSquare,
                                                      bb::Square bKingSquare);
+
+template void nn::Evaluator::setPieceOnSquareAccumulator<false>(bb::Color side, bb::PieceType pieceType, bb::Color pieceColor, bb::Square square, bb::Square kingSquare);
+template void nn::Evaluator::setPieceOnSquareAccumulator<true>(bb::Color side, bb::PieceType pieceType, bb::Color pieceColor, bb::Square square, bb::Square kingSquare);
