X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=313ccbe9026c1d807b641d39473de330132ac866;hp=baed79ae476cb47cadbd7a9973d6998d9dc4974c;hb=a42a7b25408acf92a72a4c04f4b577e5c8b38195;hpb=faf19b0ff0a5cbc2e814bd095c95d64730e18d27

diff --git a/remoteglot.pl b/remoteglot.pl
index baed79a..313ccbe 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -13,6 +13,7 @@ use Net::Telnet;
 use FileHandle;
 use IPC::Open2;
 use Time::HiRes;
+use JSON::XS;
 use strict;
 use warnings;
 
@@ -20,9 +21,11 @@ use warnings;
 my $server = "freechess.org";
 my $target = "GMCarlsen";
 my $engine_cmdline = "'./Deep Rybka 4 SSE42 x64'";
+my $engine2_cmdline = "./stockfish_13111119_x64_modern_sse42";
 my $telltarget = undef;   # undef to be silent
 my @tell_intervals = (5, 20, 60, 120, 240, 480, 960);  # after each move
 my $uci_assume_full_compliance = 0;                    # dangerous :-)
+my $update_max_interval = 1.0;
 my @masters = (
 	'Sesse',
 	'Sessse',
@@ -32,7 +35,8 @@ my @masters = (
 );
 
 # Program starts here
-$SIG{ALRM} = sub { output_screen(); };
+$SIG{ALRM} = sub { output(); };
+my $latest_update = undef;
 
 $| = 1;
 
@@ -50,13 +54,12 @@ $| = 1;
 select(STDOUT);
 
 # open the chess engine
-my $engine = open_engine($engine_cmdline);
-my %uciinfo = ();
-my %uciid = ();
+my $engine = open_engine($engine_cmdline, 'E1');
+my $engine2 = open_engine($engine2_cmdline, 'E2');
 my ($last_move, $last_tell);
 my $last_text = '';
 my $last_told_text = '';
-my ($pos_waiting, $pos_calculating);
+my ($pos_waiting, $pos_calculating, $pos_calculating_second_engine);
 
 uciprint($engine, "setoption name UCI_AnalyseMode value true");
 # uciprint($engine, "setoption name NalimovPath value /srv/tablebase");
@@ -65,6 +68,14 @@ uciprint($engine, "setoption name Hash value 1024");
 # uciprint($engine, "setoption name MultiPV value 2");
 uciprint($engine, "ucinewgame");
 
+uciprint($engine2, "setoption name UCI_AnalyseMode value true");
+# uciprint($engine2, "setoption name NalimovPath value /srv/tablebase");
+uciprint($engine2, "setoption name NalimovUsage value Rarely");
+uciprint($engine2, "setoption name Hash value 1024");
+uciprint($engine2, "setoption name Threads value 8");
+uciprint($engine2, "setoption name MultiPV value 500");
+uciprint($engine2, "ucinewgame");
+
 print "Chess engine ready.\n";
 
 # now talk to FICS
@@ -87,6 +98,7 @@ while (1) {
 	my $rin = '';
 	my $rout;
 	vec($rin, fileno($engine->{'read'}), 1) = 1;
+	vec($rin, fileno($engine2->{'read'}), 1) = 1;
 	vec($rin, fileno($t), 1) = 1;
 
 	my ($nfound, $timeleft) = select($rout=$rin, undef, undef, 5.0);
@@ -131,8 +143,16 @@ while (1) {
 				$pos_calculating = $pos;
 			}
 
-			%uciinfo = ();
+			if (defined($pos_calculating_second_engine)) {
+				uciprint($engine2, "stop");
+			} else {
+				uciprint($engine2, "position fen " . $pos->{'fen'});
+				uciprint($engine2, "go infinite");
+				$pos_calculating_second_engine = $pos;
+			}
+
 			$engine->{'info'} = {};
+			$engine2->{'info'} = {};
 			$last_move = time;
 
 			# 
@@ -165,24 +185,36 @@ while (1) {
 	
 	# any fun on the UCI channel?
 	if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-		my $line = read_line($engine->{'read'});
-		handle_uci($engine, $line);
+		my @lines = read_lines($engine);
+		for my $line (@lines) {
+			next if $line =~ /(upper|lower)bound/;
+			handle_uci($engine, $line, 1);
+		}
 		$sleep = 0;
 
-		# don't update too often
-		Time::HiRes::alarm(0.2);
+		output();
+	}
+	if ($nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
+		my @lines = read_lines($engine2);
+		for my $line (@lines) {
+			next if $line =~ /(upper|lower)bound/;
+			handle_uci($engine2, $line, 0);
+		}
+		$sleep = 0;
+
+		output();
 	}
 
 	sleep $sleep;
 }
 
 sub handle_uci {
-	my ($engine, $line) = @_;
+	my ($engine, $line, $primary) = @_;
 
 	chomp $line;
 	$line =~ tr/\r//d;
 	$line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
-	print UCILOG localtime() . " <= $line\n";
+	print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
 	if ($line =~ /^info/) {
 		my (@infos) = split / /, $line;
 		shift @infos;
@@ -195,13 +227,22 @@ sub handle_uci {
 
 		parse_ids($engine, @ids);
 	}
-	if ($line =~ /^bestmove/ && $uci_assume_full_compliance) {
-		if (defined($pos_waiting)) {
-			uciprint($engine, "position fen " . $pos_waiting->{'fen'});
-			uciprint($engine, "go infinite");
+	if ($line =~ /^bestmove/) {
+		if ($primary) {
+			return if (!$uci_assume_full_compliance);
+			if (defined($pos_waiting)) {
+				uciprint($engine, "position fen " . $pos_waiting->{'fen'});
+				uciprint($engine, "go infinite");
 
-			$pos_calculating = $pos_waiting;
-			$pos_waiting = undef;
+				$pos_calculating = $pos_waiting;
+				$pos_waiting = undef;
+			}
+		} else {
+			$engine2->{'info'} = {};
+			my $pos = $pos_waiting // $pos_calculating;
+			uciprint($engine2, "position fen " . $pos->{'fen'});
+			uciprint($engine2, "go infinite");
+			$pos_calculating_second_engine = $pos;
 		}
 	}
 }
@@ -212,10 +253,19 @@ sub parse_infos {
 
 	my $info = $engine->{'info'};
 
+	# Search for "multipv" first of all, since e.g. Stockfish doesn't put it first.
+	for my $i (0..$#x - 1) {
+		if ($x[$i] =~ 'multipv') {
+			$mpv = $x[$i + 1];
+			next;
+		}
+	}
+
 	while (scalar @x > 0) {
 		if ($x[0] =~ 'multipv') {
+			# Dealt with above
+			shift @x;
 			shift @x;
-			$mpv = shift @x;
 			next;
 		}
 		if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
@@ -271,7 +321,7 @@ sub parse_ids {
 		if ($x[0] =~ /^(name|author)$/) {
 			my $key = shift @x;
 			my $value = join(' ', @x);
-			$engine->{'info'}{'id'}{$key} = $value;
+			$engine->{'id'}{$key} = $value;
 			last;
 		}
 
@@ -294,6 +344,11 @@ sub style12_to_pos {
 	$pos{'black_castle_q'} = $x[14];
 	$pos{'time_to_100move_rule'} = $x[15];
 	$pos{'move_num'} = $x[26];
+	if ($x[27] =~ /([a-h][1-8])-([a-h][1-8])/) {
+		$pos{'last_move_uci'} = $1 . $2;
+	} else {
+		$pos{'last_move_uci'} = undef;
+	}
 	$pos{'last_move'} = $x[29];
 	$pos{'fen'} = make_fen(\%pos);
 
@@ -574,14 +629,33 @@ sub prettyprint_pv {
 	return ($pretty, prettyprint_pv($nb, @pvs));
 }
 
-sub output_screen {
+sub output {
 	#return;
-	
+
 	return if (!defined($pos_calculating));
 
+	# Don't update too often.
+	my $age = Time::HiRes::tv_interval($latest_update);
+	if ($age < $update_max_interval) {
+		Time::HiRes::alarm($update_max_interval + 0.01 - $age);
+		return;
+	}
+	
 	my $info = $engine->{'info'};
-	my $id = $engine->{'id'};
-
+	
+	#
+	# Some programs _always_ report MultiPV, even with only one PV.
+	# In this case, we simply use that data as if MultiPV was never
+	# specified.
+	#
+	if (exists($info->{'pv1'}) && !exists($info->{'pv2'})) {
+		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
+			if (exists($info->{$key . '1'})) {
+				$info->{$key} = $info->{$key . '1'};
+			}
+		}
+	}
+	
 	#
 	# Check the PVs first. if they're invalid, just wait, as our data
 	# is most likely out of sync. This isn't a very good solution, as
@@ -604,6 +678,15 @@ sub output_screen {
 		return;
 	}
 
+	output_screen();
+	output_json();
+	$latest_update = [Time::HiRes::gettimeofday];
+}
+
+sub output_screen {
+	my $info = $engine->{'info'};
+	my $id = $engine->{'id'};
+
 	my $text = 'Analysis';
 	if ($pos_calculating->{'last_move'} ne 'none') {
 		if ($pos_calculating->{'toplay'} eq 'W') {
@@ -624,19 +707,6 @@ sub output_screen {
 
 	return unless (exists($pos_calculating->{'board'}));
 		
-	#
-	# Some programs _always_ report MultiPV, even with only one PV.
-	# In this case, we simply use that data as if MultiPV was never
-	# specified.
-	#
-	if (exists($info->{'pv1'}) && !exists($info->{'pv2'})) {
-		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
-			if (exists($info->{$key . '1'}) && !exists($info->{$key})) {
-				$info->{$key} = $info->{$key . '1'};
-			}
-		}
-	}
-
 	if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
 		# multi-PV
 		my $mpv = 1;
@@ -675,6 +745,9 @@ sub output_screen {
 			$text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
 				$info->{'nodes'}, $info->{'nps'}, $info->{'depth'};
 		}
+		if (exists($info->{'seldepth'})) {
+			$text .= sprintf " (%u selective)", $info->{'seldepth'};
+		}
 		if (exists($info->{'tbhits'}) && $info->{'tbhits'} > 0) {
 			if ($info->{'tbhits'} == 1) {
 				$text .= ", one Nalimov hit";
@@ -682,14 +755,42 @@ sub output_screen {
 				$text .= sprintf ", %u Nalimov hits", $info->{'tbhits'};
 			}
 		}
-		if (exists($info->{'seldepth'})) {
-			$text .= sprintf " (%u selective)", $info->{'seldepth'};
-		}
-		$text .=  "\n\n";
+		$text .= "\n\n";
 	}
 
 	#$text .= book_info($pos_calculating->{'fen'}, $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
 
+	my @refutation_lines = ();
+	for (my $mpv = 1; $mpv < 500; ++$mpv) {
+		my $info = $engine2->{'info'};
+		last if (!exists($info->{'pv' . $mpv}));
+		eval {
+			my $pv = $info->{'pv' . $mpv};
+
+			my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine->{'board'}, $pv->[0]));
+			my @pretty_pv = prettyprint_pv($pos_calculating_second_engine->{'board'}, @$pv);
+			if (scalar @pretty_pv > 5) {
+				@pretty_pv = @pretty_pv[0..4];
+				push @pretty_pv, "...";
+			}
+			my $key = $pretty_move;
+			my $line = sprintf("  %-6s %6s %3s  %s",
+				$pretty_move,
+				short_score($info, $pos_calculating_second_engine, $mpv, 0),
+				"d" . $info->{'depth' . $mpv},
+				join(', ', @pretty_pv));
+			push @refutation_lines, [ $key, $line ];
+		};
+	}
+
+	if ($#refutation_lines >= 0) {
+		$text .= "Shallow search of all legal moves:\n\n";
+		for my $line (sort { $a->[0] cmp $b->[0] } @refutation_lines) {
+			$text .= $line->[1] . "\n";
+		}
+		$text .= "\n\n";	
+	}	
+
 	if ($last_text ne $text) {
 		print ""; # clear the screen
 		print $text;
@@ -755,6 +856,56 @@ sub output_screen {
 	}
 }
 
+sub output_json {
+	my $info = $engine->{'info'};
+
+	my $json = {};
+	$json->{'position'} = $pos_calculating;
+	$json->{'id'} = $engine->{'id'};
+	$json->{'score'} = long_score($info, $pos_calculating, '');
+
+	$json->{'nodes'} = $info->{'nodes'};
+	$json->{'nps'} = $info->{'nps'};
+	$json->{'depth'} = $info->{'depth'};
+	$json->{'tbhits'} = $info->{'tbhits'};
+	$json->{'seldepth'} = $info->{'seldepth'};
+
+	# single-PV only for now
+	$json->{'pv_uci'} = $info->{'pv'};
+	$json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}) ];
+
+	my %refutation_lines = ();
+	my @refutation_lines = ();
+	for (my $mpv = 1; $mpv < 500; ++$mpv) {
+		my $info = $engine2->{'info'};
+		my $pretty_move = "";
+		my @pretty_pv = ();
+		last if (!exists($info->{'pv' . $mpv}));
+
+		eval {
+			my $pv = $info->{'pv' . $mpv};
+			my $pretty_move = join('', prettyprint_pv($pos_calculating->{'board'}, $pv->[0]));
+			my @pretty_pv = prettyprint_pv($pos_calculating->{'board'}, @$pv);
+			$refutation_lines{$pv->[0]} = {
+				sort_key => $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, 0),
+				pretty_move => $pretty_move,
+				pv_pretty => \@pretty_pv,
+			};
+			$refutation_lines{$pv->[0]}->{'pv_uci'} = $pv;
+		};
+	}
+	$json->{'refutation_lines'} = \%refutation_lines;
+
+	open my $fh, ">analysis.json.tmp"
+		or return;
+	print $fh JSON::XS::encode_json($json);
+	close $fh;
+	rename("analysis.json.tmp", "analysis.json");	
+}
+
 sub find_kings {
 	my $board = shift;
 	my ($wkr, $wkc, $bkr, $bkc);
@@ -955,18 +1106,30 @@ sub can_reach {
 sub uciprint {
 	my ($engine, $msg) = @_;
 	print { $engine->{'write'} } "$msg\n";
-	print UCILOG localtime() . " => $msg\n";
+	print UCILOG localtime() . " $engine->{'tag'} => $msg\n";
 }
 
 sub short_score {
-	my ($info, $pos, $mpv) = @_;
+	my ($info, $pos, $mpv, $invert) = @_;
+
+	$invert //= 0;
+	if ($pos->{'toplay'} eq 'B') {
+		$invert = !$invert;
+	}
 
 	if (defined($info->{'score_mate' . $mpv})) {
-		return sprintf "M%3d", $info->{'score_mate' . $mpv};
+		if ($invert) {
+			return sprintf "M%3d", -$info->{'score_mate' . $mpv};
+		} else {
+			return sprintf "M%3d", $info->{'score_mate' . $mpv};
+		}
 	} else {
 		if (exists($info->{'score_cp' . $mpv})) {
 			my $score = $info->{'score_cp' . $mpv} * 0.01;
-			if ($pos->{'toplay'} eq 'B') {
+			if ($score == 0) {
+				return " 0.00";
+			}
+			if ($invert) {
 				$score = -$score;
 			}
 			return sprintf "%+5.2f", $score;
@@ -976,6 +1139,28 @@ sub short_score {
 	return undef;
 }
 
+sub score_sort_key {
+	my ($info, $pos, $mpv, $invert) = @_;
+
+	if (defined($info->{'score_mate' . $mpv})) {
+		if ($invert) {
+			return -(99999 - $info->{'score_mate' . $mpv});
+		} else {
+			return 99999 - $info->{'score_mate' . $mpv};
+		}
+	} else {
+		if (exists($info->{'score_cp' . $mpv})) {
+			my $score = $info->{'score_cp' . $mpv};
+			if ($invert) {
+				$score = -$score;
+			}
+			return $score;
+		}
+	}
+
+	return undef;
+}
+
 sub long_score {
 	my ($info, $pos, $mpv) = @_;
 
@@ -1055,16 +1240,18 @@ sub book_info {
 }
 
 sub open_engine {
-	my $cmdline = shift;
+	my ($cmdline, $tag) = @_;
 	my ($uciread, $uciwrite);
 	my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
 
 	my $engine = {
 		pid => $pid,
 		read => $uciread,
+		readbuf => '',
 		write => $uciwrite,
 		info => {},
-		ids => {}
+		ids => {},
+		tag => $tag,
 	};
 
 	uciprint($engine, "uci");
@@ -1078,18 +1265,17 @@ sub open_engine {
 	return $engine;
 }
 
-sub read_line {
-	my $fh = shift;
+sub read_lines {
+	my $engine = shift;
 
 	# 
 	# Read until we've got a full line -- if the engine sends part of
 	# a line and then stops we're pretty much hosed, but that should
 	# never happen.
 	#
-	my $line = '';
-	while ($line !~ /\n/) {
+	while ($engine->{'readbuf'} !~ /\n/) {
 		my $tmp;
-		my $ret = sysread $engine->{'read'}, $tmp, 1;
+		my $ret = sysread $engine->{'read'}, $tmp, 4096;
 
 		if (!defined($ret)) {
 			next if ($!{EINTR});
@@ -1098,11 +1284,17 @@ sub read_line {
 			die "EOF from UCI engine";
 		}
 
-		$line .= $tmp;
+		$engine->{'readbuf'} .= $tmp;
 	}
 
-	$line =~ tr/\r\n//d;
-	return $line;
+	# Blah.
+	my @lines = ();
+	while ($engine->{'readbuf'} =~ s/^([^\n]*)\n//) {
+		my $line = $1;
+		$line =~ tr/\r\n//d;
+		push @lines, $line;
+	}
+	return @lines;
 }
 
 sub col_letter_to_num {