use Time::HiRes;
use JSON::XS;
use URI::Escape;
+use Tie::Persistent;
require 'Position.pm';
require 'Engine.pm';
require 'config.pm';
my $tb_lookup_running = 0;
my $last_written_json = undef;
-# TODO: Persist (parts of) this so that we can restart.
-my %clock_target_for_pos = ();
+# Persisted so that we can restart.
+tie my %clock_info_for_pos, 'Tie::Persistent', 'clock_info.db', 'rw';
+(tied %clock_info_for_pos)->autosync(1);
+
+tie my %json_for_pos, 'Tie::Persistent', 'analysis_info.db', 'rw';
+(tied %json_for_pos)->autosync(1);
$| = 1;
sub handle_position {
my ($pos) = @_;
- find_clock_start($pos);
+ find_clock_start($pos, $pos_calculating);
# if this is already in the queue, ignore it (just update the result)
if (defined($pos_waiting) && $pos->fen() eq $pos_waiting->fen()) {
$json->{'id'} = $engine->{'id'};
$json->{'score'} = long_score($info, $pos_calculating, '');
$json->{'short_score'} = short_score($info, $pos_calculating, '');
+ $json->{'plot_score'} = plot_score($info, $pos_calculating, '');
$json->{'nodes'} = $info->{'nodes'};
$json->{'nps'} = $info->{'nps'};
}
$json->{'refutation_lines'} = \%refutation_lines;
- my $encoded = JSON::XS::encode_json($json);
+ # Piece together historic score information, to the degree we have it.
+ if (!$historic_json_only && exists($pos_calculating->{'pretty_history'})) {
+ my %score_history = ();
+
+ my $pos = Position->start_pos('white', 'black');
+ my $halfmove_num = 0;
+ for my $move (@{$pos_calculating->{'pretty_history'}}) {
+ my $id = id_for_pos($pos, $halfmove_num);
+ if (exists($json_for_pos{$id}) && defined($json_for_pos{$id}->{'plot_score'})) {
+ $score_history{$halfmove_num} = [
+ $json_for_pos{$id}->{'plot_score'},
+ $json_for_pos{$id}->{'short_score'}
+ ];
+ }
+ ++$halfmove_num;
+ ($pos) = $pos->make_pretty_move($move);
+ }
+
+ # If at any point we are missing 10 consecutive moves,
+ # truncate the history there. This is so we don't get into
+ # a situation where we e.g. start analyzing at move 45,
+ # but we have analysis for 1. e4 from some completely different game
+ # and thus show a huge hole.
+ my $consecutive_missing = 0;
+ my $truncate_until = 0;
+ for (my $i = $halfmove_num; $i --> 0; ) {
+ if ($consecutive_missing >= 10) {
+ delete $score_history{$i};
+ next;
+ }
+ if (exists($score_history{$i})) {
+ $consecutive_missing = 0;
+ } else {
+ ++$consecutive_missing;
+ }
+ }
+
+ $json->{'score_history'} = \%score_history;
+ }
+
+ my $json_enc = JSON::XS->new;
+ $json_enc->canonical(1);
+ my $encoded = $json_enc->encode($json);
unless ($historic_json_only || !defined($remoteglotconf::json_output) ||
(defined($last_written_json) && $last_written_json eq $encoded)) {
atomic_set_contents($remoteglotconf::json_output, $encoded);
if (exists($pos_calculating->{'pretty_history'}) &&
defined($remoteglotconf::json_history_dir)) {
- my $filename = $remoteglotconf::json_history_dir . "/" . id_for_pos($pos_calculating) . ".json";
+ my $id = id_for_pos($pos_calculating);
+ my $filename = $remoteglotconf::json_history_dir . "/" . $id . ".json";
# Overwrite old analysis (assuming it exists at all) if we're
# using a different engine, or if we've calculated deeper.
$new_depth > $old_depth ||
($new_depth == $old_depth && $new_nodes >= $old_nodes)) {
atomic_set_contents($filename, $encoded);
+ $json_for_pos{$id} = $json;
}
}
}
}
sub id_for_pos {
- my $pos = shift;
+ my ($pos, $halfmove_num) = @_;
- my $halfmove_num = scalar @{$pos->{'pretty_history'}};
+ $halfmove_num //= scalar @{$pos->{'pretty_history'}};
(my $fen = $pos->fen()) =~ tr,/ ,-_,;
return "move$halfmove_num-$fen";
}
return undef;
}
+# For graphs; a single number in centipawns, capped at +/- 500.
+sub plot_score {
+ my ($info, $pos, $mpv) = @_;
+
+ my $invert = ($pos->{'toplay'} eq 'B');
+ if (defined($info->{'score_mate' . $mpv})) {
+ my $mate = $info->{'score_mate' . $mpv};
+ if ($invert) {
+ $mate = -$mate;
+ }
+ if ($mate > 0) {
+ return 500;
+ } else {
+ return -500;
+ }
+ } else {
+ if (exists($info->{'score_cp' . $mpv})) {
+ my $score = $info->{'score_cp' . $mpv};
+ if ($invert) {
+ $score = -$score;
+ }
+ $score = 500 if ($score > 500);
+ $score = -500 if ($score < -500);
+ return int($score);
+ }
+ }
+
+ return undef;
+}
+
my %book_cache = ();
sub book_info {
my ($fen, $board, $toplay) = @_;
# Look for extended PGN clock tags.
my $tags = $pgn->tags;
if (exists($tags->{'WhiteClock'}) && exists($tags->{'BlackClock'})) {
- $pos->{'white_clock'} = $tags->{'WhiteClock'};
- $pos->{'black_clock'} = $tags->{'BlackClock'};
-
- $pos->{'white_clock'} =~ s/\b(\d)\b/0$1/g;
- $pos->{'black_clock'} =~ s/\b(\d)\b/0$1/g;
+ $pos->{'white_clock'} = hms_to_sec($tags->{'WhiteClock'});
+ $pos->{'black_clock'} = hms_to_sec($tags->{'BlackClock'});
return;
}
$comments->{$white_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/ &&
$comments->{$black_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/) {
$comments->{$white_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/;
- $pos->{'white_clock'} = $1;
+ $pos->{'white_clock'} = hms_to_sec($1);
$comments->{$black_key} =~ /(?:tl=|clk )(\d+:\d+:\d+)/;
- $pos->{'black_clock'} = $1;
-
- $pos->{'white_clock'} =~ s/\b(\d)\b/0$1/g;
- $pos->{'black_clock'} =~ s/\b(\d)\b/0$1/g;
+ $pos->{'black_clock'} = hms_to_sec($1);
return;
}
delete $pos->{'black_clock'};
}
+sub hms_to_sec {
+ my $hms = shift;
+ return undef if (!defined($hms));
+ $hms =~ /(\d+):(\d+):(\d+)/;
+ return $1 * 3600 + $2 * 60 + $3;
+}
+
sub find_clock_start {
- my $pos = shift;
+ my ($pos, $prev_pos) = @_;
# If the game is over, the clock is stopped.
if (exists($pos->{'result'}) &&
# When we don't have any moves, we assume the clock hasn't started yet.
if ($pos->{'move_num'} == 1 && $pos->{'toplay'} eq 'W') {
+ if (defined($remoteglotconf::adjust_clocks_before_move)) {
+ &$remoteglotconf::adjust_clocks_before_move(\$pos->{'white_clock'}, \$pos->{'black_clock'}, 1, 'W');
+ }
return;
}
}
my $id = id_for_pos($pos);
- if (exists($clock_target_for_pos{$id})) {
+ if (exists($clock_info_for_pos{$id})) {
+ $pos->{'white_clock'} //= $clock_info_for_pos{$id}{'white_clock'};
+ $pos->{'black_clock'} //= $clock_info_for_pos{$id}{'black_clock'};
if ($pos->{'toplay'} eq 'W') {
- $pos->{'white_clock_target'} = $clock_target_for_pos{$id};
+ $pos->{'white_clock_target'} = $clock_info_for_pos{$id}->{'white_clock_target'};
} else {
- $pos->{'black_clock_target'} = $clock_target_for_pos{$id};
+ $pos->{'black_clock_target'} = $clock_info_for_pos{$id}->{'black_clock_target'};
}
return;
}
# OK, we haven't seen this position before, so we assume the move
# happened right now.
+
+ # See if we should do our own clock management (ie., clock information
+ # is spurious or non-existent).
+ if (defined($remoteglotconf::adjust_clocks_before_move)) {
+ my $wc = $pos->{'white_clock'} // $prev_pos->{'white_clock'};
+ my $bc = $pos->{'black_clock'} // $prev_pos->{'black_clock'};
+ if (defined($prev_pos->{'white_clock_target'})) {
+ $wc = $prev_pos->{'white_clock_target'} - time;
+ }
+ if (defined($prev_pos->{'black_clock_target'})) {
+ $bc = $prev_pos->{'black_clock_target'} - time;
+ }
+ &$remoteglotconf::adjust_clocks_before_move(\$wc, \$bc, $pos->{'move_num'}, $pos->{'toplay'});
+ $pos->{'white_clock'} = $wc;
+ $pos->{'black_clock'} = $bc;
+ }
+
my $key = ($pos->{'toplay'} eq 'W') ? 'white_clock' : 'black_clock';
if (!exists($pos->{$key})) {
# No clock information.
return;
}
- $pos->{$key} =~ /(\d+):(\d+):(\d+)/;
- my $time_left = $1 * 3600 + $2 * 60 + $3;
- $clock_target_for_pos{$id} = time + $time_left;
+ my $time_left = $pos->{$key};
+ my $clock_info = {
+ white_clock => $pos->{'white_clock'},
+ black_clock => $pos->{'black_clock'}
+ };
if ($pos->{'toplay'} eq 'W') {
- $pos->{'white_clock_target'} = $clock_target_for_pos{$id};
+ $clock_info->{'white_clock_target'} = $pos->{'white_clock_target'} = time + $time_left;
} else {
- $pos->{'black_clock_target'} = $clock_target_for_pos{$id};
+ $clock_info->{'black_clock_target'} = $pos->{'black_clock_target'} = time + $time_left;
}
+ $clock_info_for_pos{$id} = $clock_info;
}
sub schedule_tb_lookup {