X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=10dead9315e21da0d4879bc384084f35cbf5f426;hp=b66fd2c43acec6f6a9db5703e06e1f42a3fc9d90;hb=352d2a6829b4144ba1ad156c08f9b3332bc73d0f;hpb=2187ba0a0e12b8e751524491e25905d7ecc2e07b

diff --git a/remoteglot.pl b/remoteglot.pl
index b66fd2c..10dead9 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -21,23 +21,10 @@ use Time::HiRes;
 use JSON::XS;
 require 'Position.pm';
 require 'Engine.pm';
+require 'config.pm';
 use strict;
 use warnings;
-
-# Configuration
-my $server = "freechess.org";
-my $target = "GMCarlsen";
-my $engine_cmdline = "'./Deep Rybka 4 SSE42 x64'";
-my $engine2_cmdline = "./stockfish_13111119_x64_modern_sse42";  # undef for none
-my $uci_assume_full_compliance = 0;                    # dangerous :-)
-my $update_max_interval = 1.0;
-my @masters = (
-	'Sesse',
-	'Sessse',
-	'Sesssse',
-	'greatestguns',
-	'beuki'
-);
+no warnings qw(once);
 
 # Program starts here
 $SIG{ALRM} = sub { output(); };
@@ -60,25 +47,23 @@ $| = 1;
 select(STDOUT);
 
 # open the chess engine
-my $engine = open_engine($engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
-my $engine2 = open_engine($engine2_cmdline, 'E2', sub { handle_uci(@_, 0); });
+my $engine = open_engine($remoteglotconf::engine_cmdline, 'E1', sub { handle_uci(@_, 1); });
+my $engine2 = open_engine($remoteglotconf::engine2_cmdline, 'E2', sub { handle_uci(@_, 0); });
 my $last_move;
 my $last_text = '';
 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");
-uciprint($engine, "setoption name NalimovUsage value Rarely");
-uciprint($engine, "setoption name Hash value 1024");
-# uciprint($engine, "setoption name MultiPV value 2");
+while (my ($key, $value) = each %remoteglotconf::engine_config) {
+	uciprint($engine, "setoption name $key value $value");
+}
 uciprint($engine, "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");
+	while (my ($key, $value) = each %remoteglotconf::engine2_config) {
+		uciprint($engine2, "setoption name $key value $value");
+	}
 	uciprint($engine2, "setoption name MultiPV value 500");
 	uciprint($engine2, "ucinewgame");
 }
@@ -88,8 +73,8 @@ print "Chess engine ready.\n";
 # now talk to FICS
 my $t = Net::Telnet->new(Timeout => 10, Prompt => '/fics% /');
 $t->input_log(\*FICSLOG);
-$t->open($server);
-$t->print("SesseBOT");
+$t->open($remoteglotconf::server);
+$t->print($remoteglotconf::nick);
 $t->waitfor('/Press return to enter the server/');
 $t->cmd("");
 
@@ -97,7 +82,7 @@ $t->cmd("");
 $t->cmd("set shout 0");
 $t->cmd("set seek 0");
 $t->cmd("set style 12");
