X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=engineoutput.c;h=6fd66623e42f69e3ff7022d2f8a7eb2e0b0230d1;hp=d881ad010923d9d49187e7fe4ea00fe5d982b4d1;hb=HEAD;hpb=759b4bb02d161bf42e32ec38b8f8b5df4bc8b126 diff --git a/engineoutput.c b/engineoutput.c index d881ad0..6fd6662 100644 --- a/engineoutput.c +++ b/engineoutput.c @@ -5,7 +5,8 @@ * * Copyright 2005 Alessandro Scotti * - * Enhancements Copyright 1995, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014, + * 2015, 2016 Free Software Foundation, Inc. * * ------------------------------------------------------------------------ * @@ -30,6 +31,7 @@ #include "config.h" #include +#include #if STDC_HEADERS # include @@ -89,10 +91,13 @@ 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], keys[MAX_VAR], curDepth[2], nrVariations[2]; +static char fail[MAX_VAR]; extern int initialRulePlies; @@ -113,7 +118,7 @@ MakeEngineOutputTitle () if( count == backwardMostMove ) count -= initialRulePlies; count = currentMove - count; if(!rule) rule = 100; - if(count >= rule - 40 && (!appData.icsActive || gameMode == IcsObserving)) { + 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); } @@ -124,7 +129,7 @@ MakeEngineOutputTitle () // back end, due to front-end wrapper for SetWindowText, and new SetIcon arguments void -SetEngineState (int which, int state, char * state_data) +SetEngineState (int which, enum ENGINE_STATE state, char * state_data) { int x_which = 1 - which; @@ -182,6 +187,8 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en return; } + if(appData.epd && which) return; // do not write second pane in -epd mode + if( !EngineOutputDialogExists() ) { return; } @@ -217,34 +224,42 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en clearMemo = TRUE; } - if( lastForwardMostMove[which] != forwardMostMove ) { + if( lastForwardMostMove[which] != forwardMostMove && endPV < 0) { clearMemo = TRUE; } if( clearMemo ) { + if(!appData.headers) columnHeader[0] = NULLCHAR; DoClearMemo(which); nrVariations[which] = 0; - header[0] = NULLCHAR; + header[which][0] = NULLCHAR; if(gameMode == AnalyzeMode) { - if((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); + ChessProgramState *cps = (which ? &second : &first); + char *exclu = cps->excludeMoves ? exclusionHeader : ""; + if((multi = MultiPV(cps, 3)) != -1) { + char *s = "setting"; + if(multi < -1) multi = -2 - multi, s = "margin"; + snprintf(header[which], MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV %s = %d / more\n", + appData.whitePOV || appData.scoreWhite ? "white" : "mover", s, cps->option[multi].value); } - snprintf(header+strlen(header), MSG_SIZ-strlen(header), exclusionHeader); - InsertIntoMemo( which, header, 0); - } else - if(appData.ponderNextMove && lastLine[which][0]) { + if(!which) snprintf(header[which]+strlen(header[which]), MSG_SIZ-strlen(header[which]), "%s%s", exclu, 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(ParseOneMove(ed.pv, currentMove, &moveType, &ff, &rf, &ft, &rt, &pc)) + 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; + if(endPV < 0) lastForwardMostMove[which] = forwardMostMove; // not during PV walk! UpdateControls( &ed ); } @@ -347,12 +362,14 @@ 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 @@ -390,9 +407,18 @@ SetEngineColorIcon (int which) // [HGM] multivar: sort Thinking Output within one depth on score static int +MateFlip (int n) +{ // map mate-score to monotonous scale, so sorting compares them correctly + if(n >= MATE_SCORE) return 2*MATE_SCORE - n; + if(n <= -MATE_SCORE) return -2*MATE_SCORE - n; + return n; +} + +static int InsertionPoint (int len, EngineOutputData *ed) { int i, offs = 0, newScore = ed->score, n = ed->which; + char failType; if(ed->nodes == 0 && ed->score == 0 && ed->time == 0) newScore = 1e6; // info lines inserted on top @@ -400,6 +426,9 @@ InsertionPoint (int len, EngineOutputData *ed) curDepth[n] = ed->depth; nrVariations[n] = 0; // throw away everything we had } + i = strlen(ed->pv); if(i > 0) i--; + failType = ed->pv[i]; + if(failType != '?' && failType != '!') failType = ' '; // loop through all lines. Note even / odd used for different panes for(i=nrVariations[n]-2; i>=0; i-=2) { // put new item behind those we haven't looked at @@ -407,22 +436,42 @@ InsertionPoint (int len, EngineOutputData *ed) textEnd[i+n+2] = offs + len; scores[i+n+2] = newScore; keys[i+n+2] = ed->moveKey; + fail[i+n+2] = failType; 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; + MateFlip(newScore) < MateFlip(scores[i+n]) && fail[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]; + fail[i+n+2] = fail[i+n]; } if(i<0) { offs = 0; textEnd[n] = offs + len; scores[n] = newScore; + keys[n] = ed->moveKey; + fail[n] = failType; } 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 { + char unit = 'M'; + if(val >= 1e9) val /= 1e3, unit = 'G'; + snprintf( buf, 24, "%.*f%c%s\t", 1 + (val < 1e7), val/1e6, unit, spaces + 10 + 2*(val >= 1e8)); + } +} // pure back end, now SetWindowText is called via wrapper DoSetWindowText static void @@ -433,6 +482,7 @@ UpdateControls (EngineOutputData *ed) char s_label[MAX_NAME_LENGTH + 32]; int h; char * name = ed->name; + char *q, *pvStart = ed->pv; /* Label */ if( name == 0 || *name == '\0' ) { @@ -442,9 +492,17 @@ UpdateControls (EngineOutputData *ed) strncpy( s_label, name, MAX_NAME_LENGTH ); s_label[ MAX_NAME_LENGTH-1 ] = '\0'; + if(pvStart) { // [HGM] tbhits: plit up old PV into extra infos and real PV + while(strchr(pvStart, '\t')) { // locate last tab before non-int (real PV starts after that) + for(q=pvStart; isdigit(*q) || *q == ' '; q++); + if(*q != '\t') break; + pvStart = q + 1; + } + } + #ifdef SHOW_PONDERING if( IsEnginePondering( ed->which ) ) { - char buf[8]; + char buf[12]; buf[0] = '\0'; @@ -452,16 +510,17 @@ UpdateControls (EngineOutputData *ed) strncpy( buf, ed->hint, sizeof(buf) ); buf[sizeof(buf)-1] = '\0'; } - else if( ed->pv != 0 && *ed->pv != '\0' ) { - char * sep = strchr( ed->pv, ' ' ); + else if( pvStart != 0 && *pvStart != '\0' ) { + char * sep; int buflen = sizeof(buf); + sep = strchr( pvStart, ' ' ); if( sep != NULL ) { - buflen = sep - ed->pv + 1; + buflen = sep - pvStart + 1; if( buflen > sizeof(buf) ) buflen = sizeof(buf); } - strncpy( buf, ed->pv, buflen ); + strncpy( buf, pvStart, buflen ); buf[ buflen-1 ] = '\0'; } @@ -503,55 +562,93 @@ 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 ); } } DoSetWindowText( ed->which, nLabelNPS, s_label ); /* Memo */ - if( ed->pv != 0 && *ed->pv != '\0' ) { + if( pvStart != 0 && *pvStart != '\0' ) { 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], fail; + int buflen, hits, i, params[5], 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 ); + double x = u64ToDouble(ed->nodes); + char unit = 'M'; + if(x >= 1e9) x /= 1e3, unit = 'G'; + snprintf( s_nodes, sizeof(s_nodes)/sizeof(s_nodes[0]), "%.*f%c%s\t", 1 + (x < 1e7), x / 1e6, + unit, spaces + 10 + 2*(ed->nodes >= 1e8)); } + /* TB Hits etc. */ + for(i=hits=0; i<5; i++) params[i] = 0; +//fprintf(stderr, "%s\n%s\n", ed->pv, pvStart); + if(pvStart != ed->pv) { // check if numbers before PV + strncpy(buf, ed->pv, 256); buf[pvStart - ed->pv] = NULLCHAR; + extra = sscanf(buf, "%d %d %d %d %d", params, params+1, params+2, params+3, params+4); +//fprintf(stderr, "extra=%d len=%d\n", extra, pvStart - ed->pv); + if(extra) hits = params[extra-1], params[extra-1] = 0; // last one is tbhits + } + Format(s_seld, params[0]); Format(s_knps, params[1]); Format(s_hits, hits); + + if(*ed->pv) fail = ed->pv[strlen(ed->pv)-1]; else fail = ' '; + 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 >= MATE_SCORE) snprintf(s_score, 16, " %s#%d%c\t", ( h > MATE_SCORE+9 ? "" : " "), h - MATE_SCORE, fail ); else + if(-h >= MATE_SCORE) snprintf(s_score, 16, " %s#-%d%c\t", (-h > MATE_SCORE+9 ? "" : " "), -h - MATE_SCORE, 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 ); + if(time_secs >= 3600) + snprintf( s_time, sizeof(s_time)/sizeof(s_time[0]), "%d:%02d:%02d\t", time_secs / 3600, (time_secs / 60) % 60, time_secs % 60 ); + else + 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'; @@ -566,6 +663,35 @@ 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