Move RootColor from Eval to Search

No functional change.
This commit is contained in:
Marco Costalba
2012-10-21 09:12:02 +02:00
parent 55bd27b8f0
commit 6b909b2343
6 changed files with 13 additions and 17 deletions

View File

@@ -267,8 +267,6 @@ namespace {
namespace Eval {
Color RootColor;
/// evaluate() is the main evaluation function. It always computes two
/// values, an endgame score and a middle game score, and interpolates
/// between them based on the remaining material.
@@ -319,7 +317,7 @@ namespace Eval {
Value margin;
std::string totals;
RootColor = pos.side_to_move();
Search::RootColor = pos.side_to_move();
TraceStream.str("");
TraceStream << std::showpoint << std::showpos << std::fixed << std::setprecision(2);
@@ -853,8 +851,8 @@ Value do_evaluate(const Position& pos, Value& margin) {
// 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 == Eval::RootColor][attackUnits];
margins[Us] += mg_value(KingDangerTable[Us == Eval::RootColor][attackUnits]);
score -= KingDangerTable[Us == Search::RootColor][attackUnits];
margins[Us] += mg_value(KingDangerTable[Us == Search::RootColor][attackUnits]);
}
if (Trace)