-$t->cmd("observe $target");
+$t->cmd("observe $remoteglotconf::target");
 print "FICS ready.\n";
 
 my $ev1 = AnyEvent->io(
@@ -120,6 +105,8 @@ EV::run;
 sub handle_uci {
 	my ($engine, $line, $primary) = @_;
 
+	return if $line =~ /(upper|lower)bound/;
+
 	$line =~ s/  / /g;  # Sometimes needed for Zappa Mexico
 	print UCILOG localtime() . " $engine->{'tag'} <= $line\n";
 	if ($line =~ /^info/) {
@@ -136,7 +123,7 @@ sub handle_uci {
 	}
 	if ($line =~ /^bestmove/) {
 		if ($primary) {
-			return if (!$uci_assume_full_compliance);
+			return if (!$remoteglotconf::uci_assume_full_compliance);
 			if (defined($pos_waiting)) {
 				uciprint($engine, "position fen " . $pos_waiting->fen());
 				uciprint($engine, "go infinite");
@@ -163,7 +150,7 @@ sub handle_fics {
 	if ($line =~ /^([A-Za-z]+)(?:\([A-Z]+\))* tells you: (.*)$/) {
 		my ($who, $msg) = ($1, $2);
 
-		next if (grep { $_ eq $who } (@masters) == 0);
+		next if (grep { $_ eq $who } (@remoteglotconf::masters) == 0);
 
 		if ($msg =~ /^fics (.*?)$/) {
 			$t->cmd("tell $who Executing '$1' on FICS.");
@@ -180,6 +167,9 @@ sub handle_fics {
 		} elsif ($msg =~ /^stoppgn$/) {
 			$t->cmd("tell $who Stopping poll.");
 			$http_timer = undef;
+		} elsif ($msg =~ /^quit$/) {
+			$t->cmd("tell $who Bye bye.");
+			exit;
 		} else {
 			$t->cmd("tell $who Couldn't understand '$msg', sorry.");
 		}
@@ -196,10 +186,14 @@ sub handle_pgn {
 		$pgn->quick_parse_game;
 		my $pos = Position->start_pos($pgn->white, $pgn->black);
 		my $moves = $pgn->moves;
+		my @uci_moves = ();
 		for my $move (@$moves) {
 			my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
+			push @uci_moves, Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
 			$pos = $pos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
 		}
+		$pos->{'history'} = \@uci_moves;
+		$pos->{'pretty_history'} = $moves;
 		handle_position($pos);
 	}
 	
@@ -227,7 +221,7 @@ sub handle_position {
 		if (!defined($pos_waiting)) {
 			uciprint($engine, "stop");
 		}
-		if ($uci_assume_full_compliance) {
+		if ($remoteglotconf::uci_assume_full_compliance) {
 			$pos_waiting = $pos;
 		} else {
 			uciprint($engine, "position fen " . $pos->fen());
@@ -275,26 +269,28 @@ sub parse_infos {
 
 	# 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') {
+		if ($x[$i] eq 'multipv') {
 			$mpv = $x[$i + 1];
 			next;
 		}
 	}
 
 	while (scalar @x > 0) {
-		if ($x[0] =~ 'multipv') {
+		if ($x[0] eq 'multipv') {
 			# Dealt with above
 			shift @x;
 			shift @x;
 			next;
 		}
-		if ($x[0] =~ /^(currmove|currmovenumber|cpuload)$/) {
+		if ($x[0] eq 'currmove' || $x[0] eq 'currmovenumber' || $x[0] eq 'cpuload') {
 			my $key = shift @x;
 			my $value = shift @x;
 			$info->{$key} = $value;
 			next;
 		}
-		if ($x[0] =~ /^(depth|seldepth|hashfull|time|nodes|nps|tbhits)$/) {
+		if ($x[0] eq 'depth' || $x[0] eq 'seldepth' || $x[0] eq 'hashfull' ||
+		    $x[0] eq 'time' || $x[0] eq 'nodes' || $x[0] eq 'nps' ||
+		    $x[0] eq 'tbhits') {
 			my $key = shift @x;
 			my $value = shift @x;
 			$info->{$key . $mpv} = $value;
@@ -306,7 +302,7 @@ sub parse_infos {
 			delete $info->{'score_cp' . $mpv};
 			delete $info->{'score_mate' . $mpv};
 
-			while ($x[0] =~ /^(cp|mate|lowerbound|upperbound)$/) {
+			while ($x[0] eq 'cp' || $x[0] eq 'mate') {
 				if ($x[0] eq 'cp') {
 					shift @x;
 					$info->{'score_cp' . $mpv} = shift @x;
@@ -350,7 +346,7 @@ sub parse_ids {
 	}
 }
 
-sub prettyprint_pv {
+sub prettyprint_pv_no_cache {
 	my ($board, @pvs) = @_;
 
 	if (scalar @pvs == 0 || !defined($pvs[0])) {
@@ -360,7 +356,20 @@ sub prettyprint_pv {
 	my $pv = shift @pvs;
 	my ($from_col, $from_row, $to_col, $to_row, $promo) = parse_uci_move($pv);
 	my ($pretty, $nb) = $board->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
-	return ($pretty, prettyprint_pv($nb, @pvs));
+	return ( $pretty, prettyprint_pv_no_cache($nb, @pvs) );
+}
+
+sub prettyprint_pv {
+	my ($pos, @pvs) = @_;
+
+	my $cachekey = join('', @pvs);
+	if (exists($pos->{'prettyprint_cache'}{$cachekey})) {
+		return @{$pos->{'prettyprint_cache'}{$cachekey}};
+	} else {
+		my @res = prettyprint_pv_no_cache($pos->{'board'}, @pvs);
+		$pos->{'prettyprint_cache'}{$cachekey} = \@res;
+		return @res;
+	}
 }
 
 sub output {
@@ -370,8 +379,8 @@ sub output {
 
 	# 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);
+	if ($age < $remoteglotconf::update_max_interval) {
+		Time::HiRes::alarm($remoteglotconf::update_max_interval + 0.01 - $age);
 		return;
 	}
 	
@@ -398,12 +407,12 @@ sub output {
 	eval {
 		my $dummy;
 		if (exists($info->{'pv'})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}});
+			$dummy = prettyprint_pv($pos_calculating, @{$info->{'pv'}});
 		}
 	
 		my $mpv = 1;
 		while (exists($info->{'pv' . $mpv})) {
-			$dummy = prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}});
+			$dummy = prettyprint_pv($pos_calculating, @{$info->{'pv' . $mpv}});
 			++$mpv;
 		}
 	};
@@ -464,7 +473,7 @@ sub output_screen {
 			}
 
 			$text .= ":\n";
-			$text .= "  " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv' . $mpv}})) . "\n";
+			$text .= "  " . join(', ', prettyprint_pv($pos_calculating, @{$info->{'pv' . $mpv}})) . "\n";
 			$text .= "\n";
 			++$mpv;
 		}
@@ -472,7 +481,7 @@ sub output_screen {
 		# single-PV
 		my $score = long_score($info, $pos_calculating, '');
 		$text .= "  $score\n" if defined($score);
-		$text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}));
+		$text .=  "  PV: " . join(', ', prettyprint_pv($pos_calculating, @{$info->{'pv'}}));
 		$text .=  "\n";
 
 		if (exists($info->{'nodes'}) && exists($info->{'nps'}) && exists($info->{'depth'})) {
@@ -502,8 +511,8 @@ sub output_screen {
 			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);
+				my $pretty_move = join('', prettyprint_pv($pos_calculating_second_engine, $pv->[0]));
+				my @pretty_pv = prettyprint_pv($pos_calculating_second_engine, @$pv);
 				if (scalar @pretty_pv > 5) {
 					@pretty_pv = @pretty_pv[0..4];
 					push @pretty_pv, "...";
@@ -550,7 +559,7 @@ sub output_json {
 
 	# single-PV only for now
 	$json->{'pv_uci'} = $info->{'pv'};
-	$json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating->{'board'}, @{$info->{'pv'}}) ];
+	$json->{'pv_pretty'} = [ prettyprint_pv($pos_calculating, @{$info->{'pv'}}) ];
 
 	my %refutation_lines = ();
 	my @refutation_lines = ();
@@ -563,8 +572,8 @@ sub output_json {
 
 			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);
+				my $pretty_move = join('', prettyprint_pv($pos_calculating, $pv->[0]));
+				my @pretty_pv = prettyprint_pv($pos_calculating, @$pv);
 				$refutation_lines{$pv->[0]} = {
 					sort_key => $pretty_move,
 					depth => $info->{'depth' . $mpv},
@@ -579,11 +588,11 @@ sub output_json {
 	}
 	$json->{'refutation_lines'} = \%refutation_lines;
 
-	open my $fh, ">/srv/analysis.sesse.net/www/analysis.json.tmp"
+	open my $fh, ">", $remoteglotconf::json_output . ".tmp"
 		or return;
 	print $fh JSON::XS::encode_json($json);
 	close $fh;
-	rename("/srv/analysis.sesse.net/www/analysis.json.tmp", "/srv/analysis.sesse.net/www/analysis.json");
+	rename($remoteglotconf::json_output . ".tmp", $remoteglotconf::json_output);
 }
 
 sub uciprint {
@@ -626,11 +635,19 @@ sub score_sort_key {
 	my ($info, $pos, $mpv, $invert) = @_;
 
 	if (defined($info->{'score_mate' . $mpv})) {
-		if ($invert) {
-			return 99999 - $info->{'score_mate' . $mpv};
+		my $mate = $info->{'score_mate' . $mpv};
+		my $score;
+		if ($mate > 0) {
+			# Side to move mates
+			$mate = 99999 - $mate;
 		} else {
-			return -(99999 - $info->{'score_mate' . $mpv});
+			# Side to move is getting mated (note the double negative for $mate)
+			$mate = -99999 - $mate;
+		}
+		if ($invert) {
+			$score = -$score;
 		}
+		return $score;
 	} else {
 		if (exists($info->{'score_cp' . $mpv})) {
 			my $score = $info->{'score_cp' . $mpv};
@@ -693,7 +710,7 @@ sub book_info {
 		if ($move eq '')  {
 			$pmove = '(current)';
 		} else {
-			($pmove) = prettyprint_pv($board, $move);
+			($pmove) = prettyprint_pv_no_cache($board, $move);
 			$pmove .= $annotation;
 		}