X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=7a68339a7a224f60db8806dfa9f413b3e49a2db7;hp=2c4bb9e8247be699bbd11cc21a5fd326a6389232;hb=8e2fcde0c39c34b3f318169ce59e4a055354fcac;hpb=07fe77d2f39c91fee4545236ef1134f9000b749c

diff --git a/remoteglot.pl b/remoteglot.pl
index 2c4bb9e..7a68339 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -18,7 +18,7 @@ use warnings;
 
 # Configuration
 my $server = "freechess.org";
-my $target = "Sesse";
+my $target = "22";
 # my $engine = "/usr/games/toga2";
 my $engine = "wine Rybkav2.3.2a.mp.w32.exe";
 my $telltarget = undef;   # undef to be silent
@@ -46,10 +46,10 @@ select(STDOUT);
 my $pid = IPC::Open2::open2(*UCIREAD, *UCIWRITE, $engine);
 my %uciinfo = ();
 my %uciid = ();
-my %ficsinfo = ();
 my ($last_move, $last_tell);
 my $last_text = '';
 my $last_told_text = '';
+my ($pos_waiting, $pos_calculating);
 
 uciprint("uci");
 
@@ -60,6 +60,7 @@ while (<UCIREAD>) {
 }
 
 uciprint("setoption name UCI_AnalyseMode value true");
+uciprint("setoption name Preserve Analysis value true");
 uciprint("setoption name NalimovPath value c:\\nalimov");
 uciprint("setoption name NalimovUsage value Rarely");
 uciprint("setoption name Hash value 1024");
