Fix yet more castling issues.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index bcc123caaefcfdad2bcf1fdc53ade30aa3ed0581..c960bb247f63bf0744ebeee477567867715ba325 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -25,6 +25,12 @@ my $target = "Sesse";
 # my $engine = "/usr/games/toga2";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 
 # my $engine = "/usr/games/toga2";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 

+open(FICSLOG, ">ficslog.txt")
+       or die "ficslog.txt: $!";
+print FICSLOG "Log starting.\n";
+select(FICSLOG);
+$| = 1;
+

 open(UCILOG, ">ucilog.txt")
        or die "ucilog.txt: $!";
 print UCILOG "Log starting.\n";
 open(UCILOG, ">ucilog.txt")
        or die "ucilog.txt: $!";
 print UCILOG "Log starting.\n";


@@ -46,7 +52,9 @@ while (<UCIREAD>) {
 
 uciprint("setoption name UCI_AnalyseMode value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
 
 uciprint("setoption name UCI_AnalyseMode value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");

-uciprint("setoption name NalimovUsage value Normally");
+uciprint("setoption name NalimovUsage value Rarely");
+uciprint("setoption name Hash value 1024");
+# uciprint("setoption name MultiPV value 3");

 # uciprint("setoption name Contempt value 1000");
 # uciprint("setoption name Outlook value Ultra Optimistic");
 uciprint("ucinewgame");
 # uciprint("setoption name Contempt value 1000");
 # uciprint("setoption name Outlook value Ultra Optimistic");
 uciprint("ucinewgame");


@@ -55,7 +63,7 @@ print "Chess engine ready.\n";
 
 # now talk to FICS
 my $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');
 
 # now talk to FICS
 my $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');

-#$t->input_log(\*STDOUT);
+$t->input_log(\*FICSLOG);

 $t->open($server);
 $t->print("guest");
 $t->waitfor('/Press return to enter the server/');
 $t->open($server);
 $t->print("guest");
 $t->waitfor('/Press return to enter the server/');


@@ -117,27 +125,39 @@ while (1) {
 
 sub parse_infos {
        my (@x) = @_;
 
 sub parse_infos {
        my (@x) = @_;

+       my $mpv = '';

 
        while (scalar @x > 0) {
 
        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;
                }
                        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;
 
                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;
 
                        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;
                                } elsif ($x[0] eq 'mate') {
                                        shift @x;

-                                       $uciinfo{'score_mate'} = shift @x;
+                                       $uciinfo{'score_mate' . $mpv} = shift @x;

                                } else {
                                        shift @x;
                                }
                                } else {
                                        shift @x;
                                }


@@ -145,7 +165,7 @@ sub parse_infos {
                        next;
                }
                if ($x[0] eq 'pv') {
                        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') {
                        last;
                }
                if ($x[0] eq 'string' || $x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {


@@ -284,7 +304,7 @@ sub prettyprint_pv {
                
                # rook
                substr($nb[0], 7, 1, '-');
                
                # rook
                substr($nb[0], 7, 1, '-');

-               substr($nb[0], 5, 1, 'R');
+               substr($nb[0], 5, 1, 'r');

                                
                return ('0-0', prettyprint_pv(\@nb, @pvs));
        }
                                
                return ('0-0', prettyprint_pv(\@nb, @pvs));
        }


@@ -299,7 +319,7 @@ sub prettyprint_pv {
                
                # rook
                substr($nb[0], 0, 1, '-');
                
                # rook
                substr($nb[0], 0, 1, '-');

-               substr($nb[0], 3, 1, 'R');
+               substr($nb[0], 3, 1, 'r');

                                
                return ('0-0-0', prettyprint_pv(\@nb, @pvs));
        }
                                
                return ('0-0-0', prettyprint_pv(\@nb, @pvs));
        }


@@ -387,34 +407,66 @@ sub output_screen {
        #return;
 
        print  "\ecAnalysis:\n";
        #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 {
        } 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";
                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 {
 }
 
 sub find_kings {