// promotions by pieces with Lion power stepping in & out the zone in same turn\r
// promotion on capture\r
\r
-#define VERSION "0.16 k+ky"\r
+#define VERSION "0.18"\r
\r
-#define PATH level==0 /*|| path[0] == 0x3490a && (level==1 || path[1] == 0x285b3 && (level == 2 || path[2] == 0x8710f && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5)))))*/\r
-//define PATH 0\r
+//define PATH level==0 /*|| path[0] == 0x3490a && (level==1 || path[1] == 0x285b3 && (level == 2 || path[2] == 0x8710f && (level == 3 /*|| path[3] == 0x3e865 && (level == 4 || path[4] == 0x4b865 && (level == 5)))))*/\r
+#define PATH 0\r
\r
#define HASH\r
#define KILLERS\r
#define BSIZE BWMAX*BHMAX\r
#define ZONE zone\r
\r
-#define ONE (currentVariant == V_SHO || currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_MAKRUK)\r
+#define ONE 1 /* currently no variants with 10-deep board */\r
\r
#define BLACK 0\r
#define WHITE 1\r
} UndoInfo;\r
\r
char *array, fenArray[4000], startPos[4000], *reason, checkStack[300];\r
-int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws, tsume, pvCuts, allowRep, entryProm;\r
+int bWidth, bHeight, bsize, zone, currentVariant, chuFlag, tenFlag, chessFlag, repDraws, stalemate, tsume, pvCuts, allowRep, entryProm, pVal;\r
int stm, xstm, hashKeyH=1, hashKeyL=1, framePtr, msp, nonCapts, rootEval, filling, promoDelta;\r
int retMSP, retFirst, retDep, pvPtr, level, cnt50, mobilityScore;\r
int ll, lr, ul, ur; // corner squares\r
};\r
\r
PieceDesc chessPieces[] = {\r
- {"Q", "", 950, { X,X,X,X,X,X,X,X } },\r
+ {"FK", "", 950, { X,X,X,X,X,X,X,X } },\r
{"R", "", 500, { X,0,X,0,X,0,X,0 } },\r
{"B", "", 320, { 0,X,0,X,0,X,0,X } },\r
{"N", "", 300, { N,N,N,N,N,N,N,N } },\r
{"K", "", 280, { 1,1,1,1,1,1,1,1 } },\r
- {"P", "Q", 80, { M,C,0,0,0,0,0,C } },\r
+ {"P", "FK", 80, { M,C,0,0,0,0,0,C } },\r
+ { NULL } // sentinel\r
+};\r
+\r
+PieceDesc lionPieces[] = {\r
+ {"LN","", LVAL, { L,L,L,L,L,L,L,L } },\r
+ {"FK", "", 600, { X,X,X,X,X,X,X,X } },\r
+ {"R", "", 300, { X,0,X,0,X,0,X,0 } },\r
+ {"K", "", 280, { 1,1,1,1,1,1,1,1 } },\r
+ {"B", "", 190, { 0,X,0,X,0,X,0,X } },\r
+ {"N", "", 180, { N,N,N,N,N,N,N,N } },\r
+ {"P", "FK", 50, { M,C,0,0,0,0,0,C } },\r
{ NULL } // sentinel\r
};\r
\r
"....d......d..../pppppppppppppppp/:sm:vmr:hf:se:bg:rg:vg:gg:rg:bg:se:hfr:vm:sm/"\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 chessArray[] = "RNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnb:fkkbnr";\r
+char lionArray[] = "R:LNB:FKKBNR/PPPPPPPP/......../......../......../......../pppppppp/r:lnb:fkkbnr";\r
char shatArray[]= "RNBK:FKBNR/PPPPPPPP/......../......../......../......../pppppppp/rnbk:fkbnr";\r
-char thaiArray[]= "RNSK:SMSNR/......../PPPPPPPP/......../......../pppppppp/......../rnsk:smsnr";\r
+char thaiArray[]= "RNSK:SMSNR/......../PPPPPPPP/......../......../pppppppp/......../rns:smksnr";\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, V_SHATRANJ, V_MAKRUK } Variant;\r
+typedef enum { V_CHESS, V_SHO, V_CHU, V_DAI, V_DADA, V_MAKA, V_TAI, V_KYOKU, V_TENJIKU, V_SHATRANJ, V_MAKRUK, V_LION } Variant;\r
+\r
+#define SAME (-1)\r
\r
VariantDesc variants[] = {\r
- { 16, 8, 8, 1, V_CHESS, "normal", chessArray }, // FIDE\r
- { 18, 9, 9, 3, V_SHO, "9x9+0_shogi", shoArray }, // Sho\r
{ 24, 12, 12, 4, V_CHU, "chu", chuArray }, // Chu\r
+ { 16, 8, 8, 1, V_CHESS, "nocastle", chessArray }, // FIDE\r
+ { 18, 9, 9, 3, V_SHO, "9x9+0_shogi", shoArray }, // Sho\r
+ { 18, 9, 9, 3, V_SHO, "sho", shoArray }, // Sho duplicat\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
+ { 16, 8, 8, 1, V_LION, "lion", lionArray}, // Mighty Lion\r
\r
-// { 0, 0, 0, 0, 0 }, // sentinel\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
{ 50, 25, 25, 0, V_TAI, "tai", chuArray }, // Tai\r
return ListLookUp(name, shatranjPieces);\r
case V_MAKRUK: // Makruk\r
return ListLookUp(name, makrukPieces);\r
+ case V_LION: // Mighty Lion\r
+ return ListLookUp(name, lionPieces);\r
}\r
return NULL;\r
}\r
Init (int var)\r
{\r
int i, j, k;\r
+ PieceDesc *pawn;\r
\r
+ if(var != SAME) { // the following should be already set if we stay in same variant (for TakeBack)\r
currentVariant = variants[var].varNr;\r
bWidth = variants[var].boardWidth;\r
bHeight = variants[var].boardRanks;\r
zone = variants[var].zoneDepth;\r
array = variants[var].array;\r
+ }\r
bsize = bWidth*bHeight;\r
- chuFlag = (currentVariant == V_CHU);\r
+ chuFlag = (currentVariant == V_CHU || currentVariant == V_LION);\r
tenFlag = (currentVariant == V_TENJIKU);\r
- chessFlag = (currentVariant == V_CHESS);\r
- repDraws = (currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_MAKRUK);\r
+ chessFlag = (currentVariant == V_CHESS || currentVariant == V_LION);\r
+ stalemate = (currentVariant == V_CHESS || currentVariant == V_MAKRUK || currentVariant == V_LION);\r
+ repDraws = (stalemate || currentVariant == V_SHATRANJ);\r
ll = 0; lr = bHeight - 1; ul = (bHeight - 1)*bWidth; ur = ul + bHeight - 1;\r
+ pawn = LookUp("P", currentVariant); pVal = pawn ? pawn->value : 0; // get Pawn value\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) && chessFlag && promoBoard[x-v])\r
+ if(!NewNonCapture(x, x+v, pFlag) && chessFlag && promoBoard[x-v] & LAST_RANK)\r
NewNonCapture(x, x+2*v, pFlag), moveStack[msp-1] |= DEFER; // use promoSuppress flag as e.p. flag\r
}\r
continue;\r
\r
if(p[u->piece].promoFlag & LAST_RANK) cnt50 = 0; // forward piece: move is irreversible\r
// TODO: put in some test for forward moves of non-backward pieces?\r
+// int n = board[promoSuppress-1];\r
+// if( n != EMPTY && (n&TYPE) == xstm && p[n].value == 8 ) NewNonCapt(promoSuppress-1, 16, 0);\r
\r
if(p[u->piece].value == FVAL) { // move with Fire Demon\r
int i, f=~fireFlags[u->piece-2];\r
int\r
Search (int alpha, int beta, int difEval, int depth, int lmr, int oldPromo, int promoSuppress, int threshold)\r
{\r
- int i, j, k, phase, king, nextVictim, to, defer, autoFail=0, inCheck = 0, late=100000;\r
+ int i, j, k, phase, king, nextVictim, to, defer, autoFail=0, inCheck = 0, late=100000, ep;\r
int firstMove, oldMSP = msp, curMove, sorted, bad, dubious, bestMoveNr;\r
int resDep, iterDep, ext;\r
int myPV = pvPtr;\r
if(PATH) printf("# autofail end (%d-%d)\n", firstMove, msp);\r
autoFail = 0; curMove = firstMove - 1; continue; // release stashed moves for search\r
}\r
-// if(currentVariant == V_CHESS && promoSuppress != ABSENT) { // e.p.\r
-// int n = board[promoSuppress-1];\r
-// if( n != EMPTY && (n&TYPE) == xstm && p[n].value == 8 ) \r
-// }\r
phase = 4; // out of victims: all captures generated\r
+ if(chessFlag && (ep = promoSuppress & SQUARE) != ABSENT) { // e.p. rights. Create e.p. captures as Lion moves\r
+ int n = board[ep-1], old = msp; // a-side neighbor of pushed pawn\r
+ if( n != EMPTY && (n&TYPE) == stm && p[n].value == pVal ) NewCapture(ep-1, SPECIAL + 20 - 4*stm, 0);\r
+ n = board[ep+1]; // h-side neighbor of pushed pawn\r
+ if( n != EMPTY && (n&TYPE) == stm && p[n].value == pVal ) NewCapture(ep+1, SPECIAL + 52 - 4*stm, 0);\r
+ if(msp != old) goto extractMove; // one or more e.p. capture were generated\r
+ }\r
case 4: // dubious captures\r
#if 0\r
while( dubious < framePtr + 250 ) // add dubious captures back to move stack\r
if(lmr && bestScore <= alpha && iterDep == depth)\r
depth++, lmr--; // self-deepen on fail-low reply to late move by lowering reduction\r
#endif\r
+ if(stalemate && bestScore == -INF && !inCheck) bestScore = 0; // stalemate\r
#ifdef HASH\r
// hash store\r
hashTable[index].lock[hit] = hashKeyH;\r
sup2 = sup1; sup1 = sup0;\r
}\r
\r
-char fenNames[] = "RV....DKDEFL..DHGB......SMLNKN..FK....BT..VM..PH...."; // pairs of char\r
+char fenNames[] = "RV....DKDEFL..DHGB......SMLNKN..FK....BT..VM..PH..LN"; // pairs of char\r
char fenPromo[] = "WLDHSMSECPB R HFDE....WHFB..LNG ..DKVMFS..FO..FK...."; // pairs of char\r
\r
char *\r
if(n=atoi(fen)) fen++; // digits read\r
if(n > 9) fen++; // double digit\r
while(n-- > 0) *p++ = '.'; // expand to empty squares\r
+ if(currentVariant == V_LION && (*fen == 'L' || *fen == 'l')) *fen += 'Z' - 'L'; // L in Mighty-Lion Chess changed in Z for Lion\r
if(isalpha(*fen)) {\r
char *table = fenNames;\r
n = *fen > 'Z' ? 'a' - 'A' : 0;\r
- if((currentVariant == V_CHESS || currentVariant == V_SHATRANJ ||\r
+ if((currentVariant == V_CHESS || currentVariant == V_SHATRANJ || currentVariant == V_LION ||\r
currentVariant == V_MAKRUK || currentVariant == V_SHO) && *fen - n == 'N' // In Chess N is Knight, not Lion\r
|| table[2* (*fen - 'A' - n)] == '.') *p++ = *fen; else {\r
*p++ = ':';\r
for(j=0; j<8; j++) if(e + kStep[j] == t) break;\r
if(j >= 8) return INVALID; // this rejects Lion Dog 1+2 moves!\r
t2 = SPECIAL + 8*i + j;\r
+ } else if(chessFlag && board[f] != EMPTY && p[board[f]].value == pVal && board[t] == EMPTY) { // Pawn to empty, could be e.p.\r
+ if(t == f + BW + 1) t2 = SPECIAL + 16; else\r
+ if(t == f + BW - 1) t2 = SPECIAL + 48; else\r
+ if(t == f - BW + 1) t2 = SPECIAL + 20; else\r
+ if(t == f - BW - 1) t2 = SPECIAL + 52; // fake double-move\r
}\r
ret = f<<SQLEN | t2;\r
if(*moveText != '\n' && *moveText != '=') ret |= PROMOTE;\r
{ // reset the game and then replay it to the desired point\r
int last, stm;\r
last = moveNr - n; if(last < 0) last = 0;\r
- Init(currentVariant); stm = Setup2(startPos);\r
+ Init(SAME); stm = Setup2(startPos);\r
printf("# setup done");fflush(stdout);\r
for(moveNr=0; moveNr<last; moveNr++) stm = MakeMove2(stm, gameMove[moveNr]),printf("make %2d: %x\n", moveNr, gameMove[moveNr]);\r
return stm;\r
engineSide = NONE; // so stop playing\r
PrintResult(stm, score);\r
} else {\r
+ MOVE f, pMove = move;\r
+ if((move & SQUARE) >= SPECIAL && p[board[f = move>>SQLEN & SQUARE]].value == pVal) { // e.p. capture\r
+ pMove = move & ~SQUARE | f + toList[(move & SQUARE) - SPECIAL]; // print as a single move\r
+ }\r
stm = MakeMove2(stm, move); // assumes MakeMove returns new side to move\r
gameMove[moveNr++] = move; // remember game\r
- printf("move %s\n", MoveToText(move, 1));\r
+ printf("move %s\n", MoveToText(pMove, 1));\r
listEnd = 0;\r
continue; // go check if we should ponder\r
}\r
continue;\r
}\r
if(!strcmp(command, "protover")){\r
+ for(i=0; variants[i].boardWidth; i++)\r
+ printf("%s%s", (i ? "," : "feature variants=\""), variants[i].name); printf("\"\n");\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,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=\"Full analysis PV -check 1\"\n"); // example of an engine-defined option\r
printf("feature option=\"Allow repeats -check 0\"\n");\r
continue;\r
}\r
if(!strcmp(command, "variant")) {\r
- for(i=0; i<7; i++) {\r
+ for(i=0; variants[i].boardWidth; i++) {\r
sscanf(inBuf+8, "%s", command);\r
if(!strcmp(variants[i].name, command)) {\r
Init(curVarNr = i); stm = Setup2(NULL); break;\r
}\r
}\r
+ if(currentVariant == V_SHO)\r
+ printf("setup (PNBRLSE..G.+++++++Kpnbrlse..g.+++++++k) 9x9+0_shogi lnsgkgsnl/1r2e2b1/ppppppppp/9/9/9/PPPPPPPPP/1B2E2R1/LNSGKGSNL w 0 1\n");\r
repStack[199] = hashKeyH, checkStack[199] = 0;\r
continue;\r
}\r
projects / hachu.git / blobdiff