X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=b9055a64d30616ff945bed8fd59c500ab8eeb62c;hp=c86eedee530e2a1e879e8b413aa2ceb524a1c551;hb=7fd4b5cef7a4121054ac85cb4cb22776cb30e72e;hpb=17c1ac08187cea6c69bd193f43a58bc984d9a5bc

diff --git a/remoteglot.pl b/remoteglot.pl
index c86eede..b9055a6 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -76,19 +76,20 @@ my $last_move;
 my $last_text = '';
 my ($pos_calculating, $pos_calculating_second_engine);
 
-uciprint($engine, "setoption name UCI_AnalyseMode value true");
-uciprint($engine, "setoption name Analysis Contempt value Off");
-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");
-	uciprint($engine2, "setoption name Analysis Contempt value Off");
-	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");
 }
@@ -396,12 +397,23 @@ sub handle_position {
 		# 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.
@@ -419,6 +431,8 @@ sub handle_position {
 	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)) {
@@ -492,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') {
@@ -543,10 +558,14 @@ sub prettyprint_pv_no_cache {
 		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 {
@@ -583,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.
@@ -593,30 +615,36 @@ sub complete_using_tbprobe {
 			$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;
@@ -627,6 +655,7 @@ sub complete_using_tbprobe {
 	} else {
 		$info->{'score_mate' . $mpv} = $matelen;
 	}
+	$info->{'splicepos' . $mpv} = $splicepos;
 }
 
 sub output {
@@ -634,23 +663,40 @@ 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};
 		}
@@ -690,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 {
@@ -735,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 {
@@ -812,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) {
@@ -912,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};
+				}
 			};
 		}
 	}
@@ -1123,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};
@@ -1149,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})) {
@@ -1204,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) = @_;
 
@@ -1475,3 +1504,16 @@ sub parse_uci_move {
 	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");
+	}
+}