organ
/
Sanmill
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build: Fix build error when MTDF_AI is off

This commit is contained in:
Calcitem 2021-09-08 15:03:20 +08:00
parent 55341e9b2c
commit 77b65d2cde
No known key found for this signature in database
GPG Key ID: F2F7C29E054CFB80
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/search.cpp
View File

@ -29,7 +29,7 @@ using namespace Search;
Value MTDF(Position *pos, Sanmill::Stack<Position> &ss, Value firstguess, Depth depth, Depth originDepth, Move &bestMove); Value MTDF(Position *pos, Sanmill::Stack<Position> &ss, Value firstguess, Depth depth, Depth originDepth, Move &bestMove);
Value search(Position *pos, Sanmill::Stack<Position> &ss, Depth depth, Depth originDepth, Value alpha, Value beta, Move &bestMove); Value qsearch(Position *pos, Sanmill::Stack<Position> &ss, Depth depth, Depth originDepth, Value alpha, Value beta, Move &bestMove);
bool is_timeout(TimePoint startTime); bool is_timeout(TimePoint startTime);
@ -153,7 +153,7 @@ int Thread::search()
#ifdef MTDF_AI #ifdef MTDF_AI
value = MTDF(rootPos, ss, value, i, i, bestMove); value = MTDF(rootPos, ss, value, i, i, bestMove);
#else #else
value = search(rootPos, ss, i, i, alpha, beta, bestMove); value = qsearch(rootPos, ss, i, i, alpha, beta, bestMove);
#endif #endif
loggerDebug("%d(%d) ", value, value - lastValue); loggerDebug("%d(%d) ", value, value - lastValue);
@ -188,7 +188,7 @@ int Thread::search()
#ifdef MTDF_AI #ifdef MTDF_AI
value = MTDF(rootPos, ss, value, originDepth, originDepth, bestMove); value = MTDF(rootPos, ss, value, originDepth, originDepth, bestMove);
#else #else
value = search(rootPos, ss, d, originDepth, alpha, beta, bestMove); value = qsearch(rootPos, ss, d, originDepth, alpha, beta, bestMove);
#endif #endif
out: out:
@ -211,7 +211,7 @@ extern ThreadPool Threads;
vector<Key> posKeyHistory; vector<Key> posKeyHistory;
Value search(Position *pos, Sanmill::Stack<Position> &ss, Depth depth, Depth originDepth, Value alpha, Value beta, Move &bestMove) Value qsearch(Position *pos, Sanmill::Stack<Position> &ss, Depth depth, Depth originDepth, Value alpha, Value beta, Move &bestMove)
{ {
Value value = VALUE_ZERO; Value value = VALUE_ZERO;
Value bestValue = -VALUE_INFINITE; Value bestValue = -VALUE_INFINITE;
@ -387,32 +387,32 @@ Value search(Position *pos, Sanmill::Stack<Position> &ss, Depth depth, Depth ori
#ifdef PVS_AI #ifdef PVS_AI
if (i == 0) { if (i == 0) {
if (after != before) { if (after != before) {
value = -search(pos, ss, depth - 1 + epsilon, originDepth, -beta, -alpha, bestMove); value = -qsearch(pos, ss, depth - 1 + epsilon, originDepth, -beta, -alpha, bestMove);
} else { } else {
value = search(pos, ss, depth - 1 + epsilon, originDepth, alpha, beta, bestMove); value = qsearch(pos, ss, depth - 1 + epsilon, originDepth, alpha, beta, bestMove);
} }
} else { } else {
if (after != before) { if (after != before) {
value = -search(pos, ss, depth - 1 + epsilon, originDepth, -alpha - VALUE_PVS_WINDOW, -alpha, bestMove); value = -qsearch(pos, ss, depth - 1 + epsilon, originDepth, -alpha - VALUE_PVS_WINDOW, -alpha, bestMove);
if (value > alpha && value < beta) { if (value > alpha && value < beta) {
value = -search(pos, ss, depth - 1 + epsilon, originDepth, -beta, -alpha, bestMove); value = -qsearch(pos, ss, depth - 1 + epsilon, originDepth, -beta, -alpha, bestMove);
//assert(value >= alpha && value <= beta); //assert(value >= alpha && value <= beta);
} }
} else { } else {
value = search(pos, ss, depth - 1 + epsilon, originDepth, alpha, alpha + VALUE_PVS_WINDOW, bestMove); value = qsearch(pos, ss, depth - 1 + epsilon, originDepth, alpha, alpha + VALUE_PVS_WINDOW, bestMove);
if (value > alpha && value < beta) { if (value > alpha && value < beta) {
value = search(pos, ss, depth - 1 + epsilon, originDepth, alpha, beta, bestMove); value = qsearch(pos, ss, depth - 1 + epsilon, originDepth, alpha, beta, bestMove);
//assert(value >= alpha && value <= beta); //assert(value >= alpha && value <= beta);
} }
} }
} }
#else #else
if (after != before) { if (after != before) {
value = -search(pos, ss, depth - 1 + epsilon, originDepth, -beta, -alpha, bestMove); value = -qsearch(pos, ss, depth - 1 + epsilon, originDepth, -beta, -alpha, bestMove);
} else { } else {
value = search(pos, ss, depth - 1 + epsilon, originDepth, alpha, beta, bestMove); value = qsearch(pos, ss, depth - 1 + epsilon, originDepth, alpha, beta, bestMove);
} }
#endif // PVS_AI #endif // PVS_AI
@ -470,7 +470,7 @@ Value MTDF(Position *pos, Sanmill::Stack<Position> &ss, Value firstguess, Depth
beta = g; beta = g;
} }
g = search(pos, ss, depth, originDepth, beta - VALUE_MTDF_WINDOW, beta, bestMove); g = qsearch(pos, ss, depth, originDepth, beta - VALUE_MTDF_WINDOW, beta, bestMove);
if (g < beta) { if (g < beta) {
upperbound = g; // fail low upperbound = g; // fail low