phasePtr = MainSearchTable;
}
- ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
phasePtr += int(ttMove == MOVE_NONE) - 1;
go_next_phase();
}
// Skip TT move if is not a capture or a promotion, this avoids
// qsearch tree explosion due to a possible perpetual check or
// similar rare cases when TT table is full.
- if (ttm != MOVE_NONE && !pos.move_is_capture_or_promotion(ttm))
+ if (ttm != MOVE_NONE && !pos.is_capture_or_promotion(ttm))
ttm = MOVE_NONE;
}
else
ttm = MOVE_NONE;
}
- ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
phasePtr += int(ttMove == MOVE_NONE) - 1;
go_next_phase();
}
assert (!pos.in_check());
// In ProbCut we consider only captures better than parent's move
- captureThreshold = piece_value_midgame(Piece(parentCapture));
+ captureThreshold = PieceValueMidgame[Piece(parentCapture)];
phasePtr = ProbCutTable;
if ( ttm != MOVE_NONE
- && (!pos.move_is_capture(ttm) || pos.see(ttm) <= captureThreshold))
+ && (!pos.is_capture(ttm) || pos.see(ttm) <= captureThreshold))
ttm = MOVE_NONE;
- ttMove = (ttm && pos.move_is_pl(ttm) ? ttm : MOVE_NONE);
+ ttMove = (ttm && pos.is_pseudo_legal(ttm) ? ttm : MOVE_NONE);
phasePtr += int(ttMove == MOVE_NONE) - 1;
go_next_phase();
}
for (MoveStack* cur = moves; cur != lastMove; cur++)
{
m = cur->move;
- cur->score = piece_value_midgame(pos.piece_on(move_to(m)))
- - piece_type(pos.piece_on(move_from(m)));
+ cur->score = PieceValueMidgame[pos.piece_on(move_to(m))]
+ - type_of(pos.piece_on(move_from(m)));
- if (move_is_promotion(m))
- cur->score += QueenValueMidgame;
+ if (is_promotion(m))
+ cur->score += PieceValueMidgame[Piece(promotion_piece_type(m))];
}
}
m = cur->move;
if ((seeScore = pos.see_sign(m)) < 0)
cur->score = seeScore - History::MaxValue; // Be sure we are at the bottom
- else if (pos.move_is_capture(m))
- cur->score = piece_value_midgame(pos.piece_on(move_to(m)))
- - piece_type(pos.piece_on(move_from(m))) + History::MaxValue;
+ else if (pos.is_capture(m))
+ cur->score = PieceValueMidgame[pos.piece_on(move_to(m))]
+ - type_of(pos.piece_on(move_from(m))) + History::MaxValue;
else
cur->score = H.value(pos.piece_on(move_from(m)), move_to(m));
}
if (seeValue >= captureThreshold)
return move;
- // Losing capture, move it to the tail of the array, note
- // that move has now been already checked for pseudo legality.
+ // Losing capture, move it to the tail of the array
(--badCaptures)->move = move;
badCaptures->score = seeValue;
}
case PH_KILLERS:
move = (curMove++)->move;
if ( move != MOVE_NONE
- && pos.move_is_pl(move)
+ && pos.is_pseudo_legal(move)
&& move != ttMove
- && !pos.move_is_capture(move))
+ && !pos.is_capture(move))
return move;
break;