1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-05-01 01:03:09 +00:00

Assorted cleanup of last patches

No functional change.
This commit is contained in:
Marco Costalba 2015-04-11 23:21:52 +02:00
parent a66c73deef
commit fb03188fc7
4 changed files with 11 additions and 14 deletions

View file

@ -1068,7 +1068,6 @@ moves_loop: // When in check and at SpNode search starts from here
rm.score = -VALUE_INFINITE; rm.score = -VALUE_INFINITE;
} }
bool newBestMove = false;
if (value > bestValue) if (value > bestValue)
{ {
bestValue = SpNode ? splitPoint->bestValue = value : value; bestValue = SpNode ? splitPoint->bestValue = value : value;
@ -1081,7 +1080,6 @@ moves_loop: // When in check and at SpNode search starts from here
&& (move != EasyMove.get(pos.key()) || moveCount > 1)) && (move != EasyMove.get(pos.key()) || moveCount > 1))
EasyMove.clear(); EasyMove.clear();
newBestMove = true;
bestMove = SpNode ? splitPoint->bestMove = move : move; bestMove = SpNode ? splitPoint->bestMove = move : move;
if (PvNode && !RootNode) // Update pv even in fail-high case if (PvNode && !RootNode) // Update pv even in fail-high case
@ -1101,7 +1099,7 @@ moves_loop: // When in check and at SpNode search starts from here
} }
} }
if (!SpNode && !captureOrPromotion && !newBestMove && quietCount < 64) if (!SpNode && !captureOrPromotion && move != bestMove && quietCount < 64)
quietsSearched[quietCount++] = move; quietsSearched[quietCount++] = move;
// Step 19. Check for splitting the search // Step 19. Check for splitting the search
@ -1147,7 +1145,7 @@ moves_loop: // When in check and at SpNode search starts from here
: inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()]; : inCheck ? mated_in(ss->ply) : DrawValue[pos.side_to_move()];
// Quiet best move: update killers, history and countermoves // Quiet best move: update killers, history and countermoves
else if (bestMove != MOVE_NONE && !pos.capture_or_promotion(bestMove)) else if (bestMove && !pos.capture_or_promotion(bestMove))
update_stats(pos, ss, bestMove, depth, quietsSearched, quietCount); update_stats(pos, ss, bestMove, depth, quietsSearched, quietCount);
tte->save(posKey, value_to_tt(bestValue, ss->ply), tte->save(posKey, value_to_tt(bestValue, ss->ply),
@ -1405,9 +1403,12 @@ moves_loop: // When in check and at SpNode search starts from here
*pv = MOVE_NONE; *pv = MOVE_NONE;
} }
// update_stats() updates killers, history, countermove history and countermoves stats for a quiet best move.
void update_stats(const Position& pos, Stack* ss, Move move, Depth depth, Move* quiets, int quietsCnt) { // update_stats() updates killers, history, countermove history and
// countermoves stats for a quiet best move.
void update_stats(const Position& pos, Stack* ss, Move move,
Depth depth, Move* quiets, int quietsCnt) {
if (ss->killers[0] != move) if (ss->killers[0] != move)
{ {

View file

@ -321,10 +321,6 @@ void ThreadPool::read_uci_options() {
assert(requested > 0); assert(requested > 0);
// If zero (default) then set best minimum split depth automatically
if (!minimumSplitDepth)
minimumSplitDepth = 5 * ONE_PLY ;
while (size() < requested) while (size() < requested)
push_back(new_thread<Thread>()); push_back(new_thread<Thread>());

View file

@ -17,8 +17,8 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef UCIOPTION_H_INCLUDED #ifndef UCI_H_INCLUDED
#define UCIOPTION_H_INCLUDED #define UCI_H_INCLUDED
#include <map> #include <map>
#include <string> #include <string>
@ -76,4 +76,4 @@ Move to_move(const Position& pos, std::string& str);
extern UCI::OptionsMap Options; extern UCI::OptionsMap Options;
#endif // #ifndef UCIOPTION_H_INCLUDED #endif // #ifndef UCI_H_INCLUDED

View file

@ -57,7 +57,7 @@ void init(OptionsMap& o) {
o["Write Debug Log"] << Option(false, on_logger); o["Write Debug Log"] << Option(false, on_logger);
o["Contempt"] << Option(0, -100, 100); o["Contempt"] << Option(0, -100, 100);
o["Min Split Depth"] << Option(0, 0, 12, on_threads); o["Min Split Depth"] << Option(5, 0, 12, on_threads);
o["Threads"] << Option(1, 1, MAX_THREADS, on_threads); o["Threads"] << Option(1, 1, MAX_THREADS, on_threads);
o["Hash"] << Option(16, 1, MaxHashMB, on_hash_size); o["Hash"] << Option(16, 1, MaxHashMB, on_hash_size);
o["Clear Hash"] << Option(on_clear_hash); o["Clear Hash"] << Option(on_clear_hash);