X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=Position.pm;h=3e3e84fd3f0282d55878f1a47ca3d215277c0000;hp=7834ca065185ad005be02cf06d252756b08dd3ae;hb=7c3edf71232cb453a4ed3f3053d0064ee7dabe24;hpb=8fcd3d2321344017e376668cb5d1f5ea7cb47c20

diff --git a/Position.pm b/Position.pm
index 7834ca0..3e3e84f 100644
--- a/Position.pm
+++ b/Position.pm
@@ -4,6 +4,7 @@
 #
 use strict;
 use warnings;
+use MIME::Base64;
 
 require 'Board.pm';
 
@@ -18,17 +19,26 @@ sub new {
 	$pos->{'board'} = Board->new(@x[1..8]);
 	$pos->{'toplay'} = $x[9];
 	$pos->{'ep_file_num'} = $x[10];
-	$pos->{'white_castle_k'} = $x[11];
-	$pos->{'white_castle_q'} = $x[12];
-	$pos->{'black_castle_k'} = $x[13];
-	$pos->{'black_castle_q'} = $x[14];
+	$pos->{'white_castle_k'} = $x[11] ? 'h' : undef;
+	$pos->{'white_castle_q'} = $x[12] ? 'a' : undef;
+	$pos->{'black_castle_k'} = $x[13] ? 'h' : undef;
+	$pos->{'black_castle_q'} = $x[14] ? 'a' : undef;
 	$pos->{'time_since_100move_rule_reset'} = $x[15];
 	$pos->{'player_w'} = $x[17];
 	$pos->{'player_b'} = $x[18];
 	$pos->{'player_w'} =~ s/^W?[FCIG]M//;
 	$pos->{'player_b'} =~ s/^W?[FCIG]M//;
+	$pos->{'white_clock'} = $x[24];
+	$pos->{'black_clock'} = $x[25];
 	$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->{'prettyprint_cache'} = {};
+	$pos->{'tbprobe_cache'} = {};
 
 	bless $pos, $class;
 	return $pos;
@@ -36,9 +46,73 @@ sub new {
 
 sub start_pos {
 	my ($class, $white, $black) = @_;
+	$white = "base64:" . MIME::Base64::encode_base64($white);
+	$black = "base64:" . MIME::Base64::encode_base64($black);
 	return $class->new("<12> rnbqkbnr pppppppp -------- -------- -------- -------- PPPPPPPP RNBQKBNR W -1 1 1 1 1 0 dummygamenum $white $black -2 dummytime dummyincrement 39 39 dummytime dummytime 1 none (0:00) none 0 0 0");
 }
 
+sub from_fen {
+	my ($class, $fen) = @_;
+	my ($board, $toplay, $castling, $ep_square, $halfmove_clock, $fullmove_clock) = split / /, $fen;
+
+	my $pos = {};
+	$board =~ s/(\d)/"-"x$1/ge;
+	$pos->{'board'} = Board->new(split /\//, $board);
+	$board = $pos->{'board'};
+	$pos->{'toplay'} = uc($toplay);
+
+	if ($ep_square =~ /^([a-h])/) {
+		$pos->{'ep_file_num'} = ord($1) - ord('a');
+	} else {
+		$pos->{'ep_file_num'} = -1;
+	}
+
+	# X-FEN castling rights parsing.
+	if ($castling =~ /K/) {
+		$pos->{'white_castle_k'} = _col_num_to_letter(_find_piece_col_from_right($board->[7], 'R'));
+	}
+	if ($castling =~ /Q/) {
+		$pos->{'white_castle_q'} = _col_num_to_letter(_find_piece_col($board->[7], 'R'));
+	}
+	while ($castling =~ s/([A-H])//) {
+		my $rook_col = lc($1);
+		my $king_col = _col_num_to_letter(_find_piece_col($board->[7], 'K'));
+		if ($rook_col lt $king_col) {
+			$pos->{'white_castle_q'} = $rook_col;
+		} else {
+			$pos->{'white_castle_k'} = $rook_col;
+		}
+	}
+	if ($castling =~ /k/) {
+		$pos->{'black_castle_k'} = _col_num_to_letter(_find_piece_col_from_right($board->[0], 'r'));
+	}
+	if ($castling =~ /q/) {
+		$pos->{'black_castle_q'} = _col_num_to_letter(_find_piece_col($board->[0], 'r'));
+	}
+	while ($castling =~ s/([a-h])//) {
+		my $rook_col = $1;
+		my $king_col = _col_num_to_letter(_find_piece_col($board->[0], 'k'));
+		if ($rook_col lt $king_col) {
+			$pos->{'black_castle_q'} = $rook_col;
+		} else {
+			$pos->{'black_castle_k'} = $rook_col;
+		}
+	}
+	$pos->{'time_since_100move_rule_reset'} = $halfmove_clock // 0;
+	$pos->{'player_w'} = 'white';
+	$pos->{'player_b'} = 'black';
+	$pos->{'white_clock'} = 0;
+	$pos->{'black_clock'} = 0;
+	$pos->{'move_num'} = $fullmove_clock // 0;
+	$pos->{'last_move_uci'} = undef;
+	$pos->{'last_move'} = undef;
+	$pos->{'prettyprint_cache'} = {};
+	$pos->{'tbprobe_cache'} = {};
+	
+	bless $pos, $class;
+	return $pos;
+}
+
 sub fen {
 	my $pos = shift;
 
@@ -49,12 +123,40 @@ sub fen {
 	$fen .= " ";
 	$fen .= lc($pos->{'toplay'});
 
-	# castling
+	# Castling (X-FEN compatible).
 	my $castling = "";
-	$castling .= "K" if ($pos->{'white_castle_k'} == 1);
-	$castling .= "Q" if ($pos->{'white_castle_q'} == 1);
-	$castling .= "k" if ($pos->{'black_castle_k'} == 1);
-	$castling .= "q" if ($pos->{'black_castle_q'} == 1);
+	if (defined($pos->{'white_castle_k'})) {
+		my $outer_rook_col = _col_num_to_letter(_find_piece_col_from_right($pos->{'board'}[7], 'R'));
+		if ($outer_rook_col eq $pos->{'white_castle_k'}) {
+			$castling .= "K";
+		} else {
+			$castling .= uc($pos->{'white_castle_k'});
+		}
+	}
+	if (defined($pos->{'white_castle_q'})) {
+		my $outer_rook_col = _col_num_to_letter(_find_piece_col($pos->{'board'}[7], 'R'));
+		if ($outer_rook_col eq $pos->{'white_castle_q'}) {
+			$castling .= "Q";
+		} else {
+			$castling .= uc($pos->{'white_castle_q'});
+		}
+	}
+	if (defined($pos->{'black_castle_k'})) {
+		my $outer_rook_col = _col_num_to_letter(_find_piece_col_from_right($pos->{'board'}[0], 'r'));
+		if ($outer_rook_col eq $pos->{'black_castle_k'}) {
+			$castling .= "k";
+		} else {
+			$castling .= $pos->{'black_castle_k'};
+		}
+	}
+	if (defined($pos->{'black_castle_q'})) {
+		my $outer_rook_col = _col_num_to_letter(_find_piece_col($pos->{'board'}[0], 'r'));
+		if ($outer_rook_col eq $pos->{'black_castle_q'}) {
+			$castling .= "q";
+		} else {
+			$castling .= $pos->{'black_castle_q'};
+		}
+	}
 	$castling = "-" if ($castling eq "");
 	# $castling = "-"; # chess960
 	$fen .= " ";
@@ -64,27 +166,12 @@ sub fen {
 	my $ep = "-";
 	if ($pos->{'ep_file_num'} != -1) {
 		my $col = $pos->{'ep_file_num'};
-		my $nep = (qw(a b c d e f g h))[$col];
+		$ep = (qw(a b c d e f g h))[$col];
 
 		if ($pos->{'toplay'} eq 'B') {
-			$nep .= "3";
+			$ep .= "3";
 		} 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
-		# a pawn of the opposite side that can do the en passant move, and if
-		# not, just lie -- it doesn't matter anyway. I'm unsure what's the
-		# "right" thing as per the standard, though.
-		#
-		if ($pos->{'toplay'} eq 'B') {
-			$ep = $nep if ($col > 0 && $pos->{'board'}[4][$col-1] eq 'p');
-			$ep = $nep if ($col < 7 && $pos->{'board'}[4][$col+1] eq 'p');
-		} else {
-			$ep = $nep if ($col > 0 && $pos->{'board'}[3][$col-1] eq 'P');
-			$ep = $nep if ($col < 7 && $pos->{'board'}[3][$col+1] eq 'P');
+			$ep .= "6";
 		}
 	}
 	$fen .= " ";
@@ -103,17 +190,38 @@ sub fen {
 
 sub to_json_hash {
 	my $pos = shift;
-	return { %$pos, board => undef, fen => $pos->fen() };
+	my $json = { %$pos, fen => $pos->fen() };
+	delete $json->{'board'};
+	delete $json->{'prettyprint_cache'};
+	delete $json->{'tbprobe_cache'};
+	delete $json->{'black_castle_k'};
+	delete $json->{'black_castle_q'};
+	delete $json->{'white_castle_k'};
+	delete $json->{'white_castle_q'};
+	delete $json->{'time_since_100move_rule_reset'};
+	delete $json->{'chess960'} if (!$json->{'chess960'});
+	if ($json->{'player_w'} =~ /^base64:(.*)$/) {
+		$json->{'player_w'} = MIME::Base64::decode_base64($1);
+	}
+	if ($json->{'player_b'} =~ /^base64:(.*)$/) {
+		$json->{'player_b'} = MIME::Base64::decode_base64($1);
+	}
+	return $json;
 }
 
 sub parse_pretty_move {
         my ($pos, $move) = @_;
-	return $pos->{'board'}->parse_pretty_move($move, $pos->{'toplay'});
+	return $pos->{'board'}->parse_pretty_move($move, $pos->{'toplay'}, $pos->{'chess960'}, $pos->{'white_castle_k'}, $pos->{'white_castle_q'}, $pos->{'black_castle_k'}, $pos->{'black_castle_q'});
+}
+
+sub num_pieces {
+	my ($pos) = @_;
+	return $pos->{'board'}->num_pieces();
 }
 
 # Returns a new Position object.
 sub make_move {
-        my ($pos, $from_row, $from_col, $to_row, $to_col, $promo) = @_;
+        my ($pos, $from_row, $from_col, $to_row, $to_col, $promo, $pretty_move) = @_;
 
 	my $from_square = _pos_to_square($from_row, $from_col);
 	my $to_square = _pos_to_square($to_row, $to_col);
@@ -144,19 +252,27 @@ sub make_move {
 	$np->{'black_castle_k'} = $pos->{'black_castle_k'};
 	$np->{'black_castle_q'} = $pos->{'black_castle_q'};
 	if ($piece eq 'K') {
-		$np->{'white_castle_k'} = 0;
-		$np->{'white_castle_q'} = 0;
+		$np->{'white_castle_k'} = undef;
+		$np->{'white_castle_q'} = undef;
 	} elsif ($piece eq 'k') {
-		$np->{'black_castle_k'} = 0;
-		$np->{'black_castle_q'} = 0;
-	} elsif ($from_square eq 'a1' || $to_square eq 'a1') {
-		$np->{'white_castle_q'} = 0;
-	} elsif ($from_square eq 'h1' || $to_square eq 'h1') {
-		$np->{'white_castle_k'} = 0;
-	} elsif ($from_square eq 'a8' || $to_square eq 'a8') {
-		$np->{'black_castle_q'} = 0;
-	} elsif ($from_square eq 'h8' || $to_square eq 'h8') {
-		$np->{'black_castle_k'} = 0;
+		$np->{'black_castle_k'} = undef;
+		$np->{'black_castle_q'} = undef;
+	} elsif (defined($np->{'white_castle_q'}) &&
+	         ($from_square eq ($np->{'white_castle_q'} . '1') ||
+	          $to_square   eq ($np->{'white_castle_q'} . '1'))) {
+		$np->{'white_castle_q'} = undef;
+	} elsif (defined($np->{'white_castle_k'}) &&
+	         ($from_square eq ($np->{'white_castle_k'} . '1') ||
+	          $to_square   eq ($np->{'white_castle_k'} . '1'))) {
+		$np->{'white_castle_k'} = undef;
+	} elsif (defined($np->{'black_castle_q'}) &&
+	         ($from_square eq ($np->{'black_castle_q'} . '8') ||
+	          $to_square   eq ($np->{'black_castle_q'} . '8'))) {
+		$np->{'black_castle_q'} = undef;
+	} elsif (defined($np->{'black_castle_k'}) &&
+	         ($from_square eq ($np->{'black_castle_k'} . '8') ||
+	          $to_square   eq ($np->{'black_castle_k'} . '8'))) {
+		$np->{'black_castle_k'} = undef;
 	}
 
 	# 50-move rule.
@@ -167,13 +283,85 @@ sub make_move {
 	}
 	$np->{'player_w'} = $pos->{'player_w'};
 	$np->{'player_b'} = $pos->{'player_b'};
-	$np->{'last_move'} = '(move)';  # FIXME
+	$np->{'chess960'} = $pos->{'chess960'};
+	if (exists($pos->{'start_fen'})) {
+		$np->{'start_fen'} = $pos->{'start_fen'};
+	}
+	if (defined($pretty_move)) {
+		$np->{'last_move'} = $pretty_move;
+	} else {
+		my ($move, $nb) = $pos->{'board'}->prettyprint_move($from_row, $from_col, $to_row, $to_col, $promo);
+		$np->{'last_move'} = $move;
+	}
+	$np->{'last_move_uci'} = Board::move_to_uci_notation($from_row, $from_col, $to_row, $to_col, $promo);
+
 	return bless $np;
 }
 
+# Returns a new Position object, and the parsed UCI move.
+sub make_pretty_move {
+	my ($pos, $move) = @_;
+
+	my ($from_row, $from_col, $to_row, $to_col, $promo) = $pos->parse_pretty_move($move);
+	my $uci_move = 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);
+	return ($pos, $uci_move);
+}
+
 sub _pos_to_square {
         my ($row, $col) = @_;
         return sprintf("%c%d", ord('a') + $col, 8 - $row);
 }
 
+sub apply_uci_pv {
+	my ($pos, @pv) = @_;
+
+	my $pvpos = $pos;
+	for my $pv_move (@pv) {
+		my ($from_row, $from_col, $to_row, $to_col, $promo) = _parse_uci_move($pv_move);
+		$pvpos = $pvpos->make_move($from_row, $from_col, $to_row, $to_col, $promo);
+	}
+
+	return $pvpos;
+}
+
+sub _col_num_to_letter {
+	my $col = shift;
+	return sprintf("%c", ord('a') + $col);
+}
+
+sub _col_letter_to_num {
+	return ord(shift) - ord('a');
+}
+
+sub _row_letter_to_num {
+	return 7 - (ord(shift) - ord('1'));
+}
+
+sub _find_piece_col {
+	my ($row, $piece) = @_;
+	for my $col (0..7) {
+		return $col if ($row->[$col] eq $piece);
+	}
+	die "Could not find piece $piece";
+}
+
+sub _find_piece_col_from_right {
+	my ($row, $piece) = @_;
+	for my $col (reverse 0..7) {
+		return $col if ($row->[$col] eq $piece);
+	}
+	die "Could not find piece $piece";
+}
+
+sub _parse_uci_move {
+        my $move = shift;
+        my $from_col = _col_letter_to_num(substr($move, 0, 1));
+        my $from_row = _row_letter_to_num(substr($move, 1, 1));
+        my $to_col   = _col_letter_to_num(substr($move, 2, 1));
+        my $to_row   = _row_letter_to_num(substr($move, 3, 1));
+        my $promo    = substr($move, 4, 1);
+        return ($from_row, $from_col, $to_row, $to_col, $promo);
+}
+
 1;