@@ -102,10 +103,31 @@ while (1) {
 		chomp $line;
 		$line =~ tr/\r//d;
 		if ($line =~ /^<12> /) {
-			my $fen = style12_to_fen($line);
-			uciprint("stop");
-			uciprint("position fen $fen");
-			uciprint("go infinite");
+			my $pos = style12_to_fen($line);
+			
+			# if this is already in the queue, ignore it
+			next if (defined($pos_waiting) && $pos->{'fen'} eq $pos_waiting->{'fen'});
+
+			# if we're already chewing on this and there's nothing else in the queue,
+			# also ignore it
+			next if (!defined($pos_waiting) && defined($pos_calculating) &&
+			         $pos->{'fen'} eq $pos_calculating->{'fen'});
+
+			# if we're already thinking on something, stop and wait for the engine
+			# to approve
+			if (defined($pos_calculating)) {
+				if (!defined($pos_waiting)) {
+					uciprint("stop");
+				}
+				$pos_waiting = $pos;
+			} else {
+				# it's wrong just to give the FEN (the move history is useful,
+				# and per the UCI spec, we should really have sent "ucinewgame"),
+				# but it's easier
+				uciprint("position fen " . $pos->{'fen'});
+				uciprint("go infinite");
+				$pos_calculating = $pos;
+			}
 
 			%uciinfo = ();
 			$last_move = time;
@@ -141,7 +163,7 @@ sub handle_uci {
 
 	chomp $line;
 	$line =~ tr/\r//d;
-	print UCILOG "<= $line\n";
+	print UCILOG localtime() . " <= $line\n";
 	if ($line =~ /^info/) {
 		my (@infos) = split / /, $line;
 		shift @infos;
@@ -154,6 +176,15 @@ sub handle_uci {
 
 		parse_ids(@ids);
 	}
+	if ($line =~ /^bestmove/) {
+		if (defined($pos_waiting)) {
+			uciprint("position fen " . $pos_waiting->{'fen'});
+			uciprint("go infinite");
+
+			$pos_calculating = $pos_waiting;
+			$pos_waiting = undef;
+		}
+	}
 }
 
 sub parse_infos {
@@ -229,11 +260,12 @@ sub parse_ids {
 }
 
 sub style12_to_fen {
-	my $str = shift; 
+	my $str = shift;
+	my %pos = ();
 	my (@x) = split / /, $str;
 	
-	$ficsinfo{'board'} = [ @x[1..8] ];
-	$ficsinfo{'toplay'} = $x[9];
+	$pos{'board'} = [ @x[1..8] ];
+	$pos{'toplay'} = $x[9];
 	
 	# the board itself
 	my (@board) = @x[1..8];
@@ -267,7 +299,7 @@ sub style12_to_fen {
 		} else {
 			$nep .= "6";
 		}
-		
+
 		#
 		# Showing the en passant square when actually no capture can be made
 		# seems to confuse at least Rybka. Thus, check if there's actually
@@ -276,11 +308,11 @@ sub style12_to_fen {
 		# "right" thing as per the standard, though.
 		#
 		if ($x[9] eq 'B') {
-			$ep = $nep if ($col > 0 && substr($board[4], $col-1, 1) eq 'p');
-			$ep = $nep if ($col < 7 && substr($board[4], $col+1, 1) eq 'p');
+			$ep = $nep if ($col > 0 && substr($pos{'board'}[4], $col-1, 1) eq 'p');
+			$ep = $nep if ($col < 7 && substr($pos{'board'}[4], $col+1, 1) eq 'p');
 		} else {
-			$ep = $nep if ($col > 0 && substr($board[3], $col-1, 1) eq 'P');
-			$ep = $nep if ($col < 7 && substr($board[3], $col+1, 1) eq 'P');
+			$ep = $nep if ($col > 0 && substr($pos{'board'}[3], $col-1, 1) eq 'P');
+			$ep = $nep if ($col < 7 && substr($pos{'board'}[3], $col+1, 1) eq 'P');
 		}
 	}
 	$fen .= " ";
@@ -294,7 +326,9 @@ sub style12_to_fen {
 	$fen .= " ";
 	$fen .= $x[26];
 
-	return $fen;
+	$pos{'fen'} = $fen;
+
+	return \%pos;
 }
 
 sub prettyprint_pv {
@@ -460,6 +494,8 @@ sub prettyprint_pv {
 
 sub output_screen {
 	#return;
+	
+	return if (!defined($pos_calculating));
 
 	#
 	# Check the PVs first. if they're invalid, just wait, as our data
@@ -469,12 +505,12 @@ sub output_screen {
 	eval {
 		my $dummy;
 		if (exists($uciinfo{'pv'})) {
-			$dummy = prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}});
+			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}});
 		}
 	
 		my $mpv = 1;
 		while (exists($uciinfo{'pv' . $mpv})) {
-			$dummy = prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}});
+			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}});
 			++$mpv;
 		}
 	};
@@ -491,7 +527,7 @@ sub output_screen {
 		$text .= "Analysis:\n\n";
 	}
 
-	return unless (exists($ficsinfo{'board'}));
+	return unless (exists($pos_calculating->{'board'}));
 		
 	#
 	# Some programs _always_ report MultiPV, even with only one PV.
@@ -511,24 +547,29 @@ sub output_screen {
 		my $mpv = 1;
 		while (exists($uciinfo{'pv' . $mpv})) {
 			$text .= sprintf "  PV%2u", $mpv;
-			my $score = short_score(\%uciinfo, \%ficsinfo, $mpv);
+			my $score = short_score(\%uciinfo, $pos_calculating, $mpv);
 			$text .= "  ($score)" if (defined($score));
 
+			my $tbhits = '';
+			if (exists($uciinfo{'tbhits' . $mpv})) {
+				$tbhits = sprintf ", %u tbhits", $uciinfo{'tbhits' . $mpv};
+			}
+
 			if (exists($uciinfo{'nodes' . $mpv}) && exists($uciinfo{'nps' . $mpv}) && exists($uciinfo{'depth' . $mpv})) {
-				$text .= sprintf " (%5u kn, %3u kn/s, %2u ply)",
+				$text .= sprintf " (%5u kn, %3u kn/s, %2u ply$tbhits)",
 					$uciinfo{'nodes' . $mpv} / 1000, $uciinfo{'nps' . $mpv} / 1000, $uciinfo{'depth' . $mpv};
 			}
 
 			$text .= ":\n";
-			$text .= "  " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
+			$text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}})) . "\n";
 			$text .= "\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
