Add Multi-PV support (disabled by default, as it's more information that
authorSteinar H. Gunderson <sesse@debian.org>
Tue, 26 Jun 2007 22:38:58 +0000 (00:38 +0200)
committerSteinar H. Gunderson <sesse@debian.org>
Tue, 26 Jun 2007 22:38:58 +0000 (00:38 +0200)
can be confusing).

remoteglot.pl

index bcc123c..e3169a5 100755 (executable)
@@ -47,6 +47,7 @@ while (<UCIREAD>) {
 uciprint("setoption name UCI_AnalyseMode value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
 uciprint("setoption name NalimovUsage value Normally");
+# uciprint("setoption name MultiPV value 3");
 # uciprint("setoption name Contempt value 1000");
 # uciprint("setoption name Outlook value Ultra Optimistic");
 uciprint("ucinewgame");
@@ -117,27 +118,39 @@ while (1) {
 
 sub parse_infos {
        my (@x) = @_;
+       my $mpv = '';
 
        while (scalar @x > 0) {
-               if ($x[0] =~ /^(currmove|currmovenumber|time|nodes|nps|cpuload|hashfull|depth|seldepth|multipv|time|tbhits)$/) {
+               if ($x[0] =~ 'multipv') {
+                       shift @x;
+                       $mpv = shift @x;
+                       next;
+               }
+               if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
                        my $key = shift @x;
                        my $value = shift @x;
                        $uciinfo{$key} = $value;
                        next;
                }
+               if ($x[0] =~ /^(depth|seldepth|hashfull|time|nodes|nps|tbhits)$/) {
+                       my $key = shift @x;
+                       my $value = shift @x;
+                       $uciinfo{$key . $mpv} = $value;
+                       next;
+               }
                if ($x[0] eq 'score') {
                        shift @x;
 
-                       delete $uciinfo{'score_cp'};
-                       delete $uciinfo{'score_mate'};
+                       delete $uciinfo{'score_cp' . $mpv};
+                       delete $uciinfo{'score_mate' . $mpv};
 
                        while ($x[0] =~ /^(cp|mate|lowerbound|upperbound)$/) {
                                if ($x[0] eq 'cp') {
                                        shift @x;
-                                       $uciinfo{'score_cp'} = shift @x;
+                                       $uciinfo{'score_cp' . $mpv} = shift @x;
                                } elsif ($x[0] eq 'mate') {
                                        shift @x;
-                                       $uciinfo{'score_mate'} = shift @x;
+                                       $uciinfo{'score_mate' . $mpv} = shift @x;
                                } else {
                                        shift @x;
                                }
@@ -145,7 +158,7 @@ sub parse_infos {
                        next;
                }
                if ($x[0] eq 'pv') {
-                       $uciinfo{'pv'} = [ @x[1..$#x] ];
+                       $uciinfo{'pv' . $mpv} = [ @x[1..$#x] ];
                        last;
                }
                if ($x[0] eq 'string' || $x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {
@@ -387,34 +400,66 @@ sub output_screen {
        #return;
 
        print  "\ecAnalysis:\n";
-       if (defined($uciinfo{'score_mate'})) {
-               printf "  Mate in %d\n", $uciinfo{'score_mate'};
+
+       return unless (exists($ficsinfo{'board'}));
+
+       if (exists($uciinfo{'pv1'})) {
+               # multi-PV
+               my $mpv = 1;
+               while (exists($uciinfo{'pv' . $mpv})) {
+                       printf "  PV%2u", $mpv;
+
+                       if (defined($uciinfo{'score_mate' . $mpv})) {
+                               printf " (M%3d)", $uciinfo{'score_mate' . $mpv};
+                       } else {
+                               if (exists($uciinfo{'score_cp' . $mpv})) {
+                                       my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
+                                       if ($ficsinfo{'toplay'} eq 'B') {
+                                               $score = -$score;
+                                       }
+                                       printf " (%+5.2f)", $score;
+                               }
+                       }
+                       
+                       if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
+                               printf " (%5u kn, %3u kn/s, %2u ply)",
+                                       $uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
+                       }
+
+                       print ":\n";
+                       print "  ", join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}})), "\n";
+                       print "\n";
+                       ++$mpv;
+               }
        } else {
-               if (exists($uciinfo{'score_cp'})) {
-                       my $score = $uciinfo{'score_cp'} * 0.01;
-                       if ($ficsinfo{'toplay'} eq 'B') {
-                               $score = -$score;
+               # single-PV
+               if (defined($uciinfo{'score_mate'})) {
+                       printf "  Mate in %d\n", $uciinfo{'score_mate'};
+               } else {
+                       if (exists($uciinfo{'score_cp'})) {
+                               my $score = $uciinfo{'score_cp'} * 0.01;
+                               if ($ficsinfo{'toplay'} eq 'B') {
+                                       $score = -$score;
+                               }
+                               printf "  Score: %+5.2f\n", $score;
                        }
-                       printf "  Score: %+5.2f\n", $score;
                }
-       }
 
-       if (exists($ficsinfo{'board'})) {
                print  "  PV: ", join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
                print  "\n";
-       }
 
-       if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
-               printf "  %u nodes, %7u nodes/sec, depth %u ply",
-                       $uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
-       }
-       if (exists($uciinfo{'tbhits'})) {
-               printf ", %u Nalimov hits", $uciinfo{'tbhits'};
-       }
-       if (exists($uciinfo{'seldepth'})) {
-               printf " (%u selective)", $uciinfo{'seldepth'};
+               if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
+                       printf "  %u nodes, %7u nodes/sec, depth %u ply",
+                               $uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
+               }
+               if (exists($uciinfo{'tbhits'})) {
+                       printf ", %u Nalimov hits", $uciinfo{'tbhits'};
+               }
+               if (exists($uciinfo{'seldepth'})) {
+                       printf " (%u selective)", $uciinfo{'seldepth'};
+               }
+               print  "\n\n";
        }
-       print  "\n\n";
 }
 
 sub find_kings {