xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-12-12 09:02:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement maxNPS UCI option for CuckooChess

Browse Source 
This is an alternative way to limit the engine strength. It also has
the advantage of reducing heat and battery drain.
This commit is contained in:
Peter Osterlund
2020-04-11 01:58:26 +02:00
parent 29d605af99
commit 67e03495dc
3 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
CuckooChessEngine/src/main/java/chess/Search.java
View File

@@ -66,6 +66,7 @@ public class Search {
// Reduced strength variables
private int strength = 1000; // Strength (0-1000)
private int maxNPS = 0; // If > 0, reduce strength by limiting NPS
private boolean weak = false; // Set to strength < 1000
private long randomSeed = 0;
@@ -170,12 +171,16 @@ public class Search {
maxTimeMillis = maxTimeLimit;
}
final public void setStrength(int strength, long randomSeed) {
final public void setStrength(int strength, long randomSeed, int maxNPS) {
if (strength < 0) strength = 0;
if (strength > 1000) strength = 1000;
this.strength = strength;
weak = strength < 1000;
this.randomSeed = randomSeed;
this.maxNPS = maxNPS;
nodesBetweenTimeCheck = 5000;
if (maxNPS > 0)
nodesBetweenTimeCheck = Math.min(Math.max(maxNPS / 100, 1), nodesBetweenTimeCheck);
}
final public Move iterativeDeepening(MoveGen.MoveList scMovesIn,
@@ -264,6 +269,9 @@ public class Search {
mi, "-", alpha, beta, "-", "-");
System.out.printf("%-6s...\n", TextIO.moveToUCIString(m)); */
pos.makeMove(m, ui);
nodes++;
totalNodes++;
nodesToGo--;
SearchTreeInfo sti = searchTreeInfo[0];
sti.currentMove = m;
sti.lmr = lmrS;
@@ -301,6 +309,9 @@ public class Search {
nodes = qNodes = 0;
posHashList[posHashListSize++] = pos.zobristHash();
pos.makeMove(m, ui);
nodes++;
totalNodes++;
nodesToGo--;
int score2 = -negaScout(-beta, -score, 1, depthS - plyScale, -1, givesCheck);
score = Math.max(score, score2);
nodesThisMove += nodes + qNodes;
@@ -320,6 +331,9 @@ public class Search {
nodes = qNodes = 0;
posHashList[posHashListSize++] = pos.zobristHash();
pos.makeMove(m, ui);
nodes++;
totalNodes++;
nodesToGo--;
score = -negaScout(-score, -alpha, 1, depthS - plyScale, -1, givesCheck);
nodesThisMove += nodes + qNodes;
posHashListSize--;
@@ -459,7 +473,7 @@ public class Search {
long idx = log.logNodeStart(sti.nodeIdx, sti.currentMove, alpha, beta, ply, depth/plyScale);
searchTreeInfo[ply].nodeIdx = idx;
}
if (--nodesToGo <= 0) {
if (nodesToGo <= 0) {
nodesToGo = nodesBetweenTimeCheck;
long tNow = System.currentTimeMillis();
long timeLimit = searchNeedMoreTime ? maxTimeMillis : minTimeMillis;
@@ -467,6 +481,15 @@ public class Search {
((maxNodes >= 0) && (totalNodes >= maxNodes))) {
throw new StopSearch();
}
if (maxNPS > 0) {
long time = tNow - tStart;
if (totalNodes * 1000.0 > maxNPS * Math.max(1, time)) {
long wantedTime = totalNodes * 1000 / maxNPS;
long sleepTime = wantedTime - time;
if (sleepTime > 0)
try { Thread.sleep(sleepTime); } catch (InterruptedException ignore) {}
}
}
if (tNow - tLastStats >= 1000) {
notifyStats();
}
@@ -797,6 +820,7 @@ public class Search {
pos.makeMove(m, ui);
nodes++;
totalNodes++;
nodesToGo--;
sti.currentMove = m;
/* long nodes0 = nodes;
long qNodes0 = qNodes;
@@ -1021,6 +1045,7 @@ public class Search {
pos.makeMove(m, ui);
qNodes++;
totalNodes++;
nodesToGo--;
score = -quiesce(-beta, -alpha, ply + 1, depth - 1, nextInCheck);
pos.unMakeMove(m, ui);
if (score > bestScore) {