From 1e0b1da6687c3fd65817bdab4002b5f509810481 Mon Sep 17 00:00:00 2001 From: H.G. Muller Date: Fri, 13 Sep 2013 19:37:59 +0200 Subject: [PATCH] Make multi-PV mode accessible from XBoard protocol Multi-PV mode uses another routine for printing the PVs, which had to be adapted. In native mode Bonanza repeats all PVs all the time; in XBoard mode it suppresses printing of all but the latest. Option features were added to set number of PVs and margin. --- Makefile | 2 +- proce.c | 29 +++++++++++++++++++++-------- searchr.c | 56 ++++++++++++++++++++++++++++++++++++++------------------ 3 files changed, 60 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index ddc50f0..4e89e6f 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ OBJS =data.o main.o io.o proce.o utility.o ini.o attack.o book.o makemove.o \ # -DMNJ_LAN enables a client-mode of cluster computing. # -DNO_LOGGING suppresses dumping log files. -OPT =-DNDEBUG -DMINIMUM -DTLP -DCSA_LAN -DMNJ_LAN -DXBOARD +OPT =-DNDEBUG -DMINIMUM -DTLP -DCSA_LAN -DMNJ_LAN -DXBOARD -DMPV help: @echo "try targets as:" diff --git a/proce.c b/proce.c index 0f9223c..0a6df1a 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 ); @@ -127,8 +127,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 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; } @@ -147,7 +153,10 @@ Out("# command = '%s'\n", line); 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); @@ -208,6 +217,9 @@ proce_cui( tree_t * restrict ptree ) 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(); } @@ -235,9 +247,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 @@ -1537,7 +1546,7 @@ cmd_learn( tree_t * restrict ptree, char **lasts ) #if defined(MPV) static int -cmd_mpv( char **lasts ) +cmd_mpv( tree_t * restrict ptree, char **lasts ) { const char *str = strtok_r( NULL, str_delimiters, lasts ); char *ptr; @@ -1567,6 +1576,8 @@ 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" ) ) @@ -1588,6 +1599,8 @@ 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; } diff --git a/searchr.c b/searchr.c index 5484e16..f82ee69 100644 --- a/searchr.c +++ b/searchr.c @@ -13,7 +13,7 @@ static int mpv_set_bound( int alpha ); static int mpv_find_min( int *pnum ); static int mpv_add_result( tree_t * restrict ptree, int value ); static void mpv_sub_result( unsigned int move ); -static void mpv_out( tree_t * restrict ptree, int turn, unsigned int time ); +static void mpv_out( tree_t * restrict ptree, int turn, unsigned int time, int newest ); #endif #if defined(NO_STDOUT) && defined(NO_LOGGING) @@ -218,6 +218,21 @@ searchr( tree_t * restrict ptree, int alpha, int beta, int turn, int depth ) } +#ifdef XBOARD +void +out_xboard_move( int move, int tt ) +{ + int from = I2From(move), to = I2To(move); + char inPromoZone = tt > 0 ? from >= 6*9 || to >= 6*9 : to < 3*9|| from < 3*9; + if(from >= nsquare) + Out(" %c@%c%c", "PLNSGBR"[From2Drop(from)-1], 'a'+to%9, '9'-to/9); + else + Out(" %c%c%c%c%s", 'a'+from%9, '9'-from/9, 'a'+to%9, '9'-to/9, + inPromoZone ? I2IsPromote(move) ? "+" : "=" : ""); +} +#endif + + void out_pv( tree_t * restrict ptree, int value, int turn, unsigned int time ) { @@ -261,13 +276,7 @@ out_pv( tree_t * restrict ptree, int value, int turn, unsigned int time ) { #ifdef XBOARD if(xboard_mode && is_out) { // print PV move in WB format - int move = ptree->pv[0].a[ply], from = I2From(move), to = I2To(move); - char inPromoZone = tt > 0 ? from >= 6*9 || to >= 6*9 : to < 3*9|| from < 3*9; - if(from >= nsquare) - Out(" %c@%c%c", "PLNSGBR"[From2Drop(from)-1], 'a'+to%9, '9'-to/9); - else - Out(" %c%c%c%c%s", 'a'+from%9, '9'-from/9, 'a'+to%9, '9'-to/9, - inPromoZone ? I2IsPromote(move) ? "+" : "=" : ""); + out_xboard_move( ptree->pv[0].a[ply], tt ); } else #endif if ( is_out ) @@ -307,13 +316,7 @@ out_pv( tree_t * restrict ptree, int value, int turn, unsigned int time ) #ifdef XBOARD if(xboard_mode && is_out) { // print PV move in WB format - int move = ptree->pv[0].a[ply], from = I2From(move), to = I2To(move); - char inPromoZone = tt > 0 ? from >= 6*9 || to >= 6*9 : to < 3*9|| from < 3*9; - if(from >= nsquare) - Out(" %c@%c%c", "PLNSGBR"[From2Drop(from)-1], 'a'+to%9, '9'-to/9); - else - Out(" %c%c%c%c%s", 'a'+from%9, '9'-from/9, 'a'+to%9, '9'-to/9, - inPromoZone ? I2IsPromote(move) ? "+" : "=" : ""); + out_xboard_move( ptree->pv[0].a[ply], tt ); } else #endif if ( is_out ) @@ -475,7 +478,7 @@ find_root_move( unsigned int move ) #if defined(MPV) static void -mpv_out( tree_t * restrict ptree, int turn, unsigned int time ) +mpv_out( tree_t * restrict ptree, int turn, unsigned int time, int newest ) { int mpv_out, ipv, best; @@ -512,12 +515,23 @@ mpv_out( tree_t * restrict ptree, int turn, unsigned int time ) str = str_time_symple( time ); ply = mpv_pv[ipv].depth; +#ifdef XBOARD + if(xboard_mode) { + if(ipv != newest) continue; // skip all but the newest, to prevent duplicates + Out("%2d %6d %6d %8d ", ply, value, time/10, 1); + } else +#endif if ( ! ipv ) { Out( "o%2d %6s %7.2f ", ply, str, dvalue ); } else { Out( " %2d %7.2f ", ply, dvalue ); } } for ( ply = 1; ply <= mpv_pv[ipv].length; ply++ ) { +#ifdef XBOARD + if(xboard_mode && is_out) { // print PV move in WB format + out_xboard_move( mpv_pv[ipv].a[ply], tt ); + } else +#endif if ( is_out ) { if ( ply > 1 && ! ( (ply-1) % 4 ) ) @@ -555,6 +569,11 @@ mpv_out( tree_t * restrict ptree, int turn, unsigned int time ) if ( mpv_pv[ipv].a[i] == mpv_pv[ipv].a[ply] ) { goto rep_esc; } +#ifdef XBOARD + if(xboard_mode && is_out) { // print PV move in WB format + out_xboard_move( mpv_pv[ipv].a[ply], tt ); + } else +#endif if ( is_out ) { if ( ply > 1 && ! ( (ply-1) % 4 ) ) @@ -648,7 +667,7 @@ mpv_add_result( tree_t * restrict ptree, int value ) { pv_t pv_tmp, pv; unsigned int time; - int i, vmin, num; + int i, vmin, num, new_pv; vmin = mpv_find_min( &num ); assert( num <= mpv_num ); @@ -693,6 +712,7 @@ mpv_add_result( tree_t * restrict ptree, int value ) pv = ptree->pv[1]; pv.a[0] = (unsigned int)(value+32768); + new_pv = i; // [HGM] xboard: remember which is the new one, so we can print only that do { assert( i < mpv_num*2 ); assert( i < root_nmove*2 ); @@ -704,7 +724,7 @@ mpv_add_result( tree_t * restrict ptree, int value ) if ( get_elapsed( &time ) < 0 ) { return -1; } - mpv_out( ptree, root_turn, time - time_start ); + mpv_out( ptree, root_turn, time - time_start, new_pv ); return 1; } -- 1.7.0.4