X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=b9055a64d30616ff945bed8fd59c500ab8eeb62c;hp=c574ed05a62027a76b66d2dbf70b80d03cb054e9;hb=de34a09e6a65e3fd580919740b28e3fffd466c12;hpb=fcf187d3357d15598245b7444ac383752bd29e13 diff --git a/remoteglot.pl b/remoteglot.pl index c574ed0..b9055a6 100755 --- a/remoteglot.pl +++ b/remoteglot.pl @@ -80,6 +80,11 @@ my ($pos_calculating, $pos_calculating_second_engine); # any analysis for it, so we're on a forced timer to do so. my $pos_calculating_started = undef; +# If not undef, we've output this position, but without a main PV, so we're on +# _another_ forced timer to do so. +my $pos_pv_started = undef; +my $last_output_had_pv = 0; + setoptions($engine, \%remoteglotconf::engine_config); uciprint($engine, "ucinewgame"); @@ -408,6 +413,7 @@ sub handle_position { output_json(1); } $pos_calculating_started = [Time::HiRes::gettimeofday]; + $pos_pv_started = undef; # Ask the engine to stop; we will throw away its data until it # sends us "bestmove", signaling the end of it. @@ -426,6 +432,7 @@ sub handle_position { uciprint($engine, "go infinite"); $pos_calculating = $pos; $pos_calculating_started = [Time::HiRes::gettimeofday]; + $pos_pv_started = undef; if (defined($engine2)) { if (defined($pos_calculating_second_engine)) { @@ -499,6 +506,7 @@ sub parse_infos { delete $info->{'score_cp' . $mpv}; delete $info->{'score_mate' . $mpv}; + delete $info->{'splicepos' . $mpv}; while ($x[0] eq 'cp' || $x[0] eq 'mate') { if ($x[0] eq 'cp') { @@ -594,8 +602,11 @@ sub complete_using_tbprobe { my @pv = @{$info->{'pv' . $mpv}}; my $key = $pos->fen() . " " . join('', @pv); my @moves = (); + my $splicepos; if (exists($tbprobe_cache{$key})) { - @moves = @{$tbprobe_cache{$key}}; + my $c = $tbprobe_cache{$key}; + @moves = @{$c->{'moves'}}; + $splicepos = $c->{'splicepos'}; } else { if ($mpv ne '') { # Force doing at least one move of the PV. @@ -613,13 +624,13 @@ sub complete_using_tbprobe { return if ($pos->num_pieces() > 7); my $fen = $pos->fen(); - my $pgn_text = `fathom --path=/srv/syzygy "$fen"`; + my $pgn_text = `$remoteglotconf::fathom_cmdline "$fen"`; my $pgn = Chess::PGN::Parse->new(undef, $pgn_text); return if (!defined($pgn) || !$pgn->read_game() || ($pgn->result ne '0-1' && $pgn->result ne '1-0')); $pgn->quick_parse_game; - $info->{'pv' . $mpv} = \@moves; # Splice the PV from the tablebase onto what we have so far. + $splicepos = scalar @moves; for my $move (@{$pgn->moves}) { last if $move eq '#'; last if $move eq '1-0'; @@ -630,7 +641,10 @@ sub complete_using_tbprobe { push @moves, $uci_move; } - $tbprobe_cache{$key} = \@moves; + $tbprobe_cache{$key} = { + moves => \@moves, + splicepos => $splicepos + }; } $info->{'pv' . $mpv} = \@moves; @@ -641,6 +655,7 @@ sub complete_using_tbprobe { } else { $info->{'score_mate' . $mpv} = $matelen; } + $info->{'splicepos' . $mpv} = $splicepos; } sub output { @@ -648,19 +663,29 @@ sub output { return if (!defined($pos_calculating)); + my $info = $engine->{'info'}; + # Don't update too often. my $wait = $remoteglotconf::update_max_interval - Time::HiRes::tv_interval($latest_update); if (defined($pos_calculating_started)) { my $new_pos_wait = $remoteglotconf::update_force_after_move - Time::HiRes::tv_interval($pos_calculating_started); $wait = $new_pos_wait if ($new_pos_wait < $wait); } + if (!$last_output_had_pv && has_pv($info)) { + if (!defined($pos_pv_started)) { + $pos_pv_started = [Time::HiRes::gettimeofday]; + } + # We just got initial PV, and we're in a hurry since we gave out a blank one earlier, + # so give us just 200ms more to increase the quality and then force a display. + my $new_pos_wait = $remoteglotconf::update_force_after_move - Time::HiRes::tv_interval($pos_pv_started); + $wait = $new_pos_wait if ($new_pos_wait < $wait); + } if ($wait > 0.0) { $output_timer = AnyEvent->timer(after => $wait + 0.01, cb => \&output); return; } + $pos_pv_started = undef; - my $info = $engine->{'info'}; - # We're outputting something for this position now, so the special handling # for new positions is off. undef $pos_calculating_started; @@ -671,7 +696,7 @@ sub output { # my $fen = $pos_calculating->fen(); if (exists($tb_cache{$fen})) { - for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) { + for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits splicepos)) { delete $info->{$key . '1'}; delete $info->{$key}; } @@ -711,7 +736,7 @@ sub output { # specified. # if (exists($info->{'pv1'}) && !exists($info->{'pv2'})) { - for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) { + for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits splicepos)) { if (exists($info->{$key . '1'})) { $info->{$key} = $info->{$key . '1'}; } else { @@ -756,6 +781,14 @@ sub output { output_screen(); output_json(0); $latest_update = [Time::HiRes::gettimeofday]; + $last_output_had_pv = has_pv($info); +} + +sub has_pv { + my $info = shift; + return 1 if (exists($info->{'pv'}) && (scalar(@{$info->{'pv'}}) > 0)); + return 1 if (exists($info->{'pv1'}) && (scalar(@{$info->{'pv1'}}) > 0)); + return 0; } sub output_screen { @@ -833,8 +866,6 @@ sub output_screen { $text .= "\n\n"; } - #$text .= book_info($pos_calculating->fen(), $pos_calculating->{'board'}, $pos_calculating->{'toplay'}); - my @refutation_lines = (); if (defined($engine2)) { for (my $mpv = 1; $mpv < 500; ++$mpv) { @@ -933,6 +964,9 @@ sub output_json { move => $pretty_move, pv => \@pretty_pv, }; + if (exists($info->{'splicepos' . $mpv})) { + $refutation_lines{$pretty_move}->{'splicepos'} = $info->{'splicepos' . $mpv}; + } }; } } @@ -1144,7 +1178,24 @@ sub score_digest { if ($pos->{'toplay'} eq 'B') { $mate = -$mate; } - return ['m', $mate]; + if (exists($info->{'splicepos' . $mpv})) { + my $sp = $info->{'splicepos' . $mpv}; + if ($mate > 0) { + return ['T', $sp]; + } else { + return ['t', $sp]; + } + } else { + if ($mate > 0) { + return ['M', $mate]; + } elsif ($mate < 0) { + return ['m', -$mate]; + } elsif ($pos->{'toplay'} eq 'B') { + return ['M', 0]; + } else { + return ['m', 0]; + } + } } else { if (exists($info->{'score_cp' . $mpv})) { my $score = $info->{'score_cp' . $mpv}; @@ -1170,10 +1221,19 @@ sub long_score { if ($pos->{'toplay'} eq 'B') { $mate = -$mate; } - if ($mate > 0) { - return sprintf "White mates in %u", $mate; + if (exists($info->{'splicepos' . $mpv})) { + my $sp = $info->{'splicepos' . $mpv}; + if ($mate > 0) { + return sprintf "White wins in %u", int(($sp + 1) * 0.5); + } else { + return sprintf "Black wins in %u", int(($sp + 1) * 0.5); + } } else { - return sprintf "Black mates in %u", -$mate; + if ($mate > 0) { + return sprintf "White mates in %u", $mate; + } else { + return sprintf "Black mates in %u", -$mate; + } } } else { if (exists($info->{'score_cp' . $mpv})) { @@ -1225,58 +1285,6 @@ sub plot_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 "" 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_no_cache($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; -} - sub extract_clock { my ($pgn, $pos) = @_;