X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=remoteglot.pl;h=9742a5a09a8686e93270290961ac4fa3704a2dae;hb=9dbe80127346dce1003c423a118321a3eb1a0b59;hp=97003acd416b8660f936be325e098b634f8e79af;hpb=dc3d19f5d7977bfa3eda1af4aa5696a10a4aebf1;p=remoteglot

diff --git a/remoteglot.pl b/remoteglot.pl
index 97003ac..9742a5a 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -506,6 +506,7 @@ sub parse_infos {
 
 			delete $info->{'score_cp' . $mpv};
 			delete $info->{'score_mate' . $mpv};
+			delete $info->{'splicepos' . $mpv};
 
 			while ($x[0] eq 'cp' || $x[0] eq 'mate') {
 				if ($x[0] eq 'cp') {
@@ -601,8 +602,11 @@ sub complete_using_tbprobe {
 	my @pv = @{$info->{'pv' . $mpv}};
 	my $key = $pos->fen() . " " . join('', @pv);
 	my @moves = ();
+	my $splicepos;
 	if (exists($tbprobe_cache{$key})) {
-		@moves = @{$tbprobe_cache{$key}};
+		my $c = $tbprobe_cache{$key};
+		@moves = @{$c->{'moves'}};
+		$splicepos = $c->{'splicepos'};
 	} else {
 		if ($mpv ne '') {
 			# Force doing at least one move of the PV.
@@ -624,9 +628,9 @@ sub complete_using_tbprobe {
 		my $pgn = Chess::PGN::Parse->new(undef, $pgn_text);
 		return if (!defined($pgn) || !$pgn->read_game() || ($pgn->result ne '0-1' && $pgn->result ne '1-0'));
 		$pgn->quick_parse_game;
-		$info->{'pv' . $mpv} = \@moves;
 
 		# Splice the PV from the tablebase onto what we have so far.
+		$splicepos = scalar @moves;
 		for my $move (@{$pgn->moves}) {
 			last if $move eq '#';
 			last if $move eq '1-0';
@@ -637,7 +641,10 @@ sub complete_using_tbprobe {
 			push @moves, $uci_move;
 		}
 
-		$tbprobe_cache{$key} = \@moves;
+		$tbprobe_cache{$key} = {
+			moves => \@moves,
+			splicepos => $splicepos
+		};
 	}
 
 	$info->{'pv' . $mpv} = \@moves;
@@ -648,6 +655,7 @@ sub complete_using_tbprobe {
 	} else {
 		$info->{'score_mate' . $mpv} = $matelen;
 	}
+	$info->{'splicepos' . $mpv} = $splicepos;
 }
 
 sub output {
@@ -688,7 +696,7 @@ sub output {
 	#
 	my $fen = $pos_calculating->fen();
 	if (exists($tb_cache{$fen})) {
-		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits splicepos)) {
 			delete $info->{$key . '1'};
 			delete $info->{$key};
 		}
@@ -728,7 +736,7 @@ sub output {
 	# specified.
 	#
 	if (exists($info->{'pv1'}) && !exists($info->{'pv2'})) {
-		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits splicepos)) {
 			if (exists($info->{$key . '1'})) {
 				$info->{$key} = $info->{$key . '1'};
 			} else {
@@ -956,6 +964,9 @@ sub output_json {
 					move => $pretty_move,
 					pv => \@pretty_pv,
 				};
+				if (exists($info->{'splicepos' . $mpv})) {
+					$refutation_lines{$pretty_move}->{'splicepos'} = $info->{'splicepos' . $mpv};
+				}
 			};
 		}
 	}
@@ -1167,7 +1178,16 @@ sub score_digest {
 		if ($pos->{'toplay'} eq 'B') {
 			$mate = -$mate;
 		}
-		return ['m', $mate];
+		if (exists($info->{'splicepos' . $mpv})) {
+			my $sp = $info->{'splicepos' . $mpv};
+			if ($mate < 0) {
+				return ['tb', -$sp];
+			} else {
+				return ['tb', $sp];
+			}
+		} else {
+			return ['m', $mate];
+		}
 	} else {
 		if (exists($info->{'score_cp' . $mpv})) {
 			my $score = $info->{'score_cp' . $mpv};
@@ -1193,10 +1213,19 @@ sub long_score {
 		if ($pos->{'toplay'} eq 'B') {
 			$mate = -$mate;
 		}
-		if ($mate > 0) {
-			return sprintf "White mates in %u", $mate;
+		if (exists($info->{'splicepos' . $mpv})) {
+			my $sp = $info->{'splicepos' . $mpv};
+			if ($mate > 0) {
+				return sprintf "White wins in %u/%u", int(($sp + 1) * 0.5), $sp;
+			} else {
+				return sprintf "Black wins in %u/%u", int(($sp + 1) * 0.5), $sp;
+			}
 		} else {
-			return sprintf "Black mates in %u", -$mate;
+			if ($mate > 0) {
+				return sprintf "White mates in %u", $mate;
+			} else {
+				return sprintf "Black mates in %u", -$mate;
+			}
 		}
 	} else {
 		if (exists($info->{'score_cp' . $mpv})) {