/*
Stockfish, a UCI chess playing engine derived from Glaurung 2.1
Copyright (C) 2004-2008 Tord Romstad (Glaurung author)
- Copyright (C) 2008-2010 Marco Costalba, Joona Kiiski, Tord Romstad
+ Copyright (C) 2008-2012 Marco Costalba, Joona Kiiski, Tord Romstad
Stockfish is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include <iostream>
#include <sstream>
#include <string>
-#include <vector>
#include "evaluate.h"
#include "misc.h"
-#include "move.h"
#include "position.h"
#include "search.h"
#include "thread.h"
if (token == "quit" || token == "stop")
{
Search::Signals.stop = true;
- Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+
+ if (token == "quit") // Cannot quit while threads are still running
+ Threads.wait_for_search_finished();
}
else if (token == "ponderhit")
if (Search::Signals.stopOnPonderhit)
Search::Signals.stop = true;
-
- Threads[0].wake_up(); // In case is waiting for stop or ponderhit
}
else if (token == "go")
go(pos, is);
else if (token == "ucinewgame")
- pos.from_fen(StartFEN, false);
+ { /* Avoid returning "Unknown command" */ }
else if (token == "isready")
cout << "readyok" << endl;
pos.flip_me();
else if (token == "eval")
- {
- read_evaluation_uci_options(pos.side_to_move());
- cout << trace_evaluate(pos) << endl;
- }
+ cout << Eval::trace(pos) << endl;
else if (token == "key")
- cout << "key: " << hex << pos.get_key()
- << "\nmaterial key: " << pos.get_material_key()
- << "\npawn key: " << pos.get_pawn_key() << endl;
+ cout << "key: " << hex << pos.key()
+ << "\nmaterial key: " << pos.material_key()
+ << "\npawn key: " << pos.pawn_key() << endl;
else if (token == "uci")
- cout << "id name " << engine_name()
- << "\nid author " << engine_authors()
- << "\n" << Options.print_all()
+ cout << "id name " << engine_info(true)
+ << "\n" << Options
<< "\nuciok" << endl;
else
cout << "Unknown command: " << cmd << endl;
else
return;
- pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
+ pos.from_fen(fen, Options["UCI_Chess960"]);
// Parse move list (if any)
while (is >> token && (m = move_from_uci(pos, token)) != MOVE_NONE)
while (is >> token)
value += string(" ", !value.empty()) + token;
- if (Options.find(name) != Options.end())
- Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "value"
+ if (Options.count(name))
+ Options[name] = value;
else
cout << "No such option: " << name << endl;
}
// go() is called when engine receives the "go" UCI command. The function sets
// the thinking time and other parameters from the input string, and then starts
- // the main searching thread.
+ // the search.
void go(Position& pos, istringstream& is) {
- string token;
Search::LimitsType limits;
- std::vector<Move> searchMoves;
- int time[] = { 0, 0 }, inc[] = { 0, 0 };
+ std::set<Move> searchMoves;
+ string token;
while (is >> token)
{
- if (token == "infinite")
- limits.infinite = true;
- else if (token == "ponder")
- limits.ponder = true;
- else if (token == "wtime")
- is >> time[WHITE];
+ if (token == "wtime")
+ is >> limits.times[WHITE];
else if (token == "btime")
- is >> time[BLACK];
+ is >> limits.times[BLACK];
else if (token == "winc")
- is >> inc[WHITE];
+ is >> limits.incs[WHITE];
else if (token == "binc")
- is >> inc[BLACK];
+ is >> limits.incs[BLACK];
else if (token == "movestogo")
- is >> limits.movesToGo;
+ is >> limits.movestogo;
else if (token == "depth")
- is >> limits.maxDepth;
+ is >> limits.depth;
else if (token == "nodes")
- is >> limits.maxNodes;
+ is >> limits.nodes;
else if (token == "movetime")
- is >> limits.maxTime;
+ is >> limits.movetime;
+ else if (token == "infinite")
+ limits.infinite = true;
+ else if (token == "ponder")
+ limits.ponder = true;
else if (token == "searchmoves")
while (is >> token)
- searchMoves.push_back(move_from_uci(pos, token));
+ searchMoves.insert(move_from_uci(pos, token));
}
- searchMoves.push_back(MOVE_NONE);
- limits.time = time[pos.side_to_move()];
- limits.increment = inc[pos.side_to_move()];
-
- Threads.start_thinking(pos, limits, searchMoves, true);
+ Threads.start_searching(pos, limits, searchMoves);
}
void perft(Position& pos, istringstream& is) {
- int depth, time;
+ int depth;
if (!(is >> depth))
return;
- time = get_system_time();
+ Time time = Time::current_time();
int64_t n = Search::perft(pos, depth * ONE_PLY);
- time = get_system_time() - time;
+ int e = time.elapsed();
std::cout << "\nNodes " << n
- << "\nTime (ms) " << time
- << "\nNodes/second " << int(n / (time / 1000.0)) << std::endl;
+ << "\nTime (ms) " << e
+ << "\nNodes/second " << int(n / (e / 1000.0)) << std::endl;
}
}