xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2024-11-23 11:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve move probability calculation for CTG books

Browse Source
This commit is contained in:
Peter Osterlund 2020-09-28 07:10:05 +02:00
parent ce2e5a326a
commit ca39ffbf09
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
DroidFishApp/src/main/java/org/petero/droidfish/book/CtgBook.java
View File

@ -36,6 +36,7 @@ class CtgBook implements IOpeningBook {
private File ctgFile; private File ctgFile;
private File ctbFile; private File ctbFile;
private File ctoFile; private File ctoFile;
private final static float bigWeight = 1e6f;
static boolean canHandle(BookOptions options) { static boolean canHandle(BookOptions options) {
String filename = options.filename; String filename = options.filename;
@ -77,7 +78,7 @@ class CtgBook implements IOpeningBook {
if (pd != null) { if (pd != null) {
boolean mirrorColor = pd.mirrorColor; boolean mirrorColor = pd.mirrorColor;
boolean mirrorLeftRight = pd.mirrorLeftRight; boolean mirrorLeftRight = pd.mirrorLeftRight;
ret = pd.getBookMoves(); ret = pd.getBookMoves(options);
UndoInfo ui = new UndoInfo(); UndoInfo ui = new UndoInfo();
for (BookEntry be : ret) { for (BookEntry be : ret) {
pd.pos.makeMove(be.move, ui); pd.pos.makeMove(be.move, ui);
@ -94,13 +95,14 @@ class CtgBook implements IOpeningBook {
weight = 0; weight = 0;
} else if (recom >= 128) { } else if (recom >= 128) {
if (options.preferMainLines) if (options.preferMainLines)
weight *= 10; weight = weight == bigWeight ? bigWeight : weight * bigWeight;
} }
float score = movePd.getOpponentScore() + 1e-4f; float score = movePd.getOpponentScore() + 1e-4f;
// double w0 = weight; // float w0 = weight;
weight = weight * score; weight = weight * score;
// System.out.printf("%s : w0:%.3f rec:%d score:%d %.3f\n", TextIO.moveToUCIString(be.move), // System.out.printf("bk %s : w0:%.3f rec:%d score:%d %.3f\n",
// w0, recom, score, weight); // TextIO.moveToUCIString(be.move),
// w0, recom, (int)score, weight);
} }
be.weight = weight; be.weight = weight;
} }
@ -390,7 +392,7 @@ class CtgBook implements IOpeningBook {
buf[i] = pageBuf[offs + i]; buf[i] = pageBuf[offs + i];
} }
final ArrayList<BookEntry> getBookMoves() { final ArrayList<BookEntry> getBookMoves(BookOptions options) {
ArrayList<BookEntry> entries = new ArrayList<>(); ArrayList<BookEntry> entries = new ArrayList<>();
int nMoves = (moveBytes - 1) / 2; int nMoves = (moveBytes - 1) / 2;
for (int mi = 0; mi < nMoves; mi++) { for (int mi = 0; mi < nMoves; mi++) {
@ -403,14 +405,19 @@ class CtgBook implements IOpeningBook {
BookEntry ent = new BookEntry(m); BookEntry ent = new BookEntry(m);
switch (flags) { switch (flags) {
default: default:
case 0x00: ent.weight = 1; break; // No annotation case 0x00: ent.weight = 1f; break; // No annotation
case 0x01: ent.weight = 8; break; // ! case 0x01: ent.weight = 1.23f; break; // !
case 0x02: ent.weight = 0; break; // ? case 0x02: ent.weight = 0f; break; // ?
case 0x03: ent.weight = 32; break; // !! case 0x03: ent.weight = 1.46f; break; // !!
case 0x04: ent.weight = 0; break; // ?? case 0x04: ent.weight = 0f; break; // ??
case 0x05: ent.weight = 0.5f; break; // !? case 0x05: ent.weight = 1f; break; // !?
case 0x06: ent.weight = 0.125f; break; // ?! case 0x06: ent.weight = 0f; break; // ?!
case 0x08: ent.weight = 1000000; break; // Only move case 0x08: // Only move
if (options.preferMainLines)
ent.weight = bigWeight;
else
ent.weight = 1.0f;
break;
} }
entries.add(ent); entries.add(ent);
} }