X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=9301ac7939d25796dbf6407d36741e9b7a6a0029;hp=2ebffc89f355eda4a33acc270c58e34907e8c592;hb=cd3b3e9142387abaad6d43a5431fc7aec5bb5865;hpb=fe2a0bc8ee2c132cf48a24b6c98ee1ecb46f78d5

diff --git a/remoteglot.pl b/remoteglot.pl
index 2ebffc8..9301ac7 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -21,12 +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 $engine2_cmdline = "./stockfish_13111119_x64_modern_sse42";  # undef for none
 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 = 2.0;
-my $second_engine_start_depth = 8;
+my $update_max_interval = 1.0;
 my @masters = (
 	'Sesse',
 	'Sessse',
@@ -60,8 +59,7 @@ my $engine2 = open_engine($engine2_cmdline, 'E2');
 my ($last_move, $last_tell);
 my $last_text = '';
 my $last_told_text = '';
-my ($pos_waiting, $pos_calculating, $move_calculating_second_engine);
-my %refutation_moves = ();
+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");
@@ -70,13 +68,15 @@ 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 2");
-uciprint($engine2, "ucinewgame");
+if (defined($engine2)) {
+	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";
 
@@ -100,7 +100,9 @@ while (1) {
 	my $rin = '';
 	my $rout;
 	vec($rin, fileno($engine->{'read'}), 1) = 1;
-	vec($rin, fileno($engine2->{'read'}), 1) = 1;
+	if (defined($engine2)) {
+		vec($rin, fileno($engine2->{'read'}), 1) = 1;
+	}
 	vec($rin, fileno($t), 1) = 1;
 
 	my ($nfound, $timeleft) = select($rout=$rin, undef, undef, 5.0);
@@ -145,16 +147,18 @@ while (1) {
 				$pos_calculating = $pos;
 			}
 
-			%refutation_moves = calculate_refutation_moves($pos);
-			if (defined($move_calculating_second_engine)) {
-				uciprint($engine2, "stop");
-				$move_calculating_second_engine = undef;
-			} else {
-				give_new_move_to_second_engine($pos);
+			if (defined($engine2)) {
+				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;
+				}
+				$engine2->{'info'} = {};
 			}
 
 			$engine->{'info'} = {};
-			$engine2->{'info'} = {};
 			$last_move = time;
 
 			# 
@@ -196,7 +200,7 @@ while (1) {
 
 		output();
 	}
-	if ($nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
+	if (defined($engine2) && $nfound > 0 && vec($rout, fileno($engine2->{'read'}), 1) == 1) {
 		my @lines = read_lines($engine2);
 		for my $line (@lines) {
 			next if $line =~ /(upper|lower)bound/;
@@ -240,14 +244,11 @@ sub handle_uci {
 				$pos_waiting = undef;
 			}
 		} else {
-			if (defined($move_calculating_second_engine)) {	
-				my $move = $refutation_moves{$move_calculating_second_engine};
-				$move->{'pv'} = $engine->{'info'}{'pv'} // $engine->{'info'}{'pv1'};
-				$move->{'score_cp'} = $engine->{'info'}{'score_cp'} // $engine->{'info'}{'score_cp1'} // 0;
-				$move->{'score_mate'} = $engine->{'info'}{'score_mate'} // $engine->{'info'}{'score_mate1'};
-				$move->{'toplay'} = $pos_calculating->{'toplay'};
-			}
-			give_new_move_to_second_engine($pos_waiting // $pos_calculating);
+			$engine2->{'info'} = {};
+			my $pos = $pos_waiting // $pos_calculating;
+			uciprint($engine2, "position fen " . $pos->{'fen'});
+			uciprint($engine2, "go infinite");
+			$pos_calculating_second_engine = $pos;
 		}
 	}
 }
@@ -258,10 +259,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)$/) {
@@ -339,7 +349,16 @@ sub style12_to_pos {
 	$pos{'black_castle_k'} = $x[13];
 	$pos{'black_castle_q'} = $x[14];
 	$pos{'time_to_100move_rule'} = $x[15];
+	$pos{'player_w'} = $x[17];
+	$pos{'player_b'} = $x[18];
+	$pos{'player_w'} =~ s/^[IG]M//;
+	$pos{'player_b'} =~ s/^[IG]M//;
 	$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);
 
@@ -736,41 +755,44 @@ 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";
+				$text .= ", one Syzygy hit";
 			} else {
-				$text .= sprintf ", %u Nalimov hits", $info->{'tbhits'};
+				$text .= sprintf ", %u Syzygy hits", $info->{'tbhits'};
 			}
 		}
-		if (exists($info->{'seldepth'})) {
-			$text .= sprintf " (%u selective)", $info->{'seldepth'};
-		}
 		$text .= "\n\n";
 	}
 
 	#$text .= book_info($pos_calculating->{'fen'}, $pos_calculating->{'board'}, $pos_calculating->{'toplay'});
 
 	my @refutation_lines = ();
-	for my $move (keys %refutation_moves) {
-		eval {
-			my $m = $refutation_moves{$move};
-			die if ($m->{'depth'} < $second_engine_start_depth);
-			my $pretty_move = join('', prettyprint_pv($pos_calculating->{'board'}, $move));
-			my @pretty_pv = prettyprint_pv($pos_calculating->{'board'}, $move, @{$m->{'pv'}});
-			if (scalar @pretty_pv > 5) {
-				@pretty_pv = @pretty_pv[0..4];
-				push @pretty_pv, "...";
-			}
-			#my $key = score_sort_key($refutation_moves{$move}, $pos_calculating, '', 1);
-			my $key = $pretty_move;
-			my $line = sprintf("  %-6s %6s %3s  %s",
-				$pretty_move,
-				short_score($refutation_moves{$move}, $pos_calculating, '', 1),
-				"d" . $m->{'depth'},
-				join(', ', @pretty_pv));
-			push @refutation_lines, [ $key, $line ];
-		};
+	if (defined($engine2)) {
+		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) {
@@ -865,33 +887,37 @@ sub output_json {
 	$json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}) ];
 
 	my %refutation_lines = ();
