X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=engineoutput.c;h=6fd66623e42f69e3ff7022d2f8a7eb2e0b0230d1;hp=714873dac15427b9990d0f4f0cf49e6f6dc249a1;hb=f7f09e5d0b183a416c4069f2c28f865c680045c7;hpb=30ff596d02fea83b3f303273077eccdd02dc928c diff --git a/engineoutput.c b/engineoutput.c index 714873d..6fd6662 100644 --- a/engineoutput.c +++ b/engineoutput.c @@ -5,7 +5,8 @@ * * Copyright 2005 Alessandro Scotti * - * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 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 @@ -95,6 +97,7 @@ 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; @@ -184,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; } @@ -219,7 +224,7 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en clearMemo = TRUE; } - if( lastForwardMostMove[which] != forwardMostMove ) { + if( lastForwardMostMove[which] != forwardMostMove && endPV < 0) { clearMemo = TRUE; } @@ -229,11 +234,14 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en 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); + 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); } - if(!which) snprintf(header[which]+strlen(header[which]), MSG_SIZ-strlen(header[which]), "%s%s", exclusionHeader, columnHeader); + 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); @@ -251,7 +259,7 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en /* 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 ); } @@ -399,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 @@ -409,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 @@ -416,18 +436,21 @@ 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] = 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 + strlen(header[ed->which]); @@ -444,7 +467,9 @@ Format(char *buf, int val) 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)); + 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)); } } @@ -457,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' ) { @@ -466,6 +492,14 @@ 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[12]; @@ -476,18 +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, *startPV = ed->pv, c; + else if( pvStart != 0 && *pvStart != '\0' ) { + char * sep; int buflen = sizeof(buf); - if(sscanf(ed->pv, "{%*d,%*d,%*d}%c", &c) && c == ' ') startPV = strchr(ed->pv, '}') + 2; // [HGM] tbhits - sep = strchr( startPV, ' ' ); + sep = strchr( pvStart, ' ' ); if( sep != NULL ) { - buflen = sep - startPV + 1; + buflen = sep - pvStart + 1; if( buflen > sizeof(buf) ) buflen = sizeof(buf); } - strncpy( buf, startPV, buflen ); + strncpy( buf, pvStart, buflen ); buf[ buflen-1 ] = '\0'; } @@ -539,15 +572,15 @@ UpdateControls (EngineOutputData *ed) 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 s_hits[24]; char s_seld[24]; char s_knps[24]; - char buf[256], *pvStart = ed->pv, fail; - int buflen, hits, seldep, knps, extra; + char buf[256], fail; + int buflen, hits, i, params[5], extra; int time_secs = ed->time / 100; int time_cent = ed->time % 100; @@ -558,17 +591,25 @@ UpdateControls (EngineOutputData *ed) 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%s\t", u64ToDouble(ed->nodes) / 1000000.0, - spaces + 8 + 2*(ed->nodes > 1e7)); + 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. */ - 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; + 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 } - fail = ed->pv[strlen(ed->pv)-1]; + 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 */ @@ -576,6 +617,8 @@ UpdateControls (EngineOutputData *ed) 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%c\t", h / 100.0, fail ); } @@ -584,6 +627,9 @@ UpdateControls (EngineOutputData *ed) } /* Time */ + 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 @@ -653,13 +699,13 @@ OutputKibitz (int window, char *text) static int currentLineEnd[2]; int where = 0; if(!EngineOutputIsUp()) return; - if(!opponentKibitzes) { // on first kibitz of game, clear memos + if(!opponentKibitzes && !appData.epd) { // on first kibitz of game, clear memos DoClearMemo(1); currentLineEnd[1] = 0; if(gameMode == IcsObserving) { DoClearMemo(0); currentLineEnd[0] = 0; } } opponentKibitzes = TRUE; // this causes split window DisplayMode in ICS modes. VerifyDisplayMode(); - strncpy(text+strlen(text)-1, "\r\n",sizeof(text+strlen(text)-1)); // to not lose line breaks on copying + strncpy(text+strlen(text)-1, "\r\n", 4); // to not lose line breaks on copying if(gameMode == IcsObserving) { DoSetWindowText(0, nLabel, gameInfo.white); SetIcon( 0, nColorIcon, nColorWhite);