/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008 Marco Costalba
+ Copyright (C) 2008-2009 Marco Costalba
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
////
/// think() is the external interface to Stockfish's search, and is called when
-/// the program receives the UCI 'go' command. It initializes various
-/// search-related global variables, and calls root_search()
+/// the program receives the UCI 'go' command. It initializes various
+/// search-related global variables, and calls root_search(). It returns false
+/// when a quit command is received during the search.
-void think(const Position &pos, bool infinite, bool ponder, int side_to_move,
+bool think(const Position &pos, bool infinite, bool ponder, int side_to_move,
int time[], int increment[], int movesToGo, int maxDepth,
int maxNodes, int maxTime, Move searchMoves[]) {
if (bookMove != MOVE_NONE)
{
std::cout << "bestmove " << bookMove << std::endl;
- return;
+ return true;
}
}
if (UseLogFile)
LogFile.close();
- if (Quit)
- {
- stop_threads();
- quit_eval();
- exit(0);
- }
Idle = true;
+ return !Quit;
}
if (i < MultiPV)
{
+ // Aspiration window is disabled in multi-pv case
+ if (MultiPV > 1)
+ alpha = -VALUE_INFINITE;
+
value = -search_pv(pos, ss, -beta, -alpha, newDepth, 1, 0);
// If the value has dropped a lot compared to the last iteration,
// set the boolean variable Problem to true. This variable is used
return false;
// Case 4: Don't prune moves with good history.
- if (!H.ok_to_prune(pos.piece_on(move_from(m)), m, d))
+ if (!H.ok_to_prune(pos.piece_on(mfrom), mto, d))
return false;
// Case 5: If the moving piece in the threatened move is a slider, don't
void update_history(const Position& pos, Move m, Depth depth,
Move movesSearched[], int moveCount) {
- H.success(pos.piece_on(move_from(m)), m, depth);
+ H.success(pos.piece_on(move_from(m)), move_to(m), depth);
for (int i = 0; i < moveCount - 1; i++)
{
assert(m != movesSearched[i]);
if (ok_to_history(pos, movesSearched[i]))
- H.failure(pos.piece_on(move_from(movesSearched[i])), movesSearched[i]);
+ H.failure(pos.piece_on(move_from(movesSearched[i])), move_to(movesSearched[i]));
}
}
AbortSearch = true;
PonderSearch = false;
Quit = true;
+ return;
}
else if(command == "stop")
{
// after which the bestmove and pondermove will be printed (in id_loop()).
void wait_for_stop_or_ponderhit() {
+
std::string command;
- while(true) {
- if(!std::getline(std::cin, command))
- command = "quit";
+ while (true)
+ {
+ if (!std::getline(std::cin, command))
+ command = "quit";
- if(command == "quit") {
- stop_threads();
- quit_eval();
- exit(0);
- }
- else if(command == "ponderhit" || command == "stop")
- break;
+ if (command == "quit")
+ {
+ Quit = true;
+ break;
+ }
+ else if(command == "ponderhit" || command == "stop")
+ break;
}
}