-	for my $move (keys %refutation_moves) {
-		my $m = $refutation_moves{$move};
-		my $pretty_move = "";
-		my @pretty_pv = ();
-		eval {
-			$pretty_move = join('', prettyprint_pv($pos_calculating->{'board'}, $move));
-			@pretty_pv = prettyprint_pv($pos_calculating->{'board'}, $move, @{$m->{'pv'}});
-		};
-		$refutation_lines{$move} = {
-			sort_key => $pretty_move,
-			depth => $m->{'depth'},
-			score_sort_key => score_sort_key($refutation_moves{$move}, $pos_calculating, '', 1),
-			pretty_score => short_score($refutation_moves{$move}, $pos_calculating, '', 1),
-			pretty_move => $pretty_move,
-			pv_pretty => \@pretty_pv,
-		};
-		eval {
-			$refutation_lines{$move}->{'pv_uci'} = [ $move, @{$m->{'pv'}} ];
-		};
+	my @refutation_lines = ();
+	if (defined($engine2)) {
+		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"
+	open my $fh, ">/srv/analysis.sesse.net/www/analysis.json.tmp"
 		or return;
 	print $fh JSON::XS::encode_json($json);
 	close $fh;
-	rename("analysis.json.tmp", "analysis.json");	
+	rename("/srv/analysis.sesse.net/www/analysis.json.tmp", "/srv/analysis.sesse.net/www/analysis.json");
 }
 
 sub find_kings {
@@ -1130,23 +1156,15 @@ sub short_score {
 sub score_sort_key {
 	my ($info, $pos, $mpv, $invert) = @_;
 
-	$invert //= 0;
-	if ($pos->{'toplay'} eq 'B') {
-		$invert = !$invert;
-	}
-
 	if (defined($info->{'score_mate' . $mpv})) {
 		if ($invert) {
-			return -(99999 - $info->{'score_mate' . $mpv});
-		} else {
 			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 ($score == 0) {
-				return " 0.00";
-			}
 			if ($invert) {
 				$score = -$score;
 			}
@@ -1173,6 +1191,9 @@ sub long_score {
 	} else {
 		if (exists($info->{'score_cp' . $mpv})) {
 			my $score = $info->{'score_cp' . $mpv} * 0.01;
+			if ($score == 0) {
+				return "Score:  0.00";
+			}
 			if ($pos->{'toplay'} eq 'B') {
 				$score = -$score;
 			}
@@ -1237,6 +1258,9 @@ sub book_info {
 
 sub open_engine {
 	my ($cmdline, $tag) = @_;
+
+	return undef if (!defined($cmdline));
+
 	my ($uciread, $uciwrite);
 	my $pid = IPC::Open2::open2($uciread, $uciwrite, $cmdline);
 
@@ -1293,74 +1317,6 @@ sub read_lines {
 	return @lines;
 }
 
-# Find all possible legal moves.
-sub calculate_refutation_moves {
-	my $pos = shift;
-	my $board = $pos->{'board'};
-	my %refutation_moves = ();
-	for my $col (0..7) {
-		for my $row (0..7) {
-			my $piece = substr($board->[$row], $col, 1);
-
-			# Check that there's a piece of the right color on this square.
-			next if ($piece eq '-');
-			if ($pos->{'toplay'} eq 'W') {
-				next if ($piece ne uc($piece));
-			} else {
-				next if ($piece ne lc($piece));
-			}
-
-			for my $to_col (0..7) {
-				for my $to_row (0..7) {
-					next if ($col == $to_col && $row == $to_row);
-					next unless (can_reach($board, $piece, $row, $col, $to_row, $to_col));
-
-					my $promo = "";  # FIXME
-					my $nb = make_move($board, $row, $col, $to_row, $to_col, $promo);
-					my $check = in_check($nb);
-					next if ($check eq 'both');
-					if ($pos->{'toplay'} eq 'W') {
-						next if ($check eq 'white');
-					} else {
-						next if ($check eq 'black');
-					}
-					my $move = move_to_uci_notation($row, $col, $to_row, $to_col, $promo);
-					$refutation_moves{$move} = { depth => $second_engine_start_depth - 1, score_cp => 0, pv => '' };
-				}
-			}
-		}
-	}
-	return %refutation_moves;
-}
-
-sub give_new_move_to_second_engine {
-	my $pos = shift;
-				
-	# Find the move that's been analyzed the shortest but is most promising.
-	# Tie-break on UCI move representation.
-	my $best_move = undef;
-	for my $move (sort keys %refutation_moves) {
-		if (!defined($best_move)) {
-			$best_move = $move;
-			next;
-		}
-		my $best = $refutation_moves{$best_move};
-		my $this = $refutation_moves{$move};
-
-		if ($this->{'depth'} < $best->{'depth'} ||
-		    ($this->{'depth'} == $best->{'depth'} && $this->{'score_cp'} < $best->{'score_cp'})) {
-			$best_move = $move;
-			next;
-		}
-	}
-
-	my $m = $refutation_moves{$best_move};
-	++$m->{'depth'};
-	uciprint($engine2, "position fen " . $pos->{'fen'} . " moves " . $best_move);
-	uciprint($engine2, "go depth " . $m->{'depth'});
-	$move_calculating_second_engine = $best_move;
-}
-
 sub col_letter_to_num {
 	return ord(shift) - ord('a');
 }