// promotions by pieces with Lion power stepping in & out the zone in same turn\r
// promotion on capture\r
\r
-#define VERSION "0.1beta"\r
+#define VERSION "0.7beta"\r
\r
#define PATH level==0 || path[0] == 0xc4028 && (level==1 /*|| path[1] == 0x75967 && (level == 2 || path[2] == 0x3400b && (level == 3))*/)\r
//define PATH 0\r
\r
+#define HASH\r
+\r
#include <stdio.h>\r
#include <stdlib.h>\r
#include <string.h>\r
#include <signal.h>\r
#include <time.h>\r
+#include <stdint.h>\r
\r
#ifdef WIN32 \r
# include <windows.h>\r
#define BSIZE BWMAX*BHMAX\r
#define ZONE zone\r
\r
-#define ONE (currentVariant == V_SHO || currentVariant == V_CHESS)\r
+#define ONE (currentVariant == V_SHO || currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_MAKRUK)\r
\r
#define BLACK 0\r
#define WHITE 1\r
void pbytes(unsigned char *b);\r
\r
typedef struct {\r
+ int lock[5];\r
+ int move[5];\r
+ short int score[5];\r
+ char depth[5];\r
+ char flag[5];\r
+ char age[4];\r
+} HashBucket;\r
+\r
+HashBucket *hashTable;\r
+int hashMask;\r
+\r
+#define H_UPPER 2\r
+#define H_LOWER 1\r
+\r
+typedef struct {\r
char *name, *promoted;\r
int value;\r
signed char range[8];\r
} UndoInfo;\r
\r
char *array, fenArray[4000], *reason;\r
-int bWidth, bHeight, bsize, zone, currentVariant;\r
-int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, chuFlag=1, tenFlag, mobilityScore;\r
+int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws;\r
+int stm, xstm, hashKeyH, hashKeyL, framePtr, msp, nonCapts, rootEval, retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;\r
int nodes, startTime, tlim1, tlim2, repCnt, comp;\r
Move retMove, moveStack[10000], path[100], repStack[300], pv[1000], repeatMove[300];\r
\r
{ NULL } // sentinel\r
};\r
\r
+PieceDesc shatranjPieces[] = {\r
+ {"FK", "", 15, { 0,1,0,1,0,1,0,1 } },\r
+ {"R", "", 50, { X,0,X,0,X,0,X,0 } },\r
+ {"B", "", 9, { 0,J,0,J,0,J,0,J } },\r
+ {"N", "", 30, { N,N,N,N,N,N,N,N } },\r
+ {"K", "", 28, { 1,1,1,1,1,1,1,1 } },\r
+ {"P", "FK", 8, { M,C,0,0,0,0,0,C } },\r
+ { NULL } // sentinel\r
+};\r
+\r
+PieceDesc makrukPieces[] = {\r
+ {"SM","", 15, { 0,1,0,1,0,1,0,1 } },\r
+ {"R", "", 50, { X,0,X,0,X,0,X,0 } },\r
+ {"S", "", 20, { 1,1,0,1,0,1,0,1 } }, // silver\r
+ {"N", "", 30, { N,N,N,N,N,N,N,N } },\r
+ {"K", "", 28, { 1,1,1,1,1,1,1,1 } },\r
+ {"P", "SM", 8, { M,C,0,0,0,0,0,C } },\r
+ { NULL } // sentinel\r
+};\r
+\r
char chuArray[] = "L:FLCSGK:DEGSC:FLL/:RV.B.:BT:KN:PH:BT.B.:RV/:SM:VMR:DH:DK:LN:FK:DK:DHR:VM:SM/PPPPPPPPPPPP/...:GB....:GB..."\r
"/............/............/"\r
"...:gb....:gb.../pppppppppppp/:sm:vmr:dh:dk:fk:ln:dk:dhr:vm:sm/:rv.b.:bt:ph:kn:bt.b.:rv/l:flcsg:dekgsc:fll";\r
":ss:vsb:dh:dk:wb:fi:fe:lh:fi:wb:dk:dhb:vs:ss/:rv.:cs:cs.:bt:ph:fk:ln:kn:bt.:cs:cs.:rv/ln:flicsg:dekgsci:flnl";\r
char shoArray[] = "LNSGKGSNL/.B..:DE..R./PPPPPPPPP/........./........./........./ppppppppp/.r..:de..b./lnsgkgsnl";\r
char chessArray[] = "RNBQKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbqkbnr";\r
+char shatArray[]= "RNBK:FKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbk:fkbnr";\r
+char thaiArray[]= "RNSK:SMSNR/......../PPPPPPPP/......../......../pppppppp/......../rnsk:smsnr";\r
\r
typedef struct {\r
int boardWidth, boardFiles, boardRanks, zoneDepth, varNr; // board sizes\r
char *array; // initial position\r
} VariantDesc;\r
\r
-typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_TENJIKU, V_DADA, V_MAKA, V_TAI, V_KYOKU } Variant;\r
+typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_TENJIKU, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_SHATRANJ, V_MAKRUK } Variant;\r
\r
VariantDesc variants[] = {\r
{ 16, 8, 8, 1, V_CHESS, "normal", chessArray }, // FIDE\r
{ 24, 12, 12, 4, V_CHU, "chu", chuArray }, // Chu\r
{ 30, 15, 15, 5, V_DAI, "dai", daiArray }, // Dai\r
{ 32, 16, 16, 5, V_TENJIKU, "tenjiku", tenArray }, // Tenjiku\r
+ { 16, 8, 8, 1, V_SHATRANJ,"shatranj",shatArray}, // Shatranj\r
+ { 16, 8, 8, 3, V_MAKRUK, "makruk", thaiArray}, // Makruk\r
+\r
// { 0, 0, 0, 0, 0 }, // sentinel\r
{ 34, 17, 17, 0, V_DADA, "dada", chuArray }, // Dai Dai\r
{ 38, 19, 19, 0, V_MAKA, "maka", chuArray }, // Maka Dai Dai\r
return ListLookUp(name, chuPieces);\r
case V_CHESS: // FIDE\r
return ListLookUp(name, chessPieces);\r
+ case V_SHATRANJ: // Shatranj\r
+ return ListLookUp(name, shatranjPieces);\r
+ case V_MAKRUK: // Makruk\r
+ return ListLookUp(name, makrukPieces);\r
}\r
return NULL;\r
}\r
}\r
}\r
for(i=stm+2; i<last[stm]; i+=2) { // second pass: promoted pieces\r
+\r
if((k = p[i].promo) == -2 && p[i].pos == ABSENT) { // orphaned promoted piece not present\r
SqueezeOut(i);\r
}\r
if(p[j].promo >= i) p[j].promo += 2;\r
}\r
if(royal[stm] >= i) royal[stm] += 2;\r
- if(p[i].value == (currentVariant == V_SHO ? 410 : 280) ) royal[stm] = i;\r
+ if(p[i].value == (currentVariant == V_SHO ? 410 : 280) ) royal[stm] = i, p[i].pst = 0;\r
p[i].qval = (currentVariant == V_TENJIKU ? list->ranking : 0); // jump-capture hierarchy\r
return i;\r
}\r
SetUp(char *array, int var)\r
{\r
int i, j, n, m, nr, color;\r
- char c, *q, name[3];\r
+ char c, *q, name[3], prince = 0;\r
PieceDesc *p1, *p2;\r
last[WHITE] = 1; last[BLACK] = 0;\r
- if(var == V_CHESS) // add dummy Crown Princes\r
- p[AddPiece(WHITE, LookUp("CP", V_CHU))].pos = p[AddPiece(BLACK, LookUp("CP", V_CHU))].pos = ABSENT;\r
for(i=0; ; i++) {\r
//printf("next rank: %s\n", array);\r
for(j = BW*i; ; j++) {\r
name[0] += 'A' - 'a';\r
if(name[1]) name[1] += 'A' - 'a';\r
} else color = WHITE;\r
+ if(!strcmp(name, "CP")) prince |= color+1; // remember if we added Crown Prince\r
p1 = LookUp(name, var);\r
if(!p1) printf("tellusererror Unknown piece '%s' in setup\n", name), exit(-1);\r
if(pflag && p1->promoted) p1 = LookUp(p1->promoted, var); // use promoted piece instead\r
n = AddPiece(color, p1);\r
p[n].pos = j;\r
if(p1->promoted[0] && !pflag) {\r
+ if(!strcmp(p1->promoted, "CP")) prince |= color+1; // remember if we added Crown Prince\r
p2 = LookUp(p1->promoted, var);\r
m = AddPiece(color, p2);\r
if(m <= n) n += 2;\r
}\r
}\r
eos:\r
+ // add dummy Crown Princes if not yet added\r
+ if(!(prince & WHITE+1)) p[AddPiece(WHITE, LookUp("CP", V_CHU))].pos = ABSENT;\r
+ if(!(prince & BLACK+1)) p[AddPiece(BLACK, LookUp("CP", V_CHU))].pos = ABSENT;\r
for(i=0; i<8; i++) fireFlags[i] = 0;\r
for(i=2, n=1; i<10; i++) if(p[i].value == 10*FVAL) {\r
int x = p[i].pos; // mark all burn zones\r
bsize = bWidth*bHeight;\r
chuFlag = (currentVariant == V_CHU);\r
tenFlag = (currentVariant == V_TENJIKU);\r
+ chessFlag = (currentVariant == V_CHESS);\r
+ repDraws = (currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_MAKRUK);\r
\r
for(i= -1; i<9; i++) { // board steps in linear coordinates\r
kStep[i] = STEP(direction[i&7].x, direction[i&7].y); // King\r
}\r
} else\r
if(r == M) { // FIDE Pawn; check double-move\r
- if(!NewNonCapture(x, x+v, pFlag) && promoBoard[x-v])\r
- NewNonCapture(x, x+2*v+DEFER, pFlag); // use promoSuppress flag as e.p. flag\r
+ if(!NewNonCapture(x, x+v, pFlag) && chessFlag && promoBoard[x-v])\r
+ NewNonCapture(x, x+2*v, pFlag), moveStack[msp-1] |= DEFER; // use promoSuppress flag as e.p. flag\r
}\r
continue;\r
}\r
int score, bestScore, curEval, iterAlpha;\r
Move move, nullMove;\r
UndoInfo tb;\r
+#ifdef HASH\r
+ Move hashMove; int index, nr, hit;\r
+#endif\r
if(PATH) /*pboard(board),pmap(attacks, BLACK),*/printf("search(%d) {%d,%d} eval=%d, stm=%d\n",depth,alpha,beta,difEval,stm),fflush(stdout);\r
xstm = stm ^ WHITE;\r
//printf("map made\n");fflush(stdout);\r
nodes++;\r
pv[pvPtr++] = 0; // start empty PV, directly behind PV of parent\r
\r
+\r
firstMove = curMove = sorted = msp += 50; // leave 50 empty slots in front of move list\r
- tb.fireMask = phase = 0; iterDep=1; replyDep = (depth < 1 ? depth : 1) - 1;\r
- do {\r
+ iterDep = 0; tb.fireMask = phase = 0;\r
+\r
+#ifdef HASH\r
+ index = hashKeyL & hashMask; nr = hashKeyL >> 30; hit = -1;\r
+ if(hashTable[index].lock[nr] == hashKeyH) hit = nr; else\r
+ if(hashTable[index].lock[4] == hashKeyH) hit = 4;\r
+ if(hit >= 0) {\r
+ bestScore = hashTable[index].score[hit];\r
+ if((bestScore <= alpha || hashTable[index].flag[hit] & H_LOWER) &&\r
+ (bestScore >= beta || hashTable[index].flag[hit] & H_UPPER) ) {\r
+ iterDep = hashTable[index].depth[hit];\r
+ }\r
+ } else { // decide on replacement\r
+ if(depth >= hashTable[index].depth[nr]) hit = nr; else hit = 4;\r
+ }\r
+#endif\r
+\r
+ replyDep = (depth < 1 ? depth : iterDep < 1 ? 1 : iterDep);\r
+ while(++iterDep <= depth) {\r
if(flag && depth>= 0) printf("iter %d:%d\n", depth,iterDep),fflush(stdout);\r
iterAlpha = alpha; bestScore = -INF; bestMoveNr = 0; resDep = 60;\r
for(curMove = firstMove; ; curMove++) { // loop over moves\r
//if(PATH) printf("mask=%x\n",tb.fireMask),pbytes(fireBoard);\r
phase = 1;\r
case 1: // hash move\r
+#ifdef HASH\r
+ if(hashMove) {\r
+ moveStack[sorted = msp++] = hashMove;\r
+ goto extractMove;\r
+ }\r
+#endif\r
phase = 2;\r
case 2: // capture-gen init\r
nextVictim = xstm;\r
\r
if(flag & depth >= 0) printf("%2d:%d made %d/%d %s\n", depth, iterDep, curMove, msp, MoveToText(moveStack[curMove], 0));\r
for(i=2; i<=cnt50; i+=2) if(repStack[level-i+200] == hashKeyH) {\r
+ if(repDraws) { score = 0; goto repetition; }\r
moveStack[curMove] = 0; // erase forbidden move\r
if(!level) repeatMove[repCnt++] = move & 0xFFFFFF; // remember outlawed move\r
score = -INF; moveStack[curMove] = 0; goto repetition;\r
if(GetTickCount() - startTime > tlim1) break; // do not start iteration we can (most likely) not finish\r
}\r
replyDep = iterDep;\r
- } while(++iterDep <= depth); // next depth\r
+#ifdef HASH\r
+ // hash store\r
+ hashTable[index].lock[hit] = hashKeyH;\r
+ hashTable[index].depth[hit] = iterDep;\r
+ hashTable[index].flag[hit] = (bestScore < beta) * H_UPPER;\r
+ if(bestScore > alpha) {\r
+ hashTable[index].flag[hit] |= H_LOWER;\r
+ hashTable[index].move[hit] = bestMoveNr ? moveStack[bestMoveNr] : 0;\r
+ } else hashTable[index].move[hit] = 0;\r
+#endif\r
+ } // next depth\r
retMSP = msp;\r
retFirst = firstMove;\r
msp = oldMSP; // pop move list\r
if(isalpha(*fen)) {\r
char *table = fenNames;\r
n = *fen > 'Z' ? 'a' - 'A' : 0;\r
- if(currentVariant == V_CHESS && *fen - 'A' - n == 'N' // In Chess N is Knight, not Lion\r
+ if((currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_MAKRUK) && *fen - n == 'N' // In Chess N is Knight, not Lion\r
|| table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {\r
*p++ = ':';\r
*p++ = table[2* (*fen - 'A' - n)] + n;\r
void\r
SetMemorySize (int n)\r
{\r
+#ifdef HASH\r
+ static HashBucket *realHash;\r
+ static int oldSize;\r
+ int m = 1;\r
+ intptr_t l;\r
+ if(n != oldSize) {\r
+ if(oldSize) free(realHash);\r
+ while(m*sizeof(HashBucket) <= n*512) m <<= 1;\r
+ m *= 1024; hashMask = m - 1;\r
+ realHash = calloc(m + 1, sizeof(HashBucket));\r
+ l = (intptr_t) realHash; hashTable = (HashBucket*) (l & ~63); // align with cache line\r
+ }\r
+#endif\r
}\r
\r
char *\r
{\r
static char buf[50];\r
int f = move>>SQLEN & SQUARE, g = f, t = move & SQUARE;\r
+ char *promoChar = "";\r
if(f == t) { sprintf(buf, "@@@@"); return buf; } // null-move notation in WB protocol\r
buf[0] = '\0';\r
if(t >= SPECIAL) { // kludgy! Print as side effect non-standard WB command to remove victims from double-capture (breaks hint command!)\r
}\r
t = g + toList[t - SPECIAL];\r
}\r
- sprintf(buf+strlen(buf), "%c%d%c%d%s", f%BW+'a', f/BW+ONE, t%BW+'a', t/BW+ONE, move & PROMOTE ? "+" : "");\r
+ if(move & PROMOTE) promoChar = currentVariant == V_MAKRUK ? "m" : repDraws ? "q" : "+";\r
+ sprintf(buf+strlen(buf), "%c%d%c%d%s", f%BW+'a', f/BW+ONE, t%BW+'a', t/BW+ONE, promoChar);\r
return buf;\r
}\r
\r
t2 = SPECIAL + 8*i + j;\r
}\r
ret = f<<SQLEN | t2;\r
- if(*moveText == '+') ret |= PROMOTE;\r
+ if(*moveText != '\n' && *moveText != '=') ret |= PROMOTE;\r
printf("# suppress = %c%d\n", sup1%BW+'a', sup1/BW);\r
MapFromScratch(attacks);\r
postThinking--; repCnt = 0;\r
if((moveStack[i] & (PROMOTE | DEFER-1)) == ret) break;\r
if((moveStack[i] & DEFER-1) == ret) deferred = i; // promoted version of entered non-promotion is legal\r
}\r
+printf("# moveNr = %d in {%d,%d}\n", i, retFirst, retMSP);\r
if(i>=retMSP) { // no exact match\r
if(deferred) { // but maybe non-sensical deferral\r
int flags = p[board[f]].promoFlag;\r
int timeLeft; // timeleft on engine's clock\r
int mps, timeControl, inc, timePerMove; // time-control parameters, to be used by Search\r
MOVE move, ponderMove;\r
- int i, score;\r
+ int i, score, curVarNr;\r
char inBuf[8000], command[80];\r
\r
Init(V_CHU); // Chu\r
}\r
if(!strcmp(command, "protover")){\r
printf("feature ping=1 setboard=1 colors=0 usermove=1 memory=1 debug=1 sigint=0 sigterm=0\n");\r
- printf("feature variants=\"normal,chu,dai,tenjiku,12x12+0_fairy,9x9+0_shogi\"\n");\r
+ printf("feature variants=\"normal,shatranj,makruk,chu,dai,tenjiku,12x12+0_fairy,9x9+0_shogi\"\n");\r
printf("feature myname=\"HaChu " VERSION "\" highlight=1\n");\r
printf("feature option=\"Resign -check 0\"\n"); // example of an engine-defined option\r
printf("feature option=\"Contempt -spin 0 -200 200\"\n"); // and another one\r
continue;\r
}\r
if(!strcmp(command, "variant")) {\r
- for(i=0; i<5; i++) {\r
+ for(i=0; i<7; i++) {\r
sscanf(inBuf+8, "%s", command);\r
if(!strcmp(variants[i].name, command)) {\r
- Init(i); stm = Setup2(NULL); break;\r
+ Init(curVarNr = i); stm = Setup2(NULL); break;\r
}\r
}\r
continue;\r
if(!strcmp(command, "ping")) { printf("pong%s", inBuf+4); continue; }\r
// if(!strcmp(command, "")) { sscanf(inBuf, " %d", &); continue; }\r
if(!strcmp(command, "new")) {\r
- engineSide = BLACK; Init(V_CHESS); stm = Setup2(NULL); maxDepth = MAXPLY; randomize = OFF; comp = 0;\r
+ engineSide = BLACK; Init(V_CHESS); stm = Setup2(NULL); maxDepth = MAXPLY; randomize = OFF; curVarNr = comp = 0;\r
continue;\r
}\r
- if(!strcmp(command, "setboard")){ engineSide = NONE; Init(currentVariant); stm = Setup2(inBuf+9); continue; }\r
+ if(!strcmp(command, "setboard")){ engineSide = NONE; Init(curVarNr); stm = Setup2(inBuf+9); continue; }\r
if(!strcmp(command, "easy")) { ponder = OFF; continue; }\r
if(!strcmp(command, "hard")) { ponder = ON; continue; }\r
if(!strcmp(command, "undo")) { stm = TakeBack(1); continue; }\r
projects / hachu.git / blobdiff