X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=9a92dd0707cd0d17b3ca8f6709c97ffb8fd3b63b;hb=0278ebc80411a20fd23303156285e55ce8d2b0a5;hp=75e1f8dc16f40c47139f6c723791fb09b00a76cf;hpb=533db2c788306e35c3eaee2eba0ce4a115be4bf3;p=xboard.git

diff --git a/engineoutput.c b/engineoutput.c
index 75e1f8d..9a92dd0 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.
  *
  * ------------------------------------------------------------------------
  *
@@ -96,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;
 
@@ -403,6 +405,7 @@ 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
@@ -410,6 +413,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
@@ -417,23 +423,27 @@ 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;
+		   newScore < 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]);
 }
 
+#define MATE_SCORE 100000
 static char spaces[] = "            "; // [HGM] align: spaces for padding
 
 static void
@@ -445,7 +455,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));
         }
 }
 
@@ -567,8 +579,11 @@ 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. */
@@ -582,7 +597,7 @@ UpdateControls (EngineOutputData *ed)
         }
         Format(s_seld, params[0]); Format(s_knps, params[1]); Format(s_hits, hits); 
 
-        fail = ed->pv[strlen(ed->pv)-1];
+        if(*ed->pv) fail = ed->pv[strlen(ed->pv)-1]; else fail = ' ';
 	if(fail != '?' && fail != '!') fail = ' ';
 
         /* Score */
@@ -590,6 +605,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 );
         }
@@ -598,6 +615,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