kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-07-11 19:49:14 +00:00
Code Issues Releases Wiki Activity

Highlight that alpha and beta could change in root_search()

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2010-03-06 18:17:04 +01:00
parent f23a9e8f88
commit 4ef068a506
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/search.cpp
View file

@ -282,7 +282,7 @@ namespace {
/// Local functions /// Local functions
Value id_loop(const Position& pos, Move searchMoves[]); Value id_loop(const Position& pos, Move searchMoves[]);
Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value& oldAlpha, Value& beta); Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value* alphaPtr, Value* betaPtr);
Value search_pv(Position& pos, SearchStack ss[], Value alpha, Value beta, Depth depth, int ply, int threadID); Value search_pv(Position& pos, SearchStack ss[], Value alpha, Value beta, Depth depth, int ply, int threadID);
Value search(Position& pos, SearchStack ss[], Value beta, Depth depth, int ply, bool allowNullmove, int threadID, Move excludedMove = MOVE_NONE); Value search(Position& pos, SearchStack ss[], Value beta, Depth depth, int ply, bool allowNullmove, int threadID, Move excludedMove = MOVE_NONE);
Value qsearch(Position& pos, SearchStack ss[], Value alpha, Value beta, Depth depth, int ply, int threadID); Value qsearch(Position& pos, SearchStack ss[], Value alpha, Value beta, Depth depth, int ply, int threadID);
@ -665,8 +665,8 @@ namespace {
beta = Min(ValueByIteration[Iteration - 1] + AspirationDelta, VALUE_INFINITE); beta = Min(ValueByIteration[Iteration - 1] + AspirationDelta, VALUE_INFINITE);
} }
// Search to the current depth, rml is updated and sorted // Search to the current depth, rml is updated and sorted, alpha and beta could change
value = root_search(p, ss, rml, alpha, beta); value = root_search(p, ss, rml, &alpha, &beta);
// Write PV to transposition table, in case the relevant entries have // Write PV to transposition table, in case the relevant entries have
// been overwritten during the search. // been overwritten during the search.
@ -786,18 +786,19 @@ namespace {
// scheme, prints some information to the standard output and handles // scheme, prints some information to the standard output and handles
// the fail low/high loops. // the fail low/high loops.
Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value& oldAlpha, Value& beta) { Value root_search(Position& pos, SearchStack ss[], RootMoveList& rml, Value* alphaPtr, Value* betaPtr) {
EvalInfo ei; EvalInfo ei;
StateInfo st; StateInfo st;
int64_t nodes; int64_t nodes;
Move move; Move move;
Depth depth, ext, newDepth; Depth depth, ext, newDepth;
Value value, alpha; Value value, alpha, beta;
bool isCheck, moveIsCheck, captureOrPromotion, dangerous; bool isCheck, moveIsCheck, captureOrPromotion, dangerous;
int researchCount = 0; int researchCount = 0;
alpha = *alphaPtr;
beta = *betaPtr;
CheckInfo ci(pos); CheckInfo ci(pos);
alpha = oldAlpha;
isCheck = pos.is_check(); isCheck = pos.is_check();
// Step 1. Initialize node and poll (omitted at root, but I can see no good reason for this, FIXME) // Step 1. Initialize node and poll (omitted at root, but I can see no good reason for this, FIXME)
@ -930,7 +931,7 @@ namespace {
// Prepare for a research after a fail high, each time with a wider window // Prepare for a research after a fail high, each time with a wider window
researchCount++; researchCount++;
beta = Min(beta + AspirationDelta * (1 << researchCount), VALUE_INFINITE); *betaPtr = beta = Min(beta + AspirationDelta * (1 << researchCount), VALUE_INFINITE);
} // End of fail high loop } // End of fail high loop
@ -1002,22 +1003,21 @@ namespace {
} }
} // PV move or new best move } // PV move or new best move
assert(alpha >= oldAlpha); assert(alpha >= *alphaPtr);
AspirationFailLow = (alpha == oldAlpha); AspirationFailLow = (alpha == *alphaPtr);
if (AspirationFailLow && StopOnPonderhit) if (AspirationFailLow && StopOnPonderhit)
StopOnPonderhit = false; StopOnPonderhit = false;
} }
// Can we exit fail low loop ? // Can we exit fail low loop ?
if (AbortSearch || alpha > oldAlpha) if (AbortSearch || !AspirationFailLow)
break; break;
// Prepare for a research after a fail low, each time with a wider window // Prepare for a research after a fail low, each time with a wider window
researchCount++; researchCount++;
alpha = Max(alpha - AspirationDelta * (1 << researchCount), -VALUE_INFINITE); *alphaPtr = alpha = Max(alpha - AspirationDelta * (1 << researchCount), -VALUE_INFINITE);
oldAlpha = alpha;
} // Fail low loop } // Fail low loop