X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=af121d6575a953ca0267ead9358076e266aa3560;hb=7ef586926e86b7f85eecb71c65577eb782800f93;hp=0a45777b203157358ea173854990814effbc2619;hpb=785add20d12515513525979f9df884f8ae15ba0d;p=xboard.git diff --git a/engineoutput.c b/engineoutput.c index 0a45777..af121d6 100644 --- a/engineoutput.c +++ b/engineoutput.c @@ -5,6 +5,8 @@ * * Copyright 2005 Alessandro Scotti * + * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. + * * ------------------------------------------------------------------------ * * GNU XBoard is free software: you can redistribute it and/or modify @@ -45,6 +47,21 @@ #include "backend.h" #include "moves.h" #include "engineoutput.h" +#include "gettext.h" + +#ifdef ENABLE_NLS +# define _(s) gettext (s) +# define N_(s) gettext_noop (s) +#else +# ifdef WIN32 +# define _(s) T_(s) +# undef ngettext +# define ngettext(s,p,n) T_(p) +# else +# define _(s) (s) +# endif +# define N_(s) s +#endif typedef struct { char * name; @@ -57,6 +74,7 @@ typedef struct { char * hint; int an_move_index; int an_move_count; + int moveKey; } EngineOutputData; // called by other front-end @@ -71,36 +89,44 @@ static int lastDepth[2] = { -1, -1 }; static int lastForwardMostMove[2] = { -1, -1 }; static int engineState[2] = { -1, -1 }; static char lastLine[2][MSG_SIZ]; -static char header[MSG_SIZ]; +static char header[2][MSG_SIZ]; +static char columnHeader[MSG_SIZ] = "dep\tscore\tnodes\ttime\t(not shown: tbhits\tknps\tseldep)\n"; +static int columnMask = 0xF0; #define MAX_VAR 400 -static int scores[MAX_VAR], textEnd[MAX_VAR], curDepth[2], nrVariations[2]; +static int scores[MAX_VAR], textEnd[MAX_VAR], keys[MAX_VAR], curDepth[2], nrVariations[2]; extern int initialRulePlies; -void MakeEngineOutputTitle() +void +MakeEngineOutputTitle () { static char buf[MSG_SIZ]; static char oldTitle[MSG_SIZ]; - char *title = "Engine Output"; + char title[MSG_SIZ]; int count, rule = 2*appData.ruleMoves; + snprintf(title, MSG_SIZ, _("Engine Output") ); + if(!EngineOutputIsUp()) return; // figure out value of 50-move counter count = currentMove; while( (signed char)boards[count][EP_STATUS] <= EP_NONE && count > backwardMostMove ) count--; if( count == backwardMostMove ) count -= initialRulePlies; count = currentMove - count; - snprintf(buf, MSG_SIZ, "%s (%d reversible plies)", title, count); if(!rule) rule = 100; - if(count >= rule - 40 && (!appData.icsActive || gameMode == IcsObserving)) title = buf; + if(count >= rule - 40 && (!appData.icsActive || gameMode == IcsObserving || appData.zippyPlay)) { + snprintf(buf, MSG_SIZ, ngettext("%s (%d reversible ply)", "%s (%d reversible plies)", count), title, count); + safeStrCpy(title, buf, MSG_SIZ); + } if(!strcmp(oldTitle, title)) return; safeStrCpy(oldTitle, title, MSG_SIZ); SetEngineOutputTitle(title); } // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments -void SetEngineState( int which, int state, char * state_data ) +void +SetEngineState (int which, enum ENGINE_STATE state, char * state_data) { int x_which = 1 - which; @@ -132,11 +158,15 @@ void SetEngineState( int which, int state, char * state_data ) } // back end, now the front-end wrapper ClearMemo is used, and ed no longer contains handles. -void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by back-end +void +SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-end { EngineOutputData ed; int clearMemo = FALSE; int which, depth, multi; + ChessMove moveType; + int ff, ft, rf, rt; + char pc; if( stats == 0 ) { SetEngineState( 0, STATE_IDLE, "" ); @@ -194,19 +224,31 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b } if( clearMemo ) { + if(!appData.headers) columnHeader[0] = NULLCHAR; DoClearMemo(which); nrVariations[which] = 0; - header[0] = NULLCHAR; - if(gameMode == AnalyzeMode && (multi = MultiPV(&first)) >= 0) { - snprintf(header, MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV setting = %d / more\n", - appData.whitePOV || appData.scoreWhite ? "white" : "mover", first.option[multi].value); - InsertIntoMemo( which, header, 0); - } else - if(appData.ponderNextMove && lastLine[which][0]) { + header[which][0] = NULLCHAR; + if(gameMode == AnalyzeMode) { + ChessProgramState *cps = (which ? &second : &first); + if((multi = MultiPV(cps)) >= 0) { + snprintf(header[which], MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV setting = %d / more\n", + appData.whitePOV || appData.scoreWhite ? "white" : "mover", cps->option[multi].value); + } + if(!which) snprintf(header[which]+strlen(header[which]), MSG_SIZ-strlen(header[which]), "%s%s", exclusionHeader, columnHeader); + InsertIntoMemo( which, header[which], 0); + } else { + snprintf(header[which], MSG_SIZ, "%s", columnHeader); + if(appData.ponderNextMove && lastLine[which][0]) { InsertIntoMemo( which, lastLine[which], 0 ); InsertIntoMemo( which, "\n", 0 ); + } + InsertIntoMemo( which, header[which], 0); } } + if(ed.pv && ed.pv[0] && ParseOneMove(ed.pv, currentMove, &moveType, &ff, &rf, &ft, &rt, &pc)) + ed.moveKey = (ff<<24 | rf << 16 | ft << 8 | rt) ^ pc*87161; + else ed.moveKey = ed.nodes; // kludge to get unique key unlikely to match any move + /* Update */ lastDepth[which] = depth == 1 && ed.nodes == 0 ? 0 : depth; // [HGM] info-line kudge lastForwardMostMove[which] = forwardMostMove; @@ -219,7 +261,8 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b #define ENGINE_COLOR_UNKNOWN ' ' // pure back end -static char GetEngineColor( int which ) +static char +GetEngineColor (int which) { char result = ENGINE_COLOR_UNKNOWN; @@ -252,7 +295,8 @@ static char GetEngineColor( int which ) } // pure back end -static char GetActiveEngineColor() +static char +GetActiveEngineColor () { char result = ENGINE_COLOR_UNKNOWN; @@ -264,7 +308,8 @@ static char GetActiveEngineColor() } // pure back end -static int IsEnginePondering( int which ) +static int +IsEnginePondering (int which) { int result = FALSE; @@ -289,7 +334,8 @@ static int IsEnginePondering( int which ) } // back end -static void SetDisplayMode( int mode ) +static void +SetDisplayMode (int mode) { if( windowMode != mode ) { windowMode = mode; @@ -299,7 +345,8 @@ static void SetDisplayMode( int mode ) } // pure back end -static void VerifyDisplayMode() +static void +VerifyDisplayMode () { int mode; @@ -307,12 +354,14 @@ static void VerifyDisplayMode() switch( gameMode ) { case IcsObserving: // [HGM] ICS analyze if(!appData.icsEngineAnalyze) return; - case AnalyzeMode: case AnalyzeFile: case MachinePlaysWhite: case MachinePlaysBlack: mode = 0; break; + case AnalyzeMode: + mode = second.analyzing; + break; case IcsPlayingWhite: case IcsPlayingBlack: mode = appData.zippyPlay && opponentKibitzes; // [HGM] kibitz @@ -329,7 +378,8 @@ static void VerifyDisplayMode() } // back end. Determine what icon to set in the color-icon field, and print it -void SetEngineColorIcon( int which ) +void +SetEngineColorIcon (int which) { char color = GetEngineColor(which); int nicon = 0; @@ -348,7 +398,8 @@ void SetEngineColorIcon( int which ) // [HGM] multivar: sort Thinking Output within one depth on score -static int InsertionPoint( int len, EngineOutputData * ed ) +static int +InsertionPoint (int len, EngineOutputData *ed) { int i, offs = 0, newScore = ed->score, n = ed->which; @@ -364,10 +415,13 @@ static int InsertionPoint( int len, EngineOutputData * ed ) offs = textEnd[i+n]; textEnd[i+n+2] = offs + len; scores[i+n+2] = newScore; - if(newScore < scores[i+n]) break; + keys[i+n+2] = ed->moveKey; + if(ed->moveKey != keys[i+n] && // same move always tops previous one (as a higher score must be a fail low) + newScore < scores[i+n]) break; // if it had higher score as previous, move previous in stead - scores[i+n+2] = scores[i+n]; + scores[i+n+2] = ed->moveKey == keys[i+n] ? newScore : scores[i+n]; // correct scores of fail-low/high searches textEnd[i+n+2] = textEnd[i+n] + len; + keys[i+n+2] = keys[i+n]; } if(i<0) { offs = 0; @@ -375,12 +429,27 @@ static int InsertionPoint( int len, EngineOutputData * ed ) scores[n] = newScore; } nrVariations[n] += 2; - return offs + (gameMode == AnalyzeMode)*strlen(header); + return offs + strlen(header[ed->which]); } +static char spaces[] = " "; // [HGM] align: spaces for padding + +static void +Format(char *buf, int val) +{ // [HGM] tbhits: print a positive integer with trailing whitespace to give it fixed width + if( val < 1000000 ) { + int h = val, i=0; + while(h > 0) h /= 10, i++; + snprintf( buf, 24, "%d%s\t", val, spaces + 2*i); + } + else { + snprintf( buf, 24, "%.1fM%s\t", val/1000000.0, spaces + 8 + 2*(val > 1e7)); + } +} // pure back end, now SetWindowText is called via wrapper DoSetWindowText -static void UpdateControls( EngineOutputData * ed ) +static void +UpdateControls (EngineOutputData *ed) { // int isPondering = FALSE; @@ -398,7 +467,7 @@ static void UpdateControls( EngineOutputData * ed ) #ifdef SHOW_PONDERING if( IsEnginePondering( ed->which ) ) { - char buf[8]; + char buf[12]; buf[0] = '\0'; @@ -407,15 +476,17 @@ static void UpdateControls( EngineOutputData * ed ) buf[sizeof(buf)-1] = '\0'; } else if( ed->pv != 0 && *ed->pv != '\0' ) { - char * sep = strchr( ed->pv, ' ' ); + char * sep, *startPV = ed->pv, c; int buflen = sizeof(buf); + if(sscanf(ed->pv, "{%*d,%*d,%*d}%c", &c) && c == ' ') startPV = strchr(ed->pv, '}') + 2; // [HGM] tbhits + sep = strchr( startPV, ' ' ); if( sep != NULL ) { - buflen = sep - ed->pv + 1; + buflen = sep - startPV + 1; if( buflen > sizeof(buf) ) buflen = sizeof(buf); } - strncpy( buf, ed->pv, buflen ); + strncpy( buf, startPV, buflen ); buf[ buflen-1 ] = '\0'; } @@ -457,10 +528,10 @@ static void UpdateControls( EngineOutputData * ed ) unsigned long nps_100 = ed->nodes / ed->time; if( nps_100 < 100000 ) { - snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "NPS: %lu", nps_100 * 100 ); + snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "%s: %lu", _("NPS"), nps_100 * 100 ); } else { - snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "NPS: %.1fk", nps_100 / 10.0 ); + snprintf( s_label, sizeof(s_label)/sizeof(s_label[0]), "%s: %.1fk", _("NPS"), nps_100 / 10.0 ); } } @@ -471,41 +542,66 @@ static void UpdateControls( EngineOutputData * ed ) char s_nodes[24]; char s_score[16]; char s_time[24]; - char buf[256]; - int buflen; + char s_hits[24]; + char s_seld[24]; + char s_knps[24]; + char buf[256], *pvStart = ed->pv, fail; + int buflen, hits, seldep, knps, extra; int time_secs = ed->time / 100; int time_cent = ed->time % 100; /* Nodes */ if( ed->nodes < 1000000 ) { - snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), u64Display, ed->nodes ); + int h = ed->nodes, i=0; + while(h > 0) h /= 10, i++; // [HGM] align: count digits; pad with 2 spaces for every missing digit + snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), u64Display "%s\t", ed->nodes, spaces + 2*i); } else { - snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), "%.1fM", u64ToDouble(ed->nodes) / 1000000.0 ); + snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), "%.1fM%s\t", u64ToDouble(ed->nodes) / 1000000.0, + spaces + 8 + 2*(ed->nodes > 1e7)); } + /* TB Hits etc. */ + hits = knps = seldep = 0; extra = sscanf(ed->pv, "{%d,%d,%d", &seldep, &knps, &hits); + Format(s_seld, seldep); Format(s_knps, knps); Format(s_hits, hits); + if(extra) { // strip extended info from PV + if((pvStart = strstr(ed->pv, "} "))) pvStart += 2; else pvStart = ed->pv; + } + fail = ed->pv[strlen(ed->pv)-1]; + if(fail != '?' && fail != '!') fail = ' '; + /* Score */ h = ((gameMode == AnalyzeMode && appData.whitePOV || appData.scoreWhite) && !WhiteOnMove(currentMove) ? -1 : 1) * ed->score; + if( h == 0 ) { + snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), " 0.00%c\t", fail ); + } else if( h > 0 ) { - snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "+%.2f", h / 100.0 ); + snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "+%.2f%c\t", h / 100.0, fail ); } else { - snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "%.2f", h / 100.0 ); + snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), " %.2f%c\t", h / 100.0, fail ); } /* Time */ - snprintf( s_time, sizeof(s_time)/sizeof(s_time[0]), "%d:%02d.%02d", time_secs / 60, time_secs % 60, time_cent ); + snprintf( s_time, sizeof(s_time)/sizeof(s_time[0]), "%d:%02d.%02d\t", time_secs / 60, time_secs % 60, time_cent ); + + if(columnMask & 2) s_score[0] = NULLCHAR; // [HGM] hide: erase columns the user has hidden + if(columnMask & 4) s_nodes[0] = NULLCHAR; + if(columnMask & 8) s_time[0] = NULLCHAR; + if(columnMask & 16) s_hits[0] = NULLCHAR; + if(columnMask & 32) s_knps[0] = NULLCHAR; + if(columnMask & 64) s_seld[0] = NULLCHAR; /* Put all together... */ if(ed->nodes == 0 && ed->score == 0 && ed->time == 0) snprintf( buf, sizeof(buf)/sizeof(buf[0]), "%3d\t", ed->depth ); else - snprintf( buf, sizeof(buf)/sizeof(buf[0]), "%3d\t%s\t%s\t%s\t", ed->depth, s_score, s_nodes, s_time ); + snprintf( buf, sizeof(buf)/sizeof(buf[0]), "%3d\t%s%s%s%s%s%s", ed->depth, s_score, s_nodes, s_time, s_hits, s_knps, s_seld ); /* Add PV */ buflen = strlen(buf); - strncpy( buf + buflen, ed->pv, sizeof(buf) - buflen ); + strncpy( buf + buflen, pvStart, sizeof(buf) - buflen ); buf[ sizeof(buf) - 3 ] = '\0'; @@ -520,8 +616,38 @@ static void UpdateControls( EngineOutputData * ed ) SetEngineColorIcon( ed->which ); } +static char *titles[] = { "score\t", "nodes\t", "time\t", "tbhits\t", "knps\t", "seldep\t" }; + +void +Collapse(int n) +{ // handle click on column headers, to hide / show them + int i, j, nr=0, m=~columnMask, Ncol=7; + for(i=0; columnHeader[i] && i