search_pv: an enpassant move is a capture

Fix the logic in search_pv and sp_search_pv

An additional issue to consider is that a castle move
is not a capture but destination square is not empty.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>

diff --git a/src/search.cpp b/src/search.cpp
index 72bf6e8191db420163a6b32b8aa4f941fd4adcd6..8e6181cc97dee8693b7be8636e2ae72a64049ed3 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -1003,9 +1003,8 @@ namespace {
       movesSearched[moveCount++] = ss[ply].currentMove = move;
 
       if (moveIsCapture)
       movesSearched[moveCount++] = ss[ply].currentMove = move;
 
       if (moveIsCapture)

-          ss[ply].currentMoveCaptureValue = pos.midgame_value_of_piece_on(move_to(move));
-      else if (move_is_ep(move))
-          ss[ply].currentMoveCaptureValue = PawnValueMidgame;
+          ss[ply].currentMoveCaptureValue =
+          move_is_ep(move)? PawnValueMidgame : pos.midgame_value_of_piece_on(move_to(move));

       else
           ss[ply].currentMoveCaptureValue = Value(0);
 
       else
           ss[ply].currentMoveCaptureValue = Value(0);
 


@@ -1691,8 +1690,11 @@ namespace {
 
       assert(move_is_ok(move));
 
 
       assert(move_is_ok(move));
 

-      ss[sp->ply].currentMoveCaptureValue = move_is_ep(move)?
-        PawnValueMidgame : pos.midgame_value_of_piece_on(move_to(move));
+      if (moveIsCapture)
+          ss[sp->ply].currentMoveCaptureValue =
+          move_is_ep(move)? PawnValueMidgame : pos.midgame_value_of_piece_on(move_to(move));
+      else
+          ss[sp->ply].currentMoveCaptureValue = Value(0);

 
       lock_grab(&(sp->lock));
       int moveCount = ++sp->moves;
 
       lock_grab(&(sp->lock));
       int moveCount = ++sp->moves;