X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=remoteglot.pl;h=baed79ae476cb47cadbd7a9973d6998d9dc4974c;hb=faf19b0ff0a5cbc2e814bd095c95d64730e18d27;hp=36c38d8c6d60ae8251649b078fea0ce4dfb1ad75;hpb=40a7bf3ba56653b39d274adaf0b48835ab34135e;p=remoteglot

diff --git a/remoteglot.pl b/remoteglot.pl
index 36c38d8..baed79a 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -132,6 +132,7 @@ while (1) {
 			}
 
 			%uciinfo = ();
+			$engine->{'info'} = {};
 			$last_move = time;
 
 			# 
@@ -165,7 +166,7 @@ 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($line);
+		handle_uci($engine, $line);
 		$sleep = 0;
 
 		# don't update too often
@@ -176,7 +177,7 @@ while (1) {
 }
 
 sub handle_uci {
-	my ($line) = @_;
+	my ($engine, $line) = @_;
 
 	chomp $line;
 	$line =~ tr/\r//d;
@@ -186,13 +187,13 @@ sub handle_uci {
 		my (@infos) = split / /, $line;
 		shift @infos;
 
-		parse_infos(@infos);
+		parse_infos($engine, @infos);
 	}
 	if ($line =~ /^id/) {
 		my (@ids) = split / /, $line;
 		shift @ids;
 
-		parse_ids(@ids);
+		parse_ids($engine, @ids);
 	}
 	if ($line =~ /^bestmove/ && $uci_assume_full_compliance) {
 		if (defined($pos_waiting)) {
@@ -206,9 +207,11 @@ sub handle_uci {
 }
 
 sub parse_infos {
-	my (@x) = @_;
+	my ($engine, @x) = @_;
 	my $mpv = '';
 
+	my $info = $engine->{'info'};
+
 	while (scalar @x > 0) {
 		if ($x[0] =~ 'multipv') {
 			shift @x;
@@ -218,28 +221,28 @@ sub parse_infos {
 		if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
 			my $key = shift @x;
 			my $value = shift @x;
-			$uciinfo{$key} = $value;
+			$info->{$key} = $value;
 			next;
 		}
 		if ($x[0] =~ /^(depth|seldepth|hashfull|time|nodes|nps|tbhits)$/) {
 			my $key = shift @x;
 			my $value = shift @x;
-			$uciinfo{$key . $mpv} = $value;
+			$info->{$key . $mpv} = $value;
 			next;
 		}
 		if ($x[0] eq 'score') {
 			shift @x;
 
-			delete $uciinfo{'score_cp' . $mpv};
-			delete $uciinfo{'score_mate' . $mpv};
+			delete $info->{'score_cp' . $mpv};
+			delete $info->{'score_mate' . $mpv};
 
 			while ($x[0] =~ /^(cp|mate|lowerbound|upperbound)$/) {
 				if ($x[0] eq 'cp') {
 					shift @x;
-					$uciinfo{'score_cp' . $mpv} = shift @x;
+					$info->{'score_cp' . $mpv} = shift @x;
 				} elsif ($x[0] eq 'mate') {
 					shift @x;
-					$uciinfo{'score_mate' . $mpv} = shift @x;
+					$info->{'score_mate' . $mpv} = shift @x;
 				} else {
 					shift @x;
 				}
@@ -247,7 +250,7 @@ sub parse_infos {
 			next;
 		}
 		if ($x[0] eq 'pv') {
-			$uciinfo{'pv' . $mpv} = [ @x[1..$#x] ];
+			$info->{'pv' . $mpv} = [ @x[1..$#x] ];
 			last;
 		}
 		if ($x[0] eq 'string' || $x[0] eq 'UCI_AnalyseMode' || $x[0] eq 'setting' || $x[0] eq 'contempt') {
@@ -262,13 +265,13 @@ sub parse_infos {
 }
 
 sub parse_ids {
-	my (@x) = @_;
+	my ($engine, @x) = @_;
 
 	while (scalar @x > 0) {
 		if ($x[0] =~ /^(name|author)$/) {
 			my $key = shift @x;
 			my $value = join(' ', @x);
-			$uciid{$key} = $value;
+			$engine->{'info'}{'id'}{$key} = $value;
 			last;
 		}
 
@@ -363,32 +366,18 @@ sub make_fen {
 	return $fen;
 }
 
-}
-
-sub prettyprint_pv {
-	my ($board, @pvs) = @_;
-
-	if (scalar @pvs == 0 || !defined($pvs[0])) {
-		return ();
-	}
-	
-	my @nb = @$board;
-
-	my $pv = shift @pvs;
-	my $from_col = ord(substr($pv, 0, 1)) - ord('a');
-	my $from_row = 7 - (ord(substr($pv, 1, 1)) - ord('1'));
-	my $to_col   = ord(substr($pv, 2, 1)) - ord('a');
-	my $to_row   = 7 - (ord(substr($pv, 3, 1)) - ord('1'));
-
-	my $pretty;
+sub make_move {
+	my ($board, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
+	my $move = move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
 	my $piece = substr($board->[$from_row], $from_col, 1);
+	my @nb = @$board;
 
 	if ($piece eq '-') {
-		die "Invalid move $pv";
+		die "Invalid move $move";
 	}
 
 	# white short castling
-	if ($pv eq 'e1g1' && $piece eq 'K') {
+	if ($move eq 'e1g1' && $piece eq 'K') {
 		# king
 		substr($nb[7], 4, 1, '-');
 		substr($nb[7], 6, 1, $piece);
@@ -397,11 +386,11 @@ sub prettyprint_pv {
 		substr($nb[7], 7, 1, '-');
 		substr($nb[7], 5, 1, 'R');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# white long castling
-	if ($pv eq 'e1c1' && $piece eq 'K') {
+	if ($move eq 'e1c1' && $piece eq 'K') {
 		# king
 		substr($nb[7], 4, 1, '-');
 		substr($nb[7], 2, 1, $piece);
@@ -410,11 +399,11 @@ sub prettyprint_pv {
 		substr($nb[7], 0, 1, '-');
 		substr($nb[7], 3, 1, 'R');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# black short castling
-	if ($pv eq 'e8g8' && $piece eq 'k') {
+	if ($move eq 'e8g8' && $piece eq 'k') {
 		# king
 		substr($nb[0], 4, 1, '-');
 		substr($nb[0], 6, 1, $piece);
@@ -423,11 +412,11 @@ sub prettyprint_pv {
 		substr($nb[0], 7, 1, '-');
 		substr($nb[0], 5, 1, 'r');
 				
-		return ('0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# black long castling
-	if ($pv eq 'e8c8' && $piece eq 'k') {
+	if ($move eq 'e8c8' && $piece eq 'k') {
 		# king
 		substr($nb[0], 4, 1, '-');
 		substr($nb[0], 2, 1, $piece);
@@ -436,15 +425,13 @@ sub prettyprint_pv {
 		substr($nb[0], 0, 1, '-');
 		substr($nb[0], 3, 1, 'r');
 				
-		return ('0-0-0', prettyprint_pv(\@nb, @pvs));
+		return \@nb;
 	}
 
 	# check if the from-piece is a pawn
 	if (lc($piece) eq 'p') {
 		# attack?
 		if ($from_col != $to_col) {
-			$pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
-
 			# en passant?
 			if (substr($board->[$to_row], $to_col, 1) eq '-') {
 				if ($piece eq 'p') {
@@ -453,6 +440,72 @@ sub prettyprint_pv {
 					substr($nb[$to_row - 1], $to_col, 1, '-');
 				}
 			}
+		} else {
+			if ($promo ne '') {
+				if ($piece eq 'p') {
+					$piece = $promo;
+				} else {
+					$piece = uc($promo);
+				}
+			}
+		}
+	}
+
+	# update the board
+	substr($nb[$from_row], $from_col, 1, '-');
+	substr($nb[$to_row], $to_col, 1, $piece);
+
+	return \@nb;
+}
+
+sub prettyprint_pv {
+	my ($board, @pvs) = @_;
+
+	if (scalar @pvs == 0 || !defined($pvs[0])) {
+		return ();
+	}
+
+	my $pv = shift @pvs;
+	my $from_col = col_letter_to_num(substr($pv, 0, 1));
+	my $from_row = row_letter_to_num(substr($pv, 1, 1));
+	my $to_col   = col_letter_to_num(substr($pv, 2, 1));
+	my $to_row   = row_letter_to_num(substr($pv, 3, 1));
+	my $promo    = substr($pv, 4, 1);
+
+	my $nb = make_move($board, $from_row, $from_col, $to_row, $to_col, $promo);
+	my $piece = substr($board->[$from_row], $from_col, 1);
+
+	if ($piece eq '-') {
+		die "Invalid move $pv";
+	}
+
+	# white short castling
+	if ($pv eq 'e1g1' && $piece eq 'K') {
+		return ('0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	# white long castling
+	if ($pv eq 'e1c1' && $piece eq 'K') {
+		return ('0-0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	# black short castling
+	if ($pv eq 'e8g8' && $piece eq 'k') {
+		return ('0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	# black long castling
+	if ($pv eq 'e8c8' && $piece eq 'k') {
+		return ('0-0-0', prettyprint_pv($nb, @pvs));
+	}
+
+	my $pretty;
+
+	# check if the from-piece is a pawn
+	if (lc($piece) eq 'p') {
+		# attack?
+		if ($from_col != $to_col) {
+			$pretty = substr($pv, 0, 1) . 'x' . substr($pv, 2, 2);
 		} else {
 			$pretty = substr($pv, 2, 2);
 
@@ -513,17 +566,12 @@ sub prettyprint_pv {
 		$pretty .= substr($pv, 2, 2);
 	}
 
-	# update the board
-	substr($nb[$from_row], $from_col, 1, '-');
-	substr($nb[$to_row], $to_col, 1, $piece);
-
-	if (in_mate(\@nb)) {
+	if (in_mate($nb)) {
 		$pretty .= '#';
-	} elsif (in_check(\@nb) ne 'none') {
+	} elsif (in_check($nb) ne 'none') {
 		$pretty .= '+';
 	}
-
-	return ($pretty, prettyprint_pv(\@nb, @pvs));
+	return ($pretty, prettyprint_pv($nb, @pvs));
 }
 
 sub output_screen {
@@ -531,6 +579,9 @@ sub output_screen {
 	
 	return if (!defined($pos_calculating));
 
+	my $info = $engine->{'info'};
+	my $id = $engine->{'id'};
+
 	#
 	# 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
@@ -538,18 +589,18 @@ sub output_screen {
 	#
 	eval {
 		my $dummy;
-		if (exists($uciinfo{'pv'})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}});
+		if (exists($info->{'pv'})) {
+			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}});
 		}
 	
 		my $mpv = 1;
-		while (exists($uciinfo{'pv' . $mpv})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}});
+		while (exists($info->{'pv' . $mpv})) {
+			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}});
 			++$mpv;
 		}
 	};
 	if ($@) {
-		%uciinfo = ();
+		$engine->{'info'} = {};
 		return;
 	}
 
@@ -560,13 +611,13 @@ sub output_screen {
 		} else {
 			$text .= sprintf ' after %u. %s', $pos_calculating->{'move_num'}, $pos_calculating->{'last_move'};
 		}
-		if (exists($uciid{'name'})) {
+		if (exists($id->{'name'})) {
 			$text .= ',';
 		}
 	}
 
-	if (exists($uciid{'name'})) {
-		$text .= " by $uciid{'name'}:\n\n";
+	if (exists($id->{'name'})) {
+		$text .= " by $id->{'name'}:\n\n";
 	} else {
 		$text .= ":\n\n";
 	}
@@ -578,61 +629,61 @@ sub output_screen {
 	# In this case, we simply use that data as if MultiPV was never
 	# specified.
 	#
-	if (exists($uciinfo{'pv1'}) && !exists($uciinfo{'pv2'})) {
+	if (exists($info->{'pv1'}) && !exists($info->{'pv2'})) {
 		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
-			if (exists($uciinfo{$key . '1'}) && !exists($uciinfo{$key})) {
-				$uciinfo{$key} = $uciinfo{$key . '1'};
+			if (exists($info->{$key . '1'}) && !exists($info->{$key})) {
+				$info->{$key} = $info->{$key . '1'};
 			}
 		}
 	}
 
-	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+	if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
 		# multi-PV
 		my $mpv = 1;
-		while (exists($uciinfo{'pv' . $mpv})) {
+		while (exists($info->{'pv' . $mpv})) {
 			$text .= sprintf "  PV%2u", $mpv;
-			my $score = short_score(\%uciinfo, $pos_calculating, $mpv);
+			my $score = short_score($info, $pos_calculating, $mpv);
 			$text .= "  ($score)" if (defined($score));
 
 			my $tbhits = '';
-			if (exists($uciinfo{'tbhits' . $mpv}) && $uciinfo{'tbhits' . $mpv} > 0) {
-				if ($uciinfo{'tbhits' . $mpv} == 1) {
+			if (exists($info->{'tbhits' . $mpv}) && $info->{'tbhits' . $mpv} > 0) {
+				if ($info->{'tbhits' . $mpv} == 1) {
 					$tbhits = ", 1 tbhit";
 				} else {
-					$tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+					$tbhits = sprintf ", %u tbhits", $info->{'tbhits' . $mpv};
 				}
 			}
 
-			if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
+			if (exists($info->{'nodes' . $mpv}) && exists($info->{'nps' . $mpv}) && exists($info->{'depth' . $mpv})) {
 				$text .= sprintf " (%5u kn, %3u kn/s, %2u ply$tbhits)",
-					$uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
+					$info->{'nodes' . $mpv} / 1000, $info->{'nps' . $mpv} / 1000, $info->{'depth' . $mpv};
 			}
 
 			$text .= ":\n";
-			$text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
+			$text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}})) . "\n";
 			$text .= "\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
-		my $score = long_score(\%uciinfo, $pos_calculating, '');
+		my $score = long_score($info, $pos_calculating, '');
 		$text .= "  $score\n" if defined($score);
-		$text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
+		$text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
 		$text .=  "\n";
 
-		if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
+		if (exists($info->{'nodes'}) && exists($info->{'nps'}) && exists($info->{'depth'})) {
 			$text .= sprintf "  %u nodes, %7u nodes/sec, depth %u ply",
-				$uciinfo{'nodes'}, $uciinfo{'nps'}, $uciinfo{'depth'};
+				$info->{'nodes'}, $info->{'nps'}, $info->{'depth'};
 		}
-		if (exists($uciinfo{'tbhits'}) && $uciinfo{'tbhits'} > 0) {
-			if ($uciinfo{'tbhits'} == 1) {
+		if (exists($info->{'tbhits'}) && $info->{'tbhits'} > 0) {
+			if ($info->{'tbhits'} == 1) {
 				$text .= ", one Nalimov hit";
 			} else {
-				$text .= sprintf ", %u Nalimov hits", $uciinfo{'tbhits'};
+				$text .= sprintf ", %u Nalimov hits", $info->{'tbhits'};
 			}
 		}
-		if (exists($uciinfo{'seldepth'})) {
-			$text .= sprintf " (%u selective)", $uciinfo{'seldepth'};
+		if (exists($info->{'seldepth'})) {
+			$text .= sprintf " (%u selective)", $info->{'seldepth'};
 		}
 		$text .=  "\n\n";
 	}
@@ -650,36 +701,36 @@ sub output_screen {
 
 	my $tell_text = '';
 
-	if (exists($uciid{'name'})) {
-		$tell_text .= "Analysis by $uciid{'name'} -- see http://analysis.sesse.net/ for more information\n";
+	if (exists($id->{'name'})) {
+		$tell_text .= "Analysis by $id->{'name'} -- see http://analysis.sesse.net/ for more information\n";
 	} else {
 		$tell_text .= "Computer analysis -- http://analysis.sesse.net/ for more information\n";
 	}
 
-	if (exists($uciinfo{'pv1'}) && exists($uciinfo{'pv2'})) {
+	if (exists($info->{'pv1'}) && exists($info->{'pv2'})) {
 		# multi-PV
 		my $mpv = 1;
-		while (exists($uciinfo{'pv' . $mpv})) {
+		while (exists($info->{'pv' . $mpv})) {
 			$tell_text .= sprintf "  PV%2u", $mpv;
-			my $score = short_score(\%uciinfo, $pos_calculating, $mpv);
+			my $score = short_score($info, $pos_calculating, $mpv);
 			$tell_text .= "  ($score)" if (defined($score));
 
-			if (exists($uciinfo{'depth' . $mpv})) {
-				$tell_text .= sprintf " (%2u ply)", $uciinfo{'depth' . $mpv};
+			if (exists($info->{'depth' . $mpv})) {
+				$tell_text .= sprintf " (%2u ply)", $info->{'depth' . $mpv};
 			}
 
 			$tell_text .= ": ";
-			$tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}}));
+			$tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}}));
 			$tell_text .= "\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
-		my $score = long_score(\%uciinfo, $pos_calculating, '');
+		my $score = long_score($info, $pos_calculating, '');
 		$tell_text .= "  $score\n" if defined($score);
-		$tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
-		if (exists($uciinfo{'depth'})) {
-			$tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
+		$tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
+		if (exists($info->{'depth'})) {
+			$tell_text .= sprintf " (depth %u ply)", $info->{'depth'};
 		}
 		$tell_text .=  "\n";
 	}
@@ -908,13 +959,13 @@ sub uciprint {
 }
 
 sub short_score {
-	my ($uciinfo, $pos, $mpv) = @_;
+	my ($info, $pos, $mpv) = @_;
 
-	if (defined($uciinfo{'score_mate' . $mpv})) {
-		return sprintf "M%3d", $uciinfo{'score_mate' . $mpv};
+	if (defined($info->{'score_mate' . $mpv})) {
+		return sprintf "M%3d", $info->{'score_mate' . $mpv};
 	} else {
-		if (exists($uciinfo{'score_cp' . $mpv})) {
-			my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
+		if (exists($info->{'score_cp' . $mpv})) {
+			my $score = $info->{'score_cp' . $mpv} * 0.01;
 			if ($pos->{'toplay'} eq 'B') {
 				$score = -$score;
 			}
@@ -926,10 +977,10 @@ sub short_score {
 }
 
 sub long_score {
-	my ($uciinfo, $pos, $mpv) = @_;
+	my ($info, $pos, $mpv) = @_;
 
-	if (defined($uciinfo{'score_mate' . $mpv})) {
-		my $mate = $uciinfo{'score_mate' . $mpv};
+	if (defined($info->{'score_mate' . $mpv})) {
+		my $mate = $info->{'score_mate' . $mpv};
 		if ($pos->{'toplay'} eq 'B') {
 			$mate = -$mate;
 		}
@@ -939,8 +990,8 @@ sub long_score {
 			return sprintf "Black mates in %u", -$mate;
 		}
 	} else {
-		if (exists($uciinfo{'score_cp' . $mpv})) {
-			my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
+		if (exists($info->{'score_cp' . $mpv})) {
+			my $score = $info->{'score_cp' . $mpv} * 0.01;
 			if ($pos->{'toplay'} eq 'B') {
 				$score = -$score;
 			}
@@ -1011,7 +1062,9 @@ sub open_engine {
 	my $engine = {
 		pid => $pid,
 		read => $uciread,
-		write => $uciwrite
+		write => $uciwrite,
+		info => {},
+		ids => {}
 	};
 
 	uciprint($engine, "uci");
@@ -1019,7 +1072,7 @@ sub open_engine {
 	# gobble the options
 	while (<$uciread>) {
 		/uciok/ && last;
-		handle_uci($_);
+		handle_uci($engine, $_);
 	}
 	
 	return $engine;
@@ -1051,3 +1104,17 @@ sub read_line {
 	$line =~ tr/\r\n//d;
 	return $line;
 }
+
+sub col_letter_to_num {
+	return ord(shift) - ord('a');
+}
+
+sub row_letter_to_num {
+	return 7 - (ord(shift) - ord('1'));
+}
+
+sub move_to_uci_notation {
+	my ($from_row, $from_col, $to_row, $to_col, $promo) = @_;
+	$promo //= "";
+	return sprintf("%c%d%c%d%s", ord('a') + $from_col, 8 - $from_row, ord('a') + $to_col, 8 - $to_row, $promo);
+}