Various fixes for booklook.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index b36487d2987cad84a4654741e8eb594c95fe5ec9..655a9ae00d8acdc57cea3f1d36036d3b11a16469 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -18,9 +18,10 @@ use warnings;
 
 # Configuration
 my $server = "freechess.org";
-my $target = "224";
+my $target = "Sessse";
 # my $engine = "/usr/games/toga2";
-my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
+# my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
+my $engine = "~/microwine-0.2/microwine Rybkav2.3.2a.mp.x64.exe";
 my $telltarget = undef;   # undef to be silent
 my @tell_intervals = (5, 20, 60, 120, 240, 480, 960);  # after each move
 my $uci_assume_full_compliance = 1;                    # dangerous :-)
@@ -67,10 +68,10 @@ while (<UCIREAD>) {
 
 uciprint("setoption name UCI_AnalyseMode value true");
 # uciprint("setoption name Preserve Analysis value true");
-uciprint("setoption name NalimovPath value c:\\nalimov");
+uciprint("setoption name NalimovPath value /srv/tablebase");
 uciprint("setoption name NalimovUsage value Rarely");
 uciprint("setoption name Hash value 1024");
-uciprint("setoption name MultiPV value 3");
+uciprint("setoption name MultiPV value 2");
 # uciprint("setoption name Contempt value 1000");
 # uciprint("setoption name Outlook value Ultra Optimistic");
 uciprint("ucinewgame");
@@ -382,7 +383,7 @@ sub style12_to_fen {
 
 sub prettyprint_pv {
        my ($board, @pvs) = @_;
-       
+
        if (scalar @pvs == 0 || !defined($pvs[0])) {
                return ();
        }
@@ -610,8 +611,12 @@ sub output_screen {
                        $text .= "  ($score)" if (defined($score));
 
                        my $tbhits = '';
-                       if (exists($uciinfo{'tbhits' . $mpv})) {
-                               $tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+                       if (exists($uciinfo{'tbhits' . $mpv}) && $uciinfo{'tbhits' . $mpv} > 0) {
+                               if ($uciinfo{'tbhits' . $mpv} == 1) {
+                                       $tbhits = ", 1 tbhit";
+                               } else {
+                                       $tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+                               }
                        }
 
                        if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
@@ -635,8 +640,12 @@ sub output_screen {
                        $text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
                                $uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
                }
-               if (exists($uciinfo{'tbhits'})) {
-                       $text .= sprintf ", %u Nalimov hits", $uciinfo{'tbhits'};
+               if (exists($uciinfo{'tbhits'}) && $uciinfo{'tbhits'} > 0) {
+                       if ($uciinfo{'tbhits'} == 1) {
+                               $text .= ", one Nalimov hit";
+                       } else {
+                               $text .= sprintf ", %u Nalimov hits", $uciinfo{'tbhits'};
+                       }
                }
                if (exists($uciinfo{'seldepth'})) {
                        $text .= sprintf " (%u selective)", $uciinfo{'seldepth'};
@@ -644,6 +653,8 @@ sub output_screen {
                $text .=  "\n\n";
        }
 
+       $text .= book_info($pos_calculating->{'fen'}, $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
+
        if ($last_text ne $text) {
                print "\e[H\e[2J"; # clear the screen
                print $text;
@@ -945,3 +956,55 @@ sub long_score {
 
        return undef;
 }
+
+my %book_cache = ();
+sub book_info {
+       my ($fen, $board, $toplay) = @_;
+
+       if (exists($book_cache{$fen})) {
+               return $book_cache{$fen};
+       }
+
+       my $ret = `./booklook $fen`;
+       return "[$fen]" if ($ret =~ /Not found/ || $ret eq '');
+
+       my @moves = ();
+
+       for my $m (split /\n/, $ret) {
+               my ($move, $annotation, $win, $draw, $lose, $rating, $rating_div) = split /,/, $m;
+
+               my $pmove;
+               if ($move eq '')  {
+                       $pmove = '(current)';
+               } else {
+                       ($pmove) = prettyprint_pv($board, $move);
+                       $pmove .= $annotation;
+               }
+
+               my $score;
+               if ($toplay eq 'W') {
+                       $score = 1.0 * $win + 0.5 * $draw + 0.0 * $lose;
+               } else {
+                       $score = 0.0 * $win + 0.5 * $draw + 1.0 * $lose;
+               }
+               my $n = $win + $draw + $lose;
+               
+               my $percent;
+               if ($n == 0) {
+                       $percent = "     ";
+               } else {
+                       $percent = sprintf "%4u%%", int(100.0 * $score / $n + 0.5);
+               }
+
+               push @moves, [ $pmove, $n, $percent, $rating ];
+       }
+
+       @moves[1..$#moves] = sort { $b->[2] cmp $a->[2] } @moves[1..$#moves];
+       
+       my $text = "Book moves:\n\n              Perf.     N     Rating\n\n";
+       for my $m (@moves) {
+               $text .= sprintf "  %-10s %s   %6u    %4s\n", $m->[0], $m->[2], $m->[1], $m->[3]
+       }
+
+       return $text;
+}