# analysis, or for live analysis of relayed games. (Do not use for
# cheating! Cheating is bad for your karma, and your abuser flag.)
#
-# Copyright 2007 Steinar H. Gunderson <sgunderson@bigfoot.com>
+# Copyright 2007 Steinar H. Gunderson <steinar+remoteglot@gunderson.no>
# Licensed under the GNU General Public License, version 2.
#
}
);
if (defined($remoteglotconf::target)) {
- if ($remoteglotconf::target =~ /^http:/) {
+ if ($remoteglotconf::target =~ /^https?:/) {
fetch_pgn($remoteglotconf::target);
} else {
$t->cmd("observe $remoteglotconf::target");
for my $pos ($pos_waiting, $pos_calculating) {
next if (!defined($pos));
if ($pos->fen() eq $pos_for_movelist->fen()) {
- $pos->{'pretty_history'} = \@pretty_movelist;
+ $pos->{'history'} = \@pretty_movelist;
}
}
$getting_movelist = 0;
}
$pgn->parse_game({ save_comments => 'yes' });
- my $pos = Position->start_pos($pgn->white, $pgn->black);
+ my $white = $pgn->white;
+ my $black = $pgn->black;
+ $white =~ s/,.*//; # Remove first name.
+ $black =~ s/,.*//; # Remove first name.
+ my $pos = Position->start_pos($white, $black);
my $moves = $pgn->moves;
my @uci_moves = ();
my @repretty_moves = ();
push @repretty_moves, $pretty;
$pos = $npos;
}
- $pos->{'result'} = $pgn->result;
- $pos->{'pretty_history'} = \@repretty_moves;
+ if ($pgn->result eq '1-0' || $pgn->result eq '1/2-1/2' || $pgn->result eq '0-1') {
+ $pos->{'result'} = $pgn->result;
+ }
+ $pos->{'history'} = \@repretty_moves;
extract_clock($pgn, $pos);
sub prettyprint_pv {
my ($pos, @pvs) = @_;
- my $cachekey = join('', @pvs);
+ my $cachekey = $pos->{'fen'} . join('', @pvs);
if (exists($pos->{'prettyprint_cache'}{$cachekey})) {
return @{$pos->{'prettyprint_cache'}{$cachekey}};
} else {
}
}
+my %tbprobe_cache = ();
+
+sub complete_using_tbprobe {
+ my ($pos, $info, $mpv) = @_;
+
+ # We need Fathom installed to do standalone TB probes.
+ return if (!defined($remoteglotconf::fathom_cmdline));
+
+ # If we already have a mate, don't bother; in some cases, it would even be
+ # better than a tablebase score.
+ return if defined($info->{'score_mate' . $mpv});
+
+ # If we have a draw or near-draw score, there's also not much interesting
+ # we could add from a tablebase. We only really want mates.
+ return if ($info->{'score_cp' . $mpv} >= -12250 && $info->{'score_cp' . $mpv} <= 12250);
+
+ # Run through the PV until we are at a 6-man position.
+ # TODO: We could in theory only have 5-man data.
+ my @pv = @{$info->{'pv' . $mpv}};
+ my $key = $pos->fen() . " " . join('', @pv);
+ my @moves = ();
+ if (exists($tbprobe_cache{$key})) {
+ @moves = @{$tbprobe_cache{$key}};
+ } else {
+ if ($mpv ne '') {
+ # Force doing at least one move of the PV.
+ my $move = shift @pv;
+ push @moves, $move;
+ $pos = $pos->make_move(parse_uci_move($move));
+ }
+
+ while ($pos->num_pieces() > 6 && $#pv > -1) {
+ my $move = shift @pv;
+ push @moves, $move;
+ $pos = $pos->make_move(parse_uci_move($move));
+ }
+
+ return if ($pos->num_pieces() > 6);
+
+ my $fen = $pos->fen();
+ my $pgn_text = `fathom --path=/srv/syzygy "$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.
+ for my $move (@{$pgn->moves}) {
+ my $uci_move;
+ ($pos, $uci_move) = $pos->make_pretty_move($move);
+ push @moves, $uci_move;
+ }
+
+ $tbprobe_cache{$key} = \@moves;
+ }
+
+ $info->{'pv' . $mpv} = \@moves;
+
+ my $matelen = int((1 + scalar @moves) / 2);
+ if ((scalar @moves) % 2 == 0) {
+ $info->{'score_mate' . $mpv} = -$matelen;
+ } else {
+ $info->{'score_mate' . $mpv} = $matelen;
+ }
+}
+
sub output {
#return;
for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
if (exists($info->{$key . '1'})) {
$info->{$key} = $info->{$key . '1'};
+ } else {
+ delete $info->{$key};
}
}
}
return;
}
+ # Now do our own Syzygy tablebase probes to convert scores like +123.45 to mate.
+ if (exists($info->{'pv'})) {
+ complete_using_tbprobe($pos_calculating, $info, '');
+ }
+
+ my $mpv = 1;
+ while (exists($info->{'pv' . $mpv})) {
+ complete_using_tbprobe($pos_calculating, $info, $mpv);
+ ++$mpv;
+ }
+
output_screen();
output_json(0);
$latest_update = [Time::HiRes::gettimeofday];
my $info = $engine2->{'info'};
last if (!exists($info->{'pv' . $mpv}));
eval {
+ complete_using_tbprobe($pos_calculating_second_engine, $info, $mpv);
my $pv = $info->{'pv' . $mpv};
-
my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine, $pv->[0]));
my @pretty_pv = prettyprint_pv($pos_calculating_second_engine, @$pv);
if (scalar @pretty_pv > 5) {
if (defined($remoteglotconf::move_source_url)) {
$json->{'move_source_url'} = $remoteglotconf::move_source_url;
}
- $json->{'score'} = long_score($info, $pos_calculating, '');
- $json->{'short_score'} = short_score($info, $pos_calculating, '');
- $json->{'plot_score'} = plot_score($info, $pos_calculating, '');
+ $json->{'score'} = score_digest($info, $pos_calculating, '');
$json->{'using_lomonosov'} = defined($remoteglotconf::tb_serial_key);
$json->{'nodes'} = $info->{'nodes'};
$json->{'tbhits'} = $info->{'tbhits'};
$json->{'seldepth'} = $info->{'seldepth'};
$json->{'tablebase'} = $info->{'tablebase'};
-
- $json->{'pv_uci'} = $info->{'pv'}; # Still needs to be there for the JS to calculate arrows; only for the primary PV, though!
- $json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
+ $json->{'pv'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
my %refutation_lines = ();
my @refutation_lines = ();
last if (!exists($info->{'pv' . $mpv}));
eval {
+ complete_using_tbprobe($pos_calculating, $info, $mpv);
my $pv = $info->{'pv' . $mpv};
my $pretty_move = join('', prettyprint_pv($pos_calculating, $pv->[0]));
my @pretty_pv = prettyprint_pv($pos_calculating, @$pv);
- $refutation_lines{$pv->[0]} = {
- sort_key => $pretty_move,
+ $refutation_lines{$pretty_move} = {
depth => $info->{'depth' . $mpv},
- score_sort_key => score_sort_key($info, $pos_calculating, $mpv, 0),
- pretty_score => short_score($info, $pos_calculating, $mpv),
- pretty_move => $pretty_move,
- pv_pretty => \@pretty_pv,
+ score => score_digest($info, $pos_calculating, $mpv),
+ move => $pretty_move,
+ pv => \@pretty_pv,
};
};
}
$json->{'refutation_lines'} = \%refutation_lines;
# Piece together historic score information, to the degree we have it.
- if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) {
+ if (!$historic_json_only && exists($pos_calculating->{'history'})) {
my %score_history = ();
my $q = $dbh->prepare('SELECT * FROM scores WHERE id=?');
my $pos = Position->start_pos('white', 'black');
my $halfmove_num = 0;
- for my $move (@{$pos_calculating->{'pretty_history'}}) {
+ for my $move (@{$pos_calculating->{'history'}}) {
my $id = id_for_pos($pos, $halfmove_num);
my $ref = $dbh->selectrow_hashref($q, undef, $id);
if (defined($ref)) {
$score_history{$halfmove_num} = [
- $ref->{'plot_score'},
- $ref->{'short_score'}
+ $ref->{'score_type'},
+ $ref->{'score_value'}
];
}
++$halfmove_num;
}
# Give out a list of other games going on. (Empty is fine.)
+ # TODO: Don't bother reading our own file, the data will be stale anyway.
if (!$historic_json_only) {
my @games = ();
my $white = $other_game_json->{'position'}{'player_w'} // die 'Missing white';
my $black = $other_game_json->{'position'}{'player_b'} // die 'Missing black';
- push @games, {
+ my $game = {
id => $ref->{'id'},
name => "$white–$black",
- url => $ref->{'url'}
+ url => $ref->{'url'},
+ hashurl => $ref->{'hash_url'},
};
+ if (defined($other_game_json->{'position'}{'result'})) {
+ $game->{'result'} = $other_game_json->{'position'}{'result'};
+ } else {
+ $game->{'score'} = $other_game_json->{'score'};
+ }
+ push @games, $game;
};
if ($@) {
warn "Could not add external game " . $ref->{'json_path'} . ": $@";
$last_written_json = $encoded;
}
- if (exists($pos_calculating->{'pretty_history'}) &&
+ if (exists($pos_calculating->{'history'}) &&
defined($remoteglotconf::json_history_dir)) {
my $id = id_for_pos($pos_calculating);
my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json";
$new_depth > $old_depth ||
($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
atomic_set_contents($filename, $encoded);
- if (defined($json->{'plot_score'})) {
- $dbh->do('INSERT INTO scores (id, plot_score, short_score, engine, depth, nodes) VALUES (?,?,?,?,?,?) ' .
+ if (defined($json->{'score'})) {
+ $dbh->do('INSERT INTO scores (id, score_type, score_value, engine, depth, nodes) VALUES (?,?,?,?,?,?) ' .
' ON CONFLICT (id) DO UPDATE SET ' .
- ' plot_score=EXCLUDED.plot_score, ' .
- ' short_score=EXCLUDED.short_score, ' .
+ ' score_type=EXCLUDED.score_type, ' .
+ ' score_value=EXCLUDED.score_value, ' .
' engine=EXCLUDED.engine, ' .
' depth=EXCLUDED.depth, ' .
' nodes=EXCLUDED.nodes',
undef,
- $id, $json->{'plot_score'}, $json->{'short_score'},
+ $id, $json->{'score'}[0], $json->{'score'}[1],
$json->{'engine'}{'name'}, $new_depth, $new_nodes);
}
}
sub id_for_pos {
my ($pos, $halfmove_num) = @_;
- $halfmove_num //= scalar @{$pos->{'pretty_history'}};
+ $halfmove_num //= scalar @{$pos->{'history'}};
(my $fen = $pos->fen()) =~ tr,/ ,-_,;
return "move$halfmove_num-$fen";
}
return undef;
}
-sub score_sort_key {
- my ($info, $pos, $mpv, $invert) = @_;
+# Sufficient for computing long_score, short_score, plot_score and
+# (with side-to-play information) score_sort_key.
+sub score_digest {
+ my ($info, $pos, $mpv) = @_;
if (defined($info->{'score_mate' . $mpv})) {
my $mate = $info->{'score_mate' . $mpv};
- my $score;
- if ($mate > 0) {
- # Side to move mates
- $score = 99999 - $mate;
- } else {
- # Side to move is getting mated (note the double negative for $mate)
- $score = -99999 - $mate;
- }
- if ($invert) {
- $score = -$score;
+ if ($pos->{'toplay'} eq 'B') {
+ $mate = -$mate;
}
- return $score;
+ return ['m', $mate];
} else {
if (exists($info->{'score_cp' . $mpv})) {
my $score = $info->{'score_cp' . $mpv};
- if ($invert) {
+ if ($pos->{'toplay'} eq 'B') {
$score = -$score;
}
- return $score;
+ if ($score == 0 && $info->{'tablebase'}) {
+ return ['d', undef];
+ } else {
+ return ['cp', int($score)];
+ }
}
}
# TODO(sesse): Maybe we can get the number of moves somehow else for FICS games.
# The history is needed for id_for_pos.
- if (!exists($pos->{'pretty_history'})) {
+ if (!exists($pos->{'history'})) {
return;
}
projects / remoteglot / blobdiff