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

diff --git a/remoteglot.pl b/remoteglot.pl
index c86eede..d8a7925 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -76,19 +76,11 @@ 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");
-}
+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");
 }
@@ -593,13 +585,13 @@ 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"`;
@@ -611,6 +603,9 @@ sub complete_using_tbprobe {
 		# Splice the PV from the tablebase onto what we have so far.
 		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;
@@ -1475,3 +1470,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");
+	}
+}