Fix an issue where the cp score would not be an int, and thus not sort correctly.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index e021c664894e4fb0a077f82ec81d79abff6fc61b..52eae900e98dc52aa070d4b5eac3fa8c7436b79e 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -536,6 +536,8 @@ sub prettyprint_pv {
        }
 }
 
+my %tbprobe_cache = ();
+
 sub complete_using_tbprobe {
        my ($pos, $info, $mpv) = @_;
 
@@ -553,11 +555,18 @@ sub complete_using_tbprobe {
        # Run through the PV until we are at a 6-man position.
        # TODO: We could in theory only have 5-man data.
        my @pv = @{$info->{'pv' . $mpv}};
-       my $key = join('', @pv);
+       my $key = $pos->fen() . " " . join('', @pv);
        my @moves = ();
-       if (exists($pos->{'tbprobe_cache'}{$key})) {
-               @moves = $pos->{'tbprobe_cache'}{$key};
+       if (exists($tbprobe_cache{$key})) {
+               @moves = @{$tbprobe_cache{$key}};
        } else {
+               if ($mpv ne '') {
+                       # Force doing at least one move of the PV.
+                       my $move = shift @pv;
+                       push @moves, $move;
+                       $pos = $pos->make_move(parse_uci_move($move));
+               }
+
                while ($pos->num_pieces() > 6 && $#pv > -1) {
                        my $move = shift @pv;
                        push @moves, $move;
@@ -579,6 +588,8 @@ sub complete_using_tbprobe {
                        ($pos, $uci_move) = $pos->make_pretty_move($move);
                        push @moves, $uci_move;
                }
+
+               $tbprobe_cache{$key} = \@moves;
        }
 
        $info->{'pv' . $mpv} = \@moves;
@@ -1079,7 +1090,7 @@ sub score_digest {
                        if ($score == 0 && $info->{'tablebase'}) {
                                return ['d', undef];
                        } else {
-                               return ['cp', $score];
+                               return ['cp', int($score)];
                        }
                }
        }