]> git.sesse.net Git - remoteglot/blobdiff - remoteglot.pl
Small refactoring.
[remoteglot] / remoteglot.pl
index 7b650477c95d8fa6727e033ef7e413c02074100f..eecd407ba587cbb156e52c4a704f28d3e1d5adc5 100755 (executable)
@@ -15,6 +15,7 @@ use IPC::Open2;
 use Time::HiRes;
 use JSON::XS;
 require 'Position.pm';
+require 'Engine.pm';
 use strict;
 use warnings;
 
@@ -23,8 +24,6 @@ my $server = "freechess.org";
 my $target = "GMCarlsen";
 my $engine_cmdline = "'./Deep Rybka 4 SSE42 x64'";
 my $engine2_cmdline = "./stockfish_13111119_x64_modern_sse42";  # undef for none
-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 = 0;                    # dangerous :-)
 my $update_max_interval = 1.0;
 my @masters = (
@@ -57,9 +56,8 @@ select(STDOUT);
 # open the chess engine
 my $engine = open_engine($engine_cmdline, 'E1');
 my $engine2 = open_engine($engine2_cmdline, 'E2');
-my ($last_move, $last_tell);
+my $last_move;
 my $last_text = '';
-my $last_told_text = '';
 my ($pos_waiting, $pos_calculating, $pos_calculating_second_engine);
 
 uciprint($engine, "setoption name UCI_AnalyseMode value true");
@@ -115,84 +113,13 @@ while (1) {
 
                chomp $line;
                $line =~ tr/\r//d;
-               if ($line =~ /^<12> /) {
-                       my $pos = Position->new($line);
-                       
-                       # if this is already in the queue, ignore it
-                       next if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen());
-
-                       # if we're already chewing on this and there's nothing else in the queue,
-                       # also ignore it
-                       next if (!defined($pos_waiting) && defined($pos_calculating) &&
-                                $pos->fen() eq $pos_calculating->fen());
-
-                       # if we're already thinking on something, stop and wait for the engine
-                       # to approve
-                       if (defined($pos_calculating)) {
-                               if (!defined($pos_waiting)) {
-                                       uciprint($engine, "stop");
-                               }
-                               if ($uci_assume_full_compliance) {
-                                       $pos_waiting = $pos;
-                               } else {
-                                       uciprint($engine, "position fen " . $pos->fen());
-                                       uciprint($engine, "go infinite");
-                                       $pos_calculating = $pos;
-                               }
-                       } else {
-                               # it's wrong just to give the FEN (the move history is useful,
-                               # and per the UCI spec, we should really have sent "ucinewgame"),
-                               # but it's easier
-                               uciprint($engine, "position fen " . $pos->fen());
-                               uciprint($engine, "go infinite");
-                               $pos_calculating = $pos;
-                       }
-
-                       if (defined($engine2)) {
-                               if (defined($pos_calculating_second_engine)) {
-                                       uciprint($engine2, "stop");
-                               } else {
-                                       uciprint($engine2, "position fen " . $pos->fen());
-                                       uciprint($engine2, "go infinite");
-                                       $pos_calculating_second_engine = $pos;
-                               }
-                               $engine2->{'info'} = {};
-                       }
-
-                       $engine->{'info'} = {};
-                       $last_move = time;
-
-                       # 
-                       # Output a command every move to note that we're
-                       # still paying attention -- this is a good tradeoff,
-                       # since if no move has happened in the last half
-                       # hour, the analysis/relay has most likely stopped
-                       # and we should stop hogging server resources.
-                       #
-                       $t->cmd("date");
-               }
-               if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
-                       my ($who, $msg) = ($1, $2);
-
-                       next if (grep { $_ eq $who } (@masters) == 0);
-       
-                       if ($msg =~ /^fics (.*?)$/) {
-                               $t->cmd("tell $who Executing '$1' on FICS.");
-                               $t->cmd($1);
-                       } elsif ($msg =~ /^uci (.*?)$/) {
-                               $t->cmd("tell $who Sending '$1' to the engine.");
-                               print { $engine->{'write'} } "$1\n";
-                       } else {
-                               $t->cmd("tell $who Couldn't understand '$msg', sorry.");
-                       }
-               }
-               #print "FICS: [$line]\n";
+               handle_fics($line);
                $sleep = 0;
        }
        
        # any fun on the UCI channel?
        if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-               my @lines = read_lines($engine);
