kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-02 09:39:36 +00:00
Code Issues Releases Wiki Activity

Proper indenting of multiple conditions

Browse source 
Triviality due to a boring saturday morning.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2012-04-28 11:08:10 +01:00
parent 456f37b8ab
commit cdfe43eb8f
4 changed files with 32 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/endgame.cpp
View file

@ -410,7 +410,7 @@ ScaleFactor Endgame<KBPsK>::operator()(const Position& pos) const {
File pawnFile = file_of(pos.piece_list(strongerSide, PAWN)[0]); File pawnFile = file_of(pos.piece_list(strongerSide, PAWN)[0]);
// All pawns are on a single rook file ? // All pawns are on a single rook file ?
if ( (pawnFile == FILE_A || pawnFile == FILE_H) if ( (pawnFile == FILE_A || pawnFile == FILE_H)
&& !(pawns & ~file_bb(pawnFile))) && !(pawns & ~file_bb(pawnFile)))
{ {
Square bishopSq = pos.piece_list(strongerSide, BISHOP)[0]; Square bishopSq = pos.piece_list(strongerSide, BISHOP)[0];
@ -650,7 +650,7 @@ ScaleFactor Endgame<KPsK>::operator()(const Position& pos) const {
{ {
// Does the defending king block the pawns? // Does the defending king block the pawns?
if ( square_distance(ksq, relative_square(strongerSide, SQ_A8)) <= 1 if ( square_distance(ksq, relative_square(strongerSide, SQ_A8)) <= 1
|| ( file_of(ksq) == FILE_A || ( file_of(ksq) == FILE_A
&& !in_front_bb(strongerSide, ksq) & pawns)) && !in_front_bb(strongerSide, ksq) & pawns))
return SCALE_FACTOR_DRAW; return SCALE_FACTOR_DRAW;
} }
@ -659,7 +659,7 @@ ScaleFactor Endgame<KPsK>::operator()(const Position& pos) const {
{ {
// Does the defending king block the pawns? // Does the defending king block the pawns?
if ( square_distance(ksq, relative_square(strongerSide, SQ_H8)) <= 1 if ( square_distance(ksq, relative_square(strongerSide, SQ_H8)) <= 1
|| ( file_of(ksq) == FILE_H || ( file_of(ksq) == FILE_H
&& !in_front_bb(strongerSide, ksq) & pawns)) && !in_front_bb(strongerSide, ksq) & pawns))
return SCALE_FACTOR_DRAW; return SCALE_FACTOR_DRAW;
} }

6
src/movepick.cpp
View file

@ -304,9 +304,9 @@ Move MovePicker::next_move() {
case KILLERS_S1: case KILLERS_S1:
move = (curMove++)->move; move = (curMove++)->move;
if ( move != MOVE_NONE if ( move != MOVE_NONE
&& pos.is_pseudo_legal(move) && pos.is_pseudo_legal(move)
&& move != ttMove && move != ttMove
&& !pos.is_capture(move)) && !pos.is_capture(move))
return move; return move;
break; break;

2
src/position.cpp
View file

@ -641,7 +641,7 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
if (ci.dcCandidates && (ci.dcCandidates & from)) if (ci.dcCandidates && (ci.dcCandidates & from))
{ {
// For pawn and king moves we need to verify also direction // For pawn and king moves we need to verify also direction
if ( (pt != PAWN && pt != KING) if ( (pt != PAWN && pt != KING)
|| !squares_aligned(from, to, king_square(~sideToMove))) || !squares_aligned(from, to, king_square(~sideToMove)))
return true; return true;
} }

50
src/search.cpp
View file

@ -176,11 +176,11 @@ namespace {
} }
// Test for a capture that triggers a pawn endgame // Test for a capture that triggers a pawn endgame
if ( captureOrPromotion if ( captureOrPromotion
&& type_of(pos.piece_on(to_sq(m))) != PAWN && type_of(pos.piece_on(to_sq(m))) != PAWN
&& !is_special(m)
&& ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK) && ( pos.non_pawn_material(WHITE) + pos.non_pawn_material(BLACK)
- PieceValueMidgame[pos.piece_on(to_sq(m))] == VALUE_ZERO) - PieceValueMidgame[pos.piece_on(to_sq(m))] == VALUE_ZERO))
&& !is_special(m))
return true; return true;
return false; return false;
@ -622,10 +622,10 @@ namespace {
TT.refresh(tte); TT.refresh(tte);
ss->currentMove = ttMove; // Can be MOVE_NONE ss->currentMove = ttMove; // Can be MOVE_NONE
if ( ttValue >= beta if ( ttValue >= beta
&& ttMove && ttMove
&& !pos.is_capture_or_promotion(ttMove) && !pos.is_capture_or_promotion(ttMove)
&& ttMove != ss->killers[0]) && ttMove != ss->killers[0])
{ {
ss->killers[1] = ss->killers[0]; ss->killers[1] = ss->killers[0];
ss->killers[0] = ttMove; ss->killers[0] = ttMove;
@ -652,9 +652,9 @@ namespace {
// Update gain for the parent non-capture move given the static position // Update gain for the parent non-capture move given the static position
// evaluation before and after the move. // evaluation before and after the move.
if ( (move = (ss-1)->currentMove) != MOVE_NULL if ( (move = (ss-1)->currentMove) != MOVE_NULL
&& (ss-1)->eval != VALUE_NONE && (ss-1)->eval != VALUE_NONE
&& ss->eval != VALUE_NONE && ss->eval != VALUE_NONE
&& !pos.captured_piece_type() && !pos.captured_piece_type()
&& !is_special(move)) && !is_special(move))
{ {
@ -806,15 +806,15 @@ split_point_start: // At split points actual search starts from here
futilityBase = ss->eval + ss->evalMargin; futilityBase = ss->eval + ss->evalMargin;
singularExtensionNode = !RootNode singularExtensionNode = !RootNode
&& !SpNode && !SpNode
&& depth >= SingularExtensionDepth[PvNode] && depth >= SingularExtensionDepth[PvNode]
&& ttMove != MOVE_NONE && ttMove != MOVE_NONE
&& !excludedMove // Recursive singular search is not allowed && !excludedMove // Recursive singular search is not allowed
&& (tte->type() & BOUND_LOWER) && (tte->type() & BOUND_LOWER)
&& tte->depth() >= depth - 3 * ONE_PLY; && tte->depth() >= depth - 3 * ONE_PLY;
// Step 11. Loop through moves // Step 11. Loop through moves
// Loop through all pseudo-legal moves until no moves remain or a beta cutoff occurs // Loop through all pseudo-legal moves until no moves remain or a beta cutoff occurs
while ( bestValue < beta while ( bestValue < beta
&& (move = mp.next_move()) != MOVE_NONE && (move = mp.next_move()) != MOVE_NONE
&& !thisThread->cutoff_occurred() && !thisThread->cutoff_occurred()
&& !Signals.stop) && !Signals.stop)
@ -870,10 +870,10 @@ split_point_start: // At split points actual search starts from here
// is singular and should be extended. To verify this we do a reduced search // is singular and should be extended. To verify this we do a reduced search
// on all the other moves but the ttMove, if result is lower than ttValue minus // on all the other moves but the ttMove, if result is lower than ttValue minus
// a margin then we extend ttMove. // a margin then we extend ttMove.
if ( singularExtensionNode if ( singularExtensionNode
&& !ext && !ext
&& move == ttMove && move == ttMove
&& pos.pl_move_is_legal(move, ci.pinned)) && pos.pl_move_is_legal(move, ci.pinned))
{ {
if (abs(ttValue) < VALUE_KNOWN_WIN) if (abs(ttValue) < VALUE_KNOWN_WIN)
{ {
@ -952,7 +952,7 @@ split_point_start: // At split points actual search starts from here
// Step 15. Reduced depth search (LMR). If the move fails high will be // Step 15. Reduced depth search (LMR). If the move fails high will be
// re-searched at full depth. // re-searched at full depth.
if ( depth > 3 * ONE_PLY if ( depth > 3 * ONE_PLY
&& !isPvMove && !isPvMove
&& !captureOrPromotion && !captureOrPromotion
&& !dangerous && !dangerous
@ -1051,9 +1051,9 @@ split_point_start: // At split points actual search starts from here
// Step 19. Check for split // Step 19. Check for split
if ( !SpNode if ( !SpNode
&& depth >= Threads.min_split_depth() && depth >= Threads.min_split_depth()
&& bestValue < beta && bestValue < beta
&& Threads.available_slave_exists(thisThread) && Threads.available_slave_exists(thisThread)
&& !Signals.stop && !Signals.stop
&& !thisThread->cutoff_occurred()) && !thisThread->cutoff_occurred())
bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, &bestMove, bestValue = Threads.split<FakeSplit>(pos, ss, alpha, beta, bestValue, &bestMove,
@ -1245,8 +1245,8 @@ split_point_start: // At split points actual search starts from here
// Detect non-capture evasions that are candidate to be pruned // Detect non-capture evasions that are candidate to be pruned
evasionPrunable = !PvNode evasionPrunable = !PvNode
&& inCheck && inCheck
&& bestValue > VALUE_MATED_IN_MAX_PLY && bestValue > VALUE_MATED_IN_MAX_PLY
&& !pos.is_capture(move) && !pos.is_capture(move)
&& !pos.can_castle(pos.side_to_move()); && !pos.can_castle(pos.side_to_move());
@ -1849,8 +1849,8 @@ void Thread::idle_loop(SplitPoint* sp_master) {
// Wake up master thread so to allow it to return from the idle loop in // Wake up master thread so to allow it to return from the idle loop in
// case we are the last slave of the split point. // case we are the last slave of the split point.
if ( Threads.use_sleeping_threads() if ( Threads.use_sleeping_threads()
&& this != sp->master && this != sp->master
&& !sp->master->is_searching) && !sp->master->is_searching)
sp->master->wake_up(); sp->master->wake_up();