HCha/Stockfish
1
0
Fork 0
mirror of https://github.com/HChaZZY/Stockfish.git synced 2025-12-20 09:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Remove slowMover"

Browse Source 
This reverts commit 77fa960f89.

Resolves #590
This commit is contained in:
Leonid Pechenik
2016-02-22 12:03:33 -05:00
committed by Joona Kiiski
parent 77fa960f89
commit d5ba8e827d
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/timeman.cpp
View File

@@ -37,25 +37,27 @@ namespace {
const double StealRatio = 0.35; // However we must not steal time from remaining moves over this ratio
// move_importance() is an exponential function based on naive observation
// that a game is closer to be decided after each half-move. This function
// should be decreasing and with "nice" convexity properties.
// move_importance() is a skew-logistic function based on naive statistical
// analysis of "how many games are still undecided after n half-moves". Game
// is considered "undecided" as long as neither side has >275cp advantage.
// Data was extracted from the CCRL game database with some simple filtering criteria.
double move_importance(int ply) {
const double PlyScale = 109.3265;
const double PlyGrowth = 4.0;
const double XScale = 7.64;
const double XShift = 58.4;
const double Skew = 0.183;
return exp(-pow(ply / PlyScale, PlyGrowth)) + DBL_MIN; // Ensure non-zero
return pow((1 + exp((ply - XShift) / XScale)), -Skew) + DBL_MIN; // Ensure non-zero
}
template<TimeType T>
int remaining(int myTime, int movesToGo, int ply)
int remaining(int myTime, int movesToGo, int ply, int slowMover)
{
const double TMaxRatio = (T == OptimumTime ? 1 : MaxRatio);
const double TStealRatio = (T == OptimumTime ? 0 : StealRatio);
double moveImportance = move_importance(ply);
double moveImportance = (move_importance(ply) * slowMover) / 100;
double otherMovesImportance = 0;
for (int i = 1; i < movesToGo; ++i)
@@ -83,6 +85,7 @@ void TimeManagement::init(Search::LimitsType& limits, Color us, int ply)
{
int minThinkingTime = Options["Minimum Thinking Time"];
int moveOverhead = Options["Move Overhead"];
int slowMover = Options["Slow Mover"];
int npmsec = Options["nodestime"];
// If we have to play in 'nodes as time' mode, then convert from time
@@ -117,8 +120,8 @@ void TimeManagement::init(Search::LimitsType& limits, Color us, int ply)
hypMyTime = std::max(hypMyTime, 0);
int t1 = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, ply);
int t2 = minThinkingTime + remaining<MaxTime >(hypMyTime, hypMTG, ply);
int t1 = minThinkingTime + remaining<OptimumTime>(hypMyTime, hypMTG, ply, slowMover);
int t2 = minThinkingTime + remaining<MaxTime >(hypMyTime, hypMTG, ply, slowMover);
optimumTime = std::min(t1, optimumTime);
maximumTime = std::min(t2, maximumTime);