+               my @lines = $engine->read_lines();
                for my $line (@lines) {
                        next if $line =~ /(upper|lower)bound/;
                        handle_uci($engine, $line, 1);
@@ -202,7 +129,7 @@ while (1) {
                output();
        }
        if (defined($engine2) && $nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
-               my @lines = read_lines($engine2);
+               my @lines = $engine2->read_lines();
                for my $line (@lines) {
                        next if $line =~ /(upper|lower)bound/;
                        handle_uci($engine2, $line, 0);
@@ -254,6 +181,82 @@ sub handle_uci {
        }
 }
 
+sub handle_fics {
+       my $line = shift;
+       if ($line =~ /^<12> /) {
+               my $pos = Position->new($line);
+               
+               # if this is already in the queue, ignore it
+               next if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen());
+
+               # if we're already chewing on this and there's nothing else in the queue,
+               # also ignore it
+               next if (!defined($pos_waiting) && defined($pos_calculating) &&
+                        $pos->fen() eq $pos_calculating->fen());
+
+               # if we're already thinking on something, stop and wait for the engine
+               # to approve
+               if (defined($pos_calculating)) {
+                       if (!defined($pos_waiting)) {
+                               uciprint($engine, "stop");
+                       }
+                       if ($uci_assume_full_compliance) {
+                               $pos_waiting = $pos;
+                       } else {
+                               uciprint($engine, "position fen " . $pos->fen());
+                               uciprint($engine, "go infinite");
+                               $pos_calculating = $pos;
+                       }
+               } else {
+                       # it's wrong just to give the FEN (the move history is useful,
+                       # and per the UCI spec, we should really have sent "ucinewgame"),
+                       # but it's easier
+                       uciprint($engine, "position fen " . $pos->fen());
+                       uciprint($engine, "go infinite");
+                       $pos_calculating = $pos;
+               }
+
+               if (defined($engine2)) {
+                       if (defined($pos_calculating_second_engine)) {
+                               uciprint($engine2, "stop");
+                       } else {
+                               uciprint($engine2, "position fen " . $pos->fen());
+                               uciprint($engine2, "go infinite");
+                               $pos_calculating_second_engine = $pos;
+                       }
+                       $engine2->{'info'} = {};
+               }
+
+               $engine->{'info'} = {};
+               $last_move = time;
+
+               # 
+               # Output a command every move to note that we're
+               # still paying attention -- this is a good tradeoff,
+               # since if no move has happened in the last half
+               # hour, the analysis/relay has most likely stopped
+               # and we should stop hogging server resources.
+               #
+               $t->cmd("date");
+       }
+       if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
+               my ($who, $msg) = ($1, $2);
+
+               next if (grep { $_ eq $who } (@masters) == 0);
+
+               if ($msg =~ /^fics (.*?)$/) {
+                       $t->cmd("tell $who Executing '$1' on FICS.");
+                       $t->cmd($1);
+               } elsif ($msg =~ /^uci (.*?)$/) {
+                       $t->cmd("tell $who Sending '$1' to the engine.");
+                       print { $engine->{'write'} } "$1\n";
+               } else {
+                       $t->cmd("tell $who Couldn't understand '$msg', sorry.");
+               }
+       }
+       #print "FICS: [$line]\n";
+}
+
 sub parse_infos {
        my ($engine, @x) = @_;
        my $mpv = '';
@@ -345,111 +348,8 @@ sub prettyprint_pv {
        }
 
        my $pv = shift @pvs;
-       my $from_col = col_letter_to_num(substr($pv, 0, 1));
-       my $from_row = row_letter_to_num(substr($pv, 1, 1));
-       my $to_col   = col_letter_to_num(substr($pv, 2, 1));
-       my $to_row   = row_letter_to_num(substr($pv, 3, 1));
-       my $promo    = substr($pv, 4, 1);
-
-       my $nb = $board->make_move($from_row, $from_col, $to_row, $to_col, $promo);
-       my $piece = $board->[$from_row][$from_col];
-
-       if ($piece eq '-') {
-               die "Invalid move $pv";
-       }
-
-       # white short castling
-       if ($pv eq 'e1g1' && $piece eq 'K') {
-               return ('0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       # white long castling
-       if ($pv eq 'e1c1' && $piece eq 'K') {
-               return ('0-0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       # black short castling
-       if ($pv eq 'e8g8' && $piece eq 'k') {
-               return ('0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       # black long castling
-       if ($pv eq 'e8c8' && $piece eq 'k') {
-               return ('0-0-0', prettyprint_pv($nb, @pvs));
-       }
-
-       my $pretty;
-
-       # check if the from-piece is a pawn
-       if (lc($piece) eq 'p') {
-               # attack?
-               if ($from_col != $to_col) {
-                       $pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
-               } else {
-                       $pretty = substr($pv, 2, 2);
-
-                       if (length($pv) == 5) {
-                               # promotion
-                               $pretty .= "=";
-                               $pretty .= uc(substr($pv, 4, 1));
-
-                               if ($piece eq 'p') {
-                                       $piece = substr($pv, 4, 1);
-                               } else {
-                                       $piece = uc(substr($pv, 4, 1));
-                               }
-                       }
-               }
-       } else {
-               $pretty = uc($piece);
-
-               # see how many of these pieces could go here, in all
-               my $num_total = 0;
-               for my $col (0..7) {
-                       for my $row (0..7) {
-                               next unless ($board->[$row][$col] eq $piece);
-                               ++$num_total if ($board->can_reach($piece, $row, $col, $to_row, $to_col));
-                       }
-               }
-
-               # see how many of these pieces from the given row could go here
-               my $num_row = 0;
-               for my $col (0..7) {
-                       next unless ($board->[$from_row][$col] eq $piece);
-                       ++$num_row if ($board->can_reach($piece, $from_row, $col, $to_row, $to_col));
-               }
-               
-               # and same for columns
-               my $num_col = 0;
-               for my $row (0..7) {
-                       next unless ($board->[$row][$from_col] eq $piece);
-                       ++$num_col if ($board->can_reach($piece, $row, $from_col, $to_row, $to_col));
-               }
-               
-               # see if we need to disambiguate
-               if ($num_total > 1) {
-                       if ($num_col == 1) {
-                               $pretty .= substr($pv, 0, 1);
-                       } elsif ($num_row == 1) {
-                               $pretty .= substr($pv, 1, 1);
-                       } else {
-                               $pretty .= substr($pv, 0, 2);
-                       }
-               }
-
-               # attack?
-               if ($board->[$to_row][$to_col] ne '-') {
-                       $pretty .= 'x';
-               }
-
-               $pretty .= substr($pv, 2, 2);
-       }
-
-       if ($nb->in_mate()) {
-               $pretty .= '#';
-       } elsif ($nb->in_check() ne 'none') {
-               $pretty .= '+';
-       }
+       my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($pv);
+       my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
        return ($pretty, prettyprint_pv($nb, @pvs));
 }
 
@@ -622,64 +522,6 @@ sub output_screen {
                print $text;
                $last_text = $text;
        }
-
-       # Now construct the tell text, if any
-       return if (!defined($telltarget));
-
-       my $tell_text = '';
-
-       if (exists($id->{'name'})) {
-               $tell_text .= "Analysis by $id->{'name'} -- see http://analysis.sesse.net/ for more information\n";
-       } else {
-               $tell_text .= "Computer analysis -- http://analysis.sesse.net/ for more information\n";
-       }
-
-       if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
-               # multi-PV
-               my $mpv = 1;
-               while (exists($info->{'pv' . $mpv})) {
-                       $tell_text .= sprintf "  PV%2u", $mpv;
-                       my $score = short_score($info, $pos_calculating, $mpv);
-                       $tell_text .= "  ($score)" if (defined($score));
-
-                       if (exists($info->{'depth' . $mpv})) {
-                               $tell_text .= sprintf " (%2u ply)", $info->{'depth' . $mpv};
-                       }
-
-                       $tell_text .= ": ";
-                       $tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}}));
-                       $tell_text .= "\n";
-                       ++$mpv;
-               }
-       } else {
-               # single-PV
-               my $score = long_score($info, $pos_calculating, '');
-               $tell_text .= "  $score\n" if defined($score);
-               $tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
-               if (exists($info->{'depth'})) {
-                       $tell_text .= sprintf " (depth %u ply)", $info->{'depth'};
-               }
-               $tell_text .=  "\n";
-       }
-
-       # see if a new tell is called for -- it is if the delay has expired _and_
-       # this is not simply a repetition of the last one
-       if ($last_told_text ne $tell_text) {
-               my $now = time;
-               for my $iv (@tell_intervals) {
-                       last if ($now - $last_move < $iv);
-                       next if ($last_tell - $last_move >= $iv);
-
-                       for my $line (split /\n/, $tell_text) {
-                               $t->print("tell $telltarget [$target] $line");
-                       }
-
-                       $last_told_text = $text;
-                       $last_tell = $now;
-
-                       last;
-               }
-       }
 }
 
 sub output_json {
@@ -736,7 +578,7 @@ sub output_json {
 
 sub uciprint {
        my ($engine, $msg) = @_;
-       print { $engine->{'write'} } "$msg\n";
+       $engine->print($msg);
        print UCILOG localtime() . " $engine->{'tag'} => $msg\n";
 }
 
@@ -875,65 +717,25 @@ sub book_info {
 
 sub open_engine {
        my ($cmdline, $tag) = @_;
-
        return undef if (!defined($cmdline));
-
-       my ($uciread, $uciwrite);
-       my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
-
-       my $engine = {
-               pid => $pid,
-               read => $uciread,
-               readbuf => '',
-               write => $uciwrite,
-               info => {},
-               ids => {},
-               tag => $tag,
-       };
+       my $engine = Engine->open($cmdline, $tag);
 
        uciprint($engine, "uci");
 
        # gobble the options
-       while (<$uciread>) {
-               /uciok/ && last;
-               handle_uci($engine, $_);
+       my $seen_uciok = 0;
+       while (!$seen_uciok) {
+               for my $line ($engine->read_lines()) {
+                       if ($line =~ /uciok/) {
+                               $seen_uciok = 1;
+                       }
+                       handle_uci($engine, $line);
+               }
        }
        
        return $engine;
 }
 
-sub read_lines {
-       my $engine = shift;
-
-       # 
-       # Read until we've got a full line -- if the engine sends part of
-       # a line and then stops we're pretty much hosed, but that should
-       # never happen.
-       #
-       while ($engine->{'readbuf'} !~ /\n/) {
-               my $tmp;
-               my $ret = sysread $engine->{'read'}, $tmp, 4096;
-
-               if (!defined($ret)) {
-                       next if ($!{EINTR});
-                       die "error in reading from the UCI engine: $!";
-               } elsif ($ret == 0) {
-                       die "EOF from UCI engine";
-               }
-
-               $engine->{'readbuf'} .= $tmp;
-       }
-
-       # Blah.
-       my @lines = ();
-       while ($engine->{'readbuf'} =~ s/^([^\n]*)\n//) {
-               my $line = $1;
-               $line =~ tr/\r\n//d;
-               push @lines, $line;
-       }
-       return @lines;
-}
-
 sub col_letter_to_num {
        return ord(shift) - ord('a');
 }
@@ -942,3 +744,12 @@ sub row_letter_to_num {
        return 7 - (ord(shift) - ord('1'));
 }
 
+sub parse_uci_move {
+       my $move = shift;
+       my $from_col = col_letter_to_num(substr($move, 0, 1));
+       my $from_row = row_letter_to_num(substr($move, 1, 1));
+       my $to_col   = col_letter_to_num(substr($move, 2, 1));
+       my $to_row   = row_letter_to_num(substr($move, 3, 1));
+       my $promo    = substr($move, 4, 1);
+       return ($from_col, $from_row, $to_col, $to_row, $promo);
+}