Skip to content

Commit

Permalink
Revert "Improve multiPV mode"
Browse files Browse the repository at this point in the history
This reverts commit a8de07c.
  • Loading branch information
joergoster authored and snicolet committed Aug 1, 2019
1 parent 8152a74 commit fcee0ce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 8 deletions.
8 changes: 1 addition & 7 deletions src/search.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ void Thread::search() {
bestValue = delta = alpha = -VALUE_INFINITE;
beta = VALUE_INFINITE;

multiPV = Options["MultiPV"];
size_t multiPV = Options["MultiPV"];

// Pick integer skill levels, but non-deterministically round up or down
// such that the average integer skill corresponds to the input floating point one.
Expand Down Expand Up @@ -934,12 +934,6 @@ namespace {
sync_cout << "info depth " << depth / ONE_PLY
<< " currmove " << UCI::move(move, pos.is_chess960())
<< " currmovenumber " << moveCount + thisThread->pvIdx << sync_endl;

// In MultiPV mode also skip moves which will be searched later as PV moves
if (rootNode && std::count(thisThread->rootMoves.begin() + thisThread->pvIdx + 1,
thisThread->rootMoves.begin() + thisThread->multiPV, move))
continue;

if (PvNode)
(ss+1)->pv = nullptr;

Expand Down
2 changes: 1 addition & 1 deletion src/thread.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class Thread {

Pawns::Table pawnsTable;
Material::Table materialTable;
size_t pvIdx, multiPV, pvLast, shuffleExts;
size_t pvIdx, pvLast, shuffleExts;
int selDepth, nmpMinPly;
Color nmpColor;
std::atomic<uint64_t> nodes, tbHits, bestMoveChanges;
Expand Down

0 comments on commit fcee0ce

Please sign in to comment.