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

@@ -42,6 +42,7 @@ namespace Search {
LimitsType Limits;
std::vector<RootMove> RootMoves;
Position RootPosition;
Color RootColor;
Time::point SearchTime;
StateStackPtr SetupStates;
}
@@ -174,7 +175,7 @@ void Search::think() {
Position& pos = RootPosition;
Chess960 = pos.is_chess960();
Eval::RootColor = pos.side_to_move();
RootColor = pos.side_to_move();
TimeMgr.init(Limits, pos.startpos_ply_counter(), pos.side_to_move());
TT.new_search();
H.clear();
@@ -192,8 +193,8 @@ void Search::think() {
{
int cf = Options["Contempt Factor"] * PawnValueMg / 100; // In centipawns
cf = cf * MaterialTable::game_phase(pos) / PHASE_MIDGAME; // Scale down with phase
DrawValue[ Eval::RootColor] = VALUE_DRAW - Value(cf);
DrawValue[~Eval::RootColor] = VALUE_DRAW + Value(cf);
DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
DrawValue[~RootColor] = VALUE_DRAW + Value(cf);
}
else
DrawValue[WHITE] = DrawValue[BLACK] = VALUE_DRAW;