X-Git-Url: http://winboard.nl/cgi-bin?p=bonanza.git;a=blobdiff_plain;f=proce.c;h=81707f9b4a67a397251c1e79d72ee43800feb9e5;hp=3de4d5e48deecf669d904c402d3c0e421ddbd0fa;hb=cygwin;hpb=6186adc13f7366b1ad78355b2693f2fa8269dd9e diff --git a/proce.c b/proce.c index 3de4d5e..81707f9 100644 --- a/proce.c +++ b/proce.c @@ -58,7 +58,7 @@ static int CONV cmd_thread( char **lasts ); #endif #if defined(MPV) -static int CONV cmd_mpv( char **lasts ); +static int CONV cmd_mpv( tree_t * restrict ptree, char **lasts ); #endif #if defined(DFPN) @@ -92,6 +92,10 @@ static int CONV cmd_read( tree_t * restrict ptree, char **lasts ); static int CONV cmd_resign( tree_t * restrict ptree, char **lasts ); static int CONV cmd_undo( tree_t * restrict ptree ); // [HGM] undo static int CONV cmd_time( char **lasts ); +static int CONV cmd_undo( tree_t * restrict ptree ); // [HGM] undo +static int CONV cmd_analyze( tree_t * restrict ptree ); // [HGM] analyze +static int CONV cmd_inex( tree_t * restrict ptree, int inex, char **last ); // [HGM] exclude +static int CONV cmd_exit( void ); int CONV is_move( const char *str ) @@ -125,12 +129,131 @@ procedure( tree_t * restrict ptree ) char *start_pos, start_data[512]; // [HGM] undo: for remembering start position int move_list[1024], move_ptr; +char analyze_mode; +int all_moves[MAX_LEGAL_MOVES]; #ifdef XBOARD #define IF(X) else if(!strcmp(command, X)) int myTime, hisTime, movesPerSession, inc, plyNr; char xboard_mode; +int root_pos[nsquare]; + +int +bonanza_piece( char p ) +{ + int piece = 0; + if(p >= 'a') p += 'A' - 'a'; + switch(p) { // encode piece + case 'P': piece = pawn; break; + case 'L': piece = lance; break; + case 'N': piece = knight; break; + case 'S': piece = silver; break; + case 'G': piece = gold; break; + case 'B': piece = bishop; break; + case 'R': piece = rook; break; + case 'K': piece = king; break; + } + return piece; +} + +void +read_fen( char *p ) +{ + static char fen[128]; + int r, f, gote = 1; + char *q = fen, *start = p; + strncpy( fen, p+9 , 127); + strcpy( p, "new SU" ); p += 6; + for ( r = 1; r <= 9; r++) { + for ( f = 0; *q; q++ ) { + int promoted = 0; + if( *q == '+' ) promoted = promote, q++; + if( isdigit( *q ) ) f += atoi( q ); else + if( isalpha( *q ) ) { + int piece = bonanza_piece( *q ); + if( ( *q >= 'a' && *q <= 'z' ) != gote ) { + gote = !gote; // switch color + *p++ = ( gote ? '-' : '+' ); + } + sprintf( p, "%d%d%s", 9-f, r, astr_table_piece[piece + promoted] ); + p += 4; f++; + } else { q++; break; } + } + } + while( q[-1] == ' ' ) q++; + if( q[-1] == '[' ) { // holdings + while( isalpha( *q ) ) { + int piece = bonanza_piece( *q ); + if( ( *q >= 'a' && *q <= 'z' ) != gote ) { + gote = !gote; // switch color + *p++ = ( gote ? '-' : '+' ); + } + sprintf( p, "00%s", astr_table_piece[piece] ); + p += 4; q++; + } + if( *q == '-' ) q++; + if( *q == ']' ) q++; + while( *q == ' ' ) q++; + } else q--; + sprintf(p, " %c", *q == 'w' ? '+' : '-' ); // side to move +} + +void +xboard_to_CSA( tree_t * restrict ptree, char *in, char *out ) +{ + char fromX=in[0], fromY=in[1], toX=in[2], toY=in[3], promo=in[4]; + int piece=0; + if(fromY == '@') { // drop (contains all info needed to convert it) + piece = bonanza_piece( fromX ); + sprintf(out, "00%c%c%s", 'a'+'9'-toX, '1'+'9'-toY, astr_table_piece[piece]); + } else { // board move (need to figure out moved piece) + int from = ('9' - fromY)*9 + (fromX - 'a'); + int flag = (promo == '+' ? FLAG_PROMO : 0); + piece = abs( BOARD[from] ); // this only works when no search in progress! +printf("# piece from board: %d\n", piece);fflush(stdout); + if( game_status & flag_thinking ) { + int i, to = ('9' - toY)*9 + (toX - 'a'); + piece = 0; // kludge to force illegal CSA move + for( i = 0; i < root_nmove; i++ ) { // determine the piece from the move list + int move = root_move_list[i].move; + if( I2To(move) != to ) continue; + if( I2From(move) != from ) continue; + if( (move & FLAG_PROMO) != flag ) continue; + piece = I2PieceMove( move ); // we found the move; take the piece from it + break; + } + } else if( game_status & ( flag_pondering | flag_puzzling ) ) piece = abs( root_pos[from] ); // we have valid copy! +printf("# piece corrected to %d\n", piece);fflush(stdout); + if( promo == '+') piece += promote; + sprintf(out, "%c%c%c%c%s", 'a'+'9'-fromX, '1'+'9'-fromY, 'a'+'9'-toX, '1'+'9'-toY, astr_table_piece[piece]); + } +} + +static void +update_exclude_list( tree_t * restrict ptree, int add, unsigned int move ) +{ // [HGM] exclude: manage list of excluded moves + int i; + if( moves_ignore[0] == MOVE_NA ) { // nothing is excluded yet; make a copy of root move list; + for( i = 0; i < root_nmove; i++) all_moves[i] = root_move_list[i].move; + all_moves[i] = MOVE_NA; + } + if ( move == MOVE_NA ) { // all moves + if( add ) { // copy entire list of legal moves + for( i = 0; i < root_nmove; i++ ) moves_ignore[i] = all_moves[i]; + } else moves_ignore[0] = MOVE_NA; // clear list + } else { // single move + for( i = 0; moves_ignore[i] != MOVE_NA; i++ ) if( move == moves_ignore[i] ) break; + if( add ) { // we must add the move + if( moves_ignore[i] != MOVE_NA ) return; // but it was already in list + if( i >= MAX_LEGAL_MOVES - 2 ) return; // overflow + moves_ignore[i] = move; moves_ignore[i+1] = MOVE_NA; // append move + } else { // we must delete the move + if( moves_ignore[i] == MOVE_NA ) return; // but it was not there + while( (moves_ignore[i] = moves_ignore[i+1]) ) i++; // squeeze it out + } + } +} static void SetTimes(void) @@ -156,8 +279,14 @@ proce_xboard(char *line, const char *command, tree_t * restrict ptree) sscanf(line + strlen(command) + 1, "%d", &value); Out("# command = '%s'\n", line); if(0) ; - IF("protover") { Out("feature variants=\"shogi\" usermove=1 myname=\"Bonanza " BNZ_VER - "\" memory=1 smp=1 debug=1 colors=0 setboard=1 ping=1 done=1\n"); } + IF("protover") { +#if defined(MPV) + Out("feature option=\"MultiPV -spin 1 1 100\"\n"); + Out("feature option=\"centi-Pawn margin -spin 200 0 25000\"\n"); +#endif + Out("feature variants=\"shogi\" usermove=1 myname=\"Bonanza " BNZ_VER + "\" memory=1 smp=1 debug=1 colors=0 setboard=1 ping=1 sigint=0 exclude=1 done=1\n"); + } IF("new") { forceMode = plyNr = 0; SetTimes(); return 0; } IF("easy") { strcpy(line, "ponder off"); return 0; } IF("hard") { strcpy(line, "ponder on"); return 0; } @@ -167,49 +296,36 @@ Out("# command = '%s'\n", line); IF("otim") { sscanf(line+5, "%d", &hisTime); } IF("force") { forceMode = 1; } IF("go") { forceMode = 0; SetTimes(); plyNr++; strcpy(line, "move"); return 0; } - IF("memory") { ; } + IF("memory") { sprintf(line, "hash %d", value); return 0; } IF("cores") { sprintf(line, "tlp num %d", value); return 0; } IF("sd") { sprintf(line, "limit depth %d", value); return 0; } IF("st") { ; } IF("quit") { return 0; } - IF("analyze") { ; } - IF("exit") { ; } + IF("analyze") { return 0; } + IF("exit") { return 0; } IF("variant") { /* ignore, since it must be Shogi */; } - IF("setboard") { ; } - IF("option") { ; } + IF("setboard") { forceMode = 1; plyNr = 0; read_fen( line ); return 0; } + IF("option") { + if(sscanf(line+7, "MultiPV=%d", &value) == 1) { sprintf(line, "mpv num %d", value); return 0; } + if(sscanf(line+7, "centi-Pawn margin=%d", &value) == 1) { sprintf(line, "mpv width %d", value); return 0; } + } IF("level") { int min, sec; float fsec=0.; if(sscanf(line+6, "%d %d:%d %f", &movesPerSession, &min, &sec, &fsec) != 4) sscanf(line+6, "%d %d %f", &movesPerSession, &min, &fsec); min = 60*min + sec; myTime = hisTime = 100*min; inc = 100 * fsec; } - IF("usermove") { char fromX=line[9], fromY=line[10], toX=line[11], toY=line[12], promo=line[13]; - int from; -{int i,j;for(i=0;i<81;i+=9){printf("# ");for(j=0;j<9;j++)printf(" %3d", BOARD[i+j]);printf("\n");}} - if(forceMode) strcpy(line, "move "), line += 5; else plyNr++, SetTimes(); - if(fromY == '@') { // drop - if(fromX >= 'a') fromX += 'A' - 'a'; - switch(fromX) { // encode piece - case 'P': fromX = pawn; break; - case 'L': fromX = lance; break; - case 'N': fromX = knight; break; - case 'S': fromX = silver; break; - case 'G': fromX = gold; break; - case 'B': fromX = bishop; break; - case 'R': fromX = rook; break; - } - sprintf(line, "00%c%c%s", 'a'+'9'-toX, '1'+'9'-toY, astr_table_piece[(int)fromX]); - } else { - from = ('9' - fromY)*9 + (fromX - 'a'); -Out("# from=%d\n",from); - sprintf(line, "%c%c%c%c%s", 'a'+'9'-fromX, '1'+'9'-fromY, 'a'+'9'-toX, '1'+'9'-toY, - astr_table_piece[abs(BOARD[from]) + (promo == '+' ? promote : 0)]); - } + IF("usermove") { char buf[20]; + xboard_to_CSA( ptree, line+9, buf ); + if(forceMode || analyze_mode) strcpy(line, "move "), line += 5; else plyNr++, SetTimes(); + strcpy( line, buf ); plyNr++; return 0; } - IF("undo") { ; } + IF("undo") { return 0; } IF("remove") { ; } IF("ping") { Out("pong %d\n", value); } + IF("exclude") { xboard_to_CSA( ptree, line+8, line+8 ); line[7] = ' '; return 0; } + IF("include") { xboard_to_CSA( ptree, line+8, line+8 ); line[7] = ' '; return 0; } return 1; } #endif @@ -232,7 +348,16 @@ static int CONV proce_cui( tree_t * restrict ptree ) if ( ! strcmp( token, "xboard" ) ) { xboard_mode = 1; game_status |= flag_noprompt; return 1; } } #endif + if ( ! strcmp( token, "analyze" ) ) { return cmd_analyze( ptree ); } // [HGM] analyze + if ( ! strcmp( token, "exit" ) ) { return cmd_exit(); } // [HGM] analyze + if ( ! strcmp( token, "move" ) ) { return cmd_move( ptree, &last ); } if ( ! strcmp( token, "undo" ) ) { return cmd_undo( ptree ); } // [HGM] undo + if ( ! strcmp( token, "include" ) ) { return cmd_inex( ptree , 0, &last); } // [HGM] exclude + if ( ! strcmp( token, "exclude" ) ) { return cmd_inex( ptree , 1, &last); } // [HGM] exclude +#if defined(MPV) + if ( ! strcmp( token, "mpv" ) ) { return cmd_mpv( ptree, &last ); } +#endif + analyze_mode = 0; // [HGM] analyze: all other commands terminate analysis if ( is_move( token ) ) { return cmd_usrmove( ptree, token, &last ); } if ( ! strcmp( token, "s" ) ) { return cmd_move_now(); } if ( ! strcmp( token, "beep" ) ) { return cmd_beep( &last); } @@ -240,7 +365,6 @@ static int CONV proce_cui( tree_t * restrict ptree ) if ( ! strcmp( token, "display" ) ) { return cmd_display( ptree, &last ); } if ( ! strcmp( token, "hash" ) ) { return cmd_hash( &last ); } if ( ! strcmp( token, "limit" ) ) { return cmd_limit( &last ); } - if ( ! strcmp( token, "move" ) ) { return cmd_move( ptree, &last ); } if ( ! strcmp( token, "new" ) ) { return cmd_new( ptree, &last ); } if ( ! strcmp( token, "outmove" ) ) { return cmd_outmove( ptree ); } if ( ! strcmp( token, "peek" ) ) { return cmd_peek( &last ); } @@ -261,9 +385,6 @@ static int CONV proce_cui( tree_t * restrict ptree ) #if defined(MNJ_LAN) if ( ! strcmp( token, "mnj" ) ) { return cmd_mnj( &last ); } #endif -#if defined(MPV) - if ( ! strcmp( token, "mpv" ) ) { return cmd_mpv( &last ); } -#endif #if defined(DFPN) if ( ! strcmp( token, "dfpn" ) ) { return cmd_dfpn( ptree, &last ); } #endif @@ -503,6 +624,23 @@ cmd_mnjmove( tree_t * restrict ptree, char **lasts, int num_alter ) static int CONV +do_analyze( tree_t * restrict ptree ) +{ // [HGM] analyze: do a ponder search on the current position + int iret; + if ( get_elapsed( &time_start ) < 0 ) { return -1; } + time_limit = time_max_limit = 1e9; // kludge: use huge time to mimic infinity +#ifdef XBOARD + if(xboard_mode) Out("1 0 0 0 New Search\n"); // make sure lower depth is emitted, so XBoard undestand new search started + for( iret = 0; iret < nsquare; iret++ ) root_pos[iret] = BOARD[iret]; +#endif + game_status |= flag_pondering; + iret = iterate( ptree ); + game_status &= ~flag_pondering; + return iret; +} + + +static int CONV cmd_undo( tree_t * restrict ptree ) { // [HGM] undo: restart the game, and feed all moves except the last int i, last = move_ptr; @@ -519,6 +657,59 @@ cmd_undo( tree_t * restrict ptree ) for(i=0; i= 1 && *ptr == '\0' ) { + if ( analyze_mode ) // [HGM] analyze: in analysis mode we cannot set the engine thinking + { + str_error = str_bad_cmdline; + return -2; + } + for ( i = 0; i < l; i += 1 ) { if ( game_status & ( flag_move_now | mask_game_end ) ) { break; } @@ -1447,6 +1650,9 @@ static int CONV cmd_move( tree_t * restrict ptree, char **lasts ) str = strtok_r( NULL, str_delimiters, lasts ); } while ( str != NULL ); + + moves_ignore[0] = MOVE_NA; // [HGM] exclude: exclude list cleared for new position + if ( analyze_mode ) return do_analyze ( ptree ); // [HGM] analyze: analysis should continue after feeding moves return 1; } @@ -1463,6 +1669,7 @@ static int CONV cmd_new( tree_t * restrict ptree, char **lasts ) AbortDifficultCommand; start_pos = *lasts; move_ptr = 0; // [HGM] undo: remember start position + moves_ignore[0] = MOVE_NA; // [HGM] exclude: exclude list cleared for new position if ( str1 != NULL ) { @@ -1809,7 +2016,7 @@ static int CONV cmd_learn( tree_t * restrict ptree, char **lasts ) #if defined(MPV) -static int CONV cmd_mpv( char **lasts ) +static int CONV cmd_mpv( tree_t * restrict ptree, char **lasts ) { const char *str = strtok_r( NULL, str_delimiters, lasts ); char *ptr; @@ -1839,6 +2046,8 @@ static int CONV cmd_mpv( char **lasts ) mpv_num = (int)l; + if ( analyze_mode ) return do_analyze ( ptree ); // [HGM] analyze: analysis should continue changing num + return 1; } else if ( ! strcmp( str, "width" ) ) @@ -1860,6 +2069,8 @@ static int CONV cmd_mpv( char **lasts ) mpv_width = (int)l; + if ( analyze_mode ) return do_analyze ( ptree ); // [HGM] analyze: analysis should continue after changing width + return 1; }