kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-03 18:19:35 +00:00
Code Issues Releases Wiki Activity

Small CheckInfo fallout

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2009-11-09 21:48:02 +01:00
parent 2f01d67a92
commit 16626dd655
1 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/search.cpp
View file

@ -1065,7 +1065,6 @@ namespace {
Move movesSearched[256]; Move movesSearched[256];
EvalInfo ei; EvalInfo ei;
StateInfo st; StateInfo st;
Bitboard dcCandidates;
const TTEntry* tte; const TTEntry* tte;
Move ttMove, move; Move ttMove, move;
Depth ext, newDepth; Depth ext, newDepth;
@ -1115,7 +1114,6 @@ namespace {
isCheck = pos.is_check(); isCheck = pos.is_check();
mateThreat = pos.has_mate_threat(opposite_color(pos.side_to_move())); mateThreat = pos.has_mate_threat(opposite_color(pos.side_to_move()));
CheckInfo ci(pos); CheckInfo ci(pos);
dcCandidates = ci.dcCandidates;
MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]); MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]);
// Loop through all legal moves until no moves remain or a beta cutoff // Loop through all legal moves until no moves remain or a beta cutoff
@ -1137,7 +1135,7 @@ namespace {
newDepth = depth - OnePly + ext; newDepth = depth - OnePly + ext;
// Make and search the move // Make and search the move
pos.do_move(move, st, dcCandidates); pos.do_move(move, st, ci.dcCandidates);
if (moveCount == 1) // The first move in list is the PV if (moveCount == 1) // The first move in list is the PV
value = -search_pv(pos, ss, -beta, -alpha, newDepth, ply+1, threadID); value = -search_pv(pos, ss, -beta, -alpha, newDepth, ply+1, threadID);
@ -1211,7 +1209,7 @@ namespace {
&& !AbortSearch && !AbortSearch
&& !thread_should_stop(threadID) && !thread_should_stop(threadID)
&& split(pos, ss, ply, &alpha, &beta, &bestValue, VALUE_NONE, VALUE_NONE, depth, && split(pos, ss, ply, &alpha, &beta, &bestValue, VALUE_NONE, VALUE_NONE, depth,
&moveCount, &mp, dcCandidates, threadID, true)) &moveCount, &mp, ci.dcCandidates, threadID, true))
break; break;
} }
@ -1258,7 +1256,6 @@ namespace {
Move movesSearched[256]; Move movesSearched[256];
EvalInfo ei; EvalInfo ei;
StateInfo st; StateInfo st;
Bitboard dcCandidates;
const TTEntry* tte; const TTEntry* tte;
Move ttMove, move; Move ttMove, move;
Depth ext, newDepth; Depth ext, newDepth;
@ -1373,7 +1370,6 @@ namespace {
// to search all moves. // to search all moves.
MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]); MovePicker mp = MovePicker(pos, ttMove, depth, H, &ss[ply]);
CheckInfo ci(pos); CheckInfo ci(pos);
dcCandidates = ci.dcCandidates;
futilityValue = VALUE_NONE; futilityValue = VALUE_NONE;
useFutilityPruning = depth < SelectiveDepth && !isCheck; useFutilityPruning = depth < SelectiveDepth && !isCheck;
@ -1427,7 +1423,7 @@ namespace {
} }
// Make and search the move // Make and search the move
pos.do_move(move, st, dcCandidates); pos.do_move(move, st, ci.dcCandidates);
// Try to reduce non-pv search depth by one ply if move seems not problematic, // 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. // if the move fails high will be re-searched at full depth.
@ -1473,7 +1469,7 @@ namespace {
&& !AbortSearch && !AbortSearch
&& !thread_should_stop(threadID) && !thread_should_stop(threadID)
&& split(pos, ss, ply, &beta, &beta, &bestValue, futilityValue, approximateEval, depth, &moveCount, && split(pos, ss, ply, &beta, &beta, &bestValue, futilityValue, approximateEval, depth, &moveCount,
&mp, dcCandidates, threadID, false)) &mp, ci.dcCandidates, threadID, false))
break; break;
} }
@ -1522,7 +1518,6 @@ namespace {
EvalInfo ei; EvalInfo ei;
StateInfo st; StateInfo st;
Bitboard dcCandidates;
Move ttMove, move; Move ttMove, move;
Value staticValue, bestValue, value, futilityValue; Value staticValue, bestValue, value, futilityValue;
bool isCheck, enoughMaterial; bool isCheck, enoughMaterial;
@ -1595,7 +1590,6 @@ namespace {
// queen promotions and checks (only if depth == 0) will be generated. // queen promotions and checks (only if depth == 0) will be generated.
MovePicker mp = MovePicker(pos, ttMove, depth, H); MovePicker mp = MovePicker(pos, ttMove, depth, H);
CheckInfo ci(pos); CheckInfo ci(pos);
dcCandidates = ci.dcCandidates;
enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame; enoughMaterial = pos.non_pawn_material(pos.side_to_move()) > RookValueMidgame;
// Loop through the moves until no moves remain or a beta cutoff // Loop through the moves until no moves remain or a beta cutoff
@ -1639,7 +1633,7 @@ namespace {
continue; continue;
// Make and search the move // Make and search the move
pos.do_move(move, st, dcCandidates); pos.do_move(move, st, ci.dcCandidates);
value = -qsearch(pos, ss, -beta, -alpha, depth-OnePly, ply+1, threadID); value = -qsearch(pos, ss, -beta, -alpha, depth-OnePly, ply+1, threadID);
pos.undo_move(move); pos.undo_move(move);