X-Git-Url: http://winboard.nl/cgi-bin?p=bonanza.git;a=blobdiff_plain;f=proce.c;h=e94c97333255ae6aae860297e85f6cb9e0983140;hp=94db5d08fb1a5388133d262205926dea840bfae2;hb=68fbef80b4cff5f70326d9c3136ca90ad524fce1;hpb=a443e15a4089569770ff5bf4ed543c2c6199a900 diff --git a/proce.c b/proce.c index 94db5d0..e94c973 100644 --- a/proce.c +++ b/proce.c @@ -52,7 +52,7 @@ static int cmd_thread( char **lasts ); #endif #if defined(MPV) -static int cmd_mpv( char **lasts ); +static int cmd_mpv( tree_t * restrict ptree, char **lasts ); #endif static int proce_cui( tree_t * restrict ptree ); @@ -74,6 +74,9 @@ static int cmd_new( tree_t * restrict ptree, char **lasts ); static int cmd_read( tree_t * restrict ptree, char **lasts ); static int cmd_resign( tree_t * restrict ptree, char **lasts ); static int cmd_time( char **lasts ); +static int cmd_undo( tree_t * restrict ptree ); // [HGM] undo +static int cmd_analyze( tree_t * restrict ptree ); // [HGM] analyze +static int cmd_exit( void ); static int is_move( const char *str ); @@ -90,11 +93,55 @@ procedure( tree_t * restrict ptree ) return proce_cui( ptree ); } +char *start_pos, start_data[512]; // [HGM] undo: for remembering start position +int move_list[1024], move_ptr; + #ifdef XBOARD #define IF(X) else if(!strcmp(command, X)) int myTime, hisTime, movesPerSession, inc, plyNr; char xboard_mode; +char analyze_mode; + +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) + if(fromX >= 'a') fromX += 'A' - 'a'; + switch(fromX) { // 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; + } + 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 not searching! +printf("# piece from board: %d\n", piece);fflush(stdout); + if( game_status & ( flag_pondering | flag_puzzling | 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; + } +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 SetTimes(void) @@ -120,8 +167,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 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; } @@ -136,41 +189,27 @@ Out("# command = '%s'\n", line); 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("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)]); - } - plyNr++; return 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); } return 1; @@ -196,6 +235,14 @@ 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 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); } @@ -203,7 +250,6 @@ 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, "peek" ) ) { return cmd_peek( &last ); } if ( ! strcmp( token, "ping" ) ) { return cmd_ping(); } @@ -223,9 +269,6 @@ proce_cui( tree_t * restrict ptree ) #if defined(DEKUNOBOU) if ( ! strcmp( token, "dekunobou" ) ) { return cmd_dek( &last ); } #endif -#if defined(MPV) - if ( ! strcmp( token, "mpv" ) ) { return cmd_mpv( &last ); } -#endif #if defined(TLP) if ( ! strcmp( token, "tlp" ) ) { return cmd_thread( &last ); } #endif @@ -385,6 +428,71 @@ cmd_mnjmove( tree_t * restrict ptree, char **lasts, int is_alter ) static int +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 + Out("1 0 0 0 New Search\n"); // make sure lower depth is emitted, so XBoard undestand new search started +#endif + game_status |= flag_pondering; + iret = iterate( ptree, 0 ); + game_status &= ~flag_pondering; + return iret; +} + + +static int +cmd_undo( tree_t * restrict ptree ) +{ // [HGM] undo: restart the game, and feed all moves except the last + int i, last = move_ptr; + char *p = start_data; + if( move_ptr <= 0 ) { + str_error = "undo past start of game ignored"; + return -2; + } + + AbortDifficultCommand; + + last--; + cmd_new( ptree, &p ); + for(i=0; i