my $last_text = '';
my ($pos_calculating, $pos_calculating_second_engine);
-uciprint($engine, "setoption name UCI_AnalyseMode value true");
-while (my ($key, $value) = each %remoteglotconf::engine_config) {
- uciprint($engine, "setoption name $key value $value");
-}
+# If not undef, we've started calculating this position but haven't ever given out
+# 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");
if (defined($engine2)) {
- uciprint($engine2, "setoption name UCI_AnalyseMode value true");
- while (my ($key, $value) = each %remoteglotconf::engine2_config) {
- uciprint($engine2, "setoption name $key value $value");
- }
+ setoptions($engine2, \%remoteglotconf::engine2_config);
uciprint($engine2, "setoption name MultiPV value 500");
uciprint($engine2, "ucinewgame");
}
);
}
if (defined($remoteglotconf::target)) {
- if ($remoteglotconf::target =~ /^https?:/) {
+ if ($remoteglotconf::target =~ /^(?:\/|https?:)/) {
fetch_pgn($remoteglotconf::target);
} elsif (defined($t)) {
$t->cmd("observe $remoteglotconf::target");
# Starts periodic fetching of PGNs from the given URL.
sub fetch_pgn {
my ($url) = @_;
- AnyEvent::HTTP::http_get($url, sub {
- handle_pgn(@_, $url);
- });
+ if ($url =~ m#^/#) { # Local file.
+ eval {
+ local $/ = undef;
+ open my $fh, "<", $url
+ or die "$url: $!";
+ my $pgn = <$fh>;
+ close $fh;
+ handle_pgn($pgn, '', $url);
+ };
+ if ($@) {
+ warn "$url: $@";
+ $http_timer = AnyEvent->timer(after => 1.0, cb => sub {
+ fetch_pgn($url);
+ });
+ }
+ } else {
+ AnyEvent::HTTP::http_get($url, sub {
+ handle_pgn(@_, $url);
+ });
+ }
}
my ($last_pgn_white, $last_pgn_black);
# the position.)
#
# Do not output anything new to the main analysis; that's
- # going to be obsolete really soon.
+ # going to be obsolete really soon. (Exception: If we've never
+ # output anything for this move, ie., it didn't hit the 200ms
+ # limit, spit it out to the user anyway. It's probably a really
+ # fast blitz game or something, and it's good to show the moves
+ # as they come in even without great analysis.)
$pos_calculating->{'white_clock'} = $pos->{'white_clock'};
$pos_calculating->{'black_clock'} = $pos->{'black_clock'};
delete $pos_calculating->{'white_clock_target'};
delete $pos_calculating->{'black_clock_target'};
- output_json(1);
+
+ if (defined($pos_calculating_started)) {
+ output_json(0);
+ } else {
+ 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.
uciprint($engine, "position fen " . $pos->fen());
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)) {
return ();
}
- my $pv = shift @pvs;
- my ($from_row, $from_col, $to_row, $to_col, $promo) = parse_uci_move($pv);
- my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
- return ( $pretty, prettyprint_pv_no_cache($nb, @pvs) );
+ my @ret = ();
+ for my $pv (@pvs) {
+ my ($from_row, $from_col, $to_row, $to_col, $promo) = parse_uci_move($pv);
+ my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
+ push @ret, $pretty;
+ $board = $nb;
+ }
+ return @ret;
}
sub prettyprint_pv {
$pos = $pos->make_move(parse_uci_move($move));
}
- while ($pos->num_pieces() > 6 && $#pv > -1) {
+ while ($pos->num_pieces() > 7 && $#pv > -1) {
my $move = shift @pv;
push @moves, $move;
$pos = $pos->make_move(parse_uci_move($move));
}
- return if ($pos->num_pieces() > 6);
+ return if ($pos->num_pieces() > 7);
my $fen = $pos->fen();
my $pgn_text = `fathom --path=/srv/syzygy "$fen"`;
# Splice the PV from the tablebase onto what we have so far.
for my $move (@{$pgn->moves}) {
last if $move eq '#';
+ last if $move eq '1-0';
+ last if $move eq '0-1';
+ last if $move eq '1/2-1/2';
my $uci_move;
($pos, $uci_move) = $pos->make_pretty_move($move);
push @moves, $uci_move;
return if (!defined($pos_calculating));
+ my $info = $engine->{'info'};
+
# Don't update too often.
- my $age = Time::HiRes::tv_interval($latest_update);
- if ($age < $remoteglotconf::update_max_interval) {
- my $wait = $remoteglotconf::update_max_interval + 0.01 - $age;
- $output_timer = AnyEvent->timer(after => $wait, cb => \&output);
+ 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;
+
+ # We're outputting something for this position now, so the special handling
+ # for new positions is off.
+ undef $pos_calculating_started;
- my $info = $engine->{'info'};
-
#
# If we have tablebase data from a previous lookup, replace the
# engine data with the data from the tablebase.
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 {
$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) {
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) = @_;
my $promo = substr($move, 4, 1);
return ($from_row, $from_col, $to_row, $to_col, $promo);
}
+
+sub setoptions {
+ my ($engine, $config) = @_;
+ uciprint($engine, "setoption name UCI_AnalyseMode value true");
+ uciprint($engine, "setoption name Analysis Contempt value Off");
+ if (exists($config->{'Threads'})) { # Threads first, because clearing hash can be multithreaded then.
+ uciprint($engine, "setoption name Threads value " . $config->{'Threads'});
+ }
+ while (my ($key, $value) = each %$config) {
+ next if $key eq 'Threads';
+ uciprint($engine, "setoption name $key value $value");
+ }
+}