kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 08:43:09 +00:00
Code Issues Releases Wiki Activity

Convert init of eval to async option

Browse source 
So to be done only once at startup and in the (unlikely)
cases that a relevant UCI parameter is changed, instead
of doing it at the beginning of each search.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2012-03-05 19:24:59 +01:00
parent 2ef5b4066e
commit d8e56cbe54
7 changed files with 62 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
src/evaluate.cpp
View file

@ -29,6 +29,8 @@
#include "thread.h"
#include "ucioption.h"
Color EvalRootColor;
namespace {
// Struct EvalInfo contains various information computed and collected
@ -250,7 +252,6 @@ namespace {
inline Score apply_weight(Score v, Score weight);
Value scale_by_game_phase(const Score& v, Phase ph, ScaleFactor sf);
Score weight_option(const std::string& mgOpt, const std::string& egOpt, Score internalWeight);
void init_safety();
double to_cp(Value v);
void trace_add(int idx, Score term_w, Score term_b = SCORE_ZERO);
}
@ -389,27 +390,42 @@ Value do_evaluate(const Position& pos, Value& margin) {
} // namespace
/// read_weights() reads evaluation weights from the corresponding UCI parameters
/// eval_init() reads evaluation weights from the corresponding UCI parameters
/// and setup weights and tables.
void eval_init() {
void read_evaluation_uci_options(Color us) {
const Value MaxSlope = Value(30);
const Value Peak = Value(1280);
Value t[100];
// King safety is asymmetrical. Our king danger level is weighted by
// "Cowardice" UCI parameter, instead the opponent one by "Aggressiveness".
const int kingDangerUs = (us == WHITE ? KingDangerUs : KingDangerThem);
const int kingDangerThem = (us == WHITE ? KingDangerThem : KingDangerUs);
Weights[Mobility] = weight_option("Mobility (Middle Game)", "Mobility (Endgame)", WeightsInternal[Mobility]);
Weights[PassedPawns] = weight_option("Passed Pawns (Middle Game)", "Passed Pawns (Endgame)", WeightsInternal[PassedPawns]);
Weights[Space] = weight_option("Space", "Space", WeightsInternal[Space]);
Weights[kingDangerUs] = weight_option("Cowardice", "Cowardice", WeightsInternal[KingDangerUs]);
Weights[kingDangerThem] = weight_option("Aggressiveness", "Aggressiveness", WeightsInternal[KingDangerThem]);
Weights[KingDangerUs] = weight_option("Cowardice", "Cowardice", WeightsInternal[KingDangerUs]);
Weights[KingDangerThem] = weight_option("Aggressiveness", "Aggressiveness", WeightsInternal[KingDangerThem]);
// If running in analysis mode, make sure we use symmetrical king safety. We do this
// by replacing both Weights[kingDangerUs] and Weights[kingDangerThem] by their average.
if (Options["UCI_AnalyseMode"])
Weights[kingDangerUs] = Weights[kingDangerThem] = (Weights[kingDangerUs] + Weights[kingDangerThem]) / 2;
Weights[KingDangerUs] = Weights[KingDangerThem] = (Weights[KingDangerUs] + Weights[KingDangerThem]) / 2;
init_safety();
// First setup the base table
for (int i = 0; i < 100; i++)
{
t[i] = Value(int(0.4 * i * i));
if (i > 0)
t[i] = std::min(t[i], t[i - 1] + MaxSlope);
t[i] = std::min(t[i], Peak);
}
// Then apply the weights and get the final KingDangerTable[] array
for (Color c = WHITE; c <= BLACK; c++)
for (int i = 0; i < 100; i++)
KingDangerTable[c == WHITE][i] = apply_weight(make_score(t[i], 0), Weights[KingDangerUs + c]);
}
@ -769,8 +785,8 @@ namespace {
// value that will be used for pruning because this value can sometimes
// be very big, and so capturing a single attacking piece can therefore
// result in a score change far bigger than the value of the captured piece.
score -= KingDangerTable[Us][attackUnits];
margins[Us] += mg_value(KingDangerTable[Us][attackUnits]);
score -= KingDangerTable[Us == EvalRootColor][attackUnits];
margins[Us] += mg_value(KingDangerTable[Us == EvalRootColor][attackUnits]);
}
if (Trace)
@ -1103,33 +1119,6 @@ namespace {
}
// init_safety() initizes the king safety evaluation, based on UCI
// parameters. It is called from read_weights().
void init_safety() {
const Value MaxSlope = Value(30);
const Value Peak = Value(1280);
Value t[100];
// First setup the base table
for (int i = 0; i < 100; i++)
{
t[i] = Value(int(0.4 * i * i));
if (i > 0)
t[i] = std::min(t[i], t[i - 1] + MaxSlope);
t[i] = std::min(t[i], Peak);
}
// Then apply the weights and get the final KingDangerTable[] array
for (Color c = WHITE; c <= BLACK; c++)
for (int i = 0; i < 100; i++)
KingDangerTable[c][i] = apply_weight(make_score(t[i], 0), Weights[KingDangerUs + c]);
}
// A couple of little helpers used by tracing code, to_cp() converts a value to
// a double in centipawns scale, trace_add() stores white and black scores.

4
src/evaluate.h
View file

@ -26,6 +26,8 @@ class Position;
extern Value evaluate(const Position& pos, Value& margin);
extern std::string trace_evaluate(const Position& pos);
extern void read_evaluation_uci_options(Color sideToMove);
extern void eval_init();
extern Color EvalRootColor;
#endif // !defined(EVALUATE_H_INCLUDED)

4
src/main.cpp
View file

@ -21,10 +21,11 @@
#include <string>
#include "bitboard.h"
#include "ucioption.h"
#include "evaluate.h"
#include "position.h"
#include "search.h"
#include "thread.h"
#include "ucioption.h"
using namespace std;
@ -39,6 +40,7 @@ int main(int argc, char* argv[]) {
kpk_bitbase_init();
Search::init();
Threads.init();
eval_init();
TT.set_size(Options["Hash"]);
cout << engine_info() << endl;

4
src/search.cpp
View file

@ -251,6 +251,7 @@ void Search::think() {
Position& pos = RootPosition;
Chess960 = pos.is_chess960();
EvalRootColor = pos.side_to_move();
SearchTime.restart();
TimeMgr.init(Limits, pos.startpos_ply_counter());
TT.new_search();
@ -276,9 +277,6 @@ void Search::think() {
}
}
// Read UCI options: GUI could change UCI parameters during the game
read_evaluation_uci_options(pos.side_to_move());
UCIMultiPV = Options["MultiPV"];
SkillLevel = Options["Skill Level"];

2
src/uci.cpp
View file

@ -106,7 +106,7 @@ void uci_loop() {
else if (token == "eval")
{
read_evaluation_uci_options(pos.side_to_move());
EvalRootColor = pos.side_to_move();
cout << trace_evaluate(pos) << endl;
}

45
src/ucioption.cpp
View file

@ -20,6 +20,7 @@
#include <algorithm>
#include <sstream>
#include "evaluate.h"
#include "misc.h"
#include "thread.h"
#include "tt.h"
@ -29,15 +30,18 @@ using std::string;
OptionsMap Options; // Global object
namespace {
/// 'On change' actions, triggered by an option's change event
static void on_threads(UCIOption&) { Threads.read_uci_options(); }
static void on_hash_size(UCIOption& o) { TT.set_size(o); }
static void on_clear_hash(UCIOption& o) { TT.clear(); o = false; } // UCI button
/// 'On change' actions, triggered by an option's value change
void on_eval(UCIOption&) { eval_init(); }
void on_threads(UCIOption&) { Threads.read_uci_options(); }
void on_hash_size(UCIOption& o) { TT.set_size(o); }
void on_clear_hash(UCIOption& o) { TT.clear(); o = false; } // UCI button
/// Our case insensitive less() function as required by UCI protocol
static bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
bool ci_less(char c1, char c2) { return tolower(c1) < tolower(c2); }
}
bool CaseInsensitiveLess::operator() (const string& s1, const string& s2) const {
return lexicographical_compare(s1.begin(), s1.end(), s2.begin(), s2.end(), ci_less);
@ -58,13 +62,13 @@ OptionsMap::OptionsMap() {
o["Search Log Filename"] = UCIOption("SearchLog.txt");
o["Book File"] = UCIOption("book.bin");
o["Best Book Move"] = UCIOption(false);
o["Mobility (Middle Game)"] = UCIOption(100, 0, 200);
o["Mobility (Endgame)"] = UCIOption(100, 0, 200);
o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200);
o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200);
o["Space"] = UCIOption(100, 0, 200);
o["Aggressiveness"] = UCIOption(100, 0, 200);
o["Cowardice"] = UCIOption(100, 0, 200);
o["Mobility (Middle Game)"] = UCIOption(100, 0, 200, on_eval);
o["Mobility (Endgame)"] = UCIOption(100, 0, 200, on_eval);
o["Passed Pawns (Middle Game)"] = UCIOption(100, 0, 200, on_eval);
o["Passed Pawns (Endgame)"] = UCIOption(100, 0, 200, on_eval);
o["Space"] = UCIOption(100, 0, 200, on_eval);
o["Aggressiveness"] = UCIOption(100, 0, 200, on_eval);
o["Cowardice"] = UCIOption(100, 0, 200, on_eval);
o["Min Split Depth"] = UCIOption(msd, 4, 7, on_threads);
o["Max Threads per Split Point"] = UCIOption(5, 4, 8, on_threads);
o["Threads"] = UCIOption(cpus, 1, MAX_THREADS);
@ -81,12 +85,13 @@ OptionsMap::OptionsMap() {
o["Minimum Thinking Time"] = UCIOption(20, 0, 5000);
o["Slow Mover"] = UCIOption(100, 10, 1000);
o["UCI_Chess960"] = UCIOption(false);
o["UCI_AnalyseMode"] = UCIOption(false);
o["UCI_AnalyseMode"] = UCIOption(false, on_eval);
}
/// operator<<() is used to output all the UCI options in chronological insertion
/// order (the idx field) and in the format defined by the UCI protocol.
std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
for (size_t idx = 0; idx < om.size(); idx++)
@ -110,19 +115,19 @@ std::ostream& operator<<(std::ostream& os, const OptionsMap& om) {
/// UCIOption class c'tors
UCIOption::UCIOption(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change_action(f)
UCIOption::UCIOption(const char* v, Fn* f) : type("string"), min(0), max(0), idx(Options.size()), on_change(f)
{ defaultValue = currentValue = v; }
UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change_action(f)
UCIOption::UCIOption(bool v, Fn* f) : type("check"), min(0), max(0), idx(Options.size()), on_change(f)
{ defaultValue = currentValue = (v ? "true" : "false"); }
UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change_action(f)
UCIOption::UCIOption(int v, int minv, int maxv, Fn* f) : type("spin"), min(minv), max(maxv), idx(Options.size()), on_change(f)
{ std::ostringstream ss; ss << v; defaultValue = currentValue = ss.str(); }
/// UCIOption::operator=() updates currentValue. Normally it's up to the GUI to
/// check for option's limits, but we could receive the new value directly from
/// the user by teminal window, so let's check the bounds anyway.
/// the user by console window, so let's check the bounds anyway.
void UCIOption::operator=(const string& v) {
@ -134,7 +139,7 @@ void UCIOption::operator=(const string& v) {
{
currentValue = v;
if (on_change_action)
(*on_change_action)(*this);
if (on_change)
(*on_change)(*this);
}
}

2
src/ucioption.h
View file

@ -57,7 +57,7 @@ private:
std::string defaultValue, currentValue, type;
int min, max;
size_t idx;
Fn* on_change_action;
Fn* on_change;
};