-		my $score = long_score(\%uciinfo, \%ficsinfo, '');
+		my $score = long_score(\%uciinfo, $pos_calculating, '');
 		$text .= "  $score\n" if defined($score);
-		$text .=  "  PV: " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
+		$text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
 		$text .=  "\n";
 
 		if (exists($uciinfo{'nodes'}) && exists($uciinfo{'nps'}) && exists($uciinfo{'depth'})) {
@@ -566,7 +607,7 @@ sub output_screen {
 		my $mpv = 1;
 		while (exists($uciinfo{'pv' . $mpv})) {
 			$tell_text .= sprintf "  PV%2u", $mpv;
-			my $score = short_score(\%uciinfo, \%ficsinfo, $mpv);
+			my $score = short_score(\%uciinfo, $pos_calculating, $mpv);
 			$tell_text .= "  ($score)" if (defined($score));
 
 			if (exists($uciinfo{'depth' . $mpv})) {
@@ -574,15 +615,15 @@ sub output_screen {
 			}
 
 			$tell_text .= ": ";
-			$tell_text .= join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv' . $mpv}}));
+			$tell_text .= join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv' . $mpv}}));
 			$tell_text .= "\n";
 			++$mpv;
 		}
 	} else {
 		# single-PV
-		my $score = long_score(\%uciinfo, \%ficsinfo, '');
+		my $score = long_score(\%uciinfo, $pos_calculating, '');
 		$tell_text .= "  $score\n" if defined($score);
-		$tell_text .= "  PV: " . join(', ', prettyprint_pv($ficsinfo{'board'}, @{$uciinfo{'pv'}}));
+		$tell_text .= "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$uciinfo{'pv'}}));
 		if (exists($uciinfo{'depth'})) {
 			$tell_text .= sprintf " (depth %u ply)", $uciinfo{'depth'};
 		}
@@ -799,18 +840,18 @@ sub can_reach {
 sub uciprint {
 	my $msg = shift;
 	print UCIWRITE "$msg\n";
-	print UCILOG "=> $msg\n";
+	print UCILOG localtime() . " => $msg\n";
 }
 
 sub short_score {
-	my ($uciinfo, $ficsinfo, $mpv) = @_;
+	my ($uciinfo, $pos, $mpv) = @_;
 
 	if (defined($uciinfo{'score_mate' . $mpv})) {
 		return sprintf "M%3d", $uciinfo{'score_mate' . $mpv};
 	} else {
 		if (exists($uciinfo{'score_cp' . $mpv})) {
 			my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
-			if ($ficsinfo{'toplay'} eq 'B') {
+			if ($pos->{'toplay'} eq 'B') {
 				$score = -$score;
 			}
 			return sprintf "%+5.2f", $score;
@@ -821,11 +862,11 @@ sub short_score {
 }
 
 sub long_score {
-	my ($uciinfo, $ficsinfo, $mpv) = @_;
+	my ($uciinfo, $pos, $mpv) = @_;
 
 	if (defined($uciinfo{'score_mate' . $mpv})) {
 		my $mate = $uciinfo{'score_mate' . $mpv};
-		if ($ficsinfo{'toplay'} eq 'B') {
+		if ($pos->{'toplay'} eq 'B') {
 			$mate = -$mate;
 		}
 		if ($mate > 0) {
@@ -836,7 +877,7 @@ sub long_score {
 	} else {
 		if (exists($uciinfo{'score_cp' . $mpv})) {
 			my $score = $uciinfo{'score_cp' . $mpv} * 0.01;
-			if ($ficsinfo{'toplay'} eq 'B') {
+			if ($pos->{'toplay'} eq 'B') {
 				$score = -$score;
 			}
 			return sprintf "Score: %+5.2f", $score;