bool idle_thread_exists(int master);
bool split(const Position &pos, SearchStack *ss, int ply,
Value *alpha, Value *beta, Value *bestValue, Depth depth,
- int *moves, MovePicker *mp, Bitboard dcCandidates, int master,
- bool pvNode);
+ int *moves, MovePicker *mp, int master, bool pvNode);
void wake_sleeping_threads();
#if !defined(_MSC_VER)
if (dbg_show_hit_rate)
dbg_print_hit_rate(LogFile);
- UndoInfo u;
+ StateInfo st;
LogFile << "Nodes: " << nodes_searched() << std::endl
<< "Nodes/second: " << nps() << std::endl
<< "Best move: " << move_to_san(p, ss[0].pv[0]) << std::endl;
- p.do_move(ss[0].pv[0], u);
+ p.do_move(ss[0].pv[0], st);
LogFile << "Ponder move: " << move_to_san(p, ss[0].pv[1])
<< std::endl << std::endl;
}
Value alpha = -VALUE_INFINITE;
Value beta = VALUE_INFINITE, value;
- Bitboard dcCandidates = pos.discovered_check_candidates(pos.side_to_move());
// Loop through all the moves in the root move list
for (int i = 0; i < rml.move_count() && !AbortSearch; i++)
{
int64_t nodes;
Move move;
- UndoInfo u;
+ StateInfo st;
Depth ext, newDepth;
RootMoveNumber = i + 1;
newDepth = (Iteration - 2) * OnePly + ext + InitialDepth;
// Make the move, and search it
- pos.do_move(move, u, dcCandidates);
+ pos.do_move(move, st);
if (i < MultiPV)
{
}
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
// Finished searching the move. If AbortSearch is true, the search
// was aborted because the user interrupted the search or because we
Move move, movesSearched[256];
int moveCount = 0;
Value value, bestValue = -VALUE_INFINITE;
- Bitboard dcCandidates = mp.discovered_check_candidates();
+ Color us = pos.side_to_move();
bool isCheck = pos.is_check();
- bool mateThreat = pos.has_mate_threat(opposite_color(pos.side_to_move()));
+ bool mateThreat = pos.has_mate_threat(opposite_color(us));
// Loop through all legal moves until no moves remain or a beta cutoff
// occurs.
assert(move_is_ok(move));
bool singleReply = (isCheck && mp.number_of_moves() == 1);
- bool moveIsCheck = pos.move_is_check(move, dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
movesSearched[moveCount++] = ss[ply].currentMove = move;
Depth newDepth = depth - OnePly + ext;
// Make and search the move
- UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st);
if (moveCount == 1) // The first move in list is the PV
value = -search_pv(pos, ss, -beta, -alpha, newDepth, ply+1, threadID);
}
}
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
&& !AbortSearch
&& !thread_should_stop(threadID)
&& split(pos, ss, ply, &alpha, &beta, &bestValue, depth,
- &moveCount, &mp, dcCandidates, threadID, true))
+ &moveCount, &mp, threadID, true))
break;
}
{
ss[ply].currentMove = MOVE_NULL;
- UndoInfo u;
- pos.do_null_move(u);
+ StateInfo st;
+ pos.do_null_move(st);
int R = (depth >= 4 * OnePly ? 4 : 3); // Null move dynamic reduction
Value nullValue = -search(pos, ss, -(beta-1), depth-R*OnePly, ply+1, false, threadID);
&& pos.see(ss[ply + 1].currentMove) + nullValue >= beta)
nullDrivenIID = true;
- pos.undo_null_move(u);
+ pos.undo_null_move();
if (value_is_mate(nullValue))
{
Move move, movesSearched[256];
int moveCount = 0;
Value value, bestValue = -VALUE_INFINITE;
- Bitboard dcCandidates = mp.discovered_check_candidates();
Value futilityValue = VALUE_NONE;
bool useFutilityPruning = UseFutilityPruning
&& depth < SelectiveDepth
assert(move_is_ok(move));
bool singleReply = (isCheck && mp.number_of_moves() == 1);
- bool moveIsCheck = pos.move_is_check(move, dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
movesSearched[moveCount++] = ss[ply].currentMove = move;
}
// Make and search the move
- UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st);
// Try to reduce non-pv search depth by one ply if move seems not problematic,
// if the move fails high will be re-searched at full depth.
ss[ply].reduction = Depth(0);
value = -search(pos, ss, -(beta-1), newDepth, ply+1, true, threadID);
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
&& !AbortSearch
&& !thread_should_stop(threadID)
&& split(pos, ss, ply, &beta, &beta, &bestValue, depth, &moveCount,
- &mp, dcCandidates, threadID, false))
+ &mp, threadID, false))
break;
}
MovePicker mp = MovePicker(pos, pvNode, MOVE_NONE, EmptySearchStack, depth, isCheck ? NULL : &ei);
Move move;
int moveCount = 0;
- Bitboard dcCandidates = mp.discovered_check_candidates();
- bool enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame;
+ Color us = pos.side_to_move();
+ bool enoughMaterial = pos.non_pawn_material(us) > RookValueMidgame;
// Loop through the moves until no moves remain or a beta cutoff
// occurs.
&& !isCheck
&& !pvNode
&& !move_promotion(move)
- && !pos.move_is_check(move, dcCandidates)
+ && !pos.move_is_check(move)
&& !pos.move_is_passed_pawn_push(move))
{
Value futilityValue = staticValue
continue;
// Make and search the move.
- UndoInfo u;
- pos.do_move(move, u, dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st);
Value value = -qsearch(pos, ss, -beta, -alpha, depth-OnePly, ply+1, threadID);
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
{
assert(move_is_ok(move));
- bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
lock_grab(&(sp->lock));
continue;
// Make and search the move.
- UndoInfo u;
- pos.do_move(move, u, sp->dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st);
// Try to reduce non-pv search depth by one ply if move seems not problematic,
// if the move fails high will be re-searched at full depth.
ss[sp->ply].reduction = Depth(0);
value = -search(pos, ss, -(sp->beta - 1), newDepth, sp->ply+1, true, threadID);
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
&& !thread_should_stop(threadID)
&& (move = sp->mp->get_next_move(sp->lock)) != MOVE_NONE)
{
- bool moveIsCheck = pos.move_is_check(move, sp->dcCandidates);
+ bool moveIsCheck = pos.move_is_check(move);
bool moveIsCapture = pos.move_is_capture(move);
assert(move_is_ok(move));
Depth newDepth = sp->depth - OnePly + ext;
// Make and search the move.
- UndoInfo u;
- pos.do_move(move, u, sp->dcCandidates);
+ StateInfo st;
+ pos.do_move(move, st);
// Try to reduce non-pv search depth by one ply if move seems not problematic,
// if the move fails high will be re-searched at full depth.
Threads[threadID].failHighPly1 = false;
}
}
- pos.undo_move(move, u);
+ pos.undo_move(move);
assert(value > -VALUE_INFINITE && value < VALUE_INFINITE);
if (includeMove)
{
// Find a quick score for the move
- UndoInfo u;
+ StateInfo st;
SearchStack ss[PLY_MAX_PLUS_2];
moves[count].move = mlist[i].move;
moves[count].nodes = 0ULL;
- pos.do_move(moves[count].move, u);
+ pos.do_move(moves[count].move, st);
moves[count].score = -qsearch(pos, ss, -VALUE_INFINITE, VALUE_INFINITE,
Depth(0), 1, 0);
- pos.undo_move(moves[count].move, u);
+ pos.undo_move(moves[count].move);
moves[count].pv[0] = moves[i].move;
moves[count].pv[1] = MOVE_NONE; // FIXME
count++;
// Case 4: The destination square for m2 is attacked by the moving piece
// in m1:
- if(pos.piece_attacks_square(t1, t2))
+ if(pos.piece_attacks_square(pos.piece_on(t1), t1, t2))
return true;
// Case 5: Discovered check, checking piece is the piece moved in m1:
bool split(const Position &p, SearchStack *sstck, int ply,
Value *alpha, Value *beta, Value *bestValue,
- Depth depth, int *moves,
- MovePicker *mp, Bitboard dcCandidates, int master, bool pvNode) {
+ Depth depth, int *moves, MovePicker *mp, int master, bool pvNode) {
assert(p.is_ok());
assert(sstck != NULL);
assert(ply >= 0 && ply < PLY_MAX);
splitPoint->alpha = pvNode? *alpha : (*beta - 1);
splitPoint->beta = *beta;
splitPoint->pvNode = pvNode;
- splitPoint->dcCandidates = dcCandidates;
splitPoint->bestValue = *bestValue;
splitPoint->master = master;
splitPoint->mp = mp;