X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=aae73ca443a202948ee940716d3a4c0b95022908;hb=ce2d2972671ea7eff9dbbe7028718bef4d837dfb;hp=42eccc03ebe3aef84bfd701724b99e9db8db7c80;hpb=3b7462ef71c6d6c841bd2f19cafb5679b9841a44;p=xboard.git diff --git a/engineoutput.c b/engineoutput.c index 42eccc0..aae73ca 100644 --- a/engineoutput.c +++ b/engineoutput.c @@ -5,7 +5,7 @@ * * Copyright 2005 Alessandro Scotti * - * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. + * Enhancements Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc. * * ------------------------------------------------------------------------ * @@ -90,6 +90,8 @@ static int lastForwardMostMove[2] = { -1, -1 }; static int engineState[2] = { -1, -1 }; static char lastLine[2][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]; @@ -222,6 +224,7 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en } if( clearMemo ) { + if(!appData.headers) columnHeader[0] = NULLCHAR; DoClearMemo(which); nrVariations[which] = 0; header[which][0] = NULLCHAR; if(gameMode == AnalyzeMode) { @@ -230,12 +233,15 @@ SetProgramStats (FrontEndProgramStats * stats) // now directly called by back-en 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", exclusionHeader); + if(!which) snprintf(header[which]+strlen(header[which]), MSG_SIZ-strlen(header[which]), "%s%s", exclusionHeader, columnHeader); InsertIntoMemo( which, header[which], 0); - } else - if(appData.ponderNextMove && lastLine[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); } } @@ -413,7 +419,7 @@ InsertionPoint (int len, EngineOutputData *ed) 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]; } @@ -423,9 +429,23 @@ InsertionPoint (int len, EngineOutputData *ed) scores[n] = newScore; } nrVariations[n] += 2; - return offs + (gameMode == AnalyzeMode)*strlen(header[ed->which]); + 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 @@ -447,7 +467,7 @@ UpdateControls (EngineOutputData *ed) #ifdef SHOW_PONDERING if( IsEnginePondering( ed->which ) ) { - char buf[8]; + char buf[12]; buf[0] = '\0'; @@ -456,15 +476,17 @@ 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'; } @@ -520,41 +542,64 @@ 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; + 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; } /* 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\t" ); + } 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\t", h / 100.0 ); } 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\t", h / 100.0 ); } /* 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'; @@ -569,6 +614,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