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);
my $black = $pgn->black;
$white =~ s/,.*//; # Remove first name.
$black =~ s/,.*//; # Remove first name.
- my $pos = Position->start_pos($white, $black);
+ my $tags = $pgn->tags();
+ my $pos;
+ if (exists($tags->{'FEN'})) {
+ $pos = Position->from_fen($tags->{'FEN'});
+ $pos->{'last_move'} = 'none';
+ $pos->{'player_w'} = $white;
+ $pos->{'player_b'} = $black;
+ $pos->{'start_fen'} = $tags->{'FEN'};
+ } else {
+ $pos = Position->start_pos($white, $black);
+ }
+ if (exists($tags->{'Variant'}) &&
+ $tags->{'Variant'} =~ /960|fischer/i) {
+ $pos->{'chess960'} = 1;
+ } else {
+ $pos->{'chess960'} = 0;
+ }
my $moves = $pgn->moves;
my @uci_moves = ();
my @repretty_moves = ();
# 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.
# It's wrong to just give the FEN (the move history is useful,
# and per the UCI spec, we should really have sent "ucinewgame"),
# but it's easier, and it works around a Stockfish repetition issue.
+ if ($engine->{'chess960'} != $pos->{'chess960'}) {
+ uciprint($engine, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+ $engine->{'chess960'} = $pos->{'chess960'};
+ }
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)) {
$engine2->{'stopping'} = 1;
uciprint($engine2, "stop");
}
+ if ($engine2->{'chess960'} != $pos->{'chess960'}) {
+ uciprint($engine2, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+ $engine2->{'chess960'} = $pos->{'chess960'};
+ }
uciprint($engine2, "position fen " . $pos->fen());
uciprint($engine2, "go infinite");
$pos_calculating_second_engine = $pos;
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') {
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 {
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.
$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"`;
+ 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';
+ 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;
}
- $tbprobe_cache{$key} = \@moves;
+ $tbprobe_cache{$key} = {
+ moves => \@moves,
+ splicepos => $splicepos
+ };
}
$info->{'pv' . $mpv} = \@moves;
} else {
$info->{'score_mate' . $mpv} = $matelen;
}
+ $info->{'splicepos' . $mpv} = $splicepos;
}
sub output {
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.
#
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};
}
# 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 {
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) {
move => $pretty_move,
pv => \@pretty_pv,
};
+ if (exists($info->{'splicepos' . $mpv})) {
+ $refutation_lines{$pretty_move}->{'splicepos'} = $info->{'splicepos' . $mpv};
+ }
};
}
}
local $dbh->{AutoCommit} = 0;
my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
- my $pos = Position->start_pos('white', 'black');
+ my $pos;
+ if (exists($pos_calculating->{'start_fen'})) {
+ $pos = Position->from_fen($pos_calculating->{'start_fen'});
+ } else {
+ $pos = Position->start_pos('white', 'black');
+ }
+ $pos->{'chess960'} = $pos_calculating->{'chess960'};
my $halfmove_num = 0;
for my $move (@{$pos_calculating->{'history'}}) {
my $id = id_for_pos($pos, $halfmove_num);
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};
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})) {
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 $id = id_for_pos($pos);
- my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=?', undef, $id);
+ my $clock_info = $dbh->selectrow_hashref('SELECT * FROM clock_info WHERE id=? AND COALESCE(white_clock_target, black_clock_target) >= EXTRACT(EPOCH FROM (CURRENT_TIMESTAMP - INTERVAL \'1 day\'));', undef, $id);
if (defined($clock_info)) {
$pos->{'white_clock'} //= $clock_info->{'white_clock'};
$pos->{'black_clock'} //= $clock_info->{'black_clock'};
return if ($tb_lookup_running);
$tb_lookup_running = 1;
- my $url = 'http://158.250.18.203:6904/tasks/addtask?auth.login=' .
+ my $url = 'http://tb7-api.chessok.com:6904/tasks/addtask?auth.login=' .
$remoteglotconf::tb_serial_key .
'&auth.password=aquarium&type=0&fen=' .
URI::Escape::uri_escape($pos->fen());
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");
+ }
+}