/*
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"
is >> skipws >> token;
if (token == "quit" || token == "stop")
- {
- Search::Signals.stop = true;
- Threads[0].wake_up(); // In case is waiting for stop or ponderhit
- }
+ Threads.stop_thinking();
else if (token == "ponderhit")
{
Search::Limits.ponder = false;
if (Search::Signals.stopOnPonderhit)
- Search::Signals.stop = true;
-
- Threads[0].wake_up(); // In case is waiting for stop or ponderhit
+ Threads.stop_thinking();
}
else if (token == "go")
go(pos, is);
- else if (token == "ucinewgame")
- pos.from_fen(StartFEN, false);
-
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.key()
<< "\npawn key: " << pos.pawn_key() << endl;
else if (token == "uci")
- cout << "id name " << engine_name()
- << "\nid author " << engine_authors()
+ cout << "id name " << engine_info(true)
<< "\n" << Options
<< "\nuciok" << endl;
else
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)
value += string(" ", !value.empty()) + token;
if (Options.count(name))
- Options[name] = (value.empty() ? "true" : value); // UCI buttons don't have "value"
+ Options[name] = value;
else
cout << "No such option: " << name << endl;
}
string token;
Search::LimitsType limits;
- std::vector<Move> searchMoves;
+ std::set<Move> searchMoves;
int time[] = { 0, 0 }, inc[] = { 0, 0 };
while (is >> token)
is >> limits.maxTime;
else if (token == "searchmoves")
while (is >> token)
- searchMoves.push_back(move_from_uci(pos, token));
+ searchMoves.insert(move_from_uci(pos, token));
}
limits.time = time[pos.side_to_move()];
void perft(Position& pos, istringstream& is) {
- int depth, time;
+ int depth;
if (!(is >> depth))
return;
- time = system_time();
+ Time time = Time::current_time();
int64_t n = Search::perft(pos, depth * ONE_PLY);
- time = 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